From eafc07399a97907357d7940e1c322467dfcca181da80968cac1982e517539f0f Mon Sep 17 00:00:00 2001 From: Otto Hollmann Date: Thu, 8 Jun 2023 11:36:20 +0000 Subject: [PATCH 1/3] Accepting request 1091085 from home:dimstar:Factory - Add support for openSSL 3.1: + Add libp11-openssl-3.1.patch: handle openSSL 3.1 the same as 3.0 + Add libtool BuildRequires and call autoreconf: abobe patch touches the build system. OBS-URL: https://build.opensuse.org/request/show/1091085 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/libp11?expand=0&rev=38 --- baselibs.conf | 1 + libp11-openssl-3.1.patch | 13 +++++++++++++ libp11.changes | 8 ++++++++ libp11.spec | 5 ++++- 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 baselibs.conf create mode 100644 libp11-openssl-3.1.patch diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..918743f --- /dev/null +++ b/baselibs.conf @@ -0,0 +1 @@ +libp11-3 diff --git a/libp11-openssl-3.1.patch b/libp11-openssl-3.1.patch new file mode 100644 index 0000000..ffea110 --- /dev/null +++ b/libp11-openssl-3.1.patch @@ -0,0 +1,13 @@ +Index: libp11-0.4.12/configure.ac +=================================================================== +--- libp11-0.4.12.orig/configure.ac ++++ libp11-0.4.12/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.0.*) # Predicted engines directory prefix for OpenSSL 3.x ++ 3.1.*|3.0.*) # 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 eba6e2e..35a82dc 100644 --- a/libp11.changes +++ b/libp11.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 6 12:24:11 UTC 2023 - Dominique Leuenberger + +- Add support for openSSL 3.1: + + Add libp11-openssl-3.1.patch: handle openSSL 3.1 the same as 3.0 + + Add libtool BuildRequires and call autoreconf: abobe patch + touches the build system. + ------------------------------------------------------------------- Mon Feb 6 10:41:29 UTC 2023 - Dominique Leuenberger diff --git a/libp11.spec b/libp11.spec index f1e29c3..1fb322a 100644 --- a/libp11.spec +++ b/libp11.spec @@ -35,7 +35,9 @@ Source0: https://github.com/OpenSC/libp11/releases/download/%{name}-%{ver Source1: https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: %{name}-rpmlintrc +Patch0: libp11-openssl-3.1.patch BuildRequires: fdupes +BuildRequires: libtool BuildRequires: p11-kit-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(openssl) @@ -103,11 +105,12 @@ thus is "derived from the RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki)". %prep -%setup -q +%autosetup -p1 # Since the library name changes based on used openssl, we have to create baselibs.conf dynamically echo %{libname} > %{_sourcedir}/baselibs.conf %build +autoreconf -fiv %configure \ --disable-static \ --disable-silent-rules \ From 69d279c2abfeca80c112a249245281a9b08b8769106563f0cef228f2c4dffd3f Mon Sep 17 00:00:00 2001 From: Otto Hollmann Date: Thu, 8 Jun 2023 13:31:22 +0000 Subject: [PATCH 2/3] Accepting request 1091446 from home:ohollmann:branches:security:chipcard + Add baselibs.conf OBS-URL: https://build.opensuse.org/request/show/1091446 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/libp11?expand=0&rev=39 --- libp11.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libp11.changes b/libp11.changes index 35a82dc..4332f00 100644 --- a/libp11.changes +++ b/libp11.changes @@ -5,6 +5,7 @@ Tue Jun 6 12:24:11 UTC 2023 - Dominique Leuenberger + Add libp11-openssl-3.1.patch: handle openSSL 3.1 the same as 3.0 + Add libtool BuildRequires and call autoreconf: abobe patch touches the build system. + + Add baselibs.conf ------------------------------------------------------------------- Mon Feb 6 10:41:29 UTC 2023 - Dominique Leuenberger From bc13636c42a3e67788ed2cdd12b5f1c24d0dde64d5ad8adfccdc452c8749e517 Mon Sep 17 00:00:00 2001 From: Otto Hollmann Date: Thu, 8 Jun 2023 13:40:33 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/security:chipcard/libp11?expand=0&rev=40 --- libp11.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libp11.spec b/libp11.spec index 1fb322a..0bf7dce 100644 --- a/libp11.spec +++ b/libp11.spec @@ -35,6 +35,7 @@ Source0: https://github.com/OpenSC/libp11/releases/download/%{name}-%{ver Source1: https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: %{name}-rpmlintrc +Source4: baselibs.conf Patch0: libp11-openssl-3.1.patch BuildRequires: fdupes BuildRequires: libtool