From c30b450aa71951f5bc93318aba09a24fa203d4ed Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 24 May 2012 07:30:44 +0000 Subject: [PATCH] topconfig enable new (> 3.2) iptables options svn path=/dists/trunk/linux-2.6/; revision=19030 --- debian/changelog | 4 +++- debian/config/config | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c91ae7588..f5c46a6b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,9 @@ linux-2.6 (3.4-1~experimental.1) UNRELEASED; urgency=low * New upstream release: http://kernelnewbies.org/Linux_3.4 - * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT. + * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT, + IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT, + NETFILTER_XT_MATCH_NFACCT. -- Ben Hutchings Mon, 21 May 2012 01:37:21 +0100 diff --git a/debian/config/config b/debian/config/config index 19d74c70d..d67422813 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4271,6 +4271,7 @@ CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m @@ -4328,6 +4329,7 @@ CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_FILTER=m @@ -4368,6 +4370,7 @@ CONFIG_MAC80211_LEDS=y ## ## file: net/netfilter/Kconfig ## +CONFIG_NETFILTER_NETLINK_ACCT=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m @@ -4415,6 +4418,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m