Version bump #184759.

Package-Manager: portage-2.1.3_rc6

4 files changed, 258 insertions, 5 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 1cf14f713cfa..d95bb770a05c 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.145 2007/06/11 05:10:56 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.146 2007/07/09 20:03:55 vapier Exp $
+
+*busybox-1.6.1 (09 Jul 2007)
+
+  09 Jul 2007; Mike Frysinger <vapier@gentoo.org> +busybox-1.6.1.ebuild:
+  Version bump #184759.
 
   11 Jun 2007; Daniel Black <dragonheart@gentoo.org> busybox-1.6.0.ebuild:
   converted to saveconfig eclass version at Mike\'s request
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 55d891bea57a..eed7ed3fa1c6 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.4.0/bb.patch 866 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 SHA1 257b0dea76eb8656e2d0f03cc877af05415bcd0b SHA256 5e4ca94e7f5914d0e525bec1d661b978fd2e3d356cb1d1014701c6e486f4d7f8
 MD5 3d19b371b9686743428acdae5c3dd9e4 files/1.4.0/bb.patch 866
 RMD160 f1cce542de0814d6dbcf5f23cfad8d3249bf8839 files/1.4.0/bb.patch 866
@@ -39,6 +42,7 @@ DIST busybox-1.4.2.tar.bz2 1509690 RMD160 222c2f2bcabeba45b8233981c8071fe4f4d62b
 DIST busybox-1.5.0.tar.bz2 1550138 RMD160 e42100fcd35856a907db983b284a37c650425185 SHA1 3968b6816b44d5ffcfd7a2feee2eb84680c801e4 SHA256 e71a5e19d3beb6139012558c8b25966b308e425ae999bd0d2a105d9bcdb37b5c
 DIST busybox-1.5.1.tar.bz2 1549430 RMD160 81ba96b794db313cacc68a29ba19d6a18e5b6707 SHA1 474a45d626735ec8e04ec31fd353a8ceb2984f3c SHA256 b47c8c9f047cec4ee42559509909df8f910597539fdfb4b2de05404c3092337f
 DIST busybox-1.6.0.tar.bz2 1689981 RMD160 56ee3ebefa5f2c6bfad84375b3f7f0752d31fcbe SHA1 bce33a204a943bf7438e1fdb8d8a28e8d99e9c81 SHA256 338cb3b77671f1dcec01079e8aad0084e05bb76e21b095274b5bea5d91b5a57d
+DIST busybox-1.6.1.tar.bz2 1692099 RMD160 5fc8a3abeea8988777a9699bdffe025804ec1056 SHA1 ff79db26fa53c20808de4d6f3514f34044749a77 SHA256 d1c7ee084266a168372755929cc59cd27a5ddc136a97608b855f0dba5f7ba8c2
 EBUILD busybox-1.4.1-r2.ebuild 7982 RMD160 e1e9ed5a231fa38829ec1286c7ceaa9651f038b2 SHA1 c1442828685e066a7a7977fca89848d2745f3316 SHA256 6174f2ff55ab60c69a2d333777fce962ad74e7705f60393629fec293dd3f5677
 MD5 33aa928ed282e68a9f1191ccdbc0ac0a busybox-1.4.1-r2.ebuild 7982
 RMD160 e1e9ed5a231fa38829ec1286c7ceaa9651f038b2 busybox-1.4.1-r2.ebuild 7982
@@ -59,10 +63,14 @@ EBUILD busybox-1.6.0.ebuild 6747 RMD160 1a260648e30bef3e1f344dbd5f4e0ab748a42774
 MD5 7a0cf934e84768e6a701b872344b2fa0 busybox-1.6.0.ebuild 6747
 RMD160 1a260648e30bef3e1f344dbd5f4e0ab748a42774 busybox-1.6.0.ebuild 6747
 SHA256 a8c6b04d8ca6cd40581b45ca4ce4af7c2e9d68d3576526ebdd718e7f55f99cbf busybox-1.6.0.ebuild 6747
-MISC ChangeLog 22710 RMD160 94157e900e6aaa0f65cb27aaf149ca6be05eb5ee SHA1 836fee5e65ad57ce53d1bebb5184db7823a250be SHA256 953f6e81ad720c0aea568ef2c21cbb811c684742735c526a84c73045d555bf39
-MD5 8da75d757bb16d410feca10117a75a99 ChangeLog 22710
-RMD160 94157e900e6aaa0f65cb27aaf149ca6be05eb5ee ChangeLog 22710
-SHA256 953f6e81ad720c0aea568ef2c21cbb811c684742735c526a84c73045d555bf39 ChangeLog 22710
+EBUILD busybox-1.6.1.ebuild 6745 RMD160 2739df6f480eaa73907da30c1921b7514c4ceb86 SHA1 bde46ef67c4546a1a58f58943671103356e09790 SHA256 660c2ace0b969d672c97c3cd5f03ac66c9ccad10ec1f0a48b5fdad385093d2f6
+MD5 c6bef4e252c5aad46a96787236c9cd9d busybox-1.6.1.ebuild 6745
+RMD160 2739df6f480eaa73907da30c1921b7514c4ceb86 busybox-1.6.1.ebuild 6745
+SHA256 660c2ace0b969d672c97c3cd5f03ac66c9ccad10ec1f0a48b5fdad385093d2f6 busybox-1.6.1.ebuild 6745
+MISC ChangeLog 22833 RMD160 90aef273fcd468ffe26a55f608e97da9d0ae8318 SHA1 8bed0e322ee343889904029027e98d77ce2d4e51 SHA256 d3c8def7ff43b2b74d2de50eb08ac25b18d3fdee1bca12e3bb9b5a3cef509d70
+MD5 61cb75a9f19010faa6f859cd6d1fc4c7 ChangeLog 22833
+RMD160 90aef273fcd468ffe26a55f608e97da9d0ae8318 ChangeLog 22833
+SHA256 d3c8def7ff43b2b74d2de50eb08ac25b18d3fdee1bca12e3bb9b5a3cef509d70 ChangeLog 22833
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -82,3 +90,13 @@ SHA256 0c4738d4288bcae2dd248d07644cecfb9feee69ba5a74fb887a26cec883d0ea5 files/di
 MD5 a46a90f2be2e9e479196132f98e1a808 files/digest-busybox-1.6.0 247
 RMD160 cd8161329dddc28cd1af96b0bf1e3f9a8b81d07d files/digest-busybox-1.6.0 247
 SHA256 229c61c237b33f6b56e83a57fe63ef286c72c5a1417dfce1f6868a636c19e12b files/digest-busybox-1.6.0 247
+MD5 bf3864361006258a805b1ba1ba2eb72b files/digest-busybox-1.6.1 247
+RMD160 c90e4d2531327c0d20ff5d83ccb9b3aff0540f6a files/digest-busybox-1.6.1 247
+SHA256 1da23f859b31a5e1fcc76b4cb6c57b1f51fdef1f5ed7e083aba88cb0c8c9d0e4 files/digest-busybox-1.6.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGkpS3p/wUKkr7RBoRAq2XAKC0oxzfUJeO+KBShIPfXEcCiYBAJQCeJJ/Q
+5PNe1bLbwIWAiu9faDf0XCU=
+=JC69
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.6.1.ebuild b/sys-apps/busybox/busybox-1.6.1.ebuild
new file mode 100644
index 000000000000..4f0f12fa2ec3
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.6.1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.6.1.ebuild,v 1.1 2007/07/09 20:03:55 vapier Exp $
+
+inherit eutils flag-o-matic savedconfig
+
+################################################################################
+# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
+#
+# Busybox can be modified in many different ways. Here's a few ways to do it:
+#
+# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
+#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
+#     start of the line if you're installing to somewhere else than the root
+#     directory. This command will save the default configuration to
+#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
+#     defined), and it will tell you that it has done this. Note the location
+#     where the config file was saved.
+#
+#     FEATURES=keepwork USE=savedconfig emerge busybox
+#
+# (2) Go to the work directory and change the configuration of busybox using its
+#     menuconfig feature.
+#
+#     cd /var/tmp/portage/busybox*/work
+#     make menuconfig
+#
+# (3) Save your configuration to the default location and copy it to the
+#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
+#
+# (4) Emerge busybox with USE=savedconfig to use the configuration file you
+#     just generated.
+#
+################################################################################
+#
+# (1) Alternatively skip the above steps and simply emerge busybox without
+#     USE=savedconfig.
+#
+# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
+#
+# (3) Remerge busybox as using USE=savedconfig.
+#
+################################################################################
+
+
+#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 make-symlinks selinux"
+RESTRICT="test"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+
+S=${WORKDIR}/${MY_P}
+
+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;;
+		*) use $1 \
+		       && busybox_config_option y $2 \
+		       || busybox_config_option n $2
+		   return 0
+		   ;;
+	esac
+	einfo $(grep "CONFIG_$2[= ]" .config)
+}
+
+src_unpack() {
+	unset KBUILD_OUTPUT #88088
+
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+
+	# patches go here!
+	epatch "${FILESDIR}"/busybox-1.6.0-bb.patch
+
+	# work around broken ass powerpc compilers
+	use ppc64 && append-flags -mminimal-toc
+	# flag cleanup
+	sed -i \
+		-e 's:,-Werror,:,,:' \
+		-e 's:-Os -falign-functions=1 -falign-jumps=1 -falign-loops=1::' \
+		-e 's:-fomit-frame-pointer::' \
+		Makefile.flags
+	sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i '/^#error Aborting compilation./d' applets/applets.c
+	sed -i "/^CFLAGS.*:=/s:$: ${CFLAGS}:" Makefile
+	echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.flags
+
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | make oldconfig > /dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	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 DEBUG_YANK_SUSv2 DEBUG_INIT \
+		DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET
+	do
+		busybox_config_option n ${opt}
+	done
+
+	make oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+
+	emake busybox || die "build failed"
+	if ! use static ; then
+		mv busybox_unstripped{,.bak}
+		emake CONFIG_STATIC=y busybox || die "static build failed"
+		mv busybox_unstripped bb
+		mv busybox_unstripped{.bak,}
+	fi
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	newbin busybox_unstripped busybox || die
+	use static \
+		&& dosym busybox /bin/bb \
+		|| dobin bb
+	dosym bb /bin/busybox.static
+
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${FILESDIR}"/mdev-start.sh || die
+
+	# bundle up the symlink files for use later
+	emake install || die
+	rm _install/bin/busybox
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	doins busybox-links.tar || die
+	newins .config ${PF}.config || die
+
+	dodoc AUTHORS README TODO
+
+	cd docs || die
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html *.sgml
+
+	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
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${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
+
+	if use make-symlinks ; then
+		mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	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.6.1 b/sys-apps/busybox/files/digest-busybox-1.6.1
new file mode 100644
index 000000000000..8c211fc44725
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.6.1
@@ -0,0 +1,3 @@
+MD5 c99a523b403d04772ac5f8dec52f107e busybox-1.6.1.tar.bz2 1692099
+RMD160 5fc8a3abeea8988777a9699bdffe025804ec1056 busybox-1.6.1.tar.bz2 1692099
+SHA256 d1c7ee084266a168372755929cc59cd27a5ddc136a97608b855f0dba5f7ba8c2 busybox-1.6.1.tar.bz2 1692099