pool/libp11
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pool:factory
Branches Tags
pool:factory
pool:devel
rpm:factory
..
compare: rpm:factory
Branches Tags
rpm:factory
pool:factory
pool:devel

No commits in common. "factory" and "factory" have entirely different histories.
factory ... factory

9 changed files with 67 additions and 128 deletions
Show Stats Expand all files Collapse all files

62
fix-wrong-non-static-lib.patch
View File

@ -1,62 +0,0 @@
Index: libp11-0.4.13/src/Makefile.am
===================================================================
--- libp11-0.4.13.orig/src/Makefile.am
+++ libp11-0.4.13/src/Makefile.am
@@ -6,7 +6,11 @@ EXTRA_DIST = Makefile.mak libp11.rc.in p
noinst_HEADERS= libp11-int.h pkcs11.h p11_pthread.h
include_HEADERS= libp11.h p11_err.h
+if ENABLE_STATIC_ENGINE
lib_LTLIBRARIES = libp11.la libpkcs11.la
+else
+lib_LTLIBRARIES = libp11.la
+endif
enginesexec_LTLIBRARIES = pkcs11.la
pkgconfig_DATA = libp11.pc
@@ -52,9 +56,11 @@ pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -modul
# Create a static version of the engine as well to allow applications
# to statically link into it.
+if ENABLE_STATIC_ENGINE
libpkcs11_la_SOURCES = $(pkcs11_la_SOURCES)
libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS)
libpkcs11_la_LIBADD = $(pkcs11_la_LIBADD)
+endif
# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
check-local: $(LTLIBRARIES)
Index: libp11-0.4.13/configure.ac
===================================================================
--- libp11-0.4.13.orig/configure.ac
+++ libp11-0.4.13/configure.ac
@@ -149,6 +149,13 @@ AC_ARG_WITH(
]
)
+AC_ARG_ENABLE(
+ [static-engine],
+ [AS_HELP_STRING([--enable-static-engine], [enable static engine (libpkcs11.a) build @<:@disabled@:>@])],
+ ,
+ [enable_static_engine="no"]
+)
+
AC_ARG_WITH(
[pkcs11-module],
[AS_HELP_STRING([--with-pkcs11-module], [default PKCS11 module])],
@@ -226,6 +233,7 @@ AC_SUBST([SHARED_EXT], $(eval echo "${sh
AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"])
AM_CONDITIONAL([ENABLE_API_DOC], [test "${enable_api_doc}" = "yes"])
+AM_CONDITIONAL([ENABLE_STATIC_ENGINE], [test "${enable_static_engine}" = "yes"])
if test "${enable_pedantic}" = "yes"; then
enable_strict="yes";
@@ -283,6 +291,7 @@ libp11 directory: $(eval eval eva
Engine directory: ${enginesexecdir}
Default PKCS11 module: ${pkcs11_module}
API doc support: ${enable_api_doc}
+Static PKCS#11 engine ${enable_static_engine}
Host: ${host}
Compiler: ${CC}

BIN
libp11-0.4.12.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
libp11-0.4.12.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEK8fk5n48wMG+py+MLvx/8NQW4BQFAmLs03oACgkQLvx/8NQW
4BRLfw//RpRc/93cRtlekgf7VwwtO+5MaO3/4umfpkb5jRXq5zOYPGjIBzzZibRS
pX1y9nnG7pDx65EdyEOM/kI8HcZp4Jkn8PQ0UqT0Ozwm1JrMfGCeRadrYvg2mQY6
5fHQ7SCub/eofeB9NNN0nHkW28B2r1Y/x728BSbuBixqq9+ZzKPzzah+VgDp+NQ1
SZ8ummmeZ+kyp3o5FOtrKjBPqo5VzWzucTiq5dH/QYeHl7YcuL/QSgpR0r+G9ei5
3tirwtxstWHMNFChquI+OLqe2++I+Cq5/Gcz9C/BKKHd00CWWRH4rZrStl8q8kM8
tIVTIH7Rcf4h4isGBl70TIOIGtxY/9IYLRhoL4aCwy0DtNKYWF5G7zSN5JN/2xvC
4CFe3Th7sEY65Z8aimwi6/wRi6lQ/sUWcQ/wUJLWL6XepMcgFLogZYgC67sidvyV
GFlZt4w8PvclfLw4wMZB6u4TkWIKu1uMl00d0rWXNaQWeYgF9aQqHMWMzi0FQzpf
J4rOcR+knBP1XvtbaAfFdm5q+HFy3HWXNsftMEGbehxy2M1sRBT9tOQv/R4pNtkP
7oWD7bKHa1kvy5qqiCB9zNQpN2LJKM/kCANQAqmQno1S8ktDYqqd08+U5966Qgis
UOs/+sOXykEMW+0NmNCA3rQ1ZZ3F9doSsaWBqzZVaEeE6WBEeWk=
=WqLA
-----END PGP SIGNATURE-----

3
libp11-0.4.13.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d25dd9cff1b623e12d51b6d2c100e26063582d25c9a6f57c99d41f2da9567086
size 531147

18
libp11-0.4.13.tar.gz.asc
View File

@ -1,18 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQKTBAABCgB9FiEEK8fk5n48wMG+py+MLvx/8NQW4BQFAmdel/9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDJC
QzdFNEU2N0UzQ0MwQzFCRUE3MkY4QzJFRkM3RkYwRDQxNkUwMTQACgkQLvx/8NQW
4BTJcA/+NxHvmhfijEo3aT7VqyX1bq7Jm/3415RCaU4igci32WNHYzZZAEbcHGoB
WnlLxzBw6g48X8axOrpgcyn28ejhKa6QcC/CDOzNfZOQTqZNpXrG+OjHVmsB3Gqh
sOx6bONlO+GvqCpPL3mwJ4cpFBauCnCoV2kgxgEZKAg2xNTe2Vc/UGYKQntGwVvL
p23lH6C5q+D9pRW67b5zVzED8mB2Hq7NJbqskhB9HitwJr9V8ELFZ4QXom0PXqv/
tybqE+fHK9bgLkmPxfd9QGdUzjsP3HXEC9azVco+WYq9G8S/sABVKL40KRcn8PrY
57xUFeMwHr6zRRfjkM8SzFzuJWLFT+8uHJxgjlCm+Jysqc8oldFUPWVfWRsVLlzU
No6ErLth3c70nxJUg5VRnLT+c6uORz0Yw0zawOIpN9eaUtlTInjWBDAt4rSUkD/c
v/+j3qUtPyr1KdDy3bKiL88TA+heo9poYVSnM2t8T0iQ8qawIumQQkwKuGuhHEwN
pXzruLTVAQZuuRw1FXq/Q0BGk48pDLZodZox6vxTSfv1k8QJg4hjnPIOzVIoZ7G6
U0ytQy5JwkZ1TfLeXo54bO1L+pMYyYFCRNoXmqeQtmIxZiJz+QEWKWgqB/NtOm5R
LkLE25IJUPHsTnFfdKRE/tQ4acPr4zoAEZTR84anG3ZTCPTswzQ=
=BziO
-----END PGP SIGNATURE-----

25
libp11-configure-treat-all-openssl-3.x-releases-the-same.patch Normal file
View File

@ -0,0 +1,25 @@
From 74497e0fa5b69b15790d6697e1ebce13af842d4c Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
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

13
libp11-openssl-3.1.patch Normal file
View File

@ -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

30
libp11.changes
View File

@ -1,33 +1,3 @@
-------------------------------------------------------------------
Fri Dec 20 17:51:35 UTC 2024 - Lucas Mulling <lucas.mulling@suse.com>
- Add patch to fix upstream
* fix-wrong-non-static-lib.patch
-------------------------------------------------------------------
Thu Dec 19 17:26:52 UTC 2024 - Lucas Mulling <lucas.mulling@suse.com>
- Update to 0.4.13:
* Increased maximum PIN length (Michał Trojnara)
* Fixed several memory leaks (Michał Trojnara, Małgorzata Olszówka)
* Don't include libp11.rc VERSIONINFO into pkcs11 (Mikhail Titov)
* Improved tests (Małgorzata Olszówka)
* Added static ENGINE (libpkcas11.a) build (Marouene Boubakri)
* Added a workaround broken foreign key handling in OpenSSL
* 3.0.12-3.0.13, 3.1.4-3.1.5, 3.2.0-3.2.1 (Małgorzata Olszówka)
* Added a workaround for conflicting atexit() callbacks (Michał Trojnara)
* Always login with PIN If FORCE_LOGIN is specified in openssl config
(Plamen Todorov)
* Added OAEP support to RSA_private_decrypt (Peter Popovec)
* Added PKCS11_enumerate_*_ext functions (Harshal Gohel)
* Fixed non-null-terminated label padding (Jorge Ramirez-Ortiz)
* Fixed several object management issues (Jakub Jelen)
* Deferred libp11 initialization until needed (Doug Engert)
- Removed patches:
* libp11-openssl-3.1.patch
* libp11-configure-treat-all-openssl-3.x-releases-the-same.patch
- Enable unit tests
-------------------------------------------------------------------
Fri Jan 19 10:43:16 UTC 2024 - Otto Hollmann <otto.hollmann@suse.com>

25
libp11.spec
View File

@ -25,7 +25,7 @@
%define libname libp11-3
%endif
Name: libp11
Version: 0.4.13
Version: 0.4.12
Release: 0
Summary: Library Implementing a Small Layer on Top of PKCS#11 API
License: LGPL-2.1-or-later
@ -36,19 +36,16 @@ Source1: https://github.com/OpenSC/libp11/releases/download/%{name}-%{ver
Source2: %{name}.keyring
Source3: %{name}-rpmlintrc
Source4: baselibs.conf
# FIX-UPSTREAM
Patch0: fix-wrong-non-static-lib.patch
# 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
BuildRequires: pkgconfig
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib)
# Required for testing
BuildRequires: opensc
# For pgrep
BuildRequires: procps
BuildRequires: softhsm
# The engine_pkcs11 library has been merged into version 0.4.0 and later.
# (It existed only in security:chipcard OBS repository.
Obsoletes: engine_pkcs11 <= 0.2.2
@ -123,9 +120,10 @@ echo %{libname} > %{_sourcedir}/baselibs.conf
%build
autoreconf -fiv
%configure \
--disable-static \
--disable-silent-rules \
--docdir=%{_docdir}/%{libname}
--disable-static \
--disable-silent-rules \
--enable-doc\
--docdir=%{_docdir}/%{libname}
%make_build
%install
@ -134,15 +132,12 @@ mkdir -p %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{libname}
find %{buildroot} -type f -name "*.la" -delete -print
%fdupes %{buildroot}%{_docdir}
%check
%make_build check
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%files -n %{libname}
%doc %{_docdir}/%{libname}
%{_libdir}/libp11.so.*
%{_libdir}/*.so.*
%files -n openssl-engine-%{name}
%if 0%{?suse_version} > 1325