Merge branch '3.2' into 3.3

5 files changed, 117 insertions, 16 deletions

diff --git a/gpgme/.footprint b/gpgme/.footprint
index 0f9f8dc0e..87b35949d 100644
--- a/gpgme/.footprint
+++ b/gpgme/.footprint
@@ -2,17 +2,63 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gpgme-config
 -rwxr-xr-x	root/root	usr/bin/gpgme-tool
+drwxr-xr-x	root/root	usr/etc/
+drwxr-xr-x	root/root	usr/etc/gpgme/
+-rw-r--r--	root/root	usr/etc/gpgme/base
 drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/gpgme++/
+-rw-r--r--	root/root	usr/include/gpgme++/configuration.h
+-rw-r--r--	root/root	usr/include/gpgme++/context.h
+-rw-r--r--	root/root	usr/include/gpgme++/data.h
+-rw-r--r--	root/root	usr/include/gpgme++/decryptionresult.h
+-rw-r--r--	root/root	usr/include/gpgme++/defaultassuantransaction.h
+-rw-r--r--	root/root	usr/include/gpgme++/editinteractor.h
+-rw-r--r--	root/root	usr/include/gpgme++/encryptionresult.h
+-rw-r--r--	root/root	usr/include/gpgme++/engineinfo.h
+-rw-r--r--	root/root	usr/include/gpgme++/error.h
+-rw-r--r--	root/root	usr/include/gpgme++/eventloopinteractor.h
+-rw-r--r--	root/root	usr/include/gpgme++/exception.h
+-rw-r--r--	root/root	usr/include/gpgme++/global.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgadduserideditinteractor.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgagentgetinfoassuantransaction.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgmefw.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgmepp_export.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgmepp_version.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgsetexpirytimeeditinteractor.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgsetownertrusteditinteractor.h
+-rw-r--r--	root/root	usr/include/gpgme++/gpgsignkeyeditinteractor.h
+-rw-r--r--	root/root	usr/include/gpgme++/importresult.h
+drwxr-xr-x	root/root	usr/include/gpgme++/interfaces/
+-rw-r--r--	root/root	usr/include/gpgme++/interfaces/assuantransaction.h
+-rw-r--r--	root/root	usr/include/gpgme++/interfaces/dataprovider.h
+-rw-r--r--	root/root	usr/include/gpgme++/interfaces/passphraseprovider.h
+-rw-r--r--	root/root	usr/include/gpgme++/interfaces/progressprovider.h
+-rw-r--r--	root/root	usr/include/gpgme++/key.h
+-rw-r--r--	root/root	usr/include/gpgme++/keygenerationresult.h
+-rw-r--r--	root/root	usr/include/gpgme++/keylistresult.h
+-rw-r--r--	root/root	usr/include/gpgme++/notation.h
+-rw-r--r--	root/root	usr/include/gpgme++/result.h
+-rw-r--r--	root/root	usr/include/gpgme++/scdgetinfoassuantransaction.h
+-rw-r--r--	root/root	usr/include/gpgme++/signingresult.h
+-rw-r--r--	root/root	usr/include/gpgme++/swdbresult.h
+-rw-r--r--	root/root	usr/include/gpgme++/tofuinfo.h
+-rw-r--r--	root/root	usr/include/gpgme++/trustitem.h
+-rw-r--r--	root/root	usr/include/gpgme++/verificationresult.h
+-rw-r--r--	root/root	usr/include/gpgme++/vfsmountresult.h
 -rw-r--r--	root/root	usr/include/gpgme.h
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libgpgme-pthread.la
-lrwxrwxrwx	root/root	usr/lib/libgpgme-pthread.so -> libgpgme-pthread.so.11.14.0
-lrwxrwxrwx	root/root	usr/lib/libgpgme-pthread.so.11 -> libgpgme-pthread.so.11.14.0
--rwxr-xr-x	root/root	usr/lib/libgpgme-pthread.so.11.14.0
+drwxr-xr-x	root/root	usr/lib/cmake/
+drwxr-xr-x	root/root	usr/lib/cmake/Gpgmepp/
+-rw-r--r--	root/root	usr/lib/cmake/Gpgmepp/GpgmeppConfig.cmake
+-rw-r--r--	root/root	usr/lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
 -rwxr-xr-x	root/root	usr/lib/libgpgme.la
-lrwxrwxrwx	root/root	usr/lib/libgpgme.so -> libgpgme.so.11.14.0
-lrwxrwxrwx	root/root	usr/lib/libgpgme.so.11 -> libgpgme.so.11.14.0
--rwxr-xr-x	root/root	usr/lib/libgpgme.so.11.14.0
+lrwxrwxrwx	root/root	usr/lib/libgpgme.so -> libgpgme.so.11.17.0
+lrwxrwxrwx	root/root	usr/lib/libgpgme.so.11 -> libgpgme.so.11.17.0
+-rwxr-xr-x	root/root	usr/lib/libgpgme.so.11.17.0
+-rwxr-xr-x	root/root	usr/lib/libgpgmepp.la
+lrwxrwxrwx	root/root	usr/lib/libgpgmepp.so -> libgpgmepp.so.6.3.0
+lrwxrwxrwx	root/root	usr/lib/libgpgmepp.so.6 -> libgpgmepp.so.6.3.0
+-rwxr-xr-x	root/root	usr/lib/libgpgmepp.so.6.3.0
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/gpgme.m4
diff --git a/gpgme/.md5sum b/gpgme/.md5sum
index 6a50ede55..889033597 100644
--- a/gpgme/.md5sum
+++ b/gpgme/.md5sum
@@ -1 +1,3 @@
-60d730d22e8065fd5de309e8b98e304b  gpgme-1.6.0.tar.bz2
+34078cb2ce4b6e9e89c3cd444556826e  gpgme-1.1.8-et_EE.patch
+e7f9eec6d2dde8d9cf03cd8596a1f6aa  gpgme-1.8.0-cmake.patch
+722a4153904b9b5dc15485a22d29263b  gpgme-1.8.0.tar.bz2
diff --git a/gpgme/Pkgfile b/gpgme/Pkgfile
index 19592195f..fce6afda1 100644
--- a/gpgme/Pkgfile
+++ b/gpgme/Pkgfile
@@ -1,25 +1,34 @@
-# Description: An API for GnuPG.
+# Description: A C, CXX, and lisp API for GnuPG.
 # URL: http://www.gnupg.org/gpgme.html
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Brett Goulder, predatorfreak at dcaf-security dot org
 # Depends on: gnupg
 
 name=gpgme
-version=1.6.0
-release=1
-source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)
+version=1.8.0
+release=3
+source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2
+	gpgme-1.1.8-et_EE.patch
+	gpgme-1.8.0-cmake.patch)
 
 build() {
 	cd $name-$version
 
+	patch -p1 -i $SRC/gpgme-1.1.8-et_EE.patch
+	patch -p1 -i $SRC/gpgme-1.8.0-cmake.patch
+
 	./configure \
 		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--with-gpg=/usr/bin/gpg \
-		--with-pth=yes
+		--enable-languages='cl cpp'
 
 	make
-	make tests
 	make DESTDIR=$PKG install
+
+	sed -i -e 's:^avail_lang=.*:avail_lang="$(cat /usr/etc/gpgme/* | xargs)":' \
+		$PKG/usr/bin/gpgme-config
+
+	install -d $PKG/usr/etc/gpgme
+	echo 'c cl cpp' > $PKG/usr/etc/gpgme/base
+
 	rm -r $PKG/usr/share/info
 }
diff --git a/gpgme/gpgme-1.1.8-et_EE.patch b/gpgme/gpgme-1.1.8-et_EE.patch
new file mode 100644
index 000000000..293debb5b
--- /dev/null
+++ b/gpgme/gpgme-1.1.8-et_EE.patch
@@ -0,0 +1,11 @@
+--- gpgme-1.1.8/src/gpgme-config.in	2009-03-08 10:25:48.000000000 +1100
++++ gpgme-1.1.8/src/gpgme-config.in	2009-03-08 10:35:53.000000000 +1100
+@@ -64,7 +64,7 @@
+ while test $# -gt 0; do
+     case "$1" in
+ 	-*=*)
+-	    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
++	    optarg=`echo "$1" | sed 's/[-_[:alnum:]]*=//'`
+ 	    ;;
+ 	*)
+ 	    optarg=
diff --git a/gpgme/gpgme-1.8.0-cmake.patch b/gpgme/gpgme-1.8.0-cmake.patch
new file mode 100644
index 000000000..09775b868
--- /dev/null
+++ b/gpgme/gpgme-1.8.0-cmake.patch
@@ -0,0 +1,33 @@
+From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 16 Nov 2016 23:09:45 +0100
+Subject: [PATCH] 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 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/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"
+ )
+ 
+-- 
+2.8.0.rc3
+