From nobody Fri Nov 22 05:16:40 2024 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 4Xvjy06V7pz5dNP7; Fri, 22 Nov 2024 05:16:40 +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 4Xvjy05zTBz41TQ; Fri, 22 Nov 2024 05:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732252600; 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=pDdsdLm/qC+OfehkHkbf9uJ7dYIfUmSzzGXLIoTa+3s=; b=Cksk2mwRyk64E9wfSX9LLHqd3+V+F94sbISNKkZKQ/mBS7F73zO+P26ezMn2dQketa2yJa V+w43q/FGs/aI+2/UQ9h3K0mfJs4WJYDUQP8NBBJhrDIR4JoLi1Qr5p8FUbOxM+MpfZ2f/ kLpJQHNWVwS4hCSyAI8Ld3117wsISz+xFddu211VgM9qYQPW8BJzth1jrFeFCM1gAuN4y8 IyGXdiBgM9WPA6UPEwqU70eGuaDBfYwzRMc5l8SlbhrXj2SK7xJzxoRIdWHxEWcUILTHZ0 WTScUL3zbmOTR+eV5XjQ7Mjaq81eCcpR40+C2+YRxISC+JsgDsGJHFLx53C5Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732252600; 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=pDdsdLm/qC+OfehkHkbf9uJ7dYIfUmSzzGXLIoTa+3s=; b=FZI9LINiCceQpnOqnJ93rYxhKYNt2IiyyQf4f8MD5L7R2UJdiOT36iD+Eut6gP16tk6Ezd HfFx3mv6D0Jo49V1FALF24/0YtUYIzpb+sruidEwVH5mtO6GjXCSqo18sPqZNzLnO2qpKl ZeOppJTMABy2ScJKmPlmspc8/1YnL/YnjlF95TKFXYy+U63vNkpHN2ICdN02YSp3A1Nh63 +J+Dplvv0RldWwzUKiJ3DCf4dG/lHBB5KY0NxYPEYcbzAIqRXIl6Tli+GfTHmbGuxiLwPj Dnpik6tge9265ekJkOO9qQ7+IouZ0wDdFna2unU5ggXIyw/qapgSUK78WI8oAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732252600; a=rsa-sha256; cv=none; b=Qrpz8uJM5GSwYGZDRJGyugcBdjEdL+TaLX4w9vNWv47WTOrRaTgAglcTxQjVJ90tX4F15P zi8/7oZHsuKZiVS3JcTn9xGBLpVf7M0Hn44mYDnGnOzy4NHnS5It8KmA6S+cnNpcNoVt30 c1pYzSdUkLLJH0jcdBG83OK8CCgPTsX3HtgZ2UEQpXhaZZU3O8U0TMu1i0fzESrT554KX6 8nwAKJpWck3U0nA9+BmiXXT4VmWyiGyPKxtBNDSKy5slEuQ/hbFFmim6t13uCFgnzVSfqu /HTGEIXOzoPgo69jVW+gmvffQQv/HYHSrLATAR9NG+DURVoDLsyEklLvx4dT+A== 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 4Xvjy05ZTlz19mb; Fri, 22 Nov 2024 05:16:40 +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 4AM5GeMe073787; Fri, 22 Nov 2024 05:16:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AM5GeTM073784; Fri, 22 Nov 2024 05:16:40 GMT (envelope-from git) Date: Fri, 22 Nov 2024 05:16:40 GMT Message-Id: <202411220516.4AM5GeTM073784@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: dd1496c651a2 - main - security/gnupg: Update to 2.4.6 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: dd1496c651a27f6327bf030f8671e7291012cc69 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd1496c651a27f6327bf030f8671e7291012cc69 commit dd1496c651a27f6327bf030f8671e7291012cc69 Author: Yasuhiro Kimura AuthorDate: 2024-11-06 22:47:16 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-11-22 05:14:39 +0000 security/gnupg: Update to 2.4.6 * There is a bug in 2.4.6 that is related to --enable-gpg-is-gpg2 option of configure script and result in error about file name of man pages. To fix it we need to patch doc/Makefile.am and regenerate doc/Makefile.in. So, 1. Add autoreconf to USES. 2. Replace patch to configure with that to m4/gpg-error.m4. 3. Add gettext-tools to USES. Running autoreconf requires autopoint command included in gettext-tools and it is necessary even if NLS option is off. * Pet portclippy * Tidy up Makefile with portfmt. ReleaseNotes: https://lists.gnupg.org/pipermail/gnupg-announce/2024q4/000486.html PR: 282594 Approved by: maintainer timeout --- security/gnupg/Makefile | 44 ++++++++++++---------- security/gnupg/distinfo | 6 +-- security/gnupg/files/patch-doc_Makefile.am | 35 +++++++++++++++++ .../{patch-configure => patch-m4_gpg-error.m4} | 8 ++-- security/gnupg/pkg-plist | 3 ++ 5 files changed, 68 insertions(+), 28 deletions(-) diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index aa68de7b6679..a285ea20c890 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,6 +1,5 @@ PORTNAME= gnupg -DISTVERSION= 2.4.5 -PORTREVISION= 1 +DISTVERSION= 2.4.6 CATEGORIES= security MASTER_SITES= GNUPG @@ -20,39 +19,44 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libnpth.so:devel/npth RUN_DEPENDS= pinentry:security/pinentry -USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 +USES= autoreconf compiler:c11 cpe gettext-tools gmake iconv makeinfo pkgconfig \ + readline sqlite tar:bzip2 -CONFLICTS= dirmngr CPE_VENDOR= gnupg -CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -INFO= gnupg -TEST_TARGET= check +CONFIGURE_ARGS= --disable-ntbtls \ + --enable-gpg-is-gpg2 + TEST_ARGS= TESTARGS=--parallel +TEST_TARGET= check -OPTIONS_DEFINE= DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG WKS_SERVER -OPTIONS_DEFAULT=GNUTLS SCDAEMON WKS_SERVER -OPTIONS_SUB= yes +CONFLICTS= dirmngr -LARGE_RSA_DESC= Enable support for 8192-bit RSA keys -LDAP_DESC= LDAP keyserver interface -SCDAEMON_DESC= Enable Smartcard daemon (with libusb) -SUID_GPG_DESC= Install GPG as SUID root -WKS_SERVER_DESC=Install the Web Key Service server +INFO= gnupg -GNUTLS_CONFIGURE_ENABLE=gnutls -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +OPTIONS_DEFINE= DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG \ + WKS_SERVER +OPTIONS_DEFAULT= GNUTLS SCDAEMON WKS_SERVER +OPTIONS_SUB= yes + +LARGE_RSA_DESC= Enable support for 8192-bit RSA keys +LDAP_DESC= LDAP keyserver interface +SCDAEMON_DESC= Enable Smartcard daemon (with libusb) +SUID_GPG_DESC= Install GPG as SUID root +WKS_SERVER_DESC= Install the Web Key Service server + +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CONFIGURE_ENABLE= gnutls LARGE_RSA_CONFIGURE_ENABLE= large-secmem +LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib -LDAP_USES= ldap -NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls SCDAEMON_CONFIGURE_ENABLE= scdaemon diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index ae792916b941..9b5e93da460e 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714203516 -SHA256 (gnupg-2.4.5.tar.bz2) = f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277 -SIZE (gnupg-2.4.5.tar.bz2) = 7889060 +TIMESTAMP = 1730927376 +SHA256 (gnupg-2.4.6.tar.bz2) = 95acfafda7004924a6f5c901677f15ac1bda2754511d973bb4523e8dd840e17a +SIZE (gnupg-2.4.6.tar.bz2) = 8011304 diff --git a/security/gnupg/files/patch-doc_Makefile.am b/security/gnupg/files/patch-doc_Makefile.am new file mode 100644 index 000000000000..c0fda8df0e82 --- /dev/null +++ b/security/gnupg/files/patch-doc_Makefile.am @@ -0,0 +1,35 @@ +--- 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 \ + 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 \ + 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 \ + 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 = \ + 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 + diff --git a/security/gnupg/files/patch-configure b/security/gnupg/files/patch-m4_gpg-error.m4 similarity index 73% rename from security/gnupg/files/patch-configure rename to security/gnupg/files/patch-m4_gpg-error.m4 index 20e250e38430..251a053014e3 100644 --- a/security/gnupg/files/patch-configure +++ b/security/gnupg/files/patch-m4_gpg-error.m4 @@ -1,8 +1,6 @@ -Fix path of pkgconfig files passed to gpgrt-config. - ---- configure.orig 2024-01-25 10:09:44 UTC -+++ configure -@@ -8428,7 +8428,7 @@ fi +--- 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 # Get the prefix of gpgrt-config assuming it's something like: # /bin/gpgrt-config gpgrt_prefix=${GPGRT_CONFIG%/*/*} diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index 5caf61bf2ec0..5560942bc330 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -3,6 +3,7 @@ bin/gpg-agent bin/gpg-card bin/gpg-connect-agent +bin/gpg-mail-tube bin/gpg-wks-client %%WKS_SERVER%%bin/gpg-wks-server %%SUID_GPG%%@(,,4555) bin/gpg2 @@ -30,6 +31,7 @@ share/man/man1/gpg-agent.1.gz share/man/man1/gpg-card.1.gz share/man/man1/gpg-check-pattern.1.gz share/man/man1/gpg-connect-agent.1.gz +share/man/man1/gpg-mail-tube.1.gz share/man/man1/gpg-preset-passphrase.1.gz share/man/man1/gpg-wks-client.1.gz %%WKS_SERVER%%share/man/man1/gpg-wks-server.1.gz @@ -111,6 +113,7 @@ sbin/applygnupgdefaults %%NLS%%share/locale/it/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ja/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/nb/LC_MESSAGES/gnupg2.mo +%%NLS%%share/locale/nl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pl/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/pt/LC_MESSAGES/gnupg2.mo %%NLS%%share/locale/ro/LC_MESSAGES/gnupg2.mo