gpgme: updated to 1.11.1

version 1.11.1:
* Fixed build problems in the 1.11.0 release.
* Added C++ interfaces which were planned for 1.11.0.

version 1.11.0:
* New encryption API to support direct key specification including
  hidden recipients option and taking keys from a file.  This also
  allows to enforce the use of a subkey.
* New encryption flag for the new API to enforce the use of plain
  mail addresses (addr-spec).
* The import API can now tell whether v3 keys are skipped.  These old
  and basically broken keys are not anymore supported by GnuPG 2.1.
* The decrypt and verify API will now return the MIME flag as
  specified by RFC-4880bis.
* The offline mode now has an effect on gpg by disabling all network
  access.
* A failed OpenPGP verification how returns the fingerprint of the
  intended key if a recent gpg version was used for signature
  creation.
* New tool gpgme-json as native messaging server for web browsers.
  As of now public key encryption and decryption is supported.
  Requires Libgpg-error 1.29.
* New context flag "request-origin" which has an effect when used
  with GnuPG 2.2.6 or later.
* New context flag "no-symkey-cache" which has an effect when used
  with GnuPG 2.2.7 or later.
* New convenience constant GPGME_KEYLIST_MODE_LOCATE.
* Improved the Python documentation.
* Fixed a potential regression with GnuPG 2.2.6 or later.
* Fixed a crash in the Python bindings on 32 bit platforms.
* Various minor fixes.

5 files changed, 11 insertions, 47 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 2b2f1f5d798..ecf546436a9 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2017/12/21 09:47:31 adam Exp $
+# $NetBSD: Makefile,v 1.88 2018/07/04 12:46:29 adam Exp $
 
-DISTNAME=	gpgme-1.10.0
+DISTNAME=	gpgme-1.11.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 EXTRACT_SUFX=	.tar.bz2
@@ -27,7 +27,6 @@ CPPFLAGS.Darwin=	-D_POSIX_C_SOURCE=200809L
 LIBS.SunOS+=		-lnsl -lsocket
 
 TEST_TARGET=		check
-#TEST_ENV+=		GPGME_DEBUG=9
 
 .include "options.mk"
 
diff --git a/security/gpgme/PLIST b/security/gpgme/PLIST
index a2a61c53d21..67ffa1858c7 100644
--- a/security/gpgme/PLIST
+++ b/security/gpgme/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.20 2017/08/29 11:26:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2018/07/04 12:46:29 adam Exp $
 bin/gpgme-config
+bin/gpgme-json
 bin/gpgme-tool
 include/gpgme++/configuration.h
 include/gpgme++/context.h
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 7581fd47374..4be10d35644 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.39 2017/12/21 09:47:31 adam Exp $
+$NetBSD: distinfo,v 1.40 2018/07/04 12:46:29 adam Exp $
 
-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 (gpgme-1.11.1.tar.bz2) = 95b1fc427871ca8d30d6d3b1985c816fe0b5077b
+RMD160 (gpgme-1.11.1.tar.bz2) = c0981c52e7bb5a5877543fc90f694363c60f8e4f
+SHA512 (gpgme-1.11.1.tar.bz2) = 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
+Size (gpgme-1.11.1.tar.bz2) = 1419232 bytes
 SHA1 (patch-aa) = 6b81bc9b6b17f14329e0dbf1917d1352c142c072
-SHA1 (patch-af) = 972982cd34315b2163d14919982f5d5b8fff1000
diff --git a/security/gpgme/options.mk b/security/gpgme/options.mk
index 6d143377b4f..5ffca242021 100644
--- a/security/gpgme/options.mk
+++ b/security/gpgme/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2018/06/04 07:44:35 leot Exp $
+# $NetBSD: options.mk,v 1.12 2018/07/04 12:46:29 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gpgme
 PKG_OPTIONS_REQUIRED_GROUPS=	gnupg
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=		gnupg2
 .if !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=		gnupg2>=2.2.0:../../security/gnupg2
 REPLACE_SH+=		tests/gpg/pinentry
-GPG_DEFAULT=		${LOCALBASE}/bin/gpg2
+GPG_DEFAULT=		${PREFIX}/bin/gpg2
 MAKE_FLAGS+=		GPG=${GPG_DEFAULT}
 .else
 DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
diff --git a/security/gpgme/patches/patch-af b/security/gpgme/patches/patch-af
deleted file mode 100644
index 719ad585c5b..00000000000
--- a/security/gpgme/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.7 2017/08/29 11:26:20 wiz Exp $
-
-Add missing getenv_r() support.
-https://dev.gnupg.org/T3376
-
---- src/get-env.c.orig	2016-11-16 12:22:41.000000000 +0000
-+++ src/get-env.c
-@@ -53,7 +53,25 @@ _gpgme_getenv (const char *name, char **
- 
- #else
- 
--/* FIXME: Implement this when we have the specification for it.  */
--#error Use of getenv_r not implemented.
-+/* Retrieve the environment variable NAME and return a copy of it in a
-+   malloc()'ed buffer in *VALUE.  If the environment variable is not
-+   set, return NULL in *VALUE.  */
-+gpgme_error_t
-+_gpgme_getenv (const char *name, char **value)
-+{
-+  char env_value[256];
-+  if (getenv_r (name, env_value, 256) < 0)
-+      *value = NULL;
-+  else
-+    {
-+      *value = strdup (env_value);
-+      if (!*value)
-+        errno = ENOMEM;
-+    }
-+  if (!*value && errno != ENOENT)
-+      return gpg_error_from_syserror ();
-+  else
-+      return 0;
-+}
- 
- #endif