From nobody Sun Nov 06 10:48:44 2022 X-Original-To: dev-commits-ports-all@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 4N4rgx1xGFz4grtW; Sun, 6 Nov 2022 10:48:45 +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 4N4rgx1Vrsz3xN5; Sun, 6 Nov 2022 10:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667731725; 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=FRy0aLXyLrZcFM9kNEjzaZtC4NRs3WHSH0IZtmaPO/g=; b=GClITF9DEthG9hnRngmT1NpAl9NKgGDug8ncBQUutS3pTaElX4BG6/ufgwENqSmS5A9AKx qSwrIh//h/vftjmKPG/r9pbwX68I0rQ9CgYEhJVT8p+xOP/RkyeSCJhQKu+yj2lf1SEsty qLVMzVqEeSZ8XAqJ9zDv9Xs/g3GqPlYfRgB8qKcEqJe+hjTBfCBf+L24Pfn6aRYLrxwxhv NnjtcIVarR8pmi8B3Kb2hkkznKyxK79iUOlDbfdofEHH/cyHybePdpEotfnLPJMLrSxZSy d9w6lkMSStJ4DL/wNkg/izh8wgYXAbCQ0dx+Qk0/ueDoNbJxXxp3A1caIZlHzA== 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 4N4rgx0ClFzJQm; Sun, 6 Nov 2022 10:48:45 +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 2A6Amil8072285; Sun, 6 Nov 2022 10:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6AmitZ072284; Sun, 6 Nov 2022 10:48:44 GMT (envelope-from git) Date: Sun, 6 Nov 2022 10:48:44 GMT Message-Id: <202211061048.2A6AmitZ072284@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 142c06a26e0f - main - security/gnupg: Update to 2.3.8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 142c06a26e0fb9293c1614890a1bb5fe04072240 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667731725; 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=FRy0aLXyLrZcFM9kNEjzaZtC4NRs3WHSH0IZtmaPO/g=; b=MJJv7fU2vzb8WcyjJJiZA7bg1Rlj99DvCtE9GENdnnkwqajSAn24ONyRQKwfnq5SvuRwLj EkMDBGjGsdmK+xgfI+aalLrLdCIk+ftLB7Z0QXp2i9WZu4a25VVC5ocQBBCieXExd4cUiR fY19nFUDVobtRrl8phbiyhGZwE4xGWol31SO5vBt2/eIGH34BdYYhAOVMyGh/a6WH6ubuD mSyjzgHupBDdFtJbrMEKIobRhbndL6pCtAjnFfW0BHQI8mJ3pD5H45gjcLcIm06QRPmeW7 nSgD56G3mM+K3eLBqL2xuTVSvhftKjPO8Jc+blnqjA34lJCpd0d3HkojJ0Fo5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667731725; a=rsa-sha256; cv=none; b=ET7Nr2L3NyTe3k9ZzR9YKiBBcoyow018sCGCR8DC8xEHIdD8yqrxfK793ZvLSMHPSZM7uj Z5q6iqQPmOcYGJhAXJF08QtKECTMJ0C20wGTd7Ovhotr5Mh7MZWnisGYI1beDwcc+Tf4Jp rKoW2u5U9xmE+jgWqxIOqHCxfbM9zykvuyfr0Oiax8tVtFGlhaPg/37fBSYZx/VEMN1Ui8 +tEXOGLboBk3Rg7ZznF8V5tZTZafvp1ZN6bYzjO/Dl1iXrmJF0sLULjqtW9/hTC9D/Xxeq RlRiJRAvqA621kgqvbieIWTTjj7uDyCTc+XWRGLy6Lc1t8DKqvv2J3NbgXFtag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=142c06a26e0fb9293c1614890a1bb5fe04072240 commit 142c06a26e0fb9293c1614890a1bb5fe04072240 Author: Herbert J. Skuhra AuthorDate: 2022-11-06 08:26:36 +0000 Commit: Daniel Engberg CommitDate: 2022-11-06 10:46:51 +0000 security/gnupg: Update to 2.3.8 Changelog: https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html Some additional changes to submitted patch: - Change PORTVERSION to DISTVERSION - Generate patch using "make makepatch" - Remove obsolete configure switch PR: 267152 Reviewed by: adridg (maintainer) Tested by: Dennis Clarke --- security/gnupg/Makefile | 5 ++--- security/gnupg/distinfo | 6 ++--- security/gnupg/files/patch-common_homedir.c | 30 ------------------------- security/gnupg/files/patch-dirmngr_server.c | 13 +++++++++++ security/gnupg/files/patch-tools_gpgconf-comp.c | 11 --------- security/gnupg/pkg-plist | 2 ++ 6 files changed, 20 insertions(+), 47 deletions(-) diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index aa6a5cc5a695..6860156fa8ac 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,6 +1,5 @@ PORTNAME= gnupg -PORTVERSION= 2.3.3 -PORTREVISION= 3 +DISTVERSION= 2.3.8 CATEGORIES= security MASTER_SITES= GNUPG @@ -25,7 +24,7 @@ USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 CONFLICTS= dirmngr CPE_VENDOR= gnupg -CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 --enable-symcryptrun +CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 GNU_CONFIGURE= yes INFO= gnupg TEST_TARGET= check diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 62baae4167de..72aa673c8552 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634135268 -SHA256 (gnupg-2.3.3.tar.bz2) = 5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937 -SIZE (gnupg-2.3.3.tar.bz2) = 7590874 +TIMESTAMP = 1666020426 +SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed +SIZE (gnupg-2.3.8.tar.bz2) = 7644926 diff --git a/security/gnupg/files/patch-common_homedir.c b/security/gnupg/files/patch-common_homedir.c deleted file mode 100644 index c383ef03b1d5..000000000000 --- a/security/gnupg/files/patch-common_homedir.c +++ /dev/null @@ -1,30 +0,0 @@ ---- common/homedir.c.orig 2021-10-01 12:44:06 UTC -+++ common/homedir.c -@@ -68,7 +68,9 @@ - * text was read. */ - #if __linux__ - # define MYPROC_SELF_EXE "/proc/self/exe" --#else /* Assume *BSD*/ -+#elif defined(__NetBSD__) -+# define MYPROC_SELF_EXE "/proc/curproc/exe" -+#else /* Assume other BSDs */ - # define MYPROC_SELF_EXE "/proc/curproc/file" - #endif - -@@ -495,13 +497,13 @@ unix_rootdir (int want_sysconfdir) - if (nread < 0) - { - err = gpg_error_from_syserror (); -- log_info ("error reading symlink '%s': %s\n", -- MYPROC_SELF_EXE, gpg_strerror (err)); - buffer[0] = 0; - if ((name = getenv ("GNUPG_BUILD_ROOT")) && *name == '/') - { - /* Try a fallback for systems w/o a supported /proc -- * file system. */ -+ * file system if we are running a regression test. */ -+ log_info ("error reading symlink '%s': %s\n", -+ MYPROC_SELF_EXE, gpg_strerror (err)); - xfree (buffer); - buffer = xstrconcat (name, "/bin/gpgconf", NULL); - log_info ("trying fallback '%s'\n", buffer); diff --git a/security/gnupg/files/patch-dirmngr_server.c b/security/gnupg/files/patch-dirmngr_server.c new file mode 100644 index 000000000000..3a20a36994a1 --- /dev/null +++ b/security/gnupg/files/patch-dirmngr_server.c @@ -0,0 +1,13 @@ +--- dirmngr/server.c.orig 2022-10-07 13:23:50 UTC ++++ dirmngr/server.c +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int se + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif /*USE_LDAP*/ + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); diff --git a/security/gnupg/files/patch-tools_gpgconf-comp.c b/security/gnupg/files/patch-tools_gpgconf-comp.c deleted file mode 100644 index d2b0244aa335..000000000000 --- a/security/gnupg/files/patch-tools_gpgconf-comp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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"), diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index 0b9ff4870b66..33becc416461 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -17,6 +17,7 @@ bin/gpgv2 bin/kbxutil bin/watchgnupg %%DIRMNGRLDAP%%libexec/dirmngr_ldap +libexec/gpg-auth libexec/gpg-check-pattern libexec/gpg-pair-tool libexec/gpg-preset-passphrase @@ -60,6 +61,7 @@ sbin/applygnupgdefaults %%PORTDOCS%%%%DOCSDIR%%/examples/common.conf %%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf +%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.rnames %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list %%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event