Skip to content

Commit 565d10c

Browse files
committed
Refresh patches
The fix in rand_init-fix-off-by-one-error.patch has been done upstream differently; drop the patch. Gbp-Dch: full
1 parent e83eefb commit 565d10c

7 files changed

Lines changed: 50 additions & 572 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
1212
1 file changed, 3 insertions(+), 1 deletion(-)
1313

1414
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
15-
index 2b3792e..a612bf7 100644
15+
index b493a47..776eff9 100644
1616
--- a/lib/rubygems/specification.rb
1717
+++ b/lib/rubygems/specification.rb
18-
@@ -1692,7 +1692,9 @@ class Gem::Specification < Gem::BasicSpecification
18+
@@ -1696,7 +1696,9 @@ class Gem::Specification < Gem::BasicSpecification
1919
raise(Gem::InvalidSpecificationException,
2020
"invalid date format in specification: #{date.inspect}")
2121
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
1111
1 file changed, 5 insertions(+), 1 deletion(-)
1212

1313
diff --git a/io.c b/io.c
14-
index 521b0b0..3d8c7a5 100644
14+
index caa4dd2..42804d1 100644
1515
--- a/io.c
1616
+++ b/io.c
1717
@@ -1902,7 +1902,11 @@ io_writev(int argc, const VALUE *argv, VALUE io)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Bug: #954293
99
1 file changed, 3 insertions(+)
1010

1111
diff --git a/configure.ac b/configure.ac
12-
index 2dcebdd..abd1c59 100644
12+
index 49e0c79..5fb8282 100644
1313
--- a/configure.ac
1414
+++ b/configure.ac
1515
@@ -2433,6 +2433,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [

debian/patches/Update-openssl-to-version-3.0.0.patch

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Add support for OpenSSL 3
5353
test/openssl/fixtures/pkey/garbage.txt | 1 +
5454
test/openssl/test_asn1.rb | 9 +-
5555
test/openssl/test_bn.rb | 114 ++-
56-
test/openssl/test_cipher.rb | 23 +-
56+
test/openssl/test_cipher.rb | 21 +-
5757
test/openssl/test_config.rb | 150 +---
5858
test/openssl/test_digest.rb | 2 +-
5959
test/openssl/test_hmac.rb | 14 +
@@ -72,7 +72,7 @@ Add support for OpenSSL 3
7272
test/openssl/test_x509store.rb | 412 ++++++---
7373
test/openssl/ut_eof.rb | 4 +
7474
test/openssl/utils.rb | 52 +-
75-
68 files changed, 5304 insertions(+), 3936 deletions(-)
75+
68 files changed, 5303 insertions(+), 3935 deletions(-)
7676
create mode 100644 test/openssl/fixtures/pkey/certificate.der
7777
create mode 100644 test/openssl/fixtures/pkey/empty.der
7878
create mode 100644 test/openssl/fixtures/pkey/empty.pem
@@ -10004,7 +10004,7 @@ index 547d334..346602d 100644
1000410004

1000510005
end
1000610006
diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
10007-
index 65b36dd..b5fdf0b 100644
10007+
index ef8c4f3..125ea11 100644
1000810008
--- a/test/openssl/test_cipher.rb
1000910009
+++ b/test/openssl/test_cipher.rb
1001010010
@@ -135,25 +135,22 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
@@ -10050,15 +10050,6 @@ index 65b36dd..b5fdf0b 100644
1005010050
end
1005110051
end
1005210052

10053-
@@ -214,7 +211,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
10054-
assert_raise(OpenSSL::Cipher::CipherError) { cipher.update(ct2) }
10055-
end if has_cipher?("aes-128-ccm") &&
10056-
OpenSSL::Cipher.new("aes-128-ccm").authenticated? &&
10057-
- OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101000 # version >= v1.1.1
10058-
+ OpenSSL::OPENSSL_VERSION_NUMBER >= 0x1010103f # version >= 1.1.1c
10059-
10060-
def test_aes_gcm
10061-
# GCM spec Appendix B Test Case 4
1006210053
diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
1006310054
index e041c1a..24a215a 100644
1006410055
--- a/test/openssl/test_config.rb

0 commit comments

Comments
 (0)