From 9b51cd595103cbcacbaf8fb8f9ff8eaa0e6ee47690592a7a5fd1a9b93ca34b35 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 17 Mar 2017 22:13:25 +0000 Subject: [PATCH 1/2] Accepting request 480948 from home:markkp:branches:security Fix problem with building on 32bit systems and make libica-devel requirement more generic. OBS-URL: https://build.opensuse.org/request/show/480948 OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=59 --- openCryptoki.changes | 6 ++++++ openCryptoki.spec | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/openCryptoki.changes b/openCryptoki.changes index 907bdc2..90e2a97 100644 --- a/openCryptoki.changes +++ b/openCryptoki.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 17 20:50:45 UTC 2017 - mpost@suse.com + +- Modified the spec file to check for systemd in the 32bit postun + scriptlet. + ------------------------------------------------------------------- Mon Feb 20 19:48:33 UTC 2017 - mpost@suse.com diff --git a/openCryptoki.spec b/openCryptoki.spec index dc04946..25ae174 100644 --- a/openCryptoki.spec +++ b/openCryptoki.spec @@ -36,7 +36,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ %ifarch s390 s390x -BuildRequires: libica3-devel +BuildRequires: libica-devel %endif BuildRequires: libtool BuildRequires: openldap2-devel @@ -223,8 +223,15 @@ fi %ifarch %openCryptoki_32bit_arch %postun 32bit -# remove the openCryptoki start script +if [ -L %{_sysconfdir}/pkcs11 ] ; then + rm %{_sysconfdir}/pkcs11 +fi +%if %{uses_systemd} +%{service_del_postun pkcsslotd.service} +%else +%{restart_on_update pkcsslotd} %{insserv_cleanup} +%endif %post 32bit # Old library name links From 4d86d0db2998a3f03b96711985e346e792e1430d26e32dab63eb63fa8dc6d6bb Mon Sep 17 00:00:00 2001 From: Mark Post Date: Fri, 17 Mar 2017 22:23:40 +0000 Subject: [PATCH 2/2] Accepting request 480951 from home:markkp:branches:security Fix problem with building on 32bit systems and make libica-devel requirement more generic. OBS-URL: https://build.opensuse.org/request/show/480951 OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=60 --- openCryptoki.changes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openCryptoki.changes b/openCryptoki.changes index 90e2a97..07068fc 100644 --- a/openCryptoki.changes +++ b/openCryptoki.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Fri Mar 17 20:50:45 UTC 2017 - mpost@suse.com -- Modified the spec file to check for systemd in the 32bit postun - scriptlet. +- Modified the spec file + - Changed libca3-devel BuildRequires to just libica-devel + - Check for systemd in the 32bit postun scriptlet. ------------------------------------------------------------------- Mon Feb 20 19:48:33 UTC 2017 - mpost@suse.com