[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-239-g2aa1ee4

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  2aa1ee416f5ff000dd868c986a35b99438fe600a (commit)
      from  fdc9b24e3e2f38eee48bc2c81545526c58039ce5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2aa1ee416f5ff000dd868c986a35b99438fe600a
Author: Jeremie Scheer <jer...@ar...>
Date:   Thu Jan 13 11:20:57 2011 +0100

    [LINUX] Add Netfilter NAT modules in PPS Linux config.
    [BUILDROOT] Add NAT Traversal support for IPSec in PPS config.

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/pps_defconfig                    |    4 +-
 .../device/armadeus/pps/pps-linux-2.6.29.config    |   45 ++++++++++++++++++--
 buildroot/target/device/armadeus/pps/pps_defconfig |    4 +-
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 9b8861a..a0908a7 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Fri Nov  5 16:46:21 2010
+# Wed Jan 12 11:33:44 2011
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_VERSION="2010.11-git"
@@ -667,7 +667,7 @@ BR2_PACKAGE_ETHTOOL=y
 # BR2_PACKAGE_IPROUTE2 is not set
 BR2_PACKAGE_IPSEC_TOOLS=y
 BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
-# BR2_PACKAGE_IPSEC_TOOLS_NATT is not set
+BR2_PACKAGE_IPSEC_TOOLS_NATT=y
 BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
 BR2_PACKAGE_IPSEC_TOOLS_STATS=y
 # BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
index 966293e..fef2fcb 100644
--- a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29.6
-# Wed Dec 15 14:32:09 2010
+# Mon Jan 10 11:54:08 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -388,19 +388,41 @@ CONFIG_BRIDGE_NETFILTER=y
 #
 # CONFIG_NETFILTER_NETLINK_QUEUE is not set
 # CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NF_CONNTRACK is not set
+CONFIG_NF_CONNTRACK=m
+# CONFIG_NF_CT_ACCT is not set
+# CONFIG_NF_CONNTRACK_MARK is not set
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# 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_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 is not set
 CONFIG_NETFILTER_XTABLES=y
 # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
 # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
 # CONFIG_NETFILTER_XT_MATCH_ESP is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
 # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
@@ -427,8 +449,9 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
 #
 # IP: Netfilter Configuration
 #
-# CONFIG_NF_DEFRAG_IPV4 is not set
-# CONFIG_NF_CONNTRACK_IPV4 is not set
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_IP_NF_QUEUE is not set
 CONFIG_IP_NF_IPTABLES=m
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
@@ -439,6 +462,19 @@ CONFIG_IP_NF_FILTER=m
 # CONFIG_IP_NF_TARGET_REJECT is not set
 # CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_NF_NAT_SNMP_BASIC is not set
+# CONFIG_NF_NAT_FTP is not set
+# CONFIG_NF_NAT_IRC is not set
+# CONFIG_NF_NAT_TFTP is not set
+# CONFIG_NF_NAT_AMANDA is not set
+# CONFIG_NF_NAT_PPTP is not set
+# CONFIG_NF_NAT_H323 is not set
+# CONFIG_NF_NAT_SIP is not set
 # CONFIG_IP_NF_MANGLE is not set
 # CONFIG_IP_NF_RAW is not set
 CONFIG_IP_NF_ARPTABLES=m
@@ -448,6 +484,7 @@ CONFIG_IP_NF_ARPFILTER=m
 #
 # IPv6: Netfilter Configuration
 #
+# CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_IP6_NF_QUEUE is not set
 # CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
diff --git a/buildroot/target/device/armadeus/pps/pps_defconfig b/buildroot/target/device/armadeus/pps/pps_defconfig
index 159d2c8..4f5b902 100644
--- a/buildroot/target/device/armadeus/pps/pps_defconfig
+++ b/buildroot/target/device/armadeus/pps/pps_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Tue Jan  4 15:50:13 2011
+# Wed Jan 12 11:33:44 2011
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_VERSION="0.10.0-svn"
@@ -414,7 +414,7 @@ BR2_PACKAGE_ETHTOOL=y
 # BR2_PACKAGE_IPROUTE2 is not set
 BR2_PACKAGE_IPSEC_TOOLS=y
 BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
-# BR2_PACKAGE_IPSEC_TOOLS_NATT is not set
+BR2_PACKAGE_IPSEC_TOOLS_NATT=y
 BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
 BR2_PACKAGE_IPSEC_TOOLS_STATS=y
 BR2_PACKAGE_IPSEC_TOOLS_IPV6=y


hooks/post-receive
-- 
armadeus


