~arch version bump, adds new procps sysctl option to busybox. misc bugfixes. new local useflag called savedconfig for user defined configs.

12 files changed, 210 insertions, 19 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 10dd137ccad5..d0470b8c41a6 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/busybox
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.19 2003/12/24 08:13:54 solar Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.20 2004/02/04 00:07:15 solar Exp $
+
+*busybox-1.00_pre6 (03 Feb 2004)
+
+  03 Feb 2004; <solar@gentoo.org> busybox-0.50.ebuild, busybox-0.60.2.ebuild,
+  busybox-0.60.3-r1.ebuild, busybox-0.60.3.ebuild, busybox-0.60.5-r1.ebuild,
+  busybox-0.60.5-r2.ebuild, busybox-0.60.5.ebuild, busybox-1.00_pre5.ebuild,
+  busybox-1.00_pre6.ebuild:
+  ~arch version bump, adds new procps sysctl option to busybox. misc bugfixes.
+  new local useflag called savedconfig for user defined configs.
 
 *busybox-1.00_pre5 (24 Dec 2003)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index ad239cd585b0..d69970b76692 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -5,9 +5,10 @@ MD5 bfec32dd92d147690a1271b7915a1579 busybox-0.60.3-r1.ebuild 1103
 MD5 1e213d53c8dab18dcc99d628b96e6737 busybox-0.60.3.ebuild 1047
 MD5 cbc0a83fefc19b66aa495c08cf2c2d9b busybox-0.60.5-r1.ebuild 1433
 MD5 482b4170d2e88c1218be4f43f124d26d busybox-0.60.5.ebuild 1043
+MD5 13a65aa8b3ff5036b8d6e6d6289da133 busybox-1.00_pre6.ebuild 5276
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 cd67b7e833d718b6fde55506d1cb556d busybox-0.60.5-r2.ebuild 2150
 MD5 73dcfb79deb1f289fd304c138ba9ceeb busybox-1.00_pre5.ebuild 4461
+MD5 cd67b7e833d718b6fde55506d1cb556d busybox-0.60.5-r2.ebuild 2150
 MD5 9ce965b12114a360496fe06e952139a8 files/Config.h 11695
 MD5 24ec3839ecb3e429bf29a819398b7753 files/Config.h-0.60.2-cd 13772
 MD5 af127cfced92352c0a43cbf63cde52bd files/Config.h-0.60.3-cd 14319
@@ -23,4 +24,5 @@ MD5 3a4b93f7ec6f3aaade20029a81562b88 files/msh.diff 433
 MD5 9af76647376bd7228609763aaad090e8 files/busybox-0.60.5-dietlibc.diff 13526
 MD5 eed3465a5e0e5ddae7dac2c1c1f879ef files/digest-busybox-0.60.5-r2 66
 MD5 9167897ed0b558e714a92f7e2d2fe534 files/busybox-1.00-pre3.config 8804
+MD5 e6ee048fa92fc64dc127f498fc06fd27 files/digest-busybox-1.00_pre6 70
 MD5 347b6eb9800123daef3dbc8b97bf6d37 files/digest-busybox-1.00_pre5 70
diff --git a/sys-apps/busybox/busybox-0.50.ebuild b/sys-apps/busybox/busybox-0.50.ebuild
index 603626b88fa3..13bf30525ba3 100644
--- a/sys-apps/busybox/busybox-0.50.ebuild
+++ b/sys-apps/busybox/busybox-0.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.50.ebuild,v 1.16 2003/09/07 00:47:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.50.ebuild,v 1.17 2004/02/04 00:07:15 solar Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
diff --git a/sys-apps/busybox/busybox-0.60.2.ebuild b/sys-apps/busybox/busybox-0.60.2.ebuild
index cbdee6b40302..9f8f2fb33020 100644
--- a/sys-apps/busybox/busybox-0.60.2.ebuild
+++ b/sys-apps/busybox/busybox-0.60.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.2.ebuild,v 1.12 2003/09/07 00:47:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.2.ebuild,v 1.13 2004/02/04 00:07:15 solar Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
diff --git a/sys-apps/busybox/busybox-0.60.3-r1.ebuild b/sys-apps/busybox/busybox-0.60.3-r1.ebuild
index 8b58408b7b67..3d783e83411d 100644
--- a/sys-apps/busybox/busybox-0.60.3-r1.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.4 2003/09/07 00:47:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.5 2004/02/04 00:07:15 solar Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
diff --git a/sys-apps/busybox/busybox-0.60.3.ebuild b/sys-apps/busybox/busybox-0.60.3.ebuild
index 990ff3d1f8ba..5768d0d70b01 100644
--- a/sys-apps/busybox/busybox-0.60.3.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3.ebuild,v 1.16 2003/09/07 00:47:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3.ebuild,v 1.17 2004/02/04 00:07:15 solar Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
diff --git a/sys-apps/busybox/busybox-0.60.5-r1.ebuild b/sys-apps/busybox/busybox-0.60.5-r1.ebuild
index 36782ca15493..d398e34a57c2 100644
--- a/sys-apps/busybox/busybox-0.60.5-r1.ebuild
+++ b/sys-apps/busybox/busybox-0.60.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.8 2003/09/07 00:47:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.9 2004/02/04 00:07:15 solar Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
diff --git a/sys-apps/busybox/busybox-0.60.5-r2.ebuild b/sys-apps/busybox/busybox-0.60.5-r2.ebuild
index f0af01b85bed..a4defee8a1d4 100644
--- a/sys-apps/busybox/busybox-0.60.5-r2.ebuild
+++ b/sys-apps/busybox/busybox-0.60.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r2.ebuild,v 1.2 2003/09/07 00:47:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r2.ebuild,v 1.3 2004/02/04 00:07:15 solar Exp $
 
 inherit flag-o-matic
 
diff --git a/sys-apps/busybox/busybox-0.60.5.ebuild b/sys-apps/busybox/busybox-0.60.5.ebuild
index dc30c6e30cc2..37938379c481 100644
--- a/sys-apps/busybox/busybox-0.60.5.ebuild
+++ b/sys-apps/busybox/busybox-0.60.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5.ebuild,v 1.6 2003/09/07 00:47:41 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5.ebuild,v 1.7 2004/02/04 00:07:15 solar Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
diff --git a/sys-apps/busybox/busybox-1.00_pre5.ebuild b/sys-apps/busybox/busybox-1.00_pre5.ebuild
index 8ce74a045c89..70c04e760e63 100644
--- a/sys-apps/busybox/busybox-1.00_pre5.ebuild
+++ b/sys-apps/busybox/busybox-1.00_pre5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre5.ebuild,v 1.1 2003/12/24 08:13:54 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre5.ebuild,v 1.2 2004/02/04 00:07:15 solar Exp $
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
diff --git a/sys-apps/busybox/busybox-1.00_pre6.ebuild b/sys-apps/busybox/busybox-1.00_pre6.ebuild
new file mode 100644
index 000000000000..aeaed5145428
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.00_pre6.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre6.ebuild,v 1.1 2004/02/04 00:07:15 solar Exp $
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Utilities for rescue and embedded systems"
+SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.gz"
+HOMEPAGE="http://www.busybox.net"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="debug static uclibc savedconfig"
+
+# Forward anticipation of expected supported arches would include ~x86
+# ~alpha ~mips ~ppc ~sparc
+
+DEPEND="virtual/glibc
+	uclibc? ( dev-libs/uclibc )
+"
+RDEPEND="!static? ${DEPEND}"
+# <pebenito> then eventually turning on selinux would mean
+# adding a dep: selinux? ( sys-libs/libselinux )
+
+busybox_config_option() {
+	[ "$2" = "" ] && return 1
+	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;;
+		*) return 1;;
+	esac
+	einfo `grep CONFIG_$2 .config`
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+	# fine grained config control for user defined busybox configs.
+	# [package]-[version]-[revision].config
+	# [package]-[version].config
+	# [package].config
+
+	if use savedconfig; then
+		[ -r .config ] && rm .config
+		for conf in ${PN}-${PV}-${PR},${PN}-${PV},${PN}.config; do
+			if [ -r /etc/${PN}/${CCHOST}/${conf} ]; then
+				cp /etc/${PN}/${CCHOST}/${conf} ${S}/.config
+				break;
+			fi
+		done
+		if [ -r "${S}/.config" ]; then
+			einfo "Found your /etc/${PN}/${CCHOST}/${conf} and using it."
+			return 0
+		fi
+	fi
+
+	# busybox has changed quite a bit from 0.[5-6]* to 1.x so this
+	# config might not be cd ready.
+
+	make allyesconfig > /dev/null
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID
+
+	# setting the cross compiler from here would be somewhat of a
+	# pain do to as we would need a multiline sed expression which
+	# does not always seem to work so hot for me.
+
+	[ `use static` ] && busybox_config_option y STATIC ||
+		busybox_config_option n STATIC
+
+	# 1.00-pre2 uses the old selinux api which is no longer
+	# maintained. perhaps the next stable release will include
+	# support. 
+	# 1.00-pre5  pebenito says busybox is still using the old se api.
+	#[ `use selinux` ] && busybox_config_option y SELINUX ||
+		busybox_config_option n SELINUX
+
+	[ `use debug` ] && busybox_config_option y DEBUG ||
+		busybox_config_option n DEBUG
+
+	# Supported architectures:
+
+	# Busybox in general will build on any architecture supported by
+	# gcc.  It has a few specialized features added for __sparc__
+	# and __alpha__.  insmod functionality is currently limited to
+	# x86, ARM, SH3/4, powerpc, m68k, MIPS, and v850e.
+
+	case ${ARCH} in
+		alpha|sparc*)
+			# non x86 needs to figure out what works for
+			# them the best. sparc64 bobmed while building
+			# ash in my tests
+			busybox_config_option n INSMOD
+			busybox_config_option n MODPROBE
+			busybox_config_option n RMMOD;;
+		*) ;;
+	esac
+
+	#busybox_features=`grep CONFIG_ .config | tr '#' '\n' | 
+	#	awk  '{print $1}' | cut -d = -f 1 | grep -v ^$ | cut -c 8- | 
+	#		tr [A-Z] [a-z] | awk '{print "busybox_"$1}'`
+	#for f in $busybox_features; do
+	#	has $f ${FEATURES} && busybox_config_option y `echo ${f/busybox_/}|tr [a-z] [A-Z]`
+	#done
+	echo | make clean oldconfig > /dev/null
+}
+
+src_compile() {
+	if use uclibc; then
+		case ${ARCH} in
+			x86*) CROSS="/usr/i386-linux-uclibc/bin/i386-uclibc-";;
+			*) ;;
+		esac
+	fi
+	[ -n "${CROSS}" ] && einfo "Setting cross compiler prefix to ${CROSS}"
+	# MAKEOPTS="-j1" emake CROSS="${CROSS}" include/config.h busybox || die
+	MAKEOPTS="-j1" emake CROSS="${CROSS}" busybox || die
+}
+
+src_install() {
+	into /
+	dobin busybox
+
+	into /usr
+	dodoc AUTHORS Changelog LICENSE README TODO
+
+	cd docs || die
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+	dohtml *.sgml
+
+	# no man files?
+	# cd ../man && doman *.1
+
+	cd ../examples || die
+	docinto examples
+	dodoc inittab
+	dodoc depmod.pl
+
+	cd bootfloppy || die
+	docinto bootfloppy
+	for f in bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* ; do
+		[ -f ${f} ] && dodoc ${f}
+	done
+
+	cd ../../ || die
+
+	if [ `has buildpkg ${FEATURES}` -a `has keepwork ${FEATURES}` ]; then
+		cd ${S}
+		# this should install to the ./_install/ dir by default.
+		# we make a micro pkg of busybox that can be used for
+		# embedded systems -solar
+		make install && cd ./_install/ &&
+			tar --no-same-owner -jcvf \
+				${WORKDIR}/${MY_P}-${ARCH}.bz2 . && cd ..
+	fi
+
+	if use savedconfig; then
+		einfo "Saving this build config to /etc/${PN}/${CCHOST}/${PN}-${PV}-${PR}.config"
+		einfo "Read this ebuild for more info on how to take advantage of this option"
+		mkdir -p ${D}/etc/${PN}/${CCHOST}/
+		cp ${S}/.config ${D}/etc/${PN}/${CCHOST}/${PN}-${PV}-${PR}.config
+	fi
+}
+
+pkg_postinst() {
+	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.00_pre6 b/sys-apps/busybox/files/digest-busybox-1.00_pre6
new file mode 100644
index 000000000000..fe70789e9f9e
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.00_pre6
@@ -0,0 +1 @@
+MD5 1c6a2f5d3dad9b661f36ccf6244b13d1 busybox-1.00-pre6.tar.gz 1294012