CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed May 20 13:13:37 UTC 2026

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

Log Message:
lang/ruby40: update to 4.0.5

Ruby 4.0.5 (2026-05-20)

* CVE-2026-46727: Use-after-free in pthread-based getaddrinfo timeout
  handler

* Bug #22065: make rdoc fails with invalid byte sequence in US-ASCII on Ruby
  4.0.4 under C locale - Ruby - Ruby Issue Tracking System


To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ruby40/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.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.323 pkgsrc/lang/ruby/rubyversion.mk:1.324
--- pkgsrc/lang/ruby/rubyversion.mk:1.323       Tue May 19 14:58:52 2026
+++ pkgsrc/lang/ruby/rubyversion.mk     Wed May 20 13:13:37 2026
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.323 2026/05/19 14:58:52 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.324 2026/05/20 13:13:37 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.4
+RUBY40_VERSION=                4.0.5
 
 # current API compatible version; used for version of shared library
 RUBY33_API_VERSION=    3.3.0
@@ -549,7 +549,7 @@ RUBY_PRIME_VER=                     0.1.4
 RUBY_RACC_VER=                 1.8.1
 RUBY_RAKE_VER=                 13.3.1
 RUBY_RBS_VER=                  3.10.0
-RUBY_RDOC_VER=                 7.0.3
+RUBY_RDOC_VER=                 7.0.4
 RUBY_READLINE_VER=             0.0.4
 RUBY_RELINE_VER=               0.6.3
 RUBY_REPL_TYPE_COMPLETOR_VER=  0.1.12

Index: pkgsrc/lang/ruby40/distinfo
diff -u pkgsrc/lang/ruby40/distinfo:1.8 pkgsrc/lang/ruby40/distinfo:1.9
--- pkgsrc/lang/ruby40/distinfo:1.8     Tue May 19 14:58:52 2026
+++ pkgsrc/lang/ruby40/distinfo Wed May 20 13:13:37 2026
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2026/05/19 14:58:52 taca Exp $
+$NetBSD: distinfo,v 1.9 2026/05/20 13:13:37 taca Exp $
 
-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_parser_c.rb) = faca1639f7efde71ab297861667192cb6ddf41d6
+BLAKE2s (ruby-4.0.5.tar.xz) = 654cd56c0e98273f2b5e1985eafa2518de957415985c2dbb4b477511b2dea802
+SHA512 (ruby-4.0.5.tar.xz) = 379d78a6d1af0455df60da46551f43438ad3ee81f83787554fc34cb1c8febb1bd363e3dc1a057b34a69f96526efc308d3dccc4b87d368897c2d1ccf179096463
+Size (ruby-4.0.5.tar.xz) = 17893756 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

Added files:

Index: pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb
diff -u /dev/null pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb:1.1
--- /dev/null   Wed May 20 13:13:37 2026
+++ pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb       Wed May 20 13:13:37 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb,v 1.1 2026/05/20 13:13:37 taca Exp $
+
+* Always convert "\r\n" to "\n" since it cause rdoc processing error.
+
+--- .bundle/gems/rdoc-7.0.4/lib/rdoc/encoding.rb.orig  2026-05-19 23:22:56.000000000 +0000
++++ .bundle/gems/rdoc-7.0.4/lib/rdoc/encoding.rb
+@@ -31,7 +31,7 @@ module RDoc::Encoding
+ 
+   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")
+ 
+     utf8 = content.sub!(/\A\xef\xbb\xbf/, '')
+