sync with waldi

This commit is contained in:
Glenn L McGrath 2003-04-21 10:26:39 +00:00
parent 35a5b08eee
commit 923dd79af7
5 changed files with 47 additions and 13 deletions

19
debian/changelog vendored
View File

@ -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

View File

@ -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

13
debian/config-udeb vendored
View File

@ -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

View File

@ -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

View File

@ -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;