<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6a71e1e882a227e5287810f3aa510551c6ed834">https://github.com/macports/macports-ports/commit/b6a71e1e882a227e5287810f3aa510551c6ed834</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b6a71e1e882a227e5287810f3aa510551c6ed834
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Apr 30 16:50:49 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> ruby27: update to 2.7.8
</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/2023/03/30/ruby-2-7-8-released/
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also converts the former reinplace-based patch for 'gem' versioning to
</span><span style='display:block; white-space:pre;color:#404040;'> a normal patch, as previously recommended.
</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 -universal on OSX 10.4-10.5 ppc, 10.4-10.6 i386,
</span><span style='display:block; white-space:pre;color:#404040;'> 10.5-10.15 x86_64, and 11.x-13.x arm64. Also successfully built
</span><span style='display:block; white-space:pre;color:#404040;'> +universal in all such cases except 10.4 (where +universal
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies failed to build), and 10.14-10.15 (where +universal is
</span><span style='display:block; white-space:pre;color:#404040;'> ignored). Also built all variants for 10.9 x86_64 and 11.x-13.x
</span><span style='display:block; white-space:pre;color:#404040;'> arm64.
</span>---
lang/ruby27/Portfile | 47 ++++++++++++---------------
lang/ruby27/files/patch-generated.diff | 4 +--
lang/ruby27/files/patch-sources.diff | 59 ++++++++++++++++++++--------------
3 files changed, 58 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby27/Portfile b/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a8147feee6d..bbf75649d68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup select 1.0
</span> PortGroup openssl 1.0
name ruby27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.7.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +29,11 @@ use_bzip2 yes
</span> distname ruby-${version}
dist_subdir ruby27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 63c55e75150251d3ba092b662138e4af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6a4fdf0292259124e6a6a51ddd8b8aa1cbdc0615 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 dfcd86b459a9d4bbdf2d4eb82ad3476cb9820892 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cf800820c9e69cdd31a8cdab920391f74ed935db2397a905afabd48961913658 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14850886
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 f44dedf51fdb7441a7dba592d6a4a14d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 96ffa81c2a7373d1a92b51802b07d159a51a8e18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 3e1c6a7bac0b7ea6becb94a1a8e8630173903387 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 09ccf12051d86e5b3877c9e9db8b7eb6495bea180cab88a1fc99851434137c67 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14851891
</span>
# ruby/openssl does not support openssl-3
openssl.branch 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,11 +64,13 @@ configure.args --enable-shared \
</span>
# Patches derived from MacPorts-enhanced GitHub fork at
# github.com/fhgwright/ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# These replace and enhance the former topic-specific patch, and can be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These replace and enhance the former topic-specific patches, and can be
</span> # seen more readably in the fork.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-sources.diff: fixes for various build problems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v2_7_7 vs. macports-2_7_7r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-sources.diff: fixes for various issues.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This includes the 'gem' versioning fix formerly handled via reinplace.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v2_7_8 vs. macports-2_7_8.
</span> #
patchfiles-append patch-sources.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,14 +79,11 @@ patchfiles-append patch-sources.diff
</span> # source patches so that make doesn't regard them as outdated.
# At present, the only patched generated file is 'configure', to avoid
# the need to rerun autoconf, whose output has reproducibility issues.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from tarball-2_7_7 vs. macports-tarball-2_7_7r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from tarball-2_7_8 vs. macports-tarball-2_7_8.
</span> #
patchfiles-append patch-generated.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Using a patch instead of reinplace for the 'gem' versioning fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# would also be more readable and more trackable. A commit version of this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# already exists in the fork, in the macports-reinplace-2_7 branch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,18 +113,14 @@ if {[info exists build_arch] && ${build_arch} != ""} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # rewrite "gem" to "gem2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # def gem_command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ENV["GEM_COMMAND"] ? ENV["GEM_COMMAND"] : "gem"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s/(\"GEM_COMMAND\". : )(\"gem\")/\\1\"gem2.7\"/g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib/bundler/gem_helper.rb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Ensure that generated files have clearly later mtimes than sources,
# to avoid gratuitous rebuilds by make.
# This is already nominally true based on the patching order, but
# one-second resolution on timestamps may cover it up.
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The list of files here should match the list of files patched by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-generated.diff.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span> # Increment the mtime(s) by one second.
foreach genfile [list configure] {
set genfull ${worksrcpath}/${genfile}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,10 +129,10 @@ post-patch {
</span> }
# KNOWN BUG: If a previous install of ruby27 is already active, destroot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fails in trace mode, apparently due to a blocked access to the *installed*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# library, though this is not listed in the trace-mode report. This bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# goes back at least as far as 2.7.4_3 (earlier versions are harder to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# test due to the openssl issue).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fails in trace mode, due to a blocked access to the *installed* library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This seems to be due to something checking explicitly for the library's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# existence during the install (destroot) phase. It's not fixable by setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# DYLD_LIBRARY_PATH.
</span>
post-destroot {
foreach type {site vendor} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby27/files/patch-generated.diff b/lang/ruby27/files/patch-generated.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 19e27002dd8..cdd2d843ddb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby27/files/patch-generated.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby27/files/patch-generated.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;'>---- configure.orig 2022-11-24 04:42:10.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2023-02-05 19:50:18.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-03-30 05:34:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-04-24 16:24:37.000000000 -0700
</span> @@ -7676,6 +7676,8 @@ case "$target_archs" in #(
ARCH_FLAG=-m64 ;; #(
i[3-6]86) :
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby27/files/patch-sources.diff b/lang/ruby27/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 25f7b2a564f..93b004a9aea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby27/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby27/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 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .gdbinit 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gdbinit.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gdbinit 2023-04-24 16:24:34.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;'>---- configure.ac.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2023-04-24 16:24:34.000000000 -0700
</span> @@ -2329,6 +2329,15 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
[arm64-darwin*], [
rb_cv_coroutine=arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,8 @@
</span> [x*64-linux*], [
AS_CASE(["$ac_cv_sizeof_voidp"],
[8], [ rb_cv_coroutine=amd64 ],
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- dln.c.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dln.c 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dln.c.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dln.c 2023-04-24 16:24:34.000000000 -0700
</span> @@ -1347,8 +1347,7 @@ dln_load(const char *file)
if (dln_incompatible_library_p(handle)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +44,8 @@
</span> /* dlclose() segfaults */
rb_fatal("%s - %s", incompatible, file);
# else
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- error.c.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ error.c 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- error.c.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ error.c 2023-04-24 16:24:34.000000000 -0700
</span> @@ -519,7 +519,7 @@ preface_dump(FILE *out)
"-- Crash Report log information "
"--------------------------------------------\n"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,8 +64,8 @@
</span> "CrashReporter or "
# endif
"DiagnosticReports directory in bug reports.\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- file.c.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ file.c 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- file.c.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ file.c 2023-04-24 16:24:34.000000000 -0700
</span> @@ -156,6 +156,23 @@ int flock(int, int);
#include <stdlib.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,8 +100,8 @@
</span> /* glibc realpath(3) does not allow /path/to/file.rb/../other_file.rb,
returning ENOTDIR in that case.
glibc realpath(3) can also return ENOENT for paths that exist,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- io.c.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ io.c 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- io.c.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ io.c 2023-04-24 16:24:34.000000000 -0700
</span> @@ -119,6 +119,15 @@
# include <copyfile.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,8 +118,19 @@
</span> #include "ruby/util.h"
#ifndef O_ACCMODE
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- random.c.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ random.c 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/bundler/gem_helper.rb.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/bundler/gem_helper.rb 2023-04-24 16:24:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +210,7 @@ module Bundler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def gem_command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENV["GEM_COMMAND"] ? ENV["GEM_COMMAND"] : "gem"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENV["GEM_COMMAND"] ? ENV["GEM_COMMAND"] : "gem2.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- random.c.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ random.c 2023-04-24 16:24:34.000000000 -0700
</span> @@ -340,6 +340,11 @@ fill_random_bytes_urandom(void *seed, si
#if 0
#elif defined MAC_OS_X_VERSION_10_7 && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,8 +143,8 @@
</span>
static int
fill_random_bytes_syscall(void *seed, size_t size, int unused)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- signal.c.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ signal.c 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- signal.c.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ signal.c 2023-04-24 16:24:34.000000000 -0700
</span> @@ -824,7 +824,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;'>@@ -144,8 +155,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;'>---- template/Makefile.in.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ template/Makefile.in 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- template/Makefile.in.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ template/Makefile.in 2023-04-24 16:24:34.000000000 -0700
</span> @@ -210,7 +210,7 @@ AR = @AR@
ARFLAGS = @ARFLAGS@$(empty)
RANLIB = @RANLIB@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,8 +166,8 @@
</span> IFCHANGE = $(srcdir)/tool/ifchange
OBJDUMP = @OBJDUMP@
OBJCOPY = @OBJCOPY@
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tool/m4/ruby_default_arch.m4.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/m4/ruby_default_arch.m4 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tool/m4/ruby_default_arch.m4.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/m4/ruby_default_arch.m4 2023-04-24 16:24:34.000000000 -0700
</span> @@ -4,6 +4,7 @@ AC_MSG_CHECKING([arch option])
AS_CASE([$1],
[*64], [ARCH_FLAG=-m64],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,8 +176,8 @@
</span> [AC_MSG_ERROR(unknown target architecture: $target_archs)]
)
AC_MSG_RESULT([$ARCH_FLAG])
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tool/transform_mjit_header.rb.orig 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tool/transform_mjit_header.rb 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tool/transform_mjit_header.rb.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tool/transform_mjit_header.rb 2023-04-24 16:24:34.000000000 -0700
</span> @@ -176,7 +176,9 @@ module MJITHeader
def self.conflicting_types?(code, cc, cflags)
with_code(code) do |path|
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,8 +189,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 2022-11-24 04:42:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vm_dump.c 2023-02-05 19:50:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vm_dump.c.orig 2023-03-30 05:34:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vm_dump.c 2023-04-24 16:24:34.000000000 -0700
</span> @@ -459,7 +459,8 @@ rb_vmdebug_thread_dump_state(VALUE self)
}
</pre><pre style='margin:0'>
</pre>