Additional busybox stuff. Updates.

3 files changed, 38 insertions, 8 deletions

diff --git a/sys-apps/busybox/busybox-0.60.2.ebuild b/sys-apps/busybox/busybox-0.60.2.ebuild
index 0af707166cbf..75b3ed158ac9 100644
--- a/sys-apps/busybox/busybox-0.60.2.ebuild
+++ b/sys-apps/busybox/busybox-0.60.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.2.ebuild,v 1.1 2001/12/19 15:22:32 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.2.ebuild,v 1.2 2001/12/20 16:03:17 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
@@ -13,6 +13,13 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 	cp ${FILESDIR}/Config.h-${PV}-cd ${S}/Config.h
+	#This is an old patch from the mailing list that it looks like they forgot
+	#to apply.  References:
+	#http://www.google.com/search?q=cache:biJRjMW2U3g:opensource.lineo.com/lists/busybox/2001-July/004023.html+%22bad+identifier%22+busybox&hl=en
+	#This patch has already been applied to their CVS, so it doesn't need to
+	#be reported.
+	cd ${S}
+	patch -p0 < ${FILESDIR}/msh.diff || die
 }
 
 src_compile() {
diff --git a/sys-apps/busybox/files/Config.h-0.60.2-cd b/sys-apps/busybox/files/Config.h-0.60.2-cd
index cce7d3d72b7d..7c794a1c27a9 100644
--- a/sys-apps/busybox/files/Config.h-0.60.2-cd
+++ b/sys-apps/busybox/files/Config.h-0.60.2-cd
@@ -56,7 +56,7 @@
 #define BB_ID
 #define BB_IFCONFIG
 #define BB_INIT
-#define BB_INSMOD
+//#define BB_INSMOD
 #define BB_KILL
 #define BB_KILLALL
 #define BB_KLOGD
@@ -69,7 +69,7 @@
 //#define BB_LOGGER
 //#define BB_LOGNAME
 #define BB_LS
-#define BB_LSMOD
+//#define BB_LSMOD
 //#define BB_MAKEDEVS
 //#define BB_MD5SUM
 #define BB_MKDIR
@@ -78,10 +78,10 @@
 #define BB_MKNOD
 #define BB_MKSWAP
 //#define BB_MKTEMP
-#define BB_MODPROBE
+//#define BB_MODPROBE
 #define BB_MORE
 #define BB_MOUNT
-#define BB_MSH
+//#define BB_MSH
 #define BB_MT
 #define BB_MV
 //#define BB_NC
@@ -100,7 +100,7 @@
 #define BB_RESET
 #define BB_RM
 #define BB_RMDIR
-#define BB_RMMOD
+//#define BB_RMMOD
 #define BB_ROUTE
 //#define BB_RPM2CPIO
 //#define BB_SED
@@ -212,7 +212,7 @@
 #define BB_FEATURE_USE_INITTAB
 //
 //Enable init being called as /linuxrc
-#define BB_FEATURE_LINUXRC
+//#define BB_FEATURE_LINUXRC
 //
 //Have init enable core dumping for child processes (for debugging only) 
 //#define BB_FEATURE_INIT_COREDUMPS
@@ -302,7 +302,7 @@
 //#define BB_FEATURE_FBSET_READMODE
 //
 // Support insmod/lsmod/rmmod for post 2.1 kernels
-#define BB_FEATURE_NEW_MODULE_INTERFACE
+//#define BB_FEATURE_NEW_MODULE_INTERFACE
 //
 // Support insmod/lsmod/rmmod for pre 2.1 kernels
 //#define BB_FEATURE_OLD_MODULE_INTERFACE
diff --git a/sys-apps/busybox/files/msh.diff b/sys-apps/busybox/files/msh.diff
new file mode 100644
index 000000000000..4a48f9c5c2ef
--- /dev/null
+++ b/sys-apps/busybox/files/msh.diff
@@ -0,0 +1,23 @@
+--- msh.c	Wed Dec 19 10:40:39 2001
++++ msh.c	Wed Dec 19 10:42:34 2001
+@@ -3093,11 +3093,19 @@
+ int key;
+ {
+ 	if (*wp != NULL) {
+-		for (; *wp != NULL; wp++)
++		for (; *wp != NULL; wp++) {
++			if (isassign(*wp)) {
++				char *cp;
++				assign(*wp, COPYV);
++				for (cp = *wp; *cp != '='; cp++)
++					;
++				*cp='\0';
++			}
+ 			if (checkname(*wp))
+ 				(*f) (lookup(*wp));
+ 			else
+ 				badid(*wp);
++		}
+ 	} else
+ 		putvlist(key, 1);
+ }