Merge branch 'master-3.0' into dist/3.0/bullseye

Author: sorah

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

@@ -9,7 +9,7 @@ Bug: #954293
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 2dcebdd..abd1c59 100644
+index 49e0c79..5fb8282 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2433,6 +2433,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [

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

@@ -12,10 +12,10 @@ Signed-off-by: Christian Hofstaedtler <[email protected]>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
-index 2b3792e..a612bf7 100644
+index b493a47..776eff9 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1692,7 +1692,9 @@ class Gem::Specification < Gem::BasicSpecification
+@@ -1696,7 +1696,9 @@ class Gem::Specification < Gem::BasicSpecification
                  raise(Gem::InvalidSpecificationException,
                        "invalid date format in specification: #{date.inspect}")
                end

debian/patches/series

@@ -5,5 +5,4 @@ Make-gemspecs-reproducible.patch
 exclude-several-tests-unstable-in-Docker.patch
 Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
 TestProcess-disable-gems-to-disable-rubygems_integration.patch
-test-openssl-test_cipher-skip-AES-CCM-tests-on-OpenSSL-1..patch
 ruby_default_arch.m4-don-t-require-arhitectures-to-be-kno.patch