merge of 'a716072bb40b66870ec9797e151cda776beacf6c'

     and 'b3615d69f6416b196ef0183e2864d4289292a007'

103 files changed, 1092 insertions, 53925 deletions

diff --git a/packages/aircrack/aircrack-ng_0.7.bb b/packages/aircrack/aircrack-ng_0.7.bb
deleted file mode 100644
index bf5bd27d9d..0000000000
--- a/packages/aircrack/aircrack-ng_0.7.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
-HOMEPAGE = "http://www.aircrack-ng.org/"
-LICENSE = "GPLv2"
-PR = "r2"
-
-SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
-
-oe_compile() {
-        oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-O3 ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
-}
-
-do_install() {
-        install -d ${D}/${sbindir}
-	install -d ${D}/${bindir}
-        install -m 0755 airodump-ng       ${D}/${sbindir}
-        install -m 0755 aircrack-ng       ${D}/${bindir}
-        install -m 0755 aireplay-ng       ${D}/${sbindir}
-        install -m 0755 airdecap-ng       ${D}/${bindir}
-        install -m 0755 packetforge-ng    ${D}/${bindir}
-        install -m 0755 airmon-ng         ${D}/${sbindir}
-        install -m 0755 ivstools          ${D}/${bindir}
-	install -m 0755 kstats		  ${D}/${bindir}
-	install -m 0755 airtun-ng	  ${D}/${bindir}
-}
diff --git a/packages/aircrack/aircrack-ng_0.9.bb b/packages/aircrack/aircrack-ng_0.9.1.bb
index d19e2e2065..116ee599e3 100644
--- a/packages/aircrack/aircrack-ng_0.9.bb
+++ b/packages/aircrack/aircrack-ng_0.9.1.bb
@@ -1,15 +1,11 @@
-SECTION = "console/network"
 DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.aircrack-ng.org/"
+SECTION = "console/network"
 LICENSE = "GPLv2"
 PR = "r2"
 
 SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
 
-oe_compile() {
-        oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-O3 ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
-}
-
 do_install() {
         install -d ${D}/${sbindir}
 	install -d ${D}/${bindir}
diff --git a/packages/aircrack/aircrack-ng_1.0-svn.bb b/packages/aircrack/aircrack-ng_1.0-svn.bb
new file mode 100644
index 0000000000..a09957bb45
--- /dev/null
+++ b/packages/aircrack/aircrack-ng_1.0-svn.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
+HOMEPAGE = "http://www.aircrack-ng.org/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "openssl"
+PV = "0.9.99+svn${SRCDATE}"
+PR = "r0"
+SRC_URI = "svn://trac.aircrack-ng.org/svn/branch;module=1.0-dev;proto=http \
+           file://makefile-ldflags.patch;patch=1;maxdate=20070629 "
+ 
+S="${WORKDIR}/1.0-dev"
+ 
+DEFAULT_PREFERENCE = "-1"
+
+export TOOL_PREFIX = "${HOST_SYS}-"
+
+do_install() {
+        install -d ${D}/${sbindir}
+        install -d ${D}/${bindir}
+        install -m 0755 src/airodump-ng       ${D}/${sbindir}
+        install -m 0755 src/aircrack-ng       ${D}/${bindir}
+        install -m 0755 src/aireplay-ng       ${D}/${sbindir}
+        install -m 0755 src/airserv-ng        ${D}/${sbindir}
+        install -m 0755 src/wesside-ng        ${D}/${sbindir}
+        install -m 0755 src/airdecap-ng       ${D}/${bindir}
+        install -m 0755 src/packetforge-ng    ${D}/${bindir}
+        install -m 0755 airmon-ng             ${D}/${sbindir}
+        install -m 0755 src/ivstools          ${D}/${bindir}
+        install -m 0755 src/kstats            ${D}/${bindir}
+        install -m 0755 src/airtun-ng         ${D}/${sbindir}
+        install -m 0755 test/makeivs          ${D}/${bindir}
+}
+
diff --git a/packages/aircrack/files/makefile-ldflags.patch b/packages/aircrack/files/makefile-ldflags.patch
new file mode 100644
index 0000000000..da2a0afaf1
--- /dev/null
+++ b/packages/aircrack/files/makefile-ldflags.patch
@@ -0,0 +1,13 @@
+Index: 1.0-dev/src/Makefile
+===================================================================
+--- 1.0-dev.orig/src/Makefile	2007-06-29 21:16:15.000000000 +0100
++++ 1.0-dev/src/Makefile	2007-06-29 21:16:32.000000000 +0100
+@@ -36,7 +36,7 @@
+ endif
+ LIBOSD		= $(OSD)/lib$(OSD).a
+ 
+-LIBSSL		= -lssl -lcrypto
++LIBSSL		= -lssl -lcrypto $(LDFLAGS)
+ 
+ all: osd userland $(SBINFILES)
+ 
diff --git a/packages/apex/apex_1.5.6.bb b/packages/apex/apex_1.5.8.bb
index ccf08ca9a0..ccf08ca9a0 100644
--- a/packages/apex/apex_1.5.6.bb
+++ b/packages/apex/apex_1.5.8.bb
diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig
index cc92ce16dd..9bdbef2f6b 100644
--- a/packages/apex/nslu2/defconfig
+++ b/packages/apex/nslu2/defconfig
@@ -19,6 +19,7 @@ CONFIG_EXPERIMENTAL=y
 #
 CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)"
 CONFIG_CROSS_COMPILE=""
+CONFIG_AEABI=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
 # CONFIG_CC_NO_OPTIMIZATION is not set
@@ -133,6 +134,7 @@ CONFIG_AUTOBOOT=y
 CONFIG_AUTOBOOT_DELAY=10
 CONFIG_ENV_STARTUP_KERNEL_COPY=y
 # CONFIG_ENV_REGION_KERNEL_SWAP is not set
+# CONFIG_ENV_STARTUP_PREFIX_P is not set
 
 #
 #    Regions
@@ -147,6 +149,8 @@ CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,1
 # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
 CONFIG_USES_NOR_BOOTFLASH=y
 CONFIG_RELOCATE_SIMPLE=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y
 # CONFIG_BIGENDIAN is not set
 # CONFIG_LITTLEENDIAN is not set
 CONFIG_CLEAR_STACKS=y
diff --git a/packages/efl1/esmart_0.9.0.009.bb b/packages/efl1/esmart_0.9.0.009.bb
index 8d2ce2eb3e..928a8c1afd 100644
--- a/packages/efl1/esmart_0.9.0.009.bb
+++ b/packages/efl1/esmart_0.9.0.009.bb
@@ -13,6 +13,7 @@ PACKAGES =+ "${PN}-textentry \
              ${PN}-file-dialog \
              ${PN}-draggies \