Sync with 20030104-2 cvs package, disable fdisk BSD label as they dont

compile on m68k


git-svn-id: svn://busybox.net/trunk/busybox@6266 69ca8d6d-28ef-0310-b511-8ec308f3f277

4 files changed, 84 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index 2d030bce2..338857da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+busybox-cvs (0.60.99.cvs20030104-2) unstable; urgency=low
+
+  * floppy-retriever needs the cut command in the udeb 
+
+ -- Glenn McGrath <bug1@debian.org>  Sat,  4 Jan 2003 17:13:05 +1100
+
+busybox-cvs (0.60.99.cvs20030104-1) unstable; urgency=low
+
+  * new cvs version
+  * Include new applets in the static package
+  * Include ash in the udeb
+
+ -- Glenn McGrath <bug1@debian.org>  Sat,  4 Jan 2003 13:39:04 +1100
+
 busybox-cvs (0.60.99.cvs20021214-1) unstable; urgency=low
 
   * new cvs version
diff --git a/debian/config-static b/debian/config-static
index 2660761b7..9b215175a 100644
--- a/debian/config-static
+++ b/debian/config-static
@@ -21,7 +21,7 @@ CONFIG_FEATURE_DEVPTS=y
 # Build Options
 #
 DOSTATIC=y
-# DOLFS is not set
+DOLFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -41,7 +41,7 @@ CONFIG_GUNZIP=y
 CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
 CONFIG_GZIP=y
 CONFIG_RPM2CPIO=y
-# CONFIG_RPM is not set
+CONFIG_RPM=y
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
@@ -208,8 +208,8 @@ CONFIG_WATCHDOG=y
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
 CONFIG_HOSTNAME=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -221,19 +221,35 @@ CONFIG_IFUPDOWN=y
 CONFIG_FEATURE_IFUPDOWN_IPV4=y
 CONFIG_FEATURE_IFUPDOWN_IPV6=y
 CONFIG_FEATURE_IFUPDOWN_IPX=y
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
 CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
+
+#
+#   address (forced enabled for ipaddr)
+#
 CONFIG_FEATURE_IP_LINK=y
+
+#
+#   link (forced enabled for iplink)
+#
 CONFIG_FEATURE_IP_ROUTE=y
+
+#
+#   route (forced enabled for iproute)
+#
 CONFIG_FEATURE_IP_TUNNEL=y
+
+#
+#   tunnel (forced enabled for iptunnel)
+#
 CONFIG_IPCALC=y
 CONFIG_FEATURE_IPCALC_FANCY=y
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_NAMEIF=y
 CONFIG_NC=y
 CONFIG_NETSTAT=y
 CONFIG_NSLOOKUP=y
@@ -311,7 +327,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # Bourne Shell Options
 #
 CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
 CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
 CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
 CONFIG_FEATURE_COMMAND_HISTORY=15
@@ -400,7 +416,12 @@ CONFIG_FBSET=y
 CONFIG_FEATURE_FBSET_FANCY=y
 CONFIG_FEATURE_FBSET_READMODE=y
 CONFIG_FDFLUSH=y
-# CONFIG_FDISK is not set
+CONFIG_FDISK=y
+CONFIG_FEATURE_AIX_LABEL=y
+CONFIG_FEATURE_SGI_LABEL=y
+CONFIG_FEATURE_SUN_LABEL=y
+# CONFIG_FEATURE_OSF_LABEL is not set
+CONFIG_FEATURE_FDISK_ADVANCED=y
 CONFIG_FREERAMDISK=y
 CONFIG_FSCK_MINIX=y
 CONFIG_MKFS_MINIX=y
diff --git a/debian/config-udeb b/debian/config-udeb
index 2f5917053..ccf57207e 100644
--- a/debian/config-udeb
+++ b/debian/config-udeb
@@ -245,17 +245,45 @@ CONFIG_PS=y
 #
 # Another Bourne-like Shell
 #
-# CONFIG_FEATURE_SH_IS_ASH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_LASH is not set
 # CONFIG_FEATURE_SH_IS_MSH is not set
-CONFIG_FEATURE_SH_IS_NONE=y
-# CONFIG_ASH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# ash (forced enabled as default shell)
+#
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_HUSH is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
 
 #
+# Bourne Shell Options
+#
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+CONFIG_FEATURE_SH_STANDALONE_SHELL=y
+# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
 # Shell Utilities
 #
 CONFIG_BASENAME=y
@@ -278,6 +306,10 @@ CONFIG_REALPATH=y
 # CONFIG_TEE is not set
 CONFIG_TRUE=y
 CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
 # CONFIG_USLEEP is not set
@@ -300,7 +332,7 @@ CONFIG_SYSLOGD=y
 #
 CONFIG_CAT=y
 # CONFIG_CMP is not set
-# CONFIG_CUT is not set
+CONFIG_CUT=y
 # CONFIG_DOS2UNIX is not set
 CONFIG_HEAD=y
 # CONFIG_LENGTH is not set
diff --git a/debian/control b/debian/control
index 4cc618a7f..ae1aee551 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: busybox-cvs
 Priority: optional
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Erik Andersen <andersee@debian.org>, Bastian Blank <waldi@debian.org>, Tollef Fog Heen <tfheen@debian.org>
+Uploaders: Erik Andersen <andersee@debian.org>, Bastian Blank <waldi@debian.org>, Tollef Fog Heen <tfheen@debian.org>, Glenn McGrath <bug1@debian.org>
 Build-Depends: debhelper (>= 2.1.18)
 Standards-Version: 3.5.7.0