Skip to content

Commit

Permalink
security/gnupg: Fix dirmngr crash caused by gettext 0.22
Browse files Browse the repository at this point in the history
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
  • Loading branch information
TijlCoosemans committed Jul 13, 2023
1 parent 0d05235 commit 7fa24cf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions security/gnupg/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gnupg
DISTVERSION= 2.4.3
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= GNUPG

Expand Down
12 changes: 12 additions & 0 deletions 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)

0 comments on commit 7fa24cf

Please sign in to comment.