From 89ee22c7e909f06815dd538a9ac70381ba08dfb8cb8d009a05f8e29e6d598444 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 9 May 2023 12:36:52 +0000 Subject: [PATCH 1/2] Accepting request 1084752 from home:ohollmann:branches:security:tls:unstable - Adapt tests for OpenSSL 3.1 [bsc#1209430] * Add openssl3_1-adapt_tests.patch OBS-URL: https://build.opensuse.org/request/show/1084752 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Protocol-HTTP2?expand=0&rev=3 --- openssl3_1-adapt_tests.patch | 31 +++++++++++++++++++++++++++++++ perl-Protocol-HTTP2.changes | 6 ++++++ perl-Protocol-HTTP2.spec | 5 ++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 openssl3_1-adapt_tests.patch diff --git a/openssl3_1-adapt_tests.patch b/openssl3_1-adapt_tests.patch new file mode 100644 index 0000000..8b7cf9c --- /dev/null +++ b/openssl3_1-adapt_tests.patch @@ -0,0 +1,31 @@ +From 552e3677372c77ec458548fd8c3fdc280e493d91 Mon Sep 17 00:00:00 2001 +From: Otto Hollmann +Date: Thu, 4 May 2023 13:42:51 +0200 +Subject: [PATCH] Adapt tests for OpenSSL 3.1 + +--- + t/lib/PH2ClientServerTest.pm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/lib/PH2ClientServerTest.pm b/t/lib/PH2ClientServerTest.pm +index 3fe9203..fe90f32 100644 +--- a/t/lib/PH2ClientServerTest.pm ++++ b/t/lib/PH2ClientServerTest.pm +@@ -43,7 +43,7 @@ sub server { + if ( !$h{upgrade} && ( $h{npn} || $h{alpn} ) ) { + eval { + $tls = AnyEvent::TLS->new( +- method => 'tlsv1', ++ method => 'tlsv1_2', + cert_file => $tls_crt, + key_file => $tls_key, + ); +@@ -122,7 +122,7 @@ sub client { + } + elsif ( $h{npn} || $h{alpn} ) { + eval { +- $tls = AnyEvent::TLS->new( method => 'tlsv1', ); ++ $tls = AnyEvent::TLS->new( method => 'tlsv1_2', ); + + if ( delete $h{npn} ) { + diff --git a/perl-Protocol-HTTP2.changes b/perl-Protocol-HTTP2.changes index 4815f98..f575adc 100644 --- a/perl-Protocol-HTTP2.changes +++ b/perl-Protocol-HTTP2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 4 13:11:57 UTC 2023 - Otto Hollmann + +- Adapt tests for OpenSSL 3.1 [bsc#1209430] + * Add openssl3_1-adapt_tests.patch + ------------------------------------------------------------------- Thu Nov 26 13:57:41 UTC 2020 - pgajdos@suse.com diff --git a/perl-Protocol-HTTP2.spec b/perl-Protocol-HTTP2.spec index 31b414c..e189498 100644 --- a/perl-Protocol-HTTP2.spec +++ b/perl-Protocol-HTTP2.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Protocol-HTTP2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ Group: Development/Libraries/Perl URL: https://metacpan.org/release/%{cpan_name} Source0: Protocol-HTTP2-1.10.tar.gz Source1: cpanspec.yml +# PATCH-FIX-OPENSUSE https://github.com/vlet/p5-Protocol-HTTP2/pull/14 +Patch1: openssl3_1-adapt_tests.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -49,6 +51,7 @@ tls socket (see examples). %prep %setup -q -n %{cpan_name}-%{version} +%autopatch -p1 %build perl Build.PL --installdirs=vendor From 962f7b261a7bd4dc72408754a3ff60153cea41b2ba7ffbc5b9bc500319464e0f Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 9 May 2023 12:40:30 +0000 Subject: [PATCH 2/2] Accepting request 1085705 from home:dstoecker:branches:home:ohollmann:branches:security:tls:unstable - refresh package, Update cpanspec.yml OBS-URL: https://build.opensuse.org/request/show/1085705 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Protocol-HTTP2?expand=0&rev=4 --- cpanspec.yml | 4 ++-- perl-Protocol-HTTP2.changes | 5 +++++ perl-Protocol-HTTP2.spec | 14 +++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cpanspec.yml b/cpanspec.yml index 368f452..03d1caa 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -7,8 +7,8 @@ #sources: # - source1 # - source2 -#patches: -# foo.patch: -p1 +patches: + openssl3_1-adapt_tests.patch: -p1 PATCH-FIX-OPENSUSE https://github.com/vlet/p5-Protocol-HTTP2/pull/14 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ diff --git a/perl-Protocol-HTTP2.changes b/perl-Protocol-HTTP2.changes index f575adc..e85a550 100644 --- a/perl-Protocol-HTTP2.changes +++ b/perl-Protocol-HTTP2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 9 12:28:36 UTC 2023 - Dirk Stoecker + +- refresh package, Update cpanspec.yml + ------------------------------------------------------------------- Thu May 4 13:11:57 UTC 2023 - Otto Hollmann diff --git a/perl-Protocol-HTTP2.spec b/perl-Protocol-HTTP2.spec index e189498..0c66fb4 100644 --- a/perl-Protocol-HTTP2.spec +++ b/perl-Protocol-HTTP2.spec @@ -16,20 +16,18 @@ # +%define cpan_name Protocol-HTTP2 Name: perl-Protocol-HTTP2 Version: 1.10 Release: 0 -%define cpan_name Protocol-HTTP2 -Summary: HTTP/2 protocol implementation (RFC 7540) License: Artistic-1.0 OR GPL-1.0-or-later -Group: Development/Libraries/Perl +Summary: HTTP/2 protocol implementation (RFC 7540) URL: https://metacpan.org/release/%{cpan_name} -Source0: Protocol-HTTP2-1.10.tar.gz +Source0: https://cpan.metacpan.org/authors/id/C/CR/CRUX/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml # PATCH-FIX-OPENSUSE https://github.com/vlet/p5-Protocol-HTTP2/pull/14 -Patch1: openssl3_1-adapt_tests.patch +Patch0: openssl3_1-adapt_tests.patch BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(AnyEvent) @@ -50,8 +48,7 @@ client/server/intermediate on top of your favorite event loop over plain or tls socket (see examples). %prep -%setup -q -n %{cpan_name}-%{version} -%autopatch -p1 +%autosetup -n %{cpan_name}-%{version} -p1 %build perl Build.PL --installdirs=vendor @@ -65,7 +62,6 @@ perl Build.PL --installdirs=vendor %perl_gen_filelist %files -f %{name}.files -%defattr(-,root,root,755) %doc Changes examples README.md %license LICENSE