keepalived: fix libip6tc dependency

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Rebase commit: nftables is not available
(cherry picked from commit eed4277d5cc923c41ae2c4e182fc7449bb44b090)

diff --git a/net/keepalived/Config.in b/net/keepalived/Config.in
index 0cddf09f35460f50361bf9e4c14d88a92674e83b..255c3aad8fa3d0bd3d77222e7f65517cf2526867 100644 (file)
--- a/net/keepalived/Config.in
+++ b/net/keepalived/Config.in
@@ -66,11 +66,21 @@ config KEEPALIVED_IPTABLES
        depends on KEEPALIVED_VRRP
        bool
        default y
+       select KEEPALIVED_IP6TABLES
        prompt "Enable iptables for VIP filtering"
        help
                Builds support for using iptables/ipsets for filtering packets
                to VIPs
 
+config KEEPALIVED_IP6TABLES
+       depends on KEEPALIVED_VRRP && KEEPALIVED_IPTABLES && IPV6
+       bool
+       default y
+       prompt "Enable ip6tables for VIP filtering"
+       help
+               Builds support for using ip6tables/ipsets for filtering packets
+               to VIPs
+
 config KEEPALIVED_SNMP_VRRP
        depends on KEEPALIVED_VRRP
        bool

diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile
index b0a3c53253ebcfcb327a762350765de310d6a4cc..dd6b7d64949ac38fcb5116bc65f9a8431773b386 100644 (file)
--- a/net/keepalived/Makefile
+++ b/net/keepalived/Makefile
@@ -61,7 +61,7 @@ define Package/keepalived
     +KEEPALIVED_VRRP:libnfnetlink \
     +KEEPALIVED_SHA1:libopenssl \
     +KEEPALIVED_IPTABLES:libip4tc \
-    +(KEEPALIVED_IPTABLES&&IPV6):libip6tc \
+    +KEEPALIVED_IP6TABLES:libip6tc \
     +KEEPALIVED_IPTABLES:libxtables \
     +KEEPALIVED_IPTABLES:libipset \
     +(KEEPALIVED_SNMP_VRRP||KEEPALIVED_SNMP_CHECKER||KEEPALIVED_SNMP_RFC2||KEEPALIVED_SNMP_RFC3):libnetsnmp \