new busybox snapshot 22.06.2007

fixed bzip2 patch
grep extendet regex support enabled


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1186 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 33 insertions, 17 deletions

diff --git a/tools/busybox-patches/bzip2-payload-1.6.0.diff b/tools/busybox-patches/bzip2-payload-1.6.0.diff
index 0211e20f..1815b285 100644
--- a/tools/busybox-patches/bzip2-payload-1.6.0.diff
+++ b/tools/busybox-patches/bzip2-payload-1.6.0.diff
@@ -38,19 +38,19 @@ diff -ru ./archival/rpm2cpio.c ../busybox-1.6.0/archival/rpm2cpio.c
 -		bb_error_msg_and_die("invalid gzip magic");
 +	if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) {
 +		check_header_gzip_or_die(rpm_fd);
-+		if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) {
++		if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
 +			bb_error_msg("error inflating (gzip)");
 +		}
  	}
 -
 -	check_header_gzip_or_die(rpm_fd);
--	if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) {
+-	if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
 -		bb_error_msg("error inflating");
 +	else if ((magic[0] == 'B') && (magic[1] == 'Z')) {
 +#ifdef CONFIG_FEATURE_RPM2CPIO_BZIP2
 +		/* return to position before magic (eek..!) */
 +		lseek(rpm_fd, -2, SEEK_CUR);
-+		if (uncompressStream(rpm_fd, fileno(stdout)) != 0)
++		if (unpack_bz2_stream(rpm_fd, fileno(stdout)) != 0)
 +			bb_error_msg("error inflating (bzip2)");
 +#else
 +		bb_error_msg_and_die("bzip2 not supported");
diff --git a/tools/busybox.config b/tools/busybox.config
index 0ea3a672..2d68c8da 100644
--- a/tools/busybox.config
+++ b/tools/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.6.0
-# Fri Jun 15 12:17:44 2007
+# Busybox version: 1.7.0.svn
+# Fri Jun 22 18:00:22 2007
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -27,13 +27,13 @@ CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_PIDFILE=y
 CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SYSLOG=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-CONFIG_FEATURE_HAVE_RPC=y
 # CONFIG_SELINUX is not set
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
 
 #
 # Build Options
@@ -69,7 +69,10 @@ CONFIG_PREFIX="./_install"
 #
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=15
@@ -77,6 +80,7 @@ CONFIG_FEATURE_EDITING_HISTORY=15
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+CONFIG_MONOTONIC_SYSCALL=y
 
 #
 # Applets
@@ -98,6 +102,7 @@ CONFIG_GZIP=y
 CONFIG_RPM2CPIO=y
 CONFIG_FEATURE_RPM2CPIO_BZIP2=y
 # CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
@@ -106,6 +111,7 @@ CONFIG_FEATURE_TAR_FROM=y
 CONFIG_FEATURE_TAR_GZIP=y
 # CONFIG_FEATURE_TAR_COMPRESS is not set
 # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
 # CONFIG_UNCOMPRESS is not set
@@ -133,7 +139,6 @@ CONFIG_CHMOD=y
 CONFIG_CHOWN=y
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
-# CONFIG_CMP is not set
 # CONFIG_COMM is not set
 CONFIG_CP=y
 CONFIG_CUT=y
@@ -143,10 +148,6 @@ CONFIG_DD=y
 # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
 # CONFIG_FEATURE_DD_IBS_OBS is not set
 CONFIG_DF=y
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_BINARY is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
 # CONFIG_DIRNAME is not set
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -191,6 +192,8 @@ CONFIG_NICE=y
 # CONFIG_PRINTENV is not set
 CONFIG_PRINTF=y
 # CONFIG_PWD is not set
+# CONFIG_READLINK is not set
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
 # CONFIG_REALPATH is not set
 CONFIG_RM=y
 # CONFIG_RMDIR is not set
@@ -224,7 +227,6 @@ CONFIG_UNIQ=y
 CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
-# CONFIG_WATCH is not set
 CONFIG_WC=y
 # CONFIG_FEATURE_WC_LARGE is not set
 # CONFIG_WHO is not set
@@ -274,8 +276,6 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 #
 # CONFIG_MKTEMP is not set
 # CONFIG_PIPE_PROGRESS is not set
-# CONFIG_READLINK is not set
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
 # CONFIG_RUN_PARTS is not set
 # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
 # CONFIG_FEATURE_RUN_PARTS_FANCY is not set
@@ -289,10 +289,16 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 #
 CONFIG_AWK=y
 # CONFIG_FEATURE_AWK_MATH is not set
+# CONFIG_CMP is not set
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
 # CONFIG_ED is not set
 # CONFIG_PATCH is not set
 CONFIG_SED=y
 CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
@@ -315,6 +321,7 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 # CONFIG_FEATURE_FIND_PERM is not set
 # CONFIG_FEATURE_FIND_TYPE is not set
 # CONFIG_FEATURE_FIND_XDEV is not set
+# CONFIG_FEATURE_FIND_MAXDEPTH is not set
 # CONFIG_FEATURE_FIND_NEWER is not set
 # CONFIG_FEATURE_FIND_INUM is not set
 # CONFIG_FEATURE_FIND_EXEC is not set
@@ -327,8 +334,10 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 # CONFIG_FEATURE_FIND_PRUNE is not set
 # CONFIG_FEATURE_FIND_DELETE is not set
 # CONFIG_FEATURE_FIND_PATH is not set
+# CONFIG_FEATURE_FIND_REGEX is not set
+# CONFIG_FEATURE_FIND_CONTEXT is not set
 CONFIG_GREP=y
-# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 # CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
 # CONFIG_FEATURE_GREP_CONTEXT is not set
 # CONFIG_XARGS is not set
@@ -368,6 +377,7 @@ CONFIG_GREP=y
 # CONFIG_FEATURE_WTMP is not set
 # CONFIG_LOGIN is not set
 # CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_NOLOGIN is not set
 # CONFIG_FEATURE_SECURETTY is not set
 # CONFIG_PASSWD is not set
 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
@@ -442,6 +452,7 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
 # CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 CONFIG_MKSWAP=y
 # CONFIG_FEATURE_MKSWAP_V0 is not set
 # CONFIG_MORE is not set
@@ -503,7 +514,6 @@ CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MOUNTPOINT is not set
 # CONFIG_MT is not set
-CONFIG_NMETER=y
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
 # CONFIG_RUNLEVEL is not set
@@ -584,8 +594,10 @@ CONFIG_FEATURE_IP_TUNNEL=y
 # CONFIG_NSLOOKUP is not set
 CONFIG_PING=y
 # CONFIG_PING6 is not set
+# CONFIG_PSCAN is not set
 CONFIG_FEATURE_FANCY_PING=y
 # CONFIG_ROUTE is not set
+# CONFIG_SLATTACH is not set
 # CONFIG_TELNET is not set
 # CONFIG_FEATURE_TELNET_TTYPE is not set
 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
@@ -622,6 +634,7 @@ CONFIG_FREE=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 # CONFIG_KILLALL5 is not set
+CONFIG_NMETER=y
 # CONFIG_PIDOF is not set
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
 # CONFIG_FEATURE_PIDOF_OMIT is not set
@@ -631,7 +644,10 @@ CONFIG_FEATURE_PS_WIDE=y
 # CONFIG_BB_SYSCTL is not set
 # CONFIG_TOP is not set
 # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
 CONFIG_UPTIME=y
+# CONFIG_WATCH is not set
 
 #
 # Shells
diff --git a/tools/busybox.i586 b/tools/busybox.i586
index daca60b0..5e616581 100755
--- a/tools/busybox.i586
+++ b/tools/busybox.i586