From 5f5248be7d544aa7859e5dbee230fe9fd8e483dd Mon Sep 17 00:00:00 2001 From: Matt Merhar Date: Sun, 13 Dec 2020 21:27:06 -0500 Subject: [PATCH] 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 --- net/fwknop/Config.in | 3 +-- net/fwknop/Makefile | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net/fwknop/Config.in b/net/fwknop/Config.in index 940e811baf..8de7e47156 100644 --- a/net/fwknop/Config.in +++ b/net/fwknop/Config.in @@ -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 diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index 5a79dd4c67..cfcf8a27fb 100644 --- a/net/fwknop/Makefile +++ b/net/fwknop/Makefile @@ -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 -- 2.30.2