CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue May 19 14:58:52 UTC 2026

Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby40: PLIST distinfo
Added Files:
        pkgsrc/lang/ruby40/patches:
            patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb
Removed Files:
        pkgsrc/lang/ruby40/patches:
            patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_generator_template_aliki___header.rhtml

Log Message:
lang/ruby40: update to 4.0.4

pkgsrc change:

* Fix rdoc problem on C locale, backported from rdoc-7.0.4.
  (So, no need to patch a template file to character entity reference.)

Ruby 4.0.4 (2026-05-11)

* Bug #21955: Fiber#transfer: machine stack not released when fiber
  terminates, causing FiberError: can't set a guard page
* Bug #21964: Fiber stack acquire can expand unnecessarily
* Bug #21971: Fix regexp performance regression for patterns starting with
  s/k
* Bug #21961: Marshal.load freeze option fail to freeze linked strings
* Bug #21959: rb_internal_thread_event_hooks_rw_lock is not reinitialized
  after fork causing deadlocks
* Bug #21954: NoMethodError instead of Gem::LoadError on gem activation
  problem in Ruby 4.0.2
* Bug #21844: Inconsistent ArgumentError message for Data::define.new
* Bug #21992: Defining BasicObject#initialize causes segmentation fault
* Bug #22018: ISeq created via RubyVM::InstructionSequence.compile don't
  support coverage
* Bug #21985: RubyVM::AST negative numbers do not include - in location
* Bug #21986: RubyVM::AST incorrect location for literals followed by
  modifier if
* Bug #21933: Ruby::Box: named capture local variable can become nil after
  non-matching lines
* Bug #21940: Ruby::Box: $_ returns stale value due to gvar_tbl caching
* Bug #22004: parse.y doesn't executes loop body with while true || true
  condition
* Bug #21952: Ruby::Box double free at process exit when fiddle/import is
  required in multiple boxes
* Bug #22003: .bundle extensions not built when doing out-of-source build
* Bug #22002: argument stack underflow (-1)


To generate a diff of this commit:
cvs rdiff -u -r1.322 -r1.323 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby40/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ruby40/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_generator_template_aliki___header.rhtml
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.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.322 pkgsrc/lang/ruby/rubyversion.mk:1.323
--- pkgsrc/lang/ruby/rubyversion.mk:1.322       Wed May  6 05:28:22 2026
+++ pkgsrc/lang/ruby/rubyversion.mk     Tue May 19 14:58:52 2026
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.322 2026/05/06 05:28:22 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.323 2026/05/19 14:58:52 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.11
 RUBY34_VERSION=                3.4.9
-RUBY40_VERSION=                4.0.3
+RUBY40_VERSION=                4.0.4
 
 # current API compatible version; used for version of shared library
 RUBY33_API_VERSION=    3.3.0
@@ -466,10 +466,10 @@ RUBY_VERSION=             ${RUBY40_VERSION}
 RUBY_ABI_VERSION=      ${RUBY_VERSION}
 RUBY_SUFFIX=           ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
 
-RUBY_RUBYGEMS_VER=             4.0.3
+RUBY_RUBYGEMS_VER=             4.0.10
 
 # default gems
-RUBY_BUNDLER_VER=              4.0.6
+RUBY_BUNDLER_VER=              4.0.10
 RUBY_CGI_VER=                  0.4.2   #
 RUBY_DELEGATE_VER=             0.6.1
 RUBY_DID_YOU_MEAN_VER=         2.0.0

Index: pkgsrc/lang/ruby40/PLIST
diff -u pkgsrc/lang/ruby40/PLIST:1.2 pkgsrc/lang/ruby40/PLIST:1.3
--- pkgsrc/lang/ruby40/PLIST:1.2        Tue May  5 14:09:07 2026
+++ pkgsrc/lang/ruby40/PLIST    Tue May 19 14:58:52 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2026/05/05 14:09:07 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/05/19 14:58:52 taca Exp $
 bin/bundle${RUBY_SUFFIX}
 bin/bundler${RUBY_SUFFIX}
 bin/erb${RUBY_SUFFIX}
@@ -421,6 +421,7 @@ ${RUBY_LIB}/bundler/templates/newgem/bin
 ${RUBY_LIB}/bundler/templates/newgem/circleci/config.yml.tt
 ${RUBY_LIB}/bundler/templates/newgem/exe/newgem.tt
 ${RUBY_LIB}/bundler/templates/newgem/ext/newgem/Cargo.toml.tt
+${RUBY_LIB}/bundler/templates/newgem/ext/newgem/build.rs.tt
 ${RUBY_LIB}/bundler/templates/newgem/ext/newgem/extconf-c.rb.tt
 ${RUBY_LIB}/bundler/templates/newgem/ext/newgem/extconf-go.rb.tt
 ${RUBY_LIB}/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt
@@ -430,6 +431,7 @@ ${RUBY_LIB}/bundler/templates/newgem/ext
 ${RUBY_LIB}/bundler/templates/newgem/ext/newgem/newgem.go.tt
 ${RUBY_LIB}/bundler/templates/newgem/ext/newgem/newgem.h.tt
 ${RUBY_LIB}/bundler/templates/newgem/ext/newgem/src/lib.rs.tt
+${RUBY_LIB}/bundler/templates/newgem/github/workflows/build-gems.yml.tt
 ${RUBY_LIB}/bundler/templates/newgem/github/workflows/main.yml.tt
 ${RUBY_LIB}/bundler/templates/newgem/gitignore.tt
 ${RUBY_LIB}/bundler/templates/newgem/gitlab-ci.yml.tt

Index: pkgsrc/lang/ruby40/distinfo
diff -u pkgsrc/lang/ruby40/distinfo:1.7 pkgsrc/lang/ruby40/distinfo:1.8
--- pkgsrc/lang/ruby40/distinfo:1.7     Fri May 15 16:58:55 2026
+++ pkgsrc/lang/ruby40/distinfo Tue May 19 14:58:52 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2026/05/15 16:58:55 wiz Exp $
+$NetBSD: distinfo,v 1.8 2026/05/19 14:58:52 taca Exp $
 
-BLAKE2s (ruby-4.0.3.tar.xz) = 0d31978571c4c160cce72d1bab331681206800c6ec1fb61f63f9947c9d2186be
-SHA512 (ruby-4.0.3.tar.xz) = 5816fb264ce76df59f4bfe0cadceb45025fada2e61f2c14024d6b03f63d304820cddf94afcf82a4951fd12f3b0d9148683f856f3f2245d56042fc8407b6cbff5
-Size (ruby-4.0.3.tar.xz) = 17878572 bytes
+BLAKE2s (ruby-4.0.4.tar.xz) = a696d1728a4e9cc6ee48408c4a43046f181fd5e690a870ea416c5c3c3e2622a7
+SHA512 (ruby-4.0.4.tar.xz) = cccc041379fd4e46a736a5c10ccf81627766a7175113c34754797b915bebcd0ce821d9cd7b42cc616b0a1f9ee38eee5ab7560c1840fa6672819c293e498a3f6f
+Size (ruby-4.0.4.tar.xz) = 17899740 bytes
 SHA1 (patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_encoding.rb) = e46514327db9c2fb7f6eccd9c8af52e85c6310cd
-SHA1 (patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_generator_template_aliki___header.rhtml) = e8752b12058f5e71e31d696de65da9360dc5d12d
+SHA1 (patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb) = faca1639f7efde71ab297861667192cb6ddf41d6
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
 SHA1 (patch-configure) = ff1b1e659ddc7cb1d62a71e1447df55f1f7b07c2
 SHA1 (patch-include_ruby_internal_static__assert.h) = 7d5c3ae7ff674b9b34639924fcf08237164de9f8

Added files:

Index: pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb
diff -u /dev/null pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb:1.1
--- /dev/null   Tue May 19 14:58:52 2026
+++ pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb       Tue May 19 14:58:52 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb,v 1.1 2026/05/19 14:58:52 taca Exp $
+
+Backport from rdoc-7.0.4.
+
+--- .bundle/gems/rdoc-7.0.3/lib/rdoc/parser/c.rb.orig  2026-05-11 21:07:54.000000000 +0000
++++ .bundle/gems/rdoc-7.0.3/lib/rdoc/parser/c.rb
+@@ -1014,7 +1014,7 @@ class RDoc::Parser::C < RDoc::Parser
+         file_name = File.join @file_dir, source_file
+ 
+         if File.exist? file_name then
+-          file_content = File.read file_name
++          file_content = RDoc::Encoding.read_file file_name, @options.encoding
+         else
+           @options.warn "unknown source #{source_file} for #{meth_name} in #{@file_name}"
+         end