CVS commit: [pkgsrc-2026Q3] pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: [pkgsrc-2026Q3] pkgsrc/lang
From: "Maya Rashish" <maya%netbsd.org@localhost>
Date: Tue, 20 Oct 2026 23:07:19 +0000

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Oct 20 23:07:19 UTC 2026

Modified Files:
        pkgsrc/lang/ruby [pkgsrc-2026Q3]: rubyversion.mk
        pkgsrc/lang/ruby34 [pkgsrc-2026Q3]: Makefile distinfo
        pkgsrc/lang/ruby34/patches [pkgsrc-2026Q3]: patch-template_Makefile.in
Removed Files:
        pkgsrc/lang/ruby34/patches [pkgsrc-2026Q3]: patch-lib_resolv.rb

Log Message:
Pullup ticket #7276 - requested by taca
lang/ruby34: Security fix

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.332
- lang/ruby34/Makefile                                          1.13
- lang/ruby34/distinfo                                          1.19-1.20
- lang/ruby34/patches/patch-lib_resolv.rb                       deleted
- lang/ruby34/patches/patch-template_Makefile.in                1.2

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Tue Sep 22 09:29:37 UTC 2026

   Modified Files:
        pkgsrc/lang/ruby34: distinfo
        pkgsrc/lang/ruby34/patches: patch-template_Makefile.in

   Log Message:
   lang/ruby34: Fix ruby-rjit option

   Fix build problem with ruby-rjit PKG_OPTIONS provided by PR pkg/60763.

   No PKGREVISION bump since it is simply build problem.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Thu Sep 24 15:28:57 UTC 2026

   Modified Files:
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/ruby34: Makefile distinfo
   Removed Files:
        pkgsrc/lang/ruby34/patches: patch-lib_resolv.rb

   Log Message:
   lang/ruby34: update to 3.4.11

   3.4.11 (2026-09-23)

   * Bug #22196: Heap-use-after-free in fiber_switch with transfer-termina=
   ted
     async tasks on 3.4.10
   * Guard fiber target across fiber_store. by samuel-williams-shopify =B7=
    Pull
     Request #17951
   * Bug #21842: Encoding of rb_interned_str
   * Bug #22126: Stack underflow for partial DCE and loops
   * Bug #22124: void value missed in parse.y
   * Bug #22183: parse.y interpolation inside lambda literal
   * Bug #22099: Keyword-only method silently accepts a positional argumen=
   t
   * Bug #22133: Ruby's default SIGINT handling ignores Thread.handle_inte=
   rrupt
     masking.
   * Bug #22189: Enumerator::Lazy#to_enum does not accept method names as =
   strings
   * Bug #22191: Signal.trap(:EXIT) exception only shown if at_exit also r=
   aises
   * Bug #22198: win32: heap overflow in Kernel#system
   * Bug #20958: fix ENV.keys encoding on windows
   * Bug #11438: native_thread_init_stack() get machine.stack_start unequa=
   l to
     thread's stack start address, x86 win32
   * Bug #22218: Line TracePoint misses executed loop condition after a gu=
   ard
   * Bug #22223: Socket.tcp with connect_timeout returns a phantom "connec=
   ted"
     socket for a refused connection on macOS 27 (kernel answers EISCONN o=
   n
     connect retry; SO_ERROR never consulted)
   * Bug #22290: Adding instance variables to anonymous object may bloat a=
   ll
     future classes
   * Bug #22269: Coverage.line_stub clobbers already-collected coverage da=
   ta
   * Bug #22257: Prepending a module to an already-included module leaves =
   stale
     super caches
   * Handle spurious wakeups in Thread#join. by samuel-williams-shopify =B7=
    Pull
     Request #13532
   * Bug #22311: Build crashes on macOS 26 with the macOS 27 SDK because
     pipe2() and dup3() are unavailable
   * 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 pro=
   cess
   * Bug #22315: heap-use-after-free in String unpack with a block that mu=
   tates
     the receiver
   * Bug #22318: heap uaf triggered in array.flatten
   * Bug #22319: heap buffer overflow triggered by array's zip function
   * Bug #22322: AddressSanitizer: use-after-poison in econv_description
     /ruby-src/build/../transcode.c
   * Bug #22321: Assertion Failed:
     rb_vm_search_method_slowpath:RB_TYPE_2_P(klass, RUBY_T_CLASS,
     RUBY_T_ICLASS): klass: T_MODULE
   * Bug #22334: Assertion Failed: VM_ENV_FLAGS:FIXNUM_P(flags)
   * Bug #22336: IO:Buffer Heap uaf
   * Bug #9932: Permutation - Segment fault
   * Bug #22330: heap uaf from string.encode()
   * Bug #22340: Win32: File.stat succeeds on symbolic-link loops on Windo=
   ws
   * Bug #22335: Stack corruption with >31 keyword args and refined Intege=
   r#=3D=3D
   * Bug #22338: [Backport] win32: create directory symlinks for relative
     directory targets


To generate a diff of this commit:
cvs rdiff -u -r1.331 -r1.331.2.1 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.12 -r1.12.2.1 pkgsrc/lang/ruby34/Makefile
cvs rdiff -u -r1.18 -r1.18.2.1 pkgsrc/lang/ruby34/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/ruby34/patches/patch-lib_resolv.rb
cvs rdiff -u -r1.1 -r1.1.2.1 \
    pkgsrc/lang/ruby34/patches/patch-template_Makefile.in

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.331 pkgsrc/lang/ruby/rubyversion.mk:1.331.2.1
--- pkgsrc/lang/ruby/rubyversion.mk:1.331       Wed Sep 16 15:00:09 2026
+++ pkgsrc/lang/ruby/rubyversion.mk     Tue Oct 20 23:07:18 2026
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.331 2026/09/16 15:00:09 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.331.2.1 2026/10/20 23:07:18 maya Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -213,7 +213,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 
 # current supported Ruby's version
 RUBY33_VERSION=                3.3.12
-RUBY34_VERSION=                3.4.10
+RUBY34_VERSION=                3.4.11
 RUBY40_VERSION=                4.0.7
 
 # current API compatible version; used for version of shared library

Index: pkgsrc/lang/ruby34/Makefile
diff -u pkgsrc/lang/ruby34/Makefile:1.12 pkgsrc/lang/ruby34/Makefile:1.12.2.1
--- pkgsrc/lang/ruby34/Makefile:1.12    Wed Sep 16 15:00:10 2026
+++ pkgsrc/lang/ruby34/Makefile Tue Oct 20 23:07:18 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2026/09/16 15:00:10 taca Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2026/10/20 23:07:18 maya Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
-PKGREVISION=   2
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby34/distinfo
diff -u pkgsrc/lang/ruby34/distinfo:1.18 pkgsrc/lang/ruby34/distinfo:1.18.2.1
--- pkgsrc/lang/ruby34/distinfo:1.18    Wed Sep 16 15:00:10 2026
+++ pkgsrc/lang/ruby34/distinfo Tue Oct 20 23:07:18 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2026/09/16 15:00:10 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2026/10/20 23:07:18 maya Exp $
 
-BLAKE2s (ruby-3.4.10.tar.xz) = f572159895927752a9dc04403c0ba186008aa8e3cf3c340eddb441444c48ac71
-SHA512 (ruby-3.4.10.tar.xz) = c28d59946c0a1b8e4385a772e0651c6f4154c18ab8a2a62289c3213eb4fe937cec0942e0076cda429576e58ad277b18f4b5611e644d15b122c1cd96baf10f284
-Size (ruby-3.4.10.tar.xz) = 16709188 bytes
+BLAKE2s (ruby-3.4.11.tar.xz) = e1314342598a9634334df928eef6bf0939b110f0ea5d99c39fe3adf7f73600a9
+SHA512 (ruby-3.4.11.tar.xz) = 466952978880190ca8eae2709a42f4cb8983aa2fa329219ef1cbe309de549928d4f94078cd70b168b313833ed9b7f8bbbe3c21ef2e772a3d3bf0c68cab669d2a
+Size (ruby-3.4.11.tar.xz) = 16712500 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
 SHA1 (patch-configure) = ff1b1e659ddc7cb1d62a71e1447df55f1f7b07c2
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
@@ -10,7 +10,6 @@ SHA1 (patch-include_ruby_internal_static
 SHA1 (patch-lib_mkmf.rb) = ea66bc4e42d2b15edfcd8ceefa9b94d07a3cdd0f
 SHA1 (patch-lib_rdoc_encoding.rb) = aea07b878cbf46ddfdc0364ca5adf3fda9311735
 SHA1 (patch-lib_rdoc_parser_c.rb) = 5d97f938379b05443438e8ae841d56c321a22c1a
-SHA1 (patch-lib_resolv.rb) = 2cc29bff6154d09b20f453b386e495d07f1b2add
 SHA1 (patch-lib_rubygems.rb) = 81af71ae9b0c3fef2ad1de88a542b3ece14b4519
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 66c475a5308deb2ed5096b88cf65549732f87421
 SHA1 (patch-lib_rubygems_config__file.rb) = 584f8cd9ef1d1b9bf25efc7e85c2219166db7ac9
@@ -19,7 +18,7 @@ SHA1 (patch-lib_rubygems_install__update
 SHA1 (patch-lib_rubygems_installer.rb) = 4ef74b4f79837a929e81bcd0e7eba9061a442304
 SHA1 (patch-lib_rubygems_platform.rb) = bde36a8fc1ba2fbf4d6fb8829bc116fb4d09b404
 SHA1 (patch-lib_rubygems_specification.rb) = a3154185ef89fb33e699dd54b19a8e274f3275e0
-SHA1 (patch-template_Makefile.in) = 3cf5d612ef725dc64d6a90d377b191a29ebfdf17
+SHA1 (patch-template_Makefile.in) = 843b42816939f25321f83eabfc5a35bd598428e7
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1803bb6a1836e232dcabcf38f11c9881dbf726ea

Index: pkgsrc/lang/ruby34/patches/patch-template_Makefile.in
diff -u pkgsrc/lang/ruby34/patches/patch-template_Makefile.in:1.1 pkgsrc/lang/ruby34/patches/patch-template_Makefile.in:1.1.2.1
--- pkgsrc/lang/ruby34/patches/patch-template_Makefile.in:1.1   Sun Sep  6 15:13:58 2026
+++ pkgsrc/lang/ruby34/patches/patch-template_Makefile.in       Tue Oct 20 23:07:19 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-template_Makefile.in,v 1.1 2026/09/06 15:13:58 kikadf Exp $
+$NetBSD: patch-template_Makefile.in,v 1.1.2.1 2026/10/20 23:07:19 maya Exp $
 
 Try fixing make parallelism/submake problems.
 
@@ -8,9 +8,27 @@ Try fixing make parallelism/submake prob
 
 https://bugs.ruby-lang.org/issues/22059
 
---- template/Makefile.in.orig  2026-05-07 20:25:14.644318083 +0000
+rjit_c.c has a DTrace hook (RUBY_DTRACE_CMETHOD_RETURN_HOOK) but its
+object was not in DTRACE_DEPENDENT_OBJS, so on a DTRACE_REBUILD=yes
+system such as NetBSD "dtrace -G" never processed it and linking
+miniruby failed with --enable-rjit:
+
+  ld: rjit_c.o: relocation R_X86_64_PLT32 against absolute symbol
+  `__dtraceenabled_ruby___cmethod__return' in section `.text' is disallowed
+
+Same fix as upstream made for yjit.o (https://bugs.ruby-lang.org/issues/18480).
+
+--- template/Makefile.in.orig  2026-06-30 10:54:35.000000000 +0000
 +++ template/Makefile.in
-@@ -523,7 +523,7 @@ probes.stamp: $(DTRACE_REBUILD_OBJS)
+@@ -203,6 +203,7 @@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) 
+                       string.$(OBJEXT) \
+                       symbol.$(OBJEXT) \
+                       vm.$(OBJEXT) \
++                      rjit_c.$(OBJEXT) \
+                       $(YJIT_OBJ)
+ 
+ THREAD_MODEL  = @THREAD_MODEL@
+@@ -513,7 +514,7 @@ _PREFIXED_SYMBOL = TOKEN_PASTE($(SYMBOL_
  
  probes.stamp: $(DTRACE_REBUILD_OBJS)
        $(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
@@ -19,7 +37,7 @@ https://bugs.ruby-lang.org/issues/22059
          $(ECHO0) "rebuilding objects which were modified by \"dtrace -G\""; \
          $(MAKE) $(DTRACE_REBUILD_OBJS); \
        fi
-@@ -537,7 +537,7 @@ probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:
+@@ -527,7 +528,7 @@ probes.$(OBJEXT): $(srcdir)/probes.d $(D
  
  # DTrace static library hacks described here:
  # https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4

Prev by Date: CVS commit: pkgsrc/security/mozilla-rootcerts-openssl
Next by Date: CVS commit: [pkgsrc-2026Q3] pkgsrc/lang
Previous by Thread: CVS commit: pkgsrc/security/mozilla-rootcerts-openssl
Next by Thread: CVS commit: [pkgsrc-2026Q3] pkgsrc/lang
Indexes:

Home | Main Index | Thread Index | Old Index