git: 7fa24cff0d8a - main - security/gnupg: Fix dirmngr crash caused by gettext 0.22

The branch main has been updated by tijl:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7fa24cff0d8a99e5d44839d4b358fafaf69cffbe

commit 7fa24cff0d8a99e5d44839d4b358fafaf69cffbe
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2023-07-13 11:38:14 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2023-07-13 12:44:44 +0000

    security/gnupg: Fix dirmngr crash caused by gettext 0.22
    
    Link the threading library after libgpg-error (and libgcrypt, which also
    links to libgpg-error) so the threading library is initialised before
    libgpg-error.  The initialisation function of libgpg-error calls gettext
    functions that call threading functions (mutex locking).
    
    PR:             272472
    Tested by:      yasu
---
 security/gnupg/Makefile                        |  1 +
 security/gnupg/files/patch-dirmngr_Makefile.in | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index da89e93fc2e4..ca13f0c944f9 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gnupg
 DISTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
diff --git a/security/gnupg/files/patch-dirmngr_Makefile.in b/security/gnupg/files/patch-dirmngr_Makefile.in
new file mode 100644
index 000000000000..96607396e75d
--- /dev/null
+++ b/security/gnupg/files/patch-dirmngr_Makefile.in
@@ -0,0 +1,12 @@
+--- dirmngr/Makefile.in.orig	2023-07-04 14:09:03 UTC
++++ dirmngr/Makefile.in
+@@ -719,8 +719,8 @@ dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN
+ @USE_LDAP_FALSE@ldaplibs = 
+ @USE_LDAP_TRUE@ldaplibs = $(LDAPLIBS)
+ dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
+-	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+ 	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
++	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+ 	$(NETLIBS) $(dirmngr_rc_objs) $(am__append_11)
+ dirmngr_LDFLAGS = 
+ dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)