Update security/gpgme and friends to 1.9.0 [1]

Fix LICENSE
Add regression test support for master port. Slave port tests are not working
properly and need further investigation.

PR:		218316 (based on) [1]
Submitted by:	gahr [1]
Changes:	https://lists.gnupg.org/pipermail/gnupg-users/2017-March/057963.html

6 files changed, 81 insertions, 67 deletions

diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
deleted file mode 100644
index 586a9df61194..000000000000
--- a/security/gpgme/files/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix configure for users that have 'WITHOUT_GNU_GREP_COMPAT=yes' set
-m4/qt.m4 fixed upstream in git 211844f.
-
---- configure.orig	2016-12-20 07:27:31 UTC
-+++ configure
-@@ -18746,7 +18746,7 @@ fi
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
- $as_echo_n "checking moc version... " >&6; }
-     mocversion=`$MOC -v 2>&1`
--    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
-+    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
-     if test x"$mocversiongrep" != x"$mocversion"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -18844,7 +18844,7 @@ else
- fi
- 
-       mocversion=`$MOC2 -v 2>&1`
--      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
-+      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
-       if test x"$mocversiongrep" != x"$mocversion"; then
-         if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
-@@ -18940,7 +18940,7 @@ fi
- 
-         qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
-         mocversion=`$qt5tooldir/moc -v 2>&1`
--        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
-+        mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
-         if test x"$mocversiongrep" != x"$mocversion"; then
-           # no valid moc found
-           have_qt5_libs="no";
diff --git a/security/gpgme/files/patch-git_5056598 b/security/gpgme/files/patch-git_5056598
new file mode 100644
index 000000000000..fde60e1555ad
--- /dev/null
+++ b/security/gpgme/files/patch-git_5056598
@@ -0,0 +1,30 @@
+From: Pietro Cerutti <gahr@gahr.ch>
+Date: Mon, 3 Apr 2017 08:31:40 +0000 (+0000)
+Subject: FreeBSD's closefrom(2) does not return errors
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=50565982cdd502c3852fcc6f598932bd32b5cdc3
+
+FreeBSD's closefrom(2) does not return errors
+---
+
+diff --git a/src/posix-io.c b/src/posix-io.c
+index a351806..14856df 100644
+--- src/posix-io.c
++++ src/posix-io.c
+@@ -473,7 +473,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+            * have closefrom(2) we first figure out the highest fd we
+            * do not want to close, then call closefrom, and on success
+            * use the regular code to close all fds up to the start
+-           * point of closefrom.  Note that Solaris' closefrom does
++           * point of closefrom.  Note that Solaris' and FreeBSD's closefrom do
+            * not return errors.  */
+ #ifdef HAVE_CLOSEFROM
+           {
+@@ -482,7 +482,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+               if (fd_list[i].fd > fd)
+                 fd = fd_list[i].fd;
+             fd++;
+-#ifdef __sun
++#if defined(__sun) || defined(__FreeBSD__)
+             closefrom (fd);
+             max_fds = fd;
+ #else /*!__sun */
diff --git a/security/gpgme/files/patch-git_572c1aa b/security/gpgme/files/patch-git_572c1aa
deleted file mode 100644
index 0b087e7110ce..000000000000
--- a/security/gpgme/files/patch-git_572c1aa
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Wed, 16 Nov 2016 22:09:45 +0000 (+0100)
-Subject: Remove a forgotten instance of @libsuffix@
-X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=572c1aac107125ce62230251713349348373db5a;hp=af79327021b5b3a5c4accd5d4e9f0124199bfdcc
-
-Remove a forgotten instance of @libsuffix@
-
-* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
-instance of @libsuffix@.
---
-
-b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
-cmake config files, but missed one instance.
-
-Signed-off-by: Heiko Becker <heirecka@exherbo.org>
---- lang/cpp/src/GpgmeppConfig.cmake.in.in.orig	2016-11-16 09:17:20 UTC
-+++ lang/cpp/src/GpgmeppConfig.cmake.in.in
-@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
- 
- set_target_properties(Gpgmepp PROPERTIES
-   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
--  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
-+  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
-   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
- )
- 
diff --git a/security/gpgme/files/patch-git_5d4f977 b/security/gpgme/files/patch-git_5d4f977
new file mode 100644
index 000000000000..e87d7950b030
--- /dev/null
+++ b/security/gpgme/files/patch-git_5d4f977
@@ -0,0 +1,28 @@
+From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
+Date: Wed, 29 Mar 2017 05:20:51 +0000 (+0200)
+Subject: qt: pass fmt to gpgrt_asprintf()
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6
+
+qt: pass fmt to gpgrt_asprintf()
+
+* lang/qt/src/dn.cpp (parse_dn_part): Add fmt argument instead of
+using name directly.
+
+GnuPG-Bug-Id: 3023
+Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
+Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
+---
+
+diff --git a/lang/qt/src/dn.cpp b/lang/qt/src/dn.cpp
+index f9fb2f6..4310ad6 100644
+--- lang/qt/src/dn.cpp
++++ lang/qt/src/dn.cpp
+@@ -167,7 +167,7 @@ parse_dn_part(DnPair *array, const unsigned char *string)
+     for (unsigned int i = 0; i < numOidMaps; ++i)
+         if (!strcasecmp((char *)p, oidmap[i].oid)) {
+             free(p);
+-            gpgrt_asprintf(&p, oidmap[i].name);
++            gpgrt_asprintf(&p, "%s", oidmap[i].name);
+             break;
+         }
+     array->key = p;
diff --git a/security/gpgme/files/patch-lang_python_Makefile.in b/security/gpgme/files/patch-lang_python_Makefile.in
index 1f67296e4a70..878f7896da2f 100644
--- a/security/gpgme/files/patch-lang_python_Makefile.in
+++ b/security/gpgme/files/patch-lang_python_Makefile.in
@@ -1,21 +1,21 @@
---- lang/python/Makefile.in.orig	2016-11-16 12:46:35 UTC
+--- lang/python/Makefile.in.orig	2017-03-28 14:25:45 UTC
 +++ lang/python/Makefile.in
-@@ -756,7 +756,7 @@ config.h:
- all-local: copystamp
- 	for PYTHON in $(PYTHONS); do \
+@@ -755,7 +755,7 @@ all-local: copystamp
+ 	  PYTHON="$$1" ; shift ; \
+ 	  cd python$${VERSION}-gpg && \
  	  CFLAGS="$(CFLAGS)" \
 -	    $$PYTHON setup.py build --verbose ; \
 +	    $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG) ; \
+ 	  cd .. ; \
  	done
  
- dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc: copystamp
-@@ -792,7 +792,8 @@ install-exec-local:
- 	rm -f install_files.txt
- 	for PYTHON in $(PYTHONS); do \
+@@ -795,7 +795,8 @@ install-exec-local:
+ 	  PYTHON="$$1" ; shift ; \
+ 	  cd python$${VERSION}-gpg ; \
  	  $$PYTHON setup.py install \
 -	  --prefix $(DESTDIR)$(prefix) \
 +	  -c -O1 --prefix=$(prefix) \
 +	  --root=$(DESTDIR) \
  	  --record files.txt \
  	  --verbose ; \
- 	  cat files.txt >> install_files.txt ; \
+ 	  cat files.txt >> ../install_files.txt ; \
diff --git a/security/gpgme/files/patch-tests_gpg_Makefile.in b/security/gpgme/files/patch-tests_gpg_Makefile.in
new file mode 100644
index 000000000000..3056ed6ba0ca
--- /dev/null
+++ b/security/gpgme/files/patch-tests_gpg_Makefile.in
@@ -0,0 +1,14 @@
+gpg 2.1.x needs pinentry loopback mode enabled for the passphase callback
+supplied by the tests to work
+
+--- tests/gpg/Makefile.in.orig	2017-04-05 12:22:44 UTC
++++ tests/gpg/Makefile.in
+@@ -1115,6 +1115,8 @@ export GPG_AGENT_INFO :=
+ ./gpg.conf:
+ # This is required for t-sig-notations.
+ 	echo no-force-v3-sigs > ./gpg.conf
++	echo "ignore-invalid-option pinentry-mode" >> ./gpg.conf
++	echo "pinentry-mode loopback" >> ./gpg.conf
+ 
+ ./gpg-agent.conf:
+ # This is required for gpg2, which does not support command fd.