<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/74b9923b494a35c52ddbf3e2d6b9f2fa47b1f139">https://github.com/macports/macports-ports/commit/74b9923b494a35c52ddbf3e2d6b9f2fa47b1f139</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 74b9923b494 ruby33: update to v3.3.2
</span>74b9923b494 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 74b9923b494a35c52ddbf3e2d6b9f2fa47b1f139
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Tue Jun 4 19:45:30 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby33: update to v3.3.2
</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/05/30/ruby-3-3-2-released/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As usual, all source patches are in a single patchfile derived from
</span><span style='display:block; white-space:pre;color:#404040;'> the ruby fork at github.com/fhgwright/ruby. The changes are much more
</span><span style='display:block; white-space:pre;color:#404040;'> readable in the git repo.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patches are functionally unchanged since 3.3.1, though the patchfile
</span><span style='display:block; white-space:pre;color:#404040;'> is updated to reflect the newer mtimes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also adds comments near the version to clarify the update procedure.
</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 with no variants on 10.4-10.5 ppc, 10.4-10.6 i386,
</span><span style='display:block; white-space:pre;color:#404040;'> 10.5-12.x x86_64, and 11.x-14.x arm64.
</span><span style='display:block; white-space:pre;color:#404040;'> Built with all variants except jemalloc and yjit on 10.4-10.5, all
</span><span style='display:block; white-space:pre;color:#404040;'> variants except yjit on 10.6-10.13, and all variants on 10.14+.
</span><span style='display:block; white-space:pre;color:#404040;'> Tests not run due to test framework issues.
</span>---
lang/ruby33/Portfile | 18 ++++++++++++------
lang/ruby33/files/patch-sources.diff | 28 ++++++++++++++--------------
2 files changed, 26 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby33/Portfile b/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a299111cb6f..b2e7dcb7e46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,15 @@ PortGroup legacysupport 1.1
</span> # MAP_ANONYMOUS
legacysupport.newest_darwin_requires_legacy 14
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Version updates should start by updating the fork noted below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (or equivalent), verifying the propriety of the patches for the new version,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and rederiving the patchfile from there.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also note that this port runs on all OS/CPU combinations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This property should be preserved.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set ruby_ver 3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ruby_patch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_patch 2
</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 +43,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 21bb563c0253020d574abcc9a1e38c17213eb62d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8dc2af2802cc700cd182d5430726388ccf885b3f0a14fcd6a0f21ff249c9aa99 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22074535
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 01a94e78c07e40b560e92bd47fffc7b459aef19e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3be1d100ebf2a0ce60c2cd8d22cd9db4d64b3e04a1943be2c4ff7b520f2bcb5b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22095824
</span>
# Universal builds don't currently work, including via the approach used
# in ruby30.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +69,8 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
</span> # github.com/fhgwright/ruby
# patch-sources.diff: fixes for various issues.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This includes the 'gem' versioning fix formerly handled via reinplace.
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3_3_1 vs. macports-3_3_1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_3_2 vs. macports-3_3_2.
</span> #
patchfiles-append patch-sources.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby33/files/patch-sources.diff b/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fa8a444a96..928aa8fac1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby33/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby33/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:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2024-04-28 13:22:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2024-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2024-06-03 19:35:45.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:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/md5/md5cc.h 2024-04-28 13:22:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/md5/md5cc.h.orig 2024-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/md5/md5cc.h 2024-06-03 19:35:45.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:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha1/sha1cc.h 2024-04-28 13:22:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha1/sha1cc.h.orig 2024-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha1/sha1cc.h 2024-06-03 19:35:45.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:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha2/sha2cc.h 2024-04-28 13:22:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha2/sha2cc.h.orig 2024-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha2/sha2cc.h 2024-06-03 19:35:45.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:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/bundler/gem_helper.rb 2024-04-28 13:22:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2024-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2024-06-03 19:35:45.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:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2024-04-28 13:22:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2024-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2024-06-03 19:35:45.000000000 -0700
</span> @@ -803,7 +803,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;'>---- vm_dump.c.orig 2024-04-23 03:20:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2024-04-28 13:22:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2024-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2024-06-03 19:35:45.000000000 -0700
</span> @@ -490,7 +490,8 @@ rb_vmdebug_thread_dump_state(FILE *errou
}
</pre><pre style='margin:0'>
</pre>