fwknop: fix build with gpg support enabled
Along with the accompanying change to gpgme to install gpgme-config, since libfko is what is actually linked to gpgme, and not fwknop/fwknopd, an explicit dependency must be added to that package. menuconfig now allows enabling gpg support if only fwknop is selected without also selecting fwknopd. Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
This commit is contained in:
parent
91a6168ded
commit
5f5248be7d
|
@ -1,6 +1,6 @@
|
|||
#fwknop config
|
||||
menu "Configuration"
|
||||
depends on PACKAGE_fwknopd
|
||||
depends on PACKAGE_fwknopd || PACKAGE_fwknop
|
||||
|
||||
config FWKNOPD_GPG
|
||||
bool "Enable GPG support"
|
||||
|
@ -12,5 +12,4 @@ config FWKNOPD_NFQ_CAPTURE
|
|||
select PACKAGE_iptables-mod-nfqueue
|
||||
default n
|
||||
|
||||
|
||||
endmenu
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=fwknop
|
||||
PKG_VERSION:=2.6.10
|
||||
PKG_RELEASE:=5
|
||||
PKG_RELEASE:=6
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download
|
||||
|
@ -47,8 +47,9 @@ define Package/fwknopd
|
|||
CATEGORY:=Network
|
||||
SUBMENU:=Firewall
|
||||
TITLE+= Daemon
|
||||
DEPENDS:=+iptables +libfko +!FWKNOPD_NFQ_CAPTURE:libpcap +FWKNOPD_NFQ_CAPTURE:iptables-mod-nfqueue +FWKNOP_GPG:gnupg \
|
||||
+FWKNOPD_NFQ_CAPTURE:libnetfilter-queue +FWKNOPD_NFQ_CAPTURE:libnfnetlink
|
||||
DEPENDS:=+iptables +libfko +!FWKNOPD_NFQ_CAPTURE:libpcap +FWKNOPD_NFQ_CAPTURE:iptables-mod-nfqueue \
|
||||
+FWKNOPD_NFQ_CAPTURE:libnetfilter-queue +FWKNOPD_NFQ_CAPTURE:libnfnetlink \
|
||||
+FWKNOP_GPG:gnupg +FWKNOP_GPG:libgpgme
|
||||
endef
|
||||
|
||||
define Package/fwknopd/description
|
||||
|
@ -72,7 +73,7 @@ define Package/fwknop
|
|||
CATEGORY:=Network
|
||||
SUBMENU:=Firewall
|
||||
TITLE+= Client
|
||||
DEPENDS:=+libfko
|
||||
DEPENDS:=+libfko +FWKNOPD_GPG:gnupg +FWKNOPD_GPG:libgpgme
|
||||
endef
|
||||
|
||||
define Package/fwknop/description
|
||||
|
@ -86,6 +87,7 @@ define Package/libfko
|
|||
CATEGORY:=Libraries
|
||||
SUBMENU:=Firewall
|
||||
TITLE+= Library
|
||||
DEPENDS:=+FWKNOPD_GPG:gnupg +FWKNOPD_GPG:libgpgme
|
||||
endef
|
||||
|
||||
define Package/libfko/description
|
||||
|
|
Loading…
Reference in New Issue