Update patches for 3.2

Author: maths22

debian/changelog

@@ -1,4 +1,4 @@
-ruby3.2 (3.2.0~placeholder-1) UNRELEASED; urgency=medium
+ruby3.2 (3.2.0-1) UNRELEASED; urgency=medium
 
   * Ruby 3.2
 

debian/patches/0005-Make-gemspecs-reproducible.patch

@@ -12,59 +12,49 @@ build unreproducible
  lib/rdoc/rdoc.gemspec             | 1 +
  5 files changed, 5 insertions(+)
 
-diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
-index fd49c1b..5b8bb00 100644
 --- a/ext/bigdecimal/bigdecimal.gemspec
 +++ b/ext/bigdecimal/bigdecimal.gemspec
-@@ -4,6 +4,7 @@ Gem::Specification.new do |s|
+@@ -4,6 +4,7 @@
    s.name          = "bigdecimal"
-   s.version       = "3.1.1"
+   s.version       = "3.1.3"
    s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
 +  s.date          = RUBY_RELEASE_DATE
    s.email         = ["mrkn@mrkn.jp"]
 
    s.summary       = "Arbitrary-precision decimal floating-point number library."
-diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
-index a9c0ec4..89da078 100644
 --- a/ext/fiddle/fiddle.gemspec
 +++ b/ext/fiddle/fiddle.gemspec
-@@ -8,6 +8,7 @@ end
+@@ -8,6 +8,7 @@
  Gem::Specification.new do |spec|
    spec.name          = "fiddle"
    spec.version       = version_module::Fiddle::VERSION
 +  spec.date          = RUBY_RELEASE_DATE
    spec.authors       = ["Aaron Patterson", "SHIBATA Hiroshi"]
    spec.email         = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
 
-diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
-index aa57f8a..ba7f8e5 100644
 --- a/ext/io/console/io-console.gemspec
 +++ b/ext/io/console/io-console.gemspec
-@@ -4,6 +4,7 @@ _VERSION = "0.5.11"
+@@ -4,6 +4,7 @@
  Gem::Specification.new do |s|
    s.name = "io-console"
    s.version = _VERSION
 +  s.date = RUBY_RELEASE_DATE
    s.summary = "Console interface"
    s.email = "nobu@ruby-lang.org"
    s.description = "add console capabilities to IO instances."
-diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
-index 1f4798e..48743cf 100644
 --- a/lib/ipaddr.gemspec
 +++ b/lib/ipaddr.gemspec
-@@ -18,6 +18,7 @@ end
+@@ -18,6 +18,7 @@
  Gem::Specification.new do |spec|
    spec.name          = "ipaddr"
    spec.version       = version
 +  spec.date          = RUBY_RELEASE_DATE
    spec.authors       = ["Akinori MUSHA", "Hajimu UMEMOTO"]
    spec.email         = ["knu@idaemons.org", "ume@mahoroba.org"]
 
-diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
-index 525a15f..f6d0e22 100644
 --- a/lib/rdoc/rdoc.gemspec
 +++ b/lib/rdoc/rdoc.gemspec
-@@ -7,6 +7,7 @@ end
+@@ -7,6 +7,7 @@
 
  Gem::Specification.new do |s|
    s.name = "rdoc"

debian/patches/0006-Fix-FTBS-on-hurd.patch

@@ -10,20 +10,18 @@ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
  io.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/io.c b/io.c
-index 0b54310..26168b2 100644
 --- a/io.c
 +++ b/io.c
-@@ -2011,7 +2011,11 @@ io_writev(int argc, const VALUE *argv, VALUE io)
+@@ -2207,7 +2207,11 @@
 
      for (i = 0; i < argc; i += cnt) {
  #ifdef HAVE_WRITEV
--	if ((fptr->mode & (FMODE_SYNC|FMODE_TTY)) && iovcnt_ok(cnt = argc - i)) {
+-        if ((fptr->mode & (FMODE_SYNC|FMODE_TTY)) && iovcnt_ok(cnt = argc - i)) {
 +        if ((fptr->mode & (FMODE_SYNC|FMODE_TTY))
 +# ifdef IOV_MAX
 +               && ((cnt = argc - i) < IOV_MAX)
 +# endif
 +               ) {
- 	    n = io_fwritev(cnt, &argv[i], fptr);
- 	}
- 	else
+             n = io_fwritev(cnt, &argv[i], fptr);
+         }
+         else

debian/patches/0007-Port-to-kfreebsd-amd64.patch

@@ -13,23 +13,19 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
  test/socket/test_socket.rb |  2 +-
  4 files changed, 26 insertions(+), 2 deletions(-)
 
-diff --git a/ext/socket/option.c b/ext/socket/option.c
-index 4b33b3f..d068292 100644
 --- a/ext/socket/option.c
 +++ b/ext/socket/option.c
-@@ -10,6 +10,7 @@ VALUE rb_cSockOpt;
+@@ -10,6 +10,7 @@
  #if defined(__linux__) || \
      defined(__GNU__) /* GNU/Hurd */ || \
      defined(__FreeBSD__) || \
 +    defined(__FreeBSD_kernel__) || \
      defined(__DragonFly__) || \
      defined(__APPLE__) || \
      defined(_WIN32) || \
-diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
-index d94e96a..e584e8e 100644
 --- a/ext/socket/raddrinfo.c
 +++ b/ext/socket/raddrinfo.c
-@@ -1723,10 +1723,21 @@ addrinfo_mload(VALUE self, VALUE ary)
+@@ -1722,10 +1722,21 @@
          INIT_SOCKADDR_UN(&uaddr, sizeof(struct sockaddr_un));
 
          StringValue(v);
@@ -51,7 +47,7 @@ index d94e96a..e584e8e 100644
          memcpy(uaddr.sun_path, RSTRING_PTR(v), RSTRING_LEN(v));
          len = (socklen_t)sizeof(uaddr);
          memcpy(&ss, &uaddr, len);
-@@ -2370,10 +2381,21 @@ addrinfo_unix_path(VALUE self)
+@@ -2369,10 +2380,21 @@
      if (n < 0)
          rb_raise(rb_eSocket, "too short AF_UNIX address: %"PRIuSIZE" bytes given for minimum %"PRIuSIZE" bytes.",
                   (size_t)rai->sockaddr_len, offsetof(struct sockaddr_un, sun_path));
@@ -73,32 +69,28 @@ index d94e96a..e584e8e 100644
      return rb_str_new(addr->sun_path, n);
  }
  #endif
-diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
-index 7e3ff9d..3799347 100644
 --- a/test/fiddle/test_handle.rb
 +++ b/test/fiddle/test_handle.rb
-@@ -174,6 +174,7 @@ module Fiddle
+@@ -178,6 +178,7 @@
      end unless /mswin|mingw/ =~ RUBY_PLATFORM
 
      def test_dlerror
 +      return if /kfreebsd/ =~ RUBY_PLATFORM
        # FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
        # getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
        # it calls _nss_cache_cycle_prevention_function with dlsym(3).
-@@ -182,7 +183,7 @@ module Fiddle
+@@ -186,7 +187,7 @@
        require 'socket'
        Socket.gethostbyname("localhost")
        Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
 -    end if /freebsd/=~ RUBY_PLATFORM
 +    end if /freebsd/ =~ RUBY_PLATFORM
 
      def test_no_memory_leak
-       if respond_to?(:assert_nothing_leaked_memory)
-diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
-index 7e596f0..930bb61 100644
+       # https://github.com/ruby/fiddle/actions/runs/3202406059/jobs/5231356410
 --- a/test/socket/test_socket.rb
 +++ b/test/socket/test_socket.rb
-@@ -541,7 +541,7 @@ class TestSocket < Test::Unit::TestCase
+@@ -541,7 +541,7 @@
    end
 
    def test_bintime

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

@@ -11,13 +11,11 @@ Updated by John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> on
  configure.ac | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/configure.ac b/configure.ac
-index 5a6b074..49897ad 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2524,6 +2524,9 @@ AS_CASE([$coroutine_type], [yes|''], [
-         [arm64-darwin*], [
-             coroutine_type=arm64
+@@ -2596,6 +2596,9 @@
+         [powerpc64-darwin*|ppc64-darwin*], [
+             coroutine_type=ppc64
          ],
 +        [x86_64-linux-gnux32], [
 +            coroutine_type=ucontext

debian/patches/0011-don-t-try-to-download-stuff-in-configure.patch

@@ -6,15 +6,15 @@ Subject: don't try to download stuff in configure
  defs/gmake.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/defs/gmake.mk b/defs/gmake.mk
-index dd7da5f..9d59f22 100644
 --- a/defs/gmake.mk
 +++ b/defs/gmake.mk
-@@ -265,7 +265,7 @@ extract-gems: $(HAVE_BASERUBY:yes=update-gems)
+@@ -295,9 +295,7 @@
+ bundled-gem-srcdir = $(srcdir)/gems/src/$(1)
+ bundled-gem-extracted = $(srcdir)/.bundle/gems/$(1)-$(2)
 
- bundled-gems := $(shell sed '/^[ 	]*\#/d;/^[ 	]*$$/d;s/[ 	][ 	]*/-/;s/[ 	].*//' $(srcdir)/gems/bundled_gems)
- 
--update-gems: | $(patsubst %,gems/%.gem,$(bundled-gems))
+-update-gems: | $(patsubst %,$(srcdir)/gems/%.gem,$(bundled-gems))
+-update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-gemfile)
+-update-gems: | $(call foreach-bundled-gems-rev,bundled-gem-srcdir)
 +update-gems:
 
  test-bundler-precheck: | $(srcdir)/.bundle/cache