<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6a10a48e9f2045b5de52b98d0807139a77220e34">https://github.com/macports/macports-ports/commit/6a10a48e9f2045b5de52b98d0807139a77220e34</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6a10a48e9f2045b5de52b98d0807139a77220e34
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed Nov 27 15:26:18 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> ruby33: update to 3.3.6
</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/11/05/ruby-3-3-6-released/
</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-15.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/ruby33/Portfile | 10 +++++-----
lang/ruby33/files/patch-sources.diff | 28 ++++++++++++++--------------
2 files changed, 19 insertions(+), 19 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 7c11254a532..15610e65ee4 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;'>@@ -17,7 +17,7 @@ legacysupport.newest_darwin_requires_legacy 14
</span> # This property should be preserved.
set ruby_ver 3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ruby_patch 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruby_patch 6
</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;'>@@ -42,9 +42,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 6b997a751809a5f84376ad653ea75e26734af085 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22129139
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b77ffe3a13d630664a1ba91e5298575a430666f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22153657
</span>
# Universal builds don't currently work, including via the approach used
# in ruby30.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
</span>
# patch-sources.diff: fixes for various issues.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3_3_5 vs. macports-3_3_5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_3_6 vs. macports-3_3_6.
</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 e0f2452b7a5..9685733f854 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-09-02 09:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2024-09-14 16:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2024-11-27 15:23:38.000000000 -0800
</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-09-02 09:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/md5/md5cc.h 2024-09-14 16:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/md5/md5cc.h.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/md5/md5cc.h 2024-11-27 15:23:38.000000000 -0800
</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-09-02 09:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha1/sha1cc.h 2024-09-14 16:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha1/sha1cc.h.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha1/sha1cc.h 2024-11-27 15:23:38.000000000 -0800
</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-09-02 09:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha2/sha2cc.h 2024-09-14 16:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha2/sha2cc.h.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha2/sha2cc.h 2024-11-27 15:23:38.000000000 -0800
</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-09-02 09:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/bundler/gem_helper.rb 2024-09-14 16:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2024-11-27 15:23:38.000000000 -0800
</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-09-02 09:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2024-09-14 16:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2024-11-27 15:23:38.000000000 -0800
</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-09-02 09:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2024-09-14 16:02:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2024-11-04 16:49:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2024-11-27 15:23:38.000000000 -0800
</span> @@ -490,7 +490,8 @@ rb_vmdebug_thread_dump_state(FILE *errou
}
</pre><pre style='margin:0'>
</pre>