From 25b69685fe3ce447e83b84942f568dd2001b840c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 19 Jan 2017 07:04:14 +0100
Subject: gnupg2: update to 2.1.17

---
 package/gnupg2/Makefile                  | 15 +++++----------
 package/gnupg2/patches/patch-Makefile_in | 13 +++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 package/gnupg2/patches/patch-Makefile_in

(limited to 'package/gnupg2')

diff --git a/package/gnupg2/Makefile b/package/gnupg2/Makefile
index f235e5a91..f51facedd 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.13
+PKG_VERSION:=		2.1.17
 PKG_RELEASE:=		1
-PKG_HASH:=		4f9d83a6221daa60130fa79f0b1d37d6c20fffdd0320b640c7a597c5b6219675
+PKG_HASH:=		c5dc54db432209fa8f9bdb071c8fb60a765ff28e363150e30bdd4543160243cb
 PKG_DESCR:=		gnu privacy guard (modern)
 PKG_SECTION:=		app/crypto
 PKG_DEPENDS:=		libreadline libncurses libgcrypt libgpg-error libassuan
@@ -26,18 +26,13 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,GNUPG2,gnupg2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 $(eval $(call PKG_template,GPGV2,gpgv2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-CONFIGURE_ARGS+=	--disable-asm \
-			--disable-dirmngr \
-			--disable-dns-srv \
-			--disable-gnupg-iconv \
+CONFIGURE_ARGS+=	--disable-dirmngr \
+			--disable-gpgsm \
+			--disable-scdaemon \
 			--disable-card-support \
-			--disable-agent-support \
 			--disable-bzip2 \
 			--disable-exec \
 			--disable-ldap \
-			--disable-hkp \
-			--disable-finger \
-			--disable-dns-srv \
 			--disable-rpath \
 			--disable-regex
 
diff --git a/package/gnupg2/patches/patch-Makefile_in b/package/gnupg2/patches/patch-Makefile_in
new file mode 100644
index 000000000..0009ed0ea
--- /dev/null
+++ b/package/gnupg2/patches/patch-Makefile_in
@@ -0,0 +1,13 @@
+--- 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
+ @BUILD_DOC_FALSE@doc = 
+ @BUILD_DOC_TRUE@doc = doc
+ SUBDIRS = m4 common kbx \
+-          ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
+-          ${tools} po ${doc} tests
++          ${gpg} ${agent} ${scd} ${g13} ${dirmngr} \
++          ${tools}
+ 
+ dist_doc_DATA = README
+ gen_start_date = 2011-12-01T06:00:00
-- 
cgit v1.2.3