diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2021-11-22 00:08:37 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2021-11-22 09:18:08 +0000 |
| commit | 7f3f8384a66c5e1d9c020e125808f153845807ad (patch) | |
| tree | de51c814cb8c26204a93d23c324b4381e1e3a1a9 | |
| parent | febd7f75524bc6a6ebde9fb3e3350279076cde71 (diff) | |
| download | ports-7f3f8384a66c5e1d9c020e125808f153845807ad.tar.gz ports-7f3f8384a66c5e1d9c020e125808f153845807ad.zip | |
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
| -rw-r--r-- | security/gnupg/Makefile | 2 | ||||
| -rw-r--r-- | security/gnupg/files/patch-common_homedir.c | 6 | ||||
| -rw-r--r-- | 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"), |