- version bump. Thanks Christoph Gysin bug #230637

Package-Manager: portage-2.1.4.4

4 files changed, 273 insertions, 12 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index de7e49daf24e..4c0cd8897852 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.191 2008/06/18 01:31:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.192 2008/08/02 15:20:07 solar Exp $
+
+*busybox-1.11.1 (02 Aug 2008)
+
+  02 Aug 2008; <solar@gentoo.org> +files/busybox-1.11.1-bb.patch,
+  +busybox-1.11.1.ebuild:
+  - version bump. Thanks Christoph Gysin bug #230637
 
 *busybox-1.10.3 (18 Jun 2008)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index aea12ff19d13..a03d2e52e873 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX busybox-1.10.1-mdev-exec.patch 384 RMD160 b42cdf99289bc6c159b1967726d2968dcd3f45b2 SHA1 d0e5799917797cc980a4ba02687d608a5e7c75ff SHA256 fa37a7178b25e59958d38b7ce4ef96540e5769d031f95762ebc59dad35a3e7b5
 AUX busybox-1.10.3-tcpudp.patch 348 RMD160 e7597d11e904007b08f5cd56b6d00795a9e15f63 SHA1 954e2d476084c8fc34c92a905c0139cb8af0c02f SHA256 2ab4f43c1beac4f5d84da625db9f14be67b5c1dae146246ac979439267cc7552
+AUX busybox-1.11.1-bb.patch 1059 RMD160 819a97b81f51314d400c86748d933e3cb1f1fcd3 SHA1 31a51bb6b7a5d1bfe32e54945eb71aac857e10ce SHA256 50d2f574093e52793dd5a08f35b275c2dddca8a76ff35e13e214dd6cd3654098
 AUX busybox-1.7.0-bb.patch 880 RMD160 fae03d9ed63f81d4ec043c4fc1eff5158eba5250 SHA1 8d515d3c2474e0f4d43015159b75e42de0d29cb1 SHA256 83c62f48e3ad89a77b2e0dd74d8ffa586faf2d112c3540c930f39e4abf3ccd55
 AUX busybox-1.7.4-signal-hack.patch 559 RMD160 4be7ab4379d4d4523fb7139a9ea6d1d885256612 SHA1 2427c3a5509fd04a3215c241c66291778cb19ae0 SHA256 541ab9a625acbb21ad413151f02ede8ab19e32d3a3583f5ca35d4713161bb567
 AUX busybox-1.9.0-allno.patch 1179 RMD160 32d9813d9bc5ec998e7eb0f1e0f04066da0e34d3 SHA1 d902d31244d31778a8a21081a801f0f458a54e8f SHA256 40a38c927502233171db99c530e8c2282a6f63a1495d0c29c268827713700d0c
@@ -19,6 +17,7 @@ AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b
 DIST busybox-1.10.1-20080430_09_28.tar.bz2 9270 RMD160 6f7cd57dd3b1066cb1f0bc47d56ce286a6111f5c SHA1 e1a82b1026b6cb04990834beb19e431c087697fc SHA256 d403d1ee6b20e586b52548df505da472fc7579d07c7ff941a70e805558e68f5e
 DIST busybox-1.10.1.tar.bz2 1859037 RMD160 19f7f31e0b358a2e7da2548cc872ad642fe2e545 SHA1 a923d28770b3b153514b57ffa11cf8f95ca99e50 SHA256 a0372c5b457f556cd34a8c7e323a82a30610df72d65732e098c229146f8a21a2
 DIST busybox-1.10.3.tar.bz2 1860680 RMD160 86a76ee4a2d1e3f4eeaaa2b5bdfcb0647bdc7672 SHA1 2da07929319a57140b806a696df8c9c412ce157c SHA256 f300b72531c2674f932b91fe4c6a34d65c6616381372269db761777c79dec222
+DIST busybox-1.11.1.tar.bz2 1924234 RMD160 8047748a4be0990f2bab61fdeefac1400e8cfa9d SHA1 73b041364d377125949dd8f5c191bcbb3daee6e9 SHA256 bf2fb5be14cb509af1153af15b8a14c143d61fc46fb50cfbcf3cf10764f3740f
 DIST busybox-1.7.4.tar.bz2 1727940 RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c19b SHA1 e5dcaa25525ca63663c3d4e7027897fed54a4f95 SHA256 8480a7c1b9ac0fddff55e8daae807ccf0a47aa292137fa8c9f97cf0733b459c7
 DIST busybox-1.8.2.tar.bz2 1765399 RMD160 561d84cc28d2b9cd85f05d9959bc2c585c80a986 SHA1 cca3259c06c64ad4ba08070c8da32083d813057f SHA256 1e444c15c064ca111299323a5193113c8bcb80f7a946675b70f14b0166a2a59c
 DIST busybox-1.9.0.tar.bz2 1798481 RMD160 ec8dbbda99d0ad2f8e139b2dd5340b8d0762a74b SHA1 adb9409ce37b2f9a8a1a5a6f9ba4fde615c3167b SHA256 2da62c3cfbea0108ba1066b7d56207fa01843a2b30314f3329454700301b28c1
@@ -27,16 +26,10 @@ EBUILD busybox-1.10.1-r2.ebuild 7438 RMD160 1164de735e8470ed350d89921dcd7f0fa994
 EBUILD busybox-1.10.1-r3.ebuild 7496 RMD160 9dd4680dfa64e94acbf3a30f0413d123d257474b SHA1 adb16b89db2cd518db6353b836c8aecff3d5930d SHA256 892ce726b8a2f0cb1f4c75451a9ca98d6f37e0a0a583fc86e1f5fa9eea4f9ee8
 EBUILD busybox-1.10.1.ebuild 7095 RMD160 a9bfb8d7e1acedfbc9d9c256cfad98293953cf1e SHA1 6798221aa9e7ef654f1ef006da2e72595ad48845 SHA256 c2b7c238ac6f106ba88fb409d1b73a6b5c1b321e3f04d16f2525f26fb8b84251
 EBUILD busybox-1.10.3.ebuild 7274 RMD160 f468d93a7892d47cb2236481db396c89dd2c74d9 SHA1 1025827dca18223d630c288b2cfa68e5fed7b117 SHA256 7c5b5a74728fe4f00ecf207ccc92646224d3630e46eb58601c654cc2b281aeac
+EBUILD busybox-1.11.1.ebuild 7225 RMD160 76a2f740c779cb84d6ce1f1e1a29291d40996226 SHA1 f6198adfe80655c0216c646830ad29b181bed329 SHA256 0d82d50e8c1bb9cfc1db47215fbaf323780c84e98e876dff0b97da4bfe14a9c8
 EBUILD busybox-1.7.4.ebuild 7065 RMD160 c15b1f193f6e6064b129ab0d3988b5a7661c484e SHA1 bd04231092d736a8d84cecaac30638a80746d5b8 SHA256 295a507bfde7316606b4b8bac650a131fec9e61ef55a2356a4d29d0a0bb873e6
 EBUILD busybox-1.8.2.ebuild 7099 RMD160 6706ad0a141250ffb9668d8d5bf1e43c31102573 SHA1 2ba84fedc138067b0a65067ef903bcdd4adce284 SHA256 9df161c10b79f3b446f816af495638354bcc2c6129c8ef880cd8a8d5234cbc0d
 EBUILD busybox-1.9.0.ebuild 7101 RMD160 228234953d5a8a6bb0580828ac53d724e1a9c784 SHA1 befa00b876bb64fde773e2420dad608de9437344 SHA256 0d954b94a2b01e84b6d71b15e41f9ce239995908b873e57e2ab9a1bd706c5a6d
 EBUILD busybox-1.9.2.ebuild 7063 RMD160 738b8532ae768be8605b6fb3e1044f680568416e SHA1 add0013f17528f2137bde9258c9654edcc7d6a55 SHA256 c1f0002bda1126037dc3b06873e7e7606cee7b49f17199902f56e90b19862291
-MISC ChangeLog 28346 RMD160 a9e99a330805dff01026bfa329249efef1290f4c SHA1 49e278970d89e4944f14995a903fe8be302ebac6 SHA256 1a0e82a35de07cc92644ee3cd6965cf643eab9113d1754386bd3b051686c14eb
+MISC ChangeLog 28522 RMD160 757425c4f83363c721a49a2eb8f14eca268929fb SHA1 5c9e10ae104635ca4dd1f82c7b59ffa8e2b747ad SHA256 dfc6f61282113d0956ff560a57d81201412c0ed270dcb38883a0205ac57e1939
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhYZW0ACgkQj9hvisErhMKShACg2zw2JYCWQ8iFpKSFIEcIoN/e
-gHgAn0eAQscrNGYFCs/LSOQq8b/BqLHi
-=0Afb
------END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.11.1.ebuild b/sys-apps/busybox/busybox-1.11.1.ebuild
new file mode 100644
index 000000000000..33960bd1f7cb
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.11.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.11.1.ebuild,v 1.1 2008/08/02 15:20:07 solar 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
+#     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)
+}
+
+src_unpack() {
+	unset KBUILD_OUTPUT #88088
+
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+
+	# patches go here!
+	epatch "${FILESDIR}"/busybox-1.11.1-bb.patch
+
+	# include this upstream later..
+	epatch "${FILESDIR}"/busybox-devmem.patch
+
+	epatch "${FILESDIR}"/busybox-1.10.1-mdev-exec.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 '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	cat <<-EOF >> Makefile.flags
+	CROSS_COMPILE := ${CHOST}-
+	HOSTCC := $(tc-getBUILD_CC)
+	SKIP_STRIP = y
+	EOF
+
+	# 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
+
+	# 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
+	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
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+
+	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 * 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.11.1-bb.patch b/sys-apps/busybox/files/busybox-1.11.1-bb.patch
new file mode 100644
index 000000000000..be56d6c32e9d
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.11.1-bb.patch
@@ -0,0 +1,21 @@
+--- include/applets.h.orig	2008-07-29 13:26:42.371370968 +0200
++++ include/applets.h	2008-07-29 13:24:43.891381220 +0200
+@@ -78,6 +78,7 @@
+ USE_ASH(APPLET(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_ODDNAME(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER, ash))
+ USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
+ //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
+--- shell/ash.c.orig	2008-07-29 12:00:58.545222061 +0200
++++ shell/ash.c	2008-07-29 12:46:08.398280906 +0200
+@@ -6873,6 +6873,8 @@
+ 			run_applet_no_and_exit(applet_no, argv);
+ 		/* 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 */
+ 	}