Upgrade to the latest version of Ruby 2.4. This is the last normal
maintenance release of Ruby 2.4, all future updates will only be for
security patches.
Remove the distpatch as the Rubygems security fixes are in this release.
Regen patches while here.
Test on amd64. Will be committing in a couple days unless I hear
objections
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 15 Mar 2019 16:46:41 -0000 1.15
+++ Makefile 1 Apr 2019 19:22:39 -0000
@@ -1,13 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2019/03/15 16:46:41 jeremy Exp $
-VERSION = 2.4.5
+VERSION = 2.4.6
SHARED_LIBS = ruby24 2.0
NEXTVER = 2.5
-
-REVISION = 0
-REVISION-main = 2
-REVISION-ri_docs = 1
-PATCHFILES = 7669/ruby-2.4.5-rubygems-v2.patch:0
PSEUDO_FLAVORS= no_ri_docs bootstrap
# Do not build the RI docs on slow arches
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 15 Mar 2019 16:46:41 -0000 1.9
+++ distinfo 1 Apr 2019 19:22:50 -0000
@@ -1,4 +1,2 @@
-SHA256 (7669/ruby-2.4.5-rubygems-v2.patch) =
FLWaNT38+GCMpDh8Iy7heTBncLyeXjQbsPdZGZAoWoY=
-SHA256 (ruby-2.4.5.tar.gz) = Zzd0Gub/phF0yKPc3YupK8OIJ4J6sdfqHseLw878UZg=
-SIZE (7669/ruby-2.4.5-rubygems-v2.patch) = 12769
-SIZE (ruby-2.4.5.tar.gz) = 14232887
+SHA256 (ruby-2.4.6.tar.gz) = 3g3ICXAjcWCZ98im/8dRURuQ3n9WlPQBtZ8tBx25EL4=
+SIZE (ruby-2.4.6.tar.gz) = 15880585
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- patches/patch-configure 31 Mar 2018 21:12:45 -0000 1.7
+++ patches/patch-configure 1 Apr 2019 19:23:16 -0000
@@ -21,7 +21,7 @@ Index: configure
if test "$FOLD"; then :
echo "$2" | fold -s -w50 |
-@@ -19583,12 +19583,12 @@ fi
+@@ -19595,12 +19595,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
-@@ -25655,7 +25655,7 @@ esac
+@@ -25667,7 +25667,7 @@ esac
openbsd*|mirbsd*) :
SOLIBS='$(LIBS)'
@@ -45,7 +45,7 @@ Index: configure
;; #(
solaris*) :
-@@ -27014,7 +27014,7 @@ _ACEOF
+@@ -27026,7 +27026,7 @@ _ACEOF
_ACEOF
else
Index: patches/patch-ext_openssl_extconf_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-ext_openssl_extconf_rb,v
retrieving revision 1.1
diff -u -p -r1.1 patch-ext_openssl_extconf_rb
--- patches/patch-ext_openssl_extconf_rb 23 Feb 2018 09:54:25 -0000
1.1
+++ patches/patch-ext_openssl_extconf_rb 1 Apr 2019 19:23:16 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-ext_openssl_extconf_rb,v
Index: ext/openssl/extconf.rb
--- ext/openssl/extconf.rb.orig
+++ ext/openssl/extconf.rb
-@@ -169,6 +169,7 @@ have_func("HMAC_CTX_free")
+@@ -179,6 +179,7 @@ have_func("HMAC_CTX_free")
OpenSSL.check_func("RAND_pseudo_bytes", "openssl/rand.h") # deprecated
have_func("X509_STORE_get_ex_data")
have_func("X509_STORE_set_ex_data")
Index: patches/patch-lib_rubygems_ext_ext_conf_builder_rb
===================================================================
RCS file:
/cvs/ports/lang/ruby/2.4/patches/patch-lib_rubygems_ext_ext_conf_builder_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_rubygems_ext_ext_conf_builder_rb
--- patches/patch-lib_rubygems_ext_ext_conf_builder_rb 24 Mar 2017 14:39:05
-0000 1.2
+++ patches/patch-lib_rubygems_ext_ext_conf_builder_rb 1 Apr 2019 19:23:16
-0000
@@ -5,9 +5,10 @@ a user uses gem install --user-install,
/usr/bin/install -o root -g bin, which fails due to permission issues.
This removes the -o root -g bin, so it can succeed as a regular user.
---- lib/rubygems/ext/ext_conf_builder.rb.orig Sun Mar 12 23:58:19 2017
-+++ lib/rubygems/ext/ext_conf_builder.rb Wed Mar 22 08:33:15 2017
-@@ -36,6 +36,11 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
+Index: lib/rubygems/ext/ext_conf_builder.rb
+--- lib/rubygems/ext/ext_conf_builder.rb.orig
++++ lib/rubygems/ext/ext_conf_builder.rb
+@@ -34,6 +34,11 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
end
@@ -17,5 +18,5 @@ This removes the -o root -g bin, so it c
+ end
+ end
- siteconf.flush
+ siteconf.close
