kernel: x86* disable alg modules

the application layer gateway modules can used to bypass the nat
via nat slipstreaming. I had disabled all of them. If one is really needed
we can reenable it later.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index c221dc7cb1a7614254ff095f8b9e81dcc4cb209b..6c7c1d476ec6c477bc34854576886d1cfa66224f 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.19-ipfire Kernel Configuration
+# Linux/x86 5.10.21-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -218,6 +218,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 # CONFIG_BPF_SYSCALL is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 CONFIG_EMBEDDED=y
@@ -1116,30 +1117,23 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
@@ -1326,9 +1320,7 @@ CONFIG_IP_VS_MH_TAB_INDEX=12
 #
 # IPVS application helper
 #
-CONFIG_IP_VS_FTP=m
 CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
 
 #
 # IP: Netfilter Configuration
@@ -1346,9 +1338,6 @@ CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 243a34640177e1327734ee5e8b31bccd9063bbe5..0197de92f7266c58863a6e047bb9760f28749ab0 100644 (file)
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.9-ipfire Kernel Configuration
+# Linux/x86 5.10.21-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -228,6 +228,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 CONFIG_EMBEDDED=y
@@ -1122,30 +1123,23 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
 CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=y
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
@@ -1332,9 +1326,7 @@ CONFIG_IP_VS_MH_TAB_INDEX=12
 #
 # IPVS application helper
 #
-CONFIG_IP_VS_FTP=m
 CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
 
 #
 # IP: Netfilter Configuration
@@ -1352,9 +1344,6 @@ CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 025353d6d0438d78dee9219441438c2d2c132240..a763380dea75b95555d35be609060addd36c2df1 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -8966,7 +8966,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/ip/vs.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/dh.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/fo.h
-#lib/modules/KVER-ipfire/build/include/config/ip/vs/ftp.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/ipv6.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/lblc.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/lblcr.h
@@ -8978,8 +8977,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/nfct.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/nq.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/ovf.h
-#lib/modules/KVER-ipfire/build/include/config/ip/vs/pe
-#lib/modules/KVER-ipfire/build/include/config/ip/vs/pe/sip.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/proto
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/proto/ah
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/proto/ah.h
@@ -9189,6 +9186,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/kallsyms/all.h
 #lib/modules/KVER-ipfire/build/include/config/kallsyms/base
 #lib/modules/KVER-ipfire/build/include/config/kallsyms/base/relative.h
+#lib/modules/KVER-ipfire/build/include/config/kcmp.h
 #lib/modules/KVER-ipfire/build/include/config/kernel
 #lib/modules/KVER-ipfire/build/include/config/kernel.release
 #lib/modules/KVER-ipfire/build/include/config/kernel/xz.h
@@ -10211,24 +10209,12 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/nf
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/amanda.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/bridge.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/broadcast.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/events.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/ftp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/h323.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/irc.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/labels.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/mark.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/netbios
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/netbios/ns.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/pptp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/procfs.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/sane.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/secmark.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/sip.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/snmp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/tftp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/timeout.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/timestamp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/zones.h
@@ -10239,7 +10225,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/netlink/timeout.h
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/dccp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/gre.h
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/sctp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/udplite.h
 #lib/modules/KVER-ipfire/build/include/config/nf/defrag
@@ -10263,17 +10248,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/nf/log/netdev.h
 #lib/modules/KVER-ipfire/build/include/config/nf/nat
 #lib/modules/KVER-ipfire/build/include/config/nf/nat.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/amanda.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/ftp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/h323.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/irc.h
 #lib/modules/KVER-ipfire/build/include/config/nf/nat/masquerade.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/pptp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/nat/redirect.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/sip.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/snmp
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/snmp/basic.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/tftp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/reject
 #lib/modules/KVER-ipfire/build/include/config/nf/reject/ipv4.h
 #lib/modules/KVER-ipfire/build/include/config/nf/reject/ipv6.h
@@ -20816,7 +20792,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/gpio
 #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-amd-fch.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-bd9571mwv.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-cs5535.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-ich.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-sch.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/gpio/gpio-viperboard.ko.xz
@@ -21912,7 +21887,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/axp20x.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/bcm590xx.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/bd9571mwv.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/mfd/cs5535-mfd.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/da9062-core.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/da9063.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/mfd/da9150-core.ko.xz
@@ -23531,9 +23505,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_flow_table_ipv4.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_log_arp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_log_ipv4.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_h323.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_pptp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_reject_ipv4.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_socket_ipv4.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_tproxy_ipv4.ko.xz
@@ -23642,42 +23613,24 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_dh.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_fo.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_ftp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_lblc.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_lblcr.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_lc.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_mh.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_nq.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_ovf.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_pe_sip.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_rr.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_sed.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_sh.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_wlc.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_wrr.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conncount.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_amanda.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_broadcast.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_ftp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_h323.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_irc.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_netbios_ns.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_netlink.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_pptp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_sane.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_sip.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_snmp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_tftp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_flow_table.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_flow_table_inet.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_log_common.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_log_netdev.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_amanda.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_ftp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_irc.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_sip.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_tftp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_synproxy_core.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nfnetlink_acct.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nfnetlink_cthelper.ko.xz

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 2186f92ce07eb677f3c88ea4e8a4918b94a968b9..152f15d4adb5dfc993e7b168af5c146c27bb0db8 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -8968,7 +8968,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/ip/vs.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/dh.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/fo.h
-#lib/modules/KVER-ipfire/build/include/config/ip/vs/ftp.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/ipv6.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/lblc.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/lblcr.h
@@ -8980,8 +8979,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/nfct.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/nq.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/ovf.h
-#lib/modules/KVER-ipfire/build/include/config/ip/vs/pe
-#lib/modules/KVER-ipfire/build/include/config/ip/vs/pe/sip.h
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/proto
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/proto/ah
 #lib/modules/KVER-ipfire/build/include/config/ip/vs/proto/ah.h
@@ -9199,6 +9196,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/kallsyms/all.h
 #lib/modules/KVER-ipfire/build/include/config/kallsyms/base
 #lib/modules/KVER-ipfire/build/include/config/kallsyms/base/relative.h
+#lib/modules/KVER-ipfire/build/include/config/kcmp.h
 #lib/modules/KVER-ipfire/build/include/config/kernel
 #lib/modules/KVER-ipfire/build/include/config/kernel.release
 #lib/modules/KVER-ipfire/build/include/config/kernel/xz.h
@@ -10198,24 +10196,12 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/nf
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/amanda.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/bridge.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/broadcast.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/events.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/ftp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/h323.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/irc.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/labels.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/mark.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/netbios
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/netbios/ns.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/pptp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/procfs.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/sane.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/secmark.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/sip.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/snmp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/conntrack/tftp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/timeout.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/timestamp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/conntrack/zones.h
@@ -10226,7 +10212,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/netlink/timeout.h
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/dccp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/gre.h
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/sctp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/ct/proto/udplite.h
 #lib/modules/KVER-ipfire/build/include/config/nf/defrag
@@ -10250,17 +10235,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/nf/log/netdev.h
 #lib/modules/KVER-ipfire/build/include/config/nf/nat
 #lib/modules/KVER-ipfire/build/include/config/nf/nat.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/amanda.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/ftp.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/h323.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/irc.h
 #lib/modules/KVER-ipfire/build/include/config/nf/nat/masquerade.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/pptp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/nat/redirect.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/sip.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/snmp
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/snmp/basic.h
-#lib/modules/KVER-ipfire/build/include/config/nf/nat/tftp.h
 #lib/modules/KVER-ipfire/build/include/config/nf/reject
 #lib/modules/KVER-ipfire/build/include/config/nf/reject/ipv4.h
 #lib/modules/KVER-ipfire/build/include/config/nf/reject/ipv6.h
@@ -23299,9 +23275,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_flow_table_ipv4.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_log_arp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_log_ipv4.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_h323.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_pptp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_reject_ipv4.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_socket_ipv4.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/ipv4/netfilter/nf_tproxy_ipv4.ko.xz
@@ -23410,41 +23383,23 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_dh.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_fo.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_ftp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_lblc.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_lblcr.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_lc.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_mh.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_nq.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_ovf.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_pe_sip.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_rr.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_sed.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_sh.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_wlc.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/ipvs/ip_vs_wrr.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conncount.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_amanda.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_broadcast.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_ftp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_h323.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_irc.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_netbios_ns.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_netlink.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_pptp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_sane.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_sip.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_snmp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_conntrack_tftp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_flow_table.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_flow_table_inet.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_log_common.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_log_netdev.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_amanda.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_ftp.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_irc.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_sip.ko.xz
-#lib/modules/KVER-ipfire/kernel/net/netfilter/nf_nat_tftp.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nf_synproxy_core.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nfnetlink_acct.ko.xz
 #lib/modules/KVER-ipfire/kernel/net/netfilter/nfnetlink_cthelper.ko.xz