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.)

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