Skip to content

Commit

Permalink
ruby33: Cosmetic patchfile cleanup
Browse files Browse the repository at this point in the history
This regenerates the patchfile from updated git commits, and updates
the related comment in the Portfile.  There are no substantive
changes in the Patchfile, but the mtimes are updated to correspond
to the new release.  The result of the patch phase is unchanged.

Also, the update URL was omitted from the original update commit
message.  See:

https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/

TESTED:
Verified that the build trees from "port patch" are identical before
and after this change.
  • Loading branch information
fhgwright committed Jun 21, 2024
1 parent de59a61 commit 6df7550
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion lang/ruby33/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ select.file ${filespath}/ruby${ruby_ver_nodot}

# patch-sources.diff: fixes for various issues.
#
# This diff is from v3_3_2 vs. macports-3_3_2.
# This diff is from v3_3_3 vs. macports-3_3_3.
#
patchfiles-append patch-sources.diff

Expand Down
28 changes: 14 additions & 14 deletions lang/ruby33/files/patch-sources.diff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- .gdbinit.orig 2024-05-29 17:23:11.000000000 -0700
+++ .gdbinit 2024-06-03 19:35:45.000000000 -0700
--- .gdbinit.orig 2024-06-11 16:54:24.000000000 -0700
+++ .gdbinit 2024-06-14 19:51:49.000000000 -0700
@@ -1,4 +1,5 @@
-set startup-with-shell off
+# Move this to end, so failure on older gdbs doesn't blow the rest
Expand All @@ -14,8 +14,8 @@
+
+# Moved from beginning, since it fails on older gdbs
+set startup-with-shell off
--- ext/digest/md5/md5cc.h.orig 2024-05-29 17:23:11.000000000 -0700
+++ ext/digest/md5/md5cc.h 2024-06-03 19:35:45.000000000 -0700
--- ext/digest/md5/md5cc.h.orig 2024-06-11 16:54:24.000000000 -0700
+++ ext/digest/md5/md5cc.h 2024-06-14 19:51:49.000000000 -0700
@@ -17,3 +17,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(MD5
#undef MD5_Finish
#define MD5_Update rb_digest_MD5_update
Expand All @@ -28,8 +28,8 @@
+ */
+#undef MD5_Init
+#define MD5_Init CC_MD5_Init
--- ext/digest/sha1/sha1cc.h.orig 2024-05-29 17:23:11.000000000 -0700
+++ ext/digest/sha1/sha1cc.h 2024-06-03 19:35:45.000000000 -0700
--- ext/digest/sha1/sha1cc.h.orig 2024-06-11 16:54:24.000000000 -0700
+++ ext/digest/sha1/sha1cc.h 2024-06-14 19:51:49.000000000 -0700
@@ -12,3 +12,11 @@ static DEFINE_FINISH_FUNC_FROM_FINAL(SHA
#undef SHA1_Finish
#define SHA1_Update rb_digest_SHA1_update
Expand All @@ -42,8 +42,8 @@
+ */
+#undef SHA1_Init
+#define SHA1_Init CC_SHA1_Init
--- ext/digest/sha2/sha2cc.h.orig 2024-05-29 17:23:11.000000000 -0700
+++ ext/digest/sha2/sha2cc.h 2024-06-03 19:35:45.000000000 -0700
--- ext/digest/sha2/sha2cc.h.orig 2024-06-11 16:54:24.000000000 -0700
+++ ext/digest/sha2/sha2cc.h 2024-06-14 19:51:49.000000000 -0700
@@ -1,6 +1,33 @@
#define COMMON_DIGEST_FOR_OPENSSL 1
#include <CommonCrypto/CommonDigest.h>
Expand Down Expand Up @@ -94,8 +94,8 @@
+#define SHA384_Init CC_SHA384_Init
+#undef SHA512_Init
+#define SHA512_Init CC_SHA512_Init
--- lib/bundler/gem_helper.rb.orig 2024-05-29 17:23:11.000000000 -0700
+++ lib/bundler/gem_helper.rb 2024-06-03 19:35:45.000000000 -0700
--- lib/bundler/gem_helper.rb.orig 2024-06-11 16:54:24.000000000 -0700
+++ lib/bundler/gem_helper.rb 2024-06-14 19:51:49.000000000 -0700
@@ -231,7 +231,7 @@ module Bundler
end

Expand All @@ -105,8 +105,8 @@
end
end
end
--- signal.c.orig 2024-05-29 17:23:11.000000000 -0700
+++ signal.c 2024-06-03 19:35:45.000000000 -0700
--- signal.c.orig 2024-06-11 16:54:24.000000000 -0700
+++ signal.c 2024-06-14 19:51:49.000000000 -0700
@@ -803,7 +803,8 @@ check_stack_overflow(int sig, const uint
const greg_t bp = mctx->gregs[REG_EBP];
# endif
Expand All @@ -117,8 +117,8 @@
# define MCTX_SS_REG(reg) __ss.__##reg
# else
# define MCTX_SS_REG(reg) ss.reg
--- vm_dump.c.orig 2024-05-29 17:23:11.000000000 -0700
+++ vm_dump.c 2024-06-03 19:35:45.000000000 -0700
--- vm_dump.c.orig 2024-06-11 16:54:24.000000000 -0700
+++ vm_dump.c 2024-06-14 19:51:49.000000000 -0700
@@ -490,7 +490,8 @@ rb_vmdebug_thread_dump_state(FILE *errou
}

Expand Down

0 comments on commit 6df7550

Please sign in to comment.