I'm testing on 6.0 and several regression tests seem to work well.

Thank you


On Wed, Mar 22, 2017 at 10:43:00AM -0700, Jeremy Evans wrote:
Simple update to the latest release of Ruby 2.4.  Fixes a number of
interpreter crashes and other problems.  Release announcement at:
https://www.ruby-lang.org/en/news/2017/03/22/ruby-2-4-1-released/

The shared lib major bump is due to the removal of the
ruby_vm_sysstack_error_copy function.  Without that this would just be a
minor bump for some new functions.

Tested on amd64.  I'm not sure I'll have a chance to run a bulk of all
ruby ports before committing this, but I tried about 20 and they all
work.  I should be able to fix any fallout quickly.  I'll 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.2
diff -u -p -r1.2 Makefile
--- Makefile    21 Feb 2017 17:04:45 -0000      1.2
+++ Makefile    22 Mar 2017 15:31:30 -0000
@@ -4,11 +4,11 @@ COMMENT-main =                object oriented script l
 COMMENT-gdbm =         gdbm interface for ruby
 COMMENT-ri_docs =      ri documentation files for ruby
-VERSION = 2.4.0
+VERSION =              2.4.1
 RUBYLIBREV =           2.4
 DISTNAME =             ruby-${VERSION}
-SHARED_LIBS = ruby24 0.0
+SHARED_LIBS =          ruby24  1.0
 PKGNAME-main =         ruby-${VERSION}
 PKGNAME-gdbm =         ruby24-gdbm-${VERSION}
 PKGNAME-ri_docs =      ruby24-ri_docs-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    6 Jan 2017 15:59:25 -0000       1.1.1.1
+++ distinfo    22 Mar 2017 15:31:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (ruby-2.4.0.tar.gz) = FS/QvRWpC0oYITRI9IXUtT6fdmLhUIGQqltwJEaynj0=
-SIZE (ruby-2.4.0.tar.gz) = 14104044
+SHA256 (ruby-2.4.1.tar.gz) = ozDhDVy15Ts6AHgybFcxiIu1XjLEq/6yfZ5/jl0AAlA=
+SIZE (ruby-2.4.1.tar.gz) = 14174752
Index: patches/patch-compile_c
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-compile_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-compile_c
--- patches/patch-compile_c     6 Jan 2017 15:59:25 -0000       1.1.1.1
+++ patches/patch-compile_c     22 Mar 2017 15:38:15 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-compile_c,v 1.1.1.1 2017
Disable peephole optimizer on sparc64, since it occasionally segfaults. ---- compile.c.orig Thu Dec 8 18:57:57 2016
-+++ compile.c  Sun Dec 18 13:32:10 2016
-@@ -2046,6 +2046,9 @@ static int
+--- 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
  iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int 
do_tailcallopt)
  {
      INSN *iobj = (INSN *)list;
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure     6 Jan 2017 15:59:25 -0000       1.1.1.1
+++ patches/patch-configure     22 Mar 2017 15:38:16 -0000
@@ -5,8 +5,8 @@ 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 Fri Dec 23 08:06:46 2016
-+++ configure  Sat Dec 24 22:25:54 2016
+--- configure.orig     Tue Mar 21 22:56:10 2017
++++ configure  Wed Mar 22 08:33:15 2017
 @@ -424,7 +424,7 @@ if test -z "$2"; then :
else
@@ -16,7 +16,7 @@ so ports don't have to be bumped when Op
        if test "$FOLD"; then :
echo "$2" | fold -s -w50 |
-@@ -25553,7 +25553,7 @@ esac
+@@ -25601,7 +25601,7 @@ esac
    openbsd*|mirbsd*) :
SOLIBS='$(LIBS)'
@@ -25,7 +25,7 @@ so ports don't have to be bumped when Op
         ;; #(
    solaris*) :
-@@ -26926,7 +26926,7 @@ _ACEOF
+@@ -26974,7 +26974,7 @@ _ACEOF
  _ACEOF
else
Index: patches/patch-include_ruby_ruby_h
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/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
--- patches/patch-include_ruby_ruby_h   6 Jan 2017 15:59:25 -0000       1.1.1.1
+++ patches/patch-include_ruby_ruby_h   22 Mar 2017 15:38:14 -0000
@@ -3,9 +3,9 @@ $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 Thu Dec 22 12:58:55 2016
-+++ include/ruby/ruby.h        Sat Dec 24 22:25:54 2016
-@@ -2192,7 +2192,7 @@ ERRORFUNC(("variable argument length doesn't match"), +--- 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"), # define rb_scan_args_verify_count(fmt, varc) \
      ((varc)/(rb_scan_args_count(fmt, varc)))
Index: patches/patch-lib_fileutils_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/patches/patch-lib_fileutils_rb,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_fileutils_rb
--- patches/patch-lib_fileutils_rb      6 Jan 2017 15:59:25 -0000       1.1.1.1
+++ patches/patch-lib_fileutils_rb      22 Mar 2017 15:38:14 -0000
@@ -4,9 +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 Feb 29 18:26:44 2016
-+++ lib/fileutils.rb   Mon Jun 20 08:22:13 2016
-@@ -190,7 +190,7 @@ module FileUtils
+--- lib/fileutils.rb.orig      Sun Mar 12 11:01:40 2017
++++ lib/fileutils.rb   Wed Mar 22 08:33:15 2017
+@@ -191,7 +191,7 @@ module FileUtils
      list.map {|path| remove_trailing_slash(path)}.each do |path|
        # optimize for the most common case
        begin
@@ -15,7 +15,7 @@ warnings when building ports.
          next
        rescue SystemCallError
          next if File.directory?(path)
-@@ -203,7 +203,7 @@ module FileUtils
+@@ -204,7 +204,7 @@ module FileUtils
        end
        stack.reverse_each do |dir|
          begin
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.1.1.1
diff -u -p -r1.1.1.1 patch-lib_rubygems_ext_ext_conf_builder_rb
--- patches/patch-lib_rubygems_ext_ext_conf_builder_rb  6 Jan 2017 15:59:25 
-0000       1.1.1.1
+++ patches/patch-lib_rubygems_ext_ext_conf_builder_rb  22 Mar 2017 15:39:07 
-0000
@@ -5,10 +5,8 @@ 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.
-Don't output mkmf.log error message if compilation didn't fail.
-
---- lib/rubygems/ext/ext_conf_builder.rb.orig  Mon Feb  1 04:43:26 2016
-+++ lib/rubygems/ext/ext_conf_builder.rb       Thu Dec 29 10:47:56 2016
+--- 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
          siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
          siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
@@ -21,18 +19,3 @@ Don't output mkmf.log error message if c
siteconf.flush -@@ -48,9 +53,11 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-           run cmd, results
-         ensure
-           if File.exist? 'mkmf.log'
--            results << "To see why this extension failed to compile, please 
check" \
--              " the mkmf.log which can be found here:\n"
--            results << "  " + File.join(dest_path, 'mkmf.log') + "\n"
-+            unless $?.success? then
-+              results << "To see why this extension failed to compile, please 
check" \
-+                " the mkmf.log which can be found here:\n"
-+              results << "  " + File.join(dest_path, 'mkmf.log') + "\n"
-+            end
-             FileUtils.mv 'mkmf.log', dest_path
-           end
-           siteconf.unlink
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main      6 Jan 2017 15:59:27 -0000       1.1.1.1
+++ pkg/PLIST-main      22 Mar 2017 15:53:21 -0000
@@ -1350,7 +1350,7 @@ lib/ruby/gems/${REV}/specifications/defa
 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.2.gemspec
+lib/ruby/gems/${REV}/specifications/default/openssl-2.0.3.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: pkg/PLIST-ri_docs
===================================================================
RCS file: /cvs/ports/lang/ruby/2.4/pkg/PLIST-ri_docs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-ri_docs
--- pkg/PLIST-ri_docs   6 Jan 2017 15:59:27 -0000       1.1.1.1
+++ pkg/PLIST-ri_docs   22 Mar 2017 15:53:50 -0000
@@ -1883,7 +1883,6 @@ share/ri/${REV}/system/FileUtils/StreamU
 share/ri/${REV}/system/FileUtils/StreamUtils_/fu_windows%3f-i.ri
 share/ri/${REV}/system/FileUtils/Verbose/
 share/ri/${REV}/system/FileUtils/Verbose/cdesc-Verbose.ri
-share/ri/${REV}/system/FileUtils/apply_mask-i.ri
 share/ri/${REV}/system/FileUtils/cd-c.ri
 share/ri/${REV}/system/FileUtils/cd-i.ri
 share/ri/${REV}/system/FileUtils/cdesc-FileUtils.ri
@@ -1958,7 +1957,6 @@ share/ri/${REV}/system/FileUtils/remove_
 share/ri/${REV}/system/FileUtils/remove_entry_secure-i.ri
 share/ri/${REV}/system/FileUtils/remove_file-c.ri
 share/ri/${REV}/system/FileUtils/remove_file-i.ri
-share/ri/${REV}/system/FileUtils/remove_trailing_slash-i.ri
 share/ri/${REV}/system/FileUtils/rm-c.ri
 share/ri/${REV}/system/FileUtils/rm-i.ri
 share/ri/${REV}/system/FileUtils/rm_f-c.ri
@@ -3265,6 +3263,7 @@ share/ri/${REV}/system/Gem/Resolver/Moli
 
share/ri/${REV}/system/Gem/Resolver/Molinillo/DependencyGraph/AddEdgeNoCircular/
 
share/ri/${REV}/system/Gem/Resolver/Molinillo/DependencyGraph/AddEdgeNoCircular/action_name-c.ri
 
share/ri/${REV}/system/Gem/Resolver/Molinillo/DependencyGraph/AddEdgeNoCircular/cdesc-AddEdgeNoCircular.ri
+share/ri/${REV}/system/Gem/Resolver/Molinillo/DependencyGraph/AddEdgeNoCircular/delete_first-i.ri
 
share/ri/${REV}/system/Gem/Resolver/Molinillo/DependencyGraph/AddEdgeNoCircular/destination-i.ri
 
share/ri/${REV}/system/Gem/Resolver/Molinillo/DependencyGraph/AddEdgeNoCircular/down-i.ri
 
share/ri/${REV}/system/Gem/Resolver/Molinillo/DependencyGraph/AddEdgeNoCircular/make_edge-i.ri
@@ -3498,6 +3497,7 @@ share/ri/${REV}/system/Gem/Resolver/Vend
 
share/ri/${REV}/system/Gem/Resolver/VendorSpecification/cdesc-VendorSpecification.ri
 share/ri/${REV}/system/Gem/Resolver/VendorSpecification/install-i.ri
 share/ri/${REV}/system/Gem/Resolver/allow_missing%3f-i.ri
+share/ri/${REV}/system/Gem/Resolver/amount_constrained-i.ri
 share/ri/${REV}/system/Gem/Resolver/cdesc-Resolver.ri
 share/ri/${REV}/system/Gem/Resolver/compose_sets-c.ri
 share/ri/${REV}/system/Gem/Resolver/debug%3f-i.ri
@@ -3515,6 +3515,7 @@ share/ri/${REV}/system/Gem/Resolver/reso
 share/ri/${REV}/system/Gem/Resolver/search_for-i.ri
 share/ri/${REV}/system/Gem/Resolver/skip_gems-i.ri
 share/ri/${REV}/system/Gem/Resolver/soft_missing-i.ri
+share/ri/${REV}/system/Gem/Resolver/sort_dependencies-i.ri
 share/ri/${REV}/system/Gem/Resolver/stats-i.ri
 share/ri/${REV}/system/Gem/RubyVersionMismatch/
 share/ri/${REV}/system/Gem/RubyVersionMismatch/cdesc-RubyVersionMismatch.ri
@@ -3589,6 +3590,7 @@ share/ri/${REV}/system/Gem/Server/run-i.
 share/ri/${REV}/system/Gem/Server/show_rdoc_for_pattern-i.ri
 share/ri/${REV}/system/Gem/Server/spec_dirs-i.ri
 share/ri/${REV}/system/Gem/Server/specs-i.ri
+share/ri/${REV}/system/Gem/Server/uri_encode-i.ri
 share/ri/${REV}/system/Gem/SilentUI/
 share/ri/${REV}/system/Gem/SilentUI/cdesc-SilentUI.ri
 share/ri/${REV}/system/Gem/SilentUI/close-i.ri
@@ -7407,71 +7409,6 @@ share/ri/${REV}/system/OpenURI/OpenRead/
 share/ri/${REV}/system/OpenURI/OpenRead/open-i.ri
 share/ri/${REV}/system/OpenURI/OpenRead/read-i.ri
 share/ri/${REV}/system/OpenURI/cdesc-OpenURI.ri
-share/ri/${REV}/system/OptParse/
-share/ri/${REV}/system/OptParse/abort-i.ri
-share/ri/${REV}/system/OptParse/accept-c.ri
-share/ri/${REV}/system/OptParse/accept-i.ri
-share/ri/${REV}/system/OptParse/banner-i.ri
-share/ri/${REV}/system/OptParse/base-i.ri
-share/ri/${REV}/system/OptParse/candidate-i.ri
-share/ri/${REV}/system/OptParse/cdesc-OptParse.ri
-share/ri/${REV}/system/OptParse/complete-i.ri
-share/ri/${REV}/system/OptParse/def_head_option-i.ri
-share/ri/${REV}/system/OptParse/def_option-i.ri
-share/ri/${REV}/system/OptParse/def_tail_option-i.ri
-share/ri/${REV}/system/OptParse/default_argv-i.ri
-share/ri/${REV}/system/OptParse/define-i.ri
-share/ri/${REV}/system/OptParse/define_by_keywords-i.ri
-share/ri/${REV}/system/OptParse/define_head-i.ri
-share/ri/${REV}/system/OptParse/define_tail-i.ri
-share/ri/${REV}/system/OptParse/each_const-c.ri
-share/ri/${REV}/system/OptParse/environment-i.ri
-share/ri/${REV}/system/OptParse/getopts-c.ri
-share/ri/${REV}/system/OptParse/getopts-i.ri
-share/ri/${REV}/system/OptParse/help-i.ri
-share/ri/${REV}/system/OptParse/inc-c.ri
-share/ri/${REV}/system/OptParse/inc-i.ri
-share/ri/${REV}/system/OptParse/load-i.ri
-share/ri/${REV}/system/OptParse/make_switch-i.ri
-share/ri/${REV}/system/OptParse/new-c.ri
-share/ri/${REV}/system/OptParse/new-i.ri
-share/ri/${REV}/system/OptParse/notwice-i.ri
-share/ri/${REV}/system/OptParse/on-i.ri
-share/ri/${REV}/system/OptParse/on_head-i.ri
-share/ri/${REV}/system/OptParse/on_tail-i.ri
-share/ri/${REV}/system/OptParse/order%21-i.ri
-share/ri/${REV}/system/OptParse/order-i.ri
-share/ri/${REV}/system/OptParse/parse%21-i.ri
-share/ri/${REV}/system/OptParse/parse-i.ri
-share/ri/${REV}/system/OptParse/permute%21-i.ri
-share/ri/${REV}/system/OptParse/permute-i.ri
-share/ri/${REV}/system/OptParse/program_name-i.ri
-share/ri/${REV}/system/OptParse/reject-c.ri
-share/ri/${REV}/system/OptParse/reject-i.ri
-share/ri/${REV}/system/OptParse/release-i.ri
-share/ri/${REV}/system/OptParse/remove-i.ri
-share/ri/${REV}/system/OptParse/search-i.ri
-share/ri/${REV}/system/OptParse/search_const-c.ri
-share/ri/${REV}/system/OptParse/separator-i.ri
-share/ri/${REV}/system/OptParse/set_banner-i.ri
-share/ri/${REV}/system/OptParse/set_program_name-i.ri
-share/ri/${REV}/system/OptParse/set_summary_indent-i.ri
-share/ri/${REV}/system/OptParse/set_summary_width-i.ri
-share/ri/${REV}/system/OptParse/show_version-c.ri
-share/ri/${REV}/system/OptParse/summarize-i.ri
-share/ri/${REV}/system/OptParse/summary_indent-i.ri
-share/ri/${REV}/system/OptParse/summary_width-i.ri
-share/ri/${REV}/system/OptParse/terminate-c.ri
-share/ri/${REV}/system/OptParse/terminate-i.ri
-share/ri/${REV}/system/OptParse/to_a-i.ri
-share/ri/${REV}/system/OptParse/to_s-i.ri
-share/ri/${REV}/system/OptParse/top-c.ri
-share/ri/${REV}/system/OptParse/top-i.ri
-share/ri/${REV}/system/OptParse/ver-i.ri
-share/ri/${REV}/system/OptParse/version-i.ri
-share/ri/${REV}/system/OptParse/visit-i.ri
-share/ri/${REV}/system/OptParse/warn-i.ri
-share/ri/${REV}/system/OptParse/with-c.ri
 share/ri/${REV}/system/OptionParser/
 share/ri/${REV}/system/OptionParser/AC/
 share/ri/${REV}/system/OptionParser/AC/_ac_arg_enable-i.ri
@@ -14423,6 +14360,7 @@ share/ri/${REV}/system/fatal/
 share/ri/${REV}/system/fatal/cdesc-fatal.ri
 share/ri/${REV}/system/lib/
 share/ri/${REV}/system/lib/page-fileutils_rb_orig.ri
+share/ri/${REV}/system/lib/page-mkmf_rb_orig.ri
 share/ri/${REV}/system/lib/racc/
 share/ri/${REV}/system/lib/racc/rdoc/
 share/ri/${REV}/system/lib/racc/rdoc/page-grammar_en_rdoc.ri


--
Dios, gracias por tu amor infinito.
-- Vladimir Támara Patiño. http://vtamara.pasosdeJesus.org/
 http://www.pasosdejesus.org/dominio_publico_colombia.html

Reply via email to