From 0aa9b352572f289dba8679191e8cd619a5f40286 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 28 2020 08:52:34 +0000 Subject: import softhsm-2.4.0-4.module+el8.2.0+5779+a38c524f --- diff --git a/SPECS/softhsm.spec b/SPECS/softhsm.spec index fcdb948..dc769e1 100644 --- a/SPECS/softhsm.spec +++ b/SPECS/softhsm.spec @@ -3,7 +3,7 @@ Summary: Software version of a PKCS#11 Hardware Security Module Name: softhsm Version: 2.4.0 -Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist} +Release: %{?prever:0.}4%{?prever:.%{prever}}%{?dist} License: BSD Url: http://www.opendnssec.org/ Source: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz @@ -47,9 +47,6 @@ The devel package contains the libsofthsm include files %patch1 -p1 %patch2 -p1 -%if 0%{?prever:1} -autoreconf -fiv -%endif # remove softhsm/ subdir auto-added to --libdir sed -i "s:full_libdir/softhsm:full_libdir:g" configure @@ -58,6 +55,16 @@ sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac %endif sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in +sed -i 's:$full_libdir/libsofthsm2\.so:libsofthsm2\.so:g' configure + +%if 0%{?prever:1} +sed -i 's:$full_libdir/libsofthsm2\.so:libsofthsm2\.so:g' configure.ac +%endif + +%if 0%{?prever:1} +autoreconf -fiv +%endif + %build %configure --libdir=%{_libdir}/pkcs11 --with-openssl=%{_prefix} --enable-ecc --disable-gost \ --with-migrate --enable-visibility --with-p11-kit=%{_datadir}/p11-kit/modules/ @@ -118,6 +125,14 @@ if [ -f /var/softhsm/slot0.db ]; then fi %changelog +* Mon Feb 17 2020 Alexander Bokovoy - 2.4.0-4 +- Provide specific version libsofthsm2.so for p11-kit +- Fixes: rhbz#1727065 + +* Tue Feb 11 2020 Alexander Bokovoy - 2.4.0-3 +- Remove architecture-specific path from softhsm2.module definition +- Fixes: rhbz#1727065 + * Fri Aug 17 2018 Alexander Bokovoy - 2.4.0-2 - Replace PKCS11 headers by a more liberal version from p11-kit - Fixes: rhbz#1615766