From dd27c9ea5116c04a3411b75fb4d2ebf30c4a4b6f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 21:21:11 +0000 Subject: [PATCH] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- softhsm.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/softhsm.spec b/softhsm.spec index 042b244..131298c 100644 --- a/softhsm.spec +++ b/softhsm.spec @@ -4,7 +4,7 @@ Summary: Software version of a PKCS#11 Hardware Security Module Name: softhsm Version: 2.6.1 -Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist} +Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}.1 License: BSD Url: http://www.opendnssec.org/ Source: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz @@ -57,14 +57,14 @@ autoreconf -fiv %configure --libdir=%{_libdir}/pkcs11 --with-openssl=%{_prefix} --enable-ecc --enable-eddsa --disable-gost \ --with-migrate --enable-visibility --with-p11-kit=%{_datadir}/p11-kit/modules/ -make %{?_smp_mflags} +%make_build %check make check %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install +%make_install rm %{buildroot}/%{_sysconfdir}/softhsm2.conf.sample rm -f %{buildroot}/%{_libdir}/pkcs11/*a @@ -111,6 +111,10 @@ if [ -f /var/softhsm/slot0.db ]; then fi %changelog +* Tue Jul 14 2020 Tom Stellard - 2.6.1-3.1 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed May 13 2020 David Woodhouse - 2.6.1-3 - Resolves: rhbz#1831086 softhsm use-after-free on process exit Fix crash introduced by initial patch