Version bump #297112 by Peter Fry.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 268 insertions, 11 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 55fa3df4904a..cfc19c5b5631 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.235 2009/11/17 19:57:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.236 2009/12/26 17:14:22 vapier Exp $
+
+*busybox-1.15.3 (26 Dec 2009)
+
+  26 Dec 2009; Mike Frysinger <vapier@gentoo.org> +busybox-1.15.3.ebuild:
+  Version bump #297112 by Peter Fry.
 
   17 Nov 2009; Brent Baude <ranger@gentoo.org> busybox-1.14.2.ebuild:
   Marking busybox-1.14.2 ppc64 for bug 291931
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index bc924f41d7e6..42d4f7e98d04 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,18 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX busybox-1.11.1-bb.patch 1059 RMD160 819a97b81f51314d400c86748d933e3cb1f1fcd3 SHA1 31a51bb6b7a5d1bfe32e54945eb71aac857e10ce SHA256 50d2f574093e52793dd5a08f35b275c2dddca8a76ff35e13e214dd6cd3654098
-AUX busybox-1.12.0-mdev-exec.patch 327 RMD160 0490e4ff48b12eadd71c3c567c6b2cdf6577f603 SHA1 2f295ad54d0a8233a5597ec165321e0f1e228303 SHA256 fa21762ed97ce0b10360e2bf19862df6813b0a6460e7b7021f69cb01c87cb18d
-AUX busybox-1.13.2-depmod.patch 3815 RMD160 905f2f805ba66cdd772fe49e76824ba0739f972a SHA1 db827cb5238407b902f424b0d8d8b0a698124400 SHA256 35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5
-AUX busybox-1.13.2-init.patch 1544 RMD160 7dbc785de9a69359ef3bd3f31154457376f96d97 SHA1 d1f382dae513daf6aaea1274d44dcc6cdae49a01 SHA256 39a8efb5a50c56feb733e519365b4e188c25c0e925a1a63cc1ace9735a80100f
-AUX busybox-1.13.2-killall.patch 674 RMD160 4587b61757279e70d17ef6cf974f3612517ee451 SHA1 9d11ea4ba7ef61aedf5706fc1bd334d067f95a72 SHA256 e04d0954e8fd20e2ba74d59162e121ac99a118b5e69b03b728037afabecb823c
-AUX busybox-1.13.2-mdev.patch 1300 RMD160 2c0615303f13456c2a66fe930eb5c6c739cc4e60 SHA1 a13b4022858f008c0654f6b1e2929e06f74d9d2a SHA256 fd4a64c6a83e07586de0360258162c5bf431f164b3980301185743e4029940df
-AUX busybox-1.13.2-modprobe.patch 3054 RMD160 49c19fd31aca0e277a37fec27e67488ac79a123c SHA1 0f64601ce1f55031a10ddcb3e132c58d9ee38744 SHA256 a02007661cf2f318a66468456f8fc8ae1177e12c3c66c59ff2de4d98863a388e
-AUX busybox-1.13.2-tar.patch 290 RMD160 78a4fd26051e21a404981e9526fc6cf2e69aa969 SHA1 e04663add68abdfda0d6eb2f10a1aee5c9002a29 SHA256 9427fa9b45f3c322bf4fe2463c99c972e6ae03df630899b38be4f29133708a0e
 AUX busybox-1.15.2-bb.patch 956 RMD160 13d7f8e8fdb35245de4072ff1e55470b2c58f6db SHA1 ab66f70245a399a1a21af0e5598fd2fae809d935 SHA256 482de22b18764e8e0b264bb00d03accf9b821666b64f1a423068b10b30b4893c
 AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7
-DIST busybox-1.13.2.tar.bz2 2046961 RMD160 21c9f2802e9b29a589a9fdcf3e01502f8af7f57f SHA1 6659d92b0056971e0faab254fdcbc7fcce872e9e SHA256 927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8
 DIST busybox-1.14.2.tar.bz2 2199685 RMD160 be138b5aa50f2c60fea75fc44ab3375c95d8f10d SHA1 b673e79ea0927e1ec14017b1e12b159c799f6feb SHA256 3565a52329e179d525127c4f80c45e76de3dbe45303151bd7f4b7d4d9ab6e4d2
 DIST busybox-1.15.2.tar.bz2 1987590 RMD160 8f1b2e5ed64d440681042d44f7bb629e33b6df10 SHA1 2f396a4cb35db438a9b4af43df6224f343b8a7ae SHA256 2dab1d6eb34e52f10fb2c4b468bfbc55dab6b73c982b58567371005c9a0dd9e1
-EBUILD busybox-1.13.2.ebuild 7292 RMD160 852f1e357c69f6163c8c570c93d483e2fe085e62 SHA1 da4b6de0b085fccb0a7c1209580452ae4c18bf32 SHA256 9b93aebdb435e47e1f5bbb8bb9e32000d599cf4ee245979cc31cd846633948a7
+DIST busybox-1.15.3.tar.bz2 1987727 RMD160 1f1bd7c25e1afe2465404203897f5b25cf499dfb SHA1 a05a692840ba1cd2bbe21af196f28809694c47e4 SHA256 d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb
 EBUILD busybox-1.14.2.ebuild 7239 RMD160 eb404dce401fcc8fea6258332b1606f6a52af48e SHA1 4c920560864b47be9e874ba67e4da415ac2e2e24 SHA256 db98e97b2fd1ebb96cb86ce96f5bd7e1bcece395513adde6bfe77a976adfcd95
 EBUILD busybox-1.15.2.ebuild 7333 RMD160 84a878941ca550e0aac9192720496ef62077bbeb SHA1 2cb36b66b2d2e17db05b2e51ad6264037a5c72b9 SHA256 0ab90bbe51652e165d8e871c7b4157f960fa88fa3d6c40ed630484f63aab1a58
-MISC ChangeLog 34526 RMD160 03f71d63fdc4ff9703229ef72f28d5ab127874ff SHA1 e03320c7aea3b666e7f76e686bfe49bfbfc0fa41 SHA256 48b937195d35bba5141f2f4d48b0e68158132da35440445227f08da9b9fb17eb
+EBUILD busybox-1.15.3.ebuild 7333 RMD160 aaa8016a6fd58e898222b846f165424356ca3c1f SHA1 78601b2f3808fae79079fb98662e1d6484d6385c SHA256 31e3b91e6bd854f654e3aaa704a8b040c973490055c15173e386756a6c0214ff
+MISC ChangeLog 34669 RMD160 f284d10b8c8afa316f20d0e3929a2d1dd5deff3a SHA1 f47a9ef8578ac59b22565f9a2df63a4fdeb8fd30 SHA256 81b2bf00d21fec70fe0681a06ddf4002761ab2a8d154c7409b6fa23a6a18ea65
 MISC metadata.xml 261 RMD160 3a3402cbd18d14e4f10e1bb0a4d94a0c3b29b44d SHA1 7bc1c61bf44ae90dfce0f668ea0dcfe0460afe77 SHA256 d45ec36c64c958afd2de0777e77292c4e2908e32c5417c952dd63d920f82990a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iF4EAREIAAYFAks2RHQACgkQTwhj9JtAlp54owEAk0WelLjwZsg3yeQu936VUt1D
+rf8dhIN6A2GYfbVuP0EA/2TkmhuefkAzvbdVy37+C/HJmOqTlZR+FdEeS/DPA26S
+=AV7B
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.15.3.ebuild b/sys-apps/busybox/busybox-1.15.3.ebuild
new file mode 100644
index 000000000000..152e67d8c902
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.15.3.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.15.3.ebuild,v 1.1 2009/12/26 17:14:22 vapier Exp $
+
+inherit eutils flag-o-matic savedconfig toolchain-funcs
+
+################################################################################
+# 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/busybox-*
+#     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 make-symlinks pam selinux static"
+RESTRICT="test"
+
+DEPEND="selinux? ( sys-libs/libselinux )
+	pam? ( sys-libs/pam )"
+
+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 || echo Could not find CONFIG_$2 ...)
+}
+
+src_unpack() {
+	unset KBUILD_OUTPUT #88088
+
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+
+	# patches go here!
+	epatch "${FILESDIR}"/busybox-1.15.2-bb.patch
+	#epatch "${FILESDIR}"/busybox-${PV}-*.patch
+
+	# work around broken ass powerpc compilers
+	use ppc64 && append-flags -mminimal-toc
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		Makefile || die
+
+	# 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 "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 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
+	busybox_config_option n NOMMU
+	busybox_config_option n MONOTONIC_SYSCALL
+
+	# 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
+
+	if use static && use pam ; then
+		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
+	fi
+	use static \
+		&& busybox_config_option n PAM \
+		|| 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
+	local opt
+	for opt in \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG \
+		FAKEIDENTD FBSPLASH FOLD FTP{GET,PUT} \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LASH LOCALE_SUPPORT LOGNAME LPD \
+		MSH \
+		OD \
+		SLATTACH SULOGIN \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake busybox || die "build failed"
+	if ! use static && ! use pam ; 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
+	if use static || use pam ; then
+		dosym busybox /bin/bb || die
+		dosym bb /bin/busybox.static || die
+	else
+		dobin bb || die
+	fi
+
+	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 $(find . -type f)
+}
+
+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
+}