From c07490e5b22df3982e2fdc784c57610af3939a5a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 18 May 2017 21:00:20 +0200
Subject: [PATCH] gnupg: bump version.

---
 ...nupg-2.1.19.recipe => gnupg-2.1.21.recipe} |  2 +-
 ...-2.1.19.patchset => gnupg-2.1.21.patchset} | 33 +++----------------
 2 files changed, 6 insertions(+), 29 deletions(-)
 rename app-crypt/gnupg/{gnupg-2.1.19.recipe => gnupg-2.1.21.recipe} (96%)
 rename app-crypt/gnupg/patches/{gnupg-2.1.19.patchset => gnupg-2.1.21.patchset} (56%)

diff --git a/app-crypt/gnupg/gnupg-2.1.19.recipe b/app-crypt/gnupg/gnupg-2.1.21.recipe
similarity index 96%
rename from app-crypt/gnupg/gnupg-2.1.19.recipe
rename to app-crypt/gnupg/gnupg-2.1.21.recipe
index 3f4659636..dcb35d970 100644
--- a/app-crypt/gnupg/gnupg-2.1.19.recipe
+++ b/app-crypt/gnupg/gnupg-2.1.21.recipe
@@ -10,7 +10,7 @@ COPYRIGHT="1998-2016 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
-CHECKSUM_SHA256="46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0"
+CHECKSUM_SHA256="7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd"
 PATCHES="gnupg-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
diff --git a/app-crypt/gnupg/patches/gnupg-2.1.19.patchset b/app-crypt/gnupg/patches/gnupg-2.1.21.patchset
similarity index 56%
rename from app-crypt/gnupg/patches/gnupg-2.1.19.patchset
rename to app-crypt/gnupg/patches/gnupg-2.1.21.patchset
index 4f97a5481..3a89bf752 100644
--- a/app-crypt/gnupg/patches/gnupg-2.1.19.patchset
+++ b/app-crypt/gnupg/patches/gnupg-2.1.21.patchset
@@ -1,37 +1,14 @@
-From 971db23d4c872cdd4daee96f3ea55eb1b5879c0e Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Tue, 21 Mar 2017 11:13:43 +0000
-Subject: patch source file to use "extern char" instead of "static const char"
-
-
-diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
-index b2ff721..e89ce32 100644
---- a/tests/gpgscm/scheme.c
-+++ b/tests/gpgscm/scheme.c
-@@ -89,7 +89,7 @@ static int stricmp(const char *s1, const char *s2)
- #endif /* __APPLE__ */
- 
- #if USE_STRLWR
--static const char *strlwr(char *s) {
-+extern char *strlwr(char *s) {
-   const char *p=s;
-   while(*s) {
-     *s=tolower(*s);
--- 
-2.7.0
-
-
-From e6d7b1f0ea81cee4f8da51853a019177515929af Mon Sep 17 00:00:00 2001
+From 8ecdd3382028f99af24abc78d4055f6b8bcb2839 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Thu, 18 Feb 2016 22:55:30 +0000
 Subject: Fix detection of libnetwork
 
 
 diff --git a/configure.ac b/configure.ac
-index 4b9ceca..c5fecc8 100644
+index 9395fb8..0b157a9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1015,10 +1015,9 @@ AC_MSG_NOTICE([checking for networking options])
+@@ -1018,10 +1018,9 @@ AC_MSG_NOTICE([checking for networking options])
  # ELF runtime link paths), then link will fail and LDAP support won't
  # be detected.
  #
@@ -45,7 +22,7 @@ index 4b9ceca..c5fecc8 100644
  
  
  #
-@@ -1032,8 +1031,8 @@ if test "$build_dirmngr" = "yes"; then
+@@ -1035,8 +1034,8 @@ if test "$build_dirmngr" = "yes"; then
    # the dirmngr option --standard-resolver.
  
    # the double underscore thing is a glibc-ism?
@@ -57,5 +34,5 @@ index 4b9ceca..c5fecc8 100644
                   AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
  
 -- 
-2.7.0
+2.12.2