- cleanup busybox dir and updated metadata

(Portage version: 2.0.51-r15)

16 files changed, 14 insertions, 2725 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index c0ccb8b0ebe3..e208b593d863 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.57 2005/01/25 05:10:49 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.58 2005/02/10 19:51:09 solar Exp $
+
+  10 Feb 2005; <solar@gentoo.org> metadata.xml, -files/Config.h,
+  -files/Config.h-0.60.2-cd, -files/Config.h-0.60.3-cd,
+  -files/Config.h-0.60.5-cd, -files/busybox-0.60.5-dietlibc.diff,
+  -files/msh.diff, -busybox-0.60.3-r1.ebuild, -busybox-0.60.3-r2.ebuild,
+  busybox-1.00-r1.ebuild, -busybox-1.00_rc3.ebuild:
+  - cleanup busybox dir and updated metadata
 
   24 Jan 2005; Brian Jackson <iggy@gentoo.org> busybox-1.00.ebuild,
   busybox-1.00_rc3.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index fa5f4f41be41..c8b3f6b76469 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,26 +1,14 @@
 MD5 b5ff10ecbdf3be737dd9a07eb688f70a busybox-1.00.ebuild 6429
-MD5 7c7ecdb7faae49f2740ad820e2bfe430 busybox-0.60.3-r2.ebuild 1181
-MD5 efaf4d761c1b3279d34a069626cf992a busybox-1.00-r1.ebuild 6054
-MD5 bd53514006037cd4d88fa5b7bb9ede8e busybox-0.60.3-r1.ebuild 1090
-MD5 7a46afdb02f1ca237c2e855e35fdd48e busybox-1.00_rc3.ebuild 6485
-MD5 e4c7fcbce1e85d5bfe24f192369155fb ChangeLog 10887
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 66f0d294a96c65bff03da5494c1a2f59 busybox-1.00-r1.ebuild 6053
+MD5 65ecb41d5b52163f0e929fff80e9e119 ChangeLog 11245
+MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00-r1 66
 MD5 335f1c2b99e52e880f3a490df9be39da files/digest-busybox-1.00 66
-MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695
-MD5 24ec3839ecb3e429bf29a819398b7753 files/Config.h-0.60.2-cd 13772
-MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319
-MD5 1bce86c66f42d204c0780faee28004d6 files/Config.h-0.60.5-cd 14299
 MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015
 MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
 MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
 MD5 8eae5b311553ee77cda4524ab892468c files/busybox-1.00_rc3-amd64.patch 658
-MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r1 66
-MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
-MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526
-MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70
-MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
 MD5 0935d76af47dda2deda0364f8c9018e3 files/1.00/more-insmod-arches.patch 1095
 MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964
 MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
diff --git a/sys-apps/busybox/busybox-0.60.3-r1.ebuild b/sys-apps/busybox/busybox-0.60.3-r1.ebuild
deleted file mode 100644
index 954dd55683e6..000000000000
--- a/sys-apps/busybox/busybox-0.60.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.10 2005/01/02 03:54:44 vapier Exp $
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha -amd64"
-IUSE="static"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/Config.h-${PV}-cd ${S}/Config.h
-	# I did not include the msh patch since I don't know if it will
-	# break stuff, I compile ash anyway, and it's in CVS
-}
-
-src_compile() {
-	local myconf
-	use static && myconf="${myconf} DOSTATIC=true"
-	emake ${myconf} || die
-}
-
-src_install() {
-	into /
-	dobin busybox
-	into /usr
-	dodoc AUTHORS Changelog* INSTALL LICENSE README TODO
-
-	docinto scripts
-	dodoc busybox.links
-
-	cd docs
-	doman *.1
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-	dohtml *.sgml
-
-	cd ../scripts
-	docinto scripts
-	dodoc inittab
-	dodoc depmod.pl
-}
diff --git a/sys-apps/busybox/busybox-0.60.3-r2.ebuild b/sys-apps/busybox/busybox-0.60.3-r2.ebuild
deleted file mode 100644
index 346cc61ca554..000000000000
--- a/sys-apps/busybox/busybox-0.60.3-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r2.ebuild,v 1.7 2005/01/02 03:54:44 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* sparc -amd64"
-IUSE="static"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cp ${FILESDIR}/Config.h-${PV}-cd ${S}/Config.h
-	# fix for sparc lag/flush in ash
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-cmdedit-sparc.diff
-	# I did not include the msh patch since I don't know if it will
-	# break stuff, I compile ash anyway, and it's in CVS
-}
-
-src_compile() {
-	local myconf
-	use static && myconf="${myconf} DOSTATIC=true"
-	emake ${myconf} || die
-}
-
-src_install() {
-	into /
-	dobin busybox
-	into /usr
-	dodoc AUTHORS Changelog* INSTALL LICENSE README TODO
-
-	docinto scripts
-	dodoc busybox.links
-
-	cd docs
-	doman *.1
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-	dohtml *.sgml
-
-	cd ../scripts
-	docinto scripts
-	dodoc inittab
-	dodoc depmod.pl
-}
diff --git a/sys-apps/busybox/busybox-1.00-r1.ebuild b/sys-apps/busybox/busybox-1.00-r1.ebuild
index dbc5937a4653..c890acf4e5a3 100644
--- a/sys-apps/busybox/busybox-1.00-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.8 2005/01/14 00:50:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r1.ebuild,v 1.9 2005/02/10 19:51:09 solar Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc x86"
 IUSE="debug uclibc static savedconfig netboot floppyboot make-busybox-symlinks"
 
 DEPEND="virtual/libc
diff --git a/sys-apps/busybox/busybox-1.00_rc3.ebuild b/sys-apps/busybox/busybox-1.00_rc3.ebuild
deleted file mode 100644
index a8f7c710385c..000000000000
--- a/sys-apps/busybox/busybox-1.00_rc3.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.15 2005/01/25 05:10:49 iggy Exp $
-
-inherit eutils
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-#SNAPSHOT=20040726
-HOMEPAGE="http://www.busybox.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~mips arm ~amd64 ~sparc hppa"
-IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks"
-
-MY_PV=${PV/_/-}
-
-if [ "$SNAPSHOT" != "" ]; then
-	MY_P=${PN}
-	SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-fi
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="virtual/libc
-	!amd64? ( uclibc? ( sys-libs/uclibc ) )
-	>=sys-apps/sed-4"
-RDEPEND="!static? ( virtual/libc )"
-
-# <pebenito> then eventually turning on selinux would mean
-# adding a dep: selinux? ( sys-libs/libselinux )
-
-busybox_config_option() {
-	[ "$2" = "" ] && return 1
-	case $1 in
-		y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
-		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-		*) return 1;;
-	esac
-	einfo `grep CONFIG_$2 .config`
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
-
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-	# fine grained config control for user defined busybox configs.
-	# [package]-[version]-[revision].config
-	# [package]-[version].config
-	# [package].config
-
-	if use netboot ; then
-		cp ${FILESDIR}/config-netboot .config
-		sed -i \
-			-e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
-			networking/udhcp/libbb_udhcp.h \
-			|| die "fixing netboot/udhcpc"
-	elif use savedconfig ; then
-		[ -r .config ] && rm .config
-		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
-			configfile=/etc/${PN}/${CHOST}/${conf}.config
-			if [ -r ${configfile} ]; then
-				cp ${configfile} ${S}/.config
-				break;
-			fi
-		done
-		if [ -r "${S}/.config" ]; then
-			einfo "Found your ${configfile} and using it."
-			return 0
-		fi
-	fi
-
-	# busybox has changed quite a bit from 0.[5-6]* to 1.x so this
-	# config might not be cd ready.
-
-	make allyesconfig > /dev/null
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y FEATURE_SH_IS_ASH
-	busybox_config_option n FEATURE_SH_IS_NONE
-
-	use static \
-		&& busybox_config_option y STATIC \
-		|| busybox_config_option n STATIC
-
-	# 1.00-pre2 uses the old selinux api which is no longer
-	# maintained. perhaps the next stable release will include
-	# support. 
-	# 1.00-pre5  pebenito says busybox is still using the old se api.
-	#use selinux \
-	#	&& busybox_config_option y SELINUX \
-	#	|| 
-	busybox_config_option n SELINUX
-
-	use debug \
-		&& busybox_config_option y DEBUG \
-		|| busybox_config_option n DEBUG
-
-	# Supported architectures:
-
-	# Busybox in general will build on any architecture supported by
-	# gcc.  It has a few specialized features added for __sparc__
-	# and __alpha__.  insmod functionality is currently limited to
-	# x86, ARM, SH3/4, powerpc, m68k, MIPS, and v850e.
-	case ${ARCH} in
-		alpha|sparc*)
-			# non x86 needs to figure out what works for
-			# them the best. sparc64 bobmed while building
-			# ash in my tests
-			busybox_config_option n INSMOD
-			busybox_config_option n MODPROBE
-			busybox_config_option n RMMOD;;
-		hppa)
-			 busybox_config_option n INSMOD;;
-		*) ;;
-	esac
-
-	#busybox_features=`grep CONFIG_ .config | tr '#' '\n' | 
-	#	awk  '{print $1}' | cut -d = -f 1 | grep -v ^$ | cut -c 8- | 
-	#		tr [A-Z] [a-z] | awk '{print "busybox_"$1}'`
-	#for f in $busybox_features; do
-	#	has $f ${FEATURES} && busybox_config_option y `echo ${f/busybox_/}|tr [a-z] [A-Z]`
-	#done
-	( echo | make clean oldconfig > /dev/null ) || :
-}
-
-busybox_set_cross_compiler() {
-	type -p ${CHOST}-ar && export CROSS=${CHOST}-
-}
-
-src_compile() {
-	busybox_set_cross_compiler
-	#emake -j1 CROSS="${CROSS}" include/config.h busybox || die
-	emake -j1 CROSS="${CROSS}" busybox || die
-}
-
-src_install() {
-	busybox_set_cross_compiler
-
-	into /
-	dobin busybox
-	if use netboot ; then
-		dosym busybox /bin/sh
-		return 0
-	fi
-	if use make-busybox-symlinks ; then
-		if [ ! "${VERY_BRAVE_OR_VERY_DUMB}" = "yes" ] && [ "${ROOT}" = "/" ];
-		then
-			ewarn "setting USE=make-busybox-symlinks and emerging to / is very dangerous."
-			ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-			ewarn "If you are creating a binary only and not merging this is probably ok."
-			ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want."
-			die "silly options will destroy your system"
-		fi
-		make CROSS="${CROSS}" install || die
-		dodir /bin
-		cp -a _install/bin/* ${D}/bin/
-		dodir /sbin
-		cp -a _install/sbin/* ${D}/sbin/
-		cd ${D}
-		local symlink
-		for symlink in {bin,sbin}/* ; do
-			[ -L "${symlink}" ] || continue
-			[ -e "${ROOT}/${symlink}" ] \
-				&& eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
-				&& rm ${symlink}
-		done
-		cd ${S}
-	fi
-
-	dodoc AUTHORS Changelog README TODO
-
-	cd docs || die
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html *.sgml
-
-	# no man files?
-	# cd ../man && doman *.1
-
-	cd ../examples || die
-	docinto examples
-	dodoc inittab depmod.pl
-
-	cd bootfloppy || die
-	docinto bootfloppy
-	dodoc bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* 2>/dev/null
-
-	cd ../../ || die
-	if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
-		cd ${S}
-		# this should install to the ./_install/ dir by default.
-		# we make a micro pkg of busybox that can be used for
-		# embedded systems -solar
-		if ! use make-busybox-symlinks ; then
-			make CROSS="${CROSS}" install || die
-		fi
-		cd ./_install/ \
-			&& tar --no-same-owner -jcvf ${WORKDIR}/${MY_P}-${ARCH}.bz2 . \
-			&& cd ..
-	fi
-
-	if use savedconfig ; then
-		einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
-		einfo "Read this ebuild for more info on how to take advantage of this option"
-		insinto /etc/${PN}/${CHOST}/
-		newins ${S}/.config ${PN}-${PV}-${PR}.config
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "This ebuild has support for user defined configs"
-	einfo "Please read this ebuild for more details and re-emerge as needed"
-	einfo "if you want to add or remove functionality for ${PN}"
-	echo
-}
diff --git a/sys-apps/busybox/files/Config.h b/sys-apps/busybox/files/Config.h
deleted file mode 100644
index 4ad8c2b777c8..000000000000
--- a/sys-apps/busybox/files/Config.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/* vi: set sw=4 ts=4: */
-// This file defines the feature set to be compiled into busybox.
-// When you turn things off here, they won't be compiled in at all.
-//
-//// This file is parsed by sed. You MUST use single line comments.
-//   i.e.  //#define BB_BLAH
-//
-//
-// BusyBox Applications
-//#define BB_AR
-#define BB_BASENAME
-#define BB_CAT
-#define BB_CHMOD_CHOWN_CHGRP
-#define BB_CHROOT
-#define BB_CHVT
-#define BB_CLEAR
-//#define BB_CMP
-#define BB_CP_MV
-#define BB_CUT
-#define BB_DATE
-#define BB_DC
-#define BB_DD
-//#define BB_DEALLOCVT
-#define BB_DF
-#define BB_DIRNAME
-#define BB_DMESG
-//#define BB_DOS2UNIX
-//#define BB_DPKG
-//#define BB_DPKG_DEB
-#define BB_DUTMP
-#define BB_DU
-#define BB_DUMPKMAP
-#define BB_ECHO
-#define BB_EXPR
-#define BB_FBSET
-#define BB_FDFLUSH
-#define BB_FIND
-#define BB_FREE
-//#define BB_FREERAMDISK
-//#define BB_FSCK_MINIX
-#define BB_GETOPT
-#define BB_GREP
-#define BB_GUNZIP
-#define BB_GZIP
-#define BB_HALT
-#define BB_HEAD
-#define BB_HOSTID
-#define BB_HOSTNAME
-#define BB_ID
-#define BB_IFCONFIG
-#define BB_INIT
-#define BB_INSMOD
-#define BB_KILL
-#define BB_KILLALL
-#define BB_KLOGD
-//#define BB_LENGTH
-#define BB_LN
-#define BB_LOADACM
-#define BB_LOADFONT
-#define BB_LOADKMAP
-#define BB_LOGGER
-#define BB_LOGNAME
-#define BB_LS
-#define BB_LSMOD
-#define BB_MAKEDEVS
-#define BB_MD5SUM
-#define BB_MKDIR
-#define BB_MKFIFO
-//#define BB_MKFS_MINIX
-#define BB_MKNOD
-#define BB_MKSWAP
-#define BB_MKTEMP
-//#define BB_NC
-#define BB_MORE
-#define BB_MOUNT
-#define BB_MT
-#define BB_NSLOOKUP
-#define BB_PING
-//#define BB_PIVOT_ROOT
-#define BB_POWEROFF
-//#define BB_PRINTF
-#define BB_PS
-#define BB_PWD
-//#define BB_RDATE
-#define BB_READLINK
-#define BB_REBOOT
-#define BB_RENICE
-#define BB_RESET
-#define BB_RM
-#define BB_RMDIR
-#define BB_RMMOD
-#define BB_ROUTE
-//#define BB_RPMUNPACK
-#define BB_SED
-#define BB_SETKEYCODES
-#define BB_SH
-#define BB_SLEEP
-#define BB_SORT
-#define BB_STTY
-#define BB_SWAPONOFF
-#define BB_SYNC
-#define BB_SYSLOGD
-#define BB_TAIL
-#define BB_TAR
-#define BB_TEE
-#define BB_TEST
-#define BB_TELNET
-#define BB_TFTP
-#define BB_TOUCH
-#define BB_TR
-#define BB_TRUE_FALSE
-#define BB_TTY
-//#define BB_UUENCODE
-//#define BB_UUDECODE
-#define BB_UMOUNT
-#define BB_UNIQ
-#define BB_UNAME
-#define BB_UPDATE
-#define BB_UPTIME
-#define BB_USLEEP
-//#define BB_WATCHDOG
-#define BB_WC
-#define BB_WGET
-#define BB_WHICH
-#define BB_WHOAMI
-#define BB_XARGS
-#define BB_YES
-// End of Applications List
-//
-//
-//
-// ---------------------------------------------------------
-// This is where feature definitions go.  Generally speaking,
-// turning this stuff off makes things a bit smaller (and less 
-// pretty/useful).
-//
-//
-// BusyBox will, by default, malloc space for its buffers.  This costs code
-// size for the call to xmalloc.  You can use the following feature to have
-// them put on the stack.  For some very small machines with limited stack
-// space, this can be deadly.  For most folks, this works just fine...
-//#define BB_FEATURE_BUFFERS_GO_ON_STACK
-//
-// Turn this on to use Erik's very cool devps, and devmtab kernel drivers,
-// thereby eliminating the need for the /proc filesystem and thereby saving
-// lots and lots memory for more important things.  NOTE:  If you enable this
-// feature, you _must_ have patched the kernel to include the devps patch that
-// is included in the busybox/kernel-patches directory.  You will also need to
-// create some device special files in /dev on your embedded system:
-//        mknod /dev/mtab c 10 22
-//        mknod /dev/ps c 10 21
-// I emailed Linus and this patch will not be going into the stock kernel.
-//#define BB_FEATURE_USE_DEVPS_PATCH
-//
-// This compiles out everything but the most 
-// trivial --help usage information (i.e. reduces binary size)
-#define BB_FEATURE_TRIVIAL_HELP
-//
-// Use termios to manipulate the screen ('more' is prettier with this on)
-#define BB_FEATURE_USE_TERMIOS
-//
-// calculate terminal & column widths (for more and ls)
-#define BB_FEATURE_AUTOWIDTH
-//
-// show username/groupnames for ls
-#define BB_FEATURE_LS_USERNAME
-//
-// show file timestamps in ls
-#define BB_FEATURE_LS_TIMESTAMPS
-//
-// enable ls -p and -F
-#define BB_FEATURE_LS_FILETYPES
-//
-// sort the file names
-#define BB_FEATURE_LS_SORTFILES
-//
-// enable ls -R
-#define BB_FEATURE_LS_RECURSIVE
-//
-// enable ls -L
-#define BB_FEATURE_LS_FOLLOWLINKS
-//
-// Change ping implementation -- simplified, featureless, but really small.
-//#define BB_FEATURE_SIMPLE_PING
-//
-// Make init use a simplified /etc/inittab file (recommended).
-#define BB_FEATURE_USE_INITTAB
-//
-//Enable init being called as /linuxrc
-#define BB_FEATURE_LINUXRC
-//
-//Have init enable core dumping for child processes (for debugging only) 
-//#define BB_FEATURE_INIT_COREDUMPS
-//
-//Make sure nothing is printed to the console on boot
-//#define BB_FEATURE_EXTRA_QUIET
-//
-// enable syslogd -R remotehost
-#define BB_FEATURE_REMOTE_LOG
-//
-// enable syslogd -C
-//#define BB_FEATURE_IPC_SYSLOG
-//
-//Simple tail implementation (2.34k vs 3k for the full one).
-//Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. 
-#define BB_FEATURE_SIMPLE_TAIL
-//
-// Enable support for loop devices in mount
-#define BB_FEATURE_MOUNT_LOOP
-//
-// Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MOUNT_MTAB_SUPPORT
-//
-// Enable support for mounting remote NFS volumes. 
-// You may need to mount with "-o nolock" if you are
-// not running a local portmapper daemon...
-#define BB_FEATURE_NFSMOUNT
-//
-// Enable support forced filesystem unmounting 
-// (i.e. in case of an unreachable NFS system).
-#define BB_FEATURE_MOUNT_FORCE
-//
-// use -i (interactive) flag for rm
-//#define BB_FEATURE_RM_INTERACTIVE
-//
-// Enable support for creation of tar files.
-#define BB_FEATURE_TAR_CREATE
-//
-// Enable support for "--exclude" and "-X" for excluding files
-#define BB_FEATURE_TAR_EXCLUDE
-//
-// Enable support for tar -z option (currently only works for inflating)
-#define BB_FEATURE_TAR_GZIP 
-//
-//// Enable reverse sort
-#define BB_FEATURE_SORT_REVERSE
-//
-// Enable command line editing in the shell.  
-// Only relevant if BB_SH is enabled. On by default.
-#define BB_FEATURE_COMMAND_EDITING
-//
-// Enable tab completion in the shell.  This is now working quite nicely.
-// This feature adds a bit over 4k. Only relevant if BB_SH is enabled.
-#define BB_FEATURE_COMMAND_TAB_COMPLETION
-//
-// Attempts to match usernames in a ~-prefixed path
-//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
-//
-//Allow the shell to invoke all the compiled in BusyBox applets as if they
-//were shell builtins.  Nice for staticly linking an emergency rescue shell,
-//among other things. Off by default.
-// Only relevant if BB_SH is enabled.
-//#define BB_FEATURE_SH_STANDALONE_SHELL
-//
-//When this is enabled, busybox shell applets can be called using full path
-//names.  This causes applets (i.e., most busybox commands) to override
-//real commands on the filesystem.  For example, if you run run /bin/cat, it
-//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
-//busybox.  Some systems want this, others do not.  Choose wisely.  :-) This
-//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
-// Only relevant if BB_SH is enabled. Off by default.
-//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-//
-// Some deeply embedded systems don't have usernames or even hostnames,
-// and the default prompt can look rather hideous on them. Uncomment
-// this option for a simpler, path-only prompt (which was the default until
-// around BusyBox-0.48). On by default.
-// Only relevant if BB_SH is enabled.
-#define BB_FEATURE_SH_SIMPLE_PROMPT
-//
-//Turn on extra fbset options
-//#define BB_FEATURE_FBSET_FANCY
-//
-//Turn on fbset readmode support
-//#define BB_FEATURE_FBSET_READMODE
-//
-// Support insmod/lsmod/rmmod for post 2.1 kernels
-//#define BB_FEATURE_NEW_MODULE_INTERFACE
-//
-// Support insmod/lsmod/rmmod for pre 2.1 kernels
-//#define BB_FEATURE_OLD_MODULE_INTERFACE
-//
-// Support module version checking
-//#define BB_FEATURE_INSMOD_VERSION_CHECKING
-//
-// Support for Minix filesystem, version 2
-//#define BB_FEATURE_MINIX2
-//
-// Enable ifconfig status reporting output -- this feature adds 12k.
-//#define BB_FEATURE_IFCONFIG_STATUS
-//
-// Enable ifconfig slip-specific options "keepalive" and "outfill"
-//#define BB_FEATURE_IFCONFIG_SLIP
-//
-// Enable ifconfig options "mem_start", "io_addr", and "irq".
-//#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-//
-// Enable ifconfig option "hw".  Currently works for only with "ether".
-//#define BB_FEATURE_IFCONFIG_HW
-//
-// Enable busybox --install [-s]
-// to create links (or symlinks) for all the commands that are 
-// compiled into the binary.  (needs /proc filesystem)
-// #define BB_FEATURE_INSTALLER
-//
-// Enable a nifty progress meter in wget (adds just under 2k)
-#define BB_FEATURE_WGET_STATUSBAR
-//
-// Clean up all memory before exiting -- usually not needed
-// as the OS can clean up...  Don't enable this unless you
-// have a really good reason for cleaning things up manually.
-//#define BB_FEATURE_CLEAN_UP
-//
-// Support for human readable output by ls, du, etc.(example 13k, 23M, 235G)
-#define BB_FEATURE_HUMAN_READABLE
-//
-// Support for the find -type option.
-#define BB_FEATURE_FIND_TYPE
-//
-// Support for the find -perm option.
-#define BB_FEATURE_FIND_PERM
-//
-// Support for the find -mtine option.
-#define BB_FEATURE_FIND_MTIME
-//
-// Support for the -A -B and -C context flags in grep
-//#define BB_FEATURE_GREP_CONTEXT
-//
-// Support for the EGREP applet (alias to the grep applet)
-//#define BB_FEATURE_GREP_EGREP_ALIAS
-//
-// Tell tftp what commands that should be supported.
-#define BB_FEATURE_TFTP_PUT
-#define BB_FEATURE_TFTP_GET
-//
-// End of Features List
-//
-//
-//
-//
-//
-//
-//---------------------------------------------------
-// Nothing beyond this point should ever be touched by 
-// mere mortals so leave this stuff alone.
-//
-#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
-	#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
-		#define BB_MTAB
-	#endif
-#else
-	#undef BB_MTAB
-#endif	
-//
-#if defined BB_SH
-	#if defined BB_FEATURE_COMMAND_EDITING 
-		#define BB_CMDEDIT
-		#ifndef BB_FEATURE_USE_TERMIOS
-			#define BB_FEATURE_USE_TERMIOS
-		#endif
-	#else
-		#undef BB_FEATURE_COMMAND_EDITING
-		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
-		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
-		#define BB_FEATURE_SH_SIMPLE_PROMPT
-	#endif
-#else
-	#undef BB_FEATURE_COMMAND_EDITING
-	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-	#undef BB_FEATURE_SH_STANDALONE_SHELL
-	#undef BB_FEATURE_SH_SIMPLE_PROMPT
-#endif
-//
-#ifdef BB_KILLALL
-	#ifndef BB_KILL
-		#define BB_KILL
-	#endif
-#endif
-//
-#ifndef BB_INIT
-	#undef BB_FEATURE_LINUXRC
-#endif
-//
-#ifdef BB_GZIP
-	#ifndef BB_GUNZIP
-		#define BB_GUNZIP
-	#endif
-#endif
-//
-#ifdef BB_DPKG
-	#ifndef BB_DPKG_DEB
-		#define BB_DPKG_DEB
-	#endif
-#endif
-//
-#ifdef BB_DPKG_DEB
-	#ifndef BB_AR
-		#define BB_AR
-	#endif
-	#ifndef BB_TAR
-		#define BB_TAR
-	#endif 
-	#ifndef BB_FEATURE_TAR_GZIP
-		#define BB_FEATURE_TAR_GZIP
-	#endif
-#endif
-//
-#ifdef BB_TAR
-	#ifdef BB_FEATURE_TAR_GZIP
-		#ifndef BB_GUNZIP
-			#define BB_GUNZIP
-		#endif
-	#endif
-#endif
-//
-#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
-	#define BB_NFSMOUNT
-#endif
-//
-#if defined BB_IFCONFIG
-	#ifdef BB_FEATURE_IFCONFIG_STATUS
-		#define BB_INTERFACE
-	#endif
-#else
-	#undef BB_INTERFACE
-#endif	
-//
-#if defined BB_FEATURE_AUTOWIDTH
-	#ifndef BB_FEATURE_USE_TERMIOS
-		#define BB_FEATURE_USE_TERMIOS
-	#endif
-#endif
-//
-#if defined BB_INSMOD || defined BB_LSMOD
-	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
-		#define BB_FEATURE_NEW_MODULE_INTERFACE
-	#endif
-#endif
-//
-#ifdef BB_SYSLOGD
-	#if defined BB_FEATURE_IPC_SYSLOG
-		#define BB_LOGREAD
-	#endif
-#endif
-//
-#if defined BB_DOS2UNIX 
-	#define BB_UNIX2DOS
-#endif
diff --git a/sys-apps/busybox/files/Config.h-0.60.2-cd b/sys-apps/busybox/files/Config.h-0.60.2-cd
deleted file mode 100644
index 84e94b992528..000000000000
--- a/sys-apps/busybox/files/Config.h-0.60.2-cd
+++ /dev/null
@@ -1,477 +0,0 @@
-/* vi: set sw=4 ts=4: */
-// This file defines the feature set to be compiled into busybox.
-// When you turn things off here, they won't be compiled in at all.
-//
-//// This file is parsed by sed.  You MUST use single line comments.
-//   i.e.,  //#define BB_BLAH
-//
-//
-// BusyBox Applications
-//#define BB_ADJTIMEX
-//#define BB_AR
-//#define BB_ASH
-#define BB_BASENAME
-#define BB_CAT
-#define BB_CHGRP
-#define BB_CHMOD
-#define BB_CHOWN
-#define BB_CHROOT
-#define BB_CHVT
-#define BB_CLEAR
-#define BB_CMP
-#define BB_CP
-//#define BB_CPIO
-#define BB_CUT
-#define BB_DATE
-//#define BB_DC
-#define BB_DD
-//#define BB_DEALLOCVT
-#define BB_DF
-#define BB_DIRNAME
-#define BB_DMESG
-//#define BB_DOS2UNIX
-//#define BB_DPKG
-//#define BB_DPKG_DEB
-//#define BB_DUTMP
-#define BB_DU
-//#define BB_DUMPKMAP
-#define BB_ECHO
-#define BB_ENV
-//#define BB_EXPR
-//#define BB_FBSET
-//#define BB_FDFLUSH
-//#define BB_FIND
-#define BB_FREE
-//#define BB_FREERAMDISK
-//#define BB_FSCK_MINIX
-//#define BB_GETOPT
-//#define BB_GREP
-#define BB_GUNZIP
-#define BB_GZIP
-#define BB_HALT
-#define BB_HEAD
-//#define BB_HOSTID
-//#define BB_HOSTNAME
-//#define BB_HUSH
-#define BB_ID
-#define BB_IFCONFIG
-#define BB_INIT
-//#define BB_INSMOD
-#define BB_KILL
-#define BB_KILLALL
-#define BB_KLOGD
-//#define BB_LASH
-//#define BB_LENGTH
-#define BB_LN
-//#define BB_LOADACM
-//#define BB_LOADFONT
-#define BB_LOADKMAP
-//#define BB_LOGGER
-//#define BB_LOGNAME
-#define BB_LS
-//#define BB_LSMOD
-//#define BB_MAKEDEVS
-//#define BB_MD5SUM
-#define BB_MKDIR
-//#define BB_MKFIFO
-//#define BB_MKFS_MINIX
-#define BB_MKNOD
-#define BB_MKSWAP
-//#define BB_MKTEMP
-//#define BB_MODPROBE
-#define BB_MORE
-#define BB_MOUNT
-//#define BB_MSH
-//#define BB_MT
-#define BB_MV
-//#define BB_NC
-//#define BB_NSLOOKUP
-#define BB_PIDOF
-#define BB_PING
-//#define BB_PIVOT_ROOT
-#define BB_POWEROFF
-//#define BB_PRINTF
-#define BB_PS
-#define BB_PWD
-//#define BB_RDATE
-#define BB_READLINK
-#define BB_REBOOT
-//#define BB_RENICE
-#define BB_RESET
-#define BB_RM
-#define BB_RMDIR
-//#define BB_RMMOD
-#define BB_ROUTE
-//#define BB_RPM2CPIO
-//#define BB_SED
-//#define BB_SETKEYCODES
-#define BB_SLEEP
-#define BB_SORT
-//#define BB_STTY
-#define BB_SWAPONOFF
-#define BB_SYNC
-#define BB_SYSLOGD
-#define BB_TAIL
-//#define BB_TAR
-//#define BB_TEE
-//#define BB_TEST
-#define BB_TELNET
-//#define BB_TFTP
-#define BB_TOUCH
-//#define BB_TR
-#define BB_TRACEROUTE
-#define BB_TRUE_FALSE
-#define BB_TTY
-//#define BB_UNIX2DOS
-//#define BB_UUENCODE
-//#define BB_UUDECODE
-#define BB_UMOUNT
-#define BB_UNIQ
-#define BB_UNAME
-//#define BB_UPDATE
-#define BB_UPTIME
-//#define BB_USLEEP
-//#define BB_VI
-//#define BB_WATCHDOG
-#define BB_WC
-#define BB_WGET
-#define BB_WHICH
-#define BB_WHOAMI
-#define BB_XARGS
-#define BB_YES
-// End of Applications List
-//
-//
-//
-// ---------------------------------------------------------
-// This is where feature definitions go.  Generally speaking,
-// turning this stuff off makes things a bit smaller (and less 
-// pretty/useful).
-//
-//
-// If you enabled one or more of the shells, you may select which one
-// should be run when sh is invoked:
-//#define BB_FEATURE_SH_IS_ASH
-//#define BB_FEATURE_SH_IS_HUSH
-//#define BB_FEATURE_SH_IS_LASH
-#define BB_FEATURE_SH_IS_MSH
-//
-// BusyBox will, by default, malloc space for its buffers.  This costs code
-// size for the call to xmalloc.  You can use the following feature to have
-// them put on the stack.  For some very small machines with limited stack
-// space, this can be deadly.  For most folks, this works just fine...
-//#define BB_FEATURE_BUFFERS_GO_ON_STACK
-// The third alternative for buffer allocation is to use BSS.  This works
-// beautifully for computers with a real MMU (and OS support), but wastes
-// runtime RAM for uCLinux.  This behavior was the only one available for
-// BusyBox versions 0.48 and earlier.
-//#define BB_FEATURE_BUFFERS_GO_IN_BSS
-//
-// Turn this on to use Erik's very cool devps, and devmtab kernel drivers,
-// thereby eliminating the need for the /proc filesystem and thereby saving
-// lots and lots memory for more important things.  NOTE:  If you enable this
-// feature, you _must_ have patched the kernel to include the devps patch that
-// is included in the busybox/kernel-patches directory.  You will also need to
-// create some device special files in /dev on your embedded system:
-//        mknod /dev/mtab c 10 22
-//        mknod /dev/ps c 10 21
-// I emailed Linus and this patch will not be going into the stock kernel.
-//#define BB_FEATURE_USE_DEVPS_PATCH
-//
-// show verbose usage messages
-//#define BB_FEATURE_VERBOSE_USAGE
-//
-// Use termios to manipulate the screen ('more' is prettier with this on)
-//#define BB_FEATURE_USE_TERMIOS
-//
-// calculate terminal & column widths (for more and ls)
-#define BB_FEATURE_AUTOWIDTH
-//
-// show username/groupnames for ls
-#define BB_FEATURE_LS_USERNAME
-//
-// show file timestamps in ls
-#define BB_FEATURE_LS_TIMESTAMPS
-//
-// enable ls -p and -F
-#define BB_FEATURE_LS_FILETYPES
-//
-// sort the file names
-#define BB_FEATURE_LS_SORTFILES
-//
-// enable ls -R
-#define BB_FEATURE_LS_RECURSIVE
-//
-// enable ls -L
-#define BB_FEATURE_LS_FOLLOWLINKS
-//
-// Disable for a smaller (but less functional) ping
-#define BB_FEATURE_FANCY_PING
-//
-// Make init use a simplified /etc/inittab file (recommended).
-#define BB_FEATURE_USE_INITTAB
-//
-//Enable init being called as /linuxrc
-//#define BB_FEATURE_LINUXRC
-//
-//Have init enable core dumping for child processes (for debugging only) 
-//#define BB_FEATURE_INIT_COREDUMPS
-//
-//Make sure nothing is printed to the console on boot
-//#define BB_FEATURE_EXTRA_QUIET
-//
-// enable syslogd -R remotehost
-#define BB_FEATURE_REMOTE_LOG
-//
-// enable syslogd -C
-//#define BB_FEATURE_IPC_SYSLOG
-//
-//Disable for a simple tail implementation (2.34k vs 3k for the full one).
-//Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. 
-#define BB_FEATURE_FANCY_TAIL
-//
-// Enable support for loop devices in mount
-#define BB_FEATURE_MOUNT_LOOP
-//
-// Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MTAB_SUPPORT
-//
-// Enable support for mounting remote NFS volumes. 
-// You may need to mount with "-o nolock" if you are
-// not running a local portmapper daemon...
-//
-// If you are using uClibc, be sure that you've already compiled
-// uClibc with INCLUDE_RPC=true (contained in the Config file)
-//#define BB_FEATURE_NFSMOUNT
-//
-// Enable support forced filesystem unmounting 
-// (i.e., in case of an unreachable NFS system).
-#define BB_FEATURE_MOUNT_FORCE
-//
-// Enable support for creation of tar files.
-#define BB_FEATURE_TAR_CREATE
-//
-// Enable support for "--exclude" and "-X" for excluding files
-#define BB_FEATURE_TAR_EXCLUDE
-//
-// Enable support for tar -z option (currently only works for inflating)
-#define BB_FEATURE_TAR_GZIP 
-//
-// Enable reverse sort
-#define BB_FEATURE_SORT_REVERSE
-//
-// Enable uniqe sort
-#define BB_FEATURE_SORT_UNIQUE
-//
-// Enable command line editing in the shell.  
-// Only relevant if a shell is enabled. On by default.
-#define BB_FEATURE_COMMAND_EDITING
-//
-// Enable tab completion in the shell.  This is now working quite nicely.
-// This feature adds a bit over 4k. Only relevant if a shell is enabled.
-#define BB_FEATURE_COMMAND_TAB_COMPLETION
-//
-// Attempts to match usernames in a ~-prefixed path
-//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
-//
-//Allow the shell to invoke all the compiled in BusyBox applets as if they
-//were shell builtins.  Nice for staticly linking an emergency rescue shell,
-//among other things. Off by default.
-// Only relevant if a shell is enabled.
-//#define BB_FEATURE_SH_STANDALONE_SHELL
-//
-//When this is enabled, busybox shell applets can be called using full path
-//names.  This causes applets (i.e., most busybox commands) to override
-//real commands on the filesystem.  For example, if you run run /bin/cat, it
-//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
-//busybox.  Some systems want this, others do not.  Choose wisely.  :-) This
-//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
-// Only relevant if a shell is enabled. Off by default.
-//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-//
-// Uncomment this option for a fancy shell prompt that includes the
-// current username and hostname.  On systems that don't have usernames
-// or hostnames, this can look hideous.
-// Only relevant if a shell is enabled.
-//#define BB_FEATURE_SH_FANCY_PROMPT
-//
-//Turn on extra fbset options
-//#define BB_FEATURE_FBSET_FANCY
-//
-//Turn on fbset readmode support
-//#define BB_FEATURE_FBSET_READMODE
-//
-// Support insmod/lsmod/rmmod for post 2.1 kernels
-//#define BB_FEATURE_NEW_MODULE_INTERFACE
-//
-// Support insmod/lsmod/rmmod for pre 2.1 kernels
-//#define BB_FEATURE_OLD_MODULE_INTERFACE
-//
-// Support module version checking
-#define BB_FEATURE_INSMOD_VERSION_CHECKING
-//
-// Support for uClinux memory usage optimization, which will load the image
-// directly into the kernel memory.  This divides memory requrements by three.
-// If you are not running uClinux (i.e., your CPU has an MMU) leave this
-// disabled...
-//#define BB_FEATURE_INSMOD_LOADINKMEM
-//
-// Support for Minix filesystem, version 2
-//#define BB_FEATURE_MINIX2
-//
-// Enable ifconfig status reporting output -- this feature adds 7k.
-#define BB_FEATURE_IFCONFIG_STATUS
-//
-// Enable ifconfig slip-specific options "keepalive" and "outfill"
-#define BB_FEATURE_IFCONFIG_SLIP
-//
-// Enable ifconfig options "mem_start", "io_addr", and "irq".
-#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-//
-// Enable ifconfig option "hw".  Currently works for only with "ether".
-#define BB_FEATURE_IFCONFIG_HW
-//
-// Allows "broadcast +" to set broadcast automatically based on hostaddr
-// and netmask, at a cost of about 100 bytes of code (i386).
-#define BB_FEATURE_IFCONFIG_BROADCAST_PLUS
-//
-// Enable busybox --install [-s]
-// to create links (or symlinks) for all the commands that are 
-// compiled into the binary.  (needs /proc filesystem)
-#define BB_FEATURE_INSTALLER
-//
-// Enable a nifty progress meter in wget (adds just under 2k)
-#define BB_FEATURE_WGET_STATUSBAR
-//
-// Enable HTTP authentication in wget
-#define BB_FEATURE_WGET_AUTHENTICATION
-//
-// Clean up all memory before exiting -- usually not needed
-// as the OS can clean up...  Don't enable this unless you
-// have a really good reason for cleaning things up manually.
-//#define BB_FEATURE_CLEAN_UP
-//
-// Support for human readable output by ls, du, etc.(example 13k, 23M, 235G)
-#define BB_FEATURE_HUMAN_READABLE
-//
-// Support for the find -type option.
-//#define BB_FEATURE_FIND_TYPE
-//
-// Support for the find -perm option.
-//#define BB_FEATURE_FIND_PERM
-//
-// Support for the find -mtine option.
-//#define BB_FEATURE_FIND_MTIME
-//
-// Support for the -A -B and -C context flags in grep
-//#define BB_FEATURE_GREP_CONTEXT
-//
-// Support for the EGREP applet (alias to the grep applet)
-//#define BB_FEATURE_GREP_EGREP_ALIAS
-//
-// Tell tftp what commands that should be supported.
-#define BB_FEATURE_TFTP_PUT
-#define BB_FEATURE_TFTP_GET
-//
-// features for vi
-#define BB_FEATURE_VI_COLON		// ":" colon commands, no "ex" mode
-#define BB_FEATURE_VI_YANKMARK		// Yank/Put commands and Mark cmds
-#define BB_FEATURE_VI_SEARCH		// search and replace cmds
-#define BB_FEATURE_VI_USE_SIGNALS	// catch signals
-#define BB_FEATURE_VI_DOT_CMD		// remember previous cmd and "." cmd
-#define BB_FEATURE_VI_READONLY		// vi -R and "view" mode
-#define BB_FEATURE_VI_SETOPTS		// set-able options,  ai ic showmatch
-#define BB_FEATURE_VI_SET		// :set
-#define BB_FEATURE_VI_WIN_RESIZE	// handle window resize
-//
-// Enable a if you system have setuped locale
-//#define BB_LOCALE_SUPPORT
-//
-// Support for TELNET to pass TERM type to remote host.  Adds 384 bytes.
-#define BB_FEATURE_TELNET_TTYPE
-//
-// Support for devfs.
-#define BB_FEATURE_DEVFS
-//
-// End of Features List
-//
-//
-//
-//
-//
-//
-//---------------------------------------------------
-// Nothing beyond this point should ever be touched by 
-// mere mortals so leave this stuff alone.
-//
-#include <features.h>
-#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
-	#undef BB_RPM2CPIO		/* Uses gz_open(), which uses fork() */
-	#undef BB_DPKG_DEB		/* Uses gz_open(), which uses fork() */
-	#undef BB_FEATURE_TAR_GZIP	/* Uses fork() */
-	#undef BB_UPDATE		/* Uses daemon() */
-#endif
-#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
-	#if defined BB_FEATURE_COMMAND_EDITING
-		#define BB_CMDEDIT
-	#else
-		#undef BB_FEATURE_COMMAND_EDITING
-		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
-		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
-		#undef BB_FEATURE_SH_FANCY_PROMPT
-	#endif
-#else
-	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-	#undef BB_FEATURE_SH_STANDALONE_SHELL
-	#undef BB_FEATURE_SH_FANCY_PROMPT
-#endif
-//
-#if (defined BB_ASH || defined BB_HUSH || defined BB_MSH) && ! defined BB_TEST
-	#define BB_TEST
-#endif
-//
-#ifdef BB_KILLALL
-	#ifndef BB_KILL
-		#define BB_KILL
-	#endif
-#endif
-//
-#ifndef BB_INIT
-	#undef BB_FEATURE_LINUXRC
-#endif
-//
-#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
-	#define BB_NFSMOUNT
-#endif
-//
-#if defined BB_FEATURE_AUTOWIDTH
-	#ifndef BB_FEATURE_USE_TERMIOS
-		#define BB_FEATURE_USE_TERMIOS
-	#endif
-#endif
-//
-#if defined BB_INSMOD || defined BB_LSMOD
-	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
-		#define BB_FEATURE_NEW_MODULE_INTERFACE
-	#endif
-#endif
-//
-#ifdef BB_UNIX2DOS
-	#define BB_DOS2UNIX
-#endif	
-//
-#ifdef BB_SYSLOGD
-	#if defined BB_FEATURE_IPC_SYSLOG
-		#define BB_LOGREAD
-	#endif
-#endif
-//
-#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define shell_main ash_main
-#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define shell_main hush_main
-#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define shell_main lash_main
-#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define shell_main msh_main
-#endif
diff --git a/sys-apps/busybox/files/Config.h-0.60.3-cd b/sys-apps/busybox/files/Config.h-0.60.3-cd
deleted file mode 100644
index 7b0bf82801c7..000000000000
--- a/sys-apps/busybox/files/Config.h-0.60.3-cd
+++ /dev/null
@@ -1,492 +0,0 @@
-/* vi: set sw=4 ts=4: */
-// This file defines the feature set to be compiled into busybox.
-// When you turn things off here, they won't be compiled in at all.
-//
-//// This file is parsed by sed.  You MUST use single line comments.
-//   i.e.,  //#define BB_BLAH
-//
-//
-// BusyBox Applications
-//#define BB_ADJTIMEX
-//#define BB_AR
-#define BB_ASH
-#define BB_BASENAME
-#define BB_CAT
-#define BB_CHGRP
-#define BB_CHMOD
-#define BB_CHOWN
-#define BB_CHROOT
-#define BB_CHVT
-#define BB_CLEAR
-#define BB_CMP
-#define BB_CP
-//#define BB_CPIO
-#define BB_CUT
-#define BB_DATE
-//#define BB_DC
-#define BB_DD
-//#define BB_DEALLOCVT
-#define BB_DF
-#define BB_DIRNAME
-#define BB_DMESG
-//#define BB_DOS2UNIX
-//#define BB_DPKG
-//#define BB_DPKG_DEB
-//#define BB_DUTMP
-#define BB_DU
-//#define BB_DUMPKMAP
-#define BB_ECHO
-#define BB_ENV
-//#define BB_EXPR
-#define BB_FBSET
-//#define BB_FDFLUSH
-#define BB_FIND
-#define BB_FREE
-//#define BB_FREERAMDISK
-//#define BB_FSCK_MINIX
-//#define BB_GETOPT
-#define BB_GREP
-#define BB_GUNZIP
-#define BB_GZIP
-#define BB_HALT
-#define BB_HEAD
-//#define BB_HOSTID
-//#define BB_HOSTNAME
-//#define BB_HUSH
-//#define BB_ID
-#define BB_IFCONFIG
-#define BB_INIT
-//#define BB_INSMOD
-#define BB_KILL
-#define BB_KILLALL
-#define BB_KLOGD
-//#define BB_LASH
-//#define BB_LENGTH
-#define BB_LN
-//#define BB_LOADACM
-//#define BB_LOADFONT
-#define BB_LOADKMAP
-//#define BB_LOGGER
-//#define BB_LOGNAME
-#define BB_LOSETUP
-#define BB_LS
-#define BB_LSMOD
-//#define BB_MAKEDEVS
-//#define BB_MD5SUM
-#define BB_MKDIR
-//#define BB_MKFIFO
-//#define BB_MKFS_MINIX
-#define BB_MKNOD
-#define BB_MKSWAP
-//#define BB_MKTEMP
-#define BB_MODPROBE
-#define BB_MORE
-#define BB_MOUNT
-//#define BB_MSH
-//#define BB_MT
-#define BB_MV
-//#define BB_NC
-//#define BB_NSLOOKUP
-#define BB_PIDOF
-#define BB_PING
-#define BB_PIVOT_ROOT
-#define BB_POWEROFF
-//#define BB_PRINTF
-#define BB_PS
-#define BB_PWD
-//#define BB_RDATE
-#define BB_READLINK
-#define BB_REBOOT
-//#define BB_RENICE
-#define BB_RESET
-#define BB_RM
-#define BB_RMDIR
-//#define BB_RMMOD
-#define BB_ROUTE
-//#define BB_RPM2CPIO
-#define BB_SED
-//#define BB_SETKEYCODES
-#define BB_SLEEP
-#define BB_SORT
-//#define BB_STTY
-#define BB_SWAPONOFF
-#define BB_SYNC
-#define BB_SYSLOGD
-#define BB_TAIL
-#define BB_TAR
-//#define BB_TEE
-//#define BB_TEST
-#define BB_TELNET
-#define BB_TFTP
-//#define BB_TIME
-#define BB_TOUCH
-//#define BB_TR
-//#define BB_TRACEROUTE
-#define BB_TRUE_FALSE
-//#define BB_TTY
-//#define BB_UNIX2DOS
-//#define BB_UUENCODE
-//#define BB_UUDECODE
-#define BB_UMOUNT
-#define BB_UNIQ
-#define BB_UNAME
-//#define BB_UPDATE
-#define BB_UPTIME
-//#define BB_USLEEP
-#define BB_VI
-//#define BB_WATCHDOG
-#define BB_WC
-#define BB_WGET
-#define BB_WHICH
-#define BB_WHOAMI
-#define BB_XARGS
-#define BB_YES
-// End of Applications List
-//
-//
-//
-// ---------------------------------------------------------
-// This is where feature definitions go.  Generally speaking,
-// turning this stuff off makes things a bit smaller (and less 
-// pretty/useful).
-//
-//
-// If you enabled one or more of the shells, you may select which one
-// should be run when sh is invoked:
-#define BB_FEATURE_SH_IS_ASH
-//#define BB_FEATURE_SH_IS_HUSH
-//#define BB_FEATURE_SH_IS_LASH
-//#define BB_FEATURE_SH_IS_MSH
-//
-// BusyBox will, by default, malloc space for its buffers.  This costs code
-// size for the call to xmalloc.  You can use the following feature to have
-// them put on the stack.  For some very small machines with limited stack
-// space, this can be deadly.  For most folks, this works just fine...
-//#define BB_FEATURE_BUFFERS_GO_ON_STACK
-// The third alternative for buffer allocation is to use BSS.  This works
-// beautifully for computers with a real MMU (and OS support), but wastes
-// runtime RAM for uCLinux.  This behavior was the only one available for
-// BusyBox versions 0.48 and earlier.
-//#define BB_FEATURE_BUFFERS_GO_IN_BSS
-//
-// Turn this on to use Erik's very cool devps, and devmtab kernel drivers,
-// thereby eliminating the need for the /proc filesystem and thereby saving
-// lots and lots memory for more important things.  NOTE:  If you enable this
-// feature, you _must_ have patched the kernel to include the devps patch that
-// is included in the busybox/kernel-patches directory.  You will also need to
-// create some device special files in /dev on your embedded system:
-//        mknod /dev/mtab c 10 22
-//        mknod /dev/ps c 10 21
-// I emailed Linus and this patch will not be going into the stock kernel.
-//#define BB_FEATURE_USE_DEVPS_PATCH
-//
-// show verbose usage messages
-#define BB_FEATURE_VERBOSE_USAGE
-//
-// Use termios to manipulate the screen ('more' is prettier with this on)
-//#define BB_FEATURE_USE_TERMIOS
-//
-// calculate terminal & column widths (for more, ls, and telnet)
-#define BB_FEATURE_AUTOWIDTH
-//
-// show username/groupnames for ls
-#define BB_FEATURE_LS_USERNAME
-//
-// show file timestamps in ls
-#define BB_FEATURE_LS_TIMESTAMPS
-//
-// enable ls -p and -F
-#define BB_FEATURE_LS_FILETYPES
-//
-// sort the file names
-#define BB_FEATURE_LS_SORTFILES
-//
-// enable ls -R
-#define BB_FEATURE_LS_RECURSIVE
-//
-// enable ls -L
-#define BB_FEATURE_LS_FOLLOWLINKS
-//
-// Use color to identify different file types
-#define BB_FEATURE_LS_COLOR
-//
-// Disable for a smaller (but less functional) ping
-#define BB_FEATURE_FANCY_PING
-//
-// Make init use a simplified /etc/inittab file (recommended).
-#define BB_FEATURE_USE_INITTAB
-//
-//Enable init being called as /linuxrc
-#define BB_FEATURE_LINUXRC
-//
-//Have init enable core dumping for child processes (for debugging only) 
-//#define BB_FEATURE_INIT_COREDUMPS
-//
-//Make sure nothing is printed to the console on boot
-//#define BB_FEATURE_EXTRA_QUIET
-//
-// enable syslogd -R remotehost
-#define BB_FEATURE_REMOTE_LOG
-//
-// enable syslogd -C
-//#define BB_FEATURE_IPC_SYSLOG
-//
-//Disable for a simple tail implementation (2.34k vs 3k for the full one).
-//Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. 
-#define BB_FEATURE_FANCY_TAIL
-//
-// Enable support for loop devices in mount
-#define BB_FEATURE_MOUNT_LOOP
-//
-// Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MTAB_SUPPORT
-//
-// Enable support for mounting remote NFS volumes. 
-// You may need to mount with "-o nolock" if you are
-// not running a local portmapper daemon...
-//
-// If you are using uClibc, be sure that you've already compiled
-// uClibc with INCLUDE_RPC=true (contained in the Config file)
-#define BB_FEATURE_NFSMOUNT
-//
-// Enable support forced filesystem unmounting 
-// (i.e., in case of an unreachable NFS system).
-#define BB_FEATURE_MOUNT_FORCE
-//
-// Enable support for creation of tar files.
-#define BB_FEATURE_TAR_CREATE
-//
-// Enable support for "--exclude" and "-X" for excluding files
-#define BB_FEATURE_TAR_EXCLUDE
-//
-// Enable support for tar -z option (currently only works for inflating)
-#define BB_FEATURE_TAR_GZIP 
-//
-// Enable reverse sort
-#define BB_FEATURE_SORT_REVERSE
-//
-// Enable uniqe sort
-#define BB_FEATURE_SORT_UNIQUE
-//
-// Enable command line editing in the shell.  
-// Only relevant if a shell is enabled. On by default.
-#define BB_FEATURE_COMMAND_EDITING
-//
-// Enable tab completion in the shell.  This is now working quite nicely.
-// This feature adds a bit over 4k. Only relevant if a shell is enabled.
-#define BB_FEATURE_COMMAND_TAB_COMPLETION
-//
-// Attempts to match usernames in a ~-prefixed path
-//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
-//
-//Allow the shell to invoke all the compiled in BusyBox applets as if they
-//were shell builtins.  Nice for staticly linking an emergency rescue shell,
-//among other things. Off by default.
-// Only relevant if a shell is enabled.
-//#define BB_FEATURE_SH_STANDALONE_SHELL
-//
-//When this is enabled, busybox shell applets can be called using full path
-//names.  This causes applets (i.e., most busybox commands) to override
-//real commands on the filesystem.  For example, if you run run /bin/cat, it
-//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
-//busybox.  Some systems want this, others do not.  Choose wisely.  :-) This
-//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
-// Only relevant if a shell is enabled. Off by default.
-//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-//
-// Uncomment this option for a fancy shell prompt that includes the
-// current username and hostname.  On systems that don't have usernames
-// or hostnames, this can look hideous.
-// Only relevant if a shell is enabled.
-//#define BB_FEATURE_SH_FANCY_PROMPT
-//
-// Uncomment this option to disable job control.  Job control lets you 
-// run jobs in the background (which completely useless for is all you 
-// are doing is running scripts).  Disabing this is bad for interactive
-// use, since when you hit ^C in an application, it will also kill the 
-// shell.  This adds about 2.5k on an x86 system.
-#define BB_FEATURE_ASH_JOB_CONTROL
-//
-//Turn on extra fbset options
-//#define BB_FEATURE_FBSET_FANCY
-//
-//Turn on fbset readmode support
-//#define BB_FEATURE_FBSET_READMODE
-//
-// Support insmod/lsmod/rmmod for post 2.1 kernels
-//#define BB_FEATURE_NEW_MODULE_INTERFACE
-//
-// Support insmod/lsmod/rmmod for pre 2.1 kernels
-//#define BB_FEATURE_OLD_MODULE_INTERFACE
-//
-// Support module version checking
-//#define BB_FEATURE_INSMOD_VERSION_CHECKING
-//
-// Support for uClinux memory usage optimization, which will load the image
-// directly into the kernel memory.  This divides memory requrements by three.
-// If you are not running uClinux (i.e., your CPU has an MMU) leave this
-// disabled...
-//#define BB_FEATURE_INSMOD_LOADINKMEM
-//
-// Support for Minix filesystem, version 2
-//#define BB_FEATURE_MINIX2
-//
-// Enable ifconfig status reporting output -- this feature adds 7k.
-#define BB_FEATURE_IFCONFIG_STATUS
-//
-// Enable ifconfig slip-specific options "keepalive" and "outfill"
-#define BB_FEATURE_IFCONFIG_SLIP
-//
-// Enable ifconfig options "mem_start", "io_addr", and "irq".
-#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-//
-// Enable ifconfig option "hw".  Currently works for only with "ether".
-#define BB_FEATURE_IFCONFIG_HW
-//
-// Allows "broadcast +" to set broadcast automatically based on hostaddr
-// and netmask, at a cost of about 100 bytes of code (i386).
-#define BB_FEATURE_IFCONFIG_BROADCAST_PLUS
-//
-// Enable busybox --install [-s]
-// to create links (or symlinks) for all the commands that are 
-// compiled into the binary.  (needs /proc filesystem)
-#define BB_FEATURE_INSTALLER
-//
-// Enable a nifty progress meter in wget (adds just under 2k)
-#define BB_FEATURE_WGET_STATUSBAR
-//
-// Enable HTTP authentication in wget
-#define BB_FEATURE_WGET_AUTHENTICATION
-//
-// Clean up all memory before exiting -- usually not needed
-// as the OS can clean up...  Don't enable this unless you
-// have a really good reason for cleaning things up manually.
-//#define BB_FEATURE_CLEAN_UP
-//
-// Support for human readable output by ls, du, etc.(example 13k, 23M, 235G)
-#define BB_FEATURE_HUMAN_READABLE
-//
-// Support for the find -type option.
-#define BB_FEATURE_FIND_TYPE
-//
-// Support for the find -perm option.
-#define BB_FEATURE_FIND_PERM
-//
-// Support for the find -mtime option.
-#define BB_FEATURE_FIND_MTIME
-//
-//// Support for the find -newer option.
-#define BB_FEATURE_FIND_NEWER
-//
-// Support for the -A -B and -C context flags in grep
-//#define BB_FEATURE_GREP_CONTEXT
-//
-// Support for the EGREP applet (alias to the grep applet)
-//#define BB_FEATURE_GREP_EGREP_ALIAS
-//
-// Tell tftp what commands that should be supported.
-#define BB_FEATURE_TFTP_PUT
-#define BB_FEATURE_TFTP_GET
-//
-// features for vi
-#define BB_FEATURE_VI_COLON		// ":" colon commands, no "ex" mode
-#define BB_FEATURE_VI_YANKMARK		// Yank/Put commands and Mark cmds
-#define BB_FEATURE_VI_SEARCH		// search and replace cmds
-#define BB_FEATURE_VI_USE_SIGNALS	// catch signals
-#define BB_FEATURE_VI_DOT_CMD		// remember previous cmd and "." cmd
-#define BB_FEATURE_VI_READONLY		// vi -R and "view" mode
-#define BB_FEATURE_VI_SETOPTS		// set-able options,  ai ic showmatch
-#define BB_FEATURE_VI_SET		// :set
-#define BB_FEATURE_VI_WIN_RESIZE	// handle window resize
-//
-// Enable a if you system have setuped locale
-//#define BB_LOCALE_SUPPORT
-//
-// Support for TELNET to pass TERM type to remote host.  Adds 384 bytes.
-#define BB_FEATURE_TELNET_TTYPE
-//
-// Support for devfs.
-#define BB_FEATURE_DEVFS
-//
-// End of Features List
-//
-//
-//
-//
-//
-//
-//---------------------------------------------------
-// Nothing beyond this point should ever be touched by 
-// mere mortals so leave this stuff alone.
-//
-#include <features.h>
-#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
-	#undef BB_RPM2CPIO		/* Uses gz_open(), which uses fork() */
-	#undef BB_DPKG_DEB		/* Uses gz_open(), which uses fork() */
-	#undef BB_FEATURE_TAR_GZIP	/* Uses fork() */
-	#undef BB_UPDATE		/* Uses daemon() */
-#endif
-#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
-	#if defined BB_FEATURE_COMMAND_EDITING
-		#define BB_CMDEDIT
-	#else
-		#undef BB_FEATURE_COMMAND_EDITING
-		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
-		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
-		#undef BB_FEATURE_SH_FANCY_PROMPT
-	#endif
-#else
-	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-	#undef BB_FEATURE_SH_STANDALONE_SHELL
-	#undef BB_FEATURE_SH_FANCY_PROMPT
-#endif
-//
-#if (defined BB_ASH || defined BB_HUSH || defined BB_MSH) && ! defined BB_TEST
-	#define BB_TEST
-#endif
-//
-#ifdef BB_KILLALL
-	#ifndef BB_KILL
-		#define BB_KILL
-	#endif
-#endif
-//
-#ifndef BB_INIT
-	#undef BB_FEATURE_LINUXRC
-#endif
-//
-#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
-	#define BB_NFSMOUNT
-#endif
-//
-#if defined BB_FEATURE_AUTOWIDTH
-	#ifndef BB_FEATURE_USE_TERMIOS
-		#define BB_FEATURE_USE_TERMIOS
-	#endif
-#endif
-//
-#if defined BB_INSMOD || defined BB_LSMOD
-	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
-		#define BB_FEATURE_NEW_MODULE_INTERFACE
-	#endif
-#endif
-//
-#ifdef BB_UNIX2DOS
-	#define BB_DOS2UNIX
-#endif	
-//
-#ifdef BB_SYSLOGD
-	#if defined BB_FEATURE_IPC_SYSLOG
-		#define BB_LOGREAD
-	#endif
-#endif
-//
-#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define shell_main ash_main
-#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define shell_main hush_main
-#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define shell_main lash_main
-#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define shell_main msh_main
-#endif
diff --git a/sys-apps/busybox/files/Config.h-0.60.5-cd b/sys-apps/busybox/files/Config.h-0.60.5-cd
deleted file mode 100644
index ebecf08e589b..000000000000
--- a/sys-apps/busybox/files/Config.h-0.60.5-cd
+++ /dev/null
@@ -1,492 +0,0 @@
-/* vi: set sw=4 ts=4: */
-// This file defines the feature set to be compiled into busybox.
-// When you turn things off here, they won't be compiled in at all.
-//
-//// This file is parsed by sed.  You MUST use single line comments.
-//   i.e.,  //#define BB_BLAH
-//
-//
-// BusyBox Applications
-//#define BB_ADJTIMEX
-//#define BB_AR
-#define BB_ASH
-#define BB_BASENAME
-#define BB_CAT
-#define BB_CHGRP
-#define BB_CHMOD
-#define BB_CHOWN
-#define BB_CHROOT
-#define BB_CHVT
-#define BB_CLEAR
-#define BB_CMP
-#define BB_CP
-#define BB_CPIO
-#define BB_CUT
-#define BB_DATE
-//#define BB_DC
-#define BB_DD
-//#define BB_DEALLOCVT
-#define BB_DF
-#define BB_DIRNAME
-#define BB_DMESG
-//#define BB_DOS2UNIX
-//#define BB_DPKG
-//#define BB_DPKG_DEB
-//#define BB_DUTMP
-#define BB_DU
-//#define BB_DUMPKMAP
-#define BB_ECHO
-#define BB_ENV
-//#define BB_EXPR
-#define BB_FBSET
-#define BB_FDFLUSH
-#define BB_FIND
-#define BB_FREE
-//#define BB_FREERAMDISK
-//#define BB_FSCK_MINIX
-//#define BB_GETOPT
-#define BB_GREP
-#define BB_GUNZIP
-#define BB_GZIP
-#define BB_HALT
-#define BB_HEAD
-//#define BB_HOSTID
-#define BB_HOSTNAME
-//#define BB_HUSH
-//#define BB_ID
-#define BB_IFCONFIG
-#define BB_INIT
-#define BB_INSMOD
-#define BB_KILL
-#define BB_KILLALL
-#define BB_KLOGD
-//#define BB_LASH
-//#define BB_LENGTH
-#define BB_LN
-//#define BB_LOADACM
-//#define BB_LOADFONT
-#define BB_LOADKMAP
-//#define BB_LOGGER
-//#define BB_LOGNAME
-#define BB_LOSETUP
-#define BB_LS
-#define BB_LSMOD
-//#define BB_MAKEDEVS
-#define BB_MD5SUM
-#define BB_MKDIR
-#define BB_MKFIFO
-//#define BB_MKFS_MINIX
-#define BB_MKNOD
-#define BB_MKSWAP
-//#define BB_MKTEMP
-#define BB_MODPROBE
-#define BB_MORE
-#define BB_MOUNT
-//#define BB_MSH
-//#define BB_MT
-#define BB_MV
-#define BB_NC
-#define BB_NSLOOKUP
-#define BB_PIDOF
-#define BB_PING
-#define BB_PIVOT_ROOT
-#define BB_POWEROFF
-//#define BB_PRINTF
-#define BB_PS
-#define BB_PWD
-//#define BB_RDATE
-#define BB_READLINK
-#define BB_REBOOT
-//#define BB_RENICE
-#define BB_RESET
-#define BB_RM
-#define BB_RMDIR
-#define BB_RMMOD
-#define BB_ROUTE
-//#define BB_RPM2CPIO
-#define BB_SED
-//#define BB_SETKEYCODES
-#define BB_SLEEP
-#define BB_SORT
-//#define BB_STTY
-#define BB_SWAPONOFF
-#define BB_SYNC
-#define BB_SYSLOGD
-#define BB_TAIL
-#define BB_TAR
-//#define BB_TEE
-//#define BB_TEST
-#define BB_TELNET
-#define BB_TFTP
-//#define BB_TIME
-#define BB_TOUCH
-//#define BB_TR
-#define BB_TRACEROUTE
-#define BB_TRUE_FALSE
-//#define BB_TTY
-//#define BB_UNIX2DOS
-//#define BB_UUENCODE
-//#define BB_UUDECODE
-#define BB_UMOUNT
-#define BB_UNIQ
-#define BB_UNAME
-//#define BB_UPDATE
-#define BB_UPTIME
-//#define BB_USLEEP
-#define BB_VI
-//#define BB_WATCHDOG
-#define BB_WC
-#define BB_WGET
-#define BB_WHICH
-#define BB_WHOAMI
-#define BB_XARGS
-#define BB_YES
-// End of Applications List
-//
-//
-//
-// ---------------------------------------------------------
-// This is where feature definitions go.  Generally speaking,
-// turning this stuff off makes things a bit smaller (and less 
-// pretty/useful).
-//
-//
-// If you enabled one or more of the shells, you may select which one
-// should be run when sh is invoked:
-#define BB_FEATURE_SH_IS_ASH
-//#define BB_FEATURE_SH_IS_HUSH
-//#define BB_FEATURE_SH_IS_LASH
-//#define BB_FEATURE_SH_IS_MSH
-//
-// BusyBox will, by default, malloc space for its buffers.  This costs code
-// size for the call to xmalloc.  You can use the following feature to have
-// them put on the stack.  For some very small machines with limited stack
-// space, this can be deadly.  For most folks, this works just fine...
-//#define BB_FEATURE_BUFFERS_GO_ON_STACK
-// The third alternative for buffer allocation is to use BSS.  This works
-// beautifully for computers with a real MMU (and OS support), but wastes
-// runtime RAM for uCLinux.  This behavior was the only one available for
-// BusyBox versions 0.48 and earlier.
-//#define BB_FEATURE_BUFFERS_GO_IN_BSS
-//
-// Turn this on to use Erik's very cool devps, and devmtab kernel drivers,
-// thereby eliminating the need for the /proc filesystem and thereby saving
-// lots and lots memory for more important things.  NOTE:  If you enable this
-// feature, you _must_ have patched the kernel to include the devps patch that
-// is included in the busybox/kernel-patches directory.  You will also need to
-// create some device special files in /dev on your embedded system:
-//        mknod /dev/mtab c 10 22
-//        mknod /dev/ps c 10 21
-// I emailed Linus and this patch will not be going into the stock kernel.
-//#define BB_FEATURE_USE_DEVPS_PATCH
-//
-// show verbose usage messages
-#define BB_FEATURE_VERBOSE_USAGE
-//
-// Use termios to manipulate the screen ('more' is prettier with this on)
-//#define BB_FEATURE_USE_TERMIOS
-//
-// calculate terminal & column widths (for more, ls, and telnet)
-#define BB_FEATURE_AUTOWIDTH
-//
-// show username/groupnames for ls
-#define BB_FEATURE_LS_USERNAME
-//
-// show file timestamps in ls
-#define BB_FEATURE_LS_TIMESTAMPS
-//
-// enable ls -p and -F
-#define BB_FEATURE_LS_FILETYPES
-//
-// sort the file names
-#define BB_FEATURE_LS_SORTFILES
-//
-// enable ls -R
-#define BB_FEATURE_LS_RECURSIVE
-//
-// enable ls -L
-#define BB_FEATURE_LS_FOLLOWLINKS
-//
-// Use color to identify different file types
-#define BB_FEATURE_LS_COLOR
-//
-// Disable for a smaller (but less functional) ping
-#define BB_FEATURE_FANCY_PING
-//
-// Make init use a simplified /etc/inittab file (recommended).
-#define BB_FEATURE_USE_INITTAB
-//
-//Enable init being called as /linuxrc
-#define BB_FEATURE_LINUXRC
-//
-//Have init enable core dumping for child processes (for debugging only) 
-//#define BB_FEATURE_INIT_COREDUMPS
-//
-//Make sure nothing is printed to the console on boot
-//#define BB_FEATURE_EXTRA_QUIET
-//
-// enable syslogd -R remotehost
-#define BB_FEATURE_REMOTE_LOG
-//
-// enable syslogd -C
-//#define BB_FEATURE_IPC_SYSLOG
-//
-//Disable for a simple tail implementation (2.34k vs 3k for the full one).
-//Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. 
-#define BB_FEATURE_FANCY_TAIL
-//
-// Enable support for loop devices in mount
-#define BB_FEATURE_MOUNT_LOOP
-//
-// Enable support for a real /etc/mtab file instead of /proc/mounts
-//#define BB_FEATURE_MTAB_SUPPORT
-//
-// Enable support for mounting remote NFS volumes. 
-// You may need to mount with "-o nolock" if you are
-// not running a local portmapper daemon...
-//
-// If you are using uClibc, be sure that you've already compiled
-// uClibc with INCLUDE_RPC=true (contained in the Config file)
-#define BB_FEATURE_NFSMOUNT
-//
-// Enable support forced filesystem unmounting 
-// (i.e., in case of an unreachable NFS system).
-#define BB_FEATURE_MOUNT_FORCE
-//
-// Enable support for creation of tar files.
-#define BB_FEATURE_TAR_CREATE
-//
-// Enable support for "--exclude" and "-X" for excluding files
-#define BB_FEATURE_TAR_EXCLUDE
-//
-// Enable support for tar -z option (currently only works for inflating)
-#define BB_FEATURE_TAR_GZIP 
-//
-// Enable reverse sort
-#define BB_FEATURE_SORT_REVERSE
-//
-// Enable uniqe sort
-#define BB_FEATURE_SORT_UNIQUE
-//
-// Enable command line editing in the shell.  
-// Only relevant if a shell is enabled. On by default.
-#define BB_FEATURE_COMMAND_EDITING
-//
-// Enable tab completion in the shell.  This is now working quite nicely.
-// This feature adds a bit over 4k. Only relevant if a shell is enabled.
-#define BB_FEATURE_COMMAND_TAB_COMPLETION
-//
-// Attempts to match usernames in a ~-prefixed path
-//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
-//
-//Allow the shell to invoke all the compiled in BusyBox applets as if they
-//were shell builtins.  Nice for staticly linking an emergency rescue shell,
-//among other things. Off by default.
-// Only relevant if a shell is enabled.
-//#define BB_FEATURE_SH_STANDALONE_SHELL
-//
-//When this is enabled, busybox shell applets can be called using full path
-//names.  This causes applets (i.e., most busybox commands) to override
-//real commands on the filesystem.  For example, if you run run /bin/cat, it
-//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
-//busybox.  Some systems want this, others do not.  Choose wisely.  :-) This
-//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
-// Only relevant if a shell is enabled. Off by default.
-//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-//
-// Uncomment this option for a fancy shell prompt that includes the
-// current username and hostname.  On systems that don't have usernames
-// or hostnames, this can look hideous.
-// Only relevant if a shell is enabled.
-//#define BB_FEATURE_SH_FANCY_PROMPT
-//
-// Uncomment this option to disable job control.  Job control lets you 
-// run jobs in the background (which completely useless for is all you 
-// are doing is running scripts).  Disabing this is bad for interactive
-// use, since when you hit ^C in an application, it will also kill the 
-// shell.  This adds about 2.5k on an x86 system.
-#define BB_FEATURE_ASH_JOB_CONTROL
-//
-//Turn on extra fbset options
-//#define BB_FEATURE_FBSET_FANCY
-//
-//Turn on fbset readmode support
-//#define BB_FEATURE_FBSET_READMODE
-//
-// Support insmod/lsmod/rmmod for post 2.1 kernels
-//#define BB_FEATURE_NEW_MODULE_INTERFACE
-//
-// Support insmod/lsmod/rmmod for pre 2.1 kernels
-//#define BB_FEATURE_OLD_MODULE_INTERFACE
-//
-// Support module version checking
-//#define BB_FEATURE_INSMOD_VERSION_CHECKING
-//
-// Support for uClinux memory usage optimization, which will load the image
-// directly into the kernel memory.  This divides memory requrements by three.
-// If you are not running uClinux (i.e., your CPU has an MMU) leave this
-// disabled...
-//#define BB_FEATURE_INSMOD_LOADINKMEM
-//
-// Support for Minix filesystem, version 2
-//#define BB_FEATURE_MINIX2
-//
-// Enable ifconfig status reporting output -- this feature adds 7k.
-#define BB_FEATURE_IFCONFIG_STATUS
-//
-// Enable ifconfig slip-specific options "keepalive" and "outfill"
-#define BB_FEATURE_IFCONFIG_SLIP
-//
-// Enable ifconfig options "mem_start", "io_addr", and "irq".
-#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-//
-// Enable ifconfig option "hw".  Currently works for only with "ether".
-#define BB_FEATURE_IFCONFIG_HW
-//
-// Allows "broadcast +" to set broadcast automatically based on hostaddr
-// and netmask, at a cost of about 100 bytes of code (i386).
-#define BB_FEATURE_IFCONFIG_BROADCAST_PLUS
-//
-// Enable busybox --install [-s]
-// to create links (or symlinks) for all the commands that are 
-// compiled into the binary.  (needs /proc filesystem)
-#define BB_FEATURE_INSTALLER
-//
-// Enable a nifty progress meter in wget (adds just under 2k)
-#define BB_FEATURE_WGET_STATUSBAR
-//
-// Enable HTTP authentication in wget
-#define BB_FEATURE_WGET_AUTHENTICATION
-//
-// Clean up all memory before exiting -- usually not needed
-// as the OS can clean up...  Don't enable this unless you
-// have a really good reason for cleaning things up manually.
-//#define BB_FEATURE_CLEAN_UP
-//
-// Support for human readable output by ls, du, etc.(example 13k, 23M, 235G)
-#define BB_FEATURE_HUMAN_READABLE
-//
-// Support for the find -type option.
-#define BB_FEATURE_FIND_TYPE
-//
-// Support for the find -perm option.
-#define BB_FEATURE_FIND_PERM
-//
-// Support for the find -mtime option.
-#define BB_FEATURE_FIND_MTIME
-//
-//// Support for the find -newer option.
-#define BB_FEATURE_FIND_NEWER
-//
-// Support for the -A -B and -C context flags in grep
-//#define BB_FEATURE_GREP_CONTEXT
-//
-// Support for the EGREP applet (alias to the grep applet)
-//#define BB_FEATURE_GREP_EGREP_ALIAS
-//
-// Tell tftp what commands that should be supported.
-#define BB_FEATURE_TFTP_PUT
-#define BB_FEATURE_TFTP_GET
-//
-// features for vi
-#define BB_FEATURE_VI_COLON		// ":" colon commands, no "ex" mode
-#define BB_FEATURE_VI_YANKMARK		// Yank/Put commands and Mark cmds
-#define BB_FEATURE_VI_SEARCH		// search and replace cmds
-#define BB_FEATURE_VI_USE_SIGNALS	// catch signals
-#define BB_FEATURE_VI_DOT_CMD		// remember previous cmd and "." cmd
-#define BB_FEATURE_VI_READONLY		// vi -R and "view" mode
-#define BB_FEATURE_VI_SETOPTS		// set-able options,  ai ic showmatch
-#define BB_FEATURE_VI_SET		// :set
-#define BB_FEATURE_VI_WIN_RESIZE	// handle window resize
-//
-// Enable a if you system have setuped locale
-//#define BB_LOCALE_SUPPORT
-//
-// Support for TELNET to pass TERM type to remote host.  Adds 384 bytes.
-#define BB_FEATURE_TELNET_TTYPE
-//
-// Support for devfs.
-#define BB_FEATURE_DEVFS
-//
-// End of Features List
-//
-//
-//
-//
-//
-//
-//---------------------------------------------------
-// Nothing beyond this point should ever be touched by 
-// mere mortals so leave this stuff alone.
-//
-#include <features.h>
-#if defined __UCLIBC__ && ! defined __UCLIBC_HAS_MMU__
-	#undef BB_RPM2CPIO		/* Uses gz_open(), which uses fork() */
-	#undef BB_DPKG_DEB		/* Uses gz_open(), which uses fork() */
-	#undef BB_FEATURE_TAR_GZIP	/* Uses fork() */
-	#undef BB_UPDATE		/* Uses daemon() */
-#endif
-#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
-	#if defined BB_FEATURE_COMMAND_EDITING
-		#define BB_CMDEDIT
-	#else
-		#undef BB_FEATURE_COMMAND_EDITING
-		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
-		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
-		#undef BB_FEATURE_SH_FANCY_PROMPT
-	#endif
-#else
-	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-	#undef BB_FEATURE_SH_STANDALONE_SHELL
-	#undef BB_FEATURE_SH_FANCY_PROMPT
-#endif
-//
-#if (defined BB_ASH || defined BB_HUSH || defined BB_MSH) && ! defined BB_TEST
-	#define BB_TEST
-#endif
-//
-#ifdef BB_KILLALL
-	#ifndef BB_KILL
-		#define BB_KILL
-	#endif
-#endif
-//
-#ifndef BB_INIT
-	#undef BB_FEATURE_LINUXRC
-#endif
-//
-#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
-	#define BB_NFSMOUNT
-#endif
-//
-#if defined BB_FEATURE_AUTOWIDTH
-	#ifndef BB_FEATURE_USE_TERMIOS
-		#define BB_FEATURE_USE_TERMIOS
-	#endif
-#endif
-//
-#if defined BB_INSMOD || defined BB_LSMOD
-	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
-		#define BB_FEATURE_NEW_MODULE_INTERFACE
-	#endif
-#endif
-//
-#ifdef BB_UNIX2DOS
-	#define BB_DOS2UNIX
-#endif	
-//
-#ifdef BB_SYSLOGD
-	#if defined BB_FEATURE_IPC_SYSLOG
-		#define BB_LOGREAD
-	#endif
-#endif
-//
-#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
-# define shell_main ash_main
-#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
-# define shell_main hush_main
-#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
-# define shell_main lash_main
-#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
-# define shell_main msh_main
-#endif
diff --git a/sys-apps/busybox/files/busybox-0.60.5-dietlibc.diff b/sys-apps/busybox/files/busybox-0.60.5-dietlibc.diff
deleted file mode 100644
index 89f68165fc84..000000000000
--- a/sys-apps/busybox/files/busybox-0.60.5-dietlibc.diff
+++ /dev/null
@@ -1,435 +0,0 @@
-diff -ur busybox-0.60.5.orig/Makefile busybox-0.60.5/Makefile
---- busybox-0.60.5.orig/Makefile	2002-10-27 05:47:54.000000000 +0100
-+++ busybox-0.60.5/Makefile	2003-05-05 17:29:45.000000000 +0200
-@@ -109,6 +109,7 @@
- #LIBRARIES = $(LIBCDIR)/lib/libc.a -lgcc
- #CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
- #GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
-+LIBRARIES = -lrpc -lcompat
- 
- WARNINGS = -Wall -Wshadow
- 
-diff -ur busybox-0.60.5.orig/ash.c busybox-0.60.5/ash.c
---- busybox-0.60.5.orig/ash.c	2002-10-23 00:14:29.000000000 +0200
-+++ busybox-0.60.5/ash.c	2003-05-05 17:29:45.000000000 +0200
-@@ -7777,7 +7777,7 @@
- 
- #undef rflag
- 
--#if !defined(__GLIBC__) || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
-+#if (!defined(__GLIBC__) || __GLIBC__ == 2 && __GLIBC_MINOR__ < 1 ) && !defined(__dietlibc__)
- typedef long rlim_t;
- #endif
- 
-diff -ur busybox-0.60.5.orig/chown.c busybox-0.60.5/chown.c
---- busybox-0.60.5.orig/chown.c	2001-11-20 00:34:17.000000000 +0100
-+++ busybox-0.60.5/chown.c	2003-05-05 17:29:45.000000000 +0200
-@@ -36,7 +36,11 @@
- static long uid;
- static long gid;
- 
-+#if !defined(__dietlibc__)
- static int (*chown_func)(const char *, __uid_t, __gid_t) = chown;
-+#else
-+static int (*chown_func)(const char *, uid_t, gid_t) = chown;
-+#endif
- 
- static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
- {
-diff -ur busybox-0.60.5.orig/cmdedit.c busybox-0.60.5/cmdedit.c
---- busybox-0.60.5.orig/cmdedit.c	2002-04-25 01:07:03.000000000 +0200
-+++ busybox-0.60.5/cmdedit.c	2003-05-05 17:29:45.000000000 +0200
-@@ -165,7 +165,7 @@
- #endif	/* BB_FEATURE_COMMAND_TAB_COMPLETION */
- 
- /* It seems that libc5 doesn't know what a sighandler_t is... */
--#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
-+#if ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)) && !defined(__dietlibc__)
- typedef void (*sighandler_t) (int);
- #endif
- 
-diff -ur busybox-0.60.5.orig/ifconfig.c busybox-0.60.5/ifconfig.c
---- busybox-0.60.5.orig/ifconfig.c	2002-10-23 00:14:29.000000000 +0200
-+++ busybox-0.60.5/ifconfig.c	2003-05-05 17:29:45.000000000 +0200
-@@ -41,7 +41,11 @@
- #include <arpa/inet.h>
- #include <net/if.h>
- #include <net/if_arp.h>
-+#ifdef __dietlibc__
-+#include <net/if_ether.h>
-+#else
- #include <linux/if_ether.h>
-+#endif
- #include "busybox.h"
- 
- #ifdef BB_FEATURE_IFCONFIG_SLIP
-diff -ur busybox-0.60.5.orig/init.c busybox-0.60.5/init.c
---- busybox-0.60.5.orig/init.c	2002-10-22 21:15:43.000000000 +0200
-+++ busybox-0.60.5/init.c	2003-05-05 17:30:03.000000000 +0200
-@@ -38,7 +38,7 @@
- #include <termios.h>
- #include <unistd.h>
- #include <limits.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mount.h>
- #include <sys/types.h>
-@@ -698,6 +698,7 @@
- static void shutdown_system(void)
- {
- 	sigset_t block_signals;
-+	sigset_t old_signals;
- 
- 	/* run everything to be run at "shutdown".  This is done _prior_
- 	 * to killing everything, in case people wish to use scripts to
-@@ -715,7 +716,7 @@
- 	sigaddset(&block_signals, SIGCONT);
- 	sigaddset(&block_signals, SIGSTOP);
- 	sigaddset(&block_signals, SIGTSTP);
--	sigprocmask(SIG_BLOCK, &block_signals, NULL);
-+	sigprocmask(SIG_BLOCK, &block_signals, &old_signals);
- 
- 	/* Allow Ctrl-Alt-Del to reboot system. */
- 	init_reboot(RB_ENABLE_CAD);
-diff -ur busybox-0.60.5.orig/libbb/interface.c busybox-0.60.5/libbb/interface.c
---- busybox-0.60.5.orig/libbb/interface.c	2002-09-17 08:36:56.000000000 +0200
-+++ busybox-0.60.5/libbb/interface.c	2003-05-05 17:29:45.000000000 +0200
-@@ -1527,7 +1527,11 @@
- 
- #if HAVE_HWETHER
- #include <net/if_arp.h>
-+#ifdef __dietlibc__
-+#include <net/if_ether.h>
-+#else
- #include <linux/if_ether.h>
-+#endif
- 
- static struct hwtype ether_hwtype;
- 
-diff -ur busybox-0.60.5.orig/libbb/libc5.c busybox-0.60.5/libbb/libc5.c
---- busybox-0.60.5.orig/libbb/libc5.c	2002-09-17 09:44:27.000000000 +0200
-+++ busybox-0.60.5/libbb/libc5.c	2003-05-05 17:29:45.000000000 +0200
-@@ -65,11 +65,13 @@
- 	return token;
- }
- 
-+#if !defined(__dietlibc__)
- /* Basically getdelim() with the delimiter hard wired to '\n' */
- ssize_t getline(char **linebuf, size_t *n, FILE *file)
- {
-       return (getdelim (linebuf, n, '\n', file));
- }
-+#endif
- 
- 
- #ifndef __uClinux__
-diff -ur busybox-0.60.5.orig/libbb/module_syscalls.c busybox-0.60.5/libbb/module_syscalls.c
---- busybox-0.60.5.orig/libbb/module_syscalls.c	2002-03-12 01:33:09.000000000 +0100
-+++ busybox-0.60.5/libbb/module_syscalls.c	2003-05-05 17:29:45.000000000 +0200
-@@ -21,6 +21,7 @@
-  *
-  */
- 
-+#ifndef __dietlibc__
- #include <stdio.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -76,7 +77,7 @@
- }
- 
- #endif /* __GNU_LIBRARY__ < 5 */
--
-+#endif /* __dietlibc__ */
- 
- /* END CODE */
- /*
-diff -ur busybox-0.60.5.orig/libbb/syscalls.c busybox-0.60.5/libbb/syscalls.c
---- busybox-0.60.5.orig/libbb/syscalls.c	2002-03-12 01:33:09.000000000 +0100
-+++ busybox-0.60.5/libbb/syscalls.c	2003-05-05 17:29:45.000000000 +0200
-@@ -21,6 +21,7 @@
-  *
-  */
- 
-+#ifndef __dietlibc__
- #include <stdio.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -102,6 +103,7 @@
- 
- 
- #endif /* __GNU_LIBRARY__ < 5 */
-+#endif /* __dietlibc__ */
- 
- 
- /* END CODE */
-diff -ur busybox-0.60.5.orig/logread.c busybox-0.60.5/logread.c
---- busybox-0.60.5.orig/logread.c	2001-04-10 01:52:18.000000000 +0200
-+++ busybox-0.60.5/logread.c	2003-05-05 17:29:45.000000000 +0200
-@@ -35,7 +35,7 @@
- #include <setjmp.h>
- #include "busybox.h"
- 
--#if __GNU_LIBRARY__ < 5
-+#if __GNU_LIBRARY__ < 5 && !defined(__dietlibc__)
- #error Sorry.  Looks like you are using libc5.  
- #error libc5 shm support isnt good enough.
- #error Please disable BB_FEATURE_IPC_SYSLOG 
-diff -ur busybox-0.60.5.orig/mkswap.c busybox-0.60.5/mkswap.c
---- busybox-0.60.5.orig/mkswap.c	2002-04-06 07:01:20.000000000 +0200
-+++ busybox-0.60.5/mkswap.c	2003-05-05 17:29:45.000000000 +0200
-@@ -42,8 +42,12 @@
- #include <stdlib.h>
- #include <sys/ioctl.h>			/* for _IO */
- #include <sys/utsname.h>
-+#ifdef __dietlibc__
-+#include <sys/shm.h>
-+#else
- #include <asm/page.h>			/* for PAGE_SIZE and PAGE_SHIFT */
- 				/* we also get PAGE_SIZE via getpagesize() */
-+#endif
- #include "busybox.h"
- 
- #ifndef _IO
-diff -ur busybox-0.60.5.orig/mt.c busybox-0.60.5/mt.c
---- busybox-0.60.5.orig/mt.c	2001-05-22 16:32:35.000000000 +0200
-+++ busybox-0.60.5/mt.c	2003-05-05 17:29:45.000000000 +0200
-@@ -3,7 +3,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/mtio.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include "busybox.h"
- 
- struct mt_opcodes {
-diff -ur busybox-0.60.5.orig/nslookup.c busybox-0.60.5/nslookup.c
---- busybox-0.60.5.orig/nslookup.c	2002-04-27 06:03:59.000000000 +0200
-+++ busybox-0.60.5/nslookup.c	2003-05-05 17:29:45.000000000 +0200
-@@ -137,8 +137,11 @@
- /* lookup the default nameserver and display it */
- static inline void server_print(void)
- {
--	struct sockaddr_in def = _res.nsaddr_list[0];
--	char *ip = inet_ntoa(def.sin_addr);
-+	struct sockaddr_in def;
-+	char *ip;
-+
-+	memcpy(&def,&_res.nsaddr_list[0],sizeof(def));
-+	ip = inet_ntoa(def.sin_addr);
- 
- 	hostent_fprint(gethostbyaddr_wrapper(ip), 1);
- 	printf("\n");
-diff -ur busybox-0.60.5.orig/ping.c busybox-0.60.5/ping.c
---- busybox-0.60.5.orig/ping.c	2002-09-17 09:56:26.000000000 +0200
-+++ busybox-0.60.5/ping.c	2003-05-05 17:29:45.000000000 +0200
-@@ -55,7 +55,7 @@
- /* It turns out that libc5 doesn't have proper icmp support
-  * built into it header files, so we have to supplement it */
- #if __GNU_LIBRARY__ < 5
--static const int ICMP_MINLEN = 8;				/* abs minimum */
-+#define ICMP_MINLEN 8				/* abs minimum */
- 
- struct icmp_ra_addr
- {
-diff -ur busybox-0.60.5.orig/ps.c busybox-0.60.5/ps.c
---- busybox-0.60.5.orig/ps.c	2002-09-17 10:23:05.000000000 +0200
-+++ busybox-0.60.5/ps.c	2003-05-05 17:29:45.000000000 +0200
-@@ -38,7 +38,9 @@
- #include <string.h>
- #include <termios.h>
- #include <sys/ioctl.h>
-+#ifndef __dietlibc__
- #include <linux/major.h>
-+#endif
- #include "busybox.h"
- 
- static const int TERMINAL_WIDTH = 79;      /* not 80 in case terminal has linefold bug */
-@@ -83,13 +85,15 @@
- 
- static void dev_to_name(dev_t dev, char *name)
- {
--	if (MAJOR(dev) == TTY_MAJOR)
-+	if (MAJOR(dev) == 4)
- 		if (MINOR(dev) < 64)
- 			sprintf(name,"tty%d", (int)MINOR(dev));
- 		else
- 			sprintf(name,"ttyS%d", (int)MINOR(dev)-64);
--	else if (MAJOR(dev) == PTY_SLAVE_MAJOR)
-+	else if (MAJOR(dev) == 3 )
- 		sprintf(name,"tty%c%x", master[MINOR(dev) / 16], (int)MINOR(dev) & 0xf);
-+	else if (MAJOR(dev) >= 136 && MAJOR(dev) <= 143)
-+		sprintf(name,"pts/%d", ((MAJOR(dev)-136) << 8) | (int)MINOR(dev));
- 	else
- 		strcpy(name, "");
- }
-diff -ur busybox-0.60.5.orig/route.c busybox-0.60.5/route.c
---- busybox-0.60.5.orig/route.c	2002-09-17 09:56:25.000000000 +0200
-+++ busybox-0.60.5/route.c	2003-05-05 17:29:45.000000000 +0200
-@@ -23,7 +23,7 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <net/route.h>
--#include <linux/param.h>  // HZ
-+//#include <linux/param.h>  // HZ
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <stdio.h>
-diff -ur busybox-0.60.5.orig/syslogd.c busybox-0.60.5/syslogd.c
---- busybox-0.60.5.orig/syslogd.c	2002-09-17 22:04:12.000000000 +0200
-+++ busybox-0.60.5/syslogd.c	2003-05-05 17:29:45.000000000 +0200
-@@ -55,7 +55,7 @@
- #define __LOG_FILE "/var/log/messages"
- 
- /* Path to the unix socket */
--static char lfile[MAXPATHLEN];
-+static const char lfile[] = _PATH_LOG;
- 
- static char *logFilePath = __LOG_FILE;
- 
-@@ -84,7 +84,7 @@
- 
- /* circular buffer variables/structures */
- #ifdef BB_FEATURE_IPC_SYSLOG
--#if __GNU_LIBRARY__ < 5
-+#if __GNU_LIBRARY__ < 5 && !defined(__dietlibc__)
- #error Sorry.  Looks like you are using libc5.
- #error libc5 shm support isnt good enough.
- #error Please disable BB_FEATURE_IPC_SYSLOG
-@@ -495,22 +495,21 @@
- 	signal (SIGALRM, domark);
- 	alarm (MarkInterval);
- 
--	/* Create the syslog file so realpath() can work. */
--	if (realpath (_PATH_LOG, lfile) != NULL)
--		unlink (lfile);
--
- 	memset (&sunx, 0, sizeof (sunx));
- 	sunx.sun_family = AF_UNIX;
- 	strncpy (sunx.sun_path, lfile, sizeof (sunx.sun_path));
- 	if ((sock_fd = socket (AF_UNIX, SOCK_DGRAM, 0)) < 0)
--		perror_msg_and_die ("Couldn't get file descriptor for socket " _PATH_LOG);
-+		perror_msg_and_die ("Couldn't get file descriptor for socket %s", lfile);
- 
- 	addrLength = sizeof (sunx.sun_family) + strlen (sunx.sun_path);
-+
-+	unlink (lfile);
-+
- 	if (bind(sock_fd, (struct sockaddr *) &sunx, addrLength) < 0)
--		perror_msg_and_die ("Could not connect to socket " _PATH_LOG);
-+		perror_msg_and_die ("Could not connect to socket %s", lfile);
- 
- 	if (chmod (lfile, 0666) < 0)
--		perror_msg_and_die ("Could not set permission on " _PATH_LOG);
-+		perror_msg_and_die ("Could not set permission on %s", lfile);
- 
- 
- #ifdef BB_FEATURE_IPC_SYSLOG
-diff -ur busybox-0.60.5.orig/tee.c busybox-0.60.5/tee.c
---- busybox-0.60.5.orig/tee.c	2001-11-20 00:34:17.000000000 +0100
-+++ busybox-0.60.5/tee.c	2003-05-05 17:29:45.000000000 +0200
-@@ -24,18 +24,33 @@
- #include <getopt.h>
- #include <stdio.h>
- 
-+#define TEE_OPT_NONE		0x0
-+#ifdef BB_FEATURE_TEE_UNBUFFERED
-+#define TEE_OPT_UNBUFFERED	0x1
-+#endif
-+
- int
- tee_main(int argc, char **argv)
- {
--	char *mode = "w";
-+	char *mode = "w",
-+	    opts = TEE_OPT_NONE;
- 	int c, i, status = 0, nfiles = 0;
- 	FILE **files;
- 
-+#ifdef BB_FEATURE_TEE_UNBUFFERED
-+	while ((c = getopt(argc, argv, "au")) != EOF) {
-+#else
- 	while ((c = getopt(argc, argv, "a")) != EOF) {
-+#endif
- 		switch (c) {
- 		case 'a': 
- 			mode = "a";
- 			break;
-+#ifdef BB_FEATURE_TEE_UNBUFFERED
-+		case 'u':
-+			opts |= TEE_OPT_UNBUFFERED;
-+			break;
-+#endif
- 		default:
- 			show_usage();
- 		}
-@@ -43,17 +58,28 @@
- 
- 	files = (FILE **)xmalloc(sizeof(FILE *) * (argc - optind + 1));
- 	files[nfiles++] = stdout;
-+
- 	while (optind < argc) {
--		if ((files[nfiles++] = fopen(argv[optind++], mode)) == NULL) {
-+		if ((files[nfiles] = fopen(argv[optind], mode)) == NULL) {
- 			nfiles--;
--			perror_msg("%s", argv[optind-1]);
-+			perror_msg("%s", argv[optind]);
- 			status = 1;
- 		}
-+		nfiles++;
-+		optind++;
- 	}
- 
- 	while ((c = getchar()) != EOF)
--		for (i = 0; i < nfiles; i++)
-+		for (i = 0; i < nfiles; i++) {
- 			putc(c, files[i]);
-+#ifdef BB_FEATURE_TEE_UNBUFFERED
-+			if (opts & TEE_OPT_UNBUFFERED) {
-+				if ((fflush(files[i])) == EOF) {
-+					perror_msg("Error flushing file");
-+				}
-+			}
-+#endif
-+		}
- 
- 	return status;
- }
-diff -ur busybox-0.60.5.orig/time.c busybox-0.60.5/time.c
---- busybox-0.60.5.orig/time.c	2002-09-30 21:37:19.000000000 +0200
-+++ busybox-0.60.5/time.c	2003-05-05 17:29:45.000000000 +0200
-@@ -429,7 +429,7 @@
- static void run_command (char *const *cmd, resource_t *resp)
- {
-     pid_t pid;			/* Pid of child.  */
--    __sighandler_t interrupt_signal, quit_signal;
-+    sighandler_t interrupt_signal, quit_signal;
- 
-     gettimeofday (&resp->start, (struct timezone *) 0);
-     pid = fork ();		/* Run CMD as child process.  */
-diff -ur busybox-0.60.5.orig/top.c busybox-0.60.5/top.c
---- busybox-0.60.5.orig/top.c	2002-10-23 12:21:19.000000000 +0200
-+++ busybox-0.60.5/top.c	2003-05-05 17:29:45.000000000 +0200
-@@ -36,7 +36,11 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- /* get page info */
-+#ifdef __dietlibc__
-+#include <sys/shm.h>
-+#else
- #include <asm/page.h>
-+#endif
- #include "busybox.h"
- 
- #define FEATURE_CPU_USAGE_PERCENTAGE  /* + 2k */
-diff -ur busybox-0.60.5.orig/wget.c busybox-0.60.5/wget.c
---- busybox-0.60.5.orig/wget.c	2002-04-27 09:40:00.000000000 +0200
-+++ busybox-0.60.5/wget.c	2003-05-05 17:29:45.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <termios.h>
- 
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
diff --git a/sys-apps/busybox/files/digest-busybox-0.60.3-r1 b/sys-apps/busybox/files/digest-busybox-0.60.3-r1
deleted file mode 100644
index 392d227dbcac..000000000000
--- a/sys-apps/busybox/files/digest-busybox-0.60.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a202031d77cfd2515dfac0b163b47b1b busybox-0.60.3.tar.gz 770870
diff --git a/sys-apps/busybox/files/digest-busybox-0.60.3-r2 b/sys-apps/busybox/files/digest-busybox-0.60.3-r2
deleted file mode 100644
index 392d227dbcac..000000000000
--- a/sys-apps/busybox/files/digest-busybox-0.60.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a202031d77cfd2515dfac0b163b47b1b busybox-0.60.3.tar.gz 770870
diff --git a/sys-apps/busybox/files/digest-busybox-1.00_rc3 b/sys-apps/busybox/files/digest-busybox-1.00_rc3
deleted file mode 100644
index 1ec2fb13248f..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.00_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb28b670a20a4670827e4a9472d22f01 busybox-1.00-rc3.tar.bz2 1106088
diff --git a/sys-apps/busybox/files/msh.diff b/sys-apps/busybox/files/msh.diff
deleted file mode 100644
index 4a48f9c5c2ef..000000000000
--- a/sys-apps/busybox/files/msh.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- msh.c	Wed Dec 19 10:40:39 2001
-+++ msh.c	Wed Dec 19 10:42:34 2001
-@@ -3093,11 +3093,19 @@
- int key;
- {
- 	if (*wp != NULL) {
--		for (; *wp != NULL; wp++)
-+		for (; *wp != NULL; wp++) {
-+			if (isassign(*wp)) {
-+				char *cp;
-+				assign(*wp, COPYV);
-+				for (cp = *wp; *cp != '='; cp++)
-+					;
-+				*cp='\0';
-+			}
- 			if (checkname(*wp))
- 				(*f) (lookup(*wp));
- 			else
- 				badid(*wp);
-+		}
- 	} else
- 		putvlist(key, 1);
- }
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index 96a2d586367d..5c40e771595f 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<herd>embedded</herd>
 </pkgmetadata>