CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Sep 16 14:08:24 UTC 2026

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby40: distinfo
        pkgsrc/lang/ruby40/patches:
            patch-lib_rubygems_commands_setup__command.rb

Log Message:
lang/ruby40: update to 4.0.7

This release contains fix for CVE-2026-80212 and CVE-2026-80213 in resolv
gem.

4.0.7 (2026-09-15)

* Bug #22188: addr2line doesn't find symbols when compiled with GCC LTO

* Bug #22210: Check if issue #19969 is still reproducible / re-opened in 4.0.x

* Bug #22217: Segmentation fault when resuming execution with Coverage.start
  and ruby/debug

* Fix formatting in ObjectSpace._id2ref error path by eregon · Pull Request
  #18206

* Bug #22200: ObjectSpace._id2ref can return a different object than the
  id's owner on Ruby 4.0 (stale id2ref_tbl entry for objects with generic
  fields)

* Bug #22123: Ruby::Box + BUNDLER_SETUP can evaluate gemspecs before
  main-box RubyGems initialization

* Bump ERB to 6.0.7 by k0kubun · Pull Request #18282

* Bug #22237: GC.auto_compact corrupts a String or segfaults from String#tr
  with dup or gsub

* Bug #22243: Change fork behavior when Process._fork raises an exception
  during fork with a block argument

* Bug #22223: Socket.tcp with connect_timeout returns a phantom "connected"
  socket for a refused connection on macOS 27 (kernel answers EISCONN on
  connect retry; SO_ERROR never consulted)

* Bug #22220: Performance regression when requiring aws-sdk-ec2 in Ruby
  4.0.6

* Bug #22218: Line TracePoint misses executed loop condition after a guard

* Bug #22198: win32: heap overflow in Kernel#system

* Bug #22196: Heap-use-after-free in fiber_switch with transfer-terminated
  async tasks on 3.4.10

* Bug #22190: Class#subclasses does not include clones of classes that
  include modules

* Bug #11438: native_thread_init_stack() get machine.stack_start unequal to
  thread's stack start address, x86 win32

* Bug #22257: Prepending a module to an already-included module leaves stale
  super caches

* Bug #22242: SEGV in method dispatch (vm_call_iseq_setup_kwparm_nokwarg /
  def_iseq_ptr) on Ruby 4.0.6 — Rails CI

* Bug #22269: Coverage.line_stub clobbers already-collected coverage data

* Bug #22290: Adding instance variables to anonymous object may bloat all
  future classes

* Bug #22292: YJIT/ZJIT: Struct accessor crashes after an instance variable
  is set on a Struct that exactly fills the largest GC slot

* Bug #20958: fix ENV.keys encoding on windows

* Bug #22259: Arrays sharding a buffer segfault when concatenating with each
  other

* Bug #22264: Warning missing from parse.y hash literals

* Bug #22303: EncodingError from interpolating symbol crashes whole process

* Bug #22224: YJIT: rb_yjit_invalidate_ep_is_bp takes the VM lock stopping
  Ractors on every Proc materialization; multi-Ractor throughput collapses
  (up to ~150x)


To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/ruby40/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ruby40/patches/patch-lib_rubygems_commands_setup__command.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.328 pkgsrc/lang/ruby/rubyversion.mk:1.329
--- pkgsrc/lang/ruby/rubyversion.mk:1.328       Fri Jul 24 15:55:14 2026
+++ pkgsrc/lang/ruby/rubyversion.mk     Wed Sep 16 14:08:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.328 2026/07/24 15:55:14 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.329 2026/09/16 14:08:24 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -214,7 +214,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 # current supported Ruby's version
 RUBY33_VERSION=                3.3.12
 RUBY34_VERSION=                3.4.10
-RUBY40_VERSION=                4.0.6
+RUBY40_VERSION=                4.0.7
 
 # current API compatible version; used for version of shared library
 RUBY33_API_VERSION=    3.3.0
@@ -469,12 +469,12 @@ RUBY_SUFFIX=              ${_RUBY_VER_MAJOR}${_RUBY_
 RUBY_RUBYGEMS_VER=             4.0.16
 
 # default gems
-RUBY_BUNDLER_VER=              4.0.16
+RUBY_BUNDLER_VER=              4.0.20
 RUBY_CGI_VER=                  0.4.2   #
 RUBY_DELEGATE_VER=             0.6.1
 RUBY_DID_YOU_MEAN_VER=         2.0.0
 RUBY_ENGLISH_VER=              0.8.1
-RUBY_ERB_VER=                  6.0.1.1
+RUBY_ERB_VER=                  6.0.7
 RUBY_ERROR_HIGHLIGHT_VER=      0.7.2
 RUBY_FILEUTILS_VER=            1.8.0
 RUBY_FIND_VER=                 0.2.0
@@ -488,7 +488,7 @@ RUBY_OPTPARSE_VER=          0.8.1
 RUBY_PP_VER=                   0.6.3
 RUBY_PRETTYPRINT_VER=          0.2.0
 RUBY_PRISM_VER=                        1.8.1
-RUBY_RESOLV_VER=               0.7.0
+RUBY_RESOLV_VER=               0.7.2
 RUBY_RUBY2_KEYWORDS_VER=       0.0.5
 RUBY_SECURERANDOM_VER=         0.4.1
 RUBY_SET_VER=                  1.1.1   #

Index: pkgsrc/lang/ruby40/distinfo
diff -u pkgsrc/lang/ruby40/distinfo:1.10 pkgsrc/lang/ruby40/distinfo:1.11
--- pkgsrc/lang/ruby40/distinfo:1.10    Sat Jul 18 14:04:38 2026
+++ pkgsrc/lang/ruby40/distinfo Wed Sep 16 14:08:24 2026
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.10 2026/07/18 14:04:38 taca Exp $
+$NetBSD: distinfo,v 1.11 2026/09/16 14:08:24 taca Exp $
 
-BLAKE2s (ruby-4.0.6.tar.xz) = 6e92c9aea4ef38b0969693b889fcf67b250573ca95c01d70ebe8918dfbe385de
-SHA512 (ruby-4.0.6.tar.xz) = c9c391675a098b5a27dd687571ab0a164c788cbb8ddcbab6d17a3e8b3c4ba389346b2e6d7807d38db3e74d225c70e378a296d60d0f465cb0fcec9702242c83c6
-Size (ruby-4.0.6.tar.xz) = 17968092 bytes
+BLAKE2s (ruby-4.0.7.tar.xz) = 1ba142e7e04de5a460853b3fc9a28bf42b6c60eb87a6c365c2bb576bb0af28b7
+SHA512 (ruby-4.0.7.tar.xz) = d1d345c25bff43aa86f536b22cd04746a7d3372077bf47ec75ef1820c0b43d0dbe3573dd5e5c55ee517796f46f0cdbd22c7506aebd06581241eefb5ffd9d2e5f
+Size (ruby-4.0.7.tar.xz) = 17995980 bytes
 SHA1 (patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb) = 896fc0825d59174b508bcfc5d17727f0d0b1050f
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
 SHA1 (patch-configure) = ff1b1e659ddc7cb1d62a71e1447df55f1f7b07c2
 SHA1 (patch-include_ruby_internal_static__assert.h) = 7d5c3ae7ff674b9b34639924fcf08237164de9f8
 SHA1 (patch-lib_mkmf.rb) = ea66bc4e42d2b15edfcd8ceefa9b94d07a3cdd0f
 SHA1 (patch-lib_rubygems.rb) = bea18f991525d7ed72d8a5a64539e6fd247e1d30
-SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 66c475a5308deb2ed5096b88cf65549732f87421
+SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 818df7f6992ee07446927a40da1a1243f9d4c587
 SHA1 (patch-lib_rubygems_config__file.rb) = 584f8cd9ef1d1b9bf25efc7e85c2219166db7ac9
 SHA1 (patch-lib_rubygems_dependency__installer.rb) = d143128b21a3803136c2d0000d75a1cf50d77155
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 0cd0816e1cd7c84c1dab1e091787c4dc38d28273

Index: pkgsrc/lang/ruby40/patches/patch-lib_rubygems_commands_setup__command.rb
diff -u pkgsrc/lang/ruby40/patches/patch-lib_rubygems_commands_setup__command.rb:1.1 pkgsrc/lang/ruby40/patches/patch-lib_rubygems_commands_setup__command.rb:1.2
--- pkgsrc/lang/ruby40/patches/patch-lib_rubygems_commands_setup__command.rb:1.1        Tue Feb  3 16:00:33 2026
+++ pkgsrc/lang/ruby40/patches/patch-lib_rubygems_commands_setup__command.rb    Wed Sep 16 14:08:24 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.1 2026/02/03 16:00:33 taca Exp $
+$NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.2 2026/09/16 14:08:24 taca Exp $
 
 * Make sure to setup under DESTDIR.
 
---- lib/rubygems/commands/setup_command.rb.orig        2022-11-24 10:20:31.000000000 +0000
+--- lib/rubygems/commands/setup_command.rb.orig        2026-09-14 23:54:56.000000000 +0000
 +++ lib/rubygems/commands/setup_command.rb
-@@ -185,7 +185,7 @@ By default, this RubyGems will install g
+@@ -172,7 +172,7 @@ By default, this RubyGems will install g
  
      uninstall_old_gemcutter
  
@@ -13,7 +13,7 @@ $NetBSD: patch-lib_rubygems_commands_set
  
      say
      if @verbose
-@@ -318,11 +318,15 @@ By default, this RubyGems will install g
+@@ -295,11 +295,15 @@ By default, this RubyGems will install g
      end
    end
  
@@ -30,12 +30,3 @@ $NetBSD: patch-lib_rubygems_commands_set
      begin
        Gem.ensure_gem_subdirectories Gem.dir
      rescue SystemCallError
-@@ -333,7 +337,7 @@ By default, this RubyGems will install g
-        (!File.exist?(rubygems_doc_dir) ||
-         File.writable?(rubygems_doc_dir))
-       say "Removing old RubyGems RDoc and ri" if @verbose
--      Dir[File.join(Gem.dir, "doc", "rubygems-[0-9]*")].each do |dir|
-+      Dir[File.join(gem_doc_dir, "rubygems-[0-9]*")].each do |dir|
-         rm_rf dir
-       end
-