Attachment #243332 for bug #272083

Lines 1-8 Link Here

(-)b/security/gnupg/Makefile (-1 / +4 lines)
1	PORTNAME= gnupg	1	PORTNAME= gnupg
2	DISTVERSION= 2.3.8	2	DISTVERSION= 2.4.3
3	CATEGORIES= security	3	CATEGORIES= security
4	MASTER_SITES= GNUPG	4	MASTER_SITES= GNUPG
5		5
		6	PATCH_SITES= https://github.com/gpg/${PORTNAME}/commit/
		7	PATCHFILES+= 9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch:-p1 #Fix linking without LDAP
		8
6	MAINTAINER= adridg@FreeBSD.org	9	MAINTAINER= adridg@FreeBSD.org
7	COMMENT= Complete and free PGP implementation	10	COMMENT= Complete and free PGP implementation
8	WWW= https://www.gnupg.org/	11	WWW= https://www.gnupg.org/

Lines 1-3 Link Here

(-)b/security/gnupg/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1666020426	1	TIMESTAMP = 1689011640
2	SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed	2	SHA256 (gnupg-2.4.3.tar.bz2) = a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d
3	SIZE (gnupg-2.3.8.tar.bz2) = 7644926	3	SIZE (gnupg-2.4.3.tar.bz2) = 7351327
		4	SHA256 (9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch) = 186154a2bd7750c212571c8be51a6f02d56e323d001673f2abe7342181d49d13
		5	SIZE (9ae3cfcabec9252c22d67b7a15c36f0a8cf22f0f.patch) = 806




--- 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);




%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
%%PORTDOCS%%%%DOCSDIR%%/examples/Automatic.prf
%%PORTDOCS%%%%DOCSDIR%%/examples/README
%%PORTDOCS%%%%DOCSDIR%%/examples/VS-NfD.prf
%%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
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/README
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.service
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.socket
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-browser.socket
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-extra.socket
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-ssh.socket
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.service
%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.socket
%%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
%%PORTDOCS%%%%DOCSDIR%%/help.be.txt
%%PORTDOCS%%%%DOCSDIR%%/help.ca.txt
- 

Return to bug 272083

Removed Link Here

(-)a/security/gnupg/files/patch-dirmngr_server.c (-13 lines)
1	--- dirmngr/server.c.orig 2022-10-07 13:23:50 UTC
2	+++ dirmngr/server.c
3	@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int se
4	ctrl->refcount);
5	else
6	{
7	+#if USE_LDAP
8	ks_ldap_free_state (ctrl->ks_get_state);
9	ctrl->ks_get_state = NULL;
10	+#endif /USE_LDAP/
11	release_ctrl_ocsp_certs (ctrl);
12	xfree (ctrl->server_local);
13	dirmngr_deinit_default_ctrl (ctrl);

Lines 55-78 sbin/applygnupgdefaults Link Here

(-)b/security/gnupg/pkg-plist (-12 lines)
55	%%PORTDOCS%%%%DOCSDIR%%/OpenPGP	55	%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
56	%%PORTDOCS%%%%DOCSDIR%%/README	56	%%PORTDOCS%%%%DOCSDIR%%/README
57	%%PORTDOCS%%%%DOCSDIR%%/TRANSLATE	57	%%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
58	%%PORTDOCS%%%%DOCSDIR%%/examples/Automatic.prf
59	%%PORTDOCS%%%%DOCSDIR%%/examples/README	58	%%PORTDOCS%%%%DOCSDIR%%/examples/README
60	%%PORTDOCS%%%%DOCSDIR%%/examples/VS-NfD.prf
61	%%PORTDOCS%%%%DOCSDIR%%/examples/common.conf	59	%%PORTDOCS%%%%DOCSDIR%%/examples/common.conf
62	%%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf
63	%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf	60	%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
64	%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.rnames	61	%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.rnames
65	%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list	62	%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
66	%%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt	63	%%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt
67	%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event	64	%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
68	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/README
69	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.service
70	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/dirmngr.socket
71	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-browser.socket
72	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-extra.socket
73	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent-ssh.socket
74	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.service
75	%%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.socket
76	%%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt	65	%%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
77	%%PORTDOCS%%%%DOCSDIR%%/help.be.txt	66	%%PORTDOCS%%%%DOCSDIR%%/help.be.txt
78	%%PORTDOCS%%%%DOCSDIR%%/help.ca.txt	67	%%PORTDOCS%%%%DOCSDIR%%/help.ca.txt
79	-