This updates JRuby to the latest release. Release notes at: https://www.jruby.org/2023/10/18/jruby-9-4-4-0.html
Tested on amd64, the only supported arch. Will be committing in a few days unless I hear objections. Thanks, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/lang/jruby/Makefile,v retrieving revision 1.109 diff -u -p -r1.109 Makefile --- Makefile 10 Jun 2023 17:30:29 -0000 1.109 +++ Makefile 18 Oct 2023 19:10:50 -0000 @@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64 COMMENT = pure-Java implementation of the Ruby language -V = 9.4.3.0 +V = 9.4.4.0 DISTNAME = jruby-dist-${V}-bin PKGNAME = jruby-${V} CATEGORIES = lang lang/ruby Index: distinfo =================================================================== RCS file: /cvs/ports/lang/jruby/distinfo,v retrieving revision 1.75 diff -u -p -r1.75 distinfo --- distinfo 10 Jun 2023 17:30:29 -0000 1.75 +++ distinfo 18 Oct 2023 19:10:55 -0000 @@ -1,6 +1,6 @@ SHA256 (jffi-1.3.10.tar.gz) = QZWOTjjcxTOTidj4/JjERqcokJJ5SOiQualLs/ivHsw= -SHA256 (jruby-dist-9.4.3.0-bin.tar.gz) = sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk= +SHA256 (jruby-dist-9.4.4.0-bin.tar.gz) = arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA= SHA256 (jruby-launcher-1.1.19-java.gem) = LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo= SIZE (jffi-1.3.10.tar.gz) = 3304571 -SIZE (jruby-dist-9.4.3.0-bin.tar.gz) = 29462176 +SIZE (jruby-dist-9.4.4.0-bin.tar.gz) = 31660522 SIZE (jruby-launcher-1.1.19-java.gem) = 64000 Index: patches/patch-lib_ruby_stdlib_ffi_library_rb =================================================================== RCS file: /cvs/ports/lang/jruby/patches/patch-lib_ruby_stdlib_ffi_library_rb,v retrieving revision 1.3 diff -u -p -r1.3 patch-lib_ruby_stdlib_ffi_library_rb --- patches/patch-lib_ruby_stdlib_ffi_library_rb 11 Mar 2022 19:29:04 -0000 1.3 +++ patches/patch-lib_ruby_stdlib_ffi_library_rb 18 Oct 2023 19:28:32 -0000 @@ -1,20 +1,17 @@ Index: lib/ruby/stdlib/ffi/library.rb --- lib/ruby/stdlib/ffi/library.rb.orig +++ lib/ruby/stdlib/ffi/library.rb -@@ -96,6 +96,7 @@ module FFI +@@ -90,10 +90,13 @@ module FFI raise LoadError.new("library names list must not be empty") if names.empty? - lib_flags = defined?(@ffi_lib_flags) ? @ffi_lib_flags : FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_LOCAL + lib_flags = defined?(@ffi_lib_flags) && @ffi_lib_flags + libc = FFI::DynamicLibrary.open('libc.so', FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL) - ffi_libs = names.map do |name| - if name == FFI::CURRENT_PROCESS -@@ -149,7 +150,7 @@ module FFI - lib - end + @ffi_libs = names.map do |name| + FFI::DynamicLibrary.send(:load_library, name, lib_flags) end -- -+ ffi_libs.unshift(libc) - @ffi_libs = ffi_libs ++ @ffi_libs.unshift(libc) ++ @ffi_libs end + # Set the calling convention for {#attach_function} and {#callback} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v retrieving revision 1.66 diff -u -p -r1.66 PLIST --- pkg/PLIST 10 Jun 2023 17:30:29 -0000 1.66 +++ pkg/PLIST 18 Oct 2023 19:30:03 -0000 @@ -529,6 +529,7 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/abbrev-0.1.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/base64-0.1.1.gemspec jruby/lib/ruby/gems/1.8/specifications/default/benchmark-0.2.0.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/bigdecimal-3.1.4-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/bundler-2.3.26.gemspec jruby/lib/ruby/gems/1.8/specifications/default/cgi-0.3.6-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/csv-3.2.5.gemspec @@ -541,7 +542,7 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/english-0.7.1.gemspec jruby/lib/ruby/gems/1.8/specifications/default/erb-2.2.3.gemspec jruby/lib/ruby/gems/1.8/specifications/default/error_highlight-0.3.0.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.15.5-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.16.3-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/ffi-binary-libfixposix-0.5.1.1-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/ffi-bindings-libfixposix-0.5.1.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/fileutils-1.6.0.gemspec @@ -553,7 +554,7 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/ipaddr-1.2.4.gemspec jruby/lib/ruby/gems/1.8/specifications/default/irb-1.4.2.gemspec jruby/lib/ruby/gems/1.8/specifications/default/jar-dependencies-0.4.1.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.14.1-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.14.2-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/jruby-readline-1.3.7-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/json-2.6.1-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/logger-1.5.1.gemspec @@ -568,7 +569,7 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/pp-0.3.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/prettyprint-0.1.1.gemspec jruby/lib/ruby/gems/1.8/specifications/default/pstore-0.1.1.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/psych-5.1.0-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/psych-5.1.1.1-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/racc-1.6.0-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/rake-ant-1.0.6.gemspec jruby/lib/ruby/gems/1.8/specifications/default/rdoc-6.4.0.gemspec @@ -580,7 +581,7 @@ jruby/lib/ruby/gems/1.8/specifications/d jruby/lib/ruby/gems/1.8/specifications/default/securerandom-0.2.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/shellwords-0.1.0.gemspec jruby/lib/ruby/gems/1.8/specifications/default/singleton-0.1.1.gemspec -jruby/lib/ruby/gems/1.8/specifications/default/stringio-3.0.5-java.gemspec +jruby/lib/ruby/gems/1.8/specifications/default/stringio-3.0.8-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/strscan-3.0.6-java.gemspec jruby/lib/ruby/gems/1.8/specifications/default/subspawn-0.1.1.gemspec jruby/lib/ruby/gems/1.8/specifications/default/subspawn-posix-0.1.1.gemspec @@ -1101,12 +1102,16 @@ jruby/lib/ruby/stdlib/ffi/abstract_memor jruby/lib/ruby/stdlib/ffi/autopointer.rb jruby/lib/ruby/stdlib/ffi/buffer.rb jruby/lib/ruby/stdlib/ffi/callback.rb +jruby/lib/ruby/stdlib/ffi/compat.rb jruby/lib/ruby/stdlib/ffi/data_converter.rb +jruby/lib/ruby/stdlib/ffi/dynamic_library.rb jruby/lib/ruby/stdlib/ffi/enum.rb jruby/lib/ruby/stdlib/ffi/errno.rb jruby/lib/ruby/stdlib/ffi/ffi.rb +jruby/lib/ruby/stdlib/ffi/function.rb jruby/lib/ruby/stdlib/ffi/io.rb jruby/lib/ruby/stdlib/ffi/library.rb +jruby/lib/ruby/stdlib/ffi/library_path.rb jruby/lib/ruby/stdlib/ffi/managedstruct.rb jruby/lib/ruby/stdlib/ffi/memorypointer.rb jruby/lib/ruby/stdlib/ffi/platform/ @@ -1398,21 +1403,21 @@ jruby/lib/ruby/stdlib/optparse/version.r jruby/lib/ruby/stdlib/org/ jruby/lib/ruby/stdlib/org/bouncycastle/ jruby/lib/ruby/stdlib/org/bouncycastle/bcpkix-jdk18on/ -jruby/lib/ruby/stdlib/org/bouncycastle/bcpkix-jdk18on/1.71/ -jruby/lib/ruby/stdlib/org/bouncycastle/bcpkix-jdk18on/1.71/bcpkix-jdk18on-1.71.jar +jruby/lib/ruby/stdlib/org/bouncycastle/bcpkix-jdk18on/1.74/ +jruby/lib/ruby/stdlib/org/bouncycastle/bcpkix-jdk18on/1.74/bcpkix-jdk18on-1.74.jar jruby/lib/ruby/stdlib/org/bouncycastle/bcprov-jdk18on/ -jruby/lib/ruby/stdlib/org/bouncycastle/bcprov-jdk18on/1.71/ -jruby/lib/ruby/stdlib/org/bouncycastle/bcprov-jdk18on/1.71/bcprov-jdk18on-1.71.jar +jruby/lib/ruby/stdlib/org/bouncycastle/bcprov-jdk18on/1.74/ +jruby/lib/ruby/stdlib/org/bouncycastle/bcprov-jdk18on/1.74/bcprov-jdk18on-1.74.jar jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk18on/ -jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk18on/1.71/ -jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk18on/1.71/bctls-jdk18on-1.71.jar +jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk18on/1.74/ +jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk18on/1.74/bctls-jdk18on-1.74.jar jruby/lib/ruby/stdlib/org/bouncycastle/bcutil-jdk18on/ -jruby/lib/ruby/stdlib/org/bouncycastle/bcutil-jdk18on/1.71/ -jruby/lib/ruby/stdlib/org/bouncycastle/bcutil-jdk18on/1.71/bcutil-jdk18on-1.71.jar +jruby/lib/ruby/stdlib/org/bouncycastle/bcutil-jdk18on/1.74/ +jruby/lib/ruby/stdlib/org/bouncycastle/bcutil-jdk18on/1.74/bcutil-jdk18on-1.74.jar jruby/lib/ruby/stdlib/org/snakeyaml/ jruby/lib/ruby/stdlib/org/snakeyaml/snakeyaml-engine/ -jruby/lib/ruby/stdlib/org/snakeyaml/snakeyaml-engine/2.6/ -jruby/lib/ruby/stdlib/org/snakeyaml/snakeyaml-engine/2.6/snakeyaml-engine-2.6.jar +jruby/lib/ruby/stdlib/org/snakeyaml/snakeyaml-engine/2.7/ +jruby/lib/ruby/stdlib/org/snakeyaml/snakeyaml-engine/2.7/snakeyaml-engine-2.7.jar jruby/lib/ruby/stdlib/org/snakeyaml/snakeyaml-engine/maven-metadata-local.xml jruby/lib/ruby/stdlib/ostruct.rb jruby/lib/ruby/stdlib/pathname.rb