aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2021-04-20 14:15:34 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2021-04-20 14:15:41 +0000
commitc260503847e4bc82132a2632f9cf2d23547d8124 (patch)
treee9ef6ecba7361e10cfafd70ceaa847d474d09bae
parent143627392d41563295e20a41a23473f671b6135b (diff)
downloadports-c260503847e4bc82132a2632f9cf2d23547d8124.tar.gz
ports-c260503847e4bc82132a2632f9cf2d23547d8124.zip
security/gnupg: Update to 2.3.1
-rw-r--r--security/gnupg/Makefile10
-rw-r--r--security/gnupg/distinfo6
-rw-r--r--security/gnupg/files/pkg-message.in6
-rw-r--r--security/gnupg/pkg-plist3
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 <bsd.port.options.mk>
+
+.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: <<EOM
-GnuPG, when run on hosts without IPv6 connectivity, may fail to connect to
-dual-stack hkp servers [1]. As a workaround, add
+When run on hosts without IPv6 connectivity, GnuPG may fail to connect to
+dual-stack hkp servers [1]. As a workaround, add:
disable-ipv6
-to
+to:
%%PREFIX%%/etc/dirmngr.conf
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index 77c212e987bd..0b9ff4870b66 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -16,7 +16,7 @@ bin/gpgtar
bin/gpgv2
bin/kbxutil
bin/watchgnupg
-%%LDAP%%libexec/dirmngr_ldap
+%%DIRMNGRLDAP%%libexec/dirmngr_ldap
libexec/gpg-check-pattern
libexec/gpg-pair-tool
libexec/gpg-preset-passphrase
@@ -57,6 +57,7 @@ sbin/applygnupgdefaults
%%PORTDOCS%%%%DOCSDIR%%/examples/Automatic.prf
%%PORTDOCS%%%%DOCSDIR%%/examples/README
%%PORTDOCS%%%%DOCSDIR%%/examples/VS-NfD.prf
+%%PORTDOCS%%%%DOCSDIR%%/examples/common.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf
%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list