From nobody Mon Jul 17 19:10:45 2023 X-Original-To: dev-commits-ports-main@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 4R4WrQ0NRyz4n3Mt; Mon, 17 Jul 2023 19:10:46 +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 4R4WrP6zmnz3rYb; Mon, 17 Jul 2023 19:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689621046; 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=vGvaPB38Jru4nTDPXEK4nfFq4k58N0j4q9kwXugcbqI=; b=EfINYn1UG6iT9OY0ehwVVedzAciBrgj2iSPfQhPeVoCO13amSttN4oInHpGObzi0mW/4uL 8wvHvC4I8WcSvSR9EhMnVgogrVQ8xcdVsH5n6bjpuabJTZE0YyHYjK8ip7Dh0aZnFqge8L zUNgJuVPoSWQy+EZ6ft6nVOCyjAO1VE7CttdqctxE5uuFwWOxm2CDOxWEqOIa+Sg0x/el/ +I1uFTgX0YwSCMBPF/DmuZ66HiVfsGs7N7gHZIN2KCazFjy+DRLumphJOyb3nA48wZ0UBL h3IHaWgRtFeB2DN7z0dVyewBByrdI2hbl3CHouRykarm65AgQ0fhTJgw1CC2eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689621046; 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=vGvaPB38Jru4nTDPXEK4nfFq4k58N0j4q9kwXugcbqI=; b=t5+AOnNqd1slxjrPzbeXeUXCYGuWOdZEf6S31zmnR/pSJvoGvtSPGjaj8gAK8zjBtoJxht hK0hFN7aXXPZrh2M8TvqgE+1DzWq8gv9OfM+QlLxy5gLOFf3ovzixSbjnvK+r9voL5liax Fa0Y0IjePtZLEAAhax4/n53DQVW9fzXbtJpJVV6F7d3WlFO+QwD0Ifjgnmz/ZfCq+hkP+4 3+zmIVxt46D3y6VtZWEo+7zrFfwtpkGuIyrfNLPivS1iZxhcjsjQSFeAndjbMloFlpnt2i g+zTi3CPt8RaUte1peoHpHR8Lfn9Ph/lBilbpH5spfjeQHa5VFpOy1kSlIf79A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689621046; a=rsa-sha256; cv=none; b=SxBdXHKjNZXFd2xy+oXvZkI0kBgQwjqRk+jJPDsuv/yYRNI9tlISFvftCM+YC6Vw4XD+N0 ZL4GDSXWNtI7LNGJCCkaod77n7V//V79tgqhP+1KDdOi9GzlkSBgHgUJSisJJD8sBQKsjK DS4M7nQiasb8C92Q4TwNjX98Z45t/F+NWpWxrEHWdLJrkyg0VJSh1ggkaWu5b9pt+N7629 D/Wuey5mziWtlEPHytCOW7tBGjmokKVCbXUF6GLHWK4AEMrgejxawRt3h5gBdJ68oKWDtj C0WhFbtGBemTNlyx8ablzrCuWImxJHDg2wVDnyIkvSs+j42vXHtssGXInXIKtQ== 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 4R4WrP655yzbJk; Mon, 17 Jul 2023 19:10:45 +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 36HJAjre023103; Mon, 17 Jul 2023 19:10:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HJAjnx023102; Mon, 17 Jul 2023 19:10:45 GMT (envelope-from git) Date: Mon, 17 Jul 2023 19:10:45 GMT Message-Id: <202307171910.36HJAjnx023102@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: d0cbe7ba85c0 - main - Revert "security/gnupg: Fix dirmngr crash caused by gettext 0.22" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: d0cbe7ba85c00f24f4b85a2c6221533e6a4db44d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0cbe7ba85c00f24f4b85a2c6221533e6a4db44d commit d0cbe7ba85c00f24f4b85a2c6221533e6a4db44d Author: Tijl Coosemans AuthorDate: 2023-07-17 18:59:17 +0000 Commit: Tijl Coosemans CommitDate: 2023-07-17 19:08:47 +0000 Revert "security/gnupg: Fix dirmngr crash caused by gettext 0.22" This reverts commit 7fa24cff0d8a99e5d44839d4b358fafaf69cffbe. The problem has been fixed in libintl in fb889ca82944. PR: 272472 --- security/gnupg/Makefile | 2 +- security/gnupg/files/patch-dirmngr_Makefile.in | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index ca13f0c944f9..02637667f41b 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnupg DISTVERSION= 2.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG diff --git a/security/gnupg/files/patch-dirmngr_Makefile.in b/security/gnupg/files/patch-dirmngr_Makefile.in deleted file mode 100644 index 96607396e75d..000000000000 --- a/security/gnupg/files/patch-dirmngr_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- 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)