From abc84686f5883ed817674fd25e17c839ced8b8a6 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 28 Feb 2018 22:59:01 +0000
Subject: [PATCH] gnupg: bump to 2.2.5. (#2258)

Also improve TEST() to make t-session-env pass.
Many tests were not even being started before this fix. Now, on x86:
FAIL: tests/openpgp/tofu.scm
FAIL: tests/openpgp/trust-pgp-1.scm
FAIL: tests/openpgp/trust-pgp-2.scm
FAIL: tests/openpgp/trust-pgp-3.scm
FAIL: tests/openpgp/gpgconf.scm

(All these tests were already failing ok 2.2.4.)
---
 ...{gnupg-2.2.4.recipe => gnupg-2.2.5.recipe} | 11 ++++++----
 ...pg-2.2.4.patchset => gnupg-2.2.5.patchset} | 20 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)
 rename app-crypt/gnupg/{gnupg-2.2.4.recipe => gnupg-2.2.5.recipe} (93%)
 rename app-crypt/gnupg/patches/{gnupg-2.2.4.patchset => gnupg-2.2.5.patchset} (83%)

diff --git a/app-crypt/gnupg/gnupg-2.2.4.recipe b/app-crypt/gnupg/gnupg-2.2.5.recipe
similarity index 93%
rename from app-crypt/gnupg/gnupg-2.2.4.recipe
rename to app-crypt/gnupg/gnupg-2.2.5.recipe
index 3cdecb7ea..56ecdfcd2 100644
--- a/app-crypt/gnupg/gnupg-2.2.4.recipe
+++ b/app-crypt/gnupg/gnupg-2.2.5.recipe
@@ -6,7 +6,7 @@ well as access modules for all kinds of public key directories. GnuPG, also \
 known as GPG, is a command line tool with features for easy integration with \
 other applications."
 HOMEPAGE="https://gnupg.org/"
-COPYRIGHT="1998-2017 Free Software Foundation, Inc.
+COPYRIGHT="1998-2018 Free Software Foundation, Inc.
 	2000, Dimitrios Souflis
 	2008, 2009, 2010, 2012-2016  William Ahern"
 LICENSE="CC0 v1.0
@@ -16,7 +16,7 @@ LICENSE="CC0 v1.0
 	GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
-CHECKSUM_SHA256="401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec"
+CHECKSUM_SHA256="3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57"
 PATCHES="gnupg-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -103,7 +103,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	autogen.sh
+	./autogen.sh
 	runConfigure ./configure \
 		--libexecdir=$libDir/gnupg \
 		--enable-wks-tools \
@@ -123,6 +123,9 @@ INSTALL()
 
 TEST()
 {
-	#check still fails as before on: FAIL: t-session-env
+	# FAIL: tests/openpgp/{tofu,trust-pgp-[123],gpgconf}.scm
+	HOME="$sourceDir"/home
+	mkdir -p "$HOME"
+	export HOME
 	make check
 }
diff --git a/app-crypt/gnupg/patches/gnupg-2.2.4.patchset b/app-crypt/gnupg/patches/gnupg-2.2.5.patchset
similarity index 83%
rename from app-crypt/gnupg/patches/gnupg-2.2.4.patchset
rename to app-crypt/gnupg/patches/gnupg-2.2.5.patchset
index 8ac04efdc..82b4dcaf4 100644
--- a/app-crypt/gnupg/patches/gnupg-2.2.4.patchset
+++ b/app-crypt/gnupg/patches/gnupg-2.2.5.patchset
@@ -5,10 +5,10 @@ Subject: Fix detection of libnetwork
 
 
 diff --git a/configure.ac b/configure.ac
-index 9395fb8..0b157a9 100644
+index e249361..a9baceb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1018,10 +1018,9 @@ AC_MSG_NOTICE([checking for networking options])
+@@ -1030,10 +1030,9 @@ AC_MSG_NOTICE([checking for networking options])
  # ELF runtime link paths), then link will fail and LDAP support won't
  # be detected.
  #
@@ -22,7 +22,7 @@ index 9395fb8..0b157a9 100644
  
  
  #
-@@ -1035,8 +1034,8 @@ if test "$build_dirmngr" = "yes"; then
+@@ -1047,8 +1046,8 @@ if test "$build_dirmngr" = "yes"; then
    # the dirmngr option --standard-resolver.
  
    # the double underscore thing is a glibc-ism?
@@ -34,22 +34,20 @@ index 9395fb8..0b157a9 100644
                   AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
  
 -- 
-2.12.2
+2.16.2
+
 
 From 685fbfd8b8a61a20c9c5d335dd1a995db5e33910 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Tue, 27 Jun 2017 13:22:04 +0200
-Subject: [PATCH] Haiku: settings Path
+Subject: Haiku: settings Path
 
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 9395fb8..44bafce 100644
+index a9baceb..a2afd5f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -495,6 +495,8 @@ AH_BOTTOM([
+@@ -492,6 +492,8 @@ AH_BOTTOM([
  # endif
  #elif defined(__VMS)
  #define GNUPG_DEFAULT_HOMEDIR "/SYS$LOGIN/gnupg"
@@ -59,5 +57,5 @@ index 9395fb8..44bafce 100644
  #define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
  #endif
 -- 
-2.12.2
+2.16.2