merge of 38a44153ccd68cbefcfc7eb3e945b52f959edfe6

     and a64c34c36a6a5002d454fa4f8693cedf5fce8d73

14 files changed, 156 insertions, 21 deletions

diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index feedfc769b..33e869bbe1 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -29,7 +29,7 @@ run_module() {
 	/etc/init.d/portmap start >/dev/tty1 2>&1 || die "/etc/init.d/portmap start failed!"
 	
 	# For some reason NFS mounts hang if /e/i/networking is not run.
-	# For the time beeing I'm to lazy to investigate ;)
+	# For the time beeing I'm too lazy to investigate ;)
 	/etc/init.d/networking start || die "/etc/init.d/networking start failed!"
 	
 	sleep 2
@@ -37,14 +37,44 @@ run_module() {
 	# After the PCMCIA service is started, an inserted WLAN card should automatically
 	# activate itself.
 	/etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!"
-	
-	# Give WLAN time to login into the network
-	echo "Waiting for WLAN..."
-	sleep 8
-		 
+
+	nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `"
 	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
 	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
 	
+	
+	# WLAN with DHCP needs some time to get a lease, set up the routing, etc.	
+	echo -n "Waiting for WLAN"
+	cnt=0
+	while true
+	do
+		if (ping -c 1 $nfs_host) >/dev/null 2>&1
+		then
+			echo " found"
+			break
+		else
+			if test "$cnt" = 30 -o "$cnt" = 60
+			then
+				echo ""
+				echo "WARNING: WLAN didn't activate in $cnt seconds!"
+				
+				if test "$cnt" = 30
+				then
+					echo "Restarting udhcpc"
+					killall udhcpc
+					udhcpc -i wlan0 -H `cat /etc/hostname`	
+				else
+					die "Failed to activate WLAN!"
+					break			
+				fi
+			else
+				echo -n "."
+				let cnt=$cnt+1
+			fi
+		fi
+		sleep 1
+	done				
+	
 	if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1
 	then
 		echo -e "Please select your NFS root:\n"
diff --git a/packages/e17/entrance/Sessions/.mtn2git_empty b/packages/e17/entrance/Session/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/e17/entrance/Sessions/.mtn2git_empty
+++ b/packages/e17/entrance/Session/.mtn2git_empty
diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Session/Enlightenment
index 4d33bbb2e9..4d33bbb2e9 100644
--- a/packages/e17/entrance/Sessions/Enlightenment
+++ b/packages/e17/entrance/Session/Enlightenment
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 574f6ea445..2714354856 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -15,7 +15,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/
            file://config-db.patch;patch=1 \
            file://allow-missing-xsession.patch;patch=1 \
 	   file://Xinit.d \
-	   file://Sessions"
+	   file://Session"
 	   
 S = "${WORKDIR}/entrance"
 
@@ -29,9 +29,9 @@ FILES += "${datadir}"
 do_install_append() {
 	install -d ${D}/etc/X11/Xinit.d
 	install -d ${D}/etc/X11/Xsession.d
-	install -d ${D}/etc/X11/Sessions
+	install -d ${D}/etc/X11/Session
 	
 	install -m 755 ${WORKDIR}/Xinit.d/* ${D}/etc/X11/Xinit.d
-	install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
+	install -m 755 ${WORKDIR}/Session/* ${D}/etc/X11/Session
 	
 }
diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh
index ed46b222d2..814dba676c 100755
--- a/packages/initscripts/initscripts-1.0/bootmisc.sh
+++ b/packages/initscripts/initscripts-1.0/bootmisc.sh
@@ -23,6 +23,20 @@ then
 fi
 
 #
+# Apply /proc settings if defined
+#
+SYSCTL_CONF="/etc/sysctl.conf"
+if [ -f "${SYSCTL_CONF}" ]
+then
+	if [ -x "/sbin/sysctl" ]
+	then
+		/sbin/sysctl -p "${SYSCTL_CONF}"
+	else
+		echo "To have ${SYSCTL_CONF} applied during boot, install package <procps>."
+	fi
+fi
+
+#
 # Update /etc/motd.
 #
 if test "$EDITMOTD" != no
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 99b2a7dfbd..d2160c0e29 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r54"
+PR = "r55"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb
index a67df35806..ab9fecc85c 100644
--- a/packages/iptables/iptables_1.3.3.bb
+++ b/packages/iptables/iptables_1.3.3.bb
@@ -2,10 +2,13 @@ DESCRIPTION = "iptables network filtering tools"
 HOMEPAGE = "http://www.netfilter.org/"
 SECTION = "console/utils"
 LICENSE = "GPL"
-PR = "r1"
+RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
+PR = "r3"
+
+
 
 PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${bindir}/iptables-save ${bindir}/iptables-restore"
+FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
 
 SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
 
@@ -22,7 +25,7 @@ do_compile () {
 }
 
 do_install () {
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
 }
 
 FILES_${PN}-doc += "${mandir}"
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index f10d7173f0..1843f21301 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa
 	   file://intdriven.patch;patch=1 \
 	   file://pollcontroller.patch;patch=1 \
 	   file://mm4.patch;patch=1"
-PR = "r7"
+PR = "r8"
 
 S = "${WORKDIR}"
 
diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb
index 0526374e96..91856a855a 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.4.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.zip
 	   file://badpaths.patch;patch=1 \
 	   file://build-timing-annoyance.patch;patch=1"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r3"
+PR = "r4"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 
diff --git a/packages/libcroco/.mtn2git_empty b/packages/libcroco/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libcroco/.mtn2git_empty
diff --git a/packages/libcroco/libcroco_0.6.0.bb b/packages/libcroco/libcroco_0.6.0.bb
new file mode 100644
index 0000000000..378b2ad523
--- /dev/null
+++ b/packages/libcroco/libcroco_0.6.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
+SECTION = "x11/utils"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+DEPENDS = "glib-2.0 libxml2"
+LICENSE = "LGPL"
+PR = "r0"
+
+inherit autotools pkgconfig gnome
+
+
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index ae20210282..f15fc998a3 100644
--- a/packages/linux/nslu2-kernel_2.6.12.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.2.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r10"
+PR = "r11"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include
diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig
index 9c4a61abda..15f2fecdb1 100644
--- a/packages/linux/openslug-kernel-2.6.12.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig
@@ -401,11 +401,13 @@ CONFIG_SCSI_QLA2XXX=y
 #
 # CONFIG_I2O is not set
 
+
 #
 # Networking support
 #
 CONFIG_NET=y
 
+
 #
 # Networking options
 #
@@ -427,6 +429,11 @@ CONFIG_INET_IPCOMP=m
 CONFIG_INET_TUNNEL=m
 CONFIG_IP_TCPDIAG=m
 CONFIG_IP_TCPDIAG_IPV6=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
 CONFIG_INET6_AH=m
@@ -435,10 +442,83 @@ CONFIG_INET6_IPCOMP=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+CONFIG_IP_NF_CT_PROTO_SCTP=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_MATCH_SCTP is not set
+CONFIG_IP_NF_MATCH_COMMENT=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_FILTER=m
+# CONFIG_IP_NF_TARGET_REJECT is not set
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
 
 #
 # SCTP Configuration (EXPERIMENTAL)
@@ -489,6 +569,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 # CONFIG_BT_HIDP is not set
 
+
 #
 # Bluetooth device drivers
 #
diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb
index 7da09d2715..3162fb50b3 100644
--- a/packages/nail/nail_11.21.bb
+++ b/packages/nail/nail_11.21.bb
@@ -13,9 +13,6 @@ S = "${WORKDIR}/nail-11.21/"
 
 inherit autotools
 
-# INITSCRIPT_NAME = "mt-daapd"
-# INITSCRIPT_PARAMS = "defaults 84"
-
 # EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes"
 
 do_install() {