From 613fca7eab3ab0cd7b38b1a9b8f97b4f385aef9292bcccb3d972c106452c51da Mon Sep 17 00:00:00 2001 From: Manuel Schnitzer Date: Thu, 25 Jan 2024 14:35:25 +0000 Subject: [PATCH] Accepting request 1134479 from home:ohollmann:branches:security:tls - Omit test_session_reuse_but_expire if OpenSSL 3.2.0 Add Omit-test_session_reuse_but_expire-if-OpenSSL-3.2.0.patch OBS-URL: https://build.opensuse.org/request/show/1134479 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby3.2?expand=0&rev=26 --- ...on_reuse_but_expire-if-OpenSSL-3.2.0.patch | 21 +++++++++++++++++++ ruby3.2.changes | 6 ++++++ ruby3.2.spec | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 Omit-test_session_reuse_but_expire-if-OpenSSL-3.2.0.patch diff --git a/Omit-test_session_reuse_but_expire-if-OpenSSL-3.2.0.patch b/Omit-test_session_reuse_but_expire-if-OpenSSL-3.2.0.patch new file mode 100644 index 0000000..a582f59 --- /dev/null +++ b/Omit-test_session_reuse_but_expire-if-OpenSSL-3.2.0.patch @@ -0,0 +1,21 @@ +From 1b7376423d3bf79ba37856eae8f45d59ecc9c170 Mon Sep 17 00:00:00 2001 +From: Nobuyoshi Nakada +Date: Sun, 26 Nov 2023 01:18:48 +0900 +Subject: [PATCH] Omit test_session_reuse_but_expire if OpenSSL 3.2.0 + +--- + test/net/http/test_https.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: ruby-3.2.2/test/net/http/test_https.rb +=================================================================== +--- ruby-3.2.2.orig/test/net/http/test_https.rb ++++ ruby-3.2.2/test/net/http/test_https.rb +@@ -167,6 +167,7 @@ class TestNetHTTPS < Test::Unit::TestCas + def test_session_reuse_but_expire + # FIXME: The new_session_cb is known broken for clients in OpenSSL 1.1.0h. + omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 1.1.0h') ++ omit if OpenSSL::OPENSSL_LIBRARY_VERSION.include?('OpenSSL 3.2.0') + + http = Net::HTTP.new(HOST, config("port")) + http.use_ssl = true diff --git a/ruby3.2.changes b/ruby3.2.changes index 8900eb8..a3e9d03 100644 --- a/ruby3.2.changes +++ b/ruby3.2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 21 12:56:03 UTC 2023 - Otto Hollmann + +- Omit test_session_reuse_but_expire if OpenSSL 3.2.0 + Add Omit-test_session_reuse_but_expire-if-OpenSSL-3.2.0.patch + ------------------------------------------------------------------- Tue Nov 7 10:01:55 UTC 2023 - Dominique Leuenberger diff --git a/ruby3.2.spec b/ruby3.2.spec index 8dd2852..3463969 100644 --- a/ruby3.2.spec +++ b/ruby3.2.spec @@ -97,6 +97,8 @@ Source6: cargo_config Source98: series Source99: %{rb_soname}-rpmlintrc Patch0: use-pie.patch +# PATCH-FIX-UPSTREAM https://github.com/ruby/ruby/pull/9036 +Patch1: Omit-test_session_reuse_but_expire-if-OpenSSL-3.2.0.patch BuildRequires: ruby-bundled-gems-rpmhelper %if %{with clang} BuildRequires: clang