netfilter: fix file conflicts between kmod-ipt- and kmod-nft- packages

The nf_reject_* and nf_nat_masquerade_* modules are moved into the
corresponding kmod-nf- packages. Appropriate dependencies are added to the
kmod-nft- packages.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer
2016-09-30 23:28:21 +02:00
parent c50ba61caf
commit cea09329e5
5 changed files with 10 additions and 10 deletions

View File

@@ -2618,6 +2618,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
# CONFIG_NF_NAT_SNMP_BASIC is not set
# CONFIG_NF_NAT_TFTP is not set
# CONFIG_NF_REJECT_IPV4 is not set
# CONFIG_NF_REJECT_IPV6 is not set
# CONFIG_NF_TABLES is not set
# CONFIG_NI52 is not set
# CONFIG_NI65 is not set

View File

@@ -2717,6 +2717,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
# CONFIG_NF_NAT_SNMP_BASIC is not set
# CONFIG_NF_NAT_TFTP is not set
# CONFIG_NF_REJECT_IPV4 is not set
# CONFIG_NF_REJECT_IPV6 is not set
# CONFIG_NF_TABLES is not set
# CONFIG_NI52 is not set
# CONFIG_NI65 is not set

View File

@@ -2706,6 +2706,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
# CONFIG_NF_NAT_SNMP_BASIC is not set
# CONFIG_NF_NAT_TFTP is not set
# CONFIG_NF_REJECT_IPV4 is not set
# CONFIG_NF_REJECT_IPV6 is not set
# CONFIG_NF_TABLES is not set
# CONFIG_NF_TABLES_NETDEV is not set
# CONFIG_NI65 is not set