upgrade busybox to 1.4.0

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6204 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 101 insertions, 34 deletions

diff --git a/package/busybox/config/e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/Config.in
index e9ef3dc04..1b83665a9 100644
--- a/package/busybox/config/e2fsprogs/Config.in
+++ b/package/busybox/config/e2fsprogs/Config.in
@@ -11,14 +11,14 @@ config BUSYBOX_CONFIG_CHATTR
 	help
 	  chattr changes the file attributes on a second extended file system.
 
-config BUSYBOX_CONFIG_E2FSCK
-	bool "e2fsck"
-	default n
-	help
-	  e2fsck is used to check Linux second extended file systems (ext2fs).
-	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
-	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
-	  provided.
+### config E2FSCK
+### 	bool "e2fsck"
+### 	default n
+### 	help
+### 	  e2fsck is used to check Linux second extended file systems (ext2fs).
+### 	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+### 	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+### 	  provided.
 
 config BUSYBOX_CONFIG_FSCK
 	bool "fsck"
@@ -34,34 +34,34 @@ config BUSYBOX_CONFIG_LSATTR
 	help
 	  lsattr lists the file attributes on a second extended file system.
 
-config BUSYBOX_CONFIG_MKE2FS
-	bool "mke2fs"
-	default n
-	help
-	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
-	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+### config MKE2FS
+### 	bool "mke2fs"
+### 	default n
+### 	help
+### 	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
+### 	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
 
-config BUSYBOX_CONFIG_TUNE2FS
-	bool "tune2fs"
-	default n
-	help
-	  tune2fs allows the system administrator to adjust various tunable
-	  filesystem parameters on Linux ext2/ext3 filesystems.
+### config TUNE2FS
+### 	bool "tune2fs"
+### 	default n
+### 	help
+### 	  tune2fs allows the system administrator to adjust various tunable
+### 	  filesystem parameters on Linux ext2/ext3 filesystems.
 
-config BUSYBOX_CONFIG_E2LABEL
-	bool "e2label"
-	default n
-	depends on BUSYBOX_CONFIG_TUNE2FS
-	help
-	  e2label will display or change the filesystem label on the ext2
-	  filesystem located on device.
+### config E2LABEL
+### 	bool "e2label"
+### 	default n
+### 	depends on TUNE2FS
+### 	help
+### 	  e2label will display or change the filesystem label on the ext2
+### 	  filesystem located on device.
 
-config BUSYBOX_CONFIG_FINDFS
-	bool "findfs"
-	default n
-	depends on BUSYBOX_CONFIG_TUNE2FS
-	help
-	  findfs will search the disks in the system looking for a filesystem
-	  which has a label matching label or a UUID equal to uuid.
+### config FINDFS
+### 	bool "findfs"
+### 	default n
+### 	depends on TUNE2FS
+### 	help
+### 	  findfs will search the disks in the system looking for a filesystem
+### 	  which has a label matching label or a UUID equal to uuid.
 
 endmenu
diff --git a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
new file mode 100644
index 000000000..e9ef3dc04
--- /dev/null
+++ b/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
@@ -0,0 +1,67 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux Ext2 FS Progs"
+
+config BUSYBOX_CONFIG_CHATTR
+	bool "chattr"
+	default n
+	help
+	  chattr changes the file attributes on a second extended file system.
+
+config BUSYBOX_CONFIG_E2FSCK
+	bool "e2fsck"
+	default n
+	help
+	  e2fsck is used to check Linux second extended file systems (ext2fs).
+	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+	  provided.
+
+config BUSYBOX_CONFIG_FSCK
+	bool "fsck"
+	default n
+	help
+	  fsck is used to check and optionally repair one or more filesystems.
+	  In actuality, fsck is simply a front-end for the various file system
+	  checkers (fsck.fstype) available under Linux.
+
+config BUSYBOX_CONFIG_LSATTR
+	bool "lsattr"
+	default n
+	help
+	  lsattr lists the file attributes on a second extended file system.
+
+config BUSYBOX_CONFIG_MKE2FS
+	bool "mke2fs"
+	default n
+	help
+	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
+	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+
+config BUSYBOX_CONFIG_TUNE2FS
+	bool "tune2fs"
+	default n
+	help
+	  tune2fs allows the system administrator to adjust various tunable
+	  filesystem parameters on Linux ext2/ext3 filesystems.
+
+config BUSYBOX_CONFIG_E2LABEL
+	bool "e2label"
+	default n
+	depends on BUSYBOX_CONFIG_TUNE2FS
+	help
+	  e2label will display or change the filesystem label on the ext2
+	  filesystem located on device.
+
+config BUSYBOX_CONFIG_FINDFS
+	bool "findfs"
+	default n
+	depends on BUSYBOX_CONFIG_TUNE2FS
+	help
+	  findfs will search the disks in the system looking for a filesystem
+	  which has a label matching label or a UUID equal to uuid.
+
+endmenu