* Fri Apr 18 2014 Paul Wouters <pwouters@redhat.com> - 1.3.6-1

- Updated to 1.3.6 (rhbz#1070196)

.gitignore

@@ -2,3 +2,4 @@
 /softhsm-1.3.2.tar.gz
 /softhsm-1.3.3.tar.gz
 /softhsm-1.3.5.tar.gz
+/softhsm-1.3.6.tar.gz

softhsm.spec

@@ -1,14 +1,21 @@
 Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
-Version: 1.3.5
+Version: 1.3.6
 Release: 1%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source: http://www.opendnssec.org/files/source/%{name}-%{version}.tar.gz
+Source1: softhsm.module
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: botan-devel >= 1.8.5 sqlite-devel >= 3.4.2
 Requires(pre): shadow-utils
+Requires: p11-kit
+# temp. for p11install
+Requires: coolkey
+
+%global softhsm_module "SoftHSM PKCS #11 Module"
+%global nssdb %{_sysconfdir}/pki/nssdb
 
 %description
 OpenDNSSEC is providing a software implementation of a generic 
@@ -37,39 +44,56 @@ make check
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}/%{_libdir}/pkcs11
+#p11-kit install
+ln -s ../softhsm/libsofthsm.so %{buildroot}/%{_libdir}/pkcs11/
+install -D %{SOURCE1} %{buildroot}/%{_datadir}/p11-kit/modules/softhsm.module
+
 rm %{buildroot}/etc/softhsm.conf.sample
 rm -f %{buildroot}/%{_libdir}/softhsm/*a
 mkdir -p %{buildroot}%{_includedir}/softhsm
 cp src/lib/*.h %{buildroot}%{_includedir}/softhsm
 mkdir -p %{buildroot}/var/softhsm
 
-%clean
-rm -rf %{buildroot}
-
 %files 
-%defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/softhsm.conf
 %{_bindir}/*
 %dir %{_libdir}/softhsm/
 %{_libdir}/softhsm/libsofthsm.so
+%{_libdir}/pkcs11/libsofthsm.so
+%{_datadir}/p11-kit/modules/softhsm.module
 %attr(0770,ods,ods) %dir /var/softhsm
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS LICENSE
 %{_mandir}/*/*
 
 %files devel
-%defattr(-,root,root,-)
 %attr(0755,root,root) %dir %{_includedir}/softhsm
 %{_includedir}/softhsm/*.h
-%doc README
 
 %pre
 getent group ods >/dev/null || groupadd -r ods
 getent passwd ods >/dev/null || \
     useradd -r -g ods -d /var/softhsm -s /sbin/nologin \
-    -c "DNSSEC private keys owner" ods
+    -c "softhsm private keys owner" ods
 exit 0
 
+%post
+isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{softhsm_module} || echo NO`
+if [ "$isThere" == "NO" ]; then
+   if [ -x %{_bindir}/pk11install ]; then
+      pk11install -p %{nssdb} 'name=%{softhsm_module} library=libsofthsm.so' ||:
+   fi
+fi
+
+if [ $1 -eq 0 ]; then
+   modutil -delete %{softhsm_module} -dbdir %{nssdb} -force || :
+fi
+
 %changelog
+* Fri Apr 18 2014 Paul Wouters <pwouters@redhat.com> - 1.3.6-1
+- Updated to 1.3.6 (rhbz#1070196)
+- Provide a p11-kit module file (rhbz#1085327)
+
 * Sun Nov 03 2013 Paul Wouters <pwouters@redhat.com> - 1.3.5-1
 - Updated to 1.3.5 (rhbz#987721)
 

sources

@@ -1,2 +1 @@
-417898d682bb8e2312aa3126f965a043  softhsm-1.3.3.tar.gz
+78707a93046b53d9326e278cdbf7a6eb  softhsm-1.3.6.tar.gz
-c07acb7ac7fceef6a56f2db082685283  softhsm-1.3.5.tar.gz