From e8dccced08ddbb0e8e0302b66503070bd14af94f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 10 Sep 2017 09:35:56 +0200
Subject: gnupg2: update to 2.2.0

---
 package/gnupg2/Makefile                  |  4 ++--
 package/gnupg2/patches/patch-Makefile_in | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'package/gnupg2')

diff --git a/package/gnupg2/Makefile b/package/gnupg2/Makefile
index adaedbc80..dbf45da1b 100644
--- a/package/gnupg2/Makefile
+++ b/package/gnupg2/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		gnupg2
-PKG_VERSION:=		2.1.19
+PKG_VERSION:=		2.2.0
 PKG_RELEASE:=		1
-PKG_HASH:=		46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0
+PKG_HASH:=		d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6
 PKG_DESCR:=		gnu privacy guard (modern)
 PKG_SECTION:=		app/crypto
 PKG_DEPENDS:=		libreadline libncurses libgcrypt libgpg-error libassuan
diff --git a/package/gnupg2/patches/patch-Makefile_in b/package/gnupg2/patches/patch-Makefile_in
index 0009ed0ea..54361aff9 100644
--- a/package/gnupg2/patches/patch-Makefile_in
+++ b/package/gnupg2/patches/patch-Makefile_in
@@ -1,13 +1,23 @@
---- gnupg-2.1.17.orig/Makefile.in	2016-12-20 11:28:18.000000000 +0100
-+++ gnupg-2.1.17/Makefile.in	2017-01-18 20:07:42.998193732 +0100
-@@ -491,8 +491,8 @@ DISTCLEANFILES = g10defs.h
+--- gnupg-2.2.0.orig/Makefile.in	2017-08-28 11:21:34.000000000 +0200
++++ gnupg-2.2.0/Makefile.in	2017-09-06 19:20:04.560251562 +0200
+@@ -220,8 +220,7 @@ am__define_uniq_tagged_files = \
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-DIST_SUBDIRS = m4 common kbx g10 sm agent scd g13 dirmngr tools po doc \
+-	tests
++DIST_SUBDIRS = m4 common kbx g10 agent scd g13 dirmngr tools
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -492,8 +491,8 @@ DISTCLEANFILES = g10defs.h
  @BUILD_DOC_FALSE@doc = 
  @BUILD_DOC_TRUE@doc = doc
  SUBDIRS = m4 common kbx \
 -          ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
--          ${tools} po ${doc} tests
+-          tools po ${doc} tests
 +          ${gpg} ${agent} ${scd} ${g13} ${dirmngr} \
-+          ${tools}
++          tools
  
  dist_doc_DATA = README
  gen_start_date = 2011-12-01T06:00:00
-- 
cgit v1.2.3