merge of 0aa8df480a5fe2c0daeaff3c39171cce7fde6a4a

     and cbe9e2ec3566ef5af4fa806a0faec1ddf3984cd4

23 files changed, 1016 insertions, 114 deletions

diff --git a/packages/altboot/altboot_1.0.7-rc3.bb b/packages/altboot/altboot_1.0.7-rc3.bb
deleted file mode 100644
index 245cf2a426..0000000000
--- a/packages/altboot/altboot_1.0.7-rc3.bb
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: altboot_1.0.5-rc2.bb
-# Date: 21-Feb-06
-
-DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-LICENSE = "GPL"
-
-######################################################################################
-
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
-RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
-
-RDEPENDS_${PN} = "${PN}-conf"
-RDEPENDS_${PN}-conf = "${PN}"
-
-######################################################################################
-
-PR = "r0"
-
-######################################################################################
-
-PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-
-PACKAGE_ARCH_${PN} = all
-PACKAGE_ARCH_${PN}-doc = all
-PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
-
-SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
-
-S = "${WORKDIR}/altboot/"
-
-######################################################################################
-
-FILES_${PN}-conf = "/etc/altboot*.cfg"
-
-######################################################################################
-
-do_install() {
-	install -d ${D}/sbin
-	install -d ${D}/etc/altboot-menu
-	install -d ${D}/etc/altboot-menu/Advanced
-	install -d ${D}/etc/altboot.rc
-	install -d ${D}/usr/share/doc/altboot
-	install -d ${D}/usr/share/sounds
-	
-	if test -d ${WORKDIR}/altboot/${MACHINE}
-	then
-		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
-	else
-		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
-	fi
-
-	install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
-	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
-	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
-	
-	install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
-
-	install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	
-	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc	
-}		
-
-######################################################################################
-
-do_configure() {
-	cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_
-	mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot
-}
-
-######################################################################################
-
-pkg_postinst_${PN}() {
-	update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-######################################################################################
-
-pkg_postrm_${PN}() {
-	update-alternatives --remove init /sbin/init.altboot
-}
-
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 08ba81e962..2c106efa73 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -177,9 +177,12 @@ run_timer() {
 		case "`uname -r`" in
 		2.4*)	key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";;
 		2.6*)	key_ints="`cat /proc/interrupts | grep Spitzkbd`"
-			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`";;	
+			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`"
+			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i locomokbd`";;	
 		esac		
 	
+		test -z "$key_ints" && debug_echo "Couldn't read keyboard ints!"
+		
 		stty -echo  <"$OUT_TTY" >"$OUT_TTY" 2>&1
 		echo -en "\n\nPlease press any key to launch altboot." > "$OUT_TTY"
 		
@@ -192,7 +195,8 @@ run_timer() {
 			case "`uname -r`" in
 			2.4*)	key_ints_now="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";;
 			2.6*)	key_ints_now="`cat /proc/interrupts | grep Spitzkbd`"
-				test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`";;	
+				test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`"
+				test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i locomokbd`";;	
 			esac		
 			
 			if test "$key_ints_now" != "$key_ints" -o -z "$key_ints_now"
@@ -323,7 +327,7 @@ then
 	debug_shell 4 >/dev/null 2>&1 &
 fi
 
-if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force"
+if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1" != "+force"
 then
 	echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >"$OUT_TTY"
 	exec $REAL_INIT $*
diff --git a/packages/busybox/slingbox-1.1.3/.mtn2git_empty b/packages/busybox/slingbox-1.1.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/slingbox-1.1.3/.mtn2git_empty
diff --git a/packages/busybox/slingbox-1.1.3/Makefile_args.patch b/packages/busybox/slingbox-1.1.3/Makefile_args.patch
new file mode 100644
index 0000000000..7561a89b94
--- /dev/null
+++ b/packages/busybox/slingbox-1.1.3/Makefile_args.patch
@@ -0,0 +1,11 @@
+--- busybox-1.1.2/Makefile.orig	2006-04-10 14:45:46.000000000 -0500
++++ busybox-1.1.2/Makefile	2006-05-15 00:54:31.000000000 -0500
+@@ -79,6 +79,8 @@
+ 	top_srcdir=$(top_srcdir) \
+ 	top_builddir=$(top_builddir) \
+ 	KBUILD_SRC=$(top_srcdir) \
++	PREFIX=$(PREFIX) \
++	CROSS=$(CROSS) \
+ 	-f $(CURDIR)/Makefile $@
+ 
+ $(KBUILD_OUTPUT)/Rules.mak:
diff --git a/packages/busybox/slingbox-1.1.3/defconfig b/packages/busybox/slingbox-1.1.3/defconfig
new file mode 100644
index 0000000000..c297988ea5
--- /dev/null
+++ b/packages/busybox/slingbox-1.1.3/defconfig
@@ -0,0 +1,594 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_FEATURE_DEVPTS is not set
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_DISABLE_SHARED is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+USING_CROSS_COMPILER=y
+CROSS_COMPILER_PREFIX="armv5b-softfloat-linux-"
+EXTRA_CFLAGS_OPTIONS=""
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_DEBUG_YANK_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+PREFIX="/"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_COMPRESS=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_UNCOMPRESS=y
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+# CONFIG_BASENAME is not set
+# CONFIG_CAL is not set
+# CONFIG_CAT is not set
+# CONFIG_CHGRP is not set
+# CONFIG_CHMOD is not set
+# CONFIG_CHOWN is not set
+CONFIG_CHROOT=y
+# CONFIG_CMP is not set
+# CONFIG_COMM is not set
+# CONFIG_CP is not set
+CONFIG_CUT=y
+# CONFIG_DATE is not set
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+# CONFIG_DD is not set
+# CONFIG_DF is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
+# CONFIG_ECHO is not set
+# CONFIG_FEATURE_FANCY_ECHO is not set
+# CONFIG_ENV is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+# CONFIG_FALSE is not set
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+# CONFIG_HOSTID is not set
+# CONFIG_ID is not set
+# CONFIG_INSTALL is not set
+# CONFIG_LENGTH is not set
+# CONFIG_LN is not set
+# CONFIG_LOGNAME is not set
+# CONFIG_LS is not set
+# CONFIG_FEATURE_LS_FILETYPES is not set
+# CONFIG_FEATURE_LS_FOLLOWLINKS is not set
+# CONFIG_FEATURE_LS_RECURSIVE is not set
+# CONFIG_FEATURE_LS_SORTFILES is not set
+# CONFIG_FEATURE_LS_TIMESTAMPS is not set
+# CONFIG_FEATURE_LS_USERNAME is not set
+# CONFIG_FEATURE_LS_COLOR is not set
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+# CONFIG_MKDIR is not set
+CONFIG_MKFIFO=y
+# CONFIG_MKNOD is not set
+# CONFIG_MV is not set
+# CONFIG_NICE is not set
+# CONFIG_NOHUP is not set
+# CONFIG_OD is not set
+# CONFIG_PRINTENV is not set
+# CONFIG_PRINTF is not set
+# CONFIG_PWD is not set
+# CONFIG_REALPATH is not set
+# CONFIG_RM is not set
+CONFIG_RMDIR=y
+# CONFIG_SEQ is not set
+# CONFIG_SHA1SUM is not set
+# CONFIG_SLEEP is not set
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_BIG is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+# CONFIG_STTY is not set
+# CONFIG_SUM is not set
+# CONFIG_SYNC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+# CONFIG_TEST is not set
+# CONFIG_FEATURE_TEST_64 is not set
+# CONFIG_TOUCH is not set
+# CONFIG_TR is not set
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+# CONFIG_TRUE is not set
+# CONFIG_TTY is not set
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+# CONFIG_USLEEP is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+# CONFIG_WATCH is not set
+# CONFIG_WC is not set
+# CONFIG_WHO is not set
+# CONFIG_WHOAMI is not set
+# CONFIG_YES is not set
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+# CONFIG_FEATURE_HUMAN_READABLE is not set
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+# CONFIG_CLEAR is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
+# CONFIG_RESET is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+# CONFIG_READLINK is not set
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
+# CONFIG_RUN_PARTS is not set
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_WHICH is not set
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_PATCH is not set
+CONFIG_SED=y
+# CONFIG_VI is not set
+# CONFIG_FEATURE_VI_COLON is not set
+# CONFIG_FEATURE_VI_YANKMARK is not set
+# CONFIG_FEATURE_VI_SEARCH is not set
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+# CONFIG_FEATURE_VI_WIN_RESIZE is not set
+# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
+
+#
+# Finding Utilities
+#
+# CONFIG_FIND is not set
+# CONFIG_FEATURE_FIND_MTIME is not set
+# CONFIG_FEATURE_FIND_MMIN is not set
+# CONFIG_FEATURE_FIND_PERM is not set
+# CONFIG_FEATURE_FIND_TYPE is not set
+# CONFIG_FEATURE_FIND_XDEV is not set
+# CONFIG_FEATURE_FIND_NEWER is not set
+# CONFIG_FEATURE_FIND_INUM is not set
+# CONFIG_FEATURE_FIND_EXEC is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+# CONFIG_FEATURE_GREP_CONTEXT is not set
+# CONFIG_XARGS is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_HALT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_E2FSCK is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+# CONFIG_MKE2FS is not set
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_INSMOD is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+# CONFIG_RMMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_2_6_MODULES is not set
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+# CONFIG_DMESG is not set
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+# CONFIG_FDISK is not set
+FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+# CONFIG_HWCLOCK is not set
+# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_MKSWAP is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_PIVOT_ROOT=y
+# CONFIG_RDATE is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+# CONFIG_SWAPONOFF is not set
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+# CONFIG_LESS is not set
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TIME is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_HOSTNAME is not set
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_IFCONFIG is not set
+# CONFIG_FEATURE_IFCONFIG_STATUS is not set
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFUPDOWN is not set
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+# CONFIG_FEATURE_IP_ADDRESS is not set
+# CONFIG_FEATURE_IP_LINK is not set
+# CONFIG_FEATURE_IP_ROUTE is not set
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_NSLOOKUP is not set
+# CONFIG_PING is not set
+# CONFIG_FEATURE_FANCY_PING is not set
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
+# CONFIG_ROUTE is not set
+# CONFIG_TELNET is not set
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_INETD is not set
+# CONFIG_TFTP is not set
+# CONFIG_FEATURE_TFTP_GET is not set
+# CONFIG_FEATURE_TFTP_PUT is not set
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_FEATURE_TFTP_DEBUG is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+
+#
+# udhcp Server/Client
+#
+# CONFIG_UDHCPD is not set
+# CONFIG_UDHCPC is not set
+# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCP_SYSLOG is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+# CONFIG_FUSER is not set
+# CONFIG_KILL is not set
+# CONFIG_KILLALL is not set
+# CONFIG_PIDOF is not set
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PS is not set
+# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_RENICE is not set
+# CONFIG_BB_SYSCTL is not set
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_UPTIME is not set
+
+#
+# Shells
+#
+# CONFIG_FEATURE_SH_IS_ASH is not set
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+CONFIG_FEATURE_SH_IS_NONE=y
+# CONFIG_ASH is not set
+# CONFIG_ASH_JOB_CONTROL is not set
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+# CONFIG_ASH_ALIAS is not set
+# CONFIG_ASH_MATH_SUPPORT is not set
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_BUILTIN_ECHO is not set
+# CONFIG_ASH_MAIL is not set
+# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+# CONFIG_FEATURE_COMMAND_EDITING is not set
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=0
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
+
+#
+# System Logging Utilities
+#
+# CONFIG_SYSLOGD is not set
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+# CONFIG_KLOGD is not set
+# CONFIG_LOGGER is not set
diff --git a/packages/busybox/slingbox-1.1.3/lazy_umount.patch b/packages/busybox/slingbox-1.1.3/lazy_umount.patch
new file mode 100644
index 0000000000..d5156d00d3
--- /dev/null
+++ b/packages/busybox/slingbox-1.1.3/lazy_umount.patch
@@ -0,0 +1,28 @@
+--- busybox-1.1.2/util-linux/umount.c~	2006-03-22 15:16:26.000000000 -0600
++++ busybox-1.1.2/util-linux/umount.c	2006-05-15 11:43:23.000000000 -0500
+@@ -21,7 +21,7 @@
+ #include <getopt.h>
+ #include "busybox.h"
+ 
+-#define OPTION_STRING		"flDnrvad"
++#define OPTION_STRING		"flDnrvadL"
+ #define OPT_FORCE			1
+ #define OPT_LAZY			2
+ #define OPT_DONTFREELOOP	4
+@@ -29,6 +29,7 @@
+ #define OPT_REMOUNT			16
+ #define OPT_IGNORED			32	// -v is ignored
+ #define OPT_ALL				(ENABLE_FEATURE_UMOUNT_ALL ? 64 : 0)
++#define OPT_LINKSYS_LAZY		256
+ 
+ int umount_main(int argc, char **argv)
+ {
+@@ -51,6 +52,8 @@
+ 	argc -= optind;
+ 	argv += optind;
+ 
++	if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L option same as -l */
++
+ 	doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
+ 
+ 	/* Get a list of mount points from mtab.  We read them all in now mostly
diff --git a/packages/busybox/slingbox-1.1.3/slingbox.patch b/packages/busybox/slingbox-1.1.3/slingbox.patch
new file mode 100644
index 0000000000..3759723bce
--- /dev/null
+++ b/packages/busybox/slingbox-1.1.3/slingbox.patch
@@ -0,0 +1,38 @@
+--- slingbox/applets/install.sh.orig	2006-05-14 18:08:17.000000000 -0500
++++ slingbox/applets/install.sh	2006-05-14 18:10:40.000000000 -0500
+@@ -33,28 +33,28 @@
+ 		fi
+ 	done
+ fi
+-rm -f $prefix/bin/busybox || exit 1
++rm -f $prefix/bin/slingbox || exit 1
+ mkdir -p $prefix/bin || exit 1
+-install -m 755 busybox $prefix/bin/busybox || exit 1
++install -m 755 busybox $prefix/bin/slingbox || exit 1
+ 
+ for i in $h ; do
+ 	appdir=`dirname $i`
+ 	mkdir -p $prefix/$appdir || exit 1
+ 	if [ "$2" = "--hardlinks" ]; then
+-	    bb_path="$prefix/bin/busybox"
++	    bb_path="$prefix/bin/slingbox"
+ 	else
+ 	    case "$appdir" in
+ 		/)
+-		    bb_path="bin/busybox"
++		    bb_path="bin/slingbox"
+ 		;;
+ 		/bin)
+-		    bb_path="busybox"
++		    bb_path="slingbox"
+ 		;;
+ 		/sbin)
+-		    bb_path="../bin/busybox"
++		    bb_path="../bin/slingbox"
+ 		;;
+ 		/usr/bin|/usr/sbin)
+-		    bb_path="../../bin/busybox"
++		    bb_path="../../bin/slingbox"
+ 		;;
+ 		*)
+ 		echo "Unknown installation directory: $appdir"
diff --git a/packages/busybox/slingbox-1.1.3/slingbox_name.patch b/packages/busybox/slingbox-1.1.3/slingbox_name.patch
new file mode 100644
index 0000000000..aeb7221fe2
--- /dev/null
+++ b/packages/busybox/slingbox-1.1.3/slingbox_name.patch
@@ -0,0 +1,10 @@
+--- busybox-1.1.2/applets/applets.c~	2006-03-22 15:16:25.000000000 -0600
++++ busybox-1.1.2/applets/applets.c	2006-05-15 11:53:18.000000000 -0500
+@@ -447,6 +447,7 @@
+ 	if(ENABLE_FEATURE_SUID_CONFIG) parse_config_file ();
+ 
+ 	if(!strncmp(name, "busybox", 7)) busybox_main(argc, argv);
++	if(!strncmp(name, "slingbox", 8)) busybox_main(argc, argv);
+ 	/* Do a binary search to find the applet entry given the name. */
+ 	applet_using = find_applet_by_name(name);
+ 	if(applet_using) {
diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb
new file mode 100644
index 0000000000..5fc31dec41
--- /dev/null
+++ b/packages/busybox/slingbox_1.1.3.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
+to enable ipkg to run on an Unslung NSLU2 device."
+HOMEPAGE = "http://www.busybox.net"
+LICENSE = "GPL"
+SECTION = "base"
+PRIORITY = "required"
+PR = "r1"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+           file://defconfig \
+           file://Makefile_args.patch;patch=1 \
+           file://lazy_umount.patch;patch=1 \
+           file://slingbox_name.patch;patch=1 \
+           file://slingbox.patch;patch=1"
+
+S = "${WORKDIR}/busybox-${PV}"
+
+python () {
+	# Don't build slingbox unless we're targeting an nslu2
+	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+		raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
+}
+
+export EXTRA_CFLAGS = "${CFLAGS}"
+EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "/"
+FILES_${PN}-doc = ""
+FILES_${PN}-dev = ""
+FILES_${PN}-locale = ""
+
+inherit cml1
+
+do_configure () {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	cml1_do_configure
+}
+
+do_compile () {
+	unset CFLAGS
+	base_do_compile
+}
+
+do_install () {
+	oe_runmake 'PREFIX=${D}' install
+}
diff --git a/packages/cherokee/cherokee-0.5.3/.mtn2git_empty b/packages/cherokee/cherokee-0.5.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.3/.mtn2git_empty
diff --git a/packages/cherokee/cherokee-0.5.3/Makefile.cget.patch b/packages/cherokee/cherokee-0.5.3/Makefile.cget.patch
new file mode 100644
index 0000000000..bb6b2141b3
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.3/Makefile.cget.patch
@@ -0,0 +1,23 @@
+
+#
+# Patch managed by http://www.xwaves.net
+#
+
+--- cherokee-0.4.29/cget/Makefile.in~Makefile.cget
++++ cherokee-0.4.29/cget/Makefile.in
+@@ -56,6 +56,7 @@
+ cget_OBJECTS = $(am_cget_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cget_DEPENDENCIES = ../cherokee/libcherokee-client.la \
++	../cherokee/libcherokee-base.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -286,6 +287,7 @@
+ 
+ cget_LDADD = \
+ ../cherokee/libcherokee-client.la \
++../cherokee/libcherokee-base.la \
+ $(TLS_LIBS) \
+ $(PTHREAD_LIBS) \
+ $(PTHREAD_CFLAGS)
diff --git a/packages/cherokee/cherokee-0.5.3/Makefile.in.patch b/packages/cherokee/cherokee-0.5.3/Makefile.in.patch
new file mode 100644
index 0000000000..05ece037c3
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.3/Makefile.in.patch
@@ -0,0 +1,32 @@
+
+#
+# Patch managed by http://www.xwaves.net
+#
+
+Index: cherokee-0.5.3/cherokee/Makefile.in
+===================================================================
+--- cherokee-0.5.3.orig/cherokee/Makefile.in	2006-04-22 20:03:20.000000000 +0200
++++ cherokee-0.5.3/cherokee/Makefile.in	2006-05-23 20:33:12.000000000 +0200
+@@ -434,11 +434,11 @@
+ am_cherokee_OBJECTS = main.$(OBJEXT)
+ cherokee_OBJECTS = $(am_cherokee_OBJECTS)
+ cherokee_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	libcherokee-base.la libcherokee-server.la
++ 	libcherokee-base.la libcherokee-client.la libcherokee-server.la
+ am_cherokee_admin_OBJECTS = cherokee_admin.$(OBJEXT)
+ cherokee_admin_OBJECTS = $(am_cherokee_admin_OBJECTS)
+ cherokee_admin_DEPENDENCIES = libcherokee-config.la \
+-	libcherokee-base.la libcherokee-client.la
++ 	libcherokee-base.la libcherokee-client.la libcherokee-server.la
+ am_cherokee_logrotate_OBJECTS = cherokee_logrotate.$(OBJEXT)
+ cherokee_logrotate_OBJECTS = $(am_cherokee_logrotate_OBJECTS)
+ cherokee_logrotate_DEPENDENCIES = libcherokee-base.la \
+@@ -1429,7 +1429,7 @@
+ cherokee_logrotate_SOURCES = cherokee_logrotate.c
+ cherokee_logrotate_LDADD = libcherokee-base.la libcherokee-client.la libcherokee-server.la libcherokee-config.la
+ cherokee_admin_SOURCES = cherokee_admin.c 
+-cherokee_admin_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la 
++cherokee_admin_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la libcherokee-server.la
+ 
+ #noinst_PROGRAMS = cherokee_modules cherokee_base64 cherokee_headers cherokee_fastcgi
+ 
diff --git a/packages/cherokee/cherokee-0.5.3/configure.patch b/packages/cherokee/cherokee-0.5.3/configure.patch
new file mode 100644
index 0000000000..9c34d961ac
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.3/configure.patch
@@ -0,0 +1,127 @@
+
+#
+# Patch managed by http://www.xwaves.net
+#
+
+--- cherokee-0.4.29/configure~configure
++++ cherokee-0.4.29/configure
+@@ -28929,59 +28929,8 @@
+ if test "x$have_epoll_include" = "xyes"; then
+  	echo "$as_me:$LINENO: checking for epoll system call" >&5
+ echo $ECHO_N "checking for epoll system call... $ECHO_C" >&6
+-
+-     if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-		#include <stdint.h>
+-		#include <sys/param.h>
+-		#include <sys/types.h>
+-		#include <sys/syscall.h>
+-		#include <sys/epoll.h>
+-		#include <unistd.h>
+-
+-		int epoll_create (int size) {
+-	        return (syscall(__NR_epoll_create, size));
+-		}
+-
+-		int main (int argc, char **argv) {
+-	        int epfd;
+-	        epfd = epoll_create(256);
+-	    	   exit (epfd == -1 ? 1 : 0);
+-		}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  have_epoll=yes
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
++have_epoll=yes
++   
+ 	echo "$as_me:$LINENO: result: $have_epoll" >&5
+ echo "${ECHO_T}$have_epoll" >&6
+ fi
+@@ -32593,55 +32542,9 @@
+ # Is sendfile broken?
+ echo "$as_me:$LINENO: checking if sendfile works" >&5
+ echo $ECHO_N "checking if sendfile works... $ECHO_C" >&6
+-if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <errno.h>
+-            int main() {
+-               int o = 0;
+-               if (-1 == sendfile(0, 0, &o, 0) && errno == ENOSYS) return -1;
+-               return 0;
+-            }
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SENDFILE_BROKEN 1
+-_ACEOF
+-
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ 
+ # readdir_r()
+ 
diff --git a/packages/cherokee/cherokee-0.5.3/util.patch b/packages/cherokee/cherokee-0.5.3/util.patch
new file mode 100644
index 0000000000..c7b1d15113
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.3/util.patch
@@ -0,0 +1,29 @@
+
+#
+# Patch managed by http://www.xwaves.net
+#
+
+Index: cherokee-0.5.3/cherokee/util.c
+===================================================================
+--- cherokee-0.5.3.orig/cherokee/util.c	2006-04-01 17:58:59.000000000 +0200
++++ cherokee-0.5.3/cherokee/util.c	2006-05-23 20:37:12.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <errno.h>
+ 
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+@@ -385,9 +386,9 @@
+ 
+ 
+ 
+-#if defined(HAVE_PTHREAD) && !defined(HAVE_READDIR_R)
++/*#if defined(HAVE_PTHREAD) && !defined(HAVE_READDIR_R)*/
+ static pthread_mutex_t readdir_mutex = PTHREAD_MUTEX_INITIALIZER;
+-#endif
++/*#endif*/
+ 
+ /* The readdir subroutine is reentrant when an application program
+  * uses different DirectoryPointer parameter values (returned from the
diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb
new file mode 100644
index 0000000000..e6ea8e03fb
--- /dev/null
+++ b/packages/cherokee/cherokee_0.5.3.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Cherokee Web Server fast and secure"
+LICENSE = "GPL"
+DEPENDS = "pcre gnutls"
+HOMEPAGE = "http://www.0x50.org/"
+SRC_URI = "http://www.0x50.org/download/0.5/${PV}/${P}.tar.gz \
+	  file://configure.patch;patch=1 \
+	  file://Makefile.in.patch;patch=1 \
+	  file://Makefile.cget.patch;patch=1 \
+	  file://util.patch;patch=1 \
+"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+LEAD_SONAME = "libcherokee-base"
+
+EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+	sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/*libtool
+}
+
+do_install_prepend () {
+	$BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
+}
diff --git a/packages/display-brightness/display-brightness.sh b/packages/display-brightness/display-brightness.sh
index 4e706e1e75..5e1a0e97d4 100644
--- a/packages/display-brightness/display-brightness.sh
+++ b/packages/display-brightness/display-brightness.sh
@@ -7,11 +7,17 @@
 
 
 STEP=5
-DRIVER="`ls /sys/class/backlight/|head -1`"
+DRIVER="`ls /sys/class/backlight/|head -n 1`"
 MAX_BRIGHTNESS=`cat /sys/class/backlight/$DRIVER/max_brightness`
 ACTUAL_BRIGHTNESS=`cat /sys/class/backlight/$DRIVER/actual_brightness`
 BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
 
+if test "$1" != "up" -a "$1" != "down" -a -n "$1"
+then
+	echo -e "\nUsage:\n\t `basename $0` [up | down]\n"
+	exit 0
+fi
+
 echo "max / current"
 echo "$MAX_BRIGHTNESS / $ACTUAL_BRIGHTNESS"
 if [ ! -n "$1" ]; then
@@ -22,7 +28,8 @@ if [ "$1" = "up" ]; then
     if [ $ACTUAL_BRIGHTNESS -eq $MAX_BRIGHTNESS ]; then
         exit 0
     else
-        let CURRENT_BRIGHTNESS=$ACTUAL_BRIGHTNESS+$STEP
+    	test "$STEP" -gt "$MAX_BRIGHTNESS" -o "$STEP" -eq "$MAX_BRIGHTNESS" && STEP=1
+        let CURRENT_BRIGHTNESS=$ACTUAL_BRIGHTNESS+$STEP	
         echo $CURRENT_BRIGHTNESS >> $BRIGHTNESS_FILE
         exit 0
     fi
@@ -42,3 +49,4 @@ if [ "$1" = "down" ]; then
         exit 0
     fi
 fi
+
diff --git a/packages/display-brightness/display-brightness_1.0.0.bb b/packages/display-brightness/display-brightness_1.0.0.bb
index 1919f98231..87725cfa39 100644
--- a/packages/display-brightness/display-brightness_1.0.0.bb
+++ b/packages/display-brightness/display-brightness_1.0.0.bb
@@ -3,7 +3,7 @@ AUTHOR = "Patrick Steiner <patrick.steiner@a1.net>"
 MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
 DEPENDS = ""
 PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPLv2"
 
 SRC_URI = "file://display-brightness.sh"
diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES
index f4a7bf724b..3ff7d79d43 100644
--- a/packages/nslu2-binary-only/unslung-rootfs/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES
@@ -524,11 +524,14 @@ Fix extraneous boot messages from jffs2 filesystem driver (change options
 used when building the flash jffs image).
 
 Added pl2303.c patch for TIOCMGET/MSET/MBIS/MBIC.
-
 Syntax fixes in prep for newer busybox:
  - comments in rc.samba, "cp" in rc.sysinit
 
 Flash filesystem cleanup (regained space):
  - replaced dupl 'date' utility with symlink, corrected 'killall' symlink
- - removed 'mt', 'libexec' from flash
- - adjusted 'unsling' to use common 'find' options
+ - removed 'mt', 'libexec', 'locate', 'xargs', 'updatedb' from flash
+   (TODO: strip ipkg database entries out for 'findutils' and 'cpio')
+ - adjusted 'unsling' to use common 'find' options (hope to replace soon)
+
+Upgraded slingbox to v1.1.3 busybox base; enabled 'more' command
+(note: upgrade added 3KB in size, 'more' added 4KB in size)
diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb
index a3deda5da7..451d44b17c 100644
--- a/packages/pcre/pcre_4.4.bb
+++ b/packages/pcre/pcre_4.4.bb
@@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r4"
+PR = "r5"
 LICENSE = "BSD"
 SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
 S = "${WORKDIR}/pcre-${PV}"
@@ -19,6 +19,10 @@ CFLAGS_append = " -D_REENTRANT"
 EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
 
 do_compile () {
+	# stop libtool from trying to link with host libraries - fix from #33
+	# this resolve build problem on amd64 - #1015
+	sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+
 	# 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
diff --git a/packages/quagga/quagga.inc b/packages/quagga/quagga.inc
index f5c6378c24..34f4a6a1ab 100644
--- a/packages/quagga/quagga.inc
+++ b/packages/quagga/quagga.inc
@@ -1,4 +1,3 @@
-SECTION = "network"
 DESCRIPTION = "Quagga is a routing software suite, providing \
 implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for \
 Unix platforms, particularly FreeBSD, Linux, Solaris and NetBSD. \
@@ -6,11 +5,14 @@ Quagga is a fork of GNU Zebra which was developed by Kunihiro \
 Ishiguro. The Quagga tree aims to build a more involved community \
 around Quagga than the current centralised model of GNU Zebra."
 HOMEPAGE = "http://www.quagga.net/"
+SECTION = "network"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
 LICENSE = "GPL"
 DEPENDS = "readline ncurses perl-native"
-PR = "r0"
 
-SRC_URI = "http://www.quagga.net/download/quagga-${PV}.tar.gz \
+# ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old
+# versions and leave it empty for recent versions.
+SRC_URI = "http://www.quagga.net/download${QUAGGASUBDIR}/quagga-${PV}.tar.gz \
 	   file://fix-for-lib-inpath.patch;patch=1 \
 	   file://quagga.init \
 	   file://quagga.default \
@@ -53,11 +55,11 @@ EXTRA_OECONF = "--prefix=${prefix} \
 
 # Split into a main package and seperate per-protocol packages
 PACKAGES = "${PN} \
-	    ${PN}-ospfd ${PN}-ospf6d ${PN}-bpgd ${PN}-ripd ${PN}-ripngd ${PN}-isisd \
+	    ${PN}-ospfd ${PN}-ospf6d ${PN}-bgpd ${PN}-ripd ${PN}-ripngd ${PN}-isisd \
 	    ${PN}-ospfclient ${PN}-watchquagga ${PN}-dev ${PN}-doc"
 FILES_${PN}-ospfd	= "${libdir}/quagga/ospfd /usr/lib/libospf.so.*"
 FILES_${PN}-ospf6d	= "${libdir}/quagga/ospf6d"
-FILES_${PN}-bpgd	= "${libdir}/quagga/bgpd"
+FILES_${PN}-bgpd	= "${libdir}/quagga/bgpd"
 FILES_${PN}-ripd	= "${libdir}/quagga/ripd"
 FILES_${PN}-ripngd	= "${libdir}/quagga/ripngd"
 FILES_${PN}-isisd	= "${libdir}/quagga/isisd"
@@ -77,7 +79,7 @@ PKG_${PN}-ospfclient	= ${PN}-ospfclient
 # Each of the per-protocol packages depends on the main package
 RDEPENDS_${PN}-ospfd	= ${PN}
 RDEPENDS_${PN}-ospf6d	= ${PN}
-RDEPENDS_${PN}-bpgd	= ${PN}
+RDEPENDS_${PN}-bgpd	= ${PN}
 RDEPENDS_${PN}-ripd 	= ${PN}
 RDEPENDS_${PN}-ripngd 	= ${PN}
 RDEPENDS_${PN}-isisd 	= ${PN}
@@ -106,12 +108,16 @@ do_install () {
 
 # Add quagga's user and groups
 pkg_postinst_${PN} () {
-        grep -q quagga: /etc/group || addgroup quagga
+	grep -q quagga: /etc/group || addgroup quagga
 	grep -q quaggavty: /etc/group || addgroup quaggavty
-        grep -q quagga: /etc/passwd || adduser --disabled-password --home=/var/run/quagga/ --ingroup quagga -g "Quagga routing suite" quagga
+	grep -q quagga: /etc/passwd || adduser --disabled-password --home=/var/run/quagga/ --ingroup quagga -g "Quagga routing suite" quagga
 }
 
 # Stop apps before uninstall
+pkg_prerm_${PN} () {
+	${sysconfdir}/init.d/quagga stop
+}
+
 pkg_prerm_${PN}-ospfd () {
 	${sysconfdir}/init.d/quagga stop ospfd
 }
@@ -121,7 +127,7 @@ pkg_prerm_${PN}-ospf6d () {
 }
 
 pkg_prerm_${PN}-bgpd () {
-	${sysconfdir}/init.d/quagga stop bpgd
+	${sysconfdir}/init.d/quagga stop bgpd
 }
 
 pkg_prerm_${PN}-ripd () {
diff --git a/packages/quagga/quagga_0.99.2.bb b/packages/quagga/quagga_0.99.2.bb
index 9214ea6155..2789d7eb1a 100644
--- a/packages/quagga/quagga_0.99.2.bb
+++ b/packages/quagga/quagga_0.99.2.bb
@@ -1,3 +1,4 @@
+QUAGGASUBDIR = "/attic"
 include quagga.inc
-PR = "r0"
+PR = "r1"
 SRC_URI += "file://ospfd-no-opaque-lsa-fix.patch;patch=1"
diff --git a/packages/quagga/quagga_0.99.3.bb b/packages/quagga/quagga_0.99.3.bb
index 52b47348f3..e61c80d651 100644
--- a/packages/quagga/quagga_0.99.3.bb
+++ b/packages/quagga/quagga_0.99.3.bb
@@ -1,2 +1,2 @@
 include quagga.inc
-PR = "r0"
+PR = "r1"
diff --git a/packages/quagga/quagga_0.99.4.bb b/packages/quagga/quagga_0.99.4.bb
new file mode 100644
index 0000000000..52b47348f3
--- /dev/null
+++ b/packages/quagga/quagga_0.99.4.bb
@@ -0,0 +1,2 @@
+include quagga.inc
+PR = "r0"