From cbbee0b5d9a608610b9e94de23e3a2c52443e459 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Sat, 9 May 2026 10:09:54 -0500 Subject: [PATCH 1/6] Remove old Ruby 2.5 patchset The configuration this patcset applied to was retired over 3 years ago when Puppet 6.x hit end-of-life. Signed-off-by: Charlie Sharpsteen --- ...-O_CLOEXEC-check-for-AIX-builds_r2.5.patch | 28 ----- ...e-to-RUBY-var-with-opt-pl-build-tool.patch | 58 ---------- ...e-to-RUBY-var-with-opt-pl-build-tool.patch | 61 ---------- .../aix-fix-libpath-in-configure.patch | 29 ----- resources/patches/ruby_25/aix_configure.patch | 104 ------------------ ..._ruby_2.1_fix_make_test_failure_r2.5.patch | 84 -------------- .../ruby_25/net_http_eof_14972_r2.5.patch | 53 --------- ...eneric_remove_safe_nav_operator_r2.5.patch | 37 ------- .../ruby_25/win32_long_paths_support.patch | 71 ------------ ...indows_nocodepage_utf8_fallback_r2.5.patch | 27 ----- ...ruby_2.5_fixup_generated_batch_files.patch | 59 ---------- 11 files changed, 611 deletions(-) delete mode 100644 resources/patches/ruby_25/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch delete mode 100644 resources/patches/ruby_25/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch delete mode 100644 resources/patches/ruby_25/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch delete mode 100644 resources/patches/ruby_25/aix-fix-libpath-in-configure.patch delete mode 100644 resources/patches/ruby_25/aix_configure.patch delete mode 100644 resources/patches/ruby_25/aix_ruby_2.1_fix_make_test_failure_r2.5.patch delete mode 100644 resources/patches/ruby_25/net_http_eof_14972_r2.5.patch delete mode 100644 resources/patches/ruby_25/uri_generic_remove_safe_nav_operator_r2.5.patch delete mode 100644 resources/patches/ruby_25/win32_long_paths_support.patch delete mode 100644 resources/patches/ruby_25/windows_nocodepage_utf8_fallback_r2.5.patch delete mode 100644 resources/patches/ruby_25/windows_ruby_2.5_fixup_generated_batch_files.patch diff --git a/resources/patches/ruby_25/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch b/resources/patches/ruby_25/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch deleted file mode 100644 index 246718de..00000000 --- a/resources/patches/ruby_25/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8f6913338eaae4f65a4b44cdc7a36a9be0337608 Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Thu, 30 Nov 2017 16:24:28 -0800 -Subject: [PATCH] (maint) Remove O_CLOEXEC check for AIX builds - ---- - io.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/io.c b/io.c -index ee3ea3e68a..eb21aa25b1 100644 ---- a/io.c -+++ b/io.c -@@ -257,10 +257,7 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode) - int ret; - static int o_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */ - --#ifdef O_CLOEXEC -- /* O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ -- flags |= O_CLOEXEC; --#elif defined O_NOINHERIT -+#ifdef defined O_NOINHERIT - flags |= O_NOINHERIT; - #endif - ret = open(pathname, flags, mode); --- -2.14.2.windows.1 - diff --git a/resources/patches/ruby_25/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch b/resources/patches/ruby_25/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch deleted file mode 100644 index 2d8bdcfa..00000000 --- a/resources/patches/ruby_25/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4fe5971b008cabb1b83e992f7aa0613fcfc6cc69 Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Fri, 10 Aug 2018 15:51:00 -0700 -Subject: [PATCH] Replace reference to RUBY var with - /opt/pl-build-tools/bin/ruby - -This is probably the worst hack I have managed yet: in our cross compiled -builds for some reason when ruby is called with -I$(root build dir) the build -fails because the ruby we are using to build loads the rbconfig for the ruby -we are building. - -ALL of the variables that reference ruby available to the depends files in -ext/etc and ext/ripper call ruby with $(ruby location) -I$(root build dir) so -every time those files are called from make there's a failure (because, as -mentioned before, the ruby using to build loads the rbconfig for the ruby -that's being built) - -I don't understand what changed between ruby 2.4.4 and ruby 2.5.1 that causes -this behavior, it could be that the ruby build is putting the rbconfig in a -new place, or it could be that there's some terrible makefile magic going on -that ruby 2.4.4 builds weren't appending -I$(root build dir) to the RUBY -variable. - -Whatever the cause, this patch just the use of the fully qualified path to -pl-ruby: /opt/pl-build-tools/bin/ruby instead of referencing the RUBY var ---- - ext/etc/depend | 2 +- - ext/ripper/depend | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/etc/depend b/ext/etc/depend -index 2d986c5913..a19183b7f7 100644 ---- a/ext/etc/depend -+++ b/ext/etc/depend -@@ -1,6 +1,6 @@ - constdefs.h : $(srcdir)/mkconstants.rb - @echo "generating constant definitions" -- @$(RUBY) $(srcdir)/mkconstants.rb -o constdefs.h -+ @/opt/pl-build-tools/bin/ruby $(srcdir)/mkconstants.rb -o constdefs.h - - # AUTOGENERATED DEPENDENCIES START - etc.o: $(RUBY_EXTCONF_H) -diff --git a/ext/ripper/depend b/ext/ripper/depend -index 5d3bce4ec3..0d6a3a891b 100644 ---- a/ext/ripper/depend -+++ b/ext/ripper/depend -@@ -29,7 +29,7 @@ check: .eventids2-check - - .eventids2-check: $(GEN) $(SRC1) $(SRC2) - $(ECHO) checking $(SRC1) and $(SRC2) -- $(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) -+ $(Q) /opt/pl-build-tools/bin/ruby $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) - @exit > $@ - - eventids1.c: $(srcdir)/tools/generate.rb $(SRC1) --- -2.18.0.windows.1 - diff --git a/resources/patches/ruby_25/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch b/resources/patches/ruby_25/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch deleted file mode 100644 index 94a53b17..00000000 --- a/resources/patches/ruby_25/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4fe5971b008cabb1b83e992f7aa0613fcfc6cc69 Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Fri, 10 Aug 2018 15:51:00 -0700 -Subject: [PATCH] Replace reference to RUBY var with - /opt/pl-build-tools/bin/ruby - -This is the Solaris only version of this patch. We do not ship pl-ruby for -solaris-10-sparc, so this patch uses system ruby instead. - -This is probably the worst hack I have managed yet: in our cross compiled -builds for some reason when ruby is called with -I$(root build dir) the build -fails because the ruby we are using to build loads the rbconfig for the ruby -we are building. - -ALL of the variables that reference ruby available to the depends files in -ext/etc and ext/ripper call ruby with $(ruby location) -I$(root build dir) so -every time those files are called from make there's a failure (because, as -mentioned before, the ruby using to build loads the rbconfig for the ruby -that's being built) - -I don't understand what changed between ruby 2.4.4 and ruby 2.5.1 that causes -this behavior, it could be that the ruby build is putting the rbconfig in a -new place, or it could be that there's some terrible makefile magic going on -that ruby 2.4.4 builds weren't appending -I$(root build dir) to the RUBY -variable. - -Whatever the cause, this patch just the use of the fully qualified path to -pl-ruby: /opt/pl-build-tools/bin/ruby instead of referencing the RUBY var ---- - ext/etc/depend | 2 +- - ext/ripper/depend | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/etc/depend b/ext/etc/depend -index 2d986c5913..a19183b7f7 100644 ---- a/ext/etc/depend -+++ b/ext/etc/depend -@@ -1,6 +1,6 @@ - constdefs.h : $(srcdir)/mkconstants.rb - @echo "generating constant definitions" -- @$(RUBY) $(srcdir)/mkconstants.rb -o constdefs.h -+ @/opt/csw/bin/ruby $(srcdir)/mkconstants.rb -o constdefs.h - - # AUTOGENERATED DEPENDENCIES START - etc.o: $(RUBY_EXTCONF_H) -diff --git a/ext/ripper/depend b/ext/ripper/depend -index 5d3bce4ec3..0d6a3a891b 100644 ---- a/ext/ripper/depend -+++ b/ext/ripper/depend -@@ -29,7 +29,7 @@ check: .eventids2-check - - .eventids2-check: $(GEN) $(SRC1) $(SRC2) - $(ECHO) checking $(SRC1) and $(SRC2) -- $(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) -+ $(Q) /opt/csw/bin/ruby $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) - @exit > $@ - - eventids1.c: $(srcdir)/tools/generate.rb $(SRC1) --- -2.18.0.windows.1 - diff --git a/resources/patches/ruby_25/aix-fix-libpath-in-configure.patch b/resources/patches/ruby_25/aix-fix-libpath-in-configure.patch deleted file mode 100644 index 4ba1a751..00000000 --- a/resources/patches/ruby_25/aix-fix-libpath-in-configure.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 34a847d9f0b350298acaa96b386aad51be38969e Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Tue, 7 Aug 2018 15:13:09 -0700 -Subject: [PATCH] aix fix libpath in configure -# Prior to this commit, builds of Ruby on AIX with the --with-opt-dir -# configure flag fails due to whitespace in the -blibpath arguments -# arguments passed to the linker. (This patch uses a fragment derived -# from the "non-portable sed" patch we used for Ruby 1.9.3.) - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d877e7a0c..cf2602325f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3336,7 +3336,7 @@ AS_IF([test "x$OPT_DIR" != x], [ - for dir in $OPT_DIR; do - echo x ${LIBPATHFLAG} ${RPATHFLAG} | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" -- done | tr '\012' ' ' | sed 's/ *$//'` -+ done | tr '\012' ' ' | sed "s% \+% %g;s% /%${IFS}/%g"` - AS_IF([test x"$val" != x], [ - test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS " - LDFLAGS="$LDFLAGS$val" --- -2.18.0.windows.1 - diff --git a/resources/patches/ruby_25/aix_configure.patch b/resources/patches/ruby_25/aix_configure.patch deleted file mode 100644 index ee1ddbfd..00000000 --- a/resources/patches/ruby_25/aix_configure.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 36c7bd3faaa23694b187c4bed27af1a944c969c5 Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Tue, 7 Aug 2018 12:07:40 -0700 -Subject: [PATCH] revert-configure-fix -# reverts changes from commit b7f7b0a2d25071dd8fe09b3f313168bf7f939cc7 that -# resulted in build failures on AIX. The patch should be removed once PA-1607 -# is resolved. - ---- - configure.ac | 43 ++++++++++++++++++++----------------------- - 1 file changed, 20 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 90ce91bf7c..8d877e7a0c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -711,23 +711,6 @@ AC_DEFUN([RUBY_TRY_LDFLAGS], [ - ]) - - : ${DLDFLAGS="$LDFLAGS"} --: ${RPATHFLAG=''} --rpathflag='' --AS_IF([test x"${RPATHFLAG}" = x], [ -- AS_CASE(["$target_os"], -- [hpux*], [AS_IF([test "$rb_cv_prog_gnu_ld" = no], [rpathflag='+b '])], -- [aix*], [rpathflag='-blibpath:'], -- [for rpathflag in -R "-rpath "; do -- AS_CASE("$rpathflag", -- [*" "], [AS_CASE(["${linker_flag}"], -- [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])]) -- rpathflag="${linker_flag}${rpathflag}" -- RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=]) -- AS_IF([test "x${rpathflag}" != x], []) -- done]) --], [ -- rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'` --]) - - AS_CASE([$RUBY_PATCHLEVEL], [-*], - [RUBY_DEVEL=yes], [RUBY_DEVEL=no]) -@@ -959,7 +942,7 @@ AC_ARG_WITH(opt-dir, - [ - val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"` - CPPFLAGS="$CPPFLAGS $val" -- val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib${rpathflag:+ $rpathflag\\\\1/lib}|g;s/^ //"` -+ val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib|g;s/^ //"` - LDFLAGS="$LDFLAGS $val" - LDFLAGS_OPTDIR="$val" - OPT_DIR="$withval" -@@ -3161,6 +3144,7 @@ AC_SUBST(LIBEXT)dnl - AC_SUBST(ASMEXT, S)dnl - - STATIC= -+: ${PATHFLAG=''} - - AS_IF([test "$with_dln_a_out" != yes], [ - rb_cv_dlopen=unknown -@@ -3199,6 +3183,9 @@ AS_IF([test "$with_dln_a_out" != yes], [ - : ${LDSHARED='$(LD) -b'} - XLDFLAGS="$XLDFLAGS -Wl,-E" - : ${LIBPATHENV=SHLIB_PATH} -+ if test "$rb_cv_prog_gnu_ld" = no; then -+ RPATHFLAG=' +b %1$-s' -+ fi - rb_cv_dlopen=yes], - [solaris*], [ AS_IF([test "$GCC" = yes], [ - : ${LDSHARED='$(CC) -shared'} -@@ -3269,6 +3256,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ - TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)' - TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)' - : ${LIBPATHENV=LIBPATH} -+ RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}" - rb_cv_dlopen=yes], - [nto-qnx*], [ DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" - : ${LDSHARED='$(LD) -Bshareable -x'} -@@ -3303,11 +3291,20 @@ AS_IF([test "$with_dln_a_out" != yes], [ - ]) - ]) - -- AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [ -- AS_IF([test "x$rpathflag" != x], [ -- RPATHFLAG=" ${rpathflag}%1\$-s" -- ]) -- ]) -+ if test "$enable_rpath" = yes; then -+ if test x"${RPATHFLAG}" = x; then -+ for rpathflag in -R "-rpath "; do -+ AS_CASE("$rpathflag", -+ [*" "], [AS_CASE(["${linker_flag}"], -+ [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])]) -+ rpathflag="${linker_flag}${rpathflag}" -+ RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=]) -+ if test "x${rpathflag}" != x; then -+ break -+ fi -+ done -+ fi -+ fi - ]) - AS_IF([test "${LDSHAREDXX}" = ""], [ - AS_CASE(["${LDSHARED}"], --- -2.18.0.windows.1 - diff --git a/resources/patches/ruby_25/aix_ruby_2.1_fix_make_test_failure_r2.5.patch b/resources/patches/ruby_25/aix_ruby_2.1_fix_make_test_failure_r2.5.patch deleted file mode 100644 index 7f57557d..00000000 --- a/resources/patches/ruby_25/aix_ruby_2.1_fix_make_test_failure_r2.5.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 25417e02b6faa0b78633038da436f25b35ab6c22 Mon Sep 17 00:00:00 2001 -From: Geoff Nichols -Date: Mon, 11 May 2015 17:12:43 -0700 -Subject: [PATCH] AIX disable tests for Ruby bugs 2729 and 5234 - -Prior to this commit, AIX ruby 2.1 builds sometimes fail -with a "temporal unlocking already unlocked string" error -message during "make test". - -These failures seems to likely be spurious, since a -manual "make test" - run in the same build area as the failure - -completes successfully. - -This commit disables the tests for Ruby bugs 2729 and 5234. ---- - bootstraptest/test_flow.rb | 52 +++++++++++++++++++++++----------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb -index 0390062..b4fcb4d 100644 ---- a/bootstraptest/test_flow.rb -+++ b/bootstraptest/test_flow.rb -@@ -518,32 +518,32 @@ assert_equal %Q{ENSURE\n}, %q{ - end - e = Bug2728.new - }], -- ['[ruby-core:28132]', %q{ -- class Bug2729 -- include Enumerable -- def each -- begin -- yield :foo -- ensure -- proc {}.call -- end -- end -- end -- e = Bug2729.new --}], -- ['[ruby-core:39125]', %q{ -- class Bug5234 -- include Enumerable -- def each -- begin -- yield :foo -- ensure -- proc -- end -- end -- end -- e = Bug5234.new --}], -+# ['[ruby-core:28132]', %q{ -+# class Bug2729 -+# include Enumerable -+# def each -+# begin -+# yield :foo -+# ensure -+# proc {}.call -+# end -+# end -+# end -+# e = Bug2729.new -+#}], -+# ['[ruby-core:39125]', %q{ -+# class Bug5234 -+# include Enumerable -+# def each -+# begin -+# yield :foo -+# ensure -+# proc -+# end -+# end -+# end -+# e = Bug5234.new -+#}], - ['[ruby-dev:45656]', %q{ - class Bug6460 - include Enumerable --- -2.3.2 (Apple Git-55) - diff --git a/resources/patches/ruby_25/net_http_eof_14972_r2.5.patch b/resources/patches/ruby_25/net_http_eof_14972_r2.5.patch deleted file mode 100644 index ac07196d..00000000 --- a/resources/patches/ruby_25/net_http_eof_14972_r2.5.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d4d9d38216ce339a63e9ecb277f9ee3046876d93 Mon Sep 17 00:00:00 2001 -From: Josh Cooper -Date: Mon, 19 Aug 2019 14:47:07 -0700 -Subject: [PATCH] (PA-2849) Raise EOF if response body content length is known - -If response body content length is known, then read the complete response body -or raise EOF if it is truncated. - -[Bug #14972][ruby-core:88324] ---- - lib/net/http/response.rb | 2 +- - test/net/http/test_httpresponse.rb | 15 +++++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb -index 6a78272..c36c8a2 100644 ---- a/lib/net/http/response.rb -+++ b/lib/net/http/response.rb -@@ -290,7 +290,7 @@ def read_body_0(dest) - - clen = content_length() - if clen -- @socket.read clen, dest, true # ignore EOF -+ @socket.read clen, dest - return - end - clen = range_length() -diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb -index d99c361..18c6718 100644 ---- a/test/net/http/test_httpresponse.rb -+++ b/test/net/http/test_httpresponse.rb -@@ -427,6 +427,21 @@ def test_raises_exception_with_missing_reason - end - end - -+ def test_raise_eof -+ io = dummy_io(< ---- a/lib/uri/generic.rb -+++ b/lib/uri/generic.rb -@@ -207,7 +207,7 @@ - "the scheme #{@scheme} does not accept registry part: #{registry} (or bad hostname?)" - end - -- @scheme&.freeze -+ @scheme.freeze if @scheme - self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2) - self.set_port(self.default_port) if self.default_port && !@port - end -@@ -330,7 +330,7 @@ - # see also URI::Generic.scheme= - # - def set_scheme(v) -- @scheme = v&.downcase -+ @scheme = v ? v.downcase : v - end - protected :set_scheme - -@@ -1305,7 +1305,7 @@ - # Destructive version of #normalize - # - def normalize! -- if path&.empty? -+ if path && path.empty? - set_path('/') - end - if scheme && scheme != scheme.downcase diff --git a/resources/patches/ruby_25/win32_long_paths_support.patch b/resources/patches/ruby_25/win32_long_paths_support.patch deleted file mode 100644 index 73c2fd0e..00000000 --- a/resources/patches/ruby_25/win32_long_paths_support.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 229cb0fcdb7957b19d7042b000d803ae58cc6593 Mon Sep 17 00:00:00 2001 -From: Gabriel Nagy -Date: Mon, 17 May 2021 02:33:08 +0300 -Subject: [PATCH] [Win32] long path name support [Bug #12551] - -Implement long path support on Windows by applying Microsoft's -recommended application manifest. - -To make this work on both Visual C++ and MinGW, include the manifest as -a resource when generating the resource files. This way it will be -embedded into the executables generated by both compilers. - -It's important for the manifest resource to have ID 1, otherwise GCC -will embed a default manifest. - -Note that in addition to this, the user needs to have [long paths enabled] -either by modifying the registry or by enabling a group policy. - -[long paths enabled]: https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later - -Co-authored-by: Nobuyoshi Nakada ---- - test/ruby/test_process.rb | 1 + - win32/resource.rb | 2 +- - win32/ruby.manifest | 8 ++++++++ - 3 files changed, 10 insertions(+), 1 deletion(-) - create mode 100644 win32/ruby.manifest - -diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb -index 33144aa62f88..04935441397b 100644 ---- a/test/ruby/test_process.rb -+++ b/test/ruby/test_process.rb -@@ -1771,6 +1771,7 @@ def assert_fail_too_long_path((cmd, sep), mesg) - min = 1_000 / (cmd.size + sep.size) - cmds = Array.new(min, cmd) - exs = [Errno::ENOENT] -+ exs << Errno::EINVAL if windows? - exs << Errno::E2BIG if defined?(Errno::E2BIG) - opts = {[STDOUT, STDERR]=>File::NULL} - opts[:rlimit_nproc] = 128 if defined?(Process::RLIMIT_NPROC) -diff --git a/win32/resource.rb b/win32/resource.rb -index e19e04b92283..bc3eda5630ba 100755 ---- a/win32/resource.rb -+++ b/win32/resource.rb -@@ -61,6 +61,7 @@ def icons.find(path) - #include - - #{icon || ''} -+#{type == 'VFT_APP' ? "1 RT_MANIFEST ruby.manifest" : ""} - VS_VERSION_INFO VERSIONINFO - FILEVERSION #{nversion} - PRODUCTVERSION #{nversion} -@@ -93,4 +94,3 @@ def icons.find(path) - EOF - } - end -- -diff --git a/win32/ruby.manifest b/win32/ruby.manifest -new file mode 100644 -index 000000000000..2bd495979bfc ---- /dev/null -+++ b/win32/ruby.manifest -@@ -0,0 +1,8 @@ -+ -+ -+ -+ -+ true -+ -+ -+ diff --git a/resources/patches/ruby_25/windows_nocodepage_utf8_fallback_r2.5.patch b/resources/patches/ruby_25/windows_nocodepage_utf8_fallback_r2.5.patch deleted file mode 100644 index 5068e509..00000000 --- a/resources/patches/ruby_25/windows_nocodepage_utf8_fallback_r2.5.patch +++ /dev/null @@ -1,27 +0,0 @@ -2010/05/13 - John O'Connor, Puppet Inc. - -This patch to Ruby is necessary to handle languages/regions on windows -where the codepage is not supported by Ruby such as Arabic which uses -codepage 720. -If the codepage is not found, the Locale falls back to UTF8. -This is a well known Ruby/Ruby on Rails issue which is described at -https://stackoverflow.com/questions/22815542/rails4-unknown-encoding-name-cp720 ---- - -diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb -index ea04bb34bf..87c8f87614 100644 ---- a/ext/win32/lib/win32/registry.rb -+++ b/ext/win32/lib/win32/registry.rb -@@ -69,7 +69,11 @@ module Win32 - WCHAR_NUL = "\0".encode(WCHAR).freeze - WCHAR_CR = "\r".encode(WCHAR).freeze - WCHAR_SIZE = WCHAR_NUL.bytesize -- LOCALE = Encoding.find(Encoding.locale_charmap) -+ begin -+ LOCALE = Encoding.find(Encoding.locale_charmap) -+ rescue ArgumentError -+ LOCALE = Encoding::UTF_8 -+ end - - class Registry - diff --git a/resources/patches/ruby_25/windows_ruby_2.5_fixup_generated_batch_files.patch b/resources/patches/ruby_25/windows_ruby_2.5_fixup_generated_batch_files.patch deleted file mode 100644 index 8bc37d96..00000000 --- a/resources/patches/ruby_25/windows_ruby_2.5_fixup_generated_batch_files.patch +++ /dev/null @@ -1,59 +0,0 @@ -2018/10/04 - Bryan Jen, Puppet Inc. - -This patch to the Ruby batch file generation is necessary when packaging -Ruby with Puppet's vanagon package builder, as used by Puppet agent, -Bolt, and PDK. When the msi installer is built, the path generated for -the installed Ruby cannot be assumed to be the same as the path in -the build environment. For that reason, we need this patch to use the -executables from the current working directory, so that it is always -using the vendored ruby installation. ---- - -diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb -index ee6ce88eae..641712a464 100644 ---- a/lib/rubygems/commands/setup_command.rb -+++ b/lib/rubygems/commands/setup_command.rb -@@ -256,14 +256,15 @@ def install_executables(bin_dir) - bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat" - - File.open bin_cmd_file, 'w' do |file| -- file.puts <<-TEXT -+ file.puts <<-SCRIPT - @ECHO OFF - IF NOT "%~f0" == "~f0" GOTO :WinNT -- @"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9 -+ ECHO.This version of Ruby has not been built with support for Windows 95/98/Me. - GOTO :EOF - :WinNT -- @"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %* -- TEXT -+ SET RUBY_EXE_PATH="%~dp0ruby.exe" -+ @%RUBY_EXE_PATH% "%~dpn0" %* -+ SCRIPT - end - - install bin_cmd_file, "#{dest_file}.bat", :mode => 0755 -diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb -index ee5fedeb64..fff0578cd9 100644 ---- a/lib/rubygems/installer.rb -+++ b/lib/rubygems/installer.rb -@@ -771,14 +771,15 @@ - - def windows_stub_script(bindir, bin_file_name) - ruby = Gem.ruby.gsub(/^\"|\"$/, "").tr(File::SEPARATOR, "\\") -- return <<-TEXT -+ return <<-SCRIPT - @ECHO OFF - IF NOT "%~f0" == "~f0" GOTO :WinNT --@"#{ruby}" "#{File.join(bindir, bin_file_name)}" %1 %2 %3 %4 %5 %6 %7 %8 %9 -+ECHO.This version of Ruby has not been built with support for Windows 95/98/Me. - GOTO :EOF - :WinNT --@"#{ruby}" "%~dpn0" %* --TEXT -+SET RUBY_EXE_PATH="%~dp0ruby.exe" -+@%RUBY_EXE_PATH% "%~dpn0" %* -+SCRIPT - end - - ## From 2070e75aa366acd2f95ceccd978d46c1b9569a0a Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Sat, 9 May 2026 10:11:49 -0500 Subject: [PATCH 2/6] Remove old Ruby 2.7 patchset This patch set is no longer usable after the retirement of the Ruby 2.7 build in commit f592c5d485fdca3a77cf5a76ec811b45d7af5f3a Signed-off-by: Charlie Sharpsteen --- ...0001-Filter-marshaled-objects-ruby30.patch | 94 ---------------- ...-and-safe_load_file-for-rdoc_options.patch | 57 ---------- ...-O_CLOEXEC-check-for-AIX-builds_r2.5.patch | 28 ----- ...e-to-RUBY-var-with-opt-pl-build-tool.patch | 58 ---------- ...e-to-RUBY-var-with-opt-pl-build-tool.patch | 35 ------ .../ruby_27/aix-do-not-use-realpath.patch | 14 --- .../aix-fix-libpath-in-configure.patch | 29 ----- resources/patches/ruby_27/aix_configure.patch | 105 ----------------- ..._ruby_2.1_fix_make_test_failure_r2.5.patch | 84 -------------- ...ib_optparse_remove_safe_nav_operator.patch | 18 --- .../ruby_27/net_http_eof_14972_r2.5.patch | 53 --------- resources/patches/ruby_27/rbconfig_win.patch | 22 ---- .../patches/ruby_27/rbinstall_gem_path.patch | 22 ---- .../ruby_27/regexp_use_after_free.patch | 13 --- ...remove_deprecate_constant_statements.patch | 22 ---- .../ruby_27/remove_squiggly_heredocs.patch | 50 --------- .../ruby_27/revert_delete_prefix.patch | 106 ------------------ .../ruby_27/revert_host_value_changes.patch | 19 ---- .../patches/ruby_27/ruby-faster-load_27.patch | 11 -- .../ruby_27/ruby2_keywords_guard.patch | 51 --------- .../patches/ruby_27/ruby_20_guards.patch | 31 ----- .../ruby_27/ruby_version_extra_guards.patch | 29 ----- .../ruby_27/stringio_cve-2024-27280.patch | 24 ---- .../ruby_27/transform_mjit_header.patch | 19 ---- .../ruby_27/uri-redos-cve-2023-36617.patch | 59 ---------- ...eneric_remove_safe_nav_operator_r2.5.patch | 37 ------ .../ruby_27/win32_long_paths_support.patch | 71 ------------ .../patches/ruby_27/windows_configure.patch | 22 ---- ...indows_nocodepage_utf8_fallback_r2.5.patch | 27 ----- ...ruby_2.5_fixup_generated_batch_files.patch | 27 ----- 30 files changed, 1237 deletions(-) delete mode 100644 resources/patches/ruby_27/0001-Filter-marshaled-objects-ruby30.patch delete mode 100644 resources/patches/ruby_27/0001-Use-safe_load-and-safe_load_file-for-rdoc_options.patch delete mode 100644 resources/patches/ruby_27/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch delete mode 100644 resources/patches/ruby_27/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch delete mode 100644 resources/patches/ruby_27/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch delete mode 100644 resources/patches/ruby_27/aix-do-not-use-realpath.patch delete mode 100644 resources/patches/ruby_27/aix-fix-libpath-in-configure.patch delete mode 100644 resources/patches/ruby_27/aix_configure.patch delete mode 100644 resources/patches/ruby_27/aix_ruby_2.1_fix_make_test_failure_r2.5.patch delete mode 100644 resources/patches/ruby_27/lib_optparse_remove_safe_nav_operator.patch delete mode 100644 resources/patches/ruby_27/net_http_eof_14972_r2.5.patch delete mode 100755 resources/patches/ruby_27/rbconfig_win.patch delete mode 100644 resources/patches/ruby_27/rbinstall_gem_path.patch delete mode 100644 resources/patches/ruby_27/regexp_use_after_free.patch delete mode 100644 resources/patches/ruby_27/remove_deprecate_constant_statements.patch delete mode 100644 resources/patches/ruby_27/remove_squiggly_heredocs.patch delete mode 100644 resources/patches/ruby_27/revert_delete_prefix.patch delete mode 100644 resources/patches/ruby_27/revert_host_value_changes.patch delete mode 100644 resources/patches/ruby_27/ruby-faster-load_27.patch delete mode 100644 resources/patches/ruby_27/ruby2_keywords_guard.patch delete mode 100644 resources/patches/ruby_27/ruby_20_guards.patch delete mode 100644 resources/patches/ruby_27/ruby_version_extra_guards.patch delete mode 100644 resources/patches/ruby_27/stringio_cve-2024-27280.patch delete mode 100644 resources/patches/ruby_27/transform_mjit_header.patch delete mode 100644 resources/patches/ruby_27/uri-redos-cve-2023-36617.patch delete mode 100644 resources/patches/ruby_27/uri_generic_remove_safe_nav_operator_r2.5.patch delete mode 100644 resources/patches/ruby_27/win32_long_paths_support.patch delete mode 100644 resources/patches/ruby_27/windows_configure.patch delete mode 100644 resources/patches/ruby_27/windows_nocodepage_utf8_fallback_r2.5.patch delete mode 100644 resources/patches/ruby_27/windows_ruby_2.5_fixup_generated_batch_files.patch diff --git a/resources/patches/ruby_27/0001-Filter-marshaled-objects-ruby30.patch b/resources/patches/ruby_27/0001-Filter-marshaled-objects-ruby30.patch deleted file mode 100644 index 1b9baf32..00000000 --- a/resources/patches/ruby_27/0001-Filter-marshaled-objects-ruby30.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 6a35becc9ac9f4b27b1d5b5b1fb8cf7aa9b49d5d Mon Sep 17 00:00:00 2001 -From: Hiroshi SHIBATA -Date: Tue, 20 Feb 2024 17:30:25 +0900 -Subject: [PATCH] Filter marshaled objects - ---- - lib/rdoc/store.rb | 45 ++++++++++++++++++++++++++------------------- - 1 file changed, 26 insertions(+), 19 deletions(-) - -diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb -index 5ba671ca1b..5b663d73fb 100644 ---- a/lib/rdoc/store.rb -+++ b/lib/rdoc/store.rb -@@ -556,9 +556,7 @@ def load_all - def load_cache - #orig_enc = @encoding - -- File.open cache_path, 'rb' do |io| -- @cache = Marshal.load io.read -- end -+ @cache = marshal_load(cache_path) - - load_enc = @cache[:encoding] - -@@ -615,9 +613,7 @@ def load_class klass_name - def load_class_data klass_name - file = class_file klass_name - -- File.open file, 'rb' do |io| -- Marshal.load io.read -- end -+ marshal_load(file) - rescue Errno::ENOENT => e - error = MissingFileError.new(self, file, klass_name) - error.set_backtrace e.backtrace -@@ -630,14 +626,10 @@ def load_class_data klass_name - def load_method klass_name, method_name - file = method_file klass_name, method_name - -- File.open file, 'rb' do |io| -- obj = Marshal.load io.read -- obj.store = self -- obj.parent = -- find_class_or_module(klass_name) || load_class(klass_name) unless -- obj.parent -- obj -- end -+ obj = marshal_load(file) -+ obj.store = self -+ obj.parent ||= find_class_or_module(klass_name) || load_class(klass_name) -+ obj - rescue Errno::ENOENT => e - error = MissingFileError.new(self, file, klass_name + method_name) - error.set_backtrace e.backtrace -@@ -650,11 +642,9 @@ def load_method klass_name, method_name - def load_page page_name - file = page_file page_name - -- File.open file, 'rb' do |io| -- obj = Marshal.load io.read -- obj.store = self -- obj -- end -+ obj = marshal_load(file) -+ obj.store = self -+ obj - rescue Errno::ENOENT => e - error = MissingFileError.new(self, file, page_name) - error.set_backtrace e.backtrace -@@ -976,4 +966,21 @@ def unique_modules - @unique_modules - end - -+ private -+ def marshal_load(file) -+ File.open(file, 'rb') {|io| Marshal.load(io, MarshalFilter)} -+ end -+ -+ MarshalFilter = proc do |obj| -+ case obj -+ when true, false, nil, Array, Class, Encoding, Hash, Integer, String, Symbol, RDoc::Text -+ else -+ unless obj.class.name.start_with?("RDoc::") -+ raise TypeError, "not permitted class: #{obj.class.name}" -+ end -+ end -+ obj -+ end -+ private_constant :MarshalFilter -+ - end --- -2.43.2 - diff --git a/resources/patches/ruby_27/0001-Use-safe_load-and-safe_load_file-for-rdoc_options.patch b/resources/patches/ruby_27/0001-Use-safe_load-and-safe_load_file-for-rdoc_options.patch deleted file mode 100644 index 70bd18b8..00000000 --- a/resources/patches/ruby_27/0001-Use-safe_load-and-safe_load_file-for-rdoc_options.patch +++ /dev/null @@ -1,57 +0,0 @@ -author Marc Deslauriers 2024-06-19 10:33:00 -0400 -committer git-ubuntu importer 2024-06-26 12:22:56 +0000 -commit 7584287c1cf59926252197badedde2cbc08e084c (patch) -tree 246e4fa465245f04c53f82cfb8cfeda7ea843db4 -parent 7128299adb87ba73094732751d96621648db1bce (diff) -[PATCH] Use safe_load and safe_load_file for .rdoc_options -Gbp-Pq: CVE-2024-27281-2.patch. -Diffstat --rw-r--r-- lib/rdoc/rdoc.rb 3 --rw-r--r-- test/rdoc/test_rdoc_options.rb 6 -2 files changed, 5 insertions, 4 deletions -diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb -index 605172ae..f6105c68 100644 ---- a/lib/rdoc/rdoc.rb -+++ b/lib/rdoc/rdoc.rb -@@ -156,8 +156,9 @@ class RDoc::RDoc - RDoc.load_yaml - - begin -- options = YAML.load_file '.rdoc_options' -+ options = YAML.safe_load_file '.rdoc_options', permitted_classes: [RDoc::Options, Symbol] - rescue Psych::SyntaxError -+ raise RDoc::Error, "#{options_file} is not a valid rdoc options file" - end - - raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless -diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb -index 140c4afc..f547f5bf 100644 ---- a/test/rdoc/test_rdoc_options.rb -+++ b/test/rdoc/test_rdoc_options.rb -@@ -145,7 +145,7 @@ class TestRDocOptions < RDoc::TestCase - - @options.encoding = Encoding::IBM437 - -- options = YAML.load YAML.dump @options -+ options = YAML.safe_load(YAML.dump(@options), permitted_classes: [RDoc::Options, Symbol]) - - assert_equal Encoding::IBM437, options.encoding - end -@@ -161,7 +161,7 @@ rdoc_include: - - /etc - YAML - -- options = YAML.load yaml -+ options = YAML.safe_load(yaml, permitted_classes: [RDoc::Options, Symbol]) - - assert_empty options.rdoc_include - assert_empty options.static_path -@@ -749,7 +749,7 @@ rdoc_include: - - assert File.exist? '.rdoc_options' - -- assert_equal @options, YAML.load(File.read('.rdoc_options')) -+ assert_equal @options, YAML.safe_load(File.read('.rdoc_options'), permitted_classes: [RDoc::Options, Symbol]) - end - end - diff --git a/resources/patches/ruby_27/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch b/resources/patches/ruby_27/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch deleted file mode 100644 index 246718de..00000000 --- a/resources/patches/ruby_27/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8f6913338eaae4f65a4b44cdc7a36a9be0337608 Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Thu, 30 Nov 2017 16:24:28 -0800 -Subject: [PATCH] (maint) Remove O_CLOEXEC check for AIX builds - ---- - io.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/io.c b/io.c -index ee3ea3e68a..eb21aa25b1 100644 ---- a/io.c -+++ b/io.c -@@ -257,10 +257,7 @@ rb_cloexec_open(const char *pathname, int flags, mode_t mode) - int ret; - static int o_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */ - --#ifdef O_CLOEXEC -- /* O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ -- flags |= O_CLOEXEC; --#elif defined O_NOINHERIT -+#ifdef defined O_NOINHERIT - flags |= O_NOINHERIT; - #endif - ret = open(pathname, flags, mode); --- -2.14.2.windows.1 - diff --git a/resources/patches/ruby_27/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch b/resources/patches/ruby_27/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch deleted file mode 100644 index 9f595dcc..00000000 --- a/resources/patches/ruby_27/Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4fe5971b008cabb1b83e992f7aa0613fcfc6cc69 Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Fri, 10 Aug 2018 15:51:00 -0700 -Subject: [PATCH] Replace reference to RUBY var with - /opt/pl-build-tools/bin/ruby - -This is probably the worst hack I have managed yet: in our cross compiled -builds for some reason when ruby is called with -I$(root build dir) the build -fails because the ruby we are using to build loads the rbconfig for the ruby -we are building. - -ALL of the variables that reference ruby available to the depends files in -ext/etc and ext/ripper call ruby with $(ruby location) -I$(root build dir) so -every time those files are called from make there's a failure (because, as -mentioned before, the ruby using to build loads the rbconfig for the ruby -that's being built) - -I don't understand what changed between ruby 2.4.4 and ruby 2.5.1 that causes -this behavior, it could be that the ruby build is putting the rbconfig in a -new place, or it could be that there's some terrible makefile magic going on -that ruby 2.4.4 builds weren't appending -I$(root build dir) to the RUBY -variable. - -Whatever the cause, this patch just the use of the fully qualified path to -pl-ruby: /opt/pl-build-tools/bin/ruby instead of referencing the RUBY var ---- - ext/etc/depend | 2 +- - ext/ripper/depend | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/etc/depend b/ext/etc/depend -index 99e812c..d4f1eaf 100644 ---- a/ext/etc/depend -+++ b/ext/etc/depend -@@ -1,6 +1,6 @@ - constdefs.h : $(srcdir)/mkconstants.rb - @echo "generating constant definitions" -- @$(RUBY) $(srcdir)/mkconstants.rb -o constdefs.h -+ @/opt/pl-build-tools/bin/ruby $(srcdir)/mkconstants.rb -o constdefs.h - - # AUTOGENERATED DEPENDENCIES START - etc.o: $(RUBY_EXTCONF_H) -diff --git a/ext/ripper/depend b/ext/ripper/depend -index 69759ec..4911f5f 100644 ---- a/ext/ripper/depend -+++ b/ext/ripper/depend -@@ -29,7 +29,7 @@ check: .eventids2-check - - .eventids2-check: $(GEN) $(SRC1) $(SRC2) - $(ECHO) checking $(SRC1) and $(SRC2) -- $(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) -+ $(Q) /opt/pl-build-tools/bin/ruby $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) - @exit > $@ - - eventids1.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC1) --- -2.18.0.windows.1 - diff --git a/resources/patches/ruby_27/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch b/resources/patches/ruby_27/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch deleted file mode 100644 index a21dc33c..00000000 --- a/resources/patches/ruby_27/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 1bfa17d69f62a7bda3a2e419349692f36f3776db -Author: Josh Cooper -Date: Tue Nov 15 11:37:53 2022 -0800 - - Solaris 10 SPARC patch for Ruby 2.7 - - This is the same patch as [1] but it's adapted to Ruby 2.7 - - [1] resource/patches/ruby_25/Solaris-only-Replace-reference-to-RUBY-var-with-opt-pl-build-tool.patch - -diff --git a/ext/etc/depend b/ext/etc/depend -index 99e812c7e4..8c9f926d36 100644 ---- a/ext/etc/depend -+++ b/ext/etc/depend -@@ -1,6 +1,6 @@ - constdefs.h : $(srcdir)/mkconstants.rb - @echo "generating constant definitions" -- @$(RUBY) $(srcdir)/mkconstants.rb -o constdefs.h -+ @/opt/csw/bin/ruby $(srcdir)/mkconstants.rb -o constdefs.h - - # AUTOGENERATED DEPENDENCIES START - etc.o: $(RUBY_EXTCONF_H) -diff --git a/ext/ripper/depend b/ext/ripper/depend -index 69759ec716..3c1314186a 100644 ---- a/ext/ripper/depend -+++ b/ext/ripper/depend -@@ -29,7 +29,7 @@ check: .eventids2-check - - .eventids2-check: $(GEN) $(SRC1) $(SRC2) - $(ECHO) checking $(SRC1) and $(SRC2) -- $(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) -+ $(Q) /opt/csw/bin/ruby $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) - @exit > $@ - - eventids1.c: $(GEN) $(srcdir)/tools/dsl.rb $(SRC1) diff --git a/resources/patches/ruby_27/aix-do-not-use-realpath.patch b/resources/patches/ruby_27/aix-do-not-use-realpath.patch deleted file mode 100644 index 32bac47b..00000000 --- a/resources/patches/ruby_27/aix-do-not-use-realpath.patch +++ /dev/null @@ -1,14 +0,0 @@ -# while migrating to ruby 2.7.1, compiled miniruby is not functional, failing -# with `Invalid argument @ rb_check_realpath_internal - ./tool/generic_erb.rb (Errno::EINVAL)` -# even if the file is existing and readable. Issue was tracked down to new code in file.c -# using glibc realpath function. ---- a/configure.ac -+++ b/configure.ac -@@ -1858,7 +1858,6 @@ - AC_CHECK_FUNCS(qsort_r) - AC_CHECK_FUNCS(qsort_s) - AC_CHECK_FUNCS(readlink) --AC_CHECK_FUNCS(realpath) - AC_CHECK_FUNCS(round) - AC_CHECK_FUNCS(sched_getaffinity) - AC_CHECK_FUNCS(seekdir) diff --git a/resources/patches/ruby_27/aix-fix-libpath-in-configure.patch b/resources/patches/ruby_27/aix-fix-libpath-in-configure.patch deleted file mode 100644 index 4ba1a751..00000000 --- a/resources/patches/ruby_27/aix-fix-libpath-in-configure.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 34a847d9f0b350298acaa96b386aad51be38969e Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Tue, 7 Aug 2018 15:13:09 -0700 -Subject: [PATCH] aix fix libpath in configure -# Prior to this commit, builds of Ruby on AIX with the --with-opt-dir -# configure flag fails due to whitespace in the -blibpath arguments -# arguments passed to the linker. (This patch uses a fragment derived -# from the "non-portable sed" patch we used for Ruby 1.9.3.) - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d877e7a0c..cf2602325f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3336,7 +3336,7 @@ AS_IF([test "x$OPT_DIR" != x], [ - for dir in $OPT_DIR; do - echo x ${LIBPATHFLAG} ${RPATHFLAG} | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" -- done | tr '\012' ' ' | sed 's/ *$//'` -+ done | tr '\012' ' ' | sed "s% \+% %g;s% /%${IFS}/%g"` - AS_IF([test x"$val" != x], [ - test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS " - LDFLAGS="$LDFLAGS$val" --- -2.18.0.windows.1 - diff --git a/resources/patches/ruby_27/aix_configure.patch b/resources/patches/ruby_27/aix_configure.patch deleted file mode 100644 index af560ce2..00000000 --- a/resources/patches/ruby_27/aix_configure.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 36c7bd3faaa23694b187c4bed27af1a944c969c5 Mon Sep 17 00:00:00 2001 -From: "Sean P. McDonald" -Date: Tue, 7 Aug 2018 12:07:40 -0700 -Subject: [PATCH] revert-configure-fix -# reverts changes from commit b7f7b0a2d25071dd8fe09b3f313168bf7f939cc7 that -# resulted in build failures on AIX. The patch should be removed once PA-1607 -# is resolved. - ---- - configure.ac | 43 ++++++++++++++++++++----------------------- - 1 file changed, 20 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1ed36b..91db828 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -463,24 +463,6 @@ RUBY_WERROR_FLAG([ - cd .. && rm -fr tmp.$$.try_link - ]) - --: ${RPATHFLAG=''} --rpathflag='' --AS_IF([test x"${RPATHFLAG}" = x], [ -- AS_CASE(["$target_os"], -- [hpux*], [AS_IF([test "$rb_cv_prog_gnu_ld" = no], [rpathflag='+b '])], -- [aix*], [rpathflag='-blibpath:'], -- [for rpathflag in -R "-rpath "; do -- AS_CASE("$rpathflag", -- [*" "], [AS_CASE(["${linker_flag}"], -- [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])]) -- rpathflag="${linker_flag}${rpathflag}" -- RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=]) -- AS_IF([test "x${rpathflag}" != x], []) -- done]) --], [ -- rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'` --]) -- - AS_CASE([$RUBY_PATCHLEVEL], [-*], - [RUBY_DEVEL=yes], [RUBY_DEVEL=no]) - particular_werror_flags=$RUBY_DEVEL -@@ -751,7 +733,7 @@ AC_ARG_WITH(opt-dir, - [ - val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"` - CPPFLAGS="$CPPFLAGS $val" -- val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib${rpathflag:+ $rpathflag\\\\1/lib}|g;s/^ //"` -+ val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -L\1/lib|g;s/^ //"` - LDFLAGS="$LDFLAGS $val" - LDFLAGS_OPTDIR="$val" - OPT_DIR="$withval" -@@ -2610,6 +2592,7 @@ AC_SUBST(LIBEXT)dnl - AC_SUBST(ASMEXT, S)dnl - - STATIC= -+: ${PATHFLAG=''} - - AS_IF([test "$with_dln_a_out" != yes], [ - rb_cv_dlopen=unknown -@@ -2648,6 +2631,9 @@ AS_IF([test "$with_dln_a_out" != yes], [ - : ${LDSHARED='$(LD) -b'} - XLDFLAGS="$XLDFLAGS -Wl,-E" - : ${LIBPATHENV=SHLIB_PATH} -+ if test "$rb_cv_prog_gnu_ld" = no; then -+ RPATHFLAG=' +b %1$-s' -+ fi - rb_cv_dlopen=yes], - [solaris*], [ AS_IF([test "$GCC" = yes], [ - : ${LDSHARED='$(CC) -shared'} -@@ -2723,6 +2709,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ - TRY_LINK='$(CC) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)' - TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(LOCAL_LIBS) $(LIBS)' - : ${LIBPATHENV=LIBPATH} -+ RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}" - : ${PRELOADENV=LDR_PRELOAD} - rb_cv_dlopen=yes], - [nto-qnx*], [ DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" -@@ -2758,11 +2745,20 @@ AS_IF([test "$with_dln_a_out" != yes], [ - ]) - ]) - -- AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [ -- AS_IF([test "x$rpathflag" != x], [ -- RPATHFLAG=" ${rpathflag}%1\$-s" -- ]) -- ]) -+ if test "$enable_rpath" = yes; then -+ if test x"${RPATHFLAG}" = x; then -+ for rpathflag in -R "-rpath "; do -+ AS_CASE("$rpathflag", -+ [*" "], [AS_CASE(["${linker_flag}"], -+ [*,], [rpathflag=`echo "$rpathflag" | tr ' ' ,`])]) -+ rpathflag="${linker_flag}${rpathflag}" -+ RUBY_TRY_LDFLAGS([${rpathflag}.], [], [rpathflag=]) -+ if test "x${rpathflag}" != x; then -+ break -+ fi -+ done -+ fi -+ fi - ]) - AS_IF([test "${LDSHAREDXX}" = ""], [ - AS_CASE(["${LDSHARED}"], --- -2.18.0.windows.1 - diff --git a/resources/patches/ruby_27/aix_ruby_2.1_fix_make_test_failure_r2.5.patch b/resources/patches/ruby_27/aix_ruby_2.1_fix_make_test_failure_r2.5.patch deleted file mode 100644 index 7f57557d..00000000 --- a/resources/patches/ruby_27/aix_ruby_2.1_fix_make_test_failure_r2.5.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 25417e02b6faa0b78633038da436f25b35ab6c22 Mon Sep 17 00:00:00 2001 -From: Geoff Nichols -Date: Mon, 11 May 2015 17:12:43 -0700 -Subject: [PATCH] AIX disable tests for Ruby bugs 2729 and 5234 - -Prior to this commit, AIX ruby 2.1 builds sometimes fail -with a "temporal unlocking already unlocked string" error -message during "make test". - -These failures seems to likely be spurious, since a -manual "make test" - run in the same build area as the failure - -completes successfully. - -This commit disables the tests for Ruby bugs 2729 and 5234. ---- - bootstraptest/test_flow.rb | 52 +++++++++++++++++++++++----------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb -index 0390062..b4fcb4d 100644 ---- a/bootstraptest/test_flow.rb -+++ b/bootstraptest/test_flow.rb -@@ -518,32 +518,32 @@ assert_equal %Q{ENSURE\n}, %q{ - end - e = Bug2728.new - }], -- ['[ruby-core:28132]', %q{ -- class Bug2729 -- include Enumerable -- def each -- begin -- yield :foo -- ensure -- proc {}.call -- end -- end -- end -- e = Bug2729.new --}], -- ['[ruby-core:39125]', %q{ -- class Bug5234 -- include Enumerable -- def each -- begin -- yield :foo -- ensure -- proc -- end -- end -- end -- e = Bug5234.new --}], -+# ['[ruby-core:28132]', %q{ -+# class Bug2729 -+# include Enumerable -+# def each -+# begin -+# yield :foo -+# ensure -+# proc {}.call -+# end -+# end -+# end -+# e = Bug2729.new -+#}], -+# ['[ruby-core:39125]', %q{ -+# class Bug5234 -+# include Enumerable -+# def each -+# begin -+# yield :foo -+# ensure -+# proc -+# end -+# end -+# end -+# e = Bug5234.new -+#}], - ['[ruby-dev:45656]', %q{ - class Bug6460 - include Enumerable --- -2.3.2 (Apple Git-55) - diff --git a/resources/patches/ruby_27/lib_optparse_remove_safe_nav_operator.patch b/resources/patches/ruby_27/lib_optparse_remove_safe_nav_operator.patch deleted file mode 100644 index 17fa8040..00000000 --- a/resources/patches/ruby_27/lib_optparse_remove_safe_nav_operator.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/lib/optparse.rb b/lib/optparse.rb -index 614ebc3..71ef887 100644 ---- a/lib/optparse.rb -+++ b/lib/optparse.rb -@@ -1842,11 +1842,12 @@ XXX - basename = File.basename($0, '.*') - return true if load(File.expand_path(basename, '~/.options')) rescue nil - basename << ".options" -+ xdg_config_dirs = ENV['XDG_CONFIG_DIRS'].split(File::PATH_SEPARATOR) if ENV['XDG_CONFIG_DIRS'] - return [ - # XDG - ENV['XDG_CONFIG_HOME'], - '~/.config', -- *ENV['XDG_CONFIG_DIRS']&.split(File::PATH_SEPARATOR), -+ *xdg_config_dirs, - - # Haiku - '~/config/settings', diff --git a/resources/patches/ruby_27/net_http_eof_14972_r2.5.patch b/resources/patches/ruby_27/net_http_eof_14972_r2.5.patch deleted file mode 100644 index a33ab253..00000000 --- a/resources/patches/ruby_27/net_http_eof_14972_r2.5.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d4d9d38216ce339a63e9ecb277f9ee3046876d93 Mon Sep 17 00:00:00 2001 -From: Josh Cooper -Date: Mon, 19 Aug 2019 14:47:07 -0700 -Subject: [PATCH] (PA-2849) Raise EOF if response body content length is known - -If response body content length is known, then read the complete response body -or raise EOF if it is truncated. - -[Bug #14972][ruby-core:88324] ---- - lib/net/http/response.rb | 2 +- - test/net/http/test_httpresponse.rb | 15 +++++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb -index 5a94f95..e4ef522 100644 ---- a/lib/net/http/response.rb -+++ b/lib/net/http/response.rb -@@ -296,7 +296,7 @@ class Net::HTTPResponse - - clen = content_length() - if clen -- @socket.read clen, dest, true # ignore EOF -+ @socket.read clen, dest - return - end - clen = range_length() -diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb -index a03bb2e..f8192e1 100644 ---- a/test/net/http/test_httpresponse.rb -+++ b/test/net/http/test_httpresponse.rb -@@ -457,6 +457,21 @@ EOS - assert_equal '#', res.inspect - end - -+ def test_raise_eof -+ io = dummy_io(< $dir_mode) - prepare "default gems from #{dir}", gem_dir, directories - -@@ -863,7 +863,7 @@ def install_default_gem(dir, srcdir) - end - - install?(:ext, :comm, :gem, :'bundled-gems') do -- gem_dir = Gem.default_dir -+ gem_dir = "/opt/puppetlabs/puppet/lib/ruby/gems/2.7.0" - directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) - prepare "bundled gems", gem_dir, directories - install_dir = with_destdir(gem_dir) diff --git a/resources/patches/ruby_27/regexp_use_after_free.patch b/resources/patches/ruby_27/regexp_use_after_free.patch deleted file mode 100644 index 8b58d9cd..00000000 --- a/resources/patches/ruby_27/regexp_use_after_free.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/regexec.c b/regexec.c -index 73694ab14a..140691ad42 100644 ---- a/regexec.c -+++ b/regexec.c -@@ -3449,8 +3449,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, - CASE(OP_MEMORY_END_PUSH_REC) MOP_IN(OP_MEMORY_END_PUSH_REC); - GET_MEMNUM_INC(mem, p); - STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */ -- STACK_PUSH_MEM_END(mem, s); - mem_start_stk[mem] = GET_STACK_INDEX(stkp); -+ STACK_PUSH_MEM_END(mem, s); - MOP_OUT; - JUMP; diff --git a/resources/patches/ruby_27/remove_deprecate_constant_statements.patch b/resources/patches/ruby_27/remove_deprecate_constant_statements.patch deleted file mode 100644 index 4c156349..00000000 --- a/resources/patches/ruby_27/remove_deprecate_constant_statements.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/rubygems/compatibility.rb b/lib/rubygems/compatibility.rb -index f1d452e..4c5f422 100644 ---- a/lib/rubygems/compatibility.rb -+++ b/lib/rubygems/compatibility.rb -@@ -13,7 +13,7 @@ - # TODO remove at RubyGems 4 - module Gem - RubyGemsVersion = VERSION -- deprecate_constant(:RubyGemsVersion) -+ deprecate_constant(:RubyGemsVersion) if respond_to?(:deprecate_constant) - - RbConfigPriorities = %w[ - MAJOR -@@ -30,7 +30,7 @@ module Gem - ConfigMap = Hash.new do |cm, key| - cm[key] = RbConfig::CONFIG[key.to_s] - end -- deprecate_constant(:ConfigMap) -+ deprecate_constant(:ConfigMap) if respond_to?(:deprecate_constant) - else - RbConfigPriorities.each do |key| - ConfigMap[key.to_sym] = RbConfig::CONFIG[key] diff --git a/resources/patches/ruby_27/remove_squiggly_heredocs.patch b/resources/patches/ruby_27/remove_squiggly_heredocs.patch deleted file mode 100644 index 4e427944..00000000 --- a/resources/patches/ruby_27/remove_squiggly_heredocs.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c78699d4f769cc88516c6cba396aefce06571c3c Mon Sep 17 00:00:00 2001 -From: Gabriel Nagy -Date: Fri, 24 Jul 2020 18:23:14 +0300 -Subject: [PATCH] Remove squiggly heredoc from cxxanyargs extconf - -The squiggly heredoc was added in Ruby 2.3, but we're cross-compiling -with older Ruby versions. Change it to a normal heredoc. ---- - ext/-test-/cxxanyargs/extconf.rb | 2 +- - lib/readline.gemspec | 4 ++-- - 2 file changed, 3 insertion(+), 3 deletion(-) - -diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb -index 08d8c83010..8cc95e48d0 100644 ---- a/ext/-test-/cxxanyargs/extconf.rb -+++ b/ext/-test-/cxxanyargs/extconf.rb -@@ -2,7 +2,7 @@ - - cxx = MakeMakefile["C++"] - --ok = cxx.try_compile(<<~'begin', "") do |x| -+ok = cxx.try_compile(<<-'begin', "") do |x| - #include "ruby/config.h" - - namespace { -diff --git a/lib/readline.gemspec b/lib/readline.gemspec -index 5c641a8..52a8ff4 100644 ---- a/lib/readline.gemspec -+++ b/lib/readline.gemspec -@@ -5,7 +5,7 @@ Gem::Specification.new do |spec| - spec.email = ['aycabta@gmail.com'] - - spec.summary = %q{It's a loader for "readline".} -- spec.description = <<~EOD -+ spec.description = <<-EOD - This is just a loader for "readline". If Ruby has "readline-ext" gem that - is a native extension, this gem will load it first. If Ruby doesn't have - the "readline-ext" gem this gem will load "reline" that is a compatible -@@ -17,7 +17,7 @@ Gem::Specification.new do |spec| - spec.files = Dir['BSDL', 'COPYING', 'README.md', 'lib/readline.rb'] - spec.require_paths = ['lib'] - -- spec.post_install_message = <<~EOM -+ spec.post_install_message = <<-EOM - +---------------------------------------------------------------------------+ - | This is just a loader for "readline". If Ruby has "readline-ext" gem that | - | is a native extension, this gem will load it first. If Ruby doesn't have | --- -2.27.0 - diff --git a/resources/patches/ruby_27/revert_delete_prefix.patch b/resources/patches/ruby_27/revert_delete_prefix.patch deleted file mode 100644 index b3013c94..00000000 --- a/resources/patches/ruby_27/revert_delete_prefix.patch +++ /dev/null @@ -1,106 +0,0 @@ -commit 8b4ce7d6c6e1ae339d8fce21e846c78f1579ce44 -Author: Gabriel Nagy -Date: Fri Jul 24 17:50:07 2020 +0300 - - Revert "Use delete_prefix instead of `sub(/\Afixed-pattern/, '')`" - - This reverts commit c01a5ee85e2d6a7128cccafb143bfa694284ca87. - - Revert this commit since on cross-compiled platforms we use older Ruby - versions to compile Ruby, and `delete_prefix` was added in Ruby 2.5. - -diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb -index 9f613c3475..1f151d5957 100644 ---- a/ext/ripper/lib/ripper/lexer.rb -+++ b/ext/ripper/lib/ripper/lexer.rb -@@ -265,14 +265,14 @@ def compile(pattern) - end - - def map_tokens(tokens) -- tokens.map {|pos,type,str| map_token(type.to_s.delete_prefix('on_')) }.join -+ tokens.map {|pos,type,str| map_token(type.to_s.sub(/\Aon_/,'')) }.join - end - - MAP = {} - seed = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a - SCANNER_EVENT_TABLE.each do |ev, | - raise CompileError, "[RIPPER FATAL] too many system token" if seed.empty? -- MAP[ev.to_s.delete_prefix('on_')] = seed.shift -+ MAP[ev.to_s.sub(/\Aon_/,'')] = seed.shift - end - - def map_token(tok) -diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb -index bec76e0749..75e6a966b6 100644 ---- a/lib/cgi/core.rb -+++ b/lib/cgi/core.rb -@@ -421,7 +421,7 @@ def self.parse(query) - module QueryExtension - - %w[ CONTENT_LENGTH SERVER_PORT ].each do |env| -- define_method(env.delete_prefix('HTTP_').downcase) do -+ define_method(env.sub(/^HTTP_/, '').downcase) do - (val = env_table[env]) && Integer(val) - end - end -@@ -434,7 +434,7 @@ module QueryExtension - HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING - HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST - HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env| -- define_method(env.delete_prefix('HTTP_').downcase) do -+ define_method(env.sub(/^HTTP_/, '').downcase) do - env_table[env] - end - end -diff --git a/lib/mkmf.rb b/lib/mkmf.rb -index eabccd48eb..4dc9c5c71f 100644 ---- a/lib/mkmf.rb -+++ b/lib/mkmf.rb -@@ -2282,7 +2282,7 @@ def create_makefile(target, srcprefix = nil) - origdef ||= '' - - if $extout and $INSTALLFILES -- $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.delete_prefix('./'))}) -+ $cleanfiles.concat($INSTALLFILES.collect {|files, dir|File.join(dir, files.sub(/\A\.\//, ''))}) - $distcleandirs.concat($INSTALLFILES.collect {|files, dir| dir}) - end - -diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb -index 07fbc6a21f..7688adb671 100644 ---- a/lib/net/protocol.rb -+++ b/lib/net/protocol.rb -@@ -337,7 +337,7 @@ def each_message_chunk - read_bytes = 0 - while (line = readuntil("\r\n")) != ".\r\n" - read_bytes += line.size -- yield line.delete_prefix('.') -+ yield line.sub(/\A\./, '') - end - LOG_on() - LOG "read message (#{read_bytes} bytes)" -diff --git a/lib/optparse.rb b/lib/optparse.rb -index 614ebc3eae..5aa74e3e50 100644 ---- a/lib/optparse.rb -+++ b/lib/optparse.rb -@@ -1602,7 +1602,7 @@ def parse_in_order(argv = default_argv, setter = nil, &nonopt) # :nodoc: - begin - sw, = complete(:short, opt) - # short option matched. -- val = arg.delete_prefix('-') -+ val = arg.sub(/\A-/, '') - has_arg = true - rescue InvalidOption - # if no short options match, try completion with long -diff --git a/lib/un.rb b/lib/un.rb -index 4a15a37394..fe5f618b78 100644 ---- a/lib/un.rb -+++ b/lib/un.rb -@@ -47,7 +47,7 @@ def setup(options = "", *long_options) - end - long_options.each do |s| - opt_name, arg_name = s.split(/(?=[\s=])/, 2) -- opt_name.delete_prefix!('--') -+ opt_name.sub!(/\A--/, '') - s = "--#{opt_name.gsub(/([A-Z]+|[a-z])([A-Z])/, '\1-\2').downcase}#{arg_name}" - puts "#{opt_name}=>#{s}" if $DEBUG - opt_name = opt_name.intern diff --git a/resources/patches/ruby_27/revert_host_value_changes.patch b/resources/patches/ruby_27/revert_host_value_changes.patch deleted file mode 100644 index 5b88556c..00000000 --- a/resources/patches/ruby_27/revert_host_value_changes.patch +++ /dev/null @@ -1,19 +0,0 @@ -# Revert "[Bug #17021] Make host_* values consistent with target_*" -# This reverts commit 43a9a974e276dc49b03ec81ccace0adb534a3d20. - -diff --git a/configure b/configure -index ee973ba..14de3e7 100755 ---- a/configure -+++ b/configure -@@ -6540,11 +6540,6 @@ esac - - - fi --host_os=$target_os --host_vendor=$target_vendor --host_cpu=$target_cpu --host=$target --host_alias=$target_alias - - case "$target_os" in #( - darwin*) : diff --git a/resources/patches/ruby_27/ruby-faster-load_27.patch b/resources/patches/ruby_27/ruby-faster-load_27.patch deleted file mode 100644 index 92e41c78..00000000 --- a/resources/patches/ruby_27/ruby-faster-load_27.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-2.7.0/load.c.orig 2020-02-26 12:19:04.963826602 -0800 -+++ ruby-2.7.0/load.c 2020-02-26 12:28:55.865876051 -0800 -@@ -578,7 +578,7 @@ - rb_parser_set_context(parser, NULL, FALSE); - ast = (rb_ast_t *)rb_parser_load_file(parser, fname); - iseq = rb_iseq_new_top(&ast->body, rb_fstring_lit(""), -- fname, rb_realpath_internal(Qnil, fname, 1), NULL); -+ fname, fname, NULL); - rb_ast_dispose(ast); - } - rb_exec_event_hook_script_compiled(ec, iseq, Qnil); diff --git a/resources/patches/ruby_27/ruby2_keywords_guard.patch b/resources/patches/ruby_27/ruby2_keywords_guard.patch deleted file mode 100644 index 529a9349..00000000 --- a/resources/patches/ruby_27/ruby2_keywords_guard.patch +++ /dev/null @@ -1,51 +0,0 @@ -# ruby2_keywords was added in Ruby 2.7, provide some empty methods for -# cross-compilation purposes -diff --git a/lib/forwardable.rb b/lib/forwardable.rb -index 4cfade4..68edefe 100644 ---- a/lib/forwardable.rb -+++ b/lib/forwardable.rb -@@ -186,7 +186,7 @@ module Forwardable - # If it's not a class or module, it's an instance - mod = Module === self ? self : singleton_class - ret = mod.module_eval(&gen) -- mod.send(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7' -+ mod.send(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7' && ENV['CROSS_COMPILING'].nil? - ret - end - -diff --git a/lib/delegate.rb b/lib/delegate.rb -index 1587c7e..2938265 100644 ---- a/lib/delegate.rb -+++ b/lib/delegate.rb -@@ -75,6 +75,14 @@ class Delegator < BasicObject - # - # Handles the magic of delegation through \_\_getobj\_\_. - # -+ if ENV['CROSS_COMPILING'] -+ unless self.respond_to?(:ruby2_keywords, true) -+ def self.ruby2_keywords(name, *) -+ # nil -+ end -+ end -+ end -+ - ruby2_keywords def method_missing(m, *args, &block) - r = true - target = self.__getobj__ {r = false} -@@ -337,6 +345,16 @@ class SimpleDelegator < Delegator - end - end - -+if ENV['CROSS_COMPILING'] -+ class Proc -+ unless method_defined?(:ruby2_keywords) -+ def ruby2_keywords -+ self -+ end -+ end -+ end -+end -+ - def Delegator.delegating_block(mid) # :nodoc: - lambda do |*args, &block| - target = self.__getobj__ diff --git a/resources/patches/ruby_27/ruby_20_guards.patch b/resources/patches/ruby_27/ruby_20_guards.patch deleted file mode 100644 index 3aea0308..00000000 --- a/resources/patches/ruby_27/ruby_20_guards.patch +++ /dev/null @@ -1,31 +0,0 @@ -# more guards for boxes where we cross-compile with ruby 2.0.0p598 -diff --git a/lib/delegate.rb b/lib/delegate.rb -index 1587c7e..a53690f 100644 ---- a/lib/delegate.rb -+++ b/lib/delegate.rb -@@ -107,6 +107,12 @@ class Delegator < BasicObject - private_constant :KERNEL_RESPOND_TO - - # Handle BasicObject instances -+ if ENV['CROSS_COMPILING'] -+ def self.private(name, *) -+ # nil -+ end -+ end -+ - private def target_respond_to?(target, m, include_private) - case target - when Object -diff --git a/lib/rubygems/core_ext/kernel_warn.rb b/lib/rubygems/core_ext/kernel_warn.rb -index dfc577d..3edf965 100644 ---- a/lib/rubygems/core_ext/kernel_warn.rb -+++ b/lib/rubygems/core_ext/kernel_warn.rb -@@ -1,7 +1,7 @@ - # frozen_string_literal: true - - # `uplevel` keyword argument of Kernel#warn is available since ruby 2.5. --if RUBY_VERSION >= "2.5" -+if RUBY_VERSION >= "2.5" && ENV['CROSS_COMPILING'].nil? - - module Kernel - path = "#{__dir__}/" # Frames to be skipped start with this path. diff --git a/resources/patches/ruby_27/ruby_version_extra_guards.patch b/resources/patches/ruby_27/ruby_version_extra_guards.patch deleted file mode 100644 index 478a7bbd..00000000 --- a/resources/patches/ruby_27/ruby_version_extra_guards.patch +++ /dev/null @@ -1,29 +0,0 @@ -# RUBY_VERSION resolves to 2.7.1, but we're compiling with much older versions, -# so also check for the CROSS_COMPILING variable which we set ourselves during -# compilation -diff --git a/lib/rubygems/util.rb b/lib/rubygems/util.rb -index b5f1408..1ea7a83 100644 ---- a/lib/rubygems/util.rb -+++ b/lib/rubygems/util.rb -@@ -85,7 +85,7 @@ module Gem::Util - # returning absolute paths to the matching files. - - def self.glob_files_in_dir(glob, base_path) -- if RUBY_VERSION >= "2.5" -+ if RUBY_VERSION >= "2.5" && ENV['CROSS_COMPILING'].nil? - Dir.glob(glob, base: base_path).map! {|f| File.expand_path(f, base_path) } - else - Dir.glob(File.expand_path(glob, base_path)) -diff --git a/lib/fileutils.rb b/lib/fileutils.rb -index a7ad65a..2a2f8f4 100644 ---- a/lib/fileutils.rb -+++ b/lib/fileutils.rb -@@ -834,7 +834,7 @@ module FileUtils - def compare_stream(a, b) - bsize = fu_stream_blksize(a, b) - -- if RUBY_VERSION > "2.4" -+ if RUBY_VERSION > "2.4" && ENV['CROSS_COMPILING'].nil? - sa = String.new(capacity: bsize) - sb = String.new(capacity: bsize) - else diff --git a/resources/patches/ruby_27/stringio_cve-2024-27280.patch b/resources/patches/ruby_27/stringio_cve-2024-27280.patch deleted file mode 100644 index ad6a2de8..00000000 --- a/resources/patches/ruby_27/stringio_cve-2024-27280.patch +++ /dev/null @@ -1,24 +0,0 @@ -Backport of: - -From c58c5f54f1eab99665ea6a161d29ff6a7490afc8 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -Date: Tue, 16 Nov 2021 17:39:32 +0900 -Subject: [PATCH] [ruby/stringio] Fix expanding size at ungetc/ungetbyte - -https://github.com/ruby/stringio/commit/a35268a3ac ---- - ext/stringio/stringio.c | 2 +- - test/stringio/test_stringio.rb | 25 +++++++++++++++++++++---- - 2 files changed, 22 insertions(+), 5 deletions(-) - ---- a/ext/stringio/stringio.c -+++ b/ext/stringio/stringio.c -@@ -983,7 +983,7 @@ strio_unget_bytes(struct StringIO *ptr, - len = RSTRING_LEN(str); - rest = pos - len; - if (cl > pos) { -- long ex = (rest < 0 ? cl-pos : cl+rest); -+ long ex = cl - (rest < 0 ? pos : len); - rb_str_modify_expand(str, ex); - rb_str_set_len(str, len + ex); - s = RSTRING_PTR(str); diff --git a/resources/patches/ruby_27/transform_mjit_header.patch b/resources/patches/ruby_27/transform_mjit_header.patch deleted file mode 100644 index b411b1d4..00000000 --- a/resources/patches/ruby_27/transform_mjit_header.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/tool/transform_mjit_header.rb b/tool/transform_mjit_header.rb -index 5f89446c81..74bf2b759b 100644 ---- a/tool/transform_mjit_header.rb -+++ b/tool/transform_mjit_header.rb -@@ -174,13 +174,7 @@ def self.supported_header?(code) - # "error: redefinition of parameter 'restrict'" - # If it's true, this script regards platform as AIX or Solaris and adds -std=c99 as workaround. - def self.conflicting_types?(code, cc, cflags) -- with_code(code) do |path| -- cmd = "#{cc} #{cflags} #{path}" -- out = IO.popen(cmd, err: [:child, :out], &:read) -- !$?.success? && -- (out.match?(/error: conflicting types for '[^']+'/) || -- out.match?(/error: redefinition of parameter '[^']+'/)) -- end -+ true - end - - def self.with_code(code) diff --git a/resources/patches/ruby_27/uri-redos-cve-2023-36617.patch b/resources/patches/ruby_27/uri-redos-cve-2023-36617.patch deleted file mode 100644 index a2047bdf..00000000 --- a/resources/patches/ruby_27/uri-redos-cve-2023-36617.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb -index 76a8f99fd4..00c66cf042 100644 ---- a/lib/uri/rfc2396_parser.rb -+++ b/lib/uri/rfc2396_parser.rb -@@ -497,8 +497,8 @@ def initialize_regexp(pattern) - ret = {} - - # for URI::split -- ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) -- ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) -+ ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED) -+ ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED) - - # for URI::extract - ret[:URI_REF] = Regexp.new(pattern[:URI_REF]) -diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb -index dd24a409ea..9b1663dbb6 100644 ---- a/lib/uri/rfc3986_parser.rb -+++ b/lib/uri/rfc3986_parser.rb -@@ -100,7 +100,7 @@ def default_regexp # :nodoc: - QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/, - FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/, - OPAQUE: /\A(?:[^\/].*)?\z/, -- PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/, -+ PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/, - } - end - -diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb -index 72fb5901d9..cee0acb4b5 100644 ---- a/test/uri/test_parser.rb -+++ b/test/uri/test_parser.rb -@@ -79,4 +79,26 @@ def test_split - assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com")) - assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]")) - end -+ -+ def test_rfc2822_parse_relative_uri -+ pre = ->(length) { -+ " " * length + "\0" -+ } -+ parser = URI::RFC2396_Parser.new -+ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |uri| -+ assert_raise(URI::InvalidURIError) do -+ parser.split(uri) -+ end -+ end -+ end -+ -+ def test_rfc3986_port_check -+ pre = ->(length) {"\t" * length + "a"} -+ uri = URI.parse("http://my.example.com") -+ assert_linear_performance((1..5).map {|i| 10**i}, pre: pre) do |port| -+ assert_raise(URI::InvalidComponentError) do -+ uri.port = port -+ end -+ end -+ end - end diff --git a/resources/patches/ruby_27/uri_generic_remove_safe_nav_operator_r2.5.patch b/resources/patches/ruby_27/uri_generic_remove_safe_nav_operator_r2.5.patch deleted file mode 100644 index f2eee592..00000000 --- a/resources/patches/ruby_27/uri_generic_remove_safe_nav_operator_r2.5.patch +++ /dev/null @@ -1,37 +0,0 @@ -# The "&." operator was introduced in Ruby 2.3.0, but we cross-compile -# ruby with ruby 2.1.9 from pl-build-tools-vanagon. This patch removes -# use of the "&." operator, reverting to the last instance of the code -# used before that change was made (ruby 2.3.7, except for the normalize! -# method change, which was taken from ruby 2.2.10). -# -# This patch should be REMOVED once we update pl-ruby to 2.3.0 or later. -# Patch authored by Scott Garman ---- a/lib/uri/generic.rb -+++ b/lib/uri/generic.rb -@@ -209,7 +209,7 @@ module URI - "the scheme #{@scheme} does not accept registry part: #{registry} (or bad hostname?)" - end - -- @scheme&.freeze -+ @scheme.freeze if @scheme - self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2) - self.set_port(self.default_port) if self.default_port && !@port - end -@@ -333,7 +333,7 @@ module URI - # See also URI::Generic.scheme=. - # - def set_scheme(v) -- @scheme = v&.downcase -+ @scheme = v ? v.downcase : v - end - protected :set_scheme - -@@ -1317,7 +1317,7 @@ module URI - # Destructive version of #normalize. - # - def normalize! -- if path&.empty? -+ if path && path.empty? - set_path('/') - end - if scheme && scheme != scheme.downcase diff --git a/resources/patches/ruby_27/win32_long_paths_support.patch b/resources/patches/ruby_27/win32_long_paths_support.patch deleted file mode 100644 index 73c2fd0e..00000000 --- a/resources/patches/ruby_27/win32_long_paths_support.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 229cb0fcdb7957b19d7042b000d803ae58cc6593 Mon Sep 17 00:00:00 2001 -From: Gabriel Nagy -Date: Mon, 17 May 2021 02:33:08 +0300 -Subject: [PATCH] [Win32] long path name support [Bug #12551] - -Implement long path support on Windows by applying Microsoft's -recommended application manifest. - -To make this work on both Visual C++ and MinGW, include the manifest as -a resource when generating the resource files. This way it will be -embedded into the executables generated by both compilers. - -It's important for the manifest resource to have ID 1, otherwise GCC -will embed a default manifest. - -Note that in addition to this, the user needs to have [long paths enabled] -either by modifying the registry or by enabling a group policy. - -[long paths enabled]: https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=cmd#enable-long-paths-in-windows-10-version-1607-and-later - -Co-authored-by: Nobuyoshi Nakada ---- - test/ruby/test_process.rb | 1 + - win32/resource.rb | 2 +- - win32/ruby.manifest | 8 ++++++++ - 3 files changed, 10 insertions(+), 1 deletion(-) - create mode 100644 win32/ruby.manifest - -diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb -index 33144aa62f88..04935441397b 100644 ---- a/test/ruby/test_process.rb -+++ b/test/ruby/test_process.rb -@@ -1771,6 +1771,7 @@ def assert_fail_too_long_path((cmd, sep), mesg) - min = 1_000 / (cmd.size + sep.size) - cmds = Array.new(min, cmd) - exs = [Errno::ENOENT] -+ exs << Errno::EINVAL if windows? - exs << Errno::E2BIG if defined?(Errno::E2BIG) - opts = {[STDOUT, STDERR]=>File::NULL} - opts[:rlimit_nproc] = 128 if defined?(Process::RLIMIT_NPROC) -diff --git a/win32/resource.rb b/win32/resource.rb -index e19e04b92283..bc3eda5630ba 100755 ---- a/win32/resource.rb -+++ b/win32/resource.rb -@@ -61,6 +61,7 @@ def icons.find(path) - #include - - #{icon || ''} -+#{type == 'VFT_APP' ? "1 RT_MANIFEST ruby.manifest" : ""} - VS_VERSION_INFO VERSIONINFO - FILEVERSION #{nversion} - PRODUCTVERSION #{nversion} -@@ -93,4 +94,3 @@ def icons.find(path) - EOF - } - end -- -diff --git a/win32/ruby.manifest b/win32/ruby.manifest -new file mode 100644 -index 000000000000..2bd495979bfc ---- /dev/null -+++ b/win32/ruby.manifest -@@ -0,0 +1,8 @@ -+ -+ -+ -+ -+ true -+ -+ -+ diff --git a/resources/patches/ruby_27/windows_configure.patch b/resources/patches/ruby_27/windows_configure.patch deleted file mode 100644 index 5b7be76f..00000000 --- a/resources/patches/ruby_27/windows_configure.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure.ac 2021-12-08 13:40:18.537723500 +0000 -+++ b/configure.ac 2021-12-08 13:43:09.128848800 +0000 -@@ -150,9 +150,6 @@ - - AC_ARG_PROGRAM - --# checks for UNIX variants that set C preprocessor variables --AC_USE_SYSTEM_EXTENSIONS -- - dnl Checks for programs. - - cflagspat= -@@ -410,6 +407,9 @@ - AC_CHECK_PROG(PKG_CONFIG, pkg-config, [pkg-config], [], [], - [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`]) - -+# checks for UNIX variants that set C preprocessor variables -+AC_USE_SYSTEM_EXTENSIONS -+ - AC_SUBST(RM, ['rm -f']) - AC_SUBST(CP, ['cp']) - RMDIRS='$(top_srcdir)/tool/rmdirs' diff --git a/resources/patches/ruby_27/windows_nocodepage_utf8_fallback_r2.5.patch b/resources/patches/ruby_27/windows_nocodepage_utf8_fallback_r2.5.patch deleted file mode 100644 index 5068e509..00000000 --- a/resources/patches/ruby_27/windows_nocodepage_utf8_fallback_r2.5.patch +++ /dev/null @@ -1,27 +0,0 @@ -2010/05/13 - John O'Connor, Puppet Inc. - -This patch to Ruby is necessary to handle languages/regions on windows -where the codepage is not supported by Ruby such as Arabic which uses -codepage 720. -If the codepage is not found, the Locale falls back to UTF8. -This is a well known Ruby/Ruby on Rails issue which is described at -https://stackoverflow.com/questions/22815542/rails4-unknown-encoding-name-cp720 ---- - -diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb -index ea04bb34bf..87c8f87614 100644 ---- a/ext/win32/lib/win32/registry.rb -+++ b/ext/win32/lib/win32/registry.rb -@@ -69,7 +69,11 @@ module Win32 - WCHAR_NUL = "\0".encode(WCHAR).freeze - WCHAR_CR = "\r".encode(WCHAR).freeze - WCHAR_SIZE = WCHAR_NUL.bytesize -- LOCALE = Encoding.find(Encoding.locale_charmap) -+ begin -+ LOCALE = Encoding.find(Encoding.locale_charmap) -+ rescue ArgumentError -+ LOCALE = Encoding::UTF_8 -+ end - - class Registry - diff --git a/resources/patches/ruby_27/windows_ruby_2.5_fixup_generated_batch_files.patch b/resources/patches/ruby_27/windows_ruby_2.5_fixup_generated_batch_files.patch deleted file mode 100644 index 00cbcca6..00000000 --- a/resources/patches/ruby_27/windows_ruby_2.5_fixup_generated_batch_files.patch +++ /dev/null @@ -1,27 +0,0 @@ -2018/10/04 - Bryan Jen, Puppet Inc. - -This patch to the Ruby batch file generation is necessary when packaging -Ruby with Puppet's vanagon package builder, as used by Puppet agent, -Bolt, and PDK. When the msi installer is built, the path generated for -the installed Ruby cannot be assumed to be the same as the path in -the build environment. For that reason, we need this patch to use the -executables from the current working directory, so that it is always -using the vendored ruby installation. ---- - ---- a/lib/rubygems/commands/setup_command.rb -+++ b/lib/rubygems/commands/setup_command.rb -@@ -279,10 +279,11 @@ - file.puts <<-TEXT - @ECHO OFF - IF NOT "%~f0" == "~f0" GOTO :WinNT -- @"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9 -+ ECHO.This version of Ruby has not been built with support for Windows 95/98/Me. - GOTO :EOF - :WinNT -- @"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %* -+ SET RUBY_EXE_PATH="%~dp0ruby.exe" -+ @%RUBY_EXE_PATH% "%~dpn0" %* - TEXT - end - From 2baae93bd3f6fa224d9504ed92a1c6fd999d848e Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Sat, 9 May 2026 10:12:18 -0500 Subject: [PATCH 3/6] Remove old patch set for ruby-stomp gem The STOMP protocol has not been used since the removal of MCollective from the `puppet-agent` package. Signed-off-by: Charlie Sharpsteen --- .../ruby-stomp/verify_client_certs.patch | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 resources/patches/ruby-stomp/verify_client_certs.patch diff --git a/resources/patches/ruby-stomp/verify_client_certs.patch b/resources/patches/ruby-stomp/verify_client_certs.patch deleted file mode 100644 index 8a15769d..00000000 --- a/resources/patches/ruby-stomp/verify_client_certs.patch +++ /dev/null @@ -1,69 +0,0 @@ -From d18bb48b93d0af2ebdb936811fb980706dfcecf8 Mon Sep 17 00:00:00 2001 -From: Rob Braden -Date: Fri, 1 Jul 2016 12:02:36 -0700 -Subject: [PATCH] verify client hostname - ---- - lib/connection/netio.rb | 4 +++- - spec/connection_spec.rb | 9 +++++---- - 2 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/lib/connection/netio.rb b/lib/connection/netio.rb -index b6c19af..f9e84be 100644 ---- a/lib/connection/netio.rb -+++ b/lib/connection/netio.rb -@@ -287,6 +287,9 @@ module Stomp - ssl.hostname = @host if ssl.respond_to? :hostname= - ssl.sync_close = true # Sync ssl close with underlying TCP socket - ssl.connect -+ if ssl.context.verify_mode != OpenSSL::SSL::VERIFY_NONE -+ ssl.post_connection_check(@host) -+ end - end - def ssl.ready? - ! @rbuffer.empty? || @io.ready? -@@ -405,4 +408,3 @@ module Stomp - end # class Connection - - end # module Stomp -- -diff --git a/spec/connection_spec.rb b/spec/connection_spec.rb -index f5dd408..e53e8c1 100644 ---- a/spec/connection_spec.rb -+++ b/spec/connection_spec.rb -@@ -269,7 +269,7 @@ describe Stomp::Connection do - module ::OpenSSL - module SSL - VERIFY_NONE = 0 -- -+ VERIFY_PEER = 1 - class SSLSocket - end - -@@ -280,14 +280,16 @@ describe Stomp::Connection do - end - - before(:each) do -+ ssl_context = double(:verify_mode => OpenSSL::SSL::VERIFY_PEER) - ssl_parameters = {:hosts => [{:login => "login2", :passcode => "passcode2", :host => "remotehost", :ssl => true}]} -- @ssl_socket = mock(:ssl_socket, :puts => nil, :write => nil, -- :setsockopt => nil, :flush => true) -+ @ssl_socket = mock(:ssl_socket, :puts => nil, :write => nil, -+ :setsockopt => nil, :flush => true, :context => ssl_context) - @ssl_socket.stub!(:sync_close=) - - TCPSocket.should_receive(:open).and_return @tcp_socket - OpenSSL::SSL::SSLSocket.should_receive(:new).and_return(@ssl_socket) - @ssl_socket.should_receive(:connect) -+ @ssl_socket.should_receive(:post_connection_check) - - @connection = Stomp::Connection.new ssl_parameters - end -@@ -460,4 +462,3 @@ describe Stomp::Connection do - end - - end -- --- -2.9.0 - From 2f09ccd5ce997c06a83d3d243cdb3aab403f4897 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Sat, 9 May 2026 10:14:29 -0500 Subject: [PATCH 4/6] Remove patch set for Boost library Boost is no longer built after the retirement of pxp-agent and pe-client-tools. Signed-off-by: Charlie Sharpsteen --- .../files/boost/macos_rpath_install_names.sh | 40 --------------- .../boost/0001-fix-build-for-solaris.patch | 51 ------------------- .../patches/boost/boost-aarch64-flags.patch | 17 ------- .../force-SONAME-option-for-solaris.patch | 34 ------------- .../patches/boost/no-O_CLOEXEC-on-aix71.patch | 17 ------- ...-declare-do_try_join_until-as-inline.patch | 11 ---- 6 files changed, 170 deletions(-) delete mode 100644 resources/files/boost/macos_rpath_install_names.sh delete mode 100644 resources/patches/boost/0001-fix-build-for-solaris.patch delete mode 100644 resources/patches/boost/boost-aarch64-flags.patch delete mode 100644 resources/patches/boost/force-SONAME-option-for-solaris.patch delete mode 100644 resources/patches/boost/no-O_CLOEXEC-on-aix71.patch delete mode 100644 resources/patches/boost/windows-thread-declare-do_try_join_until-as-inline.patch diff --git a/resources/files/boost/macos_rpath_install_names.sh b/resources/files/boost/macos_rpath_install_names.sh deleted file mode 100644 index adaefacb..00000000 --- a/resources/files/boost/macos_rpath_install_names.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -# This script rewrites the install_name values for any boost dylibs in the -# `libdir` so that they rely on the @rpath instead of a specific build directory. -# -# After building, the `otool -L` output for the boost dylibs looks something like this: -# -# /opt/puppetlabs/puppet/lib/libboost_locale.dylib: -# boost/bin.v2/libs/locale/build/gcc-4.8.2/release/threading-multi/libboost_locale.dylib (compatibility version 0.0.0, current version 0.0.0) -# boost/bin.v2/libs/system/build/gcc-4.8.2/release/threading-multi/libboost_system.dylib (compatibility version 0.0.0, current version 0.0.0) -# /usr/lib/libiconv.2.dylib (compatibility version 7.0.0, current version 7.0.0) -# /usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 307.4.0) -# /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1238.0.0) -# -# ...where relative paths to the build directory have been hard-coded. To make these -# libraries useful after relocation, we update them so that they look like this: -# -# /opt/puppetlabs/puppet/lib/libboost_locale.dylib: -# @rpath/libboost_locale.dylib (compatibility version 0.0.0, current version 0.0.0) -# @rpath/libboost_system.dylib (compatibility version 0.0.0, current version 0.0.0) -# /usr/lib/libiconv.2.dylib (compatibility version 7.0.0, current version 7.0.0) -# /usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 307.4.0) -# /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1238.0.0) - -BOOST_DYLIBS=${LIBDIR}/libboost*.dylib - -echo "Updating install_name values for boost dylibs..." - -for dylib_path in $BOOST_DYLIBS; do - # Update the id of this dylib from the old relative path to '@rpath/libboost_foo.dylib': - install_name_tool -id @rpath/$(basename $dylib_path) $dylib_path - - # Update the install_names of each of the boost libraries this library depends on this way, too: - linked_boost_libs=$(otool -L $dylib_path | tail -n +2 | grep boost | awk '{ print $1 }') - for old_name in $linked_boost_libs; do - install_name_tool -change $old_name @rpath/$(basename $old_name) $dylib_path - done -done - -echo "Done." diff --git a/resources/patches/boost/0001-fix-build-for-solaris.patch b/resources/patches/boost/0001-fix-build-for-solaris.patch deleted file mode 100644 index 677ad8a6..00000000 --- a/resources/patches/boost/0001-fix-build-for-solaris.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a916bb628eacb6e594a19a39aeb2bc4bca24d857 Mon Sep 17 00:00:00 2001 -From: gimmy -Date: Wed, 20 May 2020 12:52:05 +0300 -Subject: [PATCH] fix-build-for-solaris ' - ---- - tools/build/src/engine/build.sh | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh -index 41af3715e..b04100e71 100755 ---- a/tools/build/src/engine/build.sh -+++ b/tools/build/src/engine/build.sh -@@ -77,7 +77,7 @@ test_exec () - # Check that the compiler can do C++11. - test_cxx11 () - { -- if ! test $NO_CXX11_CHECK ; then -+ if [ ! $NO_CXX11_CHECK ]; then - case $1 in - gcc) ( ${CXX:=g++} -x c++ -std=c++11 check_cxx11.cpp && rm -f a.out ) 1>/dev/null 2>/dev/null ;; - intel-darwin) ( ${CXX:=icc} -xc++ check_cxx11.cpp && rm -f a.out ) 1>/dev/null 2>/dev/null ;; -@@ -190,7 +190,8 @@ case "$1" in - esac - - # We need a C++11 compiler. Check here and given some feedback about it. --if ! test_cxx11 $B2_TOOLSET ; then -+res=test_cxx11 $B2_TOOLSET -+if [ ! res ]; then - error_exit " - A C++11 capable compiler is required for building the B2 engine. - Toolset '$B2_TOOLSET' does not appear to support C++11. -@@ -207,7 +208,7 @@ case $B2_TOOLSET in - CXX=${CXX:=g++} - CXX_VERSION_OPT=${CXX_VERSION_OPT:=--version} - # Check whether it's MinGW GCC, which has Windows headers and none of POSIX ones. -- machine=$(${CXX} -dumpmachine 2>/dev/null) -+ machine=`${CXX} -dumpmachine 2>/dev/null` - if test $? -ne 0 ; then - echo "B2_TOOLSET is gcc, but the 'gcc' command cannot be executed." - echo "Make sure 'gcc' is in PATH, or use a different toolset." -@@ -492,5 +493,5 @@ esac - if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" - else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" - fi --echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 -+echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} -lrt ${B2_SOURCES} -o b2 - echo_run cp b2 bjam --- -2.25.0 - diff --git a/resources/patches/boost/boost-aarch64-flags.patch b/resources/patches/boost/boost-aarch64-flags.patch deleted file mode 100644 index 58cb0428..00000000 --- a/resources/patches/boost/boost-aarch64-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Boost doesn't build with the -m64 option on aarch64, and the compiler -# builds 64-bit binaries by default, so remove the option. -Index: boost_1_58_0/tools/build/src/tools/gcc.jam -=================================================================== ---- boost_1_58_0.orig/tools/build/src/tools/gcc.jam -+++ boost_1_58_0/tools/build/src/tools/gcc.jam -@@ -457,10 +457,6 @@ rule setup-address-model ( targets * : s - { - option = -m32 ; - } -- else if $(model) = 64 -- { -- option = -m64 ; -- } - } - # For darwin, the model can be 32_64. darwin.jam will handle that - # on its own. diff --git a/resources/patches/boost/force-SONAME-option-for-solaris.patch b/resources/patches/boost/force-SONAME-option-for-solaris.patch deleted file mode 100644 index 11c1c09d..00000000 --- a/resources/patches/boost/force-SONAME-option-for-solaris.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 73f592a68c4a0cedcdf910c51c51a3359755c0e9 Mon Sep 17 00:00:00 2001 -From: gimmy -Date: Wed, 20 May 2020 12:44:50 +0300 -Subject: [PATCH] force SONAME option for solaris -# Solaris machines need to provide the shared object name via the -h flag to the -# linker when compiling things. This is so when other things are linked against -# the lib just the lib name is listed (and not an entire path). See -# https://docs.oracle.com/cd/E19253-01/817-1984/chapter4-97194/index.html for a -# better description. - -# This patch to the gcc jamfile forces the usage -# of the -h flag via SONAME_OPTION. - - ---- - tools/build/src/tools/gcc.jam | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 8910a55f2..b5bec7066 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -1070,6 +1070,9 @@ toolset.flags gcc.link.dll .IMPLIB-COMMAND cygwin : "-Wl,--out-implib - # See note [1] - toolset.flags gcc.link OPTIONS solaris/static : -static ; - -+ toolset.flags gcc.link HAVE_SONAME solaris : "" ; -+ toolset.flags gcc.link SONAME_OPTION solaris : -h ; -+ - # [1] - # For static we made sure there are no dynamic libraries in the - # link. On HP-UX not all system libraries exist as archived libraries (for --- -2.25.0 diff --git a/resources/patches/boost/no-O_CLOEXEC-on-aix71.patch b/resources/patches/boost/no-O_CLOEXEC-on-aix71.patch deleted file mode 100644 index d223d72e..00000000 --- a/resources/patches/boost/no-O_CLOEXEC-on-aix71.patch +++ /dev/null @@ -1,17 +0,0 @@ -# on AIX7.1(7100-04-02-1614), using O_CLOEXEC leads to -# kopen("/dev/urandom", 040000000) Err#22 EINVAL -diff --git a/boost/uuid/detail/random_provider_posix.ipp b/boost/uuid/detail/random_provider_posix.ipp -index 4a22235..1f61cd0 100644 ---- a/boost/uuid/detail/random_provider_posix.ipp -+++ b/boost/uuid/detail/random_provider_posix.ipp -@@ -49,9 +49,6 @@ public: - : fd_(-1) - { - int flags = O_RDONLY; --#if defined(O_CLOEXEC) -- flags |= O_CLOEXEC; --#endif - fd_ = BOOST_UUID_RANDOM_PROVIDER_POSIX_IMPL_OPEN("/dev/urandom", flags); - - if (BOOST_UNLIKELY(-1 == fd_)) - diff --git a/resources/patches/boost/windows-thread-declare-do_try_join_until-as-inline.patch b/resources/patches/boost/windows-thread-declare-do_try_join_until-as-inline.patch deleted file mode 100644 index 8093db3c..00000000 --- a/resources/patches/boost/windows-thread-declare-do_try_join_until-as-inline.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur boost_1_67_0.orig/boost/thread/detail/thread.hpp boost_1_67_0/boost/thread/detail/thread.hpp ---- boost_1_67_0.orig/boost/thread/detail/thread.hpp 2018-07-16 20:42:54.889539200 +0000 -+++ boost_1_67_0/boost/thread/detail/thread.hpp 2018-07-16 20:45:41.436156800 +0000 -@@ -461,7 +461,7 @@ - private: - bool join_noexcept(); - bool do_try_join_until_noexcept(detail::internal_platform_timepoint const &timeout, bool& res); -- bool do_try_join_until(detail::internal_platform_timepoint const &timeout); -+ inline bool do_try_join_until(detail::internal_platform_timepoint const &timeout); - public: - void join(); From 169334667b6ab9f96ef9d7ee353f287e5eb617f0 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Sat, 9 May 2026 10:16:11 -0500 Subject: [PATCH 5/6] Remove patch set for libicu This library is no longer built after the retirement of pe-client-tools. Signed-off-by: Charlie Sharpsteen --- resources/files/libicu/curr_reslocal.mk | 34 ------------------- resources/files/libicu/lang_reslocal.mk | 36 -------------------- resources/files/libicu/locales_reslocal.mk | 38 ---------------------- resources/files/libicu/region_reslocal.mk | 35 -------------------- resources/files/libicu/unit_reslocal.mk | 38 ---------------------- resources/files/libicu/zone_reslocal.mk | 38 ---------------------- 6 files changed, 219 deletions(-) delete mode 100644 resources/files/libicu/curr_reslocal.mk delete mode 100644 resources/files/libicu/lang_reslocal.mk delete mode 100644 resources/files/libicu/locales_reslocal.mk delete mode 100644 resources/files/libicu/region_reslocal.mk delete mode 100644 resources/files/libicu/unit_reslocal.mk delete mode 100644 resources/files/libicu/zone_reslocal.mk diff --git a/resources/files/libicu/curr_reslocal.mk b/resources/files/libicu/curr_reslocal.mk deleted file mode 100644 index 0686f63b..00000000 --- a/resources/files/libicu/curr_reslocal.mk +++ /dev/null @@ -1,34 +0,0 @@ -CURR_CLDR_VERSION = 31.0.1 -# A list of txt's to build -# This file was created by copying data/curr/resfiles.mk from the icu data -# source, and removing unused locales. - -# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml) -CURR_SYNTHETIC_ALIAS = en_NH.txt en_RH.txt ja_JP.txt ja_JP_TRADITIONAL.txt - - -# All aliases (to not be included under 'installed'), but not including root. -CURR_ALIAS_SOURCE = $(CURR_SYNTHETIC_ALIAS) - - -# Ordinary resources -CURR_SOURCE = en.txt en_001.txt en_150.txt en_AG.txt en_AI.txt\ - en_AT.txt en_AU.txt en_BB.txt en_BE.txt en_BI.txt\ - en_BM.txt en_BS.txt en_BW.txt en_BZ.txt en_CA.txt\ - en_CC.txt en_CH.txt en_CK.txt en_CM.txt en_CX.txt\ - en_CY.txt en_DE.txt en_DG.txt en_DK.txt en_DM.txt\ - en_ER.txt en_FI.txt en_FJ.txt en_FK.txt en_FM.txt\ - en_GB.txt en_GD.txt en_GG.txt en_GH.txt en_GI.txt\ - en_GM.txt en_GY.txt en_HK.txt en_IE.txt en_IL.txt\ - en_IM.txt en_IN.txt en_IO.txt en_JE.txt en_JM.txt\ - en_KE.txt en_KI.txt en_KN.txt en_KY.txt en_LC.txt\ - en_LR.txt en_LS.txt en_MG.txt en_MO.txt en_MS.txt\ - en_MT.txt en_MU.txt en_MW.txt en_MY.txt en_NA.txt\ - en_NF.txt en_NG.txt en_NL.txt en_NR.txt en_NU.txt\ - en_NZ.txt en_PG.txt en_PH.txt en_PK.txt en_PN.txt\ - en_PW.txt en_RW.txt en_SB.txt en_SC.txt en_SD.txt\ - en_SE.txt en_SG.txt en_SH.txt en_SI.txt en_SL.txt\ - en_SS.txt en_SX.txt en_SZ.txt en_TC.txt en_TK.txt\ - en_TO.txt en_TT.txt en_TV.txt en_TZ.txt en_UG.txt\ - en_VC.txt en_VG.txt en_VU.txt en_WS.txt en_ZA.txt\ - en_ZM.txt en_ZW.txt eo.txt ja.txt diff --git a/resources/files/libicu/lang_reslocal.mk b/resources/files/libicu/lang_reslocal.mk deleted file mode 100644 index 76f88628..00000000 --- a/resources/files/libicu/lang_reslocal.mk +++ /dev/null @@ -1,36 +0,0 @@ -# © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License -LANG_CLDR_VERSION = 31.0.1 -# A list of txt's to build -# This file was created by copying data/lang/resfiles.mk from the icu data -# source, and removing unused locales. - -# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml) -LANG_SYNTHETIC_ALIAS = en_NH.txt en_RH.txt ja_JP.txt ja_JP_TRADITIONAL.txt - - -# All aliases (to not be included under 'installed'), but not including root. -LANG_ALIAS_SOURCE = $(LANG_SYNTHETIC_ALIAS) - - -# Ordinary resources -LANG_SOURCE = en.txt en_001.txt en_150.txt en_AG.txt en_AI.txt\ - en_AT.txt en_AU.txt en_BB.txt en_BE.txt en_BM.txt\ - en_BS.txt en_BW.txt en_BZ.txt en_CA.txt en_CC.txt\ - en_CH.txt en_CK.txt en_CM.txt en_CX.txt en_CY.txt\ - en_DE.txt en_DG.txt en_DK.txt en_DM.txt en_ER.txt\ - en_FI.txt en_FJ.txt en_FK.txt en_FM.txt en_GB.txt\ - en_GD.txt en_GG.txt en_GH.txt en_GI.txt en_GM.txt\ - en_GY.txt en_HK.txt en_IE.txt en_IL.txt en_IM.txt\ - en_IN.txt en_IO.txt en_JE.txt en_JM.txt en_KE.txt\ - en_KI.txt en_KN.txt en_KY.txt en_LC.txt en_LR.txt\ - en_LS.txt en_MG.txt en_MO.txt en_MS.txt en_MT.txt\ - en_MU.txt en_MW.txt en_MY.txt en_NA.txt en_NF.txt\ - en_NG.txt en_NL.txt en_NR.txt en_NU.txt en_NZ.txt\ - en_PG.txt en_PH.txt en_PK.txt en_PN.txt en_PW.txt\ - en_RW.txt en_SB.txt en_SC.txt en_SD.txt en_SE.txt\ - en_SG.txt en_SH.txt en_SI.txt en_SL.txt en_SS.txt\ - en_SX.txt en_SZ.txt en_TC.txt en_TK.txt en_TO.txt\ - en_TT.txt en_TV.txt en_TZ.txt en_UG.txt en_VC.txt\ - en_VG.txt en_VU.txt en_WS.txt en_ZA.txt en_ZM.txt\ - en_ZW.txt eo.txt ja.txt diff --git a/resources/files/libicu/locales_reslocal.mk b/resources/files/libicu/locales_reslocal.mk deleted file mode 100644 index 1447d685..00000000 --- a/resources/files/libicu/locales_reslocal.mk +++ /dev/null @@ -1,38 +0,0 @@ -# © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License -GENRB_CLDR_VERSION = 31.0.1 -# A list of txt's to build -# This file was created by copying data/locales/resfiles.mk from the icu data -# source, and removing unused locales. - -# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml) -GENRB_SYNTHETIC_ALIAS = en_NH.txt en_RH.txt ja_JP_TRADITIONAL.txt - - -# All aliases (to not be included under 'installed'), but not including root. -GENRB_ALIAS_SOURCE = $(GENRB_SYNTHETIC_ALIAS) - - -# Ordinary resources -GENRB_SOURCE = en.txt en_001.txt en_150.txt en_AG.txt\ - en_AI.txt en_AS.txt en_AT.txt en_AU.txt en_BB.txt\ - en_BE.txt en_BI.txt en_BM.txt en_BS.txt en_BW.txt\ - en_BZ.txt en_CA.txt en_CC.txt en_CH.txt en_CK.txt\ - en_CM.txt en_CX.txt en_CY.txt en_DE.txt en_DG.txt\ - en_DK.txt en_DM.txt en_ER.txt en_FI.txt en_FJ.txt\ - en_FK.txt en_FM.txt en_GB.txt en_GD.txt en_GG.txt\ - en_GH.txt en_GI.txt en_GM.txt en_GU.txt en_GY.txt\ - en_HK.txt en_IE.txt en_IL.txt en_IM.txt en_IN.txt\ - en_IO.txt en_JE.txt en_JM.txt en_KE.txt en_KI.txt\ - en_KN.txt en_KY.txt en_LC.txt en_LR.txt en_LS.txt\ - en_MG.txt en_MH.txt en_MO.txt en_MP.txt en_MS.txt\ - en_MT.txt en_MU.txt en_MW.txt en_MY.txt en_NA.txt\ - en_NF.txt en_NG.txt en_NL.txt en_NR.txt en_NU.txt\ - en_NZ.txt en_PG.txt en_PH.txt en_PK.txt en_PN.txt\ - en_PR.txt en_PW.txt en_RW.txt en_SB.txt en_SC.txt\ - en_SD.txt en_SE.txt en_SG.txt en_SH.txt en_SI.txt\ - en_SL.txt en_SS.txt en_SX.txt en_SZ.txt en_TC.txt\ - en_TK.txt en_TO.txt en_TT.txt en_TV.txt en_TZ.txt\ - en_UG.txt en_UM.txt en_US.txt en_US_POSIX.txt en_VC.txt\ - en_VG.txt en_VI.txt en_VU.txt en_WS.txt en_ZA.txt\ - en_ZM.txt en_ZW.txt eo.txt ja.txt ja_JP.txt diff --git a/resources/files/libicu/region_reslocal.mk b/resources/files/libicu/region_reslocal.mk deleted file mode 100644 index 3d7f68fe..00000000 --- a/resources/files/libicu/region_reslocal.mk +++ /dev/null @@ -1,35 +0,0 @@ -# © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License -REGION_CLDR_VERSION = 31.0.1 -# A list of txt's to build -# This file was created by copying data/region/resfiles.mk from the icu data -# source, and removing unused locales. - -# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml) -REGION_SYNTHETIC_ALIAS = en_NH.txt en_RH.txt ja_JP.txt ja_JP_TRADITIONAL.txt - - -# All aliases (to not be included under 'installed'), but not including root. -REGION_ALIAS_SOURCE = $(REGION_SYNTHETIC_ALIAS) - - -# Ordinary resources -REGION_SOURCE = en_AU.txt en_BB.txt en_BE.txt en_BM.txt en_BS.txt\ - en_BW.txt en_BZ.txt en_CA.txt en_CC.txt en_CH.txt\ - en_CK.txt en_CM.txt en_CX.txt en_CY.txt en_DE.txt\ - en_DG.txt en_DK.txt en_DM.txt en_ER.txt en_FI.txt\ - en_FJ.txt en_FK.txt en_FM.txt en_GB.txt en_GD.txt\ - en_GG.txt en_GH.txt en_GI.txt en_GM.txt en_GY.txt\ - en_HK.txt en_IE.txt en_IL.txt en_IM.txt en_IN.txt\ - en_IO.txt en_JE.txt en_JM.txt en_KE.txt en_KI.txt\ - en_KN.txt en_KY.txt en_LC.txt en_LR.txt en_LS.txt\ - en_MG.txt en_MO.txt en_MS.txt en_MT.txt en_MU.txt\ - en_MW.txt en_MY.txt en_NA.txt en_NF.txt en_NG.txt\ - en_NL.txt en_NR.txt en_NU.txt en_NZ.txt en_PG.txt\ - en_PH.txt en_PK.txt en_PN.txt en_PW.txt en_RW.txt\ - en_SB.txt en_SC.txt en_SD.txt en_SE.txt en_SG.txt\ - en_SH.txt en_SI.txt en_SL.txt en_SS.txt en_SX.txt\ - en_SZ.txt en_TC.txt en_TK.txt en_TO.txt en_TT.txt\ - en_TV.txt en_TZ.txt en_UG.txt en_VC.txt en_VG.txt\ - en_VU.txt en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt\ - eo.txt ja.txt diff --git a/resources/files/libicu/unit_reslocal.mk b/resources/files/libicu/unit_reslocal.mk deleted file mode 100644 index 2db5871b..00000000 --- a/resources/files/libicu/unit_reslocal.mk +++ /dev/null @@ -1,38 +0,0 @@ -# © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License -UNIT_CLDR_VERSION = 31.0.1 -# A list of txt's to build -# This file was created by copying data/unit/resfiles.mk from the icu data -# source, and removing unused locales. - -# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml) -UNIT_SYNTHETIC_ALIAS = en_NH.txt en_RH.txt ja_JP.txt ja_JP_TRADITIONAL.txt - - -# All aliases (to not be included under 'installed'), but not including root. -UNIT_ALIAS_SOURCE = $(UNIT_SYNTHETIC_ALIAS) - - -# Ordinary resources -UNIT_SOURCE = en.txt\ - en_001.txt en_150.txt en_AG.txt en_AI.txt en_AT.txt\ - en_AU.txt en_BB.txt en_BE.txt en_BM.txt en_BS.txt\ - en_BW.txt en_BZ.txt en_CA.txt en_CC.txt en_CH.txt\ - en_CK.txt en_CM.txt en_CX.txt en_CY.txt en_DE.txt\ - en_DG.txt en_DK.txt en_DM.txt en_ER.txt en_FI.txt\ - en_FJ.txt en_FK.txt en_FM.txt en_GB.txt en_GD.txt\ - en_GG.txt en_GH.txt en_GI.txt en_GM.txt en_GY.txt\ - en_HK.txt en_IE.txt en_IL.txt en_IM.txt en_IN.txt\ - en_IO.txt en_JE.txt en_JM.txt en_KE.txt en_KI.txt\ - en_KN.txt en_KY.txt en_LC.txt en_LR.txt en_LS.txt\ - en_MG.txt en_MO.txt en_MS.txt en_MT.txt en_MU.txt\ - en_MW.txt en_MY.txt en_NA.txt en_NF.txt en_NG.txt\ - en_NL.txt en_NR.txt en_NU.txt en_NZ.txt en_PG.txt\ - en_PH.txt en_PK.txt en_PN.txt en_PW.txt en_RW.txt\ - en_SB.txt en_SC.txt en_SD.txt en_SE.txt en_SG.txt\ - en_SH.txt en_SI.txt en_SL.txt en_SS.txt en_SX.txt\ - en_SZ.txt en_TC.txt en_TK.txt en_TO.txt en_TT.txt\ - en_TV.txt en_TZ.txt en_UG.txt en_VC.txt en_VG.txt\ - en_VU.txt en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt\ - eo.txt ja.txt - diff --git a/resources/files/libicu/zone_reslocal.mk b/resources/files/libicu/zone_reslocal.mk deleted file mode 100644 index c8b4e60e..00000000 --- a/resources/files/libicu/zone_reslocal.mk +++ /dev/null @@ -1,38 +0,0 @@ -# © 2016 and later: Unicode, Inc. and others. -# License & terms of use: http://www.unicode.org/copyright.html#License -ZONE_CLDR_VERSION = 31.0.1 -# A list of txt's to build -# This file was created by copying data/zone/resfiles.mk from the icu data -# source, and removing unused locales. - -# Aliases without a corresponding xx.xml file (see icu-config.xml & build.xml) -ZONE_SYNTHETIC_ALIAS = en_NH.txt en_RH.txt ja_JP.txt ja_JP_TRADITIONAL.txt - - -# All aliases (to not be included under 'installed'), but not including root. -ZONE_ALIAS_SOURCE = $(ZONE_SYNTHETIC_ALIAS) - - -# Ordinary resources -ZONE_SOURCE = en.txt en_001.txt\ - en_150.txt en_AG.txt en_AI.txt en_AT.txt en_AU.txt\ - en_BB.txt en_BE.txt en_BM.txt en_BS.txt en_BW.txt\ - en_BZ.txt en_CA.txt en_CC.txt en_CH.txt en_CK.txt\ - en_CM.txt en_CX.txt en_CY.txt en_DE.txt en_DG.txt\ - en_DK.txt en_DM.txt en_ER.txt en_FI.txt en_FJ.txt\ - en_FK.txt en_FM.txt en_GB.txt en_GD.txt en_GG.txt\ - en_GH.txt en_GI.txt en_GM.txt en_GU.txt en_GY.txt\ - en_HK.txt en_IE.txt en_IL.txt en_IM.txt en_IN.txt\ - en_IO.txt en_JE.txt en_JM.txt en_KE.txt en_KI.txt\ - en_KN.txt en_KY.txt en_LC.txt en_LR.txt en_LS.txt\ - en_MG.txt en_MH.txt en_MO.txt en_MP.txt en_MS.txt\ - en_MT.txt en_MU.txt en_MW.txt en_MY.txt en_NA.txt\ - en_NF.txt en_NG.txt en_NL.txt en_NR.txt en_NU.txt\ - en_NZ.txt en_PG.txt en_PH.txt en_PK.txt en_PN.txt\ - en_PW.txt en_RW.txt en_SB.txt en_SC.txt en_SD.txt\ - en_SE.txt en_SG.txt en_SH.txt en_SI.txt en_SL.txt\ - en_SS.txt en_SX.txt en_SZ.txt en_TC.txt en_TK.txt\ - en_TO.txt en_TT.txt en_TV.txt en_TZ.txt en_UG.txt\ - en_VC.txt en_VG.txt en_VU.txt en_WS.txt en_ZA.txt\ - en_ZM.txt en_ZW.txt eo.txt\ - ja.txt jgo.txt jmc.txt ka.txt kab.txt From 8bf542f5105e14b008a0f19e2557567f8e9dc7b6 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Sat, 9 May 2026 10:17:08 -0500 Subject: [PATCH 6/6] Remove stray .DS_Store file This is a macOS finder preference file that doesn't belong in a git repo. This commit also adds `.DS_Store` to `.gitignore` to prevent it from coming back in the future. Signed-off-by: Charlie Sharpsteen --- .gitignore | 1 + resources/patches/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 1 insertion(+) delete mode 100644 resources/patches/.DS_Store diff --git a/.gitignore b/.gitignore index d3adf55b..700ffe2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /.vendor/ vendor/* output/* +.DS_Store .bundle gems Gemfile.lock diff --git a/resources/patches/.DS_Store b/resources/patches/.DS_Store deleted file mode 100644 index bac731c9d30c7f79a9495e9c9ab33241aaa89e4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T0$TO({YSiXH=A3)Z#>#Y?F51&ruHr6#m!FlI}VTBH&_Z zH()j3O~lT??l(I>yO|HNKL8*Gv+*H-4FDE4LP1K2kh#=VF~NjF%`t*5bb@(04Wg2X z{-TM#y$%V?Ab@B1^!+kG&s#8!!Zd5Q-$kWb+t{pIb*pLJc=vMdWqvkG2YzxzqjM>v zpwRu`BAm=e_V$U4Ge3+ciAo5^6AZb&4CAq!59BN!rz+Re4y$1`M)vMv(eJjLUazxk zIg5U$je7TJxolWF`v=Eoqlf4*mM@w~fut+hGFZSXDqo6v@{%}`@f~`KtRk9`8DIvO z0cK#$7%&Hc)m*c>xm;#|8Tgq2+8-Qjgs#C{quM&Kqw6#IYlI}I(_4bjG3Xl1HKGSa z=u||VD$El@=ybF@CeAgOYt-o=)XF%IS-E(;2(>!e9Tg73)yO?FzznQ1P}M`5&i_;V zWlA6Ut0_EU2AF|=#(<~|z2N|hGH2_z^60E}u-#%Kp}3qB6x3HP0XU$2WKTJ@-yt32 YT!XnrnuY8t9g!~riV*IYfnQ+Y1EKCq6#xJL