SHA256
1
0
forked from pool/openCryptoki

Accepting request 652754 from home:jengelh:branches:security

- Do not ignore errors from groupadd. If groupadd fails,
  installation ought not to proceed because files would have the
  wrong ownership.

OBS-URL: https://build.opensuse.org/request/show/652754
OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=85
This commit is contained in:
Marcus Meissner 2018-12-06 13:55:44 +00:00 committed by Git OBS Bridge
parent 521acbf5c9
commit 4008088d68
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 30 00:04:41 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Do not ignore errors from groupadd. If groupadd fails,
installation ought not to proceed because files would have the
wrong ownership.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 29 22:45:36 UTC 2018 - mpost@suse.com Thu Nov 29 22:45:36 UTC 2018 - mpost@suse.com

View File

@ -157,11 +157,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
rm -f %{buildroot}%{_libdir}/opencryptoki/methods rm -f %{buildroot}%{_libdir}/opencryptoki/methods
%pre %pre
%{service_add_pre pkcsslotd.service}
# autobuild:/work/cd/lib/misc/group # autobuild:/work/cd/lib/misc/group
# openCryptoki pkcs11:x:64: # openCryptoki pkcs11:x:64:
%{_bindir}/getent group %{pkcs11_group_id} >/dev/null || %{_sbindir}/groupadd -g %{pkcs11_group_id} -r pkcs11 || true %{_bindir}/getent group %{pkcs11_group_id} >/dev/null || %{_sbindir}/groupadd -g %{pkcs11_group_id} -r pkcs11
%{_sbindir}/usermod -a -G pkcs11 root %{_sbindir}/usermod -a -G pkcs11 root
%{service_add_pre pkcsslotd.service}
%preun %preun
%{service_del_preun pkcsslotd.service} %{service_del_preun pkcsslotd.service}