merge of 4d5b94a92602e5e257fa068651ecc2760fd67b44

     and cccbd67a0ede7ae4d1db1f9c45f544ed28d0b294

34 files changed, 2352 insertions, 62 deletions

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index efafe698dd..98dfb5cff1 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -106,6 +106,7 @@ ${PKGDIR}/packages/libvorbis/*.bb \
 ${PKGDIR}/packages/libxml/*.bb \
 ${PKGDIR}/packages/linux-libc-headers/*.bb \
 ${PKGDIR}/packages/linux/*.bb \
+${PKGDIR}/packages/lirc/*.bb \
 ${PKGDIR}/packages/lrzsz/*.bb \
 ${PKGDIR}/packages/lsof/*.bb \
 ${PKGDIR}/packages/lzo/*.bb \
@@ -182,6 +183,7 @@ ${PKGDIR}/packages/sane-backends/*.bb \
 ${PKGDIR}/packages/screen/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
+${PKGDIR}/packages/setserial/*.bb \
 ${PKGDIR}/packages/sgml-common/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/slugos-init/*.bb \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 58e2ab65c7..0bedaa7f71 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -163,7 +163,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15.1"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index de5d780579..5fe8d2278b 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r9"
+PR = "r10"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 33e869bbe1..cefc46c8d0 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -42,6 +42,11 @@ run_module() {
 	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
 	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
 	
+	if test -z "$nfs_host"
+	then
+		die "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET"
+		
+	fi
 	
 	# WLAN with DHCP needs some time to get a lease, set up the routing, etc.	
 	echo -n "Waiting for WLAN"
diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
index 1949f20b48..13f98a0d41 100644
--- a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
+++ b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
@@ -1,6 +1,8 @@
 # !/bin/sh
 M_TITLE="Copy rootfs to SD/CF"
 
+# Unfinished script.
+exit 0
 
 die() {
 	echo "ERROR: $1" >/dev/tty0
@@ -50,7 +52,7 @@ ask_target() {
 ask_format() {
 	if test "$ROOTFS_TARGET_FS" != ext2
 	then
-		echo -e "\nYou are not using the ext2 filesystem on your target.\nYou now have two choices:"
+		echo -e "\nYou are not using the ext2 filesystem on your target ($ROOTFS_TARGET_FS)$.\nYou now have two choices:"
 		echo -e "\t[1] Reformat to ext2"
 		echo -e "\t[2] Use an image-file ontop of the existing filesystem"
 		
@@ -113,7 +115,7 @@ ask_confirm() {
 
 direct_install() {
 
-	format_target
+	#format_target
 		
 	echo -n "Creating temporary directory..."
 	mkdir -p /media/temp && echo ok || die "mkdir -p /media/temp failed!"
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 0598c8ce93..7afb3727f9 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -185,18 +185,26 @@ set_password() {
 	then
 		echo -e "\nAltboot is a boot-manager which allows to boot from SD,\nCF and NFS"
 		echo -e "\nFor security reasons altboot requires a password\nto boot into init=/bin/sh."
-		echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}"
-		echo -e "${C_BLUE}\nNote:\tThe password will be echoed to the screen\n\tand it will be asked twice for confirmation.${C_RESET}"
-		echo -e "\nPlease enter a new master password:\n"
+		echo -e "${C_RED}This is *not* your root password!\nIt is used by altboot alone!${C_RESET}\n"
+		#echo -e "${C_BLUE}\nNote:\tThe password will be echoed to the screen\n\tand it will be asked twice for confirmation.${C_RESET}"
+		#echo -e "\nPlease enter a new master password:\n"
 
 		while true
 		do
-			echo -en "New password: "
+			echo -en "\nNew password: "
+
+			stty -echo
 			read junk1 < /dev/tty0
+			stty echo
+
 			if ! test -z "$junk1"
 			then
-				echo -n "Repeat: "
+				echo -en "\nRepeat: "
+				
+				stty -echo
 				read junk2  < /dev/tty0
+				stty echo
+				echo ""
 				
 				if test "$junk1" = "$junk2"
 				then
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 2b7df14c86..b1d0704501 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -146,6 +146,7 @@ run_timer() {
 		mount -t proc proc /proc >/dev/null 2>&1
 		key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`"
 	
+		stty -echo
 		echo -en "\n\nPlease press any key to launch altboot." > /dev/tty1
 		
 		test -z "$TIMEOUT" && TIMEOUT="3"
@@ -157,6 +158,7 @@ run_timer() {
 			if test "`cat /proc/interrupts | grep keyboard | awk '{print $2}'`" != "$key_ints" 
 			then				
 				launch_altboot=yes				
+				stty echo
 				break
 			fi
 			echo -n "." >/dev/tty1
@@ -206,16 +208,28 @@ launch_selection() {
 wait_for_input() {
 	while true
 	do
-		echo -n "Please choose one of the above [$last_selection]: " </dev/tty0 > /dev/tty0 2>&1
-		read junk < /dev/tty0 2>&1
-
+		
+		
+		# Do _not_ change the next few lines!
+		# 	
 		# This is required to work around an annoying busybox bug.
 		# Every key you press while this script runs will be
-		# picked up by the next "read $junk". And there's no goddamn way
-		# to prevent it. So the next read would pick up the "any" key the user pressed
+		# picked up by the next "read $junk".	
+		# So the next read would pick up the "any" key the user pressed
 		# above to launch the altboot menu.		
-		junk="`echo "$junk" |  sed -n "s/.*\([0-9]\)/\1/p"`"
+				
+ 		
+		# This filters an "<ENTER>" from the user as "any key"
+		( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 &
+		sleep 1; kill $!
+				
 		
+
+		echo -n "Please choose one of the above [$last_selection]: " </dev/tty0 > /dev/tty0 2>&1
+		read junk< /dev/tty0 2>&1
+		
+		# This filters other chars the user may have used
+		junk="`echo "$junk" |  sed -n "s/.*\([0-9]\)/\1/p"`"
 		
 		if test "$junk" -lt "$cnt" -o "$junk" -eq "$cnt" 
 		then
@@ -243,6 +257,9 @@ wait_for_input() {
 
 # * * * * * * This is the main function * * * * * *
 
+# if /sbin/init is launched with a parameter, it is very likely that the user is trying to switch runlevels
+# manually by running "/sbin/init $RUN_LEVEL". If it is empty (or just contains "tty1") we assume that the kernel
+# launched init during bootup
 if test -n "$*" -a "$*" != "tty1"
 then
 	echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1
@@ -251,7 +268,7 @@ then
 else	
 
 	# Execute scripts in /etc/altboot.rc before doing anything else.
-	# Required for special situations, like booting spitz
+	# Required in special situations, like booting spitz
 	RC_FILES=`ls /etc/altboot.rc | grep \.sh$`
 
 	for file in $RC_FILES
diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
index b3de2db061..6fdf0d8c2c 100644
--- a/packages/ctrlproxy/ctrlproxy_2.6.2.bb
+++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 DEPENDS = "glib-2.0 libxml2 popt pcre openssl"
-PR = "r0"
+PR = "r1"
 LICENSE = "GPL"
 
 SRC_URI = "http://sources.nslu2-linux.org/sources/ctrlproxy-2.6.2.tar.gz"
@@ -16,6 +16,13 @@ inherit autotools
 #INITSCRIPT_PARAMS = "defaults 84"
 # CONFFILES_${PN} = "${sysconfdir}/foo.conf" 
 
+# To fix this error in autotools_do_configure (which arises after a
+# change to pkg-config pkg.m4):
+#configure:314: error: possibly undefined macro: PKG_LIBS
+do_configure() {
+	oe_runconf
+}
+
 CFLAGS += "-L${STAGING_LIBDIR}"
 
 #do_install() {
diff --git a/packages/dsniff/dsniff_2.3.bb b/packages/dsniff/dsniff_2.3.bb
index 21e7c39674..8da4ad82aa 100644
--- a/packages/dsniff/dsniff_2.3.bb
+++ b/packages/dsniff/dsniff_2.3.bb
@@ -3,7 +3,10 @@ DESCRIPTION = "dsniff is a collection of tools for network auditing and penetrat
 LICENSE = "BSD"
 PR = "r1"
 
-DEPENDS = "virtual/db libpcap libnet libnids openssl"
+# There is a significant API change beween 1.0.2a of libnet and
+# 1.1.x, dsniff will only work with the older and there is no
+# updated version of dnsniff.
+DEPENDS = "virtual/db libpcap libnet-1.0 libnids openssl"
 
 SRC_URI = "http://www.monkey.org/~dugsong/dsniff/dsniff-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
index dc45e948df..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
@@ -1,4 +1,4 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
 keycode   1 = +a                +A                +a                Control_a        Control_a       
 keycode   2 = +b                +B                underscore       Control_b        Control_b       
 keycode   3 = +c                +C                +c                Control_c        Control_c       
@@ -33,17 +33,17 @@ keycode  31 = BackSpace        BackSpace        Delete           BackSpace
 keycode  32 = Num_Lock         Num_Lock         Num_Lock         Num_Lock         Num_Lock        
 keycode  33 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  34 = Escape           Escape           Escape           Escape           Escape          
-keycode  35 = Left             Left             Home             Left             Left            
+keycode  35 = Left             Left             Decr_Console             Left             Left            
 keycode  36 = Up               Up               PageUp           Up               Up              
 keycode  37 = Down             Down             PageDown         Down             Down            
-keycode  38 = Right            Right            End              Right            Right           
+keycode  38 = Right            Right            Incr_Console             Right            Right           
 keycode  39 = Return           Return           Return           Return           Return          
 keycode  40 = F12              VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol 	Console_1      
+keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol 	Console_2 	
+keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol 	Console_3 	
+keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol  	Console_4 	
+keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol  	Console_5 	
 keycode  46 = six              ampersand        VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  47 = seven            apostrophe       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  48 = eight            parenleft        VoidSymbol       VoidSymbol       VoidSymbol      
@@ -57,7 +57,7 @@ keycode  55 = at               grave            VoidSymbol       VoidSymbol
 keycode  56 = Control          Control          Control          Control          Control         
 keycode  57 = Alt              Alt              Alt              Alt              Alt             
 keycode  58 = Control          Control          Control          Control          Control         
-keycode  59 = minus            at               VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  59 = minus            VoidSymbol       at	         VoidSymbol       VoidSymbol      
 keycode  60 = Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock      
 keycode  61 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  62 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
@@ -67,7 +67,7 @@ keycode  65 = Tab              Tab              Caps_Lock        Tab
 keycode  66 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  67 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  68 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  69 = asciitilde       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  69 = Alt	       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  70 = slash            VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  71 = KP_1             KP_1             KP_1             KP_1             KP_1            
 keycode  72 = KP_2             KP_2             KP_2             KP_2             KP_2            
diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
index dc45e948df..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
@@ -1,4 +1,4 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
 keycode   1 = +a                +A                +a                Control_a        Control_a       
 keycode   2 = +b                +B                underscore       Control_b        Control_b       
 keycode   3 = +c                +C                +c                Control_c        Control_c       
@@ -33,17 +33,17 @@ keycode  31 = BackSpace        BackSpace        Delete           BackSpace
 keycode  32 = Num_Lock         Num_Lock         Num_Lock         Num_Lock         Num_Lock        
 keycode  33 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  34 = Escape           Escape           Escape           Escape           Escape          
-keycode  35 = Left             Left             Home             Left             Left            
+keycode  35 = Left             Left             Decr_Console             Left             Left            
 keycode  36 = Up               Up               PageUp           Up               Up              
 keycode  37 = Down             Down             PageDown         Down             Down            
-keycode  38 = Right            Right            End              Right            Right           
+keycode  38 = Right            Right            Incr_Console             Right            Right           
 keycode  39 = Return           Return           Return           Return           Return          
 keycode  40 = F12              VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol 	Console_1      
+keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol 	Console_2 	
+keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol 	Console_3 	
+keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol  	Console_4 	
+keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol  	Console_5 	
 keycode  46 = six              ampersand        VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  47 = seven            apostrophe       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  48 = eight            parenleft        VoidSymbol       VoidSymbol       VoidSymbol      
@@ -57,7 +57,7 @@ keycode  55 = at               grave            VoidSymbol       VoidSymbol
 keycode  56 = Control          Control          Control          Control          Control         
 keycode  57 = Alt              Alt              Alt              Alt              Alt             
 keycode  58 = Control          Control          Control          Control          Control         
-keycode  59 = minus            at               VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  59 = minus            VoidSymbol       at	         VoidSymbol       VoidSymbol      
 keycode  60 = Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock      
 keycode  61 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  62 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
@@ -67,7 +67,7 @@ keycode  65 = Tab              Tab              Caps_Lock        Tab
 keycode  66 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  67 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  68 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  69 = asciitilde       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  69 = Alt	       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  70 = slash            VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  71 = KP_1             KP_1             KP_1             KP_1             KP_1            
 keycode  72 = KP_2             KP_2             KP_2             KP_2             KP_2            
diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/initscripts/initscripts-1.0/keymap
index 792a31d6da..6ebc634266 100755
--- a/packages/initscripts/initscripts-1.0/keymap
+++ b/packages/initscripts/initscripts-1.0/keymap
@@ -6,3 +6,11 @@ KERNEL_MAJMIN=`uname -r | cut -d '.' -f 1,2`
 if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then
 	loadkeys /etc/keymap-$KERNEL_MAJMIN.map
 fi
+
+if ( ls "/etc" | grep -q "keymap-extension-${KERNEL_MAJMIN}" )
+then
+	for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*` 
+	do	
+		loadkeys "$extension"
+	done
+fi
diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
index dc45e948df..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
@@ -1,4 +1,4 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
 keycode   1 = +a                +A                +a                Control_a        Control_a       
 keycode   2 = +b                +B                underscore       Control_b        Control_b       
 keycode   3 = +c                +C                +c                Control_c        Control_c       
@@ -33,17 +33,17 @@ keycode  31 = BackSpace        BackSpace        Delete           BackSpace
 keycode  32 = Num_Lock         Num_Lock         Num_Lock         Num_Lock         Num_Lock        
 keycode  33 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  34 = Escape           Escape           Escape           Escape           Escape          
-keycode  35 = Left             Left             Home             Left             Left            
+keycode  35 = Left             Left             Decr_Console             Left             Left            
 keycode  36 = Up               Up               PageUp           Up               Up              
 keycode  37 = Down             Down             PageDown         Down             Down            
-keycode  38 = Right            Right            End              Right            Right           
+keycode  38 = Right            Right            Incr_Console             Right            Right           
 keycode  39 = Return           Return           Return           Return           Return          
 keycode  40 = F12              VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol 	Console_1      
+keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol 	Console_2 	
+keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol 	Console_3 	
+keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol  	Console_4 	
+keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol  	Console_5 	
 keycode  46 = six              ampersand        VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  47 = seven            apostrophe       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  48 = eight            parenleft        VoidSymbol       VoidSymbol       VoidSymbol      
@@ -57,7 +57,7 @@ keycode  55 = at               grave            VoidSymbol       VoidSymbol
 keycode  56 = Control          Control          Control          Control          Control         
 keycode  57 = Alt              Alt              Alt              Alt              Alt             
 keycode  58 = Control          Control          Control          Control          Control         
-keycode  59 = minus            at               VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  59 = minus            VoidSymbol       at	         VoidSymbol       VoidSymbol      
 keycode  60 = Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock      
 keycode  61 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  62 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
@@ -67,7 +67,7 @@ keycode  65 = Tab              Tab              Caps_Lock        Tab
 keycode  66 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  67 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  68 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  69 = asciitilde       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  69 = Alt	       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  70 = slash            VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  71 = KP_1             KP_1             KP_1             KP_1             KP_1            
 keycode  72 = KP_2             KP_2             KP_2             KP_2             KP_2            
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index c5332f23cf..18017d1e90 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 = "r59"
+PR = "r63"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/keymap-locales/.mtn2git_empty b/packages/keymap-locales/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/.mtn2git_empty
diff --git a/packages/keymap-locales/files/.mtn2git_empty b/packages/keymap-locales/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/files/.mtn2git_empty
diff --git a/packages/keymap-locales/files/akita/.mtn2git_empty b/packages/keymap-locales/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/files/akita/.mtn2git_empty
diff --git a/packages/keymap-locales/files/akita/keymap-extension-2.4-de.map b/packages/keymap-locales/files/akita/keymap-extension-2.4-de.map
new file mode 100644
index 0000000000..0a43c8d107
--- /dev/null
+++ b/packages/keymap-locales/files/akita/keymap-extension-2.4-de.map
@@ -0,0 +1,8 @@
+# German keymappings
+shift altgr keycode 1  = +Adiaeresis
+shift altgr keycode 15 = +Odiaeresis
+shift altgr keycode 21 = +Udiaeresis
+altgr keycode 1  = +adiaeresis
+altgr keycode 15 = +odiaeresis
+altgr keycode 21 = +udiaeresis
+altgr keycode 19 = ssharp
diff --git a/packages/keymap-locales/files/placeholder.map b/packages/keymap-locales/files/placeholder.map
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/files/placeholder.map
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
new file mode 100644
index 0000000000..89cb5aa580
--- /dev/null
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Localized key mappings"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
+LICENSE = "GPL"
+
+PR = "r1"
+
+SRC_URI = "file://*.map"
+
+# If any python guru wants to setup PACKAGES_$machine with some code instead,
+# be my guet =)
+PACKAGES_akita = "keymap-extension-de"
+
+FILES_keymap-extension-de = "/etc/*-de.map"
+FILES_keymap-extension-fr = "/etc/*-fr.map"
+
+do_install() {
+	install -d ${D}/${sysconfdir}
+	
+	install -m 0644 ${WORKDIR}/*.map ${D}/${sysconfdir}
+}
diff --git a/packages/libnet/libnet_1.0.2a.bb b/packages/libnet/libnet_1.0.2a.bb
index 9cfcdf8a2a..071a53e0cd 100644
--- a/packages/libnet/libnet_1.0.2a.bb
+++ b/packages/libnet/libnet_1.0.2a.bb
@@ -6,6 +6,9 @@ SECTION = "libs/network"
 LICENSE = "GPL"
 PR = "r1"
 
+# There are major API changes beween libnet v1.0 and libnet v1.1
+PROVIDES = "libnet-1.0"
+
 SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \
 	   file://configure.patch;patch=1 \
 	   file://configure.uclibc.patch;patch=1 \
diff --git a/packages/libnet/libnet_1.1.2.1.bb b/packages/libnet/libnet_1.1.2.1.bb
index 4c862dce9e..c28b98a304 100644
--- a/packages/libnet/libnet_1.1.2.1.bb
+++ b/packages/libnet/libnet_1.1.2.1.bb
@@ -6,6 +6,9 @@ PRIORITY = "optional"
 DEPENDS = "libpcap"
 PR = "r0"
 
+# There are major API changes beween libnet v1.0 and libnet v1.1
+PROVIDES = "libnet-1.1"
+
 SRC_URI = "http://www.packetfactory.net/libnet/dist/libnet-${PV}.tar.gz \
 	   file://support-uclibc.patch;patch=1 \
 	   file://fix-endianess-test.patch;patch=1 \
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
index 761b9c3203..b4cde1bf41 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.bb
+++ b/