From 8e25d747075f6a85d557138c531de114453f4476 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 3 May 2018 13:16:30 +0000
Subject: [PATCH] gnupg: bump to 2.2.7.

---
 .../gnupg/{gnupg-2.2.5.recipe => gnupg-2.2.7.recipe} |  2 +-
 .../{gnupg-2.2.5.patchset => gnupg-2.2.7.patchset}   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename app-crypt/gnupg/{gnupg-2.2.5.recipe => gnupg-2.2.7.recipe} (97%)
 rename app-crypt/gnupg/patches/{gnupg-2.2.5.patchset => gnupg-2.2.7.patchset} (89%)

diff --git a/app-crypt/gnupg/gnupg-2.2.5.recipe b/app-crypt/gnupg/gnupg-2.2.7.recipe
similarity index 97%
rename from app-crypt/gnupg/gnupg-2.2.5.recipe
rename to app-crypt/gnupg/gnupg-2.2.7.recipe
index 56ecdfcd2..b341d120b 100644
--- a/app-crypt/gnupg/gnupg-2.2.5.recipe
+++ b/app-crypt/gnupg/gnupg-2.2.7.recipe
@@ -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="3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57"
+CHECKSUM_SHA256="d95b361ee6ef7eff86af40c8c72bf9313736ac9f7010d6604d78bf83818e976e"
 PATCHES="gnupg-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
diff --git a/app-crypt/gnupg/patches/gnupg-2.2.5.patchset b/app-crypt/gnupg/patches/gnupg-2.2.7.patchset
similarity index 89%
rename from app-crypt/gnupg/patches/gnupg-2.2.5.patchset
rename to app-crypt/gnupg/patches/gnupg-2.2.7.patchset
index 82b4dcaf4..333915e1b 100644
--- a/app-crypt/gnupg/patches/gnupg-2.2.5.patchset
+++ b/app-crypt/gnupg/patches/gnupg-2.2.7.patchset
@@ -5,10 +5,10 @@ Subject: Fix detection of libnetwork
 
 
 diff --git a/configure.ac b/configure.ac
-index e249361..a9baceb 100644
+index e94bd30..4d7d13e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1030,10 +1030,9 @@ AC_MSG_NOTICE([checking for networking options])
+@@ -1041,10 +1041,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 e249361..a9baceb 100644
  
  
  #
-@@ -1047,8 +1046,8 @@ if test "$build_dirmngr" = "yes"; then
+@@ -1058,8 +1057,8 @@ if test "$build_dirmngr" = "yes"; then
    # the dirmngr option --standard-resolver.
  
    # the double underscore thing is a glibc-ism?
@@ -34,7 +34,7 @@ index e249361..a9baceb 100644
                   AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
  
 -- 
-2.16.2
+2.17.0
 
 
 From 685fbfd8b8a61a20c9c5d335dd1a995db5e33910 Mon Sep 17 00:00:00 2001
@@ -44,7 +44,7 @@ Subject: Haiku: settings Path
 
 
 diff --git a/configure.ac b/configure.ac
-index a9baceb..a2afd5f 100644
+index 4d7d13e..08b77f4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -492,6 +492,8 @@ AH_BOTTOM([
@@ -57,5 +57,5 @@ index a9baceb..a2afd5f 100644
  #define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
  #endif
 -- 
-2.16.2
+2.17.0