Version bump.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.4 x86_64

5 files changed, 293 insertions, 5 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index e913416769dd..3b8d41e14853 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.203 2008/10/27 02:29:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.204 2008/11/18 00:15:08 vapier Exp $
+
+*busybox-1.12.2 (18 Nov 2008)
+
+  18 Nov 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/busybox-1.12.2-getopt.patch, +files/busybox-1.12.2-lineedit.patch,
+  +busybox-1.12.2.ebuild:
+  Version bump.
 
   27 Oct 2008; Mike Frysinger <vapier@gentoo.org> busybox-1.11.1.ebuild,
   busybox-1.11.3.ebuild, busybox-1.12.0.ebuild, busybox-1.12.1.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 8869a5f9b6ac..840e1f6f4a1f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -8,22 +8,26 @@ AUX busybox-1.12.0-mdev-exec.patch 327 RMD160 0490e4ff48b12eadd71c3c567c6b2cdf65
 AUX busybox-1.12.1-grep.patch 1061 RMD160 f8a2859f5dde8bc3f389609e708d9f086f5be4e0 SHA1 f0ded0cd805d8740632ab7d5c892433f8fa9dc04 SHA256 722d486c10fc1c68828572d6899d11604fa802afed1d2d761537313eb32fc2d0
 AUX busybox-1.12.1-modprobe.patch 1407 RMD160 575c8fdd86836d01fac75482bfb076d1bf53b65c SHA1 ef659cbc5dd5157fbd9c73319dc95a313fab8d97 SHA256 e3541b8012743cdb5a2be7cbe41795e53ccf077ee006ff0109175885e19220da
 AUX busybox-1.12.1-standalone.patch 7585 RMD160 0bf39b7183ae9e66bbb2b4b4b9b4861874cd192f SHA1 cd509e3b327ad85d2adbdd3e3b4e0d6b332ea790 SHA256 70f1da468db9dba23cb73dee58a01baf3497d9d44ba52102c5abec2641a34c5a
+AUX busybox-1.12.2-getopt.patch 639 RMD160 bfa79b576d704bb2102514ff41edac69607dd9de SHA1 8961e854042bcea29a0a92cc06f055192d7a32ab SHA256 039d76d7a8e3ee77fcb6cf879a311c7a2c64a6996da480a11aa90cadc749a524
+AUX busybox-1.12.2-lineedit.patch 461 RMD160 7e378845f8dde9b04148a076e08246cde9012552 SHA1 9a92d463241ad6c7ab3c9999ed44603c47b86b10 SHA256 5446f034e99ed66d6111d2d3b0735256d90d98cb1c6c20e2aa29a287d8ee69c6
 AUX busybox-devmem.patch 4623 RMD160 3a9c0a4eba57b18308b3a75d05a7eb1804c8e8ee SHA1 77fe59da168f6d4b1a0508816683c2887084673f SHA256 9ef56cb12d3d566a54ccdbe225a996eae9263efcddbb68c258121f75ece2b7f8
 AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7
 DIST busybox-1.11.1.tar.bz2 1924234 RMD160 8047748a4be0990f2bab61fdeefac1400e8cfa9d SHA1 73b041364d377125949dd8f5c191bcbb3daee6e9 SHA256 bf2fb5be14cb509af1153af15b8a14c143d61fc46fb50cfbcf3cf10764f3740f
 DIST busybox-1.11.3.tar.bz2 1924832 RMD160 1f2fd6dad3199ecc7de79ff7ad5ed84bae48da44 SHA1 d90e3ff443deb9bfed09582b74bd994cc6ad6129 SHA256 6d35fda668988c06f8c22e6e20fe6951ec83108169df6b8c0bad99872577c784
 DIST busybox-1.12.0.tar.bz2 2017989 RMD160 b5e991bdbc1481a649f963b9e949777707412fd3 SHA1 0c174c69e7b7244a3936ebfdc245fa37b73ce633 SHA256 c5b5c6d89e22c975d160e9dd9bb767521f6c478b9c356cab06a9328da5e4a2e6
 DIST busybox-1.12.1.tar.bz2 2022321 RMD160 075092f73e03c4b36de7426c35b1bfb6568fc884 SHA1 e405e2d6587714626c8eb7d181f63208f3997845 SHA256 80829f38d719879dcf01db6251015c8aea2567a382dad463f65d2299447e949b
+DIST busybox-1.12.2.tar.bz2 2021304 RMD160 b716a8742411954845b0aed8e12754e3aed8c7c6 SHA1 49c715a4adb8f6f3d4103dfe04b050479fe43e56 SHA256 49a33023399b1378ef905f382e59581f1b139faf68247321f5abd8c591a24335
 EBUILD busybox-1.11.1.ebuild 7262 RMD160 38e22a53c30f7c1c4f2f89ed2687223773fc5507 SHA1 196710164617fa70643363511911bee04205315f SHA256 ce6c3010aa49e9cf6c1bf1da6171face189da06cde695d2fd170e02977ee3da1
 EBUILD busybox-1.11.3.ebuild 7220 RMD160 d7bbc7d36206d584457507074efd5afd3e9f7a21 SHA1 2eb2266e9aea4f15e3db646673fdd32b39c26597 SHA256 1d292ba1308ec3ba1091259e4e45c748f47ab3fc41f04934fed063c6fa6652ba
 EBUILD busybox-1.12.0.ebuild 7220 RMD160 8de777da5c9f840b849cdd4fd20e7e2b1548eafc SHA1 9f73aebcd0ae9e6fbe931220242cd69d8f3254d9 SHA256 7a6dadb792f848a20420e732e3465fa36d4195e8b347d64a8810bd4f3862db04
 EBUILD busybox-1.12.1.ebuild 7265 RMD160 13d2bd2ecc40f0a2b06fcfe25282ce19c511a822 SHA1 8f33452a3bd4a7af89154c8cb83e5de770b3c804 SHA256 dd447bf298bf71ff331192ed2df4f1d29fff88e701472371e3ffda003f2de1b6
-MISC ChangeLog 30157 RMD160 8696f162dd3835a77c254bb6dc2205c5dd5e0beb SHA1 785ea2d7fbee81cbb197c0a65a9d35dfd90dfe13 SHA256 cea3d31f94e0af34c90124d9b2c0bf4df104dd262144b4f7d1fc32fd4b4f098e
+EBUILD busybox-1.12.2.ebuild 7264 RMD160 d1231123c673c5cc6cca8399fd489e341440600c SHA1 d51ff0dc5e79bbc99067f84b0954a5b4880625c1 SHA256 312f06601bdbc849891a28b80d11547ccf0976b0ab7f3c7c9f874e731025da38
+MISC ChangeLog 30357 RMD160 532d915d0709737b84ee826c0e452b4368e12839 SHA1 fff65bf0094f119ff4cf8eaa27371a60eb8d8b35 SHA256 1c63e5feb9d593b61ef138525a6b71b60d1e3fda367a5b88eb616536cec844b3
 MISC metadata.xml 261 RMD160 3a3402cbd18d14e4f10e1bb0a4d94a0c3b29b44d SHA1 7bc1c61bf44ae90dfce0f668ea0dcfe0460afe77 SHA256 d45ec36c64c958afd2de0777e77292c4e2908e32c5417c952dd63d920f82990a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkFJ5cACgkQ67wieSYcaxfWswCeKsyNV4g5hFV/iztzomLanudC
-FXkAn3OPdxdociCxpZHfc00Cy5EV8av3
-=OhdR
+iEYEARECAAYFAkkiCRIACgkQ67wieSYcaxcb8QCfSVO1R+GCp4evu6hg+qwUp6tT
+bF0An2zjtHONbWzDQmsRj0wwNXqY3QbN
+=Mm1e
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.12.2.ebuild b/sys-apps/busybox/busybox-1.12.2.ebuild
new file mode 100644
index 000000000000..e5719e4c30b4
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.12.2.ebuild
@@ -0,0 +1,242 @@
+# 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.12.2.ebuild,v 1.1 2008/11/18 00:15:08 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
+#     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
+	epatch "${FILESDIR}"/busybox-${PV}-*.patch
+
+	# include this upstream later..
+	epatch "${FILESDIR}"/busybox-devmem.patch
+
+	epatch "${FILESDIR}"/busybox-1.12.0-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 INOTIFYD
+	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 $(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
+}
diff --git a/sys-apps/busybox/files/busybox-1.12.2-getopt.patch b/sys-apps/busybox/files/busybox-1.12.2-getopt.patch
new file mode 100644
index 000000000000..bdc8b9327e13
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.12.2-getopt.patch
@@ -0,0 +1,22 @@
+--- busybox-1.12.2/libbb/getopt32.c	Sun Nov  9 18:20:37 2008
++++ busybox-1.12.2-getopt/libbb/getopt32.c	Wed Nov 12 23:03:33 2008
+@@ -515,6 +515,19 @@
+ 		}
+ 	}
+ 
++	/* In case getopt32 was already called:
++	 * reset the libc getopt() function, which keeps internal state.
++	 * run_nofork_applet_prime() does this, but we might end up here
++	 * also via gunzip_main() -> gzip_main(). Play safe.
++	 */
++#ifdef __GLIBC__
++	optind = 0;
++#else /* BSD style */
++	optind = 1;
++	/* optreset = 1; */
++#endif
++	/* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
++
+ 	pargv = NULL;
+ 
+ 	/* Note: just "getopt() <= 0" will not work well for
diff --git a/sys-apps/busybox/files/busybox-1.12.2-lineedit.patch b/sys-apps/busybox/files/busybox-1.12.2-lineedit.patch
new file mode 100644
index 000000000000..b7051c0d80a1
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.12.2-lineedit.patch
@@ -0,0 +1,13 @@
+--- busybox-1.12.2/libbb/lineedit.c	Sun Nov  9 18:20:16 2008
++++ busybox-1.12.2-lineedit/libbb/lineedit.c	Tue Nov 11 21:02:04 2008
+@@ -1415,8 +1415,10 @@
+ 	if ((state->flags & SAVE_HISTORY) && state->hist_file)
+ 		load_history(state->hist_file);
+ #endif
++#if MAX_HISTORY > 0
+ 	if (state->flags & DO_HISTORY)
+ 		state->cur_history = state->cnt_history;
++#endif
+ 
+ 	/* prepare before init handlers */
+ 	cmdedit_y = 0;  /* quasireal y, not true if line > xt*yt */