Thursday, September 14, 2017

ruby security releases

Ruby 2.2.8, 2.3.5, and 2.4.2 were released today. 2.3.5 and 2.4.2
contain bugfixes, and all three versions fix security issues.
See the following release announcements:

https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/
https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-3-5-released/
https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-2-8-released/

Below is a diff for upgrading to these versions. I'll be working
on backporting the security fixes to 2.1 and 1.8 when I have time.

Unfortunately, functions were removed or changed in the shared library
in both 2.3.5 and 2.4.2, so the major was bumped for both. 2.2.8 only
includes the security fixes and does not need a bump.

Tested briefly on amd64. I'll be committing tomorrow after further
testing unless I hear objections.

Regen patches while here.

Thanks,
Jeremy

Index: 2.2/Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.2/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- 2.2/Makefile 2 Sep 2017 21:29:47 -0000 1.21
+++ 2.2/Makefile 14 Sep 2017 19:27:59 -0000
@@ -5,7 +5,7 @@ COMMENT-gdbm = gdbm interface for ruby
COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby

-VERSION = 2.2.7
+VERSION = 2.2.8
RUBYLIBREV = 2.2
DISTNAME = ruby-${VERSION}

@@ -17,12 +17,6 @@ PKGNAME-ri_docs = ruby22-ri_docs-${VERSI

PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty
-
-PATCHFILES = 6690/rubygems-2613-ruby22.patch:0
-
-MASTER_SITES0 = https://bugs.ruby-lang.org/attachments/download/
-
-REVISION-main = 0

NEXTVER = 2.3
PKGSPEC-main = ruby->=${RUBYLIBREV},<${NEXTVER}
Index: 2.2/distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.2/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- 2.2/distinfo 2 Sep 2017 21:29:47 -0000 1.9
+++ 2.2/distinfo 14 Sep 2017 19:28:14 -0000
@@ -1,4 +1,2 @@
-SHA256 (6690/rubygems-2613-ruby22.patch) = 0KjFVSrETYvJhb768SKIJj+iSFFrQb7em+tltIM05uM=
-SHA256 (ruby-2.2.7.tar.gz) = N0GExsW7yI+3utQiNo1AU6I2+2WH8O/3YUbculf5PaU=
-SIZE (6690/rubygems-2613-ruby22.patch) = 11094
-SIZE (ruby-2.2.7.tar.gz) = 16678101
+SHA256 (ruby-2.2.8.tar.gz) = jze52FOL+OUK0JjbKnFupJWFrRYBu9NH74TKBmLZJoo=
+SIZE (ruby-2.2.8.tar.gz) = 16681654
Index: 2.2/patches/patch-compile_c
===================================================================
RCS file: /cvs/ports/lang/ruby/2.2/patches/patch-compile_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-compile_c
--- 2.2/patches/patch-compile_c 19 Nov 2016 04:55:26 -0000 1.2
+++ 2.2/patches/patch-compile_c 14 Sep 2017 19:28:38 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-compile_c,v 1.2 2016/11/

Disable peephole optimizer on sparc64, since it occasionally segfaults.

---- compile.c.orig Tue Aug 16 05:14:41 2016
-+++ compile.c Tue Nov 15 08:00:46 2016
-@@ -1865,6 +1865,9 @@ static int
+Index: compile.c
+--- compile.c.orig
++++ compile.c
+@@ -1866,6 +1866,9 @@ static int
iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
{
INSN *iobj = (INSN *)list;
Index: 2.2/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.2/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- 2.2/patches/patch-configure 19 Nov 2016 04:55:26 -0000 1.2
+++ 2.2/patches/patch-configure 14 Sep 2017 19:28:38 -0000
@@ -5,9 +5,10 @@ Fix so name, checking for DOT and DOXYGE
Override the arch setting to remove OpenBSD version from it,
so ports don't have to be bumped when OpenBSD version changes.

---- configure.orig Mon Apr 25 21:51:48 2016
-+++ configure Tue Jul 12 11:24:45 2016
-@@ -22475,7 +22475,7 @@ esac
+Index: configure
+--- configure.orig
++++ configure
+@@ -22534,7 +22534,7 @@ esac
openbsd*|mirbsd*) :

SOLIBS='$(LIBS)'
@@ -16,7 +17,7 @@ so ports don't have to be bumped when Op
;; #(
solaris*) :

-@@ -23741,7 +23741,7 @@ _ACEOF
+@@ -23800,7 +23800,7 @@ _ACEOF
_ACEOF

else
Index: 2.2/patches/patch-lib_fileutils_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.2/patches/patch-lib_fileutils_rb,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_fileutils_rb
--- 2.2/patches/patch-lib_fileutils_rb 8 Jan 2015 18:48:32 -0000 1.1.1.1
+++ 2.2/patches/patch-lib_fileutils_rb 14 Sep 2017 19:28:38 -0000
@@ -4,8 +4,9 @@ Make FileUtils.mkdir_p act more like mkd
to create directories that already exist. This fixes systrace
warnings when building ports.

---- lib/fileutils.rb.orig Mon Aug 11 21:36:31 2014
-+++ lib/fileutils.rb Thu Sep 18 17:48:55 2014
+Index: lib/fileutils.rb
+--- lib/fileutils.rb.orig
++++ lib/fileutils.rb
@@ -210,7 +210,7 @@ module FileUtils
list.map {|path| remove_tailing_slash(path)}.each do |path|
# optimize for the most common case
@@ -15,8 +16,8 @@ warnings when building ports.
next
rescue SystemCallError
next if File.directory?(path)
-@@ -223,7 +223,7 @@ module FileUtils
- end
+@@ -224,7 +224,7 @@ module FileUtils
+ stack.pop # root directory should exist
stack.reverse_each do |dir|
begin
- fu_mkdir dir, options[:mode]
Index: 2.2/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ruby/2.2/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- 2.2/pkg/PLIST-main 19 Nov 2016 04:55:26 -0000 1.5
+++ 2.2/pkg/PLIST-main 14 Sep 2017 19:41:06 -0000
@@ -1215,8 +1215,8 @@ lib/ruby/gems/${RUBYLIBREV}/specificatio
lib/ruby/gems/${RUBYLIBREV}/specifications/default/
lib/ruby/gems/${RUBYLIBREV}/specifications/default/bigdecimal-1.2.6.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/io-console-0.4.3.gemspec
-lib/ruby/gems/${RUBYLIBREV}/specifications/default/json-1.8.1.gemspec
-lib/ruby/gems/${RUBYLIBREV}/specifications/default/psych-2.0.8.gemspec
+lib/ruby/gems/${RUBYLIBREV}/specifications/default/json-1.8.1.1.gemspec
+lib/ruby/gems/${RUBYLIBREV}/specifications/default/psych-2.0.8.1.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/rake-10.4.2.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/rdoc-4.2.0.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/minitest-5.4.3.gemspec
Index: 2.3/Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- 2.3/Makefile 2 Sep 2017 21:29:47 -0000 1.18
+++ 2.3/Makefile 14 Sep 2017 15:34:54 -0000
@@ -5,11 +5,11 @@ COMMENT-gdbm = gdbm interface for ruby
COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby

-VERSION = 2.3.4
+VERSION = 2.3.5
RUBYLIBREV = 2.3
DISTNAME = ruby-${VERSION}

-SHARED_LIBS = ruby23 1.0
+SHARED_LIBS = ruby23 2.0
PKGNAME-main = ruby-${VERSION}
PKGNAME-gdbm = ruby23-gdbm-${VERSION}
PKGNAME-tk = ruby23-tk-${VERSION}
@@ -17,12 +17,6 @@ PKGNAME-ri_docs = ruby23-ri_docs-${VERSI

PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty
-
-PATCHFILES = 6691/rubygems-2613-ruby23.patch:0
-
-MASTER_SITES0 = https://bugs.ruby-lang.org/attachments/download/
-
-REVISION-main = 0

NEXTVER = 2.4
PKGSPEC-main = ruby->=${RUBYLIBREV},<${NEXTVER}
Index: 2.3/distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- 2.3/distinfo 2 Sep 2017 21:29:47 -0000 1.6
+++ 2.3/distinfo 14 Sep 2017 15:35:08 -0000
@@ -1,4 +1,2 @@
-SHA256 (6691/rubygems-2613-ruby23.patch) = UQVnpD1X6pyMdDaxTnjQpNMzgPQQRD3PNQuYZ8l0V0g=
-SHA256 (ruby-2.3.4.tar.gz) = mOGPF8kzMY0OMv7TrqZ+ME8XTQMXCjj9kgxPvkn+wMM=
-SIZE (6691/rubygems-2613-ruby23.patch) = 11119
-SIZE (ruby-2.3.4.tar.gz) = 17820518
+SHA256 (ruby-2.3.5.tar.gz) = VGL3u7KL7/XadEGWhHHtki+WTbGr3OgriGBgiswj3cw=
+SIZE (ruby-2.3.5.tar.gz) = 17836997
Index: 2.3/patches/patch-compile_c
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/patches/patch-compile_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-compile_c
--- 2.3/patches/patch-compile_c 19 Nov 2016 04:56:00 -0000 1.2
+++ 2.3/patches/patch-compile_c 14 Sep 2017 15:35:28 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-compile_c,v 1.2 2016/11/

Disable peephole optimizer on sparc64, since it occasionally segfaults.

---- compile.c.orig Fri Nov 11 07:35:29 2016
-+++ compile.c Tue Nov 15 07:42:22 2016
-@@ -2004,6 +2004,9 @@ static int
+Index: compile.c
+--- compile.c.orig
++++ compile.c
+@@ -2006,6 +2006,9 @@ static int
iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
{
INSN *iobj = (INSN *)list;
Index: 2.3/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- 2.3/patches/patch-configure 19 Nov 2016 04:56:00 -0000 1.2
+++ 2.3/patches/patch-configure 14 Sep 2017 15:35:28 -0000
@@ -5,9 +5,10 @@ Fix so name, checking for DOT and DOXYGE
Override the arch setting to remove OpenBSD version from it,
so ports don't have to be bumped when OpenBSD version changes.

---- configure.orig Mon Apr 25 11:08:47 2016
-+++ configure Tue Jul 12 11:14:12 2016
-@@ -23605,7 +23605,7 @@ esac
+Index: configure
+--- configure.orig
++++ configure
+@@ -23698,7 +23698,7 @@ esac
openbsd*|mirbsd*) :

SOLIBS='$(LIBS)'
@@ -16,7 +17,7 @@ so ports don't have to be bumped when Op
;; #(
solaris*) :

-@@ -24852,7 +24852,7 @@ _ACEOF
+@@ -24931,7 +24931,7 @@ _ACEOF
_ACEOF

else
Index: 2.3/patches/patch-lib_fileutils_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/patches/patch-lib_fileutils_rb,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_fileutils_rb
--- 2.3/patches/patch-lib_fileutils_rb 7 Jan 2016 00:52:46 -0000 1.1.1.1
+++ 2.3/patches/patch-lib_fileutils_rb 14 Sep 2017 15:35:28 -0000
@@ -4,8 +4,9 @@ Make FileUtils.mkdir_p act more like mkd
to create directories that already exist. This fixes systrace
warnings when building ports.

---- lib/fileutils.rb.orig Tue Dec 15 21:07:31 2015
-+++ lib/fileutils.rb Sat Dec 26 13:11:04 2015
+Index: lib/fileutils.rb
+--- lib/fileutils.rb.orig
++++ lib/fileutils.rb
@@ -211,7 +211,7 @@ module FileUtils
list.map {|path| remove_trailing_slash(path)}.each do |path|
# optimize for the most common case
@@ -15,8 +16,8 @@ warnings when building ports.
next
rescue SystemCallError
next if File.directory?(path)
-@@ -224,7 +224,7 @@ module FileUtils
- end
+@@ -225,7 +225,7 @@ module FileUtils
+ stack.pop # root directory should exist
stack.reverse_each do |dir|
begin
- fu_mkdir dir, options[:mode]
Index: 2.3/patches/patch-test_ruby_test_io_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/patches/patch-test_ruby_test_io_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-test_ruby_test_io_rb
--- 2.3/patches/patch-test_ruby_test_io_rb 19 Nov 2016 04:56:00 -0000 1.2
+++ 2.3/patches/patch-test_ruby_test_io_rb 14 Sep 2017 15:35:28 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-test_ruby_test_io_rb,v 1

Work around pthread fifo fdlock bug.

---- test/ruby/test_io.rb.orig Fri Nov 4 20:01:30 2016
-+++ test/ruby/test_io.rb Tue Nov 15 07:42:22 2016
-@@ -3249,7 +3249,7 @@ End
+Index: test/ruby/test_io.rb
+--- test/ruby/test_io.rb.orig
++++ test/ruby/test_io.rb
+@@ -3271,7 +3271,7 @@ End
File.mkfifo("fifo")
assert_separately([], <<-'EOS')
t1 = Thread.new {
Index: 2.3/patches/patch-test_ruby_test_process_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/patches/patch-test_ruby_test_process_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-test_ruby_test_process_rb
--- 2.3/patches/patch-test_ruby_test_process_rb 19 Nov 2016 04:56:00 -0000 1.2
+++ 2.3/patches/patch-test_ruby_test_process_rb 14 Sep 2017 15:35:28 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-test_ruby_test_process_r

Work around pthread fifo fdlock bug.

---- test/ruby/test_process.rb.orig Fri Nov 11 07:26:06 2016
-+++ test/ruby/test_process.rb Tue Nov 15 07:42:22 2016
-@@ -613,7 +613,7 @@ class TestProcess < Test::Unit::TestCase
+Index: test/ruby/test_process.rb
+--- test/ruby/test_process.rb.orig
++++ test/ruby/test_process.rb
+@@ -633,7 +633,7 @@ class TestProcess < Test::Unit::TestCase
_, v2 = assert_join_threads([t1, t2])
assert_equal("output to fifo\n", v2)
}
Index: 2.3/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- 2.3/pkg/PLIST-main 19 Nov 2016 04:56:00 -0000 1.4
+++ 2.3/pkg/PLIST-main 14 Sep 2017 15:44:29 -0000
@@ -1418,8 +1418,8 @@ lib/ruby/gems/${RUBYLIBREV}/specificatio
lib/ruby/gems/${RUBYLIBREV}/specifications/default/
lib/ruby/gems/${RUBYLIBREV}/specifications/default/bigdecimal-1.2.8.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/io-console-0.4.5.gemspec
-lib/ruby/gems/${RUBYLIBREV}/specifications/default/json-1.8.3.gemspec
-lib/ruby/gems/${RUBYLIBREV}/specifications/default/psych-2.1.0.gemspec
+lib/ruby/gems/${RUBYLIBREV}/specifications/default/json-1.8.3.1.gemspec
+lib/ruby/gems/${RUBYLIBREV}/specifications/default/psych-2.1.0.1.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/rdoc-4.2.1.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/did_you_mean-1.0.0.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/minitest-5.8.5.gemspec
Index: 2.3/pkg/PLIST-ri_docs
===================================================================
RCS file: /cvs/ports/lang/ruby/2.3/pkg/PLIST-ri_docs,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-ri_docs
--- 2.3/pkg/PLIST-ri_docs 7 Apr 2017 21:14:17 -0000 1.4
+++ 2.3/pkg/PLIST-ri_docs 14 Sep 2017 19:04:00 -0000
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST-ri_docs,v 1.4 2017/04/07 21:14:17 jeremy Exp $
share/ri/
share/ri/${RUBYLIBREV}/
share/ri/${RUBYLIBREV}/system/
@@ -2704,6 +2703,7 @@ share/ri/${RUBYLIBREV}/system/Gem/Instal
share/ri/${RUBYLIBREV}/system/Gem/Installer/spec-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Installer/spec_file-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Installer/unpack-i.ri
+share/ri/${RUBYLIBREV}/system/Gem/Installer/verify_spec_name-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Installer/windows_stub_script-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Installer/wrappers-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Installer/write_build_info_file-i.ri
@@ -3871,8 +3871,10 @@ share/ri/${RUBYLIBREV}/system/Gem/TestCa
share/ri/${RUBYLIBREV}/system/Gem/TestCase/write_file-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Text/
share/ri/${RUBYLIBREV}/system/Gem/Text/cdesc-Text.ri
+share/ri/${RUBYLIBREV}/system/Gem/Text/clean_text-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Text/format_text-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Text/levenshtein_distance-i.ri
+share/ri/${RUBYLIBREV}/system/Gem/Text/truncate_text-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Uninstaller/
share/ri/${RUBYLIBREV}/system/Gem/Uninstaller/bin_dir-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Uninstaller/cdesc-Uninstaller.ri
@@ -5609,45 +5611,8 @@ share/ri/${RUBYLIBREV}/system/Net/HTTPHe
share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/%5b%5d%3d-i.ri
share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/%5b%5d-i.ri
share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/add_field-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/basic_auth-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/basic_encode-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/canonical_each-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/capitalize-i.ri
share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/cdesc-HTTPHeader.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/chunked%3f-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/connection_close%3f-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/connection_keep_alive%3f-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/content_length%3d-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/content_length-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/content_range-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/content_type%3d-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/content_type-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/delete-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/each-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/each_capitalized-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/each_capitalized_name-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/each_header-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/each_key-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/each_name-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/each_value-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/fetch-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/form_data%3d-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/get_fields-i.ri
share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/initialize_http_header-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/key%3f-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/main_type-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/proxy_basic_auth-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/range%3d-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/range-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/range_length-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/set_content_type-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/set_form-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/set_form_data-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/set_range-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/sub_type-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/to_hash-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/tokens-i.ri
-share/ri/${RUBYLIBREV}/system/Net/HTTPHeader/type_params-i.ri
share/ri/${RUBYLIBREV}/system/Net/HTTPHeaderSyntaxError/
share/ri/${RUBYLIBREV}/system/Net/HTTPHeaderSyntaxError/cdesc-HTTPHeaderSyntaxError.ri
share/ri/${RUBYLIBREV}/system/Net/HTTPIMUsed/
@@ -6118,6 +6083,7 @@ share/ri/${RUBYLIBREV}/system/Net/SMTP/s
share/ri/${RUBYLIBREV}/system/Net/SMTP/tcp_socket-i.ri
share/ri/${RUBYLIBREV}/system/Net/SMTP/tls%3f-i.ri
share/ri/${RUBYLIBREV}/system/Net/SMTP/tlsconnect-i.ri
+share/ri/${RUBYLIBREV}/system/Net/SMTP/validate_line-i.ri
share/ri/${RUBYLIBREV}/system/Net/SMTPAuthenticationError/
share/ri/${RUBYLIBREV}/system/Net/SMTPAuthenticationError/cdesc-SMTPAuthenticationError.ri
share/ri/${RUBYLIBREV}/system/Net/SMTPError/
@@ -9955,7 +9921,6 @@ share/ri/${RUBYLIBREV}/system/REXML/Func
share/ri/${RUBYLIBREV}/system/REXML/Functions/lang-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/last-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/local_name-c.ri
-share/ri/${RUBYLIBREV}/system/REXML/Functions/method_missing-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/name-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/namespace_context%3d-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/namespace_context-c.ri
@@ -9966,6 +9931,8 @@ share/ri/${RUBYLIBREV}/system/REXML/Func
share/ri/${RUBYLIBREV}/system/REXML/Functions/position-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/processing_instruction-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/round-c.ri
+share/ri/${RUBYLIBREV}/system/REXML/Functions/send-c.ri
+share/ri/${RUBYLIBREV}/system/REXML/Functions/singleton_method_added-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/starts_with-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/string-c.ri
share/ri/${RUBYLIBREV}/system/REXML/Functions/string_length-c.ri
Index: 2.4/Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- 2.4/Makefile 2 Sep 2017 21:29:47 -0000 1.5
+++ 2.4/Makefile 14 Sep 2017 15:02:47 -0000
@@ -4,24 +4,17 @@ COMMENT-main = object oriented script l
COMMENT-gdbm = gdbm interface for ruby
COMMENT-ri_docs = ri documentation files for ruby

-VERSION = 2.4.1
+VERSION = 2.4.2
RUBYLIBREV = 2.4
DISTNAME = ruby-${VERSION}

-SHARED_LIBS = ruby24 1.0
+SHARED_LIBS = ruby24 2.0
PKGNAME-main = ruby-${VERSION}
PKGNAME-gdbm = ruby24-gdbm-${VERSION}
PKGNAME-ri_docs = ruby24-ri_docs-${VERSION}

PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty
-
-PATCHFILES = 6692/rubygems-2612-ruby24.patch:0 \
- 6693/rubygems-2613-ruby24.patch:0
-
-MASTER_SITES0 = https://bugs.ruby-lang.org/attachments/download/
-
-REVISION-main = 1

NEXTVER = 2.5
PKGSPEC-main = ruby->=${RUBYLIBREV},<${NEXTVER}
Index: 2.4/distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- 2.4/distinfo 2 Sep 2017 21:29:47 -0000 1.3
+++ 2.4/distinfo 14 Sep 2017 15:03:33 -0000
@@ -1,6 +1,2 @@
-SHA256 (6692/rubygems-2612-ruby24.patch) = JRJCDsaq1YbG++gN/DLn7FcaAWjJDkUa0CK0QyAqtKk=
-SHA256 (6693/rubygems-2613-ruby24.patch) = ZndonZkeB63yY1XkBFo72ersoHaUkoZEwoK9BewTBg0=
-SHA256 (ruby-2.4.1.tar.gz) = ozDhDVy15Ts6AHgybFcxiIu1XjLEq/6yfZ5/jl0AAlA=
-SIZE (6692/rubygems-2612-ruby24.patch) = 13536
-SIZE (6693/rubygems-2613-ruby24.patch) = 11119
-SIZE (ruby-2.4.1.tar.gz) = 14174752
+SHA256 (ruby-2.4.2.tar.gz) = k7nnXgCyYrxN72smt66HF+/CUsRxVKu3OS5UNX5sjJw=
+SIZE (ruby-2.4.2.tar.gz) = 14187859
Index: 2.4/patches/patch-compile_c
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-compile_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-compile_c
--- 2.4/patches/patch-compile_c 24 Mar 2017 14:39:05 -0000 1.2
+++ 2.4/patches/patch-compile_c 14 Sep 2017 15:03:52 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-compile_c,v 1.2 2017/03/

Disable peephole optimizer on sparc64, since it occasionally segfaults.

---- compile.c.orig Sat Mar 11 08:29:51 2017
-+++ compile.c Wed Mar 22 08:33:15 2017
-@@ -2048,6 +2048,9 @@ static int
+Index: compile.c
+--- compile.c.orig
++++ compile.c
+@@ -2068,6 +2068,9 @@ static int
iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
{
INSN *iobj = (INSN *)list;
Index: 2.4/patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- 2.4/patches/patch-configure 18 Apr 2017 17:09:26 -0000 1.4
+++ 2.4/patches/patch-configure 14 Sep 2017 15:03:52 -0000
@@ -9,8 +9,9 @@ Rename HEAP_ALIGN_LOG to HEAP_PAGE_ALIGN
operating system page size as GC heap page size (as was true
in earlier ruby versions).

---- configure.orig Tue Mar 21 22:56:10 2017
-+++ configure Fri Apr 14 16:15:30 2017
+Index: configure
+--- configure.orig
++++ configure
@@ -424,7 +424,7 @@ if test -z "$2"; then :

else
@@ -20,7 +21,7 @@ in earlier ruby versions).
if test "$FOLD"; then :

echo "$2" | fold -s -w50 |
-@@ -19464,12 +19464,12 @@ fi
+@@ -19573,12 +19573,12 @@ fi
colorize_result "$rb_cv_page_size_log" ; }
if test $rb_cv_page_size_log != no; then
cat >>confdefs.h <<_ACEOF
@@ -35,7 +36,7 @@ in earlier ruby versions).
_ACEOF

fi
-@@ -25601,7 +25601,7 @@ esac
+@@ -25645,7 +25645,7 @@ esac
openbsd*|mirbsd*) :

SOLIBS='$(LIBS)'
@@ -44,7 +45,7 @@ in earlier ruby versions).
;; #(
solaris*) :

-@@ -26974,7 +26974,7 @@ _ACEOF
+@@ -27004,7 +27004,7 @@ _ACEOF
_ACEOF

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.2
diff -u -p -r1.2 patch-include_ruby_ruby_h
--- 2.4/patches/patch-include_ruby_ruby_h 24 Mar 2017 14:39:05 -0000 1.2
+++ 2.4/patches/patch-include_ruby_ruby_h 14 Sep 2017 15:03:52 -0000
@@ -3,9 +3,10 @@ $OpenBSD: patch-include_ruby_ruby_h,v 1.
Fix GCC error: #pragma GCC diagnostic not allowed inside functions
when compiling some extensions.

---- include/ruby/ruby.h.orig Mon Mar 13 00:30:30 2017
-+++ include/ruby/ruby.h Wed Mar 22 08:33:15 2017
-@@ -2196,7 +2196,7 @@ ERRORFUNC(("variable argument length doesn't match"),
+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"),
# define rb_scan_args_verify_count(fmt, varc) \
((varc)/(rb_scan_args_count(fmt, varc)))

Index: 2.4/patches/patch-lib_fileutils_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-lib_fileutils_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_fileutils_rb
--- 2.4/patches/patch-lib_fileutils_rb 24 Mar 2017 14:39:05 -0000 1.2
+++ 2.4/patches/patch-lib_fileutils_rb 14 Sep 2017 15:03:52 -0000
@@ -4,8 +4,9 @@ Make FileUtils.mkdir_p act more like mkd
to create directories that already exist. This fixes systrace
warnings when building ports.

---- lib/fileutils.rb.orig Sun Mar 12 11:01:40 2017
-+++ lib/fileutils.rb Wed Mar 22 08:33:15 2017
+Index: lib/fileutils.rb
+--- lib/fileutils.rb.orig
++++ lib/fileutils.rb
@@ -191,7 +191,7 @@ module FileUtils
list.map {|path| remove_trailing_slash(path)}.each do |path|
# optimize for the most common case
@@ -15,8 +16,8 @@ warnings when building ports.
next
rescue SystemCallError
next if File.directory?(path)
-@@ -204,7 +204,7 @@ module FileUtils
- end
+@@ -205,7 +205,7 @@ module FileUtils
+ stack.pop # root directory should exist
stack.reverse_each do |dir|
begin
- fu_mkdir dir, mode
Index: 2.4/patches/patch-test_ruby_test_io_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-test_ruby_test_io_rb,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-test_ruby_test_io_rb
--- 2.4/patches/patch-test_ruby_test_io_rb 6 Jan 2017 15:59:25 -0000 1.1.1.1
+++ 2.4/patches/patch-test_ruby_test_io_rb 14 Sep 2017 15:03:52 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-test_ruby_test_io_rb,v 1

Work around pthread fifo fdlock bug.

---- test/ruby/test_io.rb.orig Sat Nov 5 00:28:09 2016
-+++ test/ruby/test_io.rb Wed Nov 9 07:34:54 2016
-@@ -3329,7 +3329,7 @@ __END__
+Index: test/ruby/test_io.rb
+--- test/ruby/test_io.rb.orig
++++ test/ruby/test_io.rb
+@@ -3351,7 +3351,7 @@ __END__
File.mkfifo("fifo")
assert_separately([], <<-'EOS')
t1 = Thread.new {
Index: 2.4/patches/patch-test_ruby_test_process_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-test_ruby_test_process_rb,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-test_ruby_test_process_rb
--- 2.4/patches/patch-test_ruby_test_process_rb 6 Jan 2017 15:59:25 -0000 1.1.1.1
+++ 2.4/patches/patch-test_ruby_test_process_rb 14 Sep 2017 15:03:52 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-test_ruby_test_process_r

Work around pthread fifo fdlock bug.

---- test/ruby/test_process.rb.orig Tue Dec 6 18:41:00 2016
-+++ test/ruby/test_process.rb Sun Dec 18 13:32:10 2016
-@@ -623,7 +623,7 @@ class TestProcess < Test::Unit::TestCase
+Index: test/ruby/test_process.rb
+--- test/ruby/test_process.rb.orig
++++ test/ruby/test_process.rb
+@@ -639,7 +639,7 @@ class TestProcess < Test::Unit::TestCase
_, v2 = assert_join_threads([t1, t2])
assert_equal("output to fifo\n", v2)
}
Index: 2.4/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- 2.4/pkg/PLIST-main 24 Mar 2017 14:39:05 -0000 1.2
+++ 2.4/pkg/PLIST-main 14 Sep 2017 15:17:38 -0000
@@ -1349,8 +1349,8 @@ 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/io-console-0.4.6.gemspec
-lib/ruby/gems/${REV}/specifications/default/json-2.0.2.gemspec
-lib/ruby/gems/${REV}/specifications/default/openssl-2.0.3.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/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.2
diff -u -p -r1.2 PLIST-ri_docs
--- 2.4/pkg/PLIST-ri_docs 24 Mar 2017 14:39:05 -0000 1.2
+++ 2.4/pkg/PLIST-ri_docs 14 Sep 2017 15:18:20 -0000
@@ -2710,6 +2710,7 @@ share/ri/${REV}/system/Gem/Installer/she
share/ri/${REV}/system/Gem/Installer/spec-i.ri
share/ri/${REV}/system/Gem/Installer/spec_file-i.ri
share/ri/${REV}/system/Gem/Installer/unpack-i.ri
+share/ri/${REV}/system/Gem/Installer/verify_spec_name-i.ri
share/ri/${REV}/system/Gem/Installer/windows_stub_script-i.ri
share/ri/${REV}/system/Gem/Installer/wrappers-i.ri
share/ri/${REV}/system/Gem/Installer/write_build_info_file-i.ri
@@ -3977,8 +3978,10 @@ share/ri/${REV}/system/Gem/TestCase/win_
share/ri/${REV}/system/Gem/TestCase/write_file-i.ri
share/ri/${REV}/system/Gem/Text/
share/ri/${REV}/system/Gem/Text/cdesc-Text.ri
+share/ri/${REV}/system/Gem/Text/clean_text-i.ri
share/ri/${REV}/system/Gem/Text/format_text-i.ri
share/ri/${REV}/system/Gem/Text/levenshtein_distance-i.ri
+share/ri/${REV}/system/Gem/Text/truncate_text-i.ri
share/ri/${REV}/system/Gem/Uninstaller/
share/ri/${REV}/system/Gem/Uninstaller/bin_dir-i.ri
share/ri/${REV}/system/Gem/Uninstaller/cdesc-Uninstaller.ri
@@ -5760,44 +5763,8 @@ share/ri/${REV}/system/Net/HTTPHeader/
share/ri/${REV}/system/Net/HTTPHeader/%5b%5d%3d-i.ri
share/ri/${REV}/system/Net/HTTPHeader/%5b%5d-i.ri
share/ri/${REV}/system/Net/HTTPHeader/add_field-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/basic_auth-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/basic_encode-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/canonical_each-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/capitalize-i.ri
share/ri/${REV}/system/Net/HTTPHeader/cdesc-HTTPHeader.ri
-share/ri/${REV}/system/Net/HTTPHeader/chunked%3f-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/connection_close%3f-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/connection_keep_alive%3f-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/content_length%3d-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/content_length-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/content_range-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/content_type%3d-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/content_type-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/delete-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/each-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/each_capitalized-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/each_capitalized_name-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/each_header-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/each_key-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/each_name-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/each_value-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/fetch-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/form_data%3d-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/get_fields-i.ri
share/ri/${REV}/system/Net/HTTPHeader/initialize_http_header-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/key%3f-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/main_type-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/proxy_basic_auth-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/range%3d-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/range-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/range_length-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/set_content_type-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/set_form-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/set_form_data-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/set_range-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/sub_type-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/to_hash-i.ri
-share/ri/${REV}/system/Net/HTTPHeader/type_params-i.ri
share/ri/${REV}/system/Net/HTTPHeaderSyntaxError/
share/ri/${REV}/system/Net/HTTPHeaderSyntaxError/cdesc-HTTPHeaderSyntaxError.ri
share/ri/${REV}/system/Net/HTTPIMUsed/
@@ -9305,7 +9272,6 @@ share/ri/${REV}/system/REXML/Functions/i
share/ri/${REV}/system/REXML/Functions/lang-c.ri
share/ri/${REV}/system/REXML/Functions/last-c.ri
share/ri/${REV}/system/REXML/Functions/local_name-c.ri
-share/ri/${REV}/system/REXML/Functions/method_missing-c.ri
share/ri/${REV}/system/REXML/Functions/name-c.ri
share/ri/${REV}/system/REXML/Functions/namespace_context%3d-c.ri
share/ri/${REV}/system/REXML/Functions/namespace_context-c.ri
@@ -9316,6 +9282,8 @@ share/ri/${REV}/system/REXML/Functions/n
share/ri/${REV}/system/REXML/Functions/position-c.ri
share/ri/${REV}/system/REXML/Functions/processing_instruction-c.ri
share/ri/${REV}/system/REXML/Functions/round-c.ri
+share/ri/${REV}/system/REXML/Functions/send-c.ri
+share/ri/${REV}/system/REXML/Functions/singleton_method_added-c.ri
share/ri/${REV}/system/REXML/Functions/starts_with-c.ri
share/ri/${REV}/system/REXML/Functions/string-c.ri
share/ri/${REV}/system/REXML/Functions/string_length-c.ri

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)