merge of 974e37be6affd939e11c5a461e60456cb8f157c0

     and bc963c96596aeadb28f51b32a5991fa477af778c

29 files changed, 367 insertions, 102 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 33e655dcb6..5efabd1cfc 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -2,19 +2,20 @@
 #@NAME: OpenSlug
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
-# Add to the user's feeds from local.conf (there may be none)
-# not all available yet
-#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross"
-#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native"
-FEED_URIS_append_linux += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe"
-#
-# if you are very very brave:
-#FEED_URIS_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable"
-
 DISTRO_NAME = "OpenSlug"
 DISTRO_VERSION = "2.2-beta"
 DISTRO_TYPE ?= "beta"
 
+# Add to the user's feeds from local.conf (there may be none)
+FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}"
+FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}"
+
+#
+# Uncomment the following to get the unstable feeds
+#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable"
+#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable"
+
+
 TARGET_FPU_local ?= "soft"
 TARGET_FPU := "${TARGET_FPU_local}"
 TARGET_OS_local ?= "linux"
@@ -32,6 +33,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE
 
 OPENSLUG_EXTRA_DEPENDS  ?= "e2fsprogs reiserfsprogs upslug-native lrzsz"
 
+# CMDLINE* macros define the kernel command line.  CMDLINE_DEBUG is provided
+# to enable/disable debugging in the distro.  Here noirqdebug is used to
+# remove the messages about unhandled interrupts - people debugging interrupt
+# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
+CMDLINE_DEBUG = "noirqdebug"
+
 # Filesystem support modules are listed in here for easy removal,
 # as is the lrzsz serial package and other kernel modules which are
 # not absolutely required for boot.
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 1484ac191c..2ce73ac836 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -19,6 +19,14 @@ IMAGE_ROOTFS_SIZE_ext2.gz = "10240"
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 PACKAGE_ARCH = "armeb"
 
+# Optimization settings.  Os works fine and is significantly
+# better than O2.  The other settings are somewhat arbitrary.
+# The optimisations chosen here include the ones which 'break'
+# symbolic debugging (because the compiler does not include
+# enough information to allow the debugger to know where given
+# values are.)
+FULL_OPTIMIZATION = "-fomit-frame-pointer -frename-registers -fweb -funit-at-a-time -Os"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 KERNEL_CONSOLE = "ttyS0,115200n8"
 USE_VT = "0"
diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf
index e33de0582e..22ade477e2 100644
--- a/conf/machine/tosa-2.4.conf
+++ b/conf/machine/tosa-2.4.conf
@@ -1,6 +1,7 @@
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \
+
+BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \
 			    orinoco-modules sharp-sdmmc-support usbutils"
 BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \
 			     kernel-module-evdev kernel-module-net-fd \
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index d546ed5c09..ec58e08bef 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r37"
+PR = "r38"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -126,6 +126,7 @@ do_install_append_openslug() {
 	rm -r ${D}/mnt/*
 	rmdir ${D}/home/root
 	install -m 0755 -d ${D}/root
+	ln -s ../root ${D}/home/root
 }
 
 PACKAGES = "${PN}-doc ${PN}"
diff --git a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
index e8b6ba59b5..0f97865c3f 100644
--- a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
+++ b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch
@@ -5,7 +5,7 @@
  
  gen: gen.c
 -	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	cc ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++	${BUILD_CC} ${EXT_CFLAGS} ${BUILD_CFLAGS} ${ALL_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
  
  rbtdb64.@O@: rbtdb.c
  
diff --git a/packages/flite/flite-1.2/configure-with-audio.patch b/packages/flite/flite-1.2/configure-with-audio.patch
new file mode 100644
index 0000000000..4f320ac068
--- /dev/null
+++ b/packages/flite/flite-1.2/configure-with-audio.patch
@@ -0,0 +1,20 @@
+*** flite-1.2-release/configure.in~	Tue Feb 18 01:45:45 2003
+--- flite-1.2-release/configure.in	Mon Jul 18 22:01:25 2005
+***************
+*** 144,150 ****
+  dnl
+  AC_ARG_WITH( audio,
+  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
+!         AUDIODRIVER=$with_audio )
+  
+  if test "x$AUDIODEFS" = x; then
+      case "$AUDIODRIVER" in
+--- 144,151 ----
+  dnl
+  AC_ARG_WITH( audio,
+  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
+!         [AUDIODRIVER=$with_audio
+!          AUDIODEFS=])
+  
+  if test "x$AUDIODEFS" = x; then
+      case "$AUDIODRIVER" in
diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index b8696fd829..c9a3e71e92 100644
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -1,14 +1,15 @@
-SECTION = "console/utils"
-HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
-DESCRIPTION = "festival light speech synthesizer"
+DESCRIPTION = "flite - the festival light speech synthesizer"
 PRIORITY = "optional"
+HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
+SECTION = "console/utils"
 LICENSE = "flite"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r1"
+MAINTAINER = "Patrick Ohly <Patrick.Ohly@gmx.de>"
+PR = "r2"
 
 PARALLEL_MAKE = ""
 
 SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
+           file://configure-with-audio.patch;patch=1 \
            file://fix-read-only-assignments.patch;patch=1"
 S = "${WORKDIR}/flite-${PV}-release"
 
diff --git a/packages/ftpd-topfield/files/init b/packages/ftpd-topfield/files/init
index a4cd501e10..0816e8bb7d 100644
--- a/packages/ftpd-topfield/files/init
+++ b/packages/ftpd-topfield/files/init
@@ -2,7 +2,7 @@
 DAEMON=/usr/sbin/ftpd-topfield
 NAME=ftpd-topfield
 DESC="FTP daemon for the Topfield PVR"
-ARGS="-D -e"
+ARGS="-D -P 21 -e"
 
 test -f $DAEMON || exit 0
 
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb
index 625cbe28fb..6a6665c8ed 100644
--- a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
 
 DEPENDS = "libusb"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_1 \
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_2 \
 	   cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \
 	   file://init"
 
diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch
new file mode 100644
index 0000000000..3cfaa5771e
--- /dev/null
+++ b/packages/gaim/files/desktop-name_1.4.0.patch
@@ -0,0 +1,11 @@
+--- gaim-1.4.0/gaim.desktop.old	2005-07-15 00:58:50.000000000 +0200
++++ gaim-1.4.0/gaim.desktop	2005-07-15 00:59:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ 
+-Name=Gaim Internet Messenger
++Name=Gaim
+ Name[ca]=Missatger d'Internet Gaim
+ Name[cs]=Gaim Internet Messenger
+ Name[da]=Gaim - internet beskeder
diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb
new file mode 100644
index 0000000000..ec55ea5b94
--- /dev/null
+++ b/packages/gaim/gaim_1.4.0.bb
@@ -0,0 +1,9 @@
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+	file://desktop-name_1.4.0.patch;patch=1"
+
+include gaim.inc
+
+CFLAGS += "-D_GNU_SOURCE"
+
diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb
new file mode 100644
index 0000000000..8292991a89
--- /dev/null
+++ b/packages/gpgme/gpgme_1.0.3.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
+PR = "r1"
+
+DEPENDS = "libgpg-error pth libassuan"
+
+EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
+
+inherit autotools binconfig
+
+do_stage() {
+	autotools_stage_includes
+
+	install -d ${STAGING_LIBDIR}
+	oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
+	oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
+	oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
+
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
+}
+
diff --git a/packages/gpsd/gpsd_2.26.bb b/packages/gpsd/gpsd_2.28.bb
index cd5e223142..cd5e223142 100644
--- a/packages/gpsd/gpsd_2.26.bb
+++ b/packages/gpsd/gpsd_2.28.bb
diff --git a/packages/kdepimpi/kdepimpi_2.1.13.bb b/packages/kdepimpi/kdepimpi_2.1.16.bb
index f3dde1a2fd..f3dde1a2fd 100644
--- a/packages/kdepimpi/kdepimpi_2.1.13.bb
+++ b/packages/kdepimpi/kdepimpi_2.1.16.bb
diff --git a/packages/kdepimpi/pwmpi_2.1.13.bb b/packages/kdepimpi/pwmpi_2.1.16.bb
index 904f640955..904f640955 100644
--- a/packages/kdepimpi/pwmpi_2.1.13.bb
+++ b/packages/kdepimpi/pwmpi_2.1.16.bb
diff --git a/packages/libgpelaunch/libgpelaunch_0.12.bb b/packages/libgpelaunch/libgpelaunch_0.12.bb
index 3178955d79..d42414d0d0 100644
--- a/packages/libgpelaunch/libgpelaunch_0.12.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.12.bb
@@ -2,7 +2,7 @@ LICENSE = "LGPL"
 DESCRIPTION = "GPE program launcher library"
 SECTION = "libs"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ startup-notification"
+DEPENDS = "gtk+ libgpewidget startup-notification"
 
 inherit autotools pkgconfig
 
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 44f466ef49..f5d7135c88 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -211,10 +211,12 @@ inherit kernel
 
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
-# To specify the console set KERNEL_CONSOLE in the .bb
-# file.  The default is currently set in machine/nslu2.conf
+# To specify the console set KERNEL_CONSOLE in the .bb file.
+# CMDLINE_ROOT contains the boot options
 CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s"
-CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+# Add distro specific debug (or non-debug) options to this
+CMDLINE_DEBUG ?= ""
+CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}"
 
 # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as
 # required.  Notice that this has to be done for each separately built
diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb
index a47cd1d8da..174ed700e4 100644
--- a/packages/lzma/lzma-native_4.17.bb
+++ b/packages/lzma/lzma-native_4.17.bb
@@ -1,19 +1,22 @@
 DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression."
 HOMEPAGE = "http://www.7-zip.org/"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \
-	file://lzma-406-zlib-stream.patch;patch=1"
-S = "${WORKDIR}"
+	   file://lzma-406-zlib-stream.patch;patch=1;pnum=2"
+S = "${WORKDIR}/SRC"
 
 inherit native
 
+CFLAGS += "-c -I${S}"
+
 do_compile() {
-	make -C ${S}/SRC/7zip/Compress/LZMA_Alone
-	make -C ${S}/SRC/7zip/Compress/LZMA_Lib
+	oe_runmake -C 7zip/Compress/LZMA_Alone
+	oe_runmake -C 7zip/Compress/LZMA_Lib
 }
 
 do_stage () {
-	install -m 0755 ${S}/SRC/7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
-	oe_libinstall -a ${S}/SRC/7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
+	install -m 0755 7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
+	oe_libinstall -a 7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
 }
diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions
index ac8e195abd..43b109977d 100755
--- a/packages/openslug-init/openslug-init-0.10/functions
+++ b/packages/openslug-init/openslug-init-0.10/functions
@@ -209,10 +209,13 @@ ifup(){
 	# is not left running so this will only work for
 	# the lease length time!
 	ifconfig "$iface" up
-	test -n "$hostname" && HOSTNAME="-H $hostname"
-	# The script writes the required shell variable assignments
-	# to file descriptor 9
-	eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null)
+	if test "$(config boot)" != static
+	then
+		test -n "$hostname" && HOSTNAME="-H $hostname"
+		# The script writes the required shell variable assignments
+		# to file descriptor 9
+		eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null)
+	fi
 
 	test -n "$broadcast" && BROADCAST="broadcast $broadcast"
 	test -n "$subnet" && NETMASK="netmask $subnet"
@@ -236,11 +239,18 @@ ifdown(){
 	ifconfig "$1" down
 }
 #
-# mountflash "flash root directory" {mount options}
+# mountflash "flash device" "flash root directory" {mount options}
 #  Finds and mounts the flash file system on the given directory
 mountflash() {
 	local ffsdev ffsdir
 
+	ffsdev="$1"
+	test -n "$ffsdev" -a -b "$ffsdev" || {
+		echo "$0: unable to find flash file system to copy ($ffsdev)" >&2
+		return 1
+	}
+	shift
+
 	ffsdir="$1"
 	test -n "$ffsdir" -a -d "$ffsdir" || {
 		echo "$0: mountflash $ffsdir: not a directory (internal error)" >&2
@@ -248,14 +258,70 @@ mountflash() {
 	}
 	shift
 
-	ffsdev="$(mtblockdev Flashdisk)"
-	test -n "$ffsdev" -a -b "$ffsdev" || {
-		echo "$0: unable to find flash file system to copy ($ffsdev)" >&2
-		return 1
-	}
 	mount -t jffs2 "$@" "$ffsdev" "$ffsdir" || {
 		echo "$0: $ffsdev: unable to mount flash file system on $ffsdir" >&2
 		return 1
 	}
 	return 0
 }
+#
+# umountflash [-r] "flash device"
+#  unmount any instance of the given flash device, if -r is specified a mount on
+#  root is an error, otherwise a mount on root is ignored (and remains).
+umountflash() {
+	local rootok ffsno ffsdev
+	rootok=1
+	case "$1" in
+	-r)	rootok=
+		shift;;
+	esac
+	#
+	# The argument is ffsdev
+	ffsdev="$1"
+	ffsno="$(devio "<<$ffsdev" prd)"
+	test -n "$ffsno" -a "$ffsno" -ge 0 || {
+		echo "$0: $ffsdev: device number $ffsno is not valid, cannot continue." >&2
+		return 1
+	}
+	#
+	# Make sure that Flashdisk isn't mounted on /
+	if test -z "$rootok" -a "$(devio "<</etc/init.d/sysconfsetup" prd)" -eq "$ffsno"
+	then
+		echo "$0: $ffsdev is mounted on /, use turnup ram" >&2
+		return 1
+	fi
+	#
+	# The function is currently always used interactively, so output 
+	echo "$0: umounting any existing mount of $ffsdev" >&2
+	#
+	# check each mount point, do this last first because otherwise nested
+	# mounts of ffsdev cannot be umounted.
+	ffs_umount() {
+		local device mp type options stuff
+
+		read device mp type options stuff
+		test -z "$device" && return 0
+
+		# handle following entries first
+		ffs_umount || return 1
+
+		# handle this entry, since this is currently only used for unmounting
+		# the flash root partition we know a file which must exist...
+		case "$type" in
+		jffs2)	test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" ||
+			umount "$mp" || {
+				echo "$0: $mp: unable to umount $ffsdev" >&2
+				return 1
+			};;
+		esac
+
+		return 0
+	}
+	#
+	ffs_umount </proc/mounts || {
+		echo "$0: umount $ffsdev from all mount points then re-run reflash" >&2
+		return 1
+	}
+
+	return 0
+}
diff --git a/packages/openslug-init/openslug-init-0.10/reflash b/packages/openslug-init/openslug-init-0.10/reflash
index 504e78f694..bcf51fc606 100644
--- a/packages/openslug-init/openslug-init-0.10/reflash
+++ b/packages/openslug-init/openslug-init-0.10/reflash
@@ -213,59 +213,15 @@ then
 		exit 1
 	}
 fi
-#
-# find the device number of the flash partition then make sure it isn't
-# mounted anywhere.
-if test -n "$ffsdev"
-then
-	ffsno="$(devio "<<$ffsdev" prd)"
-	test -n "$ffsno" -a "$ffsno" -ge 0 || {
-		echo "reflash: $ffsdev: device number $ffsno is not valid, cannot continue." >&2
-		exit 1
-	}
-	#
-	# Make sure that Flashdisk isn't mounted on /
-	if test "$(devio "<</etc/init.d/sysconfsetup" prd)" -eq "$ffsno"
-	then
-		echo "reflash: $ffsdev is mounted on /, use turnup ram to reflash" >&2
-		exit 1
-	fi
-fi
+
 #
 # INPUTS OK, ENVIRONMENT OK, UMOUNT ANY EXISTING MOUNT OF THE FLASHDISK
 # ---------------------------------------------------------------------
 # This is only required if the device is going to be used
 if test -n "$ffsdev"
 then
-	echo "reflash: umounting any existing mount of $ffsdev" >&2
-	#
-	# check each mount point, do this last first because otherwise nested
-	# mounts of ffsdev cannot be umounted.
-	ffs_umount() {
-		local device mp type options stuff
-
-		read device mp type options stuff
-		test -z "$device" && return 0
-
-		# handle following entries first
-		ffs_umount || return 1
-
-		# handle this entry
-		case "$type" in
-		jffs2)	test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd)" -ne "$ffsno" ||
-			umount "$mp" || {
-				echo "reflash: $mp: unable to umount $ffsdev" >&2
-				return 1
-			};;
-		esac
-
-		return 0
-	}
-	#
-	ffs_umount </proc/mounts || {
-		echo "reflash: umount $ffsdev from all mount points then re-run reflash" >&2
-		exit 1
-	}
+	# -r causes this to fail if the flash device is mounted on /
+	umountflash -r "$ffsdev" || exit 1
 	#
 	# Everything is umounted, now remount on a temporary directory.
 	ffsdir="/tmp/flashdisk.$$"
@@ -274,7 +230,7 @@ then
 		exit 1
 	}
 	#
-	mountflash "$ffsdir" -o ro || {
+	mountflash "$ffsdev" "$ffsdir" -o ro || {
 		rmdir "$ffsdir"
 		exit 1
 	}
@@ -471,7 +427,7 @@ echo "reflash: restoring saved configuration files" >&2
 # /etc/rcS.d/S99finish on first boot (if it does not exist).  We need
 # a timestamp earlier than any files we create so touch it here, this
 # also acts as a test on the mounted file system
-mountflash "$ffsdir" && :>"$ffsdir/etc/.configured" || {
+mountflash "$ffsdev" "$ffsdir" && :>"$ffsdir/etc/.configured" || {
 	rmdir "$ffsdir"
 	echo "reflash: mount of new flash root file system failed" >&2
 	if test -d "$ffsdir/etc"
diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/openslug-init/openslug-init-0.10/turnup
index ce504b022e..0029697c50 100644
--- a/packages/openslug-init/openslug-init-0.10/turnup
+++ b/packages/openslug-init/openslug-init-0.10/turnup
@@ -4,10 +4,13 @@
 #
 . /etc/default/functions
 
+#
+# configuration
+#  The following variables control which directories in /var end up on the rootfs
+#  and which end up in a temporary file system.
 INRAM_MEMSTICK="/var/cache /var/lock /var/log /var/run /var/tmp /var/lib/ipkg"
-INRAM_NFS="/var/cache /var/run"
+INRAM_NFS="/var/cache /var/lock /var/run /var/tmp"
 INRAM_DISK=""
-
 #
 # force: override certain checks
 force=
@@ -61,6 +64,23 @@ fsoptions() {
 	fi
 }
 #
+# get_flash <directory> {mount options}
+#  mount the flash device, writeable, on the given directory
+get_flash() {
+	local ffsdir ffsdev
+
+	ffsdir="$1"
+	shift
+	test -n "$ffsdir" -a -d "$ffsdir" || {
+		echo "$0: $ffsdir: internal error, flash mount point not a directory" >&2
+		return 1
+	}
+
+	ffsdev="$(mtblockdev Flashdisk)"
+	umountflash "$ffsdev" &&
+	mountflash "$ffsdev" "$ffsdir" "$@"
+}
+#
 # check_rootfs [-i] <root fs directory>
 #  Make sure the candidate rootfs is empty
 check_rootfs() {
@@ -425,7 +445,7 @@ disk() {
 	}
 
 	# make sure we can get to the flash file system first
-	mountflash "$ffs" || {
+	get_flash "$ffs" || {
 		rmdir "$new" "$ffs"
 		return 1
 	}
@@ -509,7 +529,7 @@ boot_reset() {
 		return 1
 	}
 
-	mountflash "$ffs" || {
+	get_flash "$ffs" || {
 		rmdir "$ffs"
 		return 1
 	}
@@ -558,7 +578,7 @@ nfs() {
 	}
 
 	# make sure we can get to the flash file system first
-	mountflash "$ffs" || {
+	get_flash "$ffs" || {
 		rmdir "$new" "$ffs"
 		return 1
 	}
@@ -670,7 +690,7 @@ fix_hw_addr() {
 		# this isn't the flash device
 		ffs="/tmp/flashdisk.$$"
 		# make sure we can get to the flash file system first
-		mountflash "$ffs" || {
+		get_flash "$ffs" || {
 			rmdir "$ffs"
 			return 1
 		}
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 59b8c0fd5d..fd2080ff65 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r38"
+PR = "r40"
 
 SRC_URI = "file://linuxrc \
 	   file://boot/flash \
diff --git a/packages/parted/.mtn2git_empty b/packages/parted/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/parted/.mtn2git_empty
diff --git a/packages/parted/parted_1.6.23.bb b/packages/parted/parted_1.6.23.bb
new file mode 100644
index 0000000000..d4182487fe
--- /dev/null
+++ b/packages/parted/parted_1.6.23.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "parted, the GNU partition resizing program"
+HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
+LICENSE = "GPLv2"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+SECTION = "console/tools"
+DEPENDS = "readline e2fsprogs-libs"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-Werror"
+
+inherit autotools
diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb
index 5ba7a1298b..609a808891 100644
--- a/packages/pcre/pcre_4.4.bb
+++ b/packages/pcre/pcre_4.4.bb
@@ -19,9 +19,11 @@ CFLAGS_append = " -D_REENTRANT"
 EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
 
 do_compile () {
-	${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c dftables.c
-	${BUILD_CC} dftables.o -o dftables
-	oe_runmake
+	# The generation of dftables can lead to timestamp problems with ccache
+	# because the generated config.h seems newer.  It is sufficient to ensure that the
+	# attempt to build dftables inside make will actually work (foo_FOR_BUILD is
+	# only used for this).
+	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}"
 }
 
 do_stage () {
diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb
index 5dc3542475..09febc9274 100644
--- a/packages/python/python_2.4.1.bb
+++ b/packages/python/python_2.4.1.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PROVIDES = "python python-core"
 DEPENDS = "python-native readline zlib gdbm openssl"
-PR = "ml6"
+PR = "ml7"
 
 PYTHON_MAJMIN = "2.4"
 
@@ -47,6 +47,7 @@ do_compile() {
 
 do_stage() {
 	install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
+	oe_libinstall -a -so libpython2.4 ${STAGING_LIBDIR}
 }
 
 do_install() {
diff --git a/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch
new file mode 100644
index 0000000000..b0a03c6a32
--- /dev/null
+++ b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch
@@ -0,0 +1,92 @@
+--- sylpheed-2.0.0beta6/config.h.in.old	2005-07-18 11:57:23.000000000 +0200
++++ sylpheed-2.0.0beta6/config.h.in	2005-07-18 11:59:57.000000000 +0200
+@@ -263,6 +263,9 @@
+ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
+ #undef TM_IN_SYS_TIME
+ 
++/* Define if you use GnuTLS to support SSL. */
++#undef USE_GNUTLS
++
+ /* Define if you use GPGME to support OpenPGP. */
+ #undef USE_GPGME
+ 
+@@ -273,6 +276,9 @@
+ #undef USE_LDAP
+ 
+ /* Define if you use OpenSSL to support SSL. */
++#undef USE_OPENSSL
++
++/* Define if SSL is supported. */
+ #undef USE_SSL
+ 
+ /* Whether to use multithread or not */
+--- sylpheed-2.0.0beta6/configure.in.old	2005-07-18 12:00:24.000000000 +0200
++++ sylpheed-2.0.0beta6/configure.in	2005-07-18 12:04:33.000000000 +0200
+@@ -202,7 +202,8 @@
+ #include <openssl/opensslv.h>
+ ],		[ return OPENSSL_VERSION_NUMBER; ],
+ 		[ AC_MSG_RESULT(yes)
+-		  AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ],
++	  	  AC_DEFINE(USE_SSL, 1, Define if SSL is supported.)
++	  	  AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ],
+ 		[ AC_MSG_RESULT(no)
+ 		  LIBS="$ac_save_LIBS"
+ 		  ac_cv_enable_ssl=no ])
+@@ -211,6 +212,27 @@
+ 	AC_MSG_RESULT(no)
+ fi
+ 
++AC_ARG_ENABLE(gnutls,
++	[  --enable-gnutls         Enable SSL support using GnuTLS [default=no]],
++	[ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no])
++AC_MSG_CHECKING([whether to use GnuTLS])
++if test $ac_cv_enable_gnutls = yes; then
++	AC_MSG_RESULT(yes)
++	AC_MSG_CHECKING([if GnuTLS is available])
++	LIBS="$LIBS -lgnutls-openssl"
++	AC_TRY_LINK([
++#include <gnutls/openssl.h>
++],	[ return OPENSSL_VERSION_NUMBER; ],
++	[ AC_MSG_RESULT(yes)
++	  AC_DEFINE(USE_SSL, 1, Define if SSL is supported.)
++	  AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ],
++	[ AC_MSG_RESULT(no)
++	  LIBS="$ac_save_LIBS"
++	  ac_cv_enable_gnutls=no ])
++else
++	AC_MSG_RESULT(no)
++fi
++
+ dnl Check for X-Face support
+ AC_ARG_ENABLE(compface,
+ 	[  --disable-compface      Do not use compface (X-Face)],
+@@ -350,6 +372,7 @@
+ echo "JPilot        : $ac_cv_enable_jpilot"
+ echo "LDAP          : $ac_cv_enable_ldap"
+ echo "OpenSSL       : $ac_cv_enable_ssl"
++echo "GnuTLS        : $ac_cv_enable_gnutls"
+ echo "iconv         : $am_cv_func_iconv"
+ echo "compface      : $ac_cv_enable_compface"
+ echo "IPv6          : $ac_cv_enable_ipv6"
+--- sylpheed-2.0.0beta6/src/ssl.h.old	2005-07-18 12:09:35.000000000 +0200
++++ sylpheed-2.0.0beta6/src/ssl.h	2005-07-18 12:11:15.000000000 +0200
+@@ -27,11 +27,19 @@
+ #if USE_SSL
+ 
+ #include <glib.h>
++#if USE_OPENSSL
+ #include <openssl/crypto.h>
+ #include <openssl/x509.h>
+ #include <openssl/pem.h>
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
++#else
++#if USE_GNUTLS
++#include <gnutls/openssl.h>
++#else
++#error Must select either GnuTLS or OpenSSL
++#endif
++#endif
+ 
+ #include "socket.h"
+ 
diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb
new file mode 100644
index 0000000000..4fab8e8bb8
--- /dev/null
+++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb
@@ -0,0 +1,30 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \
+	file://sylpheed-gnutls_2.0.0beta6.patch;patch=1"
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+	mkdir -p m4
+}
+
+inherit autotools 
+
+do_install_append() {
+	install -d ${D}${datadir}/applications
+	install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
+
diff --git a/packages/zaurus-updater/tosa/updater.sh b/packages/zaurus-updater/tosa/updater.sh
index e22edbf19a..5adfa97a1e 100644
--- a/packages/zaurus-updater/tosa/updater.sh
+++ b/packages/zaurus-updater/tosa/updater.sh
@@ -67,7 +67,7 @@ then
 	./consolescroll
 fi
 
-for TARGETFILE in zImage zimage ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
+for TARGETFILE in zImage zimage.bin ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
 do
 	if [ -e $TARGETFILE ]
 	then
@@ -78,8 +78,8 @@ do
 		#echo $TARGETFILE':'$DATASIZE'bytes'
 		TARGETTYPE=Invalid
 		case "$TARGETFILE" in
-##		zImage) TARGETTYPE=Kernel;;
-		zimage) TARGETTYPE=Kernel;;
+		zImage) TARGETTYPE=Kernel;;
+		zimage.bin) TARGETTYPE=Kernel;;
 		ZIMAGE) TARGETTYPE=Kernel;;
 		initrd.bin) TARGETTYPE=RoFs;;
 		INITRD.BIN) TARGETTYPE=RoFs;;