git: 6bf7787c8837 - 2023Q2 - security/opencryptoki: fix build as non-root
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Apr 2023 13:37:04 UTC
The branch 2023Q2 has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6bf7787c8837b93096cc92cb049a8cf1b87898ce
commit 6bf7787c8837b93096cc92cb049a8cf1b87898ce
Author: John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2023-04-19 16:09:44 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-20 13:36:52 +0000
security/opencryptoki: fix build as non-root
Simple fix to remove the '-g ' option. Just let the @sample()
parameters in pkg-plist set the group permissions.
Approved by: hrs (maintainer timeout)
MFH: 2023Q2
PR: 269524
(cherry picked from commit 6714a2486ac92293aeed04f5cdac6ac546da0497)
---
security/opencryptoki/files/patch-Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/opencryptoki/files/patch-Makefile.am b/security/opencryptoki/files/patch-Makefile.am
index 7f102a37c1f3..4d718d716928 100644
--- a/security/opencryptoki/files/patch-Makefile.am
+++ b/security/opencryptoki/files/patch-Makefile.am
@@ -51,7 +51,7 @@
if ENABLE_P11SAK
test -f $(DESTDIR)$(sysconfdir)/opencryptoki || $(MKDIR_P) $(DESTDIR)$(sysconfdir)/opencryptoki || true
- test -f $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || $(INSTALL) -g pkcs11 -m 0640 $(srcdir)/usr/sbin/p11sak/p11sak_defined_attrs.conf $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf || true
-+ test -f $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf.sample || $(INSTALL) -g @PKCS11GROUP@ -m 0640 $(srcdir)/usr/sbin/p11sak/p11sak_defined_attrs.conf $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf.sample || true
++ test -f $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf.sample || $(INSTALL) -m 0640 $(srcdir)/usr/sbin/p11sak/p11sak_defined_attrs.conf $(DESTDIR)$(sysconfdir)/opencryptoki/p11sak_defined_attrs.conf.sample || true
endif
if ENABLE_ICATOK
cd $(DESTDIR)$(libdir)/opencryptoki/stdll && \