<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cdef7db4c553ce81caf92b2e515edcb63c014a5f">https://github.com/macports/macports-ports/commit/cdef7db4c553ce81caf92b2e515edcb63c014a5f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new cdef7db4c55 ruby32: update to 3.2.5
</span>cdef7db4c55 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cdef7db4c553ce81caf92b2e515edcb63c014a5f
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Jul 28 13:49:20 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby32: update to 3.2.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See:
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The upstream code includes both the change that broke 3.2.4 and the
</span><span style='display:block; white-space:pre;color:#404040;'> fix for it as patched in 3.2.4_2.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built successfully on OSX 10.4-10.5 ppc, 10.4-10.6 i386, 10.5-12.x
</span><span style='display:block; white-space:pre;color:#404040;'> x86_64, and 11.x-14.x arm64. Included all variants compatible with
</span><span style='display:block; white-space:pre;color:#404040;'> available dependencies on the respective platforms.
</span>---
lang/ruby32/Portfile | 10 +++++-----
lang/ruby32/files/patch-sources.diff | 32 ++++++++++++++++----------------
2 files changed, 21 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby32/Portfile b/lang/ruby32/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8153205b0c8..e77c9755ad8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 14
set ruby_ver 3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ruby_patch 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_patch 5
</span> set ruby_ver_nodot [string map {. {}} ${ruby_ver}]
name ruby${ruby_ver_nodot}
version ${ruby_ver}.${ruby_patch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,9 @@ master_sites ruby:${ruby_ver}
</span> distname ruby-${version}
dist_subdir ruby${ruby_ver_nodot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d7e5420af382751846b8a0c3013a913042372dad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20581711
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9e01fbc8b7c48576c27b6b0a24c97950b4cf32fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20619047
</span>
# Universal builds don't currently work, including via the approach used
# in ruby30.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,7 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
</span> # patch-sources.diff: fixes for various issues.
# This includes the 'gem' versioning fix formerly handled via reinplace.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3_2_4 vs. macports-3_2_4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_2_5 vs. macports-3_2_5.
</span> #
patchfiles-append patch-sources.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby32/files/patch-sources.diff b/lang/ruby32/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 025f49cdf4d..8cc0d007f8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby32/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby32/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .gdbinit.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2024-07-26 20:56:01.000000000 -0700
</span> @@ -1,4 +1,5 @@
-set startup-with-shell off
+# Move this to end, so failure on older gdbs doesn't blow the rest
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@
</span> +
+# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/md5/md5cc.h.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/md5/md5cc.h 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/md5/md5cc.h.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/md5/md5cc.h 2024-07-26 20:56:01.000000000 -0700
</span> @@ -17,3 +17,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(MD5
#undef MD5_Finish
#define MD5_Update rb_digest_MD5_update
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,8 @@
</span> + */
+#undef MD5_Init
+#define MD5_Init CC_MD5_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/sha1/sha1cc.h.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha1/sha1cc.h 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha1/sha1cc.h.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha1/sha1cc.h 2024-07-26 20:56:01.000000000 -0700
</span> @@ -12,3 +12,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA
#undef SHA1_Finish
#define SHA1_Update rb_digest_SHA1_update
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,8 @@
</span> + */
+#undef SHA1_Init
+#define SHA1_Init CC_SHA1_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/digest/sha2/sha2cc.h.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha2/sha2cc.h 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha2/sha2cc.h.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha2/sha2cc.h 2024-07-26 20:56:01.000000000 -0700
</span> @@ -1,6 +1,33 @@
#define COMMON_DIGEST_FOR_OPENSSL 1
#include <CommonCrypto/CommonDigest.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,8 +94,8 @@
</span> +#define SHA384_Init CC_SHA384_Init
+#undef SHA512_Init
+#define SHA512_Init CC_SHA512_Init
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/bundler/gem_helper.rb.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/bundler/gem_helper.rb 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2024-07-26 20:56:01.000000000 -0700
</span> @@ -231,7 +231,7 @@ module Bundler
end
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,8 +105,8 @@
</span> end
end
end
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- signal.c.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2024-07-26 20:56:01.000000000 -0700
</span> @@ -841,7 +841,8 @@ check_stack_overflow(int sig, const uint
const greg_t bp = mctx->gregs[REG_EBP];
# endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,8 +117,8 @@
</span> # define MCTX_SS_REG(reg) __ss.__##reg
# else
# define MCTX_SS_REG(reg) ss.reg
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tool/transform_mjit_header.rb.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/transform_mjit_header.rb 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tool/transform_mjit_header.rb.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/transform_mjit_header.rb 2024-07-26 20:56:01.000000000 -0700
</span> @@ -181,7 +181,9 @@ module MJITHeader
def self.conflicting_types?(code, cc, cflags)
with_code(code) do |path|
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,8 +130,8 @@
</span> !$?.success? &&
(out.match?(/error: conflicting types for '[^']+'/) ||
out.match?(/error: redefinition of parameter '[^']+'/))
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- vm_dump.c.orig 2024-04-23 03:20:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2024-04-27 17:32:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2024-07-26 04:54:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2024-07-26 20:56:01.000000000 -0700
</span> @@ -470,7 +470,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
}
</pre><pre style='margin:0'>
</pre>