CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Sat, 26 Jul 2025 06:21:36 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Jul 26 06:21:36 UTC 2025

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby32-base: Makefile PLIST distinfo
        pkgsrc/lang/ruby32-base/patches: patch-configure
Added Files:
        pkgsrc/lang/ruby32-base/patches:
            patch-.bundle_gems_net-imap-0.3.9_net-imap.gemspec patch-vm__core.h
Removed Files:
        pkgsrc/lang/ruby32-base/patches: patch-lib_resolv.gemspec
            patch-lib_resolv.rb patch-test_resolv_test__dns.rb
            patch-tool_rbinstall.rb

Log Message:
lang/ruby32: update to 3.2.9

pkgsrc change:

* Enable sigaltstack(2) on NetBSD refering to PR pkg/59017.
* Fix file encoding problem of net-imap bundled gem.

Ruby 3.2.9 (2025-07-24)

This release includes the following security fixes:

* CVE-2025-24294: Possible Denial of Service in resolv gem
* CVE-2025-43857: DoS vulnerability in net-imap

and the following fixes for build issues:

* GCC 15.1
* Visual Studio 2022 Version 17.14

What's Changed

* Bug #21286: Windows - MSYS2 just updated to GCC 15.1.0, builds failing
* Bug #21255: Can't build Ruby with Windows SDK 10.0.26100


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ruby32-base/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ruby32-base/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/ruby32-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ruby32-base/patches/patch-.bundle_gems_net-imap-0.3.9_net-imap.gemspec \
    pkgsrc/lang/ruby32-base/patches/patch-vm__core.h
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ruby32-base/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/ruby32-base/patches/patch-lib_resolv.gemspec \
    pkgsrc/lang/ruby32-base/patches/patch-lib_resolv.rb \
    pkgsrc/lang/ruby32-base/patches/patch-test_resolv_test__dns.rb \
    pkgsrc/lang/ruby32-base/patches/patch-tool_rbinstall.rb

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.302 pkgsrc/lang/ruby/rubyversion.mk:1.303
--- pkgsrc/lang/ruby/rubyversion.mk:1.302       Sat Jul 26 06:17:00 2025
+++ pkgsrc/lang/ruby/rubyversion.mk     Sat Jul 26 06:21:35 2025
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.302 2025/07/26 06:17:00 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.303 2025/07/26 06:21:35 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -213,7 +213,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 .endif
 
 # current supported Ruby's version
-RUBY32_VERSION=                3.2.8
+RUBY32_VERSION=                3.2.9
 RUBY33_VERSION=                3.3.8
 RUBY34_VERSION=                3.4.5
 
@@ -351,7 +351,7 @@ RUBY_DEBUG_VER=                     1.7.1
 RUBY_MATRIX_VER=               0.4.2
 RUBY_MINITEST_VER=             5.25.1
 RUBY_NET_FTP_VER=              0.2.1
-RUBY_NET_IMAP_VER=             0.3.8
+RUBY_NET_IMAP_VER=             0.3.9
 RUBY_NET_POP_VER=              0.1.2
 RUBY_NET_SMTP_VER=             0.3.4
 RUBY_POWER_ASSERT_VER=         2.0.3

Index: pkgsrc/lang/ruby32-base/Makefile
diff -u pkgsrc/lang/ruby32-base/Makefile:1.11 pkgsrc/lang/ruby32-base/Makefile:1.12
--- pkgsrc/lang/ruby32-base/Makefile:1.11       Sun Jul 13 15:23:00 2025
+++ pkgsrc/lang/ruby32-base/Makefile    Sat Jul 26 06:21:35 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2025/07/13 15:23:00 taca Exp $
+# $NetBSD: Makefile,v 1.12 2025/07/26 06:21:35 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
@@ -76,9 +75,9 @@ pre-configure:
        ${CHMOD} -x ${WRKSRC}/sample/test.rb
 
 pre-install:
-#      cd ${WRKSRC}/lib; \
-#              ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
-#              -exec ${RM} -f {} \;
+       cd ${WRKSRC}/.bundle; \
+               ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
+               -exec ${RM} -f {} \;
 .for f in ${EMPTY_DIRS}
        ${RMDIR} ${WRKSRC}/lib/rdoc/${f} 2>/dev/null || ${TRUE}
 .endfor

Index: pkgsrc/lang/ruby32-base/PLIST
diff -u pkgsrc/lang/ruby32-base/PLIST:1.7 pkgsrc/lang/ruby32-base/PLIST:1.8
--- pkgsrc/lang/ruby32-base/PLIST:1.7   Sat Feb  8 05:21:30 2025
+++ pkgsrc/lang/ruby32-base/PLIST       Sat Jul 26 06:21:35 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2025/02/08 05:21:30 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/07/26 06:21:35 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/pure.h
 ${RUBY_INC}/ruby/internal/attr/restrict.h
@@ -1411,8 +1412,11 @@ ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/TODO.md
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/exe/rdbg
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/debug.c
+${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/debug_version.h
+${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/extconf.h
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/extconf.rb
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/ext/debug/iseq_collector.c
+${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/exts.mk
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug.rb
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/abbrev_command.rb
 ${GEM_HOME}/gems/debug-${RUBY_DEBUG_VER}/lib/debug/breakpoint.rb
@@ -1498,6 +1502,7 @@ ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMA
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/flags.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/response_data.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/response_parser.rb
+${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/response_reader.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/sasl.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/sasl/saslprep.rb
 ${GEM_HOME}/gems/net-imap-${RUBY_NET_IMAP_VER}/lib/net/imap/sasl/saslprep_tables.rb
@@ -1694,6 +1699,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/doc
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/exe/rbs
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/constants.c
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/constants.h
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/extconf.h
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/extconf.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/lexer.c
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/lexer.h
@@ -1710,6 +1716,7 @@ ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/ruby_objs.c
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/ruby_objs.h
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/ext/rbs_extension/unescape.c
+${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/exts.mk
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/goodcheck.yml
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs.rb
 ${GEM_HOME}/gems/rbs-${RUBY_RBS_VER}/lib/rbs/ancestor_graph.rb

Index: pkgsrc/lang/ruby32-base/distinfo
diff -u pkgsrc/lang/ruby32-base/distinfo:1.16 pkgsrc/lang/ruby32-base/distinfo:1.17
--- pkgsrc/lang/ruby32-base/distinfo:1.16       Sun Jul 13 15:23:00 2025
+++ pkgsrc/lang/ruby32-base/distinfo    Sat Jul 26 06:21:35 2025
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.16 2025/07/13 15:23:00 taca Exp $
+$NetBSD: distinfo,v 1.17 2025/07/26 06:21:35 taca Exp $
 
-BLAKE2s (ruby-3.2.8.tar.xz) = 717b23027da787963039642204ff08d23cfe242d58f0ca7371d621194c96d1c0
-SHA512 (ruby-3.2.8.tar.xz) = 19ff96619945d907e509803b85ecf21750ffa4ae033045272feb43c183ab180d0033b98cf47c18804e448f01bc1928e3b833c61c98446dbe6be31fb9ea6b059d
-Size (ruby-3.2.8.tar.xz) = 15130380 bytes
+BLAKE2s (ruby-3.2.9.tar.xz) = 4a75586ce20da8e18247f2d17ebf72d8d765e72f4996c641292a7114190726d1
+SHA512 (ruby-3.2.9.tar.xz) = 4db0656694c25c971bcf3591516e6feddb7fc60c4474b63dd1d2c1481c3629421edc904666067b2dcbc47357db1a32b7bf412055306fe29cee30fa048f89b6e3
+Size (ruby-3.2.9.tar.xz) = 15141728 bytes
+SHA1 (patch-.bundle_gems_net-imap-0.3.9_net-imap.gemspec) = 8fafe18eeb24bff0a79b558746cfab331e65aa8c
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = 33c6bdd27e22f5a517c90fec882534f4f5d84dbb
+SHA1 (patch-configure) = b653c9443574e9c2e76699063ad2937f77a532b2
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
 SHA1 (patch-include_ruby_internal_static__assert.h) = 7d5c3ae7ff674b9b34639924fcf08237164de9f8
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335
 SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a
-SHA1 (patch-lib_resolv.gemspec) = bf2fa504fcb2451a3b6b4e6d30a30d01f876c166
-SHA1 (patch-lib_resolv.rb) = 1a04a55d54e7d45c7147605b6335f6623ddd92c1
 SHA1 (patch-lib_rubygems.rb) = 060549c43b84f73c77432a72cdcf22941be4eb17
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 66c475a5308deb2ed5096b88cf65549732f87421
 SHA1 (patch-lib_rubygems_config__file.rb) = 1da55a32d931f91321636401e94d89f78f9fa622
@@ -18,9 +17,8 @@ SHA1 (patch-lib_rubygems_dependency__ins
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 0cd0816e1cd7c84c1dab1e091787c4dc38d28273
 SHA1 (patch-lib_rubygems_installer.rb) = 1c94047a24362b3597dac7ea156982a09cb93234
 SHA1 (patch-lib_rubygems_platform.rb) = 58094b26520623f258ecf035084f4aa7226e9686
-SHA1 (patch-test_resolv_test__dns.rb) = 98fd0533ad92bfb6729abd107d75c4ca436fd660
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1814cd41f0b0a93b181799cb117bd1f57068cf33
-SHA1 (patch-tool_rbinstall.rb) = 457aa4ea02caad3496f69dd6eb91ef47501d006a
+SHA1 (patch-vm__core.h) = 93ea431f3dab79a1f38aee670ea22609157b7411
 SHA1 (patch-yjit_not__gmake.mk) = 6f7b63e51d0f5fa25817a458b28d1fd541142dcb

Index: pkgsrc/lang/ruby32-base/patches/patch-configure
diff -u pkgsrc/lang/ruby32-base/patches/patch-configure:1.3 pkgsrc/lang/ruby32-base/patches/patch-configure:1.4
--- pkgsrc/lang/ruby32-base/patches/patch-configure:1.3 Mon Apr 21 20:54:56 2025
+++ pkgsrc/lang/ruby32-base/patches/patch-configure     Sat Jul 26 06:21:35 2025
@@ -1,11 +1,7 @@
-$NetBSD: patch-configure,v 1.3 2025/04/21 20:54:56 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2025/07/26 06:21:35 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.
 

Added files:

Index: pkgsrc/lang/ruby32-base/patches/patch-.bundle_gems_net-imap-0.3.9_net-imap.gemspec
diff -u /dev/null pkgsrc/lang/ruby32-base/patches/patch-.bundle_gems_net-imap-0.3.9_net-imap.gemspec:1.1
--- /dev/null   Sat Jul 26 06:21:36 2025
+++ pkgsrc/lang/ruby32-base/patches/patch-.bundle_gems_net-imap-0.3.9_net-imap.gemspec  Sat Jul 26 06:21:35 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-.bundle_gems_net-imap-0.3.9_net-imap.gemspec,v 1.1 2025/07/26 06:21:35 taca Exp $
+
+lib/net/imap.rb is encoded in UTF-8.  This is fixed by net-imap 0.5.9.
+
+--- .bundle/gems/net-imap-0.3.9/net-imap.gemspec.orig  2025-07-24 08:27:20.000000000 +0000
++++ .bundle/gems/net-imap-0.3.9/net-imap.gemspec
+@@ -2,7 +2,7 @@
+ 
+ name = File.basename(__FILE__, ".gemspec")
+ version = ["lib", Array.new(name.count("-"), "..").join("/")].find do |dir|
+-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
++  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb"), :encoding=> 'utf-8') do |line|
+     /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+   end rescue nil
+ end
Index: pkgsrc/lang/ruby32-base/patches/patch-vm__core.h
diff -u /dev/null pkgsrc/lang/ruby32-base/patches/patch-vm__core.h:1.1
--- /dev/null   Sat Jul 26 06:21:36 2025
+++ pkgsrc/lang/ruby32-base/patches/patch-vm__core.h    Sat Jul 26 06:21:36 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-vm__core.h,v 1.1 2025/07/26 06:21:36 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-24 08:27:18.000000000 +0000
++++ vm_core.h
+@@ -148,7 +148,7 @@ extern int ruby_assert_critical_section_
+ /* define to 0 to test old code path */
+ #define WAITPID_USE_SIGCHLD (RUBY_SIGCHLD || SIGCHLD_LOSSY)
+ 
+-#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 *);

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index