#6 Use make macros
Merged 2 years ago by abbra. Opened 2 years ago by tstellar.
rpms/ tstellar/softhsm make-macros  into  master

file modified
+7 -3
@@ -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 @@ 

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

  fi

  

  %changelog

+ * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.6.1-3.1

+ - Use make macros

+ - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

+ 

  * Wed May 13 2020 David Woodhouse <dwmw2@infradead.org> - 2.6.1-3

  - Resolves: rhbz#1831086 softhsm use-after-free on process exit

    Fix crash introduced by initial patch

This pull request was create automatically for the f33 change:
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

Please review the patch and if you approve the changes, merge it after the simple-koji-ci test passes.

This pull request will be automatically merged in 1 week if there are not objections.

Pull-Request has been merged by abbra

2 years ago