From owner-dev-commits-ports-all@freebsd.org Tue Apr 20 14:15:45 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D6CD5F7F30; Tue, 20 Apr 2021 14:15:45 +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 4FPm1Y1gtDz4mj5; Tue, 20 Apr 2021 14:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2281A141FC; Tue, 20 Apr 2021 14:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KEFja4012256; Tue, 20 Apr 2021 14:15:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KEFju8012255; Tue, 20 Apr 2021 14:15:45 GMT (envelope-from git) Date: Tue, 20 Apr 2021 14:15:45 GMT Message-Id: <202104201415.13KEFju8012255@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: c260503847e4 - main - security/gnupg: Update to 2.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c260503847e4bc82132a2632f9cf2d23547d8124 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 14:15:45 -0000 The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=c260503847e4bc82132a2632f9cf2d23547d8124 commit c260503847e4bc82132a2632f9cf2d23547d8124 Author: Adam Weinberger AuthorDate: 2021-04-20 14:15:34 +0000 Commit: Adam Weinberger CommitDate: 2021-04-20 14:15:41 +0000 security/gnupg: Update to 2.3.1 --- security/gnupg/Makefile | 10 +++++++++- security/gnupg/distinfo | 6 +++--- security/gnupg/files/pkg-message.in | 6 +++--- security/gnupg/pkg-plist | 3 ++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 452308c269a0..3d35189e46ba 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnupg -PORTVERSION= 2.3.0 +PORTVERSION= 2.3.1 CATEGORIES= security MASTER_SITES= GNUPG @@ -57,6 +57,14 @@ SCDAEMON_CONFIGURE_ENABLE= scdaemon WKS_SERVER_CONFIGURE_ENABLE= wks-tools +.include + +.if ${PORT_OPTIONS:MGNUTLS} && ${PORT_OPTIONS:MLDAP} +PLIST_SUB+= DIRMNGRLDAP="" +.else +PLIST_SUB+= DIRMNGRLDAP="@comment " +.endif + # Touch the texinfo files to force makeinfo to run. This fixes Linuxisms in # the paths in the man pages. pre-build: diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 61cff8e4eaa3..9957f765fff3 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617905248 -SHA256 (gnupg-2.3.0.tar.bz2) = 84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4 -SIZE (gnupg-2.3.0.tar.bz2) = 7557228 +TIMESTAMP = 1618925954 +SHA256 (gnupg-2.3.1.tar.bz2) = c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec +SIZE (gnupg-2.3.1.tar.bz2) = 7570431 diff --git a/security/gnupg/files/pkg-message.in b/security/gnupg/files/pkg-message.in index 26f67eb103cc..41ae1967a461 100644 --- a/security/gnupg/files/pkg-message.in +++ b/security/gnupg/files/pkg-message.in @@ -1,12 +1,12 @@ [ { type: install message: <