Update to 2.2.18

Changelog:
Noteworthy changes in version 2.2.18 (2019-11-25)
-------------------------------------------------

  * gpg: Changed the way keys are detected on a smartcards; this
    allows the use of non-OpenPGP cards.  In the case of a not very
    likely regression the new option --use-only-openpgp-card is
    available.  [#4681]

  * gpg: The commands --full-gen-key and --quick-gen-key now allow
    direct key generation from supported cards.  [#4681]

  * gpg: Prepare against chosen-prefix SHA-1 collisions in key
    signatures.  This change removes all SHA-1 based key signature
    newer than 2019-01-19 from the web-of-trust.  Note that this
    includes all key signature created with dsa1024 keys.  The new
    option --allow-weak-key-signatues can be used to override the new
    and safer behaviour.  [#4755,CVE-2019-14855]

  * gpg: Improve performance for import of large keyblocks.  [#4592]

  * gpg: Implement a keybox compression run.  [#4644]

  * gpg: Show warnings from dirmngr about redirect and certificate
    problems (details require --verbose as usual).

  * gpg: Allow to pass the empty string for the passphrase if the
    '--passphase=' syntax is used.  [#4633]

  * gpg: Fix printing of the KDF object attributes.

  * gpg: Avoid surprises with --locate-external-key and certain
    --auto-key-locate settings.  [#4662]

  * gpg: Improve selection of best matching key.  [#4713]

  * gpg: Delete key binding signature when deletring a subkey.
    [#4665,#4457]

  * gpg: Fix a potential loss of key sigantures during import with
    self-sigs-only active.  [#4628]

  * gpg: Silence "marked as ultimately trusted" diagnostics if
    option --quiet is used.  [#4634]

  * gpg: Silence some diagnostics during in key listsing even with
    option --verbose.  [#4627]

  * gpg, gpgsm: Change parsing of agent's pkdecrypt results.  [#4652]

  * gpgsm: Support AES-256 keys.

  * gpgsm: Fix a bug in triggering a keybox compression run if
    --faked-system-time is used.

  * dirmngr: System CA certificates are no longer used for the SKS
    pool if GNUTLS instead of NTBTLS is used as TLS library.  [#4594]

  * dirmngr: On Windows detect usability of IPv4 and IPv6 interfaces
    to avoid long timeouts.  [#4165]

  * scd: Fix BWI value for APDU level transfers to make Gemalto Ezio
    Shield and Trustica Cryptoucan work.  [#4654,#4566]

  * wkd: gpg-wks-client --install-key now installs the required policy
    file.

2 files changed, 7 insertions, 8 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 05748374599..187e9e01603 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.105 2019/07/20 22:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2019/11/27 12:17:08 ryoon Exp $
 
-DISTNAME=	gnupg-2.2.17
+DISTNAME=	gnupg-2.2.18
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg2-/}
-PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
 MASTER_SITES+=	http://mirrors.dotsrc.org/gcrypt/gnupg/
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index ce8a4e5f114..f87d466b0a1 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.57 2019/07/10 09:28:24 adam Exp $
+$NetBSD: distinfo,v 1.58 2019/11/27 12:17:08 ryoon Exp $
 
-SHA1 (gnupg-2.2.17.tar.bz2) = 12c1cee8871c03f0315fc8f27876364b75c95b12
-RMD160 (gnupg-2.2.17.tar.bz2) = 13ad8e3e216d8c7ff6786329d8c15627ed2b9af2
-SHA512 (gnupg-2.2.17.tar.bz2) = a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
-Size (gnupg-2.2.17.tar.bz2) = 6717554 bytes
+SHA1 (gnupg-2.2.18.tar.bz2) = 2f95d6aa409f666c61c1526641fd609f1a50c4c4
+RMD160 (gnupg-2.2.18.tar.bz2) = ba64135749a50e65af2ce974083661c6e9f1b71a
+SHA512 (gnupg-2.2.18.tar.bz2) = f1b75e420569982ab3b192fc52f8272c924e07c08ea3d93725f2ba3a25a96d8fedf2f32fabd51cbb978e18fb143c961b02cfaefdb7df0e8097d30a5736f992d2
+Size (gnupg-2.2.18.tar.bz2) = 6740621 bytes