gpgme: updated to 1.10.0

Noteworthy changes in version 1.10.0:
 * Now returns more specific error codes for decryption to distinguish
   between bad passphrase, user canceled, and no secret key.
 * Now returns key origin information if available.
 * Added context flag "auto-key-retrieve" to selectively enable the
   corresponding gpg option.
 * Added flag is_de_vs to decryption and verify results.
 * py: Use SEEK_SET as default for data.seek.
 * cpp: Various new APIs.
 * Reduced spawn overhead on Linux again.  Added new configure option
   --disable-linux-getdents to disable this feature for very old
   Linux versions.
 * Improved the Python bindings build system.
 * Made the test suite less fragile.

4 files changed, 12 insertions, 14 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 39028160677..2b2f1f5d798 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.86 2017/08/29 12:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2017/12/21 09:47:31 adam Exp $
 
-DISTNAME=	gpgme-1.9.0
+DISTNAME=	gpgme-1.10.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,8 +11,8 @@ COMMENT=	GnuPG Made Easy
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES+=		c c++
-
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 INFO_FILES=		yes
@@ -26,8 +26,6 @@ SUBST_STAGE.pthread=	post-patch
 CPPFLAGS.Darwin=	-D_POSIX_C_SOURCE=200809L
 LIBS.SunOS+=		-lnsl -lsocket
 
-# 18 errors as of 1.9.0
-# https://dev.gnupg.org/T3056
 TEST_TARGET=		check
 #TEST_ENV+=		GPGME_DEBUG=9
 
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index 218dac87672..a29392d15fa 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2017/08/29 12:11:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2017/12/21 09:47:31 adam Exp $
 
 BUILDLINK_TREE+=	gpgme
 
@@ -16,7 +16,7 @@ pkgbase:=		gpgme
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg2)
-DEPENDS+=		gnupg2-[0-9]*:../../security/gnupg2
+DEPENDS+=		gnupg>=2.2.0:../../security/gnupg2
 GPGME_GPG=		${PREFIX}/bin/gpg2
 .else
 DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index b029ced7976..7581fd47374 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.38 2017/08/29 11:26:19 wiz Exp $
+$NetBSD: distinfo,v 1.39 2017/12/21 09:47:31 adam Exp $
 
-SHA1 (gpgme-1.9.0.tar.bz2) = 870719cd3d2ef6a7fcb1d6af9ce5446edba7bfc3
-RMD160 (gpgme-1.9.0.tar.bz2) = 55719b4a7263ae8d0ef79205e26409ff5693ea27
-SHA512 (gpgme-1.9.0.tar.bz2) = 2a33343e907d9d70cc57dc1ef4e1c01995e1030bb0db937f44435643d6abfbb1bd55d52ba241701fa702783ebf035c09941131604fd8a811474b8bee41afccc8
-Size (gpgme-1.9.0.tar.bz2) = 1344222 bytes
+SHA1 (gpgme-1.10.0.tar.bz2) = 77d3390887da25ed70b7ac04392360efbdca501f
+RMD160 (gpgme-1.10.0.tar.bz2) = 9e6d0cef086b47f697a17384082f0c9f2f95c412
+SHA512 (gpgme-1.10.0.tar.bz2) = 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
+Size (gpgme-1.10.0.tar.bz2) = 1370162 bytes
 SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072
 SHA1 (patch-af) = 972982cd34315b2163d14919982f5d5b8fff1000
diff --git a/security/gpgme/options.mk b/security/gpgme/options.mk
index eb8295a21c4..64513973583 100644
--- a/security/gpgme/options.mk
+++ b/security/gpgme/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2017/08/29 12:20:25 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2017/12/21 09:47:31 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gpgme
 PKG_OPTIONS_REQUIRED_GROUPS=	gnupg
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=		gnupg2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=		gnupg2-[0-9]*:../../security/gnupg2
+DEPENDS+=		gnupg>=2.2.0:../../security/gnupg2
 REPLACE_SH+=		tests/gpg/pinentry
 GPG_DEFAULT=		${LOCALBASE}/bin/gpg2
 MAKE_FLAGS+=		GPG=${GPG_DEFAULT}