From 242c1e6a278c47aadf9df5885745e7ab27d6b436 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Wed, 8 Oct 2014 01:03:49 -0400
Subject: [PATCH] - Add Petr Spacek's patches and use automake/libtool to
 build. - Fixup libdir for all architectures for the pkcs11 directory

---
 softhsm.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/softhsm.spec b/softhsm.spec
index 00c609d..d0b39db 100644
--- a/softhsm.spec
+++ b/softhsm.spec
@@ -2,16 +2,20 @@ Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
 Version: 2.0.0b1
 Release: 3%{?dist}
-ExcludeArch: i686 ppc s390
 License: BSD
 Url: http://www.opendnssec.org/
 Source: http://dist.opendnssec.org/source/testing/%{name}-%{version}.tar.gz
 Source1: softhsm.module
 # taken from coolkey which is not build on all arches we build on
 Source2: softhsm2-pk11install.c
+Patch1: softhsm-v2.0.0b1-aes-key-wrap.patch
+Patch2: softhsm-v2.0.0b1-ckm-rsa-pkcs-oaep-key-wrap.patch
+
 Group: Applications/System
 BuildRequires: openssl-devel, sqlite-devel >= 3.4.2, cppunit-devel
 BuildRequires: gcc-c++, pkgconfig, p11-kit-devel, nss-devel
+# for snapshot only - or when our patches touches .m4 files
+BuildRequires: autoconf, libtool, automake
 
 Requires(pre): shadow-utils
 Requires: p11-kit, nss-tools
@@ -37,12 +41,17 @@ The devel package contains the libsofthsm include files
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+
 # remove softhsm/ subdir auto-added to --libdir
 sed -i "s:full_libdir/softhsm:full_libdir:g" configure
+sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac
 sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
 
 %build
-%configure --libdir=/usr/lib64/pkcs11 --with-openssl=%{_prefix} --enable-ecc --disable-gost \
+autoreconf --install --force
+%configure --libdir=%{_libdir}/pkcs11 --with-openssl=%{_prefix} --enable-ecc --disable-gost \
            --with-migrate --enable-visibility
 
 make %{?_smp_mflags}
@@ -111,6 +120,8 @@ fi
 
 %changelog
 * Tue Sep 30 2014 Paul Wouters <pwouters@redhat.com> - 2.0.0b1-3
+- Add support for CKM_RSA_PKCS_OAEP key un/wrapping [Petr Spacek]
+- Use OpenSSL EVP interface for AES key wrapping [Petr Spacek]
 - Fix softhsm2-pk11install buid and post call
 - Do not use --with-objectstore-backend-db (causes issues on i686)
 - Change install directory to /usr/lib*/pkcs11/