backport ruby/prism#3585

https://bugs.ruby-lang.org/issues/21337

Early backport of ruby/prism#3585 due to its
bug severity, but missed 3.4.5 release.

Author: sorah

debian/patches/Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

@@ -12,10 +12,10 @@ Updated by John Paul Adrian Glaubitz <[email protected]> on
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 5899f2a..5e9b168 100644
+index fced42e..b24646e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2690,6 +2690,9 @@ AS_CASE([$coroutine_type], [yes|''], [
+@@ -2688,6 +2688,9 @@ AS_CASE([$coroutine_type], [yes|''], [
          [powerpc64-darwin*|ppc64-darwin*], [
              coroutine_type=ppc64
          ],

debian/patches/Make-gemspecs-reproducible.patch

@@ -61,7 +61,7 @@ index 5719f83..fe76260 100644
    spec.email         = ["[email protected]", "[email protected]"]
 
 diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
-index 3144df5..65c313f 100644
+index 47f4802..cf0b5f7 100644
 --- a/lib/rdoc/rdoc.gemspec
 +++ b/lib/rdoc/rdoc.gemspec
 @@ -7,6 +7,7 @@ end

debian/patches/Reject-true-not-true.patch

@@ -15,10 +15,10 @@ Subject: extract-gems-sequential: Keep using RUNRUBY
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/common.mk b/common.mk
-index 594b5da..0b2aa6a 100644
+index 193ed12..0879c2b 100644
 --- a/common.mk
 +++ b/common.mk
-@@ -1537,7 +1537,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
+@@ -1543,7 +1543,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
 
  extract-gems$(gnumake:yes=-sequential): PHONY
  	$(ECHO) Extracting bundled gem files...
@@ -27,7 +27,7 @@ index 594b5da..0b2aa6a 100644
  	    -Itool/lib -rfileutils -rbundled_gem -answ \
  	    -e 'BEGIN {d = ".bundle/gems"}' \
  	    -e 'gem, ver, _, rev = *$$F' \
-@@ -1551,8 +1551,6 @@ extract-gems$(gnumake:yes=-sequential): PHONY
+@@ -1557,8 +1557,6 @@ extract-gems$(gnumake:yes=-sequential): PHONY
  	    -e 'end' \
  	    gems/bundled_gems
 

debian/patches/extract-gems-sequential-Keep-using-RUNRUBY.patch

@@ -14,7 +14,7 @@ Signed-off-by: Reiner Herrmann <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index 768a152..f16cdd8 100644
+index 99f3764..62377b6 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
 @@ -2480,7 +2480,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}

debian/patches/lib-mkmf.rb-sort-list-of-object-files-in-generated-Makefi.patch

@@ -12,10 +12,10 @@ Signed-off-by: Christian Hofstaedtler <[email protected]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
-index c454910..24feab0 100644
+index 065caa4..cfa1f33 100644
 --- a/lib/rdoc/generator/json_index.rb
 +++ b/lib/rdoc/generator/json_index.rb
-@@ -178,7 +178,7 @@ class RDoc::Generator::JsonIndex
+@@ -176,7 +176,7 @@ class RDoc::Generator::JsonIndex
      debug_msg "Writing gzipped search index to %s" % outfile
 
      Zlib::GzipWriter.open(outfile) do |gz|
@@ -24,7 +24,7 @@ index c454910..24feab0 100644
        gz.orig_name = search_index_file.basename.to_s
        gz.write search_index
        gz.close
-@@ -196,7 +196,7 @@ class RDoc::Generator::JsonIndex
+@@ -194,7 +194,7 @@ class RDoc::Generator::JsonIndex
          debug_msg "Writing gzipped file to %s" % outfile
 
          Zlib::GzipWriter.open(outfile) do |gz|

debian/patches/rdoc-build-reproducible-documentation.patch

@@ -13,3 +13,4 @@ gc-mmtk-keep-using-std-panic-PanicInfo-for-MSRV-1.74.patch
 TestReline-test_tty_amibuous_width-use-test_rubybin.patch
 rbinstall-Disable-arch-dependent-file-isolation.patch
 gc-mmtk-avoid-fn_addr_eq-for-MSRV-1.74.patch
+Reject-true-not-true.patch

debian/patches/series

@@ -8,10 +8,10 @@ https://github.com/git/git/commit/39edfd5cbc4d168db19ec1bc867d78ec7211ec39
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
-index 9581922..1b27941 100755
+index 8330787..b1153f9 100755
 --- a/tool/sync_default_gems.rb
 +++ b/tool/sync_default_gems.rb
-@@ -682,7 +682,7 @@ module SyncDefaultGems
+@@ -690,7 +690,7 @@ module SyncDefaultGems
      if picked
        system(*%w"git commit --amend --no-edit")
      else