From nobody Thu Apr 20 13:37:04 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2Jc151ncz464mY; Thu, 20 Apr 2023 13:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2Jc10tYFz46wM; Thu, 20 Apr 2023 13:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ybBI2ywXlghPJsSvRwHNcrMTqKvem8kuB6qXGkMZDY=; b=LS9l8w7a9/FB5emSE4tws02y0eJ3YYkfSQehPV8vYy7L+0PneVH+MXBE93L/A7JyXE5WR7 e2ukcUfeLPidkVcaoPjALFajNiB7RctAn6VGTQIyvkhT+3WS00nydO8nQzd/ErRNpy5Spy uxbNjwdw+CfMRZ5zc2XPIkFEau8qNzaETdXmjB4fv3Ri3bDF35fPS/IYswkdn/b6k18uk9 A7FyghIiOG0cG7bZI2AmWhgWzibBC8Y6vP6V9IZStJZlEHax5CwHNgaF8+UBOZp+YeTR8z UxDdvqOOQ4fIFby58DaIUEkYbKAPRd/wgI6tx7wLaMWVv6ZnF9rvDlQzLIwcow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ybBI2ywXlghPJsSvRwHNcrMTqKvem8kuB6qXGkMZDY=; b=fc/DVp4ua6Ug9G3Yu2WD5fmqmYBA4aKUQJRqSPbL9NjWRGpI0VvGXzd8evHhGY519o7BLz m26F4fR6C3DqPXgIdI/6MFIDbTsxI5OC2n3Q6XwMH1YSk0BZb1VJeuFqUigEvPSo9pfp+2 1x3ACxFfnnx8OOYrb0VDV0OgdEZxzG6LgXNwIFItrUb7t4Vuf/d3SlQ9mYaQ+0EQNjGUfG /kblscUULe7IGsENP1diltmW35iQvol5TdstzobVQsCdz1CezqewhEQ0P9udYF5S9sNri5 ewWwM9OEgVtUAQkkcJFM3K8RnhDu0H2ZjFi/WyegR307dK7cMfrEnPe/g7u9HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681997825; a=rsa-sha256; cv=none; b=tkL97TBmQM4K98ijTN8Nh84RJUMpFIMuJisjyYpEqrOyhZFnvKI4dlGj4zZGyP+99Mx9V1 +rFXXxYWIo19KH7rAjkzOMsOSZwR7AYiANE7AHhem2156wbG0xgPOLXRIGKPJ52NbGQF0X /Ngtr3MxbCRFQnVnaAY0daWIgWpDKzYeRaXZnFgnSpGAYCLDvmcMP3y13b3zBnKXr1fLWW E/4JqP3v3telrL2q1t/weUN9xL9Fic8yRJKP6IlMyS+iTDAn3+HkNx1NsdIP+XAKPOFg1W ja2YcS1xM9BDWfW/s0jZf945JxLcLT4K0CtTNzUVWbSB/7F+tceHymD1yJ2gLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2Jc074BqzfVs; Thu, 20 Apr 2023 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KDb4gh082152; Thu, 20 Apr 2023 13:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KDb4lm082151; Thu, 20 Apr 2023 13:37:04 GMT (envelope-from git) Date: Thu, 20 Apr 2023 13:37:04 GMT Message-Id: <202304201337.33KDb4lm082151@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 6bf7787c8837 - 2023Q2 - security/opencryptoki: fix build as non-root List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 6bf7787c8837b93096cc92cb049a8cf1b87898ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bf7787c8837b93096cc92cb049a8cf1b87898ce commit 6bf7787c8837b93096cc92cb049a8cf1b87898ce Author: John Hein AuthorDate: 2023-04-19 16:09:44 +0000 Commit: Robert Clausecker 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 && \