pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: [pkgsrc-2026Q1] pkgsrc/lang
Module Name: pkgsrc
Committed By: maya
Date: Thu May 21 03:07:30 UTC 2026
Modified Files:
pkgsrc/lang/ruby [pkgsrc-2026Q1]: rubyversion.mk
pkgsrc/lang/ruby40 [pkgsrc-2026Q1]: Makefile PLIST distinfo
Added Files:
pkgsrc/lang/ruby40/patches [pkgsrc-2026Q1]:
patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb
patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb
patch-template_Makefile.in
Removed Files:
pkgsrc/lang/ruby40/patches [pkgsrc-2026Q1]:
patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_generator_template_aliki___header.rhtml
Log Message:
Pullup ticket #7124 - requested by taca
lang/ruby40: Security fix
Revisions pulled up:
- lang/ruby/rubyversion.mk 1.323-1.324
- lang/ruby40/Makefile 1.3
- lang/ruby40/PLIST 1.3
- lang/ruby40/distinfo 1.6-1.9
- lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_generator_template_aliki___header.rhtml deleted
- lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb deleted
- lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb 1.1
- lang/ruby40/patches/patch-template_Makefile.in 1.3-1.4
---
Module Name: pkgsrc
Committed By: wiz
Date: Fri May 15 16:56:19 UTC 2026
Modified Files:
pkgsrc/lang/ruby40: Makefile distinfo
Added Files:
pkgsrc/lang/ruby40/patches: patch-template_Makefile.in
Log Message:
ruby40: fix parallel build and dtrace-related build problem
---
Module Name: pkgsrc
Committed By: wiz
Date: Fri May 15 16:58:55 UTC 2026
Modified Files:
pkgsrc/lang/ruby40: distinfo
pkgsrc/lang/ruby40/patches: patch-template_Makefile.in
Log Message:
ruby40: add upstream bug report to patch
---
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)
---
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.314.2.7 -r1.314.2.8 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 pkgsrc/lang/ruby40/Makefile \
pkgsrc/lang/ruby40/PLIST
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 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.2.2.2 \
pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb
cvs rdiff -u -r0 -r1.1.2.2 \
pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb
cvs rdiff -u -r0 -r1.4.2.2 \
pkgsrc/lang/ruby40/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.314.2.7 pkgsrc/lang/ruby/rubyversion.mk:1.314.2.8
--- pkgsrc/lang/ruby/rubyversion.mk:1.314.2.7 Tue May 12 18:38:42 2026
+++ pkgsrc/lang/ruby/rubyversion.mk Thu May 21 03:07:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.314.2.7 2026/05/12 18:38:42 bsiegert Exp $
+# $NetBSD: rubyversion.mk,v 1.314.2.8 2026/05/21 03:07:30 maya Exp $
#
# This file determines which Ruby version is used as a dependency for
@@ -215,7 +215,7 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
RUBY32_VERSION= 3.2.11
RUBY33_VERSION= 3.3.11
RUBY34_VERSION= 3.4.9
-RUBY40_VERSION= 4.0.3
+RUBY40_VERSION= 4.0.5
# current API compatible version; used for version of shared library
RUBY32_API_VERSION= 3.2.0
@@ -564,10 +564,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
@@ -647,7 +647,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/Makefile
diff -u pkgsrc/lang/ruby40/Makefile:1.1.2.1 pkgsrc/lang/ruby40/Makefile:1.1.2.2
--- pkgsrc/lang/ruby40/Makefile:1.1.2.1 Sat May 9 16:21:05 2026
+++ pkgsrc/lang/ruby40/Makefile Thu May 21 03:07:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.1 2026/05/09 16:21:05 bsiegert Exp $
+# $NetBSD: Makefile,v 1.1.2.2 2026/05/21 03:07:30 maya Exp $
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_VERSION}
@@ -11,7 +11,6 @@ COMMENT= Ruby ${RUBY_VERSION} release pa
RUBY_VERSIONS_ACCEPTED= 40
-MAKE_JOBS_SAFE= no
USE_GCC_RUNTIME= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pax yacc pkg-config
Index: pkgsrc/lang/ruby40/PLIST
diff -u pkgsrc/lang/ruby40/PLIST:1.1.2.1 pkgsrc/lang/ruby40/PLIST:1.1.2.2
--- pkgsrc/lang/ruby40/PLIST:1.1.2.1 Sat May 9 16:21:05 2026
+++ pkgsrc/lang/ruby40/PLIST Thu May 21 03:07:30 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.2.1 2026/05/09 16:21:05 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.1.2.2 2026/05/21 03:07:30 maya 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.4.2.1 pkgsrc/lang/ruby40/distinfo:1.4.2.2
--- pkgsrc/lang/ruby40/distinfo:1.4.2.1 Sat May 9 16:21:05 2026
+++ pkgsrc/lang/ruby40/distinfo Thu May 21 03:07:30 2026
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4.2.1 2026/05/09 16:21:05 bsiegert Exp $
+$NetBSD: distinfo,v 1.4.2.2 2026/05/21 03:07:30 maya 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
-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
+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
@@ -17,6 +16,7 @@ SHA1 (patch-lib_rubygems_install__update
SHA1 (patch-lib_rubygems_installer.rb) = 68a43121b4faab060afa4e352e1603f9d6630a47
SHA1 (patch-lib_rubygems_platform.rb) = 6bd2e1c5c3064f9d694508169a5bf0a594d7bbef
SHA1 (patch-lib_rubygems_specification.rb) = f543cab6b56fec0f7195d4eabddedc080c18688c
+SHA1 (patch-template_Makefile.in) = 3cf5d612ef725dc64d6a90d377b191a29ebfdf17
SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
SHA1 (patch-tool_ifchange) = 1803bb6a1836e232dcabcf38f11c9881dbf726ea
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.2.2.2
--- /dev/null Thu May 21 03:07:30 2026
+++ pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb Thu May 21 03:07:30 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-.bundle_gems_rdoc-7.0.3_lib_rdoc_parser_c.rb,v 1.2.2.2 2026/05/21 03:07:30 maya 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
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.2.2
--- /dev/null Thu May 21 03:07:30 2026
+++ pkgsrc/lang/ruby40/patches/patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb Thu May 21 03:07:30 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-.bundle_gems_rdoc-7.0.4_lib_rdoc_encoding.rb,v 1.1.2.2 2026/05/21 03:07:30 maya 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/, '')
+
Index: pkgsrc/lang/ruby40/patches/patch-template_Makefile.in
diff -u /dev/null pkgsrc/lang/ruby40/patches/patch-template_Makefile.in:1.4.2.2
--- /dev/null Thu May 21 03:07:30 2026
+++ pkgsrc/lang/ruby40/patches/patch-template_Makefile.in Thu May 21 03:07:30 2026
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Try fixing make parallelism/submake problems.
+
+1. make sure no stale probes.o is there when the probes.o is rebuilt
+2. ruby-glommed and probes.stamp depend on the same files, make sure
+ they don't trigger the same objects twice.
+
+https://bugs.ruby-lang.org/issues/22059
+
+--- template/Makefile.in.orig 2026-05-07 20:25:14.644318083 +0000
++++ template/Makefile.in
+@@ -523,7 +523,7 @@ probes.stamp: $(DTRACE_REBUILD_OBJS)
+
+ probes.stamp: $(DTRACE_REBUILD_OBJS)
+ $(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
+- $(RM) $(DTRACE_REBUILD_OBJS) $@; \
++ $(RM) $(DTRACE_REBUILD_OBJS) $@ probes.$(OBJEXT); \
+ $(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:
+
+ # DTrace static library hacks described here:
+ # https://marc.info/?l=opensolaris-dtrace-discuss&m=114761203110734&w=4
+-ruby-glommed.$(OBJEXT):
++ruby-glommed.$(OBJEXT): probes.$(OBJEXT)
+ @$(ECHO) generating a glommed object with DTrace probes for static library
+ $(Q) $(LD) -r -o $@ $(OBJS)
+
Home |
Main Index |
Thread Index |
Old Index