This updates to the latest version of ruby 2.3, 2.4, and 2.5. Upstream
released new versions yesterday containing patches for the following
CVEs:
2017-17742: https://www.ruby-lang.org/en/news/2018/03/28/http-response-splitting-in-webrick-cve-2017-17742/
2018-6914: https://www.ruby-lang.org/en/news/2018/03/28/unintentional-file-and-directory-creation-with-directory-traversal-cve-2018-6914/
2018-8777: https://www.ruby-lang.org/en/news/2018/03/28/large-request-dos-in-webrick-cve-2018-8777/
2018-8778: https://www.ruby-lang.org/en/news/2018/03/28/buffer-under-read-unpack-cve-2018-8778/
2018-8779: https://www.ruby-lang.org/en/news/2018/03/28/poisoned-nul-byte-unixsocket-cve-2018-8779/
2018-8780: https://www.ruby-lang.org/en/news/2018/03/28/poisoned-nul-byte-dir-cve-2018-8780/
Release announcements are available at:
2.5.1: https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-5-1-released/
2.4.4: https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/
2.3.7: https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-3-7-released/
These releases include the rubygems security patches that were
previously handled with a separate patch file.
Tested on amd64, will be committing tomorrow unless I hear objections. I
plan to use the same patch for 6.3-stable after the stable branch opens
up.
Thanks,
Jeremy
Index: 2.3/Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- 2.3/Makefile 8 Mar 2018 15:00:27 -0000 1.24
+++ 2.3/Makefile 28 Mar 2018 21:11:54 -0000
@@ -1,12 +1,8 @@
# $OpenBSD: Makefile,v 1.24 2018/03/08 15:00:27 jeremy Exp $
-VERSION = 2.3.6
+VERSION = 2.3.7
NEXTVER = 2.4
SHARED_LIBS = ruby${BINREV} 2.0
-
-REVISION-main = 0
-REVISION-ri_docs= 0
-PATCHFILES = 7029/rubygems-276-for-ruby23.patch:0
COMMENT-tk = tk interface for ruby
PKGNAME-tk = ruby${BINREV}-tk-${VERSION}
Index: 2.3/distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- 2.3/distinfo 19 Feb 2018 02:18:13 -0000 1.9
+++ 2.3/distinfo 28 Mar 2018 19:35:00 -0000
@@ -1,4 +1,2 @@
-SHA256 (7029/rubygems-276-for-ruby23.patch) = kTsC1B1w1gFAvNVd4XH3eN1ddBhrNq8cnpSy6beY870=
-SHA256 (ruby-2.3.6.tar.gz) = gyJRMnn57fphLURbwRGoeJT6wRKOqlOTAc6/wN1RVx4=
-SIZE (7029/rubygems-276-for-ruby23.patch) = 19953
-SIZE (ruby-2.3.6.tar.gz) = 17840901
+SHA256 (ruby-2.3.7.tar.gz) = Nc00nN33jkoGQNKOyMfoiirg21Hr2JJs0jK7cNssfX8=
+SIZE (ruby-2.3.7.tar.gz) = 17859100
Index: 2.3/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- 2.3/patches/patch-configure 16 Sep 2017 22:43:38 -0000 1.3
+++ 2.3/patches/patch-configure 28 Mar 2018 19:36:50 -0000
@@ -8,7 +8,7 @@ so ports don't have to be bumped when Op
Index: configure
--- configure.orig
+++ configure
-@@ -23698,7 +23698,7 @@ esac
+@@ -23736,7 +23736,7 @@ esac
openbsd*|mirbsd*) :
SOLIBS='$(LIBS)'
@@ -17,7 +17,7 @@ Index: configure
;; #(
solaris*) :
-@@ -24931,7 +24931,7 @@ _ACEOF
+@@ -24969,7 +24969,7 @@ _ACEOF
_ACEOF
else
Index: 2.3/patches/patch-ext_etc_etc_c
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/patches/patch-ext_etc_etc_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ext_etc_etc_c
--- 2.3/patches/patch-ext_etc_etc_c 15 Jul 2016 15:39:04 -0000 1.1
+++ 2.3/patches/patch-ext_etc_etc_c 28 Mar 2018 19:36:50 -0000
@@ -2,8 +2,9 @@ $OpenBSD: patch-ext_etc_etc_c,v 1.1 2016
Use shadow versions of password functions.
---- ext/etc/etc.c.orig Tue Jul 12 11:14:25 2016
-+++ ext/etc/etc.c Tue Jul 12 11:15:05 2016
+Index: ext/etc/etc.c
+--- ext/etc/etc.c.orig
++++ ext/etc/etc.c
@@ -187,7 +187,7 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
else {
uid = getuid();
@@ -13,12 +14,12 @@ Use shadow versions of password function
if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", (int)uid);
return setup_passwd(pwd);
#else
-@@ -217,7 +217,7 @@ etc_getpwnam(VALUE obj, VALUE nam)
- struct passwd *pwd;
+@@ -218,7 +218,7 @@ etc_getpwnam(VALUE obj, VALUE nam)
+ const char *p = StringValueCStr(nam);
- SafeStringValue(nam);
-- pwd = getpwnam(RSTRING_PTR(nam));
-+ pwd = getpwnam_shadow(RSTRING_PTR(nam));
+ rb_check_safe_obj(nam);
+- pwd = getpwnam(p);
++ pwd = getpwnam_shadow(p);
if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam);
return setup_passwd(pwd);
#else
Index: 2.3/pkg/PLIST-ri_docs
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/pkg/PLIST-ri_docs,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-ri_docs
--- 2.3/pkg/PLIST-ri_docs 8 Mar 2018 15:00:27 -0000 1.8
+++ 2.3/pkg/PLIST-ri_docs 28 Mar 2018 20:58:27 -0000
@@ -2831,6 +2831,7 @@ share/ri/${REV}/system/Gem/Package/TarHe
share/ri/${REV}/system/Gem/Package/TarHeader/header-i.ri
share/ri/${REV}/system/Gem/Package/TarHeader/new-c.ri
share/ri/${REV}/system/Gem/Package/TarHeader/oct-i.ri
+share/ri/${REV}/system/Gem/Package/TarHeader/strict_oct-c.ri
share/ri/${REV}/system/Gem/Package/TarHeader/update_checksum-i.ri
share/ri/${REV}/system/Gem/Package/TarInvalidError/
share/ri/${REV}/system/Gem/Package/TarInvalidError/cdesc-TarInvalidError.ri
@@ -2915,8 +2916,10 @@ share/ri/${REV}/system/Gem/Package/extra
share/ri/${REV}/system/Gem/Package/files-i.ri
share/ri/${REV}/system/Gem/Package/gzip_to-i.ri
share/ri/${REV}/system/Gem/Package/initialize-i.ri
+share/ri/${REV}/system/Gem/Package/mkdir_p_safe-i.ri
share/ri/${REV}/system/Gem/Package/new-c.ri
share/ri/${REV}/system/Gem/Package/read_checksums-i.ri
+share/ri/${REV}/system/Gem/Package/realpath-i.ri
share/ri/${REV}/system/Gem/Package/security_policy-i.ri
share/ri/${REV}/system/Gem/Package/setup_signer-i.ri
share/ri/${REV}/system/Gem/Package/spec-i.ri
@@ -14357,8 +14360,13 @@ share/ri/${REV}/system/WEBrick/HTTPReque
share/ri/${REV}/system/WEBrick/HTTPResponse/
share/ri/${REV}/system/WEBrick/HTTPResponse/%5b%5d%3d-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/%5b%5d-i.ri
+share/ri/${REV}/system/WEBrick/HTTPResponse/ChunkedWrapper/
+share/ri/${REV}/system/WEBrick/HTTPResponse/ChunkedWrapper/cdesc-ChunkedWrapper.ri
+share/ri/${REV}/system/WEBrick/HTTPResponse/InvalidHeader/
+share/ri/${REV}/system/WEBrick/HTTPResponse/InvalidHeader/cdesc-InvalidHeader.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/body-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/cdesc-HTTPResponse.ri
+share/ri/${REV}/system/WEBrick/HTTPResponse/check_header-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/chunked%3d-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/chunked%3f-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/config-i.ri
Index: 2.4/Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- 2.4/Makefile 19 Feb 2018 02:18:13 -0000 1.10
+++ 2.4/Makefile 28 Mar 2018 19:16:07 -0000
@@ -1,11 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2018/02/19 02:18:13 jeremy Exp $
-VERSION = 2.4.3
+VERSION = 2.4.4
SHARED_LIBS = ruby24 2.0
NEXTVER = 2.5
-
-REVISION-main = 0
-PATCHFILES = 7028/rubygems-276-for-ruby24.patch:0
PSEUDO_FLAVORS= no_ri_docs bootstrap
# Do not build the RI docs on slow arches
Index: 2.4/distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- 2.4/distinfo 19 Feb 2018 02:18:13 -0000 1.6
+++ 2.4/distinfo 28 Mar 2018 19:31:14 -0000
@@ -1,4 +1,2 @@
-SHA256 (7028/rubygems-276-for-ruby24.patch) = TYGgDKgsEFw4cNLKqM5gujdvqGXoFwXRz6umv+t0bl4=
-SHA256 (ruby-2.4.3.tar.gz) = /QN1WCySBFqn0xhU5yRHH7Rp4RpLCP8zTTkFLMqqOpg=
-SIZE (7028/rubygems-276-for-ruby24.patch) = 19937
-SIZE (ruby-2.4.3.tar.gz) = 14178729
+SHA256 (ruby-2.4.4.tar.gz) = JU8cGnnkzIFNHnMgvFvdmV3FfghyfTCnZ2ZGGanIrlo=
+SIZE (ruby-2.4.4.tar.gz) = 14225338
Index: 2.4/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure
--- 2.4/patches/patch-configure 18 Feb 2018 17:53:45 -0000 1.6
+++ 2.4/patches/patch-configure 28 Mar 2018 19:33:40 -0000
@@ -21,7 +21,7 @@ Index: configure
if test "$FOLD"; then :
echo "$2" | fold -s -w50 |
-@@ -19575,12 +19575,12 @@ fi
+@@ -19583,12 +19583,12 @@ fi
colorize_result "$rb_cv_page_size_log" ; }
if test $rb_cv_page_size_log != no; then
cat >>confdefs.h <<_ACEOF
@@ -36,7 +36,7 @@ Index: configure
_ACEOF
fi
-@@ -25647,7 +25647,7 @@ esac
+@@ -25655,7 +25655,7 @@ esac
openbsd*|mirbsd*) :
SOLIBS='$(LIBS)'
@@ -45,7 +45,7 @@ Index: configure
;; #(
solaris*) :
-@@ -27006,7 +27006,7 @@ _ACEOF
+@@ -27014,7 +27014,7 @@ _ACEOF
_ACEOF
else
Index: 2.4/patches/patch-ext_etc_etc_c
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-ext_etc_etc_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-ext_etc_etc_c
--- 2.4/patches/patch-ext_etc_etc_c 6 Jan 2017 15:59:25 -0000 1.1.1.1
+++ 2.4/patches/patch-ext_etc_etc_c 28 Mar 2018 19:33:40 -0000
@@ -2,8 +2,9 @@ $OpenBSD: patch-ext_etc_etc_c,v 1.1.1.1
Use shadow versions of password functions.
---- ext/etc/etc.c.orig Tue Jul 12 11:14:25 2016
-+++ ext/etc/etc.c Tue Jul 12 11:15:05 2016
+Index: ext/etc/etc.c
+--- ext/etc/etc.c.orig
++++ ext/etc/etc.c
@@ -187,7 +187,7 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
else {
uid = getuid();
@@ -13,12 +14,12 @@ Use shadow versions of password function
if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", (int)uid);
return setup_passwd(pwd);
#else
-@@ -217,7 +217,7 @@ etc_getpwnam(VALUE obj, VALUE nam)
- struct passwd *pwd;
+@@ -218,7 +218,7 @@ etc_getpwnam(VALUE obj, VALUE nam)
+ const char *p = StringValueCStr(nam);
- SafeStringValue(nam);
-- pwd = getpwnam(RSTRING_PTR(nam));
-+ pwd = getpwnam_shadow(RSTRING_PTR(nam));
+ rb_check_safe_obj(nam);
+- pwd = getpwnam(p);
++ pwd = getpwnam_shadow(p);
if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam);
return setup_passwd(pwd);
#else
Index: 2.4/patches/patch-include_ruby_ruby_h
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-include_ruby_ruby_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_ruby_ruby_h
--- 2.4/patches/patch-include_ruby_ruby_h 16 Sep 2017 22:42:37 -0000 1.3
+++ 2.4/patches/patch-include_ruby_ruby_h 28 Mar 2018 19:33:40 -0000
@@ -6,7 +6,7 @@ when compiling some extensions.
Index: include/ruby/ruby.h
--- include/ruby/ruby.h.orig
+++ include/ruby/ruby.h
-@@ -2200,7 +2200,7 @@ ERRORFUNC(("variable argument length doesn't match"),
+@@ -2204,7 +2204,7 @@ ERRORFUNC(("variable argument length doesn't match"),
# define rb_scan_args_verify_count(fmt, varc) \
((varc)/(rb_scan_args_count(fmt, varc)))
Index: 2.4/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- 2.4/pkg/PLIST-main 15 Dec 2017 16:47:37 -0000 1.4
+++ 2.4/pkg/PLIST-main 28 Mar 2018 20:56:46 -0000
@@ -1348,10 +1348,10 @@ lib/ruby/gems/${REV}/gems/xmlrpc-0.2.1/l
lib/ruby/gems/${REV}/gems/xmlrpc-0.2.1/lib/xmlrpc/utils.rb
lib/ruby/gems/${REV}/specifications/
lib/ruby/gems/${REV}/specifications/default/
-lib/ruby/gems/${REV}/specifications/default/bigdecimal-1.3.0.gemspec
+lib/ruby/gems/${REV}/specifications/default/bigdecimal-1.3.2.gemspec
lib/ruby/gems/${REV}/specifications/default/io-console-0.4.6.gemspec
lib/ruby/gems/${REV}/specifications/default/json-2.0.4.gemspec
-lib/ruby/gems/${REV}/specifications/default/openssl-2.0.5.gemspec
+lib/ruby/gems/${REV}/specifications/default/openssl-2.0.7.gemspec
lib/ruby/gems/${REV}/specifications/default/psych-2.2.2.gemspec
lib/ruby/gems/${REV}/specifications/default/rdoc-5.0.0.gemspec
lib/ruby/gems/${REV}/specifications/did_you_mean-1.1.0.gemspec
Index: 2.4/pkg/PLIST-ri_docs
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/pkg/PLIST-ri_docs,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-ri_docs
--- 2.4/pkg/PLIST-ri_docs 15 Dec 2017 16:47:37 -0000 1.4
+++ 2.4/pkg/PLIST-ri_docs 28 Mar 2018 20:56:28 -0000
@@ -2846,6 +2846,7 @@ share/ri/${REV}/system/Gem/Package/TarHe
share/ri/${REV}/system/Gem/Package/TarHeader/header-i.ri
share/ri/${REV}/system/Gem/Package/TarHeader/new-c.ri
share/ri/${REV}/system/Gem/Package/TarHeader/oct-i.ri
+share/ri/${REV}/system/Gem/Package/TarHeader/strict_oct-c.ri
share/ri/${REV}/system/Gem/Package/TarHeader/update_checksum-i.ri
share/ri/${REV}/system/Gem/Package/TarInvalidError/
share/ri/${REV}/system/Gem/Package/TarInvalidError/cdesc-TarInvalidError.ri
@@ -2930,8 +2931,10 @@ share/ri/${REV}/system/Gem/Package/extra
share/ri/${REV}/system/Gem/Package/files-i.ri
share/ri/${REV}/system/Gem/Package/gzip_to-i.ri
share/ri/${REV}/system/Gem/Package/initialize-i.ri
+share/ri/${REV}/system/Gem/Package/mkdir_p_safe-i.ri
share/ri/${REV}/system/Gem/Package/new-c.ri
share/ri/${REV}/system/Gem/Package/read_checksums-i.ri
+share/ri/${REV}/system/Gem/Package/realpath-i.ri
share/ri/${REV}/system/Gem/Package/security_policy-i.ri
share/ri/${REV}/system/Gem/Package/setup_signer-i.ri
share/ri/${REV}/system/Gem/Package/spec-i.ri
@@ -7334,6 +7337,8 @@ share/ri/${REV}/system/OpenSSL/debug%3d-
share/ri/${REV}/system/OpenSSL/debug-c.ri
share/ri/${REV}/system/OpenSSL/errors-c.ri
share/ri/${REV}/system/OpenSSL/fips_mode%3d-c.ri
+share/ri/${REV}/system/OpenSSL/mem_check_start-c.ri
+share/ri/${REV}/system/OpenSSL/print_mem_leaks-c.ri
share/ri/${REV}/system/OpenStruct/
share/ri/${REV}/system/OpenStruct/%3d%3d-i.ri
share/ri/${REV}/system/OpenStruct/%5b%5d%3d-i.ri
@@ -7346,13 +7351,11 @@ share/ri/${REV}/system/OpenStruct/each_p
share/ri/${REV}/system/OpenStruct/eql%3f-i.ri
share/ri/${REV}/system/OpenStruct/freeze-i.ri
share/ri/${REV}/system/OpenStruct/hash-i.ri
-share/ri/${REV}/system/OpenStruct/initialize_copy-i.ri
share/ri/${REV}/system/OpenStruct/inspect-i.ri
share/ri/${REV}/system/OpenStruct/json_create-c.ri
share/ri/${REV}/system/OpenStruct/marshal_dump-i.ri
share/ri/${REV}/system/OpenStruct/marshal_load-i.ri
share/ri/${REV}/system/OpenStruct/new-c.ri
-share/ri/${REV}/system/OpenStruct/respond_to_missing%3f-i.ri
share/ri/${REV}/system/OpenStruct/to_h-i.ri
share/ri/${REV}/system/OpenStruct/to_json-i.ri
share/ri/${REV}/system/OpenStruct/to_s-i.ri
@@ -13771,8 +13774,13 @@ share/ri/${REV}/system/WEBrick/HTTPReque
share/ri/${REV}/system/WEBrick/HTTPResponse/
share/ri/${REV}/system/WEBrick/HTTPResponse/%5b%5d%3d-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/%5b%5d-i.ri
+share/ri/${REV}/system/WEBrick/HTTPResponse/ChunkedWrapper/
+share/ri/${REV}/system/WEBrick/HTTPResponse/ChunkedWrapper/cdesc-ChunkedWrapper.ri
+share/ri/${REV}/system/WEBrick/HTTPResponse/InvalidHeader/
+share/ri/${REV}/system/WEBrick/HTTPResponse/InvalidHeader/cdesc-InvalidHeader.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/body-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/cdesc-HTTPResponse.ri
+share/ri/${REV}/system/WEBrick/HTTPResponse/check_header-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/chunked%3d-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/chunked%3f-i.ri
share/ri/${REV}/system/WEBrick/HTTPResponse/config-i.ri
Index: 2.5/Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.5/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- 2.5/Makefile 19 Feb 2018 02:18:13 -0000 1.3
+++ 2.5/Makefile 28 Mar 2018 19:16:14 -0000
@@ -1,11 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2018/02/19 02:18:13 jeremy Exp $
-VERSION = 2.5.0
+VERSION = 2.5.1
SHARED_LIBS = ruby25 0.0
NEXTVER = 2.6
-
-REVISION-main = 1
-PATCHFILES = 7027/rubygems-276-for-ruby25.patch:0
PSEUDO_FLAVORS= no_ri_docs bootstrap
# Do not build the RI docs on slow arches
Index: 2.5/distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.5/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- 2.5/distinfo 19 Feb 2018 02:18:13 -0000 1.2
+++ 2.5/distinfo 28 Mar 2018 19:16:24 -0000
@@ -1,4 +1,2 @@
-SHA256 (7027/rubygems-276-for-ruby25.patch) = S2csKKV9GI3sV3sMhQeHoU4OEY1qbjCpq4rTdOBScMQ=
-SHA256 (ruby-2.5.0.tar.gz) = RubzYw8YiOtlOxX6gR13tbHfb9ejr0NrNDz+T0UD8qs=
-SIZE (7027/rubygems-276-for-ruby25.patch) = 79238
-SIZE (ruby-2.5.0.tar.gz) = 15834941
+SHA256 (ruby-2.5.1.tar.gz) = 2sgYIjJbecO6lTKwSMISM1fTMQsrQAJCAvNgJR2YKbE=
+SIZE (ruby-2.5.1.tar.gz) = 15923244
Index: 2.5/patches/patch-compile_c
===================================================================
RCS file: /cvs/ports/lang/ruby/2.5/patches/patch-compile_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-compile_c
--- 2.5/patches/patch-compile_c 15 Jan 2018 23:57:42 -0000 1.1.1.1
+++ 2.5/patches/patch-compile_c 28 Mar 2018 19:29:22 -0000
@@ -5,7 +5,7 @@ Disable peephole optimizer on sparc64, s
Index: compile.c
--- compile.c.orig
+++ compile.c
-@@ -2382,6 +2382,9 @@ static int
+@@ -2407,6 +2407,9 @@ static int
iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
{
INSN *const iobj = (INSN *)list;
Index: 2.5/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.5/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- 2.5/patches/patch-configure 15 Jan 2018 23:57:42 -0000 1.1.1.1
+++ 2.5/patches/patch-configure 28 Mar 2018 19:29:22 -0000
@@ -14,7 +14,7 @@ in earlier ruby versions).
Index: configure
--- configure.orig
+++ configure
-@@ -19988,14 +19988,14 @@ fi
+@@ -19989,14 +19989,14 @@ fi
if test $rb_cv_page_size_log != no; then :
cat >>confdefs.h <<_ACEOF
@@ -31,7 +31,7 @@ Index: configure
_ACEOF
-@@ -26267,7 +26267,7 @@ fi
+@@ -26268,7 +26268,7 @@ fi
openbsd*|mirbsd*) :
SOLIBS='$(LIBS)'
@@ -40,7 +40,7 @@ Index: configure
;; #(
solaris*) :
-@@ -27742,7 +27742,7 @@ _ACEOF
+@@ -27743,7 +27743,7 @@ _ACEOF
else
Index: 2.5/patches/patch-include_ruby_ruby_h
===================================================================
RCS file: /cvs/ports/lang/ruby/2.5/patches/patch-include_ruby_ruby_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_ruby_ruby_h
--- 2.5/patches/patch-include_ruby_ruby_h 15 Jan 2018 23:57:42 -0000 1.1.1.1
+++ 2.5/patches/patch-include_ruby_ruby_h 28 Mar 2018 19:29:22 -0000
@@ -6,7 +6,7 @@ when compiling some extensions.
Index: include/ruby/ruby.h
--- include/ruby/ruby.h.orig
+++ include/ruby/ruby.h
-@@ -2227,7 +2227,7 @@ ERRORFUNC(("variable argument length doesn't match"),
+@@ -2231,7 +2231,7 @@ ERRORFUNC(("variable argument length doesn't match"),
# define rb_scan_args_verify_count(fmt, varc) \
((varc)/(rb_scan_args_count(fmt, varc)))
Index: 2.5/patches/patch-prelude_c
===================================================================
RCS file: 2.5/patches/patch-prelude_c
diff -N 2.5/patches/patch-prelude_c
--- 2.5/patches/patch-prelude_c 25 Jan 2018 14:34:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-$OpenBSD: patch-prelude_c,v 1.1 2018/01/25 14:34:58 jeremy Exp $
-
-Work on GCC 4.2, which doesn't allow diagnostic pragma inside functions.
-
-Index: prelude.c
---- prelude.c.orig
-+++ prelude.c
-@@ -197,13 +197,13 @@ static const struct {
-
-
- #define PRELUDE_STR(n) rb_usascii_str_new_static(prelude_##n.L0, sizeof(prelude_##n))
--static void
--prelude_eval(VALUE code, VALUE name, int line)
--{
- #ifdef __GNUC__
- # pragma GCC diagnostic push
- # pragma GCC diagnostic error "-Wmissing-field-initializers"
-
No comments:
Post a Comment