From 27a30789602994e2c42cc9008cfe6ce4e9db2803bba7f96253769063dfa9b249 Mon Sep 17 00:00:00 2001 From: Otto Hollmann Date: Fri, 19 Jan 2024 10:58:21 +0000 Subject: [PATCH] Accepting request 1139903 from home:ohollmann:branches:security:chipcard - Add support for OpenSSL 3.x: Add libp11-configure-treat-all-openssl-3.x-releases-the-same.patch OBS-URL: https://build.opensuse.org/request/show/1139903 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/libp11?expand=0&rev=45 --- ...at-all-openssl-3.x-releases-the-same.patch | 25 +++++++++++++++++++ libp11.changes | 6 +++++ libp11.spec | 5 +++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 libp11-configure-treat-all-openssl-3.x-releases-the-same.patch diff --git a/libp11-configure-treat-all-openssl-3.x-releases-the-same.patch b/libp11-configure-treat-all-openssl-3.x-releases-the-same.patch new file mode 100644 index 0000000..2c17356 --- /dev/null +++ b/libp11-configure-treat-all-openssl-3.x-releases-the-same.patch @@ -0,0 +1,25 @@ +From 74497e0fa5b69b15790d6697e1ebce13af842d4c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 13 Jul 2023 13:52:54 -0400 +Subject: [PATCH] configure: treat all openssl-3.x releases the same + +OpenSSL's soversion will not change for any 3.x minor release. + +https://www.openssl.org/policies/general/versioning-policy.html +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b96979d9..c344e84a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,7 +33,7 @@ AC_C_BIGENDIAN + # issues with applications linking to new openssl, old libp11, and vice versa + case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \ + $PKG_CONFIG --modversion openssl`" in +- 3.1.*|3.0.*) # Predicted engines directory prefix for OpenSSL 3.x ++ 3.*) # Predicted engines directory prefix for OpenSSL 3.x + LIBP11_LT_OLDEST="3" + debian_ssl_prefix="openssl-3.0.0";; + 1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x diff --git a/libp11.changes b/libp11.changes index a481fb9..83e2980 100644 --- a/libp11.changes +++ b/libp11.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 19 10:43:16 UTC 2024 - Otto Hollmann + +- Add support for OpenSSL 3.x: + Add libp11-configure-treat-all-openssl-3.x-releases-the-same.patch + ------------------------------------------------------------------- Wed Sep 27 09:58:37 UTC 2023 - Otto Hollmann diff --git a/libp11.spec b/libp11.spec index 6c0c054..21b7725 100644 --- a/libp11.spec +++ b/libp11.spec @@ -1,7 +1,7 @@ # # spec file for package libp11 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,7 +36,10 @@ Source1: https://github.com/OpenSC/libp11/releases/download/%{name}-%{ver Source2: %{name}.keyring Source3: %{name}-rpmlintrc Source4: baselibs.conf +# PATCH-FIX-UPSTREAM Patch0: libp11-openssl-3.1.patch +# PATCH-FIX-UPSTREAM +Patch1: libp11-configure-treat-all-openssl-3.x-releases-the-same.patch BuildRequires: fdupes BuildRequires: libtool BuildRequires: p11-kit-devel