From 3da6381712bd8438a2900a428dab04ee516c3fb1730f395bd46a2c13b9b03623 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 11 Jul 2024 14:41:38 +0000 Subject: [PATCH] add patch for operator precedence issue OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-IO-Socket-SSL?expand=0&rev=155 --- ...5ed1a6a0b7968ce26284ed81b56c0ab288d9.patch | 36 +++++++++++++++++++ cpanspec.yml | 1 + perl-IO-Socket-SSL.changes | 6 ++++ perl-IO-Socket-SSL.spec | 23 ++++-------- 4 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 80315ed1a6a0b7968ce26284ed81b56c0ab288d9.patch diff --git a/80315ed1a6a0b7968ce26284ed81b56c0ab288d9.patch b/80315ed1a6a0b7968ce26284ed81b56c0ab288d9.patch new file mode 100644 index 0000000..4f7225c --- /dev/null +++ b/80315ed1a6a0b7968ce26284ed81b56c0ab288d9.patch @@ -0,0 +1,36 @@ +From 80315ed1a6a0b7968ce26284ed81b56c0ab288d9 Mon Sep 17 00:00:00 2001 +From: Steffen Ullrich +Date: Wed, 10 Jul 2024 06:59:14 +0200 +Subject: [PATCH] fix typo and warning + +--- + lib/IO/Socket/SSL.pm | 2 +- + lib/IO/Socket/SSL.pod | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/IO/Socket/SSL.pm b/lib/IO/Socket/SSL.pm +index 50b2660..d38a75c 100644 +--- a/lib/IO/Socket/SSL.pm ++++ b/lib/IO/Socket/SSL.pm +@@ -2594,7 +2594,7 @@ sub new { + Net::SSLeay::CTX_set_psk_server_callback($ctx, sub { + my ($ssl,$identity,$psklen) = @_; + if (ref($psk) eq 'HASH') { +- return $psk->{$identity} || $psk->{''} or return ++ return $psk->{$identity} || $psk->{''} || + IO::Socket::SSL->_internal_error( + "no PSK for given identity '$identity' and no default"); + } else { +diff --git a/lib/IO/Socket/SSL.pod b/lib/IO/Socket/SSL.pod +index f5af020..5ec29cc 100644 +--- a/lib/IO/Socket/SSL.pod ++++ b/lib/IO/Socket/SSL.pod +@@ -1357,7 +1357,7 @@ the configuration in the peer can be useless ("handshake failure") or misleading + ("bad mac"). + + PSK support needs respective API functionality in Net::SSLeay, which was +-only fully included in 1.94. C<can_psk()>> returns undef if ++only fully included in 1.94. C<< IO::Socket::SSL->can_psk() >> returns undef if + functionality is not available and a hash-ref with details otherwise: key + C in the hash signals support for using PSK in a SSL client (available + since Net::SSLeay 1.82) while key server for support of PSK in SSL server (since diff --git a/cpanspec.yml b/cpanspec.yml index 1449a3b..2efd66c 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -1,5 +1,6 @@ patches: perl-IO-Socket-SSL-use-system-default-cipher-list.patch: -p1 PATCH-FIX-UPSTREAM (bsc1200295) perl-IO-Socket-SSL doesn't follow system "PROFILE=SYSTEM" openSSL ciphers - https://git.centos.org/rpms/perl-IO-Socket-SSL/blob/e0b0ae04f5cdb41b1f29cb7d76c23abba7ac35e9/f/SOURCES/IO-Socket-SSL-2.066-use-system-default-cipher-list.patch + https://github.com/noxxi/p5-io-socket-ssl/commit/80315ed1a6a0b7968ce26284ed81b56c0ab288d9.patch: -p1 PATCH-FIX-UPSTREAM https://github.com/noxxi/p5-io-socket-ssl/issues/155 ignore_requires: Mozilla::CA prep: |- rm README.Win32 diff --git a/perl-IO-Socket-SSL.changes b/perl-IO-Socket-SSL.changes index cb92f8f..e0d41e1 100644 --- a/perl-IO-Socket-SSL.changes +++ b/perl-IO-Socket-SSL.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 11 14:38:31 UTC 2024 - Dirk Stoecker + +- add 80315ed1a6a0b7968ce26284ed81b56c0ab288d9.patch to fix a error + introduced in version 2.087 + ------------------------------------------------------------------- Tue Jul 9 05:30:33 UTC 2024 - Tina Müller diff --git a/perl-IO-Socket-SSL.spec b/perl-IO-Socket-SSL.spec index 83481ee..988a95b 100644 --- a/perl-IO-Socket-SSL.spec +++ b/perl-IO-Socket-SSL.spec @@ -18,17 +18,17 @@ %define cpan_name IO-Socket-SSL Name: perl-IO-Socket-SSL -Version: 2.87.0 +Version: 2.087 Release: 0 -# 2.087 -> normalize -> 2.87.0 -%define cpan_version 2.087 License: Artistic-1.0 OR GPL-1.0-or-later Summary: Nearly transparent SSL encapsulation for IO::Socket::INET URL: https://metacpan.org/release/%{cpan_name} -Source0: https://cpan.metacpan.org/authors/id/S/SU/SULLR/%{cpan_name}-%{cpan_version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/S/SU/SULLR/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml +# PATCH-FIX-UPSTREAM https://github.com/noxxi/p5-io-socket-ssl/issues/155 +Patch0: https://github.com/noxxi/p5-io-socket-ssl/commit/80315ed1a6a0b7968ce26284ed81b56c0ab288d9.patch # PATCH-FIX-UPSTREAM (bsc1200295) perl-IO-Socket-SSL doesn't follow system "PROFILE=SYSTEM" openSSL ciphers - https://git.centos.org/rpms/perl-IO-Socket-SSL/blob/e0b0ae04f5cdb41b1f29cb7d76c23abba7ac35e9/f/SOURCES/IO-Socket-SSL-2.066-use-system-default-cipher-list.patch -Patch0: perl-IO-Socket-SSL-use-system-default-cipher-list.patch +Patch1: perl-IO-Socket-SSL-use-system-default-cipher-list.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros @@ -36,17 +36,6 @@ BuildRequires: perl-macros BuildRequires: perl(Net::SSLeay) >= 1.46 #Requires: perl(Mozilla::CA) Requires: perl(Net::SSLeay) >= 1.46 -Provides: perl(IO::Socket::SSL) = %{version} -Provides: perl(IO::Socket::SSL::Intercept) = 2.056 -Provides: perl(IO::Socket::SSL::OCSP_Cache) -Provides: perl(IO::Socket::SSL::OCSP_Resolver) -Provides: perl(IO::Socket::SSL::PublicSuffix) -Provides: perl(IO::Socket::SSL::SSL_Context) -Provides: perl(IO::Socket::SSL::SSL_HANDLE) -Provides: perl(IO::Socket::SSL::Session_Cache) -Provides: perl(IO::Socket::SSL::Trace) -Provides: perl(IO::Socket::SSL::Utils) = 2.015 -%undefine __perllib_provides %{perl_requires} %description @@ -89,7 +78,7 @@ Additional documentation can be found in * * IO::Socket::SSL::Utils - Useful functions for certificates etc %prep -%autosetup -n %{cpan_name}-%{cpan_version} -p1 +%autosetup -n %{cpan_name}-%{version} -p1 find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path "*/script/*" ! -path "*/scripts/*" ! -name "configure" -print0 | xargs -0 chmod 644