Refresh patches

Author: maths22

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

@@ -15,7 +15,7 @@ Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>
 
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -2363,7 +2363,7 @@
+@@ -2368,7 +2368,7 @@
  LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
  ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
  SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}

debian/patches/0003-Mark-Gemspec-reproducible-change-fixing-784225-too.patch

@@ -13,7 +13,7 @@ Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
 
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1768,7 +1768,9 @@
+@@ -1774,7 +1774,9 @@
                  raise(Gem::InvalidSpecificationException,
                        "invalid date format in specification: #{date.inspect}")
                end

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

@@ -12,7 +12,7 @@ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
 
 --- a/io.c
 +++ b/io.c
-@@ -2213,7 +2213,11 @@
+@@ -2214,7 +2214,11 @@
 
      for (i = 0; i < argc; i += cnt) {
  #ifdef HAVE_WRITEV

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

@@ -25,7 +25,7 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
      defined(_WIN32) || \
 --- a/ext/socket/raddrinfo.c
 +++ b/ext/socket/raddrinfo.c
-@@ -1722,10 +1722,21 @@
+@@ -2138,10 +2138,21 @@
          INIT_SOCKADDR_UN(&uaddr, sizeof(struct sockaddr_un));
 
          StringValue(v);
@@ -47,7 +47,7 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
          memcpy(uaddr.sun_path, RSTRING_PTR(v), RSTRING_LEN(v));
          len = (socklen_t)sizeof(uaddr);
          memcpy(&ss, &uaddr, len);
-@@ -2369,10 +2380,21 @@
+@@ -2785,10 +2796,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));
@@ -90,7 +90,7 @@ Signed-off-by: Svante Signell <svante.signell@gmail.com>
        # https://github.com/ruby/fiddle/actions/runs/3202406059/jobs/5231356410
 --- a/test/socket/test_socket.rb
 +++ b/test/socket/test_socket.rb
-@@ -545,7 +545,7 @@
+@@ -549,7 +549,7 @@
    end
 
    def test_bintime

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

@@ -13,7 +13,7 @@ Updated by John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> on
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2616,6 +2616,9 @@
+@@ -2649,6 +2649,9 @@
          [powerpc64-darwin*|ppc64-darwin*], [
              coroutine_type=ppc64
          ],

debian/patches/rbconfig-mkmf-call-foreign-pkg-config-when-cross-compilin.patch

@@ -27,7 +27,7 @@ Forwarded: https://github.com/ruby/ruby/pull/6355
 
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -1866,7 +1866,7 @@
+@@ -1871,7 +1871,7 @@
        if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
        # if and only if package specific config command is given
        elsif ($PKGCONFIG ||=

debian/patches/ruby_default_arch.m4-don-t-require-arhitectures-to-be-kno.patch

@@ -8,14 +8,3 @@ Not sure yet if this should be forwarded upstream or not.
  tool/m4/ruby_default_arch.m4 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/tool/m4/ruby_default_arch.m4
-+++ b/tool/m4/ruby_default_arch.m4
-@@ -6,7 +6,7 @@
- 	[*64],        [ARCH_FLAG=-m64],
- 	[[i[3-6]86]], [ARCH_FLAG=-m32],
- 	[ppc],        [ARCH_FLAG=-m32],
--	[AC_MSG_ERROR(unknown target architecture: $target_archs)]
-+	[*],          []
- 	)
- AC_MSG_RESULT([$ARCH_FLAG])
- ])dnl

debian/patches/series

@@ -7,5 +7,4 @@
 0007-Port-to-kfreebsd-amd64.patch
 0009-Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
 0011-don-t-try-to-download-stuff-in-configure.patch
-ruby_default_arch.m4-don-t-require-arhitectures-to-be-kno.patch
 rbconfig-mkmf-call-foreign-pkg-config-when-cross-compilin.patch