Version bump.

Package-Manager: portage-2.1.3.7

5 files changed, 277 insertions, 8 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index a70bb64ff0d9..87b1f84c7130 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.155 2007/08/13 14:22:13 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.156 2007/08/25 15:11:19 vapier Exp $
+
+*busybox-1.7.0 (25 Aug 2007)
+
+  25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/busybox-1.7.0-bb.patch, +busybox-1.7.0.ebuild:
+  Version bump.
 
   13 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> busybox-1.6.1.ebuild:
   Stable on sparc
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index f5c4995ffa96..653954c98d3c 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -33,6 +33,10 @@ AUX busybox-1.6.0-hushdep.patch 738 RMD160 fe71f80fd3260ab85b2c6a3d758d6b996f76a
 MD5 7b32dda1a741772aa255d2cb2bcae2b6 files/busybox-1.6.0-hushdep.patch 738
 RMD160 fe71f80fd3260ab85b2c6a3d758d6b996f76a1f5 files/busybox-1.6.0-hushdep.patch 738
 SHA256 e9a71597c8cc0efa246538678a35cd5af776d5165afb8e50f9f6d518eb174a0b files/busybox-1.6.0-hushdep.patch 738
+AUX busybox-1.7.0-bb.patch 880 RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 SHA1 8d515d3c2474e0f4d43015159b75e42de0d29cb1 SHA256 83c62f48e3ad89a77b2e0dd74d8ffa586faf2d112c3540c930f39e4abf3ccd55
+MD5 743ba1bb9056833bc1f22505c9286653 files/busybox-1.7.0-bb.patch 880
+RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 files/busybox-1.7.0-bb.patch 880
+SHA256 83c62f48e3ad89a77b2e0dd74d8ffa586faf2d112c3540c930f39e4abf3ccd55 files/busybox-1.7.0-bb.patch 880
 AUX mdev-start.sh 2411 RMD160 0513dc2423a62d2728cd04ef01172906a79f4d01 SHA1 52efb662fc0726c18da0964adf1d80571766ce01 SHA256 33f45f6f09ee28f623b4cc0dcc1e60743141d9a969c04b9566ac3d0687cb670a
 MD5 6d6f6aec47ea4f757d4836a57d2d66d5 files/mdev-start.sh 2411
 RMD160 0513dc2423a62d2728cd04ef01172906a79f4d01 files/mdev-start.sh 2411
@@ -43,6 +47,7 @@ DIST busybox-1.5.0.tar.bz2 1550138 RMD160 e42100fcd35856a907db983b284a37c6504251
 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
+DIST busybox-1.7.0.tar.bz2 1726650 RMD160 23691b0e908028d109138c1fdf719c35aada6bdc SHA1 84395ec037f23f08bdfc35e808622f344ab3c708 SHA256 b8b991dda8d386ef0210b421670efa6f72da2a5c382c544e6791efa0cbaeac76
 EBUILD busybox-1.4.1-r2.ebuild 7981 RMD160 83426ba5b68db54a6201fcbe9f7213908b8b8457 SHA1 6394e28e73cdea532532afbb674076d029a029b7 SHA256 bf7a7ee065cefa47aa00eb06714cf6225b664968a95f826d8ada3f8489cb79a3
 MD5 7221bd06e12defbe8b271d914f0e1b95 busybox-1.4.1-r2.ebuild 7981
 RMD160 83426ba5b68db54a6201fcbe9f7213908b8b8457 busybox-1.4.1-r2.ebuild 7981
@@ -67,10 +72,14 @@ EBUILD busybox-1.6.1.ebuild 6736 RMD160 81fae61f72647b9e2926bb1279c7cfec0cac3c6f
 MD5 240e4bfc3fede0f7e93271a12e340e0d busybox-1.6.1.ebuild 6736
 RMD160 81fae61f72647b9e2926bb1279c7cfec0cac3c6f busybox-1.6.1.ebuild 6736
 SHA256 dbb880b6f569841c3e0ac3b0a351cb64a80e655e435138f83a9f5cc5d64735ca busybox-1.6.1.ebuild 6736
-MISC ChangeLog 23730 RMD160 9180af2bd2658a83fc9a0264770ee09f90e0c64c SHA1 e53e1d3c7b0aeffd6958dfc1892bf939ee75d43a SHA256 59c7e5cc4cb9c47de4e073d1a3a06837ba4bf89895d928065fdf928d4dc2aaf5
-MD5 9a3cc1d9a36476a3998807b04f7d2053 ChangeLog 23730
-RMD160 9180af2bd2658a83fc9a0264770ee09f90e0c64c ChangeLog 23730
-SHA256 59c7e5cc4cb9c47de4e073d1a3a06837ba4bf89895d928065fdf928d4dc2aaf5 ChangeLog 23730
+EBUILD busybox-1.7.0.ebuild 6779 RMD160 fe2c12ec7b09625ee65a9620d41c8ad49058a7af SHA1 53d64d2ef058404ef51f711239285a4861975863 SHA256 7e080bd46e4f8e4fb76a90f44012f503e3ae17999e3e16e199cd581bd49c58bc
+MD5 6fe0b10e21f03a07e223fcc11858eef9 busybox-1.7.0.ebuild 6779
+RMD160 fe2c12ec7b09625ee65a9620d41c8ad49058a7af busybox-1.7.0.ebuild 6779
+SHA256 7e080bd46e4f8e4fb76a90f44012f503e3ae17999e3e16e199cd581bd49c58bc busybox-1.7.0.ebuild 6779
+MISC ChangeLog 23881 RMD160 c1442a0d8f71b5dd7bc51f2b421e6d39b425e261 SHA1 1cdd39f404d1105d4026e3d0a5c1268a49f899c3 SHA256 e74348c10bf80990e948c7f49977c0f36796c127b8cb4a38e296f7c3904983d1
+MD5 f83e39053fafb11bf90fab84e8c183ea ChangeLog 23881
+RMD160 c1442a0d8f71b5dd7bc51f2b421e6d39b425e261 ChangeLog 23881
+SHA256 e74348c10bf80990e948c7f49977c0f36796c127b8cb4a38e296f7c3904983d1 ChangeLog 23881
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -93,10 +102,13 @@ SHA256 229c61c237b33f6b56e83a57fe63ef286c72c5a1417dfce1f6868a636c19e12b files/di
 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
+MD5 baf4f4f57e5edcd4a6123867e91d350e files/digest-busybox-1.7.0 247
+RMD160 076e57b20753e68e4c8666bb5975da9a892a6d5f files/digest-busybox-1.7.0 247
+SHA256 f879f15c80c48716cdd3d0b2daf84dca99b91b9149d371a55793b4eb6d16fdcb files/digest-busybox-1.7.0 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFG0Du6p/wUKkr7RBoRAuHuAJ4+W9jHnNlmxzFHymRBFbuj8fkp1ACfZBZN
-xdLGMNYDHTm2LT+EylkLa6s=
-=pLF7
+iD8DBQFG0Ebop/wUKkr7RBoRApgNAKCY/Iv1E5yS2ZtOoIbPpULrD+DumQCg1Zzx
+JwY0qzcGrG0/oTaUu26ttNM=
+=2m+o
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.7.0.ebuild b/sys-apps/busybox/busybox-1.7.0.ebuild
new file mode 100644
index 000000000000..a8a4a6a69f31
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.7.0.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.7.0.ebuild,v 1.1 2007/08/25 15:11:19 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 pam 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.7.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 pam PAM
+	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/busybox-1.7.0-bb.patch b/sys-apps/busybox/files/busybox-1.7.0-bb.patch
new file mode 100644
index 000000000000..a83ecf5c92ba
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.7.0-bb.patch
@@ -0,0 +1,21 @@
+--- include/applets.h
++++ include/applets.h
+@@ -77,6 +77,7 @@
+ USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))
+ USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))
++USE_ASH(APPLET_NOUSAGE(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
+ //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+--- shell/ash.c
++++ shell/ash.c
+@@ -6472,6 +6472,8 @@
+ 			}
+ 			/* re-exec ourselves with the new arguments */
+ 			execve(bb_busybox_exec_path, argv, envp);
++			execve("/bin/busybox.static",argv,envp);
++			execve("/bin/busybox",argv,envp);
+ 			/* If they called chroot or otherwise made the binary no longer
+ 			 * executable, fall through */
+ 		}
diff --git a/sys-apps/busybox/files/digest-busybox-1.7.0 b/sys-apps/busybox/files/digest-busybox-1.7.0
new file mode 100644
index 000000000000..91545b2f4bea
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.7.0
@@ -0,0 +1,3 @@
+MD5 c98236e46e7b3b4217ffe9f65600a794 busybox-1.7.0.tar.bz2 1726650
+RMD160 23691b0e908028d109138c1fdf719c35aada6bdc busybox-1.7.0.tar.bz2 1726650
+SHA256 b8b991dda8d386ef0210b421670efa6f72da2a5c382c544e6791efa0cbaeac76 busybox-1.7.0.tar.bz2 1726650