From nobody Thu Nov 28 10:56:51 2024 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 4XzYCl62Qwz5fYVW; Thu, 28 Nov 2024 10:56:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XzYCl5NTbz4TMt; Thu, 28 Nov 2024 10:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732791411; 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=g7oRpxRp5g6FeUmG1JvHwUjbdsnr+PMEk2Z+E0RAKAY=; b=TZt8nHjbgTq1CiSHQHzVuDaNs2+N1aTeoybZcmQVoAl0Nqbb1UFzaC6vkaP0FHQ1UTsD4S 3HjH6U3POx56ewW71rNRxXeG+4QjJ+l91EBwBfUCOPZyfD1QUF7lU/VezLNBwnQ/6gNtap 84fSTejI/iS5ylP50AhmPs16bLQqjSN9da+C26vHClBOzHguJcOuq8fGZqaztpN1DacOdd e5lLzIFD/MGRWLz6wZQe6mDrR8LIRia18UtKVUbcwfRvWeUMiry7X2i5npEXHGxP9JluTO 7Ikn+iBz7GEG4oOhr7y8Tb68yEH906x1hIFup/TdjTCLhMFq79boYkLv30/dow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732791411; 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=g7oRpxRp5g6FeUmG1JvHwUjbdsnr+PMEk2Z+E0RAKAY=; b=OlKjUc2xbCiwzYqKsipv3ZU2a5c2zSMSxEpoDnz1wY5wagWnM+DdDQx4FrhB3HUFLbG2rr kohypUsOpRWX5iS816x1xSFGDHMLUQMGXQREZEkqhlAAhzbFRIzmz6vKoaxY1MXGV3JujW mpMfHgHmCi8EmsKUyvF7YI9ax5ZPmAawWgnG9/2mAExlCdeWcdi43vkZozyTamRdX2cYHS KgxBTyJeoN80Ml3P1Z7URQODdBBEXcxoloYqlHVnWQp+MUCioLATBv3J/V5My9Y1VW5QSo uIvBkp6jwLd523UoEmQrd3AG50wyuobzNlWCGbdb1uLhmY5bXtDGuWPcmLaNCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732791411; a=rsa-sha256; cv=none; b=sIT4uiuCAqL13uDpcBauPCF4nXXwnwvEBasp6VGE7mQg3BA8NqBTJf1KdUfcxIB+3aBXlF DMLiW4sJkOBdMcLnt1Sdi2R9Xi5KF53eny12MaKkWE76+M0X//JmKDCv0US5rl2u2Ng7mK kNm8EggPjKbWc2Iqz1pJjHMcTsPkCCHgJ+IxzGTd/5xOaApoRy+3I2gy7l1hFZFEwllaM5 wRosUAV5xkOcWcXpnc8i/ZRNXPEXbADbn/a9anRIr/3l3Hdv6UHchS708E+f6vEkqthiyT K0xS2VlxiiGPQpYhzjzCtkcq1cKEski1Jr3usVJf+CKLiOEa/rwmslEgBQ6BMw== 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 4XzYCl507GzcK3; Thu, 28 Nov 2024 10:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ASAupXw024371; Thu, 28 Nov 2024 10:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ASAupI5024368; Thu, 28 Nov 2024 10:56:51 GMT (envelope-from git) Date: Thu, 28 Nov 2024 10:56:51 GMT Message-Id: <202411281056.4ASAupI5024368@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 568882d1b82e - main - security/gnupg: Stop running autoreconf and directly patch doc/Makefile.in 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 568882d1b82ef4bf8cbd18175f3c2ef41ce93399 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=568882d1b82ef4bf8cbd18175f3c2ef41ce93399 commit 568882d1b82ef4bf8cbd18175f3c2ef41ce93399 Author: Yasuhiro Kimura AuthorDate: 2024-11-28 09:37:13 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-11-28 10:54:57 +0000 security/gnupg: Stop running autoreconf and directly patch doc/Makefile.in It turned out running autoreconf causes unexpected side effect that gpg displays message as following. gpg: NOTE: THIS IS A DEVELOPMENT VERSION! gpg: It is only intended for test purposes and should NOT be gpg: used in a production environment or with production keys! So stop running autoreconf to regenerate doc/Makefile.in from patched doc/Makefile.am, and directly patch doc/Makefile.in instead. This partially reverts commit dd1496c651a27f6327bf030f8671e7291012cc69. Reported by: gahr Approved by: portmgr (implicit, just fix it) Fixes: dd1496c651a2 security/gnupg: Update to 2.4.6 --- security/gnupg/Makefile | 6 +++-- .../{patch-m4_gpg-error.m4 => patch-configure} | 8 +++--- ...patch-doc_Makefile.am => patch-doc_Makefile.in} | 29 ++++++++-------------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index a285ea20c890..fbc1c3565982 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,5 +1,6 @@ PORTNAME= gnupg DISTVERSION= 2.4.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= GNUPG @@ -19,8 +20,8 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libnpth.so:devel/npth RUN_DEPENDS= pinentry:security/pinentry -USES= autoreconf compiler:c11 cpe gettext-tools gmake iconv makeinfo pkgconfig \ - readline sqlite tar:bzip2 +USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite \ + tar:bzip2 CPE_VENDOR= gnupg @@ -76,6 +77,7 @@ pre-build: ${TOUCH} ${WRKSRC}/doc/*.texi post-install: + ${RMDIR} ${STAGEDIR}${PREFIX}/share/man/manh ${MV} ${STAGEDIR}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2 ${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} diff --git a/security/gnupg/files/patch-m4_gpg-error.m4 b/security/gnupg/files/patch-configure similarity index 73% rename from security/gnupg/files/patch-m4_gpg-error.m4 rename to security/gnupg/files/patch-configure index 251a053014e3..20e250e38430 100644 --- a/security/gnupg/files/patch-m4_gpg-error.m4 +++ b/security/gnupg/files/patch-configure @@ -1,6 +1,8 @@ ---- m4/gpg-error.m4.orig 2024-05-15 10:33:38 UTC -+++ m4/gpg-error.m4 -@@ -67,7 +67,7 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl +Fix path of pkgconfig files passed to gpgrt-config. + +--- configure.orig 2024-01-25 10:09:44 UTC ++++ configure +@@ -8428,7 +8428,7 @@ fi # Get the prefix of gpgrt-config assuming it's something like: # /bin/gpgrt-config gpgrt_prefix=${GPGRT_CONFIG%/*/*} diff --git a/security/gnupg/files/patch-doc_Makefile.am b/security/gnupg/files/patch-doc_Makefile.in similarity index 59% rename from security/gnupg/files/patch-doc_Makefile.am rename to security/gnupg/files/patch-doc_Makefile.in index c0fda8df0e82..9149a0b4ab89 100644 --- a/security/gnupg/files/patch-doc_Makefile.am +++ b/security/gnupg/files/patch-doc_Makefile.in @@ -1,35 +1,28 @@ ---- doc/Makefile.am.orig 2024-09-20 10:07:25 UTC -+++ doc/Makefile.am -@@ -79,13 +79,13 @@ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-ag - myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \ +--- doc/Makefile.in.orig 2024-10-29 12:52:23 UTC ++++ doc/Makefile.in +@@ -521,14 +521,14 @@ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-ag dirmngr.texi scdaemon.texi tools.texi wks.texi \ gpg-card.texi --myman_pages = gpg.1 gpgv.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ -+myman_pages = gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ + +-myman_pages = gpg.1 gpgv.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ ++myman_pages = gpg2.1 gpgv2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ gpg-connect-agent.1 gpgparsemail.1 gpgtar.1 gpg-mail-tube.1 \ applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \ dirmngr-client.1 gpg-card.1 gpg-check-pattern.1 + myhtmlman_pages = \ - gpg.1.html gpgv.1.html gpgsm.1.html \ -+ gpgsm.1.html \ ++ gpg2.1.html gpgv2.1.html gpgsm.1.html \ gpg-agent.1.html dirmngr.8.html scdaemon.1.html \ watchgnupg.1.html gpgconf.1.html addgnupghome.8.html \ gpg-preset-passphrase.1.html \ -@@ -95,7 +95,15 @@ myhtmlman_pages = \ +@@ -538,7 +538,7 @@ myhtmlman_pages = \ gpg-wks-server.1.html \ dirmngr-client.1.html gpg-card.1.html gpg-check-pattern.1.html -man_MANS = $(myman_pages) gnupg.7 gnupg.7.html -+if USE_GPG2_HACK -+myman_pages += gpg2.1 gpgv2.1 -+myhtmlman_pages += gpg2.1.html gpgv2.1.html -+else -+myman_pages += gpg.1 gpgv.1 -+myhtmlman_pages += gpg.1.html gpgv.1.html -+endif -+ +man_MANS = $(myman_pages) gnupg.7 - watchgnupg_SOURCE = gnupg.texi - + CLEANFILES = yat2m mkdefsinc defs.inc + DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \