Marcus Meissner
695604103a
Reconciled all the differences between the OBS and IBS versions of the package. Merged the changelog files so that everything is in there. OBS-URL: https://build.opensuse.org/request/show/390252 OBS-URL: https://build.opensuse.org/package/show/security/openCryptoki?expand=0&rev=29
95 lines
4.2 KiB
Diff
95 lines
4.2 KiB
Diff
--- opencryptoki/usr/Makefile.am
|
|
+++ opencryptoki/usr/Makefile.am
|
|
@@ -6,5 +6,4 @@
|
|
|
|
install-data-hook:
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir) $(DESTDIR)$(logdir)
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir) $(DESTDIR)$(logdir)
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir) $(DESTDIR)$(logdir)
|
|
--- opencryptoki/usr/lib/pkcs11/cca_stdll/Makefile.am
|
|
+++ opencryptoki/usr/lib/pkcs11/cca_stdll/Makefile.am
|
|
@@ -66,12 +66,9 @@
|
|
cd $(DESTDIR)/$(libdir)/opencryptoki/stdll && \
|
|
ln -sf libpkcs11_cca.so PKCS11_CCA.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ccatok
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/ccatok
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/ccatok
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/ccatok
|
|
|
|
uninstall-hook:
|
|
--- opencryptoki/usr/lib/pkcs11/ep11_stdll/Makefile.am
|
|
+++ opencryptoki/usr/lib/pkcs11/ep11_stdll/Makefile.am
|
|
@@ -49,12 +49,9 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -sf libpkcs11_ep11.so PKCS11_EP11.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/ep11tok
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/ep11tok
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/ep11tok
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/ep11tok
|
|
|
|
uninstall-hook:
|
|
--- opencryptoki/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
|
|
+++ opencryptoki/usr/lib/pkcs11/ica_s390_stdll/Makefile.am
|
|
@@ -64,12 +64,9 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -sf libpkcs11_ica.so PKCS11_ICA.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/lite
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/lite
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/lite
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/lite
|
|
|
|
uninstall-hook:
|
|
--- opencryptoki/usr/lib/pkcs11/icsf_stdll/Makefile.am
|
|
+++ opencryptoki/usr/lib/pkcs11/icsf_stdll/Makefile.am
|
|
@@ -79,10 +79,8 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -sf libpkcs11_icsf.so PKCS11_ICSF.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/icsf
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/icsf
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/icsf
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/icsf
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/icsf
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/icsf
|
|
|
|
uninstall-hook:
|
|
--- opencryptoki/usr/lib/pkcs11/soft_stdll/Makefile.am
|
|
+++ opencryptoki/usr/lib/pkcs11/soft_stdll/Makefile.am
|
|
@@ -56,12 +56,9 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -sf libpkcs11_sw.so PKCS11_SW.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok/TOK_OBJ
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/swtok
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/swtok
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/swtok
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/swtok
|
|
|
|
uninstall-hook:
|
|
--- opencryptoki/usr/lib/pkcs11/tpm_stdll/Makefile.am
|
|
+++ opencryptoki/usr/lib/pkcs11/tpm_stdll/Makefile.am
|
|
@@ -71,10 +71,8 @@
|
|
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \
|
|
ln -sf libpkcs11_tpm.so PKCS11_TPM.so
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
|
|
$(CHMOD) 0770 $(DESTDIR)$(localstatedir)/lib/opencryptoki/tpm
|
|
$(MKDIR_P) $(DESTDIR)$(lockdir)/tpm
|
|
- $(CHGRP) pkcs11 $(DESTDIR)$(lockdir)/tpm
|
|
$(CHMOD) 0770 $(DESTDIR)$(lockdir)/tpm
|
|
|
|
uninstall-hook:
|