These are both fairly simple updates. 1.8.7p358 has only a single security patch over p357 related to preventing the SSL BEAST attack: https://github.com/ruby/ruby/commit/2cb7a6c0569cf2f1da791f21f6af4ff9bfcb97ac
1.9.3p125 also has a patch to prevent the SSL BEAST attack, along with some of our local patches being accepted upstream, and numerous other bug fixes. Tested on amd64 and i386. I plan to commit next week unless I hear negative reports. Thanks, Jeremy Index: 1.8/Makefile =================================================================== RCS file: /cvs/ports/lang/ruby/1.8/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- 1.8/Makefile 5 Jan 2012 02:09:02 -0000 1.20 +++ 1.8/Makefile 16 Feb 2012 16:30:03 -0000 @@ -7,7 +7,7 @@ COMMENT-tk= tk interface for ruby COMMENT-ri_docs= ri documentation files ruby VERSION= 1.8.7 -PATCHLEVEL= 357 +PATCHLEVEL= 358 SHARED_LIBS= ruby18 0.0 PKGNAME-main= ruby-${VERSION}.${PATCHLEVEL} Index: 1.8/distinfo =================================================================== RCS file: /cvs/ports/lang/ruby/1.8/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- 1.8/distinfo 5 Jan 2012 02:09:02 -0000 1.5 +++ 1.8/distinfo 16 Feb 2012 16:58:48 -0000 @@ -1,5 +1,5 @@ -MD5 (ruby-1.8.7-p357.tar.gz) = srgkj/UJfP1in1uXaNHfgg== -RMD160 (ruby-1.8.7-p357.tar.gz) = /6aNbOSTq5ZZLqvzXIdJg4CUHNQ= -SHA1 (ruby-1.8.7-p357.tar.gz) = 4uKSXlVHqzbKTF5AJA9PejgPvtM= -SHA256 (ruby-1.8.7-p357.tar.gz) = L9ysTrN7LroaTu85Kiki4HqSIvyG14HZIVTXFkNLliw= -SIZE (ruby-1.8.7-p357.tar.gz) = 4895136 +MD5 (ruby-1.8.7-p358.tar.gz) = Jr1VNYhHRZp3Uqzb0zpTXw== +RMD160 (ruby-1.8.7-p358.tar.gz) = T/G3td47cV0IGIo8dv1m0HQBsgQ= +SHA1 (ruby-1.8.7-p358.tar.gz) = ogpm7G19fOE7YhlBoODIxSQLWEo= +SHA256 (ruby-1.8.7-p358.tar.gz) = nghW1Ygw4I8eOCM5R9hZiYrgnUeAyxpQIQjkEwjeM8s= +SIZE (ruby-1.8.7-p358.tar.gz) = 4895206 Index: 1.9/Makefile =================================================================== RCS file: /cvs/ports/lang/ruby/1.9/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- 1.9/Makefile 2 Dec 2011 14:36:15 -0000 1.22 +++ 1.9/Makefile 16 Feb 2012 16:17:39 -0000 @@ -7,7 +7,7 @@ COMMENT-tk = tk interface for ruby COMMENT-ri_docs = ri documentation files for ruby VERSION = 1.9.3 -PATCHLEVEL = 0 +PATCHLEVEL = 125 RUBYLIBREV = 1.9.1 SHARED_LIBS = ruby19 1.0 @@ -16,9 +16,6 @@ PKGNAME-gdbm = ruby-gdbm-${VERSION}.${P PKGNAME-dbm = ruby-dbm-${VERSION}.${PATCHLEVEL} PKGNAME-tk = ruby-tk-${VERSION}.${PATCHLEVEL} PKGNAME-ri_docs = ruby-ri_docs-${VERSION}.${PATCHLEVEL} - -REVISION-main = 0 -REVISION-ri_docs= 0 PKG_ARCH-ri_docs= * Index: 1.9/distinfo =================================================================== RCS file: /cvs/ports/lang/ruby/1.9/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- 1.9/distinfo 8 Nov 2011 23:38:57 -0000 1.5 +++ 1.9/distinfo 16 Feb 2012 16:18:12 -0000 @@ -1,5 +1,5 @@ -MD5 (ruby-1.9.3-p0.tar.gz) = ji/vVhhc+68p0Mgyn8d8BQ== -RMD160 (ruby-1.9.3-p0.tar.gz) = HSOFrKIMfLxONUNucVc01QK/gwg= -SHA1 (ruby-1.9.3-p0.tar.gz) = 9875rSgIofUiQnyRFkFpc7n8rxo= -SHA256 (ruby-1.9.3-p0.tar.gz) = O5EAQuNWH0KW/ZXZa/MDIuU+7PCDmS5QQqdoBpjPo04= -SIZE (ruby-1.9.3-p0.tar.gz) = 12223217 +MD5 (ruby-1.9.3-p125.tar.gz) = dqrZAMGCOm+qUVG2mrJcCg== +RMD160 (ruby-1.9.3-p125.tar.gz) = EQVonW0NYhlBmI0JxUCf7wyQjWc= +SHA1 (ruby-1.9.3-p125.tar.gz) = gPvi1ISTzngWGYsRTuOfHH0v6RE= +SHA256 (ruby-1.9.3-p125.tar.gz) = 73eZ7UntYSt0n48H9ZeInTxs9DLNbT+MDhp5bMQbKfQ= +SIZE (ruby-1.9.3-p125.tar.gz) = 12128778 Index: 1.9/patches/patch-common_mk =================================================================== RCS file: /cvs/ports/lang/ruby/1.9/patches/patch-common_mk,v retrieving revision 1.3 diff -u -p -r1.3 patch-common_mk --- 1.9/patches/patch-common_mk 15 Nov 2011 00:04:15 -0000 1.3 +++ 1.9/patches/patch-common_mk 16 Feb 2012 16:20:52 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-common_mk,v 1.3 2011/11/ Don't regenerate rdoc documentation during install. ---- common.mk.orig Mon Nov 14 05:01:15 2011 -+++ common.mk Mon Nov 14 05:01:18 2011 -@@ -393,7 +393,7 @@ dont-install-man: $(PREP) +--- common.mk.orig Mon Feb 6 04:53:11 2012 ++++ common.mk Thu Feb 16 08:18:24 2012 +@@ -394,7 +394,7 @@ dont-install-man: $(PREP) post-no-install-man:: @$(NULLCMD) Index: 1.9/patches/patch-configure =================================================================== RCS file: /cvs/ports/lang/ruby/1.9/patches/patch-configure,v retrieving revision 1.5 diff -u -p -r1.5 patch-configure --- 1.9/patches/patch-configure 8 Nov 2011 23:38:57 -0000 1.5 +++ 1.9/patches/patch-configure 16 Feb 2012 16:21:16 -0000 @@ -1,13 +1,13 @@ $OpenBSD: patch-configure,v 1.5 2011/11/08 23:38:57 jeremy Exp $ -Fix so name, checking for DOT and DOXYGEN, and use -pthread. +Fix so name, checking for DOT and DOXYGEN. Override the arch setting to remove OpenBSD version from it, so ports don't have to be bumped when OpenBSD version changes. ---- configure.orig Sun Oct 30 02:55:52 2011 -+++ configure Sun Oct 30 19:07:09 2011 -@@ -15503,13 +15503,13 @@ fi +--- configure.orig Thu Feb 16 01:04:54 2012 ++++ configure Thu Feb 16 08:18:24 2012 +@@ -15563,13 +15563,13 @@ fi if test x"$enable_pthread" = xyes; then for pthread_lib in thr pthread pthreads c c_r root; do as_ac_Lib=`$as_echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh` @@ -24,16 +24,7 @@ so ports don't have to be bumped when Op cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -15576,7 +15576,7 @@ done - c_r) : - MAINLIBS="-pthread $MAINLIBS" ;; #( - *) : -- LIBS="-l$pthread_lib $LIBS" ;; -+ LIBS="-pthread $LIBS" ;; - esac - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Don't know how to find pthread library on your system -- thread support disabled\"" >&5 -@@ -16568,7 +16568,7 @@ case "$enable_shared" in #( +@@ -16633,7 +16633,7 @@ case "$enable_shared" in #( openbsd*) : SOLIBS='$(LIBS)' @@ -42,7 +33,7 @@ so ports don't have to be bumped when Op ;; #( solaris*) : -@@ -17390,7 +17390,10 @@ _ACEOF +@@ -17455,7 +17455,10 @@ _ACEOF _ACEOF else Index: 1.9/patches/patch-test_ruby_test_process_rb =================================================================== RCS file: 1.9/patches/patch-test_ruby_test_process_rb diff -N 1.9/patches/patch-test_ruby_test_process_rb --- 1.9/patches/patch-test_ruby_test_process_rb 8 Nov 2011 23:38:57 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-test_ruby_test_process_rb,v 1.3 2011/11/08 23:38:57 jeremy Exp $ ---- test/ruby/test_process.rb.orig Wed Jul 27 17:16:58 2011 -+++ test/ruby/test_process.rb Wed Jul 27 17:17:00 2011 -@@ -61,7 +61,7 @@ class TestProcess < Test::Unit::TestCase - write_file 's', <<-"End" - result = 1 - begin -- Process.setrlimit(Process::RLIMIT_NOFILE, 0) -+ Process.setrlimit(Process::RLIMIT_NOFILE, 1) - rescue Errno::EINVAL - result = 0 - end Index: 1.9/patches/patch-thread_pthread_c =================================================================== RCS file: 1.9/patches/patch-thread_pthread_c diff -N 1.9/patches/patch-thread_pthread_c --- 1.9/patches/patch-thread_pthread_c 9 Nov 2011 19:23:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -$OpenBSD: patch-thread_pthread_c,v 1.1 2011/11/09 19:23:35 jeremy Exp $ - -Backport svn revision 33693, fixes bootstrap thread test failure. - ---- thread_pthread.c.orig Thu Sep 22 03:45:23 2011 -+++ thread_pthread.c Wed Nov 9 09:37:52 2011 -@@ -109,16 +109,13 @@ gvl_yield(rb_vm_t *vm, rb_thread_t *th) - goto acquire; - } - -- vm->gvl.wait_yield = 1; -- -- if (vm->gvl.waiting > 0) -- vm->gvl.need_yield = 1; -- -- if (vm->gvl.need_yield) { -+ if (vm->gvl.waiting > 0) { - /* Wait until another thread task take GVL. */ -- while (vm->gvl.need_yield) { -+ vm->gvl.need_yield = 1; -+ vm->gvl.wait_yield = 1; -+ while (vm->gvl.need_yield) - native_cond_wait(&vm->gvl.switch_cond, &vm->gvl.lock); -- } -+ vm->gvl.wait_yield = 0; - } - else { - native_mutex_unlock(&vm->gvl.lock); -@@ -126,7 +123,6 @@ gvl_yield(rb_vm_t *vm, rb_thread_t *th) - native_mutex_lock(&vm->gvl.lock); - } - -- vm->gvl.wait_yield = 0; - native_cond_broadcast(&vm->gvl.switch_wait_cond); - acquire: - gvl_acquire_common(vm); Index: 1.9/pkg/PLIST-ri_docs =================================================================== RCS file: /cvs/ports/lang/ruby/1.9/pkg/PLIST-ri_docs,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-ri_docs --- 1.9/pkg/PLIST-ri_docs 8 Nov 2011 23:38:57 -0000 1.1 +++ 1.9/pkg/PLIST-ri_docs 16 Feb 2012 16:43:20 -0000 @@ -1756,6 +1756,7 @@ share/ri/${RUBYLIBREV}/system/Encoding/ share/ri/${RUBYLIBREV}/system/Encoding/CompatibilityError/ share/ri/${RUBYLIBREV}/system/Encoding/CompatibilityError/cdesc-CompatibilityError.ri share/ri/${RUBYLIBREV}/system/Encoding/Converter/ +share/ri/${RUBYLIBREV}/system/Encoding/Converter/%3d%3d-i.ri share/ri/${RUBYLIBREV}/system/Encoding/Converter/asciicompat_encoding-c.ri share/ri/${RUBYLIBREV}/system/Encoding/Converter/cdesc-Converter.ri share/ri/${RUBYLIBREV}/system/Encoding/Converter/convert-i.ri @@ -6350,17 +6351,14 @@ share/ri/${RUBYLIBREV}/system/OpenSSL/Ci share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/Cipher/cdesc-Cipher.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/CipherError/ share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/CipherError/cdesc-CipherError.ri -share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/block_size-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/cdesc-Cipher.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/ciphers-c.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/decrypt-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/encrypt-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/final-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/iv%3d-i.ri -share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/iv_len-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/key%3d-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/key_len%3d-i.ri -share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/key_len-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/name-i.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/new-c.ri share/ri/${RUBYLIBREV}/system/OpenSSL/Cipher/padding%3d-i.ri @@ -7672,6 +7670,7 @@ share/ri/${RUBYLIBREV}/system/Psych/Node share/ri/${RUBYLIBREV}/system/Psych/Nodes/Node/to_ruby-i.ri share/ri/${RUBYLIBREV}/system/Psych/Nodes/Node/to_yaml-i.ri share/ri/${RUBYLIBREV}/system/Psych/Nodes/Node/transform-i.ri +share/ri/${RUBYLIBREV}/system/Psych/Nodes/Node/yaml-i.ri share/ri/${RUBYLIBREV}/system/Psych/Nodes/Scalar/ share/ri/${RUBYLIBREV}/system/Psych/Nodes/Scalar/anchor-i.ri share/ri/${RUBYLIBREV}/system/Psych/Nodes/Scalar/cdesc-Scalar.ri @@ -7780,6 +7779,7 @@ share/ri/${RUBYLIBREV}/system/Psych/Visi share/ri/${RUBYLIBREV}/system/Psych/Visitors/YAMLTree/ share/ri/${RUBYLIBREV}/system/Psych/Visitors/YAMLTree/%3c%3c-i.ri share/ri/${RUBYLIBREV}/system/Psych/Visitors/YAMLTree/accept-i.ri +share/ri/${RUBYLIBREV}/system/Psych/Visitors/YAMLTree/binary%3f-i.ri share/ri/${RUBYLIBREV}/system/Psych/Visitors/YAMLTree/cdesc-YAMLTree.ri share/ri/${RUBYLIBREV}/system/Psych/Visitors/YAMLTree/dump_coder-i.ri share/ri/${RUBYLIBREV}/system/Psych/Visitors/YAMLTree/dump_ivars-i.ri @@ -9363,6 +9363,7 @@ share/ri/${RUBYLIBREV}/system/REXML/Pars share/ri/${RUBYLIBREV}/system/REXML/Parsers/BaseParser/peek-i.ri share/ri/${RUBYLIBREV}/system/REXML/Parsers/BaseParser/position-i.ri share/ri/${RUBYLIBREV}/system/REXML/Parsers/BaseParser/pull-i.ri +share/ri/${RUBYLIBREV}/system/REXML/Parsers/BaseParser/pull_event-i.ri share/ri/${RUBYLIBREV}/system/REXML/Parsers/BaseParser/source-i.ri share/ri/${RUBYLIBREV}/system/REXML/Parsers/BaseParser/stream%3d-i.ri share/ri/${RUBYLIBREV}/system/REXML/Parsers/BaseParser/unnormalize-i.ri @@ -11247,12 +11248,6 @@ share/ri/${RUBYLIBREV}/system/RSS/Taxono share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicModel/cdesc-TaxonomyTopicModel.ri share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/ share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/ -share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/Bag/ -share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/Bag/cdesc-Bag.ri -share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/Bag/full_name-i.ri -share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/Bag/new-c.ri -share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/Bag/required_uri-c.ri -share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/Bag/setup_maker-i.ri share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/cdesc-TaxonomyTopics.ri share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/full_name-i.ri share/ri/${RUBYLIBREV}/system/RSS/TaxonomyTopicsModel/TaxonomyTopics/maker_target-i.ri