Version bump #142595 by Jac Goudsmit.

Package-Manager: portage-2.1.1_pre4

4 files changed, 270 insertions, 16 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 1942ba236673..f0ee05597eb5 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.101 2006/07/10 17:54:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.102 2006/08/05 20:06:01 vapier Exp $
+
+*busybox-1.2.1 (05 Aug 2006)
+
+  05 Aug 2006; Mike Frysinger <vapier@gentoo.org> +busybox-1.2.1.ebuild:
+  Version bump #142595 by Jac Goudsmit.
 
   10 Jul 2006; <solar@gentoo.org> busybox-1.1.3.ebuild,
   busybox-1.2.0.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 63380e12bc85..f218bede4393 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -31,18 +31,23 @@ RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853
 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853
 DIST busybox-1.1.3.tar.bz2 1435820 RMD160 b1e3409bc3180532af60140cdc5cfa84591c9641 SHA1 9feb01c74e370e7e59b6ccecd9cee2760435b462 SHA256 5228a88866211810c69d7a5be925cf87df47519b1d9d403aaca63bbdd32c975e
 DIST busybox-1.2.0.tar.bz2 1399041 RMD160 c9cc9cf3ad3f947519489c8492a845228a736438 SHA1 857ec4bec588af8f1f843472f02d2058a215f4bb SHA256 e066e6f526fd1a4473f4431a05848181d12056bd1c12456954a68f9b15a57624
-EBUILD busybox-1.1.3.ebuild 6628 RMD160 913d2b16fbd352459d476c0ea43914a28591b7e2 SHA1 eb137e24aad34e6c97df39d78eb691f868e4f2fb SHA256 ce9adaf0b05f5879f7c50e653e665b31dc1439776bae781ca70015ce4d3d5308
-MD5 33e048d9d6416b060343e0454f152c41 busybox-1.1.3.ebuild 6628
-RMD160 913d2b16fbd352459d476c0ea43914a28591b7e2 busybox-1.1.3.ebuild 6628
-SHA256 ce9adaf0b05f5879f7c50e653e665b31dc1439776bae781ca70015ce4d3d5308 busybox-1.1.3.ebuild 6628
-EBUILD busybox-1.2.0.ebuild 6640 RMD160 662f81c69046bcb0607c97d6c6cc6fd16ff19f7c SHA1 6268bcb50a8d729ca0e29d9b64d889eab29c79df SHA256 518278a3a9d5c08df2c26c55257f33d5c3acfd238059ce706c3d8287c9cb4aa9
-MD5 bbae384bf114f0001fcbb6393994a21b busybox-1.2.0.ebuild 6640
-RMD160 662f81c69046bcb0607c97d6c6cc6fd16ff19f7c busybox-1.2.0.ebuild 6640
-SHA256 518278a3a9d5c08df2c26c55257f33d5c3acfd238059ce706c3d8287c9cb4aa9 busybox-1.2.0.ebuild 6640
-MISC ChangeLog 16887 RMD160 07863d543b074d48503191bf246d4db718a0d50d SHA1 d913a3e936221c7de5a4c18d01bd2d59d0b2f9b4 SHA256 6d98f8aa3ebbb8ec541893f77f9c334e95eb3465b63389c992287ec4db823055
-MD5 3e6ece63bf0e34bd65171621c4def0b8 ChangeLog 16887
-RMD160 07863d543b074d48503191bf246d4db718a0d50d ChangeLog 16887
-SHA256 6d98f8aa3ebbb8ec541893f77f9c334e95eb3465b63389c992287ec4db823055 ChangeLog 16887
+DIST busybox-1.2.1.tar.bz2 1404986 RMD160 c9eb1637856a98278a4666f1c27db861477c31ca SHA1 487ef51209e253d3aa981dc0b0645063a804f4c7 SHA256 c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410
+EBUILD busybox-1.1.3.ebuild 6715 RMD160 7ae9bac03c9fb1765f2c390090fbacc067a7b541 SHA1 7bdc5e81354ee5bafb6ca643281807d3ebee51ad SHA256 9ecf8315165a7dd3f89b2f8d39b2a0ff3a2ec45a60351ee458857e75a792095a
+MD5 f4893b4882b938579f1fb45539b8b624 busybox-1.1.3.ebuild 6715
+RMD160 7ae9bac03c9fb1765f2c390090fbacc067a7b541 busybox-1.1.3.ebuild 6715
+SHA256 9ecf8315165a7dd3f89b2f8d39b2a0ff3a2ec45a60351ee458857e75a792095a busybox-1.1.3.ebuild 6715
+EBUILD busybox-1.2.0.ebuild 6617 RMD160 57ea02de9a4af9c9d764deabec391f0651e9db3e SHA1 81e9cea8436ab95cc3747538fc844a9e1c710afd SHA256 b1482558e35ba6b07ade3cbcb717737f721f31f053f37ac6e7a0786e6acf6daf
+MD5 102ddb229fc1da47f58dd07d11c342bd busybox-1.2.0.ebuild 6617
+RMD160 57ea02de9a4af9c9d764deabec391f0651e9db3e busybox-1.2.0.ebuild 6617
+SHA256 b1482558e35ba6b07ade3cbcb717737f721f31f053f37ac6e7a0786e6acf6daf busybox-1.2.0.ebuild 6617
+EBUILD busybox-1.2.1.ebuild 6727 RMD160 3ebb1b8eadc96e72a804c1a73ec6a6fc4c4c0de5 SHA1 039466f1daf930a042ecfe8b5de33e1a47f36367 SHA256 81f25a259f2b2feb74a69c9e6a6b0b8732284bf16bd99367cc270361399cd5f6
+MD5 b7b839f272ba8870351e883708892fab busybox-1.2.1.ebuild 6727
+RMD160 3ebb1b8eadc96e72a804c1a73ec6a6fc4c4c0de5 busybox-1.2.1.ebuild 6727
+SHA256 81f25a259f2b2feb74a69c9e6a6b0b8732284bf16bd99367cc270361399cd5f6 busybox-1.2.1.ebuild 6727
+MISC ChangeLog 17032 RMD160 c93e5e41847c3463b789baa82ba2e04ad6b94926 SHA1 da28d9ab6d7a5b0f5634201e8fbc18b0ae0eb46c SHA256 f4ff54fc75d8294b475ae9b59794aee3503d5eb799c1ed34a2902ea6794e175c
+MD5 3f61a61b97252915cc78e93d615c78e6 ChangeLog 17032
+RMD160 c93e5e41847c3463b789baa82ba2e04ad6b94926 ChangeLog 17032
+SHA256 f4ff54fc75d8294b475ae9b59794aee3503d5eb799c1ed34a2902ea6794e175c ChangeLog 17032
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -53,10 +58,13 @@ SHA256 8e2b432ca3a9d41a3570fc5e46c188a90a297211dd5edfa201aec67025bf6bda files/di
 MD5 224a8150c83c86edd9e491b9c7fa891c files/digest-busybox-1.2.0 247
 RMD160 dc54585454d49d67db494895604cd5917096466f files/digest-busybox-1.2.0 247
 SHA256 c451956a96baf9e9a0a1e22c65fa5ad2f05f3ad5ffe14ee48b82ea7d8cd679d4 files/digest-busybox-1.2.0 247
+MD5 db1fbb77932be13df78cd21c9b9a99de files/digest-busybox-1.2.1 247
+RMD160 6260c344966ac5def1f04cf03fa15b10a4240d64 files/digest-busybox-1.2.1 247
+SHA256 7cdd7cafb10a98988a5e4226f3b23246f785e3e624880789676f89fa362eb38b files/digest-busybox-1.2.1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuFh3amhnQswr0vIRAj3JAKC8Gqv4Js1npwdmJRpyn4yQgtpyJgCcDrh1
-7Kg7b0Ii3rN3U4vinVz7z4s=
-=7w61
+iD8DBQFE1Po9amhnQswr0vIRAnzsAJ4/TF1/xf9IsiaR8CZoqleTnU95jgCePTlb
+aliwoMSe36XG1uDVCU/wVko=
+=vXxa
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.2.1.ebuild b/sys-apps/busybox/busybox-1.2.1.ebuild
new file mode 100644
index 000000000000..454dd1abe00e
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.2.1.ebuild
@@ -0,0 +1,238 @@
+# 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.2.1.ebuild,v 1.1 2006/08/05 20:06:01 vapier Exp $
+
+inherit eutils flag-o-matic
+
+#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"
+RESTRICT="test"
+
+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.2.0/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
+		local conf root
+		[[ -r .config ]] && rm .config
+		for conf in {${PF},${P},${PN}}{,-${CHOST}} ; do
+			for root in "${ROOT}" / ; do
+				configfile=${root}etc/portage/savedconfig/${conf}.config
+				if [[ -r ${configfile} ]] ; then
+					cp ${configfile} "${S}"/.config
+					break
+				fi
+			done
+		done
+		if [[ -r ${S}/.config ]] ; then
+			einfo "Found your ${configfile} and using it."
+			yes "" | make oldconfig > /dev/null
+			return 0
+		else
+			einfo "Could not locate user configfile, going with default"
+			yes "" | make oldconfig > /dev/null
+		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
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+
+	# 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
+
+	busybox_config_option selinux 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
+	use ppc64 && append-flags -mminimal-toc $(test-flags-CC -fno-stack-protector)
+	use ppc && append-flags $(test-flags-CC -fno-stack-protector)
+	emake CROSS="${CROSS}" busybox || die "build failed"
+	if ! use static ; then
+		mv busybox_unstripped{,.bak}
+		local failed=0
+		LDFLAGS="${LDFLAGS} -static" \
+		emake \
+			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/94879"
+				cp busybox_unstripped bb
+			else
+				die "static build failed"
+			fi
+		else
+			mv busybox_unstripped bb
+		fi
+		mv busybox_unstripped{.bak,}
+	fi
+}
+
+src_install() {
+	busybox_set_env
+
+	into /
+	newbin busybox_unstripped busybox || die
+	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
+		cp -pPR _install/${x}/* "${D}"/ || die "copying links for ${x} failed"
+		cd "${D}"
+		# XXX: should really move this to pkg_preinst() ...
+		local symlink
+		for symlink in {,usr/}{bin,sbin}/* linuxrc ; do
+			[[ -L ${symlink} ]] || continue
+			[[ -e ${ROOT}/${symlink} ]] \
+				&& eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
+				&& rm ${symlink}
+		done
+		cd "${S}"
+	fi
+
+	dodoc AUTHORS 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 *.conf *.script undeb unrpm
+
+	cd bootfloppy || die
+	docinto bootfloppy
+	dodoc * 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/portage/savedconfig/${PVR}.config"
+		einfo "Read this ebuild for more info on how to take advantage of this option"
+		insinto /etc/portage/savedconfig
+		newins "${S}"/.config ${PVR}.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.2.1 b/sys-apps/busybox/files/digest-busybox-1.2.1
new file mode 100644
index 000000000000..a951b98249ea
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.2.1
@@ -0,0 +1,3 @@
+MD5 362b3dc0f2023ddfda901dc1f1a74391 busybox-1.2.1.tar.bz2 1404986
+RMD160 c9eb1637856a98278a4666f1c27db861477c31ca busybox-1.2.1.tar.bz2 1404986
+SHA256 c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410 busybox-1.2.1.tar.bz2 1404986