Version bump.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 310 insertions, 20 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 20c2f2c5b217..a9a19c99e582 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.73 2005/08/18 00:54:39 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.74 2006/02/01 02:34:59 vapier Exp $
+
+*busybox-1.1.0 (01 Feb 2006)
+
+  01 Feb 2006; Mike Frysinger <vapier@gentoo.org> +busybox-1.1.0.ebuild:
+  Version bump.
 
 *busybox-1.01 (18 Aug 2005)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index c835010dfbd6..51d2800eacd8 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,31 +1,73 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7544fceeb5eaefc424889d4651850237 busybox-1.1_pre20050802.ebuild 6334
-MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
+MD5 fd381fd5e4959337280abf764a19b7b4 ChangeLog 13782
+RMD160 44bf0899b4cc7894f6ec75bce7a184a89b81e16c ChangeLog 13782
+SHA256 753a8fb92b47b5d72de8ffc1a9194e672c88f5d6621f9537c7d96cc668906e39 ChangeLog 13782
 MD5 fe2861ddcc79aa407758c05886aee1e0 busybox-1.00-r4.ebuild 7084
-MD5 1dad6f571e1a8d34c2aa521ce6b3f50c busybox-1.01.ebuild 6924
-MD5 67d9008dfb895deda9cc7b5d1fc27a26 ChangeLog 13662
-MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142
-MD5 4bd102f0f2dae4271f441ca0d53c33c9 files/digest-busybox-1.01 141
-MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
-MD5 c6ef5df865f1dd6a2f4d1200184a366b files/digest-busybox-1.1_pre20050802 70
+RMD160 758cad996204484b90f30ec3f7a0f1b4bf757818 busybox-1.00-r4.ebuild 7084
+SHA256 d011220b72214515e0d48c97ada66015ad2e0d823c997d6f08423d3323ab8c3a busybox-1.00-r4.ebuild 7084
+MD5 01af8a5794d7047d0ea9debb8f6d0030 busybox-1.01.ebuild 6954
+RMD160 094637b64e929c3bc02e299a271c415530487d68 busybox-1.01.ebuild 6954
+SHA256 207e555ca07ebecf26aa5148e90a57d097416261aec89fcfb818c469a08290b6 busybox-1.01.ebuild 6954
+MD5 a86a9f03a75c02b1da96e68a1a88501c busybox-1.1.0.ebuild 6808
+RMD160 9d1b7dafff8b083c8dcc59756080d0baefb7a504 busybox-1.1.0.ebuild 6808
+SHA256 79f8681a8412644e629454f4a994548ba4ee8deb7fa968368b482a2b60feddea busybox-1.1.0.ebuild 6808
+MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
+RMD160 01c16591ff5d5b339a605a4372c6e431270862ed files/1.00/bash-tests.patch 1474
+SHA256 091f9aa2a5294cf9659ffaa2c6f995e9af2d0cdc2388ecab3620d06fd4ac4cb2 files/1.00/bash-tests.patch 1474
+MD5 02bde866363ce5357e8dfadcf870b230 files/1.00/bb.patch 155
+RMD160 2a963bb2f9658d6d3500b2680785328c5b342475 files/1.00/bb.patch 155
+SHA256 a38b1fde80af6d8654fa5f393e3eae468c19b4a69685c65babf2fac664891c12 files/1.00/bb.patch 155
 MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964
-MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007
-MD5 c5891798e8da55d3441b5361b62ee377 files/1.00/fix-amd64-insmod.patch 427
+RMD160 aa623aab22fba5a8ca7133b2ee8cc826437889df files/1.00/busybox-read-timeout.patch 1964
+SHA256 9fc405ca0fc964425c9b09a5fa38bed60040dad30d405edce8b1be79c1983e9d files/1.00/busybox-read-timeout.patch 1964
 MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245
-MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723
+RMD160 bebbde60e5b4ceda9c61ad3775195a145ec219af files/1.00/cp-posix-opts.patch 1245
+SHA256 c4e90f6af392fbb8abab98fd74952243250d94b63ce0301f56ed5fc91e6d8f55 files/1.00/cp-posix-opts.patch 1245
+MD5 c5891798e8da55d3441b5361b62ee377 files/1.00/fix-amd64-insmod.patch 427
+RMD160 6b56a2346340bdc046bf0e448dc865f4a96e150f files/1.00/fix-amd64-insmod.patch 427
+SHA256 6e8bab9e384094515f19818e2bce2feac04fa2ab3f67183e43eb7b0929a9af3f files/1.00/fix-amd64-insmod.patch 427
 MD5 8a3287074aab50454f7785651ddea71c files/1.00/gcc4.patch 632
-MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
-MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
-MD5 6209b38225ac1d7cc77f84799acbe3ca files/1.00/nice.patch 4571
+RMD160 e9186bc23092aa8db89414cd772578c05a5ce1fb files/1.00/gcc4.patch 632
+SHA256 3936befab1dca6723acde8f525ca58cced29bdb42e1c33f9750c7ecb35e1d6b9 files/1.00/gcc4.patch 632
 MD5 42df6649bab3689e562877edf2694f04 files/1.00/more-insmod-arches.patch 1079
+RMD160 d87f4643ae279873b6b2f6257e4af20ceca953b3 files/1.00/more-insmod-arches.patch 1079
+SHA256 89f75f8ba728a517fdb6eb4032be5dcc8db521d08498863ffaa82142be01e6b5 files/1.00/more-insmod-arches.patch 1079
+MD5 6209b38225ac1d7cc77f84799acbe3ca files/1.00/nice.patch 4571
+RMD160 52c825cdf2ed37540834cf9aa8dbe6afd28d4605 files/1.00/nice.patch 4571
+SHA256 7da1c4b4abda30146457c968a5d14d5c28556dd02e0108a60a59b8c2a2719174 files/1.00/nice.patch 4571
 MD5 0e50cd0ad938a8c15f1af8b59028c959 files/1.00/printenv.patch 3365
-MD5 02bde866363ce5357e8dfadcf870b230 files/1.00/bb.patch 155
+RMD160 a4942fa54d17f92c5d75b93f5b22aeb70a924f4b files/1.00/printenv.patch 3365
+SHA256 3389c26ebff4638981e8d0cd3d8ec74c89f6b170f844446e60dfd7c1b2f13f83 files/1.00/printenv.patch 3365
+MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
+RMD160 cfe7634e97f3b56d2573d77ceb2747e8c5642153 files/1.00/readlink-follow.patch 2795
+SHA256 6ed3d3c49ed768d261ec67cdac6d45a99449d570ff6b27e9754217f82ced2716 files/1.00/readlink-follow.patch 2795
+MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007
+RMD160 e047d9959393f7d9cb15c995fe9259f82b4ef48e files/1.00/standalone.patch 1007
+SHA256 ac3c6c1d4a9e1e7f73aed6fed4d016f75e53077284409e43c1031cba7697f90f files/1.00/standalone.patch 1007
+MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723
+RMD160 6cedc91bc8acb696dd2c629851e052e22065c46b files/1.00/sum.patch 6723
+SHA256 f1b10d90fdcf0ee370ffb8a760dd3e82d3a6df4e213c03be99ed3803e7460a7d files/1.00/sum.patch 6723
+MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
+RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853
+SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853
+MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142
+RMD160 ab359264555cd808eef30f09f5b82070043fc096 files/digest-busybox-1.00-r4 142
+SHA256 50b70755826d2949f40cbf2e650d37759b2179f0d6ba3389cd5dfa614d577fed files/digest-busybox-1.00-r4 142
+MD5 4bd102f0f2dae4271f441ca0d53c33c9 files/digest-busybox-1.01 141
+RMD160 8c7b31914fee9d3cae27666d34c0b15563917feb files/digest-busybox-1.01 141
+SHA256 0c83db317fd841a5fb70f628a2d07b8d43b881da777fa61d1392a04185c57d7a files/digest-busybox-1.01 141
+MD5 f6c0e8bba77ce0a1ed09e590071c033c files/digest-busybox-1.1.0 247
+RMD160 960eafa3aed947d819a4f5e56935c5942f3b6999 files/digest-busybox-1.1.0 247
+SHA256 282946af248671965c9462ace860bf663937b5a784aa894585e0c36e56f8b6c8 files/digest-busybox-1.1.0 247
+MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
+RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
+SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJ2n5gIKl8Uu19MoRAuPKAJwKyyre5xSIBbXDe/OmpQ2shJPThwCggJrp
-ACSIg7nKRD36jJW2WLG4inI=
-=k/Ji
+iD8DBQFD4B552+ySkm8kpY0RAk3uAKCkUC1ssGmHf5+xoh1+ndjhTbSC5wCeM4Oo
+M6YJ/Tlz6UcNcd7JW5aMzmo=
+=T5Yt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.0.ebuild b/sys-apps/busybox/busybox-1.1.0.ebuild
new file mode 100644
index 000000000000..a245c24b5be0
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.1.0.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.0.ebuild,v 1.1 2006/02/01 02:34:59 vapier Exp $
+
+inherit eutils
+
+#SNAPSHOT=20040726
+SNAPSHOT=""
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
+if [[ -n ${SNAPSHOT} ]] ; then
+	MY_P=${PN}
+	SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug static savedconfig netboot floppyboot make-symlinks"
+
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+# <pebenito> then eventually turning on selinux would mean
+# adding a dep: selinux? ( sys-libs/libselinux )
+
+busybox_set_env() {
+	type -p ${CHOST}-ar > /dev/null && export CROSS=${CHOST}-
+	# Don't let KBUILD_OUTPUT mess us up #88088
+	unset KBUILD_OUTPUT
+}
+
+busybox_config_option() {
+	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;;
+		Y) echo "CONFIG_$2=y" >> .config;;
+		N) echo "CONFIG_$2=n" >> .config;;
+		*) use $1 \
+		       && busybox_config_option y $2 \
+		       || busybox_config_option n $2
+		   return 0
+		   ;;
+	esac
+	einfo $(grep "CONFIG_$2[= ]" .config)
+}
+
+src_unpack() {
+	busybox_set_env
+	unpack ${A}
+	cd "${S}"
+
+	# patches go here!
+#	epatch "${FILESDIR}"/1.00/busybox-read-timeout.patch
+#	epatch "${FILESDIR}"/1.00/readlink-follow.patch
+#	epatch "${FILESDIR}"/1.00/more-insmod-arches.patch
+#	epatch "${FILESDIR}"/1.00/bash-tests.patch
+#	epatch "${FILESDIR}"/1.00/standalone.patch
+#	epatch "${FILESDIR}"/1.00/nice.patch
+#	epatch "${FILESDIR}"/1.00/printenv.patch
+#	epatch "${FILESDIR}"/1.00/sum.patch
+	epatch "${FILESDIR}"/1.00/bb.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 savedconfig ; then
+		[[ -r .config ]] && rm .config
+		for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
+			configfile=${ROOT}/etc/${PN}/${CHOST}/${conf}.config
+			[[ -r ${configfile} ]] || 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
+	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 floppyboot ; then
+		cp "${FILESDIR}"/config-floppyboot .config
+	fi
+
+	# setup the config file
+	make allyesconfig > /dev/null
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID_CONFIG
+
+	# 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
+
+	busybox_config_option static STATIC
+	busybox_config_option debug DEBUG
+	use debug \
+		&& busybox_config_option Y NO_DEBUG_LIB \
+		&& busybox_config_option N DMALLOC \
+		&& busybox_config_option N EFENCE
+
+	# 1.00-pre5 uses the old selinux api which is no longer maintained
+	#busybox_config_option selinux SELINUX
+	busybox_config_option n SELINUX
+
+	# default a bunch of uncommon options to off
+	for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
+		LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
+		UUDECODE UUENCODE SULOGIN DC
+	do
+		busybox_config_option n ${opt}
+	done
+
+	make oldconfig > /dev/null
+}
+
+src_compile() {
+	busybox_set_env
+	emake -j1 CROSS="${CROSS}" depend || die "depend failed"
+	emake CROSS="${CROSS}" busybox || die "build failed"
+	if ! use static ; then
+		mv busybox{,.bak}
+		local failed=0
+		emake -j1 \
+			LDFLAGS="${LDFLAGS} -static" \
+			CROSS="${CROSS}" \
+			busybox || failed=1
+		if [[ ${failed} == 1 ]] ; then
+			if has_version '<sys-libs/glibc-2.3.5' ; then
+				eerror "Your glibc has broken static support, ignorning static build failure."
+				eerror "See http://bugs.gentoo.org/show_bug.cgi?id=94879"
+				cp busybox.bak bb
+			else
+				die "static build failed"
+			fi
+		else
+			mv busybox bb
+		fi
+		mv busybox{.bak,}
+	fi
+}
+
+src_install() {
+	busybox_set_env
+
+	into /
+	dobin busybox
+	use static \
+		&& dosym busybox /bin/bb \
+		|| dobin bb
+
+	if use make-symlinks ; then
+		if [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+			ewarn "setting USE=make-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 -pPR _install/bin/* "${D}"/bin/
+		dodir /sbin
+		cp -pPR _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-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/digest-busybox-1.1.0 b/sys-apps/busybox/files/digest-busybox-1.1.0
new file mode 100644
index 000000000000..7c8cbcf909be
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.1.0
@@ -0,0 +1,3 @@
+MD5 855e12c7c9dc90e16b014a788925e4cb busybox-1.1.0.tar.bz2 1408642
+RMD160 12769c88b1813063044ff29d43171be114cf178d busybox-1.1.0.tar.bz2 1408642
+SHA256 3377d271dcfcbf8f49368c63c4819d4f8306bc529766bb0d8f4a12888fb20596 busybox-1.1.0.tar.bz2 1408642