sync with waldi

diff --git a/debian/changelog b/debian/changelog
index 2da1ea0227134f49e9deb1386a2358c51c164c83..992269a2b479fe823fc4c6c4b1a0e560f5e5eef0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+busybox-cvs (0.60.99.cvs20030420-2) unstable; urgency=low
+
+  * archival/tar.c
+    - unlink files first (upstream patch)
+
+ -- Bastian Blank <waldi@debian.org>  Mon, 21 Apr 2003 12:06:57 +0200
+
+busybox-cvs (0.60.99.cvs20030420-1) unstable; urgency=low
+
+  * new cvs version
+  * debian/config*-udeb*
+    - add ifconfig/route for easier transition
+  * debian/config-net-udeb-i386
+    - add logger
+  * debian/config-udeb*
+    - add uniq
+
+ -- Bastian Blank <waldi@debian.org>  Sun, 20 Apr 2003 21:02:58 +0200
+
 busybox-cvs (0.60.99.cvs20030405-1) unstable; urgency=low
 
   * new cvs version

diff --git a/debian/config-net-udeb-i386 b/debian/config-net-udeb-i386
index 15c9b3f1efa6bbb9a3adce3da48a84240fa90ec7..d82fabb94df9fc0eb44cae44b8e9fb0d295395db 100644 (file)
--- a/debian/config-net-udeb-i386
+++ b/debian/config-net-udeb-i386
@@ -169,7 +169,7 @@ CONFIG_GREP=y
 #
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INITRD is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 # CONFIG_HALT is not set
@@ -236,7 +236,12 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_FTPPUT is not set
 # CONFIG_HOSTNAME is not set
 # CONFIG_HTTPD is not set
-# CONFIG_IFCONFIG is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
 # CONFIG_IFUPDOWN is not set
 # CONFIG_INETD is not set
 CONFIG_IP=y
@@ -254,7 +259,7 @@ CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
 # CONFIG_PING is not set
-# CONFIG_ROUTE is not set
+CONFIG_ROUTE=y
 # CONFIG_TELNET is not set
 # CONFIG_TELNETD is not set
 # CONFIG_TFTP is not set
@@ -331,7 +336,7 @@ CONFIG_SYSLOGD=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_KLOGD=y
-# CONFIG_LOGGER is not set
+CONFIG_LOGGER=y
 
 #
 # Linux System Utilities

diff --git a/debian/config-udeb b/debian/config-udeb
index 2799d4b3530a52de39daea5b701264cd02534e6e..be119aa3e26f63a7ec4a0a71d0cf9574e9f672e0 100644 (file)
--- a/debian/config-udeb
+++ b/debian/config-udeb
@@ -126,7 +126,7 @@ CONFIG_TR=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
-# CONFIG_UNIQ is not set
+CONFIG_UNIQ=y
 # CONFIG_USLEEP is not set
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
@@ -201,7 +201,7 @@ CONFIG_GREP=y
 #
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INITRD is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 CONFIG_HALT=y
@@ -257,7 +257,12 @@ CONFIG_USE_BB_PWD_GRP=y
 # CONFIG_FTPPUT is not set
 # CONFIG_HOSTNAME is not set
 # CONFIG_HTTPD is not set
-# CONFIG_IFCONFIG is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
 # CONFIG_IFUPDOWN is not set
 # CONFIG_INETD is not set
 CONFIG_IP=y
@@ -275,7 +280,7 @@ CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
 # CONFIG_PING is not set
-# CONFIG_ROUTE is not set
+CONFIG_ROUTE=y
 # CONFIG_TELNET is not set
 # CONFIG_TELNETD is not set
 # CONFIG_TFTP is not set

diff --git a/debian/config-udeb-i386 b/debian/config-udeb-i386
index 0f2188a1a4c0017159fa86d48690cd32aa59df7d..e12e8c178fe8ce1ecee2b748baf57197a91bbd2e 100644 (file)
--- a/debian/config-udeb-i386
+++ b/debian/config-udeb-i386
@@ -126,7 +126,7 @@ CONFIG_TR=y
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
-# CONFIG_UNIQ is not set
+CONFIG_UNIQ=y
 # CONFIG_USLEEP is not set
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
@@ -201,7 +201,7 @@ CONFIG_GREP=y
 #
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
-CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INITRD is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 CONFIG_HALT=y
@@ -269,7 +269,12 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_FTPPUT is not set
 # CONFIG_HOSTNAME is not set
 # CONFIG_HTTPD is not set
-# CONFIG_IFCONFIG is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
 # CONFIG_IFUPDOWN is not set
 # CONFIG_INETD is not set
 CONFIG_IP=y
@@ -287,7 +292,7 @@ CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
 # CONFIG_PING is not set
-# CONFIG_ROUTE is not set
+CONFIG_ROUTE=y
 # CONFIG_TELNET is not set
 # CONFIG_TELNETD is not set
 # CONFIG_TFTP is not set

diff --git a/libbb/dump.c b/libbb/dump.c
index 03ab9f315553d405001ef5f6cc47eaa1b12fa887..5a43b7c7052b44bb529242aea49dcf0df7931b51 100644 (file)
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -258,7 +258,7 @@ static void rewrite(FS * fs)
                                savech = *p3;
                                *p3 = '\0';
                                if (!(pr->fmt = realloc(pr->fmt, strlen(pr->fmt)+(p3-p2)+1)))
-                                       perror_msg_and_die("hexdump");
+                                       bb_perror_msg_and_die("hexdump");
                                strcat(pr->fmt, p2);
                                *p3 = savech;
                                p2 = p3;