macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

ruby40: update to 4.0.5 (security)

Browse Source 
See:
https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/

As noted, this is a focused update to fix CVE-2026-46727.

TESTED:
Built successfully on OSX 10.4-10.6 i386, 10.5-12.x x86_64, and
11.x-26.x arm64.  Included all variants compatible with available
dependencies on the respective platforms.
This commit is contained in:
Fred Wright
2026-03-18 13:55:55 -07:00
committed by Perry E. Metzger
parent 9fa2bfd286
commit 2ac7acfb54
3 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/ruby40/Portfile
+6 -6
View File
@@ -16,7 +16,7 @@ legacysupport.newest_darwin_requires_legacy 15
# This property should be preserved.
set ruby_ver 4.0
set ruby_patch 4
set ruby_patch 5
set ruby_ver_nodot [string map {. {}} ${ruby_ver}]
name ruby${ruby_ver_nodot}
version ${ruby_ver}.${ruby_patch}
@@ -41,9 +41,9 @@ master_sites ruby:${ruby_ver}
distname ruby-${version}
dist_subdir ruby${ruby_ver_nodot}
checksums rmd160 d75ffcb4faa62c5efb225ae35ef688727e9a5a9b \
sha256 f35f6edfa3dabb3f723f9d0cf1906c6512ae77f4e412ab1e68cc6e91d230fa80 \
size 23816838
checksums rmd160 32affbff17eb7cca396f675d0235054262de12b4 \
sha256 7d6149079a63f8ae1d326c9fa65c6019ba2dc3155eae7b39159817911c88958e \
size 23818557
# Universal builds don't currently work, including via the approach used
# in ruby30.
@@ -68,7 +68,7 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
# patch-sources.diff: fixes for various issues.
#
# This diff is from v4.0.2 vs. macports-4_0_2.
# This diff is from v4.0.5 vs. macports-4_0_5.
#
patchfiles-append patch-sources.diff
@@ -78,7 +78,7 @@ patchfiles-append patch-sources.diff
# At present, the only patched generated file is 'configure', to avoid
# the need to rerun autoconf, whose output has reproducibility issues.
#
# This diff is from tarball-4_0_2 vs. macports-tarball-4_0_2.
# This diff is from tarball-4_0_5 vs. macports-tarball-4_0_5.
#
patchfiles-append patch-generated.diff
lang/ruby40/files/patch-generated.diff
+11 -13
View File
@@ -1,6 +1,6 @@
--- ../ruby-4.0.4.org/configure 2026-05-12 06:07:54
+++ ./configure 2026-05-12 23:13:13
@@ -8524,7 +8524,8 @@ then :
--- configure.orig 2026-05-19 16:22:56.000000000 -0700
+++ configure 2026-05-21 17:41:22.000000000 -0700
@@ -8524,7 +8524,8 @@ printf %s "checking for $CC linker warni
>/dev/null
then :
@@ -10,16 +10,13 @@
fi
rm -fr conftest*
@@ -34981,21 +34982,8 @@ fi
then :
withval=$with_destdir; DESTDIR="$withval"
fi
-
-
-
@@ -34984,19 +34985,6 @@ fi
-if test "x$load_relative:$DESTDIR" = xyes:
-then :
-
- if test "x$prefix" = xNONE
-then :
- DESTDIR="$ac_default_prefix"
@@ -27,8 +24,9 @@
- DESTDIR="$prefix"
-fi
- prefix=/.
-
-fi
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
lang/ruby40/files/patch-sources.diff
+12 -20
View File
@@ -1,6 +1,5 @@
diff -urp ../ruby-4.0.4.org/configure.ac ./configure.ac
--- ../ruby-4.0.4.org/configure.ac 2026-05-12 06:07:52.000000000 +0900
+++ ./configure.ac 2026-05-12 22:20:10.207397689 +0900
--- configure.ac.orig 2026-05-19 16:22:54.000000000 -0700
+++ configure.ac 2026-05-21 17:41:21.000000000 -0700
@@ -458,7 +458,8 @@ AS_CASE(["$build_os"],
-e '^ld: warning: text-based stub file' \
-e '^ld: warning: -multiply_defined is obsolete' \
@@ -23,11 +22,8 @@ diff -urp ../ruby-4.0.4.org/configure.ac ./configure.ac
AC_OUTPUT
}
Only in .: configure.ac.orig
Only in .: configure.orig
diff -urp ../ruby-4.0.4.org/file.c ./file.c
--- ../ruby-4.0.4.org/file.c 2026-05-12 06:07:52.000000000 +0900
+++ ./file.c 2026-05-12 22:20:10.217177319 +0900
--- file.c.orig 2026-05-19 16:22:54.000000000 -0700
+++ file.c 2026-05-21 17:41:21.000000000 -0700
@@ -291,9 +291,27 @@ static CFMutableStringRef
mutable_CFString_new(CFStringRef *s, const char *ptr, long len)
{
@@ -56,9 +52,8 @@ diff -urp ../ruby-4.0.4.org/file.c ./file.c
return CFStringCreateMutableCopy(alloc, len, *s);
}
diff -urp ../ruby-4.0.4.org/lib/bundler/gem_helper.rb ./lib/bundler/gem_helper.rb
--- ../ruby-4.0.4.org/lib/bundler/gem_helper.rb 2026-05-12 06:07:52.000000000 +0900
+++ ./lib/bundler/gem_helper.rb 2026-05-12 22:20:10.218094413 +0900
--- lib/bundler/gem_helper.rb.orig 2026-05-19 16:22:54.000000000 -0700
+++ lib/bundler/gem_helper.rb 2026-05-21 17:41:21.000000000 -0700
@@ -231,7 +231,7 @@ module Bundler
end
@@ -68,9 +63,8 @@ diff -urp ../ruby-4.0.4.org/lib/bundler/gem_helper.rb ./lib/bundler/gem_helper.r
end
end
end
diff -urp ../ruby-4.0.4.org/template/Makefile.in ./template/Makefile.in
--- ../ruby-4.0.4.org/template/Makefile.in 2026-05-12 06:07:52.000000000 +0900
+++ ./template/Makefile.in 2026-05-12 22:20:10.219528990 +0900
--- template/Makefile.in.orig 2026-05-19 16:22:54.000000000 -0700
+++ template/Makefile.in 2026-05-21 17:41:21.000000000 -0700
@@ -513,7 +513,7 @@ _PREFIXED_SYMBOL = TOKEN_PASTE($(SYMBOL_
.d.h:
@@ -80,9 +74,8 @@ diff -urp ../ruby-4.0.4.org/template/Makefile.in ./template/Makefile.in
$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/RUBY_PROBES_H/' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
$(Q) $(RM) $@.tmp
diff -urp ../ruby-4.0.4.org/thread_pthread.c ./thread_pthread.c
--- ../ruby-4.0.4.org/thread_pthread.c 2026-05-12 06:07:52.000000000 +0900
+++ ./thread_pthread.c 2026-05-12 22:20:10.223447858 +0900
--- thread_pthread.c.orig 2026-05-19 16:22:54.000000000 -0700
+++ thread_pthread.c 2026-05-21 17:41:21.000000000 -0700
@@ -42,6 +42,22 @@
#if defined __APPLE__
@@ -106,9 +99,8 @@ diff -urp ../ruby-4.0.4.org/thread_pthread.c ./thread_pthread.c
#endif
#if defined(HAVE_SYS_EVENTFD_H) && defined(HAVE_EVENTFD)
diff -urp ../ruby-4.0.4.org/vm_dump.c ./vm_dump.c
--- ../ruby-4.0.4.org/vm_dump.c 2026-05-12 06:07:52.000000000 +0900
+++ ./vm_dump.c 2026-05-12 22:20:10.225705198 +0900
--- vm_dump.c.orig 2026-05-19 16:22:54.000000000 -0700
+++ vm_dump.c 2026-05-21 17:41:21.000000000 -0700
@@ -793,7 +793,7 @@ backtrace(void **trace, int size)
unw_getcontext(&uc);