[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-182-gb662781
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-182-gb662781
|
From: jscheer <js...@us...> - 2010-12-21 16:49:22
|
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 b6627815e4653e31795571c789823dc09477b2d1 (commit)
from f20c526fa0a0845f1a7c0ae2901f57dbde7fbe52 (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 b6627815e4653e31795571c789823dc09477b2d1
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Dec 21 17:49:00 2010 +0100
[BUILDROOT] Bump flex, IPSec and IPTables versions with patches 137, 138 and 139 to make them work together and along with Linux 2.6.29.
[TEST] Add PPS' test scripts for bridged connection, OpenSSH tunnel and IPSec.
[TEST] Add IPSec configuration file to rootfs for PPS' IPSec test script.
[BUILDROOT] Needed packages for OpenSSH, IPSec and IPTables set in PPS' Buildroot config file.
[LINUX] Needed modules and drivers for OpenSSH, IPSec and IPTables set in PPS' Linux config file.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 25 +++-
.../device/armadeus/pps/pps-linux-2.6.29.config | 130 ++++++++++++++++----
buildroot/target/device/armadeus/pps/pps_defconfig | 21 ++--
patches/buildroot/137-flex-bump_version.patch | 55 ++++++++
...bump_version_and_disable_security_context.patch | 26 ++++
patches/buildroot/139-iptables-bump_version.patch | 50 ++++++++
.../buildroot/2010.11/137-flex-bump_version.patch | 45 +++++++
.../2010.11/138-ipsec-tools-bump_version.patch | 21 +++
target/pps/configs/ipsec-tools.conf | 59 +++++++++
.../pps/scripts/{test_wifi.sh => test_bridge.sh} | 28 +++--
target/pps/scripts/test_ipsec.sh | 83 +++++++++++++
target/pps/scripts/test_ssh_tunnel.sh | 55 ++++++++
12 files changed, 549 insertions(+), 49 deletions(-)
create mode 100644 patches/buildroot/137-flex-bump_version.patch
create mode 100644 patches/buildroot/138-ipsec-tools-bump_version_and_disable_security_context.patch
create mode 100644 patches/buildroot/139-iptables-bump_version.patch
create mode 100644 patches/buildroot/2010.11/137-flex-bump_version.patch
create mode 100644 patches/buildroot/2010.11/138-ipsec-tools-bump_version.patch
create mode 100644 target/pps/configs/ipsec-tools.conf
copy target/pps/scripts/{test_wifi.sh => test_bridge.sh} (65%)
create mode 100644 target/pps/scripts/test_ipsec.sh
create mode 100644 target/pps/scripts/test_ssh_tunnel.sh
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 8c3fd88..4c102cb 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -232,7 +232,7 @@ BR2_BUSYBOX_VERSION_1_16_X=y
BR2_BUSYBOX_VERSION="1.16.2"
BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION).config"
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
# BR2_PACKAGE_CUSTOMIZE is not set
#
@@ -309,13 +309,15 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
# BR2_PACKAGE_FAKEROOT is not set
-# BR2_PACKAGE_FLEX is not set
+BR2_PACKAGE_FLEX=y
+BR2_PACKAGE_FLEX_LIBFL=y
#
# native toolchain needs development files in target filesystem
#
-# BR2_PACKAGE_GETTEXT is not set
-# BR2_PACKAGE_LIBINTL is not set
+BR2_PACKAGE_GETTEXT=y
+# BR2_PACKAGE_GETTEXT_STATIC is not set
+BR2_PACKAGE_LIBINTL=y
# BR2_PACKAGE_LIBGMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
@@ -644,6 +646,7 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BLUEZ_LIBS is not set
@@ -651,7 +654,7 @@ BR2_PACKAGE_NCURSES=y
# bluez-utils not available (need dbus)
#
# BR2_PACKAGE_BMON is not set
-# BR2_PACKAGE_BRIDGE is not set
+BR2_PACKAGE_BRIDGE=y
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DNSMASQ is not set
@@ -661,8 +664,16 @@ BR2_PACKAGE_ETHTOOL=y
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IPERF is not set
# BR2_PACKAGE_IPROUTE2 is not set
-# BR2_PACKAGE_IPSEC_TOOLS is not set
-# BR2_PACKAGE_IPTABLES 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_FRAG=y
+BR2_PACKAGE_IPSEC_TOOLS_STATS=y
+# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
+BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
+# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
+# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
+BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
# BR2_PACKAGE_L2TP 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 a2aa565..966293e 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
-# Thu Nov 4 14:57:42 2010
+# Wed Dec 15 14:32:09 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -319,15 +319,22 @@ CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
+CONFIG_XFRM_USER=y
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_NET_KEY is not set
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_MULTIPLE_TABLES is not set
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_BOOTP is not set
@@ -337,14 +344,14 @@ CONFIG_IP_PNP=y
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
CONFIG_INET_TUNNEL=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
# CONFIG_INET_LRO is not set
# CONFIG_INET_DIAG is not set
# CONFIG_TCP_CONG_ADVANCED is not set
@@ -371,15 +378,89 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=y
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY 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_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_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_NF_DEFRAG_IPV4 is not set
+# CONFIG_NF_CONNTRACK_IPV4 is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+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_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_RAW is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+# CONFIG_IP_NF_ARP_MANGLE is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_STP=y
+CONFIG_BRIDGE=y
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
+CONFIG_LLC=y
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
@@ -1154,6 +1235,7 @@ CONFIG_SND_USB=y
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
# CONFIG_HID_SUPPORT is not set
+CONFIG_HID=m
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1656,32 +1738,34 @@ CONFIG_CRYPTO=y
# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_BLKCIPHER2=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_AUTHENC=y
# CONFIG_CRYPTO_TEST is not set
#
# Authenticated Encryption with Associated Data
#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
#
# Block modes
#
CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CTR is not set
+CONFIG_CRYPTO_CTR=y
# CONFIG_CRYPTO_CTS is not set
CONFIG_CRYPTO_ECB=m
# CONFIG_CRYPTO_LRW is not set
@@ -1691,7 +1775,7 @@ CONFIG_CRYPTO_ECB=m
#
# Hash modes
#
-# CONFIG_CRYPTO_HMAC is not set
+CONFIG_CRYPTO_HMAC=y
# CONFIG_CRYPTO_XCBC is not set
#
@@ -1705,7 +1789,7 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_RMD160 is not set
# CONFIG_CRYPTO_RMD256 is not set
# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
+CONFIG_CRYPTO_SHA1=y
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_TGR192 is not set
@@ -1714,7 +1798,7 @@ CONFIG_CRYPTO_MD5=y
#
# Ciphers
#
-CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES=y
# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/buildroot/target/device/armadeus/pps/pps_defconfig b/buildroot/target/device/armadeus/pps/pps_defconfig
index 04470d2..586df38 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
-# Fri Nov 5 16:15:18 2010
+# Wed Dec 8 16:35:18 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -301,7 +301,8 @@ BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
#
# The minimum needed to build a uClibc development system
#
-# BR2_PACKAGE_FLEX is not set
+BR2_PACKAGE_FLEX=y
+BR2_PACKAGE_FLEX_LIBFL=y
# BR2_PACKAGE_GCC_TARGET is not set
# BR2_PACKAGE_MAKE is not set
@@ -401,7 +402,7 @@ BR2_PACKAGE_BOA=y
#
# bluez-utils not available (need dbus)
#
-# BR2_PACKAGE_BRIDGE is not set
+BR2_PACKAGE_BRIDGE=y
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
BR2_PACKAGE_ETHTOOL=y
@@ -410,11 +411,15 @@ BR2_PACKAGE_ETHTOOL=y
# BR2_PACKAGE_IRDA_UTILS is not set
# BR2_PACKAGE_IPERF is not set
# BR2_PACKAGE_IPROUTE2 is not set
-
-#
-# ipsec-tools - disabled (requires openssl, flex and the flex library (libfl.a) )
-#
-# BR2_PACKAGE_IPTABLES 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_FRAG=y
+BR2_PACKAGE_IPSEC_TOOLS_STATS=y
+BR2_PACKAGE_IPSEC_TOOLS_IPV6=y
+# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
+BR2_PACKAGE_IPSEC_TOOLS_LIBS=y
+BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_KISMET is not set
# BR2_PACKAGE_L2TP is not set
# BR2_PACKAGE_LIBCGI is not set
diff --git a/patches/buildroot/137-flex-bump_version.patch b/patches/buildroot/137-flex-bump_version.patch
new file mode 100644
index 0000000..8327ff1
--- /dev/null
+++ b/patches/buildroot/137-flex-bump_version.patch
@@ -0,0 +1,55 @@
+Version 2.5.33 of Flex and patch 11 are no more available, so change
+the software and patch version.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/flex/flex.mk
+===================================================================
+--- buildroot.orig/package/flex/flex.mk 2008-11-03 09:15:27.000000000 +0100
++++ buildroot/package/flex/flex.mk 2010-12-13 16:05:57.000000000 +0100
+@@ -3,8 +3,8 @@
+ # flex
+ #
+ #############################################################
+-FLEX_VERSION:=2.5.33
+-FLEX_PATCH_VERSION:=11
++FLEX_VERSION:=2.5.35
++FLEX_PATCH_VERSION:=10
+ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
+ FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
+ FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
+@@ -29,6 +29,7 @@
+ toolchain/patch-kernel.sh $(FLEX_DIR) $(FLEX_DIR)/debian/patches \*.patch; \
+ fi
+ endif
++ toolchain/patch-kernel.sh $(FLEX_DIR) package/flex/ flex-$(FLEX_VERSION)-\*.patch
+ $(CONFIG_UPDATE) $(FLEX_DIR)
+ touch $@
+
+Index: buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch 2010-12-16 15:32:55.000000000 +0100
+@@ -0,0 +1,22 @@
++This patch may be unnecessary depending on the toolchain used to compile flex.
++
++--- flex-2.5.35/configure.orig 2010-11-26 17:39:28.000000000 +0100
+++++ flex-2.5.35/configure 2010-11-26 17:40:00.000000000 +0100
++@@ -9169,7 +9169,7 @@
++
++
++ cat >>confdefs.h <<\_ACEOF
++-#define malloc rpl_malloc
+++/* #define malloc rpl_malloc */
++ _ACEOF
++
++ fi
++@@ -9399,7 +9399,7 @@
++
++
++ cat >>confdefs.h <<\_ACEOF
++-#define realloc rpl_realloc
+++/* #define realloc rpl_realloc */
++ _ACEOF
++
++ fi
diff --git a/patches/buildroot/138-ipsec-tools-bump_version_and_disable_security_context.patch b/patches/buildroot/138-ipsec-tools-bump_version_and_disable_security_context.patch
new file mode 100644
index 0000000..537837c
--- /dev/null
+++ b/patches/buildroot/138-ipsec-tools-bump_version_and_disable_security_context.patch
@@ -0,0 +1,26 @@
+Bump IPSec-Tools to version 0.8-alpha201022 to make it work with Linux Kernel 2.6.29 and
+disable security context.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/ipsec-tools/ipsec-tools.mk
+===================================================================
+--- buildroot.orig/package/ipsec-tools/ipsec-tools.mk 2010-12-10 16:51:06.000000000 +0100
++++ buildroot/package/ipsec-tools/ipsec-tools.mk 2010-12-10 16:51:38.000000000 +0100
+@@ -4,7 +4,7 @@
+ #
+ #############################################################
+
+-IPSEC_TOOLS_VERSION:=0.6.7
++IPSEC_TOOLS_VERSION:=0.8-alpha20101022
+ IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
+ IPSEC_TOOLS_CAT:=$(BZCAT)
+ IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VERSION)
+@@ -81,6 +81,7 @@
+ --without-libpam \
+ --disable-gssapi \
+ --with-kernel-headers=$(STAGING_DIR)/usr/include \
++ --enable-security-context=no \
+ $(IPSEC_TOOLS_CONFIG_FLAGS) \
+ )
+ # simpler than patching that cruft..
diff --git a/patches/buildroot/139-iptables-bump_version.patch b/patches/buildroot/139-iptables-bump_version.patch
new file mode 100644
index 0000000..d5163fe
--- /dev/null
+++ b/patches/buildroot/139-iptables-bump_version.patch
@@ -0,0 +1,50 @@
+Bump iptables version to 1.4.7 to make it work with Linux Kernel 2.6.29
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/iptables/iptables.mk
+===================================================================
+--- buildroot.orig/package/iptables/iptables.mk 2010-12-16 15:30:53.000000000 +0100
++++ buildroot/package/iptables/iptables.mk 2010-12-16 17:00:46.000000000 +0100
+@@ -3,16 +3,35 @@
+ # iptables
+ #
+ #############################################################
+-IPTABLES_VERSION = 1.4.1
++IPTABLES_VERSION = 1.4.7
+ IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
+ IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
+
+-IPTABLES_CONF_OPT = --libexecdir=/usr/lib
+-IPTABLES_INSTALL_TARGET = YES
++IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(LINUX_HEADERS_DIR)
++ifneq ($(BR2_INET_IPV6),y)
++IPTABLES_CONF_OPT += --disable-ipv6
++endif
+
+ IPTABLES_AUTORECONF = YES
+-IPTABLES_DEPENDENCIES =
+-IPTABLES_CONFIGURE_OPT = --with-kernel=$(LINUX_HEADERS_DIR)
+-IPTABLES_MAKE_OPT = GLIB_GENMARSHAL=/usr/bin/glib-genmarshal GLIB_MKENUMS=/usr/bin
++IPTABLES_LIBTOOL_PATCH = NO
+
+ $(eval $(call AUTOTARGETS,package,iptables))
++
++$(IPTABLES_HOOK_POST_INSTALL): $(IPTABLES_TARGET_INSTALL_TARGET)
++ ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables
++ ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-save
++ ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-restore
++ifeq ($(BR2_INET_IPV6),y)
++ ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables
++ ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-save
++ ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore
++endif
++ touch $@
++
++$(IPTABLES_TARGET_UNINSTALL):
++ $(call MESSAGE,"Uninstalling")
++ rm -f $(TARGET_DIR)/usr/bin/iptables-xml
++ rm -f $(TARGET_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/sbin/ip6tables*
++ rm -rf $(TARGET_DIR)/usr/lib/xtables
++ rm -f $(IPTABLES_TARGET_INSTALL_TARGET) $(IPTABLES_HOOK_POST_INSTALL)
++
diff --git a/patches/buildroot/2010.11/137-flex-bump_version.patch b/patches/buildroot/2010.11/137-flex-bump_version.patch
new file mode 100644
index 0000000..a1b145c
--- /dev/null
+++ b/patches/buildroot/2010.11/137-flex-bump_version.patch
@@ -0,0 +1,45 @@
+Version 9.1 of Flex patch is no more available, so upgrade it.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch 2010-11-26 17:50:52.000000000 +0100
+@@ -0,0 +1,22 @@
++This patch may be unnecessary depending on the toolchain used to compile flex.
++
++--- flex-2.5.35/configure.orig 2010-11-26 17:39:28.000000000 +0100
+++++ flex-2.5.35/configure 2010-11-26 17:40:00.000000000 +0100
++@@ -9169,7 +9169,7 @@
++
++
++ cat >>confdefs.h <<\_ACEOF
++-#define malloc rpl_malloc
+++/* #define malloc rpl_malloc */
++ _ACEOF
++
++ fi
++@@ -9399,7 +9399,7 @@
++
++
++ cat >>confdefs.h <<\_ACEOF
++-#define realloc rpl_realloc
+++/* #define realloc rpl_realloc */
++ _ACEOF
++
++ fi
+Index: buildroot/package/flex/flex.mk
+===================================================================
+--- buildroot.orig/package/flex/flex.mk 2010-11-26 17:22:56.000000000 +0100
++++ buildroot/package/flex/flex.mk 2010-11-26 17:34:09.000000000 +0100
+@@ -4,7 +4,7 @@
+ #
+ #############################################################
+ FLEX_VERSION:=2.5.35
+-FLEX_PATCH_VERSION:=9.1
++FLEX_PATCH_VERSION:=10
+ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
+ FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
+ FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
diff --git a/patches/buildroot/2010.11/138-ipsec-tools-bump_version.patch b/patches/buildroot/2010.11/138-ipsec-tools-bump_version.patch
new file mode 100644
index 0000000..e330df7
--- /dev/null
+++ b/patches/buildroot/2010.11/138-ipsec-tools-bump_version.patch
@@ -0,0 +1,21 @@
+Bump IPSec-Tools to version 0.8-alpha201022 to make it work with Linux Kernel 2.6.29 and
+disable security context.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/ipsec-tools/ipsec-tools.mk
+===================================================================
+--- buildroot.orig/package/ipsec-tools/ipsec-tools.mk 2010-12-10 17:21:15.000000000 +0100
++++ buildroot/package/ipsec-tools/ipsec-tools.mk 2010-12-10 17:27:01.000000000 +0100
+@@ -4,9 +4,9 @@
+ #
+ #############################################################
+
+-IPSEC_TOOLS_VERSION = 0.7.3
++IPSEC_TOOLS_VERSION = 0.8-alpha20101022
+ IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
+-IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
++IPSEC_TOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ipsec-tools/
+ IPSEC_TOOLS_INSTALL_STAGING = YES
+ IPSEC_TOOLS_MAKE = $(MAKE1)
+ IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
diff --git a/target/pps/configs/ipsec-tools.conf b/target/pps/configs/ipsec-tools.conf
new file mode 100644
index 0000000..8e98d69
--- /dev/null
+++ b/target/pps/configs/ipsec-tools.conf
@@ -0,0 +1,59 @@
+#
+# THE ARMADEUS PROJECT
+#
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+#!/usr/sbin/setkey -f
+
+# NOTE: Do not use this file if you use racoon with racoon-tool
+# utility. racoon-tool will setup SAs and SPDs automatically using
+# /etc/racoon/racoon-tool.conf configuration.
+#
+
+## Flush the SAD and SPD
+#
+flush;
+spdflush;
+
+# Attention: Use this keys only for testing purposes!
+# Generate your own keys!
+
+# AH SAs using 128 bit long keys
+add 192.168.0.225 192.168.0.208 ah 0x200 -A hmac-md5
+ 0xc0291ff014dccdd03874d9e8e4cdf3e6;
+
+add 192.168.0.208 192.168.0.225 ah 0x300 -A hmac-md5
+ 0x96358c90783bbfa3d7b196ceabe0536b;
+
+# ESP SAs using 192 bit long keys (168 + 24 parity)
+
+add 192.168.0.225 192.168.0.208 esp 0x201 -E 3des-cbc
+ 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831;
+add 192.168.0.208 192.168.0.225 esp 0x301 -E 3des-cbc
+ 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df;
+
+
+# Security policies
+spdadd 192.168.0.225 192.168.0.208 any -P in ipsec
+ esp/transport//require
+ ah/transport//require;
+
+spdadd 192.168.0.208 192.168.0.225 any -P out ipsec
+ esp/transport//require
+ ah/transport//require;
+
diff --git a/target/pps/scripts/test_wifi.sh b/target/pps/scripts/test_bridge.sh
similarity index 65%
copy from target/pps/scripts/test_wifi.sh
copy to target/pps/scripts/test_bridge.sh
index 9b9c5c5..e5cedd3 100644
--- a/target/pps/scripts/test_wifi.sh
+++ b/target/pps/scripts/test_bridge.sh
@@ -18,17 +18,23 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-modprobe libertas_sdio
+# stop active interfaces if any:
+ ifconfig usb0 down 2>/dev/null
+ ifconfig eth0 down 2>/dev/null
+ ifconfig eth1 down 2>/dev/null
+ ifconfig usb1 down 2>/dev/null
-# shutdown other ports
-ifconfig usb0 down 2>/dev/null
-ifconfig eth0 down 2>/dev/null
-ifconfig usb1 down 2>/dev/null
+ modprobe smsc95xx
+ brctl addbr br0
+ brctl addif br0 eth0
+ brctl addif br0 usb0
-ifconfig eth1 up
-iwconfig eth1 mode managed essid armadeus key restricted 93d7-e853-22e8-8784-0b4a-629c-ab
+ ifconfig eth0 0.0.0.0
+ ifconfig usb0 0.0.0.0
+ ifconfig br0 up
+ ifconfig eth0 up
+ ifconfig usb0 up
+ #if you want you can add bridge device himself:
+
+ ifconfig br0 192.168.0.208 netmask 255.255.255.0
-
-ifconfig eth1 192.168.0.251
-sleep 1
-echo -e "\nTo check the wifi port, please browse on 192.168.0.251\n"
diff --git a/target/pps/scripts/test_ipsec.sh b/target/pps/scripts/test_ipsec.sh
new file mode 100644
index 0000000..98d9aa5
--- /dev/null
+++ b/target/pps/scripts/test_ipsec.sh
@@ -0,0 +1,83 @@
+#
+# THE ARMADEUS PROJECT
+#
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+if [ -f /etc/ipsec-tools.conf ]; then
+
+ #****** 1: definition *****
+
+ #dont forget to edit the file /etc/ipsec-tools.conf on the system with this address
+ export IPADDR=
+
+ if [ "$IPADDR" != "" ]; then
+
+ #****** 2:create connection (PPS Ethernet port) ****
+ ifconfig usb0 down 2>/dev/null
+ ifconfig eth1 down 2>/dev/null
+ ifconfig usb1 down 2>/dev/null
+
+ ifconfig eth0 $IPADDR
+
+ #****** 3:securize the connection with IPSec ****
+ setkey -f /etc/ipsec-tools.conf
+
+ if [ $? -eq 0 ]; then
+ echo -e "\nHere are the keys you just set with IPSec:\n"
+ setkey -D
+
+ echo -e "\nNow you can test the IPSec securized connection by activating it on your host PC:\n- First you have to put on your host PC in the directory /etc/ the file ipsec-tools.conf.\n- Then you can run IPSec with the command: sudo /etc/init.d/setkey start\n- On your system, you can run a telnet toward your host PC\n- Check with Wireshark on your host PC that you can't see the protocol TELNET and your password in the datagrams.\n"
+ fi
+ else
+ echo -e '\nThe variable IPADDR is not initialized. \nYou have to fill this variable in the file /usr/local/pps/scripts/test_ipsec.sh\n'
+ fi
+else
+ echo -e '\nThe file /etc/ipsec-tools.conf doesnt exist.\nYou have to create this file and fill it with the correct datas, like this:\n
+ ## Flush the SAD and SPD
+ #
+ flush;
+ spdflush;
+
+ # Attention: Use this keys only for testing purposes!
+ # Generate your own keys!
+
+ # AH SAs using 128 bit long keys
+ add 192.168.0.225 192.168.0.208 ah 0x200 -A hmac-md5
+ 0xc0291ff014dccdd03874d9e8e4cdf3e6;
+
+ add 192.168.0.208 192.168.0.225 ah 0x300 -A hmac-md5
+ 0x96358c90783bbfa3d7b196ceabe0536b;
+
+ # ESP SAs using 192 bit long keys (168 + 24 parity)
+
+ add 192.168.0.225 192.168.0.208 esp 0x201 -E 3des-cbc
+ 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831;
+ add 192.168.0.208 192.168.0.225 esp 0x301 -E 3des-cbc
+ 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df;
+
+
+ # Security policies
+ spdadd 192.168.0.225 192.168.0.208 any -P out ipsec
+ esp/transport//require
+ ah/transport//require;
+
+ spdadd 192.168.0.208 192.168.0.225 any -P in ipsec
+ esp/transport//require
+ ah/transport//require;\n'
+fi
+
diff --git a/target/pps/scripts/test_ssh_tunnel.sh b/target/pps/scripts/test_ssh_tunnel.sh
new file mode 100644
index 0000000..1b9dabc
--- /dev/null
+++ b/target/pps/scripts/test_ssh_tunnel.sh
@@ -0,0 +1,55 @@
+#
+# THE ARMADEUS PROJECT
+#
+# Copyright (C) year The armadeus systems team [Jérémie Scheer]
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+#****** 1: definition *****
+
+export USERNAME=
+export HOSTNAME=
+#dont forget to add the tunnel port to the file /etc/ssh/sshd_config on your Host PC.
+export PORTNAME= #(configure firewall and NAT for this port if necessary)
+# define tunnel id (port;standard value should be 23; avoid it because NAT config may be already used for ssh )
+export TELNETPORT=
+
+if [ "$USERNAME" != "" -a "$HOSTNAME" != "" -a "$PORTNAME" != "" -a "$TELNETPORT" != "" ]; then
+ # ****** 2: Activate the connection interface (PPS Ethernet port) *****
+ ifconfig usb0 down 2>/dev/null
+ ifconfig eth1 down 2>/dev/null
+ ifconfig usb1 down 2>/dev/null
+
+ ifconfig eth0 192.168.0.208
+
+ # ****** 2: create the ssh tunnel (check first if exists !!!)*****
+
+ ps -eaf |grep "ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTNAME -p $PORTNAME" | grep -vq "grep"
+ [ $? -eq 1 ] && ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTNAME -p $PORTNAME ;
+
+ # *** 3: start telnet (if tunnel exist!!) : !! NOTE: host name is localhost !!! ***
+
+ ps -eaf |grep "ssh -fN -L $TELNETPORT:localhost:$TELNETPORT -C $USERNAME@$HOSTNAME -p $PORTNAME" | grep -vq "grep"
+ res=$?
+
+ [ $res -eq 0 ] && echo -e "\nSSH tunnel is created on localhost, port 23. Now connecting to host $HOSTNAME with telnet.\n You can check if the tunnel is properly encrypting the datas with Wireshark: you must not see the protocol TELNET or your password in the datagrams.\n"
+ [ $res -eq 0 ] && telnet -l $USERNAME localhost
+else
+ echo -e "\nOne or many of the variables USERNAME, HOSTNAME, PORTNAME and TELNETPORT are not initialized. \nYou have to fill these variables in the file /usr/local/pps/scripts/test_ssh_tunnel.sh\n"
+fi
+
+
+
hooks/post-receive
--
armadeus
|
