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:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user