Version bump.

Package-Manager: portage-2.1.4_rc4

4 files changed, 266 insertions, 5 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 4c08bc3b4b3e..56d4e40df1f1 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.165 2007/11/30 21:49:34 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.166 2007/12/02 23:33:19 vapier Exp $
+
+*busybox-1.7.4 (02 Dec 2007)
+
+  02 Dec 2007; Mike Frysinger <vapier@gentoo.org> +busybox-1.7.4.ebuild:
+  Version bump.
 
   30 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> busybox-1.8.2.ebuild:
   Fix cross compile, bug#200367, thanks to Joakim Tjernlund
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 1335b31212c2..d4b62775da23 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
@@ -52,6 +55,7 @@ DIST busybox-1.7.0.tar.bz2 1726650 RMD160 23691b0e908028d109138c1fdf719c35aada6b
 DIST busybox-1.7.1.tar.bz2 1728262 RMD160 42ba3ef6033b8d74c31251810f73c48ddb3820e1 SHA1 439ebcbe2b48e19e1c9acc5aa886b24795d523b1 SHA256 8b6a5fe183cbc19c73db475aaba73af0ba2cba386f3b206fb7720dcf94da549c
 DIST busybox-1.7.2.tar.bz2 1729040 RMD160 f9850b3949ad61dfae37c7ab48eac6c9507eb537 SHA1 d9c618a7b104af4e70d623b1b6f3bc454405e12b SHA256 83c4cc813124a43f13e2ebb83cea9da9909d63891b824bf4bc7006f0567db7cf
 DIST busybox-1.7.3.tar.bz2 1727483 RMD160 1039011774b7501abb8a4df4c858cba2def7abda SHA1 e50507674baa245774b7205384b2049f06ba7998 SHA256 b29c2701c5203ee21d6cf2590b6af164d05b7a524a42991b1a7da7fef6fbaaea
+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
 EBUILD busybox-1.4.1-r2.ebuild 7981 RMD160 83426ba5b68db54a6201fcbe9f7213908b8b8457 SHA1 6394e28e73cdea532532afbb674076d029a029b7 SHA256 bf7a7ee065cefa47aa00eb06714cf6225b664968a95f826d8ada3f8489cb79a3
 MD5 7221bd06e12defbe8b271d914f0e1b95 busybox-1.4.1-r2.ebuild 7981
@@ -93,14 +97,18 @@ EBUILD busybox-1.7.3.ebuild 7015 RMD160 7464153bd120766c254ba789337b536ef706630e
 MD5 54c24c9876d3e5acd71223e2d866cdf5 busybox-1.7.3.ebuild 7015
 RMD160 7464153bd120766c254ba789337b536ef706630e busybox-1.7.3.ebuild 7015
 SHA256 8339ea8680e20c7df7eae1573a88fc457d21f2a88521409cd082158d550e3f70 busybox-1.7.3.ebuild 7015
+EBUILD busybox-1.7.4.ebuild 7016 RMD160 cb970a2e3b5c0ea84a7814b92513721a8c0a92c9 SHA1 74cd8021c38b16fdb6de14b713cdd49c4f16114b SHA256 c9ea3950d733fd109adff5232cc56aa99ac91807b06a566b280d95f737b85974
+MD5 aba209e90c7b2da6389e7aebce1d3efc busybox-1.7.4.ebuild 7016
+RMD160 cb970a2e3b5c0ea84a7814b92513721a8c0a92c9 busybox-1.7.4.ebuild 7016
+SHA256 c9ea3950d733fd109adff5232cc56aa99ac91807b06a566b280d95f737b85974 busybox-1.7.4.ebuild 7016
 EBUILD busybox-1.8.2.ebuild 6976 RMD160 3c8b971b5c5db02e49fad03972db5296f204fa6f SHA1 f71419fec3d279b64f578191677765691f11238e SHA256 4c61cf5e99ea1f41cb48da5249d251f30a81b183c8d0ba2f68a363e9bccc022e
 MD5 d37f97a38da491bbc4e69eb131479a05 busybox-1.8.2.ebuild 6976
 RMD160 3c8b971b5c5db02e49fad03972db5296f204fa6f busybox-1.8.2.ebuild 6976
 SHA256 4c61cf5e99ea1f41cb48da5249d251f30a81b183c8d0ba2f68a363e9bccc022e busybox-1.8.2.ebuild 6976
-MISC ChangeLog 24933 RMD160 55f810cb321ae4239711347205a13cce9f05402f SHA1 8e2377f16bfbc204e0e8338927175411f20dd0f4 SHA256 b072939058e985975c8630bcdd5a2019a5dacd0999efd076b8a7b56ce3b5b85a
-MD5 5f936df70f21fd6e2eb906243d1ac5e3 ChangeLog 24933
-RMD160 55f810cb321ae4239711347205a13cce9f05402f ChangeLog 24933
-SHA256 b072939058e985975c8630bcdd5a2019a5dacd0999efd076b8a7b56ce3b5b85a ChangeLog 24933
+MISC ChangeLog 25053 RMD160 4aa9b401719a70827b0319b136efbb2669168ae2 SHA1 8be6dae22168f885862555fe2fe884bae5215770 SHA256 6631e0557a4cae4bc2573fbad8110e7477dff3440a1c60d935ae4fa6b078f3ee
+MD5 002af26d335bf6a38b30e77f9797edce ChangeLog 25053
+RMD160 4aa9b401719a70827b0319b136efbb2669168ae2 ChangeLog 25053
+SHA256 6631e0557a4cae4bc2573fbad8110e7477dff3440a1c60d935ae4fa6b078f3ee ChangeLog 25053
 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -135,6 +143,16 @@ SHA256 45828cbb8ff1bf28b44e3b750812585eff99c87a99d87d2a9694a360285d68b1 files/di
 MD5 392625ff45781425f0a77cedd8ceb47b files/digest-busybox-1.7.3 247
 RMD160 3c0e6b380c3025f037436d134c13719fa74e5530 files/digest-busybox-1.7.3 247
 SHA256 ea0901882e4e866f25ac461d84ef076ab2840ecd721a485a9733f81af6649de0 files/digest-busybox-1.7.3 247
+MD5 09bba2edfba84619d80dc5990c32155f files/digest-busybox-1.7.4 247
+RMD160 fe20fda2af122d28346f8ac80693daa298457e70 files/digest-busybox-1.7.4 247
+SHA256 7ea34ce079eb70d7d0ac673a161be7d81f4fe417e38a7867c5fe0bcbee957617 files/digest-busybox-1.7.4 247
 MD5 18588ddf4448eb9a62f4080db7bbd060 files/digest-busybox-1.8.2 247
 RMD160 11c7bb8ba2b46d903ea95dcdf1e38d3fa5379422 files/digest-busybox-1.8.2 247
 SHA256 5e2ce9089e972a240334bcca819f6424d96bb12eeafa57478ebb840523f8c12f files/digest-busybox-1.8.2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHU0DFp/wUKkr7RBoRAojIAJwIS7ThRAkXzfqALwkIWEef7X0L9QCg2cSr
+1Hg4V8sXTzx+u/xdA8omCsU=
+=fvHn
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.7.4.ebuild b/sys-apps/busybox/busybox-1.7.4.ebuild
new file mode 100644
index 000000000000..847ea1e7788f
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.7.4.ebuild
@@ -0,0 +1,235 @@
+# 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.4.ebuild,v 1.1 2007/12/02 23:33: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 make-symlinks selinux"
+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.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
+
+	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
+
+	make 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/digest-busybox-1.7.4 b/sys-apps/busybox/files/digest-busybox-1.7.4
new file mode 100644
index 000000000000..aff7d5bb99ca
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.7.4
@@ -0,0 +1,3 @@
+MD5 6583ff3125fad257fcd9c773ecfd33c3 busybox-1.7.4.tar.bz2 1727940
+RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c19b busybox-1.7.4.tar.bz2 1727940
+SHA256 8480a7c1b9ac0fddff55e8daae807ccf0a47aa292137fa8c9f97cf0733b459c7 busybox-1.7.4.tar.bz2 1727940