<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/1690debd84fa1eb7c452ed0f4eb43c9c059c7d9a">https://github.com/macports/macports-ports/commit/1690debd84fa1eb7c452ed0f4eb43c9c059c7d9a</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 1690debd84f ruby33: Cosmetic patchfile cleanup
</span>1690debd84f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1690debd84fa1eb7c452ed0f4eb43c9c059c7d9a
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Thu Jun 20 19:21:54 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby33: Cosmetic patchfile cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This regenerates the patchfile from updated git commits, and updates
</span><span style='display:block; white-space:pre;color:#404040;'> the related comment in the Portfile. There are no substantive
</span><span style='display:block; white-space:pre;color:#404040;'> changes in the Patchfile, but the mtimes are updated to correspond
</span><span style='display:block; white-space:pre;color:#404040;'> to the new release. The result of the patch phase is unchanged.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also, the update URL was omitted from the original update commit
</span><span style='display:block; white-space:pre;color:#404040;'> message. See:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-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;'> Verified that the build trees from "port patch" are identical before
</span><span style='display:block; white-space:pre;color:#404040;'> and after this change.
</span>---
lang/ruby33/Portfile | 2 +-
lang/ruby33/files/patch-sources.diff | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 15 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 dfcbaa54a23..df50934c691 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;'>@@ -70,7 +70,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_2 vs. macports-3_3_2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3_3_3 vs. macports-3_3_3.
</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 928aa8fac1c..2cc69cc7f21 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-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2024-06-03 19:35:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2024-06-14 19:51:49.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-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/md5/md5cc.h 2024-06-03 19:35:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/md5/md5cc.h.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/md5/md5cc.h 2024-06-14 19:51:49.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-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha1/sha1cc.h 2024-06-03 19:35:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha1/sha1cc.h.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha1/sha1cc.h 2024-06-14 19:51:49.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-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/digest/sha2/sha2cc.h 2024-06-03 19:35:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/digest/sha2/sha2cc.h.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/digest/sha2/sha2cc.h 2024-06-14 19:51:49.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-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/bundler/gem_helper.rb 2024-06-03 19:35:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2024-06-14 19:51:49.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-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2024-06-03 19:35:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2024-06-14 19:51:49.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-05-29 17:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2024-06-03 19:35:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2024-06-11 16:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2024-06-14 19:51:49.000000000 -0700
</span> @@ -490,7 +490,8 @@ rb_vmdebug_thread_dump_state(FILE *errou
}
</pre><pre style='margin:0'>
</pre>