diff --git a/libp11/.SRCINFO b/libp11/.SRCINFO new file mode 100644 index 0000000000..14aa0ea064 --- /dev/null +++ b/libp11/.SRCINFO @@ -0,0 +1,17 @@ +pkgbase = libp11 + pkgdesc = A library implementing a small layer on top of the PKCS11 API + pkgver = 0.4.12 + pkgrel = 3 + url = https://github.com/OpenSC/libp11/wiki + arch = x86_64 + license = LGPL-2.1-or-later + depends = openssl + source = https://github.com/OpenSC/libp11/releases/download/libp11-0.4.12/libp11-0.4.12.tar.gz + source = https://github.com/OpenSC/libp11/releases/download/libp11-0.4.12/libp11-0.4.12.tar.gz.asc + source = libp11-0.4.12-openssl-3.1.patch + validpgpkeys = AC915EA30645D9D3D4DAE4FEB1048932DD3AAAA3 + sha256sums = 1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd + sha256sums = SKIP + sha256sums = 8c06ef235508730c0f0e0fb7f928a3bd008804520a146ea058944b8172a29ac9 + +pkgname = libp11 diff --git a/libp11/PKGBUILD b/libp11/PKGBUILD index d789ff9149..cb5d8a3251 100644 --- a/libp11/PKGBUILD +++ b/libp11/PKGBUILD @@ -7,17 +7,23 @@ pkgname=libp11 pkgver=0.4.12 -pkgrel=2 +pkgrel=3 pkgdesc="A library implementing a small layer on top of the PKCS11 API" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://github.com/OpenSC/libp11/wiki" -license=('LGPL') +license=('LGPL-2.1-or-later') depends=('openssl') -source=("https://github.com/OpenSC/${pkgname}/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}) +source=("https://github.com/OpenSC/${pkgname}/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc} + "libp11-0.4.12-openssl-3.1.patch") sha256sums=('1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd' - 'SKIP') + 'SKIP' + '8c06ef235508730c0f0e0fb7f928a3bd008804520a146ea058944b8172a29ac9') validpgpkeys=('AC915EA30645D9D3D4DAE4FEB1048932DD3AAAA3') +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i ../libp11-0.4.12-openssl-3.1.patch +} build() { cd "$pkgname-$pkgver" @@ -25,6 +31,11 @@ build() { make } +check() { + cd "$pkgname-$pkgver" + make check +} + package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir/" install diff --git a/libp11/libp11-0.4.12-openssl-3.1.patch b/libp11/libp11-0.4.12-openssl-3.1.patch new file mode 100644 index 0000000000..f7f148e07e --- /dev/null +++ b/libp11/libp11-0.4.12-openssl-3.1.patch @@ -0,0 +1,50 @@ +https://github.com/OpenSC/libp11/pull/503 +https://bugs.gentoo.org/910203 + +From 580c12b78b63d88010a6178d7c4c58186938c479 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Tue, 6 Jun 2023 14:27:46 +0200 +Subject: [PATCH] Detect openSSL 3.1; compatible to openSSL 3.0 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d6b0ee91..b96979d9 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.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 +From 0697773b403efb8e7fa9f0c0fddcb499fb9b6337 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