Merge branch 'master' into dist/3.0/bullseye

Author: sorah

debian/Dockerfile.bionic

@@ -8,6 +8,7 @@ RUN sed -i -e 's|archive\.ubuntu\.com/ubuntu|ap-northeast-1.ec2.archive.ubuntu.c
 # Allow use of debhelper-compat 12 in backport
 # https://help.ubuntu.com/community/UbuntuBackports
 RUN /bin/echo -e "Package: debhelper\nPin: release a=bionic-backports\nPin-Priority: 500\n" | tee -a /etc/apt/preferences
+RUN /bin/echo -e "Package: dwz\nPin: release a=bionic-backports\nPin-Priority: 500\n" | tee -a /etc/apt/preferences
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN mkdir -p /build \

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

@@ -9,10 +9,10 @@ Bug: #954293
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index c143c23..19533b8 100644
+index 2dcebdd..abd1c59 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2403,6 +2403,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
+@@ -2433,6 +2433,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
          [arm64-darwin*], [
              rb_cv_coroutine=arm64
          ],

debian/patches/Make-gemspecs-reproducible.patch

@@ -37,10 +37,10 @@ index a47f795..5141413 100644
    spec.email         = ["[email protected]", "[email protected]"]
 
 diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
-index 743e5e9..3751ceb 100644
+index 8a0df83..b370b73 100644
 --- a/ext/io/console/io-console.gemspec
 +++ b/ext/io/console/io-console.gemspec
-@@ -4,6 +4,7 @@ _VERSION = "0.5.6"
+@@ -4,6 +4,7 @@ _VERSION = "0.5.7"
  Gem::Specification.new do |s|
    s.name = "io-console"
    s.version = _VERSION
@@ -61,7 +61,7 @@ index 5187f3b..9e83268 100644
    spec.email         = ["[email protected]", "[email protected]"]
 
 diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
-index fd222d4..fe8f39b 100644
+index 7725e40..79698f5 100644
 --- a/lib/rdoc/rdoc.gemspec
 +++ b/lib/rdoc/rdoc.gemspec
 @@ -7,6 +7,7 @@ end

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 d59f57c..b51038e 100644
+index 2b3792e..a612bf7 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1695,7 +1695,9 @@ class Gem::Specification < Gem::BasicSpecification
+@@ -1692,7 +1692,9 @@ class Gem::Specification < Gem::BasicSpecification
                  raise(Gem::InvalidSpecificationException,
                        "invalid date format in specification: #{date.inspect}")
                end

debian/patches/lib-mkmf.rb-sort-list-of-object-files-in-generated-Makefi.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 672c544..def8476 100644
+index 9468a2c..516fa1e 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
 @@ -2315,7 +2315,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}

debian/patches/series

@@ -5,3 +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

debian/patches/test-openssl-test_cipher-skip-AES-CCM-tests-on-OpenSSL-1..patch

@@ -0,0 +1,30 @@
+From: Kazuki Yamaguchi <[email protected]>
+Date: Tue, 16 Mar 2021 22:05:04 +0900
+Subject: test/openssl/test_cipher: skip AES-CCM tests on OpenSSL <= 1.1.1b
+
+AES CCM mode in OpenSSL <= 1.1.1b was overly strict in the parameters
+assignment order. This has been relaxed by OpenSSL 1.1.1c.
+
+https://github.com/openssl/openssl/commit/b48e3be947ddc5da6b5a86db8341081c72b9a4ee
+
+The test case is failing on Ubuntu 18.04 because it still uses the
+initial 1.1.1 release and has the issue:
+
+http://rubyci.s3.amazonaws.com/graviton2/ruby-master/log/20210316T120003Z.fail.html.gz
+---
+ test/openssl/test_cipher.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
+index 65b36dd..3652f9c 100644
+--- a/test/openssl/test_cipher.rb
++++ b/test/openssl/test_cipher.rb
+@@ -214,7 +214,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
+     assert_raise(OpenSSL::Cipher::CipherError) { cipher.update(ct2) }
+   end if has_cipher?("aes-128-ccm") &&
+          OpenSSL::Cipher.new("aes-128-ccm").authenticated? &&
+-         OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101000  # version >= v1.1.1
++         OpenSSL::OPENSSL_VERSION_NUMBER >= 0x1010103f # version >= 1.1.1c
+ 
+   def test_aes_gcm
+     # GCM spec Appendix B Test Case 4