version bump

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 264 insertions, 7 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index c588c5a92ed5..0f6b3d30aa29 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.227 2009/03/18 14:51:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.228 2009/04/15 02:44:42 solar Exp $
+
+*busybox-1.13.4 (15 Apr 2009)
+
+  15 Apr 2009; <solar@gentoo.org> busybox-1.13.2.ebuild,
+  +busybox-1.13.4.ebuild:
+  version bump
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> busybox-1.13.2.ebuild:
   stable ppc, bug 260138
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 456d8b0f381e..4eb664623771 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -23,8 +23,10 @@ AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b
 DIST busybox-1.12.2.tar.bz2 2021304 RMD160 b716a8742411954845b0aed8e12754e3aed8c7c6 SHA1 49c715a4adb8f6f3d4103dfe04b050479fe43e56 SHA256 49a33023399b1378ef905f382e59581f1b139faf68247321f5abd8c591a24335
 DIST busybox-1.13.2.tar.bz2 2046961 RMD160 21c9f2802e9b29a589a9fdcf3e01502f8af7f57f SHA1 6659d92b0056971e0faab254fdcbc7fcce872e9e SHA256 927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8
 DIST busybox-1.13.3.tar.bz2 2057360 RMD160 63c9178a60b5ca628be2a0310d8338c0b11bbd25 SHA1 364eefc4ff73613db530518e9882fdf66a694294 SHA256 2899af57e28fe1fd2aa1c6467919e1350e3653b000d4f870d55665ef7eef8419
+DIST busybox-1.13.4.tar.bz2 2047578 RMD160 282dd44464b8e679c0f3c23bc73066e4ce855863 SHA1 cb80742efda773c748450397c7ebfd47fcef9622 SHA256 43ff187937f0bf38b23a926f4215be021c9f937b497912d785a91fbdf180b94b
 EBUILD busybox-1.12.2-r1.ebuild 7453 RMD160 621b5e68094c19a3f22de63fe4dd418ef80d048d SHA1 a0a67feed251986110ca923b4216fece5b150dae SHA256 74107bed04894eb63060bf3c0bb06d5eca34ee995fd858639739528cf123fdad
-EBUILD busybox-1.13.2.ebuild 7322 RMD160 93f3475f6cf82c64ee6053b4841cb1ae776cbe9b SHA1 83535ed19a6233e96145254008f9446877b08ae7 SHA256 e37707752875faac3d0e31a742cfcaf8613610cbbeb5d256062f43d85cdbe8ff
+EBUILD busybox-1.13.2.ebuild 7292 RMD160 852f1e357c69f6163c8c570c93d483e2fe085e62 SHA1 da4b6de0b085fccb0a7c1209580452ae4c18bf32 SHA256 9b93aebdb435e47e1f5bbb8bb9e32000d599cf4ee245979cc31cd846633948a7
 EBUILD busybox-1.13.3.ebuild 7335 RMD160 d72190e1e8db8d15bb767e9043be8ab952f71b4c SHA1 a67fab093ddcdd3c7a3ee565735c36fd55f078f1 SHA256 449c0e782f8d99a2d7e2fe2db8b00119549c3bfdf7f921182249a96603c96c89
-MISC ChangeLog 33579 RMD160 fb43b93ef9ea8b314b1a056cb521c37615620fe7 SHA1 1641a6a46c3e141c121cd2c94c90e6e795a7ef5c SHA256 33a07231c287e885b0531ce3674f4222c453620b8a8e747ac2e1434ed91bec0e
+EBUILD busybox-1.13.4.ebuild 7304 RMD160 bd67b04e8c40f0245e0400dbcc53c7202d84f3ad SHA1 d015900a5a7b8cc99043c566878fdd2cfb4c00cf SHA256 a0e3b8902545bd700d1c8b7b8f97ff972e7486baca03bed6e059f6322a703746
+MISC ChangeLog 33708 RMD160 5571dce1d479c37932280002ff88f337c48423ed SHA1 79de95be277543e16fbbd645cf8084be31d761a5 SHA256 ec47f9b07bd11e21d3755c36b1bc952f36d8398511854b843fad991bc100c746
 MISC metadata.xml 261 RMD160 3a3402cbd18d14e4f10e1bb0a4d94a0c3b29b44d SHA1 7bc1c61bf44ae90dfce0f668ea0dcfe0460afe77 SHA256 d45ec36c64c958afd2de0777e77292c4e2908e32c5417c952dd63d920f82990a
diff --git a/sys-apps/busybox/busybox-1.13.2.ebuild b/sys-apps/busybox/busybox-1.13.2.ebuild
index 9e507a1121c6..3c55f21e84d6 100644
--- a/sys-apps/busybox/busybox-1.13.2.ebuild
+++ b/sys-apps/busybox/busybox-1.13.2.ebuild
@@ -1,6 +1,6 @@
 # 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.13.2.ebuild,v 1.9 2009/03/18 14:51:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.13.2.ebuild,v 1.10 2009/04/15 02:44:42 solar Exp $
 
 inherit eutils flag-o-matic savedconfig toolchain-funcs
 
@@ -146,17 +146,16 @@ src_unpack() {
 	# default a bunch of uncommon options to off
 	local opt
 	for opt in \
-		APP_UDHCPD \
 		CRONTAB \
 		DC DPKG \
 		FAKEIDENTD FBSPLASH FOLD FTP{GET,PUT} \
-		HTTPD HUSH \
+		HUSH \
 		INETD INOTIFYD IPCALC \
 		LASH LOCALE_SUPPORT LOGNAME \
 		MSH \
 		OD \
 		SULOGIN \
-		TASKSET TFTP{,D} \
+		TASKSET \
 		RPM RPM2CPIO \
 		UDPSVD UUDECODE UUENCODE
 	do
diff --git a/sys-apps/busybox/busybox-1.13.4.ebuild b/sys-apps/busybox/busybox-1.13.4.ebuild
new file mode 100644
index 000000000000..72456c2fa854
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.13.4.ebuild
@@ -0,0 +1,250 @@
+# 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.13.4.ebuild,v 1.1 2009/04/15 02:44:42 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/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.11.1-bb.patch
+	#epatch "${FILESDIR}"/busybox-${PV}-*.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
+	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 DPKG \
+		FAKEIDENTD FBSPLASH FOLD FTP{GET,PUT} \
+		HUSH \
+		INETD INOTIFYD IPCALC \
+		LASH LOCALE_SUPPORT LOGNAME \
+		MSH \
+		OD \
+		SULOGIN \
+		TASKSET \
+		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
+}