The highly anticipated release of BusyBox 1.00 has arrived after 3 years in development. (arches please test and mark stable so we can clean out files/*)

11 files changed, 100 insertions, 241 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 54b1b38930d7..96483e0e3ce7 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.45 2004/09/28 13:30:13 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.46 2004/10/13 12:29:13 solar Exp $
+
+*busybox-1.00 (13 Oct 2004)
+
+  13 Oct 2004; <solar@gentoo.org> -files/busybox-1.00_pre8-amd64.patch,
+  -busybox-0.60.5-r1.ebuild, -busybox-0.60.5-r2.ebuild, +busybox-1.00.ebuild,
+  -busybox-1.00_pre8.ebuild, busybox-1.00_rc3.ebuild:
+  The highly anticipated release of BusyBox 1.00 has arrived after 3 years in
+  development. (arches please test and mark stable so we can clean out files/*)
 
   28 Sep 2004; Guy Martin <gmsoft@gentoo.org> busybox-1.00_rc3.ebuild:
   Removed build of insmod for hppa. Marked stable on hppa.
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 0ea995cafb11..f4657f24ba47 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,36 +1,52 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 01374f50d2f624bb263eafbda35ce3a9 ChangeLog 8982
-MD5 f98f75be102af5709caff4cf84eaeb90 busybox-0.60.3-r1.ebuild 1091
+MD5 fa747ecef8eb57f7a134f269ed2d524a busybox-1.00.ebuild 6816
+SHA1 a9ceb5854f8c357f00c904a717ebc5c4741c27c7 busybox-1.00.ebuild 6816
 MD5 bb58878c35f17f5bad4aa060f1dcc25e busybox-0.60.3-r2.ebuild 1183
-MD5 bc6b0e4b7611df0d97f0c380b9fa7c07 busybox-0.60.5-r1.ebuild 1407
+SHA1 bd5fd6cacd87c2e2e1b2931160f036169f0cbf19 busybox-0.60.3-r2.ebuild 1183
+MD5 f98f75be102af5709caff4cf84eaeb90 busybox-0.60.3-r1.ebuild 1091
+SHA1 9d234d3566150ca85f825b884f88091bb2e49ab0 busybox-0.60.3-r1.ebuild 1091
+MD5 f8da3423413ed2769f010629349cceb9 busybox-1.00_rc3.ebuild 6868
+SHA1 fc53ccddeab8619f43f5814ffc65ecc203171f4e busybox-1.00_rc3.ebuild 6868
+MD5 374b5cdf3bb2a0d877a76828996efdd5 ChangeLog 9373
+SHA1 e9ff5db8bbc6a65679cca29ce9fd1ba4110f13bc ChangeLog 9373
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 850bd351d581d0e98c74552826d24eae busybox-0.60.5-r2.ebuild 2280
-MD5 ff085c6cf8e0573bcd3f80bb86c4ca4d busybox-1.00_pre8.ebuild 6116
-MD5 755a816eee22ea778ca28a82467dc39d busybox-1.00_rc3.ebuild 6869
+SHA1 9c213f5803676c56439df3716be07d6692588856 metadata.xml 164
+MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
+SHA1 0dc911793cd298a1e6f61073c2e37ba1c107f5f9 files/config-netboot 9853
+MD5 92b8251be33472ce69437a6b0eddf4b1 files/digest-busybox-1.00 141
+SHA1 ba0b00257dfdef245d448552d447cd26c7d30678 files/digest-busybox-1.00 141
 MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695
+SHA1 dc1ecbc9e91724956daeda5163fede3d2cd0a7ee files/Config.h 11695
 MD5 24ec3839ecb3e429bf29a819398b7753 files/Config.h-0.60.2-cd 13772
+SHA1 eca6ab2495dd5feccebc4ba21039da7b69fc4544 files/Config.h-0.60.2-cd 13772
 MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319
+SHA1 b8da2698a9d25f7e122826051c14df7a136d641a files/Config.h-0.60.3-cd 14319
 MD5 1bce86c66f42d204c0780faee28004d6 files/Config.h-0.60.5-cd 14299
-MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526
-MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
-MD5 3d2f032de478151319a640c020fa492e files/busybox-1.00_pre8-amd64.patch 862
-MD5 75d3d96c0d23ddd4ffae3daa59e0fb1e files/digest-busybox-1.00_rc3 70
-MD5 2a162a491ef2162ee773767a8dbca4da files/digest-busybox-0.60.3-r1 513
-MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r1 66
-MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r2 66
+SHA1 603df7bd0e9e5f934a364db835a9e105a68737c4 files/Config.h-0.60.5-cd 14299
 MD5 9750d4004e6507d35f9aa67d2785fdd3 files/dodeps 2015
-MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
+SHA1 35588ac61fa268dab2909e7fc50721b79bac2086 files/dodeps 2015
 MD5 4e80b04a6c57cb7341be774b55b7229c files/busybox-cmdedit-sparc.diff 568
-MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
-MD5 607bbb12af0241b696df9dbfcd71d8c4 files/digest-busybox-1.00_pre8 70
-MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
+SHA1 51dbf190b7ed93d9d9dfacdc3ca25777c7dcde17 files/busybox-cmdedit-sparc.diff 568
+MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
+SHA1 811bc903760a0fa899f9d34d3fb20d9aec038bde files/busybox-1.00-pre3.config 8804
 MD5 8eae5b311553ee77cda4524ab892468c files/busybox-1.00_rc3-amd64.patch 658
+SHA1 838fe5f60aa5f9faea0d963f2bb4359d7bb8650b files/busybox-1.00_rc3-amd64.patch 658
+MD5 2a162a491ef2162ee773767a8dbca4da files/digest-busybox-0.60.3-r1 513
+SHA1 82dda9640c24abed8121687a537caacbffad8757 files/digest-busybox-0.60.3-r1 513
+MD5 61ecae720ff226b1e543f7c1d0900043 files/digest-busybox-0.60.3-r2 66
+SHA1 6ba7d78ccc0836a14bb34d5d8d6f6695cae61dff files/digest-busybox-0.60.3-r2 66
+MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526
+SHA1 61467e45259659161ee8d4981be589e9e373c1c5 files/busybox-0.60.5-dietlibc.diff 13526
+MD5 82715fed5d7bb015819ce9d9849e7524 files/digest-busybox-1.00_rc3 149
+SHA1 54083e1f5f0be5e286dbbfbdfb9c028cb2156efc files/digest-busybox-1.00_rc3 149
+MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
+SHA1 e66b9533ba4ff0849f89836dfba65c6ae2a60b56 files/msh.diff 433
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBZNcSHTu7gpaalycRAopgAKDVFlKJvRKXV8Rk2k/70rj9J2FeXgCfWg8B
-DzClysBXojrTUpgVpK+HmnU=
-=5C7Y
+iD8DBQFBbR9Q94CCfB4KcwwRAkaBAJwJHSFgIN+yyjlPbtzHXvbaJZ9p6ACghbsL
+5Ypu7mYN5sri0uZEL+4YBmY=
+=tDRv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-0.60.5-r1.ebuild b/sys-apps/busybox/busybox-0.60.5-r1.ebuild
deleted file mode 100644
index de5e9fc436bf..000000000000
--- a/sys-apps/busybox/busybox-0.60.5-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.13 2004/06/28 16:01:00 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 -alpha -amd64"
-IUSE="static uclibc"
-
-DEPEND="virtual/libc"
-RDEPEND="!static? ( 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"
-	if use uclibc; then
-		myconf="${myconf} \
-			CC=/usr/i386-linux-uclibc/bin/i386-uclibc-gcc \
-			USE_SYSTEM_PWD=false"
-		unset CFLAGS
-	fi
-	emake ${myconf} || die
-}
-
-src_install() {
-	into /
-	dobin busybox
-	into /usr
-	dodoc AUTHORS Changelog LICENSE README TODO
-
-	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
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Edit /usr/portage/sys-apps/busybox/files/Config.h-${PV}-cd and"
-	einfo "re-emerge if you need to add/remove functionality in "
-	einfo "BusyBox."
-	einfo ""
-}
diff --git a/sys-apps/busybox/busybox-0.60.5-r2.ebuild b/sys-apps/busybox/busybox-0.60.5-r2.ebuild
deleted file mode 100644
index 8665602eb4dc..000000000000
--- a/sys-apps/busybox/busybox-0.60.5-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r2.ebuild,v 1.10 2004/06/28 16:01:00 vapier Exp $
-
-inherit flag-o-matic 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="~x86 arm -alpha -amd64"
-IUSE="static uclibc diet devfs"
-
-DEPEND="virtual/libc
-	diet? ( dev-libs/dietlibc )
-	>=sys-apps/sed-4"
-RDEPEND="
-	!static? (
-		!diet? ( virtual/libc )
-		diet? ( dev-libs/dietlibc )
-	)"
-
-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
-
-	if use devfs; then
-		einfo "Disabling devfs in busybox"
-		sed -i -e "s:#define.*BB_FEATURE_DEVFS://#define BB_FEATURE_DEVFS:g" \
-			 ${S}/Config.h
-	fi
-
-	# Add support for dietlibc - solar@gentoo.org
-	if use diet; then
-		[ "${PV}" == "0.60.5" ] &&
-		sed -i \
-			-e "s://#define.*BB_TTY:#define BB_TTY:g" \
-			-e "s://#define.*BB_WATCH:#define BB_WATCH:g" \
-			-e "s:BB_TRACEROUTE:BB_TRACEROUTE_${RANDOM}:g" \
-			${S}/Config.h
-		[ -f ${FILESDIR}/${PN}-${PV}-dietlibc.diff ] &&
-			epatch ${FILESDIR}/${PN}-${PV}-dietlibc.diff ||
-			ewarn "No dietlibc patch found for ${PN}-${PV}"
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	use static && myconf="${myconf} DOSTATIC=true"
-	if use uclibc; then
-		myconf="${myconf} \
-			CC=/usr/i386-linux-uclibc/bin/i386-uclibc-gcc \
-			USE_SYSTEM_PWD=false"
-		unset CFLAGS
-	fi
-
-	if use diet ; then
-		append-flags -D_BSD_SOURCE
-		emake CC="diet ${CC}" CLFAGS="${CFLAGS}" ${myconf} ||
-			die "Failed to make diet ${PN}"
-	else
-		emake ${myconf} || die
-	fi
-}
-
-src_install() {
-	into /
-	dobin busybox
-	into /usr
-	dodoc AUTHORS Changelog LICENSE README TODO
-
-	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
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Edit /usr/portage/sys-apps/busybox/files/Config.h-${PV}-cd and"
-	einfo "re-emerge if you need to add/remove functionality in "
-	einfo "BusyBox."
-	einfo ""
-}
diff --git a/sys-apps/busybox/busybox-1.00_pre8.ebuild b/sys-apps/busybox/busybox-1.00.ebuild
index 54c3e043925e..1a13d5e7756b 100644
--- a/sys-apps/busybox/busybox-1.00_pre8.ebuild
+++ b/sys-apps/busybox/busybox-1.00.ebuild
@@ -1,25 +1,36 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre8.ebuild,v 1.13 2004/10/07 01:13:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00.ebuild,v 1.1 2004/10/13 12:29:13 solar Exp $
 
 inherit eutils
 
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Utilities for rescue and embedded systems"
+#SNAPSHOT=20040726
 HOMEPAGE="http://www.busybox.net/"
-SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~mips arm ~amd64"
-IUSE="debug static uclibc savedconfig make-busybox-symlinks"
+KEYWORDS="~x86 ~ppc ~mips ~arm ~amd64 ~sparc ~hppa"
+IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks"
+#IUSE="${IUSE} cross"
+
+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? ( dev-libs/uclibc ) )
 	>=sys-apps/sed-4"
 RDEPEND="!static? ( ${DEPEND} )"
+
 # <pebenito> then eventually turning on selinux would mean
 # adding a dep: selinux? ( sys-libs/libselinux )
 
@@ -37,8 +48,6 @@ 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.
@@ -46,7 +55,13 @@ src_unpack() {
 	# [package]-[version].config
 	# [package].config
 
-	if use savedconfig ; then
+	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
@@ -68,6 +83,11 @@ src_unpack() {
 	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
+
 	# setting the cross compiler from here would be somewhat of a
 	# pain do to as we would need a multiline sed expression which
 	# does not always seem to work so hot for me.
@@ -103,6 +123,8 @@ src_unpack() {
 			busybox_config_option n INSMOD
 			busybox_config_option n MODPROBE
 			busybox_config_option n RMMOD;;
+		hppa)
+			 busybox_config_option n INSMOD;;
 		*) ;;
 	esac
 
@@ -112,16 +134,18 @@ src_unpack() {
 	#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
+	( echo | make clean oldconfig > /dev/null ) || :
 }
 
 busybox_set_cross_compiler() {
-	if use uclibc ; then
-		case ${ARCH} in
-			x86*) CROSS="/usr/i386-linux-uclibc/bin/i386-uclibc-";;
-			*) ;;
-		esac
-	fi
+	return 0
+	# revisit this another day.
+	#if use cross ; then
+	#	case ${ARCH} in
+	#		x86*) CROSS="/usr/i386-linux-uclibc/bin/i386-uclibc-";;
+	#		*) ;;
+	#	esac
+	#fi
 	[ -n "${CROSS}" ] && einfo "Setting cross compiler prefix to ${CROSS}"
 }
 
@@ -136,12 +160,15 @@ src_install() {
 
 	into /
 	dobin busybox
-	if use make-busybox-symlinks ;
-	then
+	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 "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"
@@ -162,7 +189,7 @@ src_install() {
 		cd ${S}
 	fi
 
-	dodoc AUTHORS Changelog LICENSE README TODO
+	dodoc AUTHORS Changelog README TODO
 
 	cd docs || die
 	docinto txt
@@ -183,7 +210,7 @@ src_install() {
 	dodoc bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* 2>/dev/null
 
 	cd ../../ || die
-	if [ `has buildpkg ${FEATURES}` -a `has keepwork ${FEATURES}` ]; then
+	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
diff --git a/sys-apps/busybox/busybox-1.00_rc3.ebuild b/sys-apps/busybox/busybox-1.00_rc3.ebuild
index 392b423914e1..ae45087cd4b6 100644
--- a/sys-apps/busybox/busybox-1.00_rc3.ebuild
+++ b/sys-apps/busybox/busybox-1.00_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.9 2004/10/07 05:41:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_rc3.ebuild,v 1.10 2004/10/13 12:29:13 solar Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.busybox.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~mips ~arm ~amd64 ~sparc hppa"
+KEYWORDS="x86 ppc ~mips arm ~amd64 ~sparc hppa"
 IUSE="debug uclibc static savedconfig netboot make-busybox-symlinks"
 #IUSE="${IUSE} cross"
 
diff --git a/sys-apps/busybox/files/busybox-1.00_pre8-amd64.patch b/sys-apps/busybox/files/busybox-1.00_pre8-amd64.patch
deleted file mode 100644
index 3f53d52f228d..000000000000
--- a/sys-apps/busybox/files/busybox-1.00_pre8-amd64.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- modutils/insmod.c.orig	2004-06-11 20:36:37.684227544 +0200
-+++ modutils/insmod.c	2004-06-11 20:36:58.307092392 +0200
-@@ -152,6 +152,18 @@
- #define ELFCLASSM	ELFCLASS32
- #endif
- 
-+#if defined(__x86_64__)
-+#define BB_USE_GOT_ENTRIES
-+#define BB_GOT_ENTRY_SIZE 8
-+#define BB_USE_SINGLE
-+
-+#define MATCH_MACHINE(x) (x == EM_X86_64)
-+
-+#define SHT_RELM	SHT_RELA
-+#define Elf64_RelM	Elf64_Rela
-+#define ELFCLASSM	ELFCLASS64
-+#endif
-+
- #if defined(__mc68000__) 
- #define CONFIG_USE_GOT_ENTRIES
- #define CONFIG_GOT_ENTRY_SIZE 4
---- util-linux/fdisk.c.orig	2004-06-11 20:49:01.141204904 +0200
-+++ util-linux/fdisk.c	2004-06-11 20:50:18.957375048 +0200
-@@ -855,7 +855,7 @@
-  */
- 
- 
--#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
-+#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) || defined(__x86_64__)
- 
- #define my_llseek lseek
- 
diff --git a/sys-apps/busybox/files/digest-busybox-0.60.5-r1 b/sys-apps/busybox/files/digest-busybox-0.60.5-r1
deleted file mode 100644
index b6977779e16d..000000000000
--- a/sys-apps/busybox/files/digest-busybox-0.60.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1dfe09e0b1db1aab2a5f7d03e47640a6 busybox-0.60.5.tar.gz 785216
diff --git a/sys-apps/busybox/files/digest-busybox-0.60.5-r2 b/sys-apps/busybox/files/digest-busybox-0.60.5-r2
deleted file mode 100644
index b6977779e16d..000000000000
--- a/sys-apps/busybox/files/digest-busybox-0.60.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1dfe09e0b1db1aab2a5f7d03e47640a6 busybox-0.60.5.tar.gz 785216
diff --git a/sys-apps/busybox/files/digest-busybox-1.00 b/sys-apps/busybox/files/digest-busybox-1.00
new file mode 100644
index 000000000000..e0b286ddb41b
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.00
@@ -0,0 +1,2 @@
+MD5 5c7ea9b5d3b3677dfcdcec38b281a756 busybox-1.00.tar.bz2 1118427
+SHA1 ef39988a059599d4e5fbd619b427fd6b1bb76870 busybox-1.00.tar.bz2 1118427
diff --git a/sys-apps/busybox/files/digest-busybox-1.00_rc3 b/sys-apps/busybox/files/digest-busybox-1.00_rc3
index 1ec2fb13248f..4ca618373f85 100644
--- a/sys-apps/busybox/files/digest-busybox-1.00_rc3
+++ b/sys-apps/busybox/files/digest-busybox-1.00_rc3
@@ -1 +1,2 @@
 MD5 cb28b670a20a4670827e4a9472d22f01 busybox-1.00-rc3.tar.bz2 1106088
+SHA1 44f3de5b3782507d6498bc4fa8dff8f3a8f6eb1f busybox-1.00-rc3.tar.bz2 1106088