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 <dclarke@blastwave.org>
freebsd · Nov 6, 2022 · 142c06a · 142c06a
1 parent 76691df
commit 142c06a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 47 deletions.
diff --git 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
@@ -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
diff --git a/security/gnupg/files/patch-dirmngr_server.c 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
diff --git 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