From nobody Thu Jul 13 13:27:33 2023 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 4R1wQF2wfhz4mgBr; Thu, 13 Jul 2023 13:27:33 +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 4R1wQF2TXkz4FSY; Thu, 13 Jul 2023 13:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689254853; 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=OZhQUkcO7UnHdxsljvdqe9i8x51e3la7MoNc0+zIQ5A=; b=YAQyp8M5321MV2cqWQRyfDdcaGn9hxSU0haDdQ5jcEMQUJa2OziCyMy6EtsTK3PADjlf0X L91ilXkckWvajpvwdvtlr/QZ8SYZc/PYjTz/e+R7BFkStXMVJZ8kac3MT7cZnrI9DkSHIP n7L34wt4hInZaSnvkZzm6EyxELdcNpwbarbW97Zto35UA49qte9ljYij30quW5lAwfA5pI iePv/oSDyLfm/j0DexM4Xqm6f2Ah4Z4eKB29RKlZKVYkZ07acU9Lj1vf+gJTltNFhJVuXA n6/VIIBi4QdhDDYIQ0oE9pKQ4NzjsEKToR+zLYiIhVWMdg3jk1Gbh441VnXcNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689254853; 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=OZhQUkcO7UnHdxsljvdqe9i8x51e3la7MoNc0+zIQ5A=; b=BuuOTQK5z016pZcnnEROj56++KpkY87/XI3SMCTg46gldrJGM4n9F6ahbiv99vrik8L7NQ YSzSgfElKNLylKbXlxaXvR5L7/iheaCjD5/20bCP4U7IGdgAWB4KOZ39VsCkB/lgkP1vkG 0KyL8shLb/nHJb1OKBAqsWEokpw/f2b/V+vtyT0ddg2GiWaeuVDGpLNcwx+RnqlR3FHKRI 9wkyhz+HsabiqLyZzvjQFNttku2c7eOtR8cbxRu/iR2eJNFq6jJ3QGLQMmJ7S6rAjU4Cji JWfSSG6V86QoZs6QLdcnPZrOsQYpPP4UKyVryurLSls7hMsKv5TdMCg+8MX2sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689254853; a=rsa-sha256; cv=none; b=ZCkrR6ss4u/I9ESZejPn07CsasLLTIhlcB6DMMePqZKVmRK/7SPu0WaPG6IPrq4tlZHO8R 0+ss5VtR1JjQ99N/Sa0hbFNhpmiTcVxRscXiPIrRge5H8JNCq4DhtwvNQbGv8edumPKFv2 cl1VhdkVtLc+GOyOwvvQ5NagkfrBx6OwZ5t+hy33z1cp0BqhurQjxzMgMr6f0iNKo2f41k Xh1HHDYqsRI4Vo7oSNQWOa8oIn20gpP8VeqViX8neUg9Ec1oXOJGaugn61cZu33k2GfIgp 6jQkNjZmIusyOsjsMNuMtCGlsVWZD7qaO1rCFMsnEKAKPWrBLnBoZhodY8WYAw== 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 4R1wQF1XXGzsRY; Thu, 13 Jul 2023 13:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DDRXRx013295; Thu, 13 Jul 2023 13:27:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DDRXmX013294; Thu, 13 Jul 2023 13:27:33 GMT (envelope-from git) Date: Thu, 13 Jul 2023 13:27:33 GMT Message-Id: <202307131327.36DDRXmX013294@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 7fa24cff0d8a - main - security/gnupg: Fix dirmngr crash caused by gettext 0.22 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fa24cff0d8a99e5d44839d4b358fafaf69cffbe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fa24cff0d8a99e5d44839d4b358fafaf69cffbe commit 7fa24cff0d8a99e5d44839d4b358fafaf69cffbe Author: Tijl Coosemans AuthorDate: 2023-07-13 11:38:14 +0000 Commit: Tijl Coosemans 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)