Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fwknop: fix build with gpg support enabled

Browse source 
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:
Matt Merhar 2020-12-13 21:27:06 -05:00
parent 91a6168ded
commit 5f5248be7d
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/fwknop/Config.in
View file

@ -1,6 +1,6 @@
#fwknop config #fwknop config
menu "Configuration" menu "Configuration"
depends on PACKAGE_fwknopd depends on PACKAGE_fwknopd || PACKAGE_fwknop
config FWKNOPD_GPG config FWKNOPD_GPG
bool "Enable GPG support" bool "Enable GPG support"
@ -12,5 +12,4 @@ config FWKNOPD_NFQ_CAPTURE
select PACKAGE_iptables-mod-nfqueue select PACKAGE_iptables-mod-nfqueue
default n default n
endmenu endmenu

10
net/fwknop/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=fwknop PKG_NAME:=fwknop
PKG_VERSION:=2.6.10 PKG_VERSION:=2.6.10
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download
@ -47,8 +47,9 @@ define Package/fwknopd
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Firewall SUBMENU:=Firewall
TITLE+= Daemon TITLE+= Daemon
DEPENDS:=+iptables +libfko +!FWKNOPD_NFQ_CAPTURE:libpcap +FWKNOPD_NFQ_CAPTURE:iptables-mod-nfqueue +FWKNOP_GPG:gnupg \ DEPENDS:=+iptables +libfko +!FWKNOPD_NFQ_CAPTURE:libpcap +FWKNOPD_NFQ_CAPTURE:iptables-mod-nfqueue \
+FWKNOPD_NFQ_CAPTURE:libnetfilter-queue +FWKNOPD_NFQ_CAPTURE:libnfnetlink +FWKNOPD_NFQ_CAPTURE:libnetfilter-queue +FWKNOPD_NFQ_CAPTURE:libnfnetlink \
+FWKNOP_GPG:gnupg +FWKNOP_GPG:libgpgme
endef endef
define Package/fwknopd/description define Package/fwknopd/description
@ -72,7 +73,7 @@ define Package/fwknop
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Firewall SUBMENU:=Firewall
TITLE+= Client TITLE+= Client
DEPENDS:=+libfko DEPENDS:=+libfko +FWKNOPD_GPG:gnupg +FWKNOPD_GPG:libgpgme
endef endef
define Package/fwknop/description define Package/fwknop/description
@ -86,6 +87,7 @@ define Package/libfko
CATEGORY:=Libraries CATEGORY:=Libraries
SUBMENU:=Firewall SUBMENU:=Firewall
TITLE+= Library TITLE+= Library
DEPENDS:=+FWKNOPD_GPG:gnupg +FWKNOPD_GPG:libgpgme
endef endef
define Package/libfko/description define Package/libfko/description