CVS commit: pkgsrc/lang

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Jul 26 06:17:00 UTC 2025

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby34: Makefile PLIST distinfo
        pkgsrc/lang/ruby34/patches: patch-configure patch-lib_rdoc_encoding.rb
Added Files:
        pkgsrc/lang/ruby34/patches: patch-vm__core.h
Removed Files:
        pkgsrc/lang/ruby34/patches: patch-ext_win32_lib_win32_resolv.rb
            patch-ext_win32_resolv_resolv.c patch-lib_resolv.rb
            patch-test_resolv_test__dns.rb

Log Message:
lang/ruby34: update to 3.4.5

pkgsrc change:

* Enable sigaltstack(2) on NetBSD refering to PR pkg/59017.

Ruby 3.4.5 (2025-07-15)

* Bug #21340: Bump autoconf version to properly handle C23 bool/stdbool
  defines
* Sync lockfile from rubygems/rubygems by deivid-rodriguez · Pull Request
  #13472
* Bug #21438: use-after-free when resizing exivars
* Ensure that memory is not freed before calling
  free_fast_fallback_getaddrinfo_* by shioimm · Pull Request #12661
* Fix heap-use-after-free in free_fast_fallback_getaddrinfo_entry by shioimm
  Pull Request #13231
* Bug #21441: SEGV during thread cleanup if profiler calls
  thread_profiles_frames at wrong time
* Bug #21255: Can't build Ruby with Windows SDK 10.0.26100
* Backport GH-13617 for s390x by hsbt · Pull Request #13757
* Bump up resolv-0.6.2 for Ruby 3.4 by hsbt · Pull Request #13818
* Bug #21197: Prism does not accept newline after defined? keyword
* Bug #21333: heap-use-after-free caused by rehash during update
* Bug #21357: Crash in Hash#merge! with ruby-dev in rubocop-rspec test suite
* Bug #21383: Prism leaks memory with invalid yield
* Bug #21394: Memory leak in Prism's RubyVM::InstructionSequence.new
* Bug #21099: TestGc#test_gc_stress_at_startup assertion failure
* Bug #21395: Please backport caa6ba1a46afa1bc696adc5fe91ee992f9570c89
* Bug #21439: Crash with PM_SPLAT_NODE compiler error (Prism)
* Bug #21354: Symbol#to_proc is not ractor safe
* Bug #20009: Marshal.load raises exception when load dumped class include
  non-ASCII
* Bug #21380: Use-After-Free in String#split with In-Block String
  Modification
* Bug #21447: Fix handling of PM_CONSTANT_PATH_NODE node in keyword
  arguments with ARGS_SPLAT
* Bug #21448: Random.urandom may fail to fall back to reading /dev/urandom
  on Linux < 3.17
* Bug #21440: Cannot create instances of frozen Data subclasses
* Bug #21437: Date#hash may return different values for equal dates with
  large years
* Bug #21497: building issue when using gcc15, because C23 is default
* Bug #21500: Backport gcc 15 support


To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ruby34/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby34/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ruby34/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby34/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/ruby34/patches/patch-ext_win32_lib_win32_resolv.rb \
    pkgsrc/lang/ruby34/patches/patch-ext_win32_resolv_resolv.c \
    pkgsrc/lang/ruby34/patches/patch-lib_resolv.rb \
    pkgsrc/lang/ruby34/patches/patch-test_resolv_test__dns.rb
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ruby34/patches/patch-lib_rdoc_encoding.rb
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ruby34/patches/patch-vm__core.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.301 pkgsrc/lang/ruby/rubyversion.mk:1.302
--- pkgsrc/lang/ruby/rubyversion.mk:1.301       Sun Jul 13 15:39:54 2025
+++ pkgsrc/lang/ruby/rubyversion.mk     Sat Jul 26 06:17:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.301 2025/07/13 15:39:54 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.302 2025/07/26 06:17:00 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -215,7 +215,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 # current supported Ruby's version
 RUBY32_VERSION=                3.2.8
 RUBY33_VERSION=                3.3.8
-RUBY34_VERSION=                3.4.4
+RUBY34_VERSION=                3.4.5
 
 # current API compatible version; used for version of shared library
 RUBY32_API_VERSION=    3.2.0
@@ -468,7 +468,7 @@ RUBY_RUBYGEMS_VER=          3.5.22
 
 # default gems
 RUBY_BENCHMARK_VER=            0.4.0
-RUBY_BUNDLER_VER=              2.6.7
+RUBY_BUNDLER_VER=              2.6.9
 RUBY_CGI_VER=                  0.4.2
 RUBY_DELEGATE_VER=             0.4.0
 RUBY_DID_YOU_MEAN_VER=         2.0.0
@@ -491,7 +491,7 @@ RUBY_PP_VER=                        0.6.2
 RUBY_PRETTYPRINT_VER=          0.2.0
 RUBY_PRISM_VER=                        1.2.0
 RUBY_PSTORE_VER=               0.1.4
-RUBY_RDOC_VER=                 6.10.0
+RUBY_RDOC_VER=                 6.14.0
 RUBY_READLINE_VER=             0.0.4
 RUBY_RELINE_VER=               0.6.0
 RUBY_RESOLV_VER=               0.6.2
@@ -514,12 +514,12 @@ RUBY_YAML_VER=                    0.4.0
 # default gems from ext
 RUBY_DATE_VER=                 3.4.1
 RUBY_DIGEST_VER=               3.2.0
-RUBY_ETC_VER=                  1.4.5
+RUBY_ETC_VER=                  1.4.6
 RUBY_FCNTL_VER=                        1.2.0
 RUBY_FIDDLE_VER=               1.1.6
-RUBY_IO_CONSOLE_VER=           0.8.0
-RUBY_IO_NONBLOCK_VER=          0.3.1
-RUBY_IO_WAIT_VER=              0.3.1
+RUBY_IO_CONSOLE_VER=           0.8.1
+RUBY_IO_NONBLOCK_VER=          0.3.2
+RUBY_IO_WAIT_VER=              0.3.2
 RUBY_JSON_VER=                 2.9.1
 RUBY_OPENSSL_VER=              3.3.0
 RUBY_PATHNAME_VER=             0.4.0
@@ -543,7 +543,7 @@ RUBY_MATRIX_VER=            0.4.2
 RUBY_PRIME_VER=                        0.1.3
 RUBY_RBS_VER=                  3.8.0
 RUBY_TYPEPROF_VER=             0.30.1
-RUBY_DEBUG_VER=                        1.10.0
+RUBY_DEBUG_VER=                        1.11.0
 RUBY_RACC_VER=                 1.8.1
 RUBY_MUTEX_M_VER=              0.3.0
 RUBY_GETOPTLONG_VER=           0.2.1

Index: pkgsrc/lang/ruby34/Makefile
diff -u pkgsrc/lang/ruby34/Makefile:1.6 pkgsrc/lang/ruby34/Makefile:1.7
--- pkgsrc/lang/ruby34/Makefile:1.6     Sun Jul 13 15:39:54 2025
+++ pkgsrc/lang/ruby34/Makefile Sat Jul 26 06:17:00 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2025/07/13 15:39:54 taca Exp $
+# $NetBSD: Makefile,v 1.7 2025/07/26 06:17:00 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
-PKGREVISION=   2
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby34/PLIST
diff -u pkgsrc/lang/ruby34/PLIST:1.4 pkgsrc/lang/ruby34/PLIST:1.5
--- pkgsrc/lang/ruby34/PLIST:1.4        Mon May 19 14:39:07 2025
+++ pkgsrc/lang/ruby34/PLIST    Sat Jul 26 06:17:00 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2025/05/19 14:39:07 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/07/26 06:17:00 taca Exp $
 bin/bundle${RUBY_SUFFIX}
 bin/bundler${RUBY_SUFFIX}
 bin/erb${RUBY_SUFFIX}
@@ -73,6 +73,7 @@ ${RUBY_INC}/ruby/internal/attr/nodiscard
 ${RUBY_INC}/ruby/internal/attr/noexcept.h
 ${RUBY_INC}/ruby/internal/attr/noinline.h
 ${RUBY_INC}/ruby/internal/attr/nonnull.h
+${RUBY_INC}/ruby/internal/attr/nonstring.h
 ${RUBY_INC}/ruby/internal/attr/noreturn.h
 ${RUBY_INC}/ruby/internal/attr/packed_struct.h
 ${RUBY_INC}/ruby/internal/attr/pure.h
@@ -229,6 +230,8 @@ ${RUBY_LIB}/bundler/cli/common.rb
 ${RUBY_LIB}/bundler/cli/config.rb
 ${RUBY_LIB}/bundler/cli/console.rb
 ${RUBY_LIB}/bundler/cli/doctor.rb
+${RUBY_LIB}/bundler/cli/doctor/diagnose.rb
+${RUBY_LIB}/bundler/cli/doctor/ssl.rb
 ${RUBY_LIB}/bundler/cli/exec.rb
 ${RUBY_LIB}/bundler/cli/fund.rb
 ${RUBY_LIB}/bundler/cli/gem.rb
@@ -864,10 +867,8 @@ ${RUBY_LIB}/rdoc/generator/pot/po_entry.
 ${RUBY_LIB}/rdoc/generator/ri.rb
 ${RUBY_LIB}/rdoc/generator/template/darkfish/_footer.rhtml
 ${RUBY_LIB}/rdoc/generator/template/darkfish/_head.rhtml
-${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
 ${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_classes.rhtml
 ${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
-${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml
 ${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
 ${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_installed.rhtml
 ${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
@@ -1191,7 +1192,6 @@ ${RUBY_LIB}/rubygems/security/policy.rb
 ${RUBY_LIB}/rubygems/security/signer.rb
 ${RUBY_LIB}/rubygems/security/trust_dir.rb
 ${RUBY_LIB}/rubygems/security_option.rb
-${RUBY_LIB}/rubygems/shellwords.rb
 ${RUBY_LIB}/rubygems/source.rb
 ${RUBY_LIB}/rubygems/source/git.rb
 ${RUBY_LIB}/rubygems/source/installed.rb

Index: pkgsrc/lang/ruby34/distinfo
diff -u pkgsrc/lang/ruby34/distinfo:1.8 pkgsrc/lang/ruby34/distinfo:1.9
--- pkgsrc/lang/ruby34/distinfo:1.8     Sun Jul 13 15:39:54 2025
+++ pkgsrc/lang/ruby34/distinfo Sat Jul 26 06:17:00 2025
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.8 2025/07/13 15:39:54 taca Exp $
+$NetBSD: distinfo,v 1.9 2025/07/26 06:17:00 taca Exp $
 
-BLAKE2s (ruby-3.4.4.tar.xz) = b4fa799d30359f9f9b22f403205e49d782e3f78d7496dc5bba16acc8a62d9bec
-SHA512 (ruby-3.4.4.tar.xz) = 0d258cf790daad424c866404b5cbdc8adba0e4e13764847a89adf2335229e5184095c9f3e9594705897697e48bcc322d9a9f919b04047abb2075daca9fce8871
-Size (ruby-3.4.4.tar.xz) = 17255388 bytes
+BLAKE2s (ruby-3.4.5.tar.xz) = f1c64c15fa9be3878abc1330cf399e8c08685e65252339e9c4ae5feb1c1cd8c9
+SHA512 (ruby-3.4.5.tar.xz) = 1f5d2fd527d15bd81ca8f49767d6426533367c1018a1d275d34721a96410b51204236173224e5198a42b56162c6e7a7b0c060fc032a9fd7f250b44e05c7af560
+Size (ruby-3.4.5.tar.xz) = 17265032 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = 9df201049bb38188f8409ee4572d3a6bb774013b
+SHA1 (patch-configure) = ff1b1e659ddc7cb1d62a71e1447df55f1f7b07c2
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
-SHA1 (patch-ext_win32_lib_win32_resolv.rb) = 7d7d9387523ce92a7924cbf235dcf3fb10d759a4
-SHA1 (patch-ext_win32_resolv_resolv.c) = 3c4217d24c2dc2d27ed5935be778009dd89490f0
 SHA1 (patch-include_ruby_internal_static__assert.h) = 7d5c3ae7ff674b9b34639924fcf08237164de9f8
 SHA1 (patch-lib_mkmf.rb) = ea66bc4e42d2b15edfcd8ceefa9b94d07a3cdd0f
-SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a
-SHA1 (patch-lib_resolv.rb) = ec152623f6f3cdcbf6c47f70f511db431551fd30
+SHA1 (patch-lib_rdoc_encoding.rb) = aea07b878cbf46ddfdc0364ca5adf3fda9311735
 SHA1 (patch-lib_rubygems.rb) = 81af71ae9b0c3fef2ad1de88a542b3ece14b4519
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 66c475a5308deb2ed5096b88cf65549732f87421
 SHA1 (patch-lib_rubygems_config__file.rb) = 584f8cd9ef1d1b9bf25efc7e85c2219166db7ac9
@@ -21,8 +18,8 @@ SHA1 (patch-lib_rubygems_installer.rb) =
 SHA1 (patch-lib_rubygems_platform.rb) = bde36a8fc1ba2fbf4d6fb8829bc116fb4d09b404
 SHA1 (patch-lib_rubygems_specification.rb) = a3154185ef89fb33e699dd54b19a8e274f3275e0
 SHA1 (patch-prism_prism.c) = 7f4221b01b4b4b412ba30050a886773b7877403c
-SHA1 (patch-test_resolv_test__dns.rb) = 57cbaff16dcfd1caf6345c8e532974cecf171729
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1803bb6a1836e232dcabcf38f11c9881dbf726ea
+SHA1 (patch-vm__core.h) = a0c710aee08a25b62ad104a9706cb55f60a96985
 SHA1 (patch-yjit_not__gmake.mk) = b597385583c82d89c816c0202e4372fbb78474e7

Index: pkgsrc/lang/ruby34/patches/patch-configure
diff -u pkgsrc/lang/ruby34/patches/patch-configure:1.2 pkgsrc/lang/ruby34/patches/patch-configure:1.3
--- pkgsrc/lang/ruby34/patches/patch-configure:1.2      Mon Apr 21 20:54:56 2025
+++ pkgsrc/lang/ruby34/patches/patch-configure  Sat Jul 26 06:17:00 2025
@@ -1,11 +1,7 @@
-$NetBSD: patch-configure,v 1.2 2025/04/21 20:54:56 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2025/07/26 06:17:00 taca Exp $
 
-* Avoid bash specific variable substitution.
-* Ignore doxygen.
 * Ignore VCS.
-* Handle SSP in pkgsrc.
 * Retain _XOPEN_SOURCE, fixes eventmachine.
-* Fix argument for pthread_self() on NetBSD.
 * Explictly stop display with color.
 * Remove bogus MJIT disabling on SunOS.
 

Index: pkgsrc/lang/ruby34/patches/patch-lib_rdoc_encoding.rb
diff -u pkgsrc/lang/ruby34/patches/patch-lib_rdoc_encoding.rb:1.1 pkgsrc/lang/ruby34/patches/patch-lib_rdoc_encoding.rb:1.2
--- pkgsrc/lang/ruby34/patches/patch-lib_rdoc_encoding.rb:1.1   Thu Jan  2 06:51:05 2025
+++ pkgsrc/lang/ruby34/patches/patch-lib_rdoc_encoding.rb       Sat Jul 26 06:17:00 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_rdoc_encoding.rb,v 1.1 2025/01/02 06:51:05 taca Exp $
+$NetBSD: patch-lib_rdoc_encoding.rb,v 1.2 2025/07/26 06:17:00 taca Exp $
 
 * Always convert "\r\n" to "\n" since it cause rdoc processing error.
 
---- lib/rdoc/encoding.rb.orig  2018-03-26 05:56:26.000000000 +0000
+--- lib/rdoc/encoding.rb.orig  2025-07-15 16:27:14.000000000 +0000
 +++ lib/rdoc/encoding.rb
 @@ -31,7 +31,7 @@ module RDoc::Encoding
  
-   def self.read_file filename, encoding, force_transcode = false
+   def self.read_file(filename, encoding, force_transcode = false)
      content = File.open filename, "rb" do |f| f.read end
 -    content.gsub!("\r\n", "\n") if RUBY_PLATFORM =~ /mswin|mingw/
 +    content.gsub!("\r\n", "\n")

Added files:

Index: pkgsrc/lang/ruby34/patches/patch-vm__core.h
diff -u /dev/null pkgsrc/lang/ruby34/patches/patch-vm__core.h:1.1
--- /dev/null   Sat Jul 26 06:17:00 2025
+++ pkgsrc/lang/ruby34/patches/patch-vm__core.h Sat Jul 26 06:17:00 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-vm__core.h,v 1.1 2025/07/26 06:17:00 taca Exp $
+
+Enable sigaltstack(2) again on NetBSD.  This has not been relevant for
+a very long time, probably since NetBSD 6.
+
+--- vm_core.h.orig     2025-07-15 16:27:14.000000000 +0000
++++ vm_core.h
+@@ -161,7 +161,7 @@ extern int ruby_assert_critical_section_
+ #  define RUBY_SIGCHLD (SIGCHLD)
+ #endif
+ 
+-#if defined(SIGSEGV) && defined(HAVE_SIGALTSTACK) && defined(SA_SIGINFO) && !defined(__NetBSD__)
++#if defined(SIGSEGV) && defined(HAVE_SIGALTSTACK) && defined(SA_SIGINFO)
+ #  define USE_SIGALTSTACK
+ void *rb_allocate_sigaltstack(void);
+ void *rb_register_sigaltstack(void *);