From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Wed, 10 Feb 2016 17:27:08 +0000 (+0100)
Subject: gnupg: fix dependency error concerning libcurl
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F2368%2Fhead;p=feed%2Fpackages.git

gnupg: fix dependency error concerning libcurl

libcurl is added as dependency for gnupg-util to avoid a dependency
error.

The following invalid configuration options are removed:
  --disable-ftp
  --enable-fake-curl

Fixes: 0a61d56eb3ab ("utils/gnupg: add new package gnupg-utils")
Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile
index 65209bb986..193a82040e 100644
--- a/utils/gnupg/Makefile
+++ b/utils/gnupg/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnupg
 PKG_VERSION:=1.4.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
@@ -39,7 +39,7 @@ endef
 
 define Package/gnupg-utils
   $(call Package/gnupg/Default)
-  DEPENDS:=gnupg
+  DEPENDS:=gnupg +libcurl
   TITLE:=Key management utilities for GnuPG
 endef
 
@@ -67,9 +67,7 @@ CONFIGURE_ARGS += \
 	--disable-bzip2 \
 	--disable-ldap \
 	--disable-finger \
-	--disable-ftp \
 	--disable-dns-srv \
-	--enable-fake-curl \
 	--disable-regex \
 
 MAKE_FLAGS += \