From 7e4ce1dcac3fcedbcc984e29c3d5800e9bf51fbb Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos nmav@redhat.com Date: Sun, 30 Apr 2017 23:37:29 +0200 Subject: Update to 0.4.6-1
- Update to upstream 0.4.6 release --- .gitignore | 1 + 0001-Destroy-cert-cache-on-login-logout-too.patch | 35 ---------------- libp11-0.4.0-paths.patch | 33 --------------- libp11-0.4.2-testsuite.patch | 21 ---------- libp11.spec | 49 +++++++++++++++++------ sources | 3 +- 6 files changed, 38 insertions(+), 104 deletions(-) delete mode 100644 0001-Destroy-cert-cache-on-login-logout-too.patch delete mode 100644 libp11-0.4.0-paths.patch delete mode 100644 libp11-0.4.2-testsuite.patch
diff --git a/.gitignore b/.gitignore index 933649c..024cc2d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libp11-0.2.7.tar.gz /libp11-0.4.0.tar.gz /libp11-0.4.2.tar.gz /libp11-0.4.2.tar.gz.asc +/libp11-0.4.6.tar.gz diff --git a/0001-Destroy-cert-cache-on-login-logout-too.patch b/0001-Destroy-cert-cache-on-login-logout-too.patch deleted file mode 100644 index 9193a29..0000000 --- a/0001-Destroy-cert-cache-on-login-logout-too.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bbcfd7b51b0606496c82be8eb8c2a5bf65eca167 Mon Sep 17 00:00:00 2001 -From: David Woodhouse David.Woodhouse@intel.com -Date: Mon, 5 Sep 2016 21:38:09 +0100 -Subject: [PATCH] Destroy cert cache on login/logout too - -Certificates can have the CKA_PRIVATE attribute, so that you need to log -in before you can see them. So destroy the cache when we log in, just as -we do the cache of keys. ---- - src/p11_slot.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/p11_slot.c b/src/p11_slot.c -index f031b3e..1fe40ab 100644 ---- a/src/p11_slot.c -+++ b/src/p11_slot.c -@@ -195,6 +195,7 @@ int pkcs11_login(PKCS11_SLOT * slot, int so, const char *pin, int relogin) - if (slot->token) { - pkcs11_destroy_keys(slot->token, CKO_PRIVATE_KEY); - pkcs11_destroy_keys(slot->token, CKO_PUBLIC_KEY); -+ pkcs11_destroy_certs(slot->token); - } - if (spriv->loggedIn) { - /* already logged in, log out first */ -@@ -251,6 +252,7 @@ int pkcs11_logout(PKCS11_SLOT * slot) - if (slot->token) { - pkcs11_destroy_keys(slot->token, CKO_PRIVATE_KEY); - pkcs11_destroy_keys(slot->token, CKO_PUBLIC_KEY); -+ pkcs11_destroy_certs(slot->token); - } - if (!spriv->haveSession) { - PKCS11err(PKCS11_F_PKCS11_LOGOUT, PKCS11_NO_SESSION); --- -2.5.5 - diff --git a/libp11-0.4.0-paths.patch b/libp11-0.4.0-paths.patch deleted file mode 100644 index 325e779..0000000 --- a/libp11-0.4.0-paths.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/examples/listkeys.c b/examples/listkeys.c -index 5e4249b..38e16b9 100644 ---- a/examples/listkeys.c -+++ b/examples/listkeys.c -@@ -77,13 +77,6 @@ int main(int argc, char *argv[]) - printf("Slot token model.......: %s\n", slot->token->model); - printf("Slot token serialnr....: %s\n", slot->token->serialnr); - -- /* get public keys */ -- rc = PKCS11_enumerate_public_keys(slot->token, &keys, &nkeys); -- error_queue("PKCS11_enumerate_public_keys"); -- CHECK_ERR(rc < 0, "PKCS11_enumerate_public_keys failed", 4); -- CHECK_ERR(nkeys == 0, "No public keys found", 5); -- list_keys("Public keys", keys, nkeys); -- - if (slot->token->loginRequired && argc > 2) { - strcpy(password, argv[2]); - /* perform pkcs #11 login */ -@@ -93,6 +86,13 @@ int main(int argc, char *argv[]) - CHECK_ERR(rc < 0, "PKCS11_login failed", 6); - } - -+ /* get public keys */ -+ rc = PKCS11_enumerate_public_keys(slot->token, &keys, &nkeys); -+ error_queue("PKCS11_enumerate_public_keys"); -+ CHECK_ERR(rc < 0, "PKCS11_enumerate_public_keys failed", 4); -+ CHECK_ERR(nkeys == 0, "No public keys found", 5); -+ list_keys("Public keys", keys, nkeys); -+ - /* get private keys */ - rc = PKCS11_enumerate_keys(slot->token, &keys, &nkeys); - error_queue("PKCS11_enumerate_keys"); - diff --git a/libp11-0.4.2-testsuite.patch b/libp11-0.4.2-testsuite.patch deleted file mode 100644 index feb4bbf..0000000 --- a/libp11-0.4.2-testsuite.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tests/ec-testfork.softhsm b/tests/ec-testfork.softhsm -index 961424a..36ae086 100755 ---- a/tests/ec-testfork.softhsm -+++ b/tests/ec-testfork.softhsm -@@ -17,15 +17,4 @@ - # along with GnuTLS; if not, write to the Free Software Foundation, - # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --outdir="output.$$" -- --. ${srcdir}/ec-common.sh -- --./fork-test $ADDITIONAL_PARAM $PIN --if test $? != 0;then -- exit 1; --fi -- --rm -rf "$outdir" -- --exit 0 -+exit 77 diff --git a/libp11.spec b/libp11.spec index 1cc6065..0181218 100644 --- a/libp11.spec +++ b/libp11.spec @@ -1,6 +1,13 @@ +# This spec file has been automatically updated +Version: 0.4.6 +Release: 1%{?dist} +%if 0%{?fedora} +%define enginesdir %{_libdir}/engines-1.1 +%else +%define enginesdir %{_libdir}/openssl/engines +%endif + Name: libp11 -Version: 0.4.2 -Release: 1%{?dist} Summary: Library for using PKCS#11 modules
Group: System Environment/Libraries @@ -8,18 +15,22 @@ License: LGPLv2+ URL: https://github.com/OpenSC/libp11 Source0: https://github.com/OpenSC/libp11/releases/download/%%7Bname%7D-%%7Bversion%7... BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: libp11-0.4.0-paths.patch -Patch2: libp11-0.4.2-testsuite.patch
BuildRequires: autoconf automake libtool BuildRequires: doxygen graphviz BuildRequires: libtool-ltdl-devel BuildRequires: openssl-devel BuildRequires: pkgconfig +%if 0%{?fedora} +BuildRequires: autoconf automake libtool # needed for testsuite +BuildRequires: softhsm opensc +%else %ifnarch ppc ppc64 ppc64le BuildRequires: softhsm opensc %endif +%endif +
%description Libp11 is a library implementing a small layer on top of PKCS#11 API to @@ -30,6 +41,10 @@ Summary: Files for developing with %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} +Conflicts: compat-openssl10-devel < 1:1.1.0 +%endif + %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -41,12 +56,17 @@ License: BSD
BuildRequires: openssl-devel pkgconfig BuildRequires: pkgconfig(p11-kit-1) +%if 0%{?fedora} +BuildRequires: softhsm opensc +Recommends: p11-kit-trust +%else %ifnarch ppc ppc64 ppc64le BuildRequires: softhsm opensc +Requires: p11-kit-trust +%endif %endif Requires: openssl > 0.9.6 Requires: %{name} = %{version}-%{release} -Requires: p11-kit-trust
%description -n engine_pkcs11 Engine_pkcs11 is an implementation of an engine for OpenSSL. It can be loaded @@ -57,15 +77,15 @@ cards and software for using smart cards in PKCS#11 format, such as OpenSC. %prep %setup -q
-%patch1 -p1 -b .paths -%patch2 -p1 -b .tests - %build -%configure --disable-static --enable-api-doc --with-enginesdir=%{_libdir}/openssl/engines +%if 0%{?fedora} +autoreconf -fvi +%endif +%configure --disable-static --enable-api-doc --with-enginesdir=%{enginesdir} make V=1 %{?_smp_mflags}
%install -mkdir -p $RPM_BUILD_ROOT%{_libdir}/openssl/engines/ +mkdir -p $RPM_BUILD_ROOT%{enginesdir} #make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" make install DESTDIR=$RPM_BUILD_ROOT
@@ -76,13 +96,13 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
# Remove libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/openssl/engines/*.la +rm -f $RPM_BUILD_ROOT%{enginesdir}/*.la
%clean rm -rf $RPM_BUILD_ROOT
%check -%ifnarch ppc ppc64 ppc64le +%if 0%{?fedora} make check %{?_smp_mflags} %endif
@@ -105,8 +125,11 @@ make check %{?_smp_mflags} %files -n engine_pkcs11 %defattr(-,root,root,-) %doc NEWS -%{_libdir}/openssl/engines/*.so +%{enginesdir}/*.so
%changelog +* Sun Apr 30 2017 Nikos Mavrogiannopoulos nmav@redhat.com - 0.4.6-1 +- Update to upstream 0.4.6 release + * Fri Oct 14 2016 Nikos Mavrogiannopoulos nmav@redhat.com - 0.4.2-1 - Initial version of the package diff --git a/sources b/sources index 167ae59..57af083 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c0c792840505650cda943a472d443f9b libp11-0.4.2.tar.gz -0406ab518542c50818c0543910508260 libp11-0.4.2.tar.gz.asc +SHA512 (libp11-0.4.6.tar.gz) = fe335c0670befe0f9be541f1751f96aab4ef9572ae2ba67edd73d019ffe9cfdcff110667e6ecabf3591cd7c64bf57bc1feedd2aad879e8dd16f545ebf81e2a9f
scm-commits@lists.fedoraproject.org