From nobody Mon Nov 22 09:18:10 2021 X-Original-To: dev-commits-ports-main@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 6C64A188A88D; Mon, 22 Nov 2021 09:18:10 +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 4HyMBV2dBYz4tdB; Mon, 22 Nov 2021 09:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3A6671FEEB; Mon, 22 Nov 2021 09:18:10 +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 1AM9IAPv078629; Mon, 22 Nov 2021 09:18:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AM9IAi1078628; Mon, 22 Nov 2021 09:18:10 GMT (envelope-from git) Date: Mon, 22 Nov 2021 09:18:10 GMT Message-Id: <202111220918.1AM9IAi1078628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 7f3f8384a66c - main - security/gnupg: fix table / enum mismatch List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f3f8384a66c5e1d9c020e125808f153845807ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f3f8384a66c5e1d9c020e125808f153845807ad commit 7f3f8384a66c5e1d9c020e125808f153845807ad Author: Adriaan de Groot AuthorDate: 2021-11-22 00:08:37 +0000 Commit: Adriaan de Groot CommitDate: 2021-11-22 09:18:08 +0000 security/gnupg: fix table / enum mismatch PR259775 reports that (auto)configuration behaves weirdly. This is caused by a mismatch between an enum in the code and a table that expects to match the enum values. When BUILD_WITH_TPM2D is off (the default; I have not looked if it can even be turned on in ports) one table entry is Patch also submitted upstream. PR: 259775 Reported by: O. Hartmann MFH: 2021Q3 --- security/gnupg/Makefile | 2 +- security/gnupg/files/patch-common_homedir.c | 6 +++--- security/gnupg/files/patch-tools_gpgconf-comp.c | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 043ffd5aded4..f95068570253 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnupg PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG diff --git a/security/gnupg/files/patch-common_homedir.c b/security/gnupg/files/patch-common_homedir.c index 619818f4ab54..c383ef03b1d5 100644 --- a/security/gnupg/files/patch-common_homedir.c +++ b/security/gnupg/files/patch-common_homedir.c @@ -1,5 +1,5 @@ ---- common/homedir.c.orig 2021-10-01 12:44:06.000000000 +0000 -+++ common/homedir.c 2021-10-26 08:14:01.320259000 +0000 +--- common/homedir.c.orig 2021-10-01 12:44:06 UTC ++++ common/homedir.c @@ -68,7 +68,9 @@ * text was read. */ #if __linux__ @@ -11,7 +11,7 @@ # define MYPROC_SELF_EXE "/proc/curproc/file" #endif -@@ -495,13 +497,13 @@ +@@ -495,13 +497,13 @@ unix_rootdir (int want_sysconfdir) if (nread < 0) { err = gpg_error_from_syserror (); diff --git a/security/gnupg/files/patch-tools_gpgconf-comp.c b/security/gnupg/files/patch-tools_gpgconf-comp.c new file mode 100644 index 000000000000..d2b0244aa335 --- /dev/null +++ b/security/gnupg/files/patch-tools_gpgconf-comp.c @@ -0,0 +1,11 @@ +--- tools/gpgconf-comp.c.orig 2021-10-10 16:28:51 UTC ++++ tools/gpgconf-comp.c +@@ -676,6 +676,8 @@ static struct + { TPM2DAEMON_NAME, TPM2DAEMON_DISP_NAME, "gnupg", N_("TPM"), + GNUPG_MODULE_NAME_TPM2DAEMON, TPM2DAEMON_NAME ".conf", + known_options_tpm2daemon, NULL, tpm2daemon_runtime_change}, ++#else ++ { NULL }, /* Another dummy, to keep the enum in sync with this table */ + #endif + + { DIRMNGR_NAME, DIRMNGR_DISP_NAME, "gnupg", N_("Network"),