aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog117
-rw-r--r--debian/config-deb17
-rw-r--r--debian/config-static40
-rw-r--r--debian/config-udeb25
-rw-r--r--debian/control5
5 files changed, 159 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index 992269a2b..bc918a129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,122 @@
1busybox-cvs (0.60.99.cvs20030420-2) unstable; urgency=low 1busybox-cvs (0.60.99.cvs20030819-2) unstable; urgency=low
2
3 * Fix configure permisions
4 * Set source Section to embedded
5
6 -- Glenn McGrath <bug1@debian.org> Mon, 25 Aug 2003 06:33:19 +0000
7
8busybox-cvs (0.60.99.cvs20030819-1) unstable; urgency=low
9
10 * new cvs version
11
12 -- Bastian Blank <waldi@debian.org> Tue, 19 Aug 2003 13:18:54 +0200
13
14busybox-cvs (0.60.99.cvs20030426-10) unstable; urgency=low
15
16 * archival/libunarchive/*
17 - add hardlink support (pending)
18 * debian/config-*udeb*
19 - add support for oldgnu tar format
20
21 -- Bastian Blank <waldi@debian.org> Tue, 10 Jun 2003 12:06:41 +0200
22
23busybox-cvs (0.60.99.cvs20030426-9) unstable; urgency=low
24
25 * modutils/depmod.c
26 - fix base_dir for modules.dep
27
28 -- Bastian Blank <waldi@debian.org> Sat, 07 Jun 2003 14:52:54 +0200
2 29
30busybox-cvs (0.60.99.cvs20030426-8) unstable; urgency=low
31
32 * util-linux/fdisk.c
33 - fix syscalls. (pending)
34 * libpwd/*
35 - don't build setgroups.o
36
37 -- Bastian Blank <waldi@debian.org> Tue, 03 Jun 2003 11:26:28 +0200
38
39busybox-cvs (0.60.99.cvs20030426-7) unstable; urgency=low
40
41 * libbb/*syscallc.c
42 - fix syscalls. (upstream) (closes: #194631)
43 * modutils/*
44 - update complete objects code from upstream. (pending)
45 * debian/config-*udeb*
46 - update to busybox-applets.txt:1.14
47
48 -- Bastian Blank <waldi@debian.org> Thu, 29 May 2003 16:17:14 +0200
49
50busybox-cvs (0.60.99.cvs20030426-6) unstable; urgency=low
51
52 * modutils/Makefile.in
53 - don't build anything if deactivated
54
55 -- Bastian Blank <waldi@debian.org> Sat, 24 May 2003 18:57:14 +0200
56
57busybox-cvs (0.60.99.cvs20030426-5) unstable; urgency=low
58
59 * debian/config-*udeb*
60 - revert changes (closes: #192717, #192753)
61 - readd initrd support (workaround)
62 - make init quiet
3 * archival/tar.c 63 * archival/tar.c
64 - fix usage of tar -O (upstream) (closes: #193788)
65
66 -- Bastian Blank <waldi@debian.org> Sat, 24 May 2003 13:25:36 +0200
67
68busybox-cvs (0.60.99.cvs20030426-4) unstable; urgency=low
69
70 * debian/config-*udeb*
71 - update to busybox-applets.txt:1.12
72 * debian/rules
73 - use system instead of arch to determine which config file to use
74
75 -- Bastian Blank <waldi@debian.org> Fri, 09 May 2003 11:21:13 +0200
76
77busybox-cvs (0.60.99.cvs20030426-3) unstable; urgency=low
78
79 * debian/config-udeb*
80 - update to busybox-applets.txt:1.11
81
82 -- Bastian Blank <waldi@debian.org> Wed, 07 May 2003 10:37:40 +0200
83
84busybox-cvs (0.60.99.cvs20030426-2) unstable; urgency=low
85
86 * modutils/*
87 - modprobe failes gracefully if the module is already loaded. (pending)
88 - implement depmod. (pending)
89 * debian/config*
90 - update
91
92 -- Bastian Blank <waldi@debian.org> Wed, 30 Apr 2003 14:12:36 +0200
93
94busybox-cvs (0.60.99.cvs20030426-1) unstable; urgency=low
95
96 * new cvs version
97
98 -- Bastian Blank <waldi@debian.org> Sat, 26 Apr 2003 18:33:17 +0200
99
100busybox-cvs (0.60.99.cvs20030420-4) unstable; urgency=low
101
102 * network/libiproute/iproute.c
103 - fix usage of ip route flush (upstream)
104
105 -- Bastian Blank <waldi@debian.org> Fri, 25 Apr 2003 16:48:43 +0200
106
107busybox-cvs (0.60.99.cvs20030420-3) unstable; urgency=low
108
109 * debian/config-*udeb*
110 - update to busybox-applets.txt:1.10
111
112 -- Bastian Blank <waldi@debian.org> Fri, 25 Apr 2003 14:03:23 +0200
113
114busybox-cvs (0.60.99.cvs20030420-2) unstable; urgency=low
115
116 * archival/tar.c, archival/libunarchive/data_extract_all.c
4 - unlink files first (upstream patch) 117 - unlink files first (upstream patch)
5 118
6 -- Bastian Blank <waldi@debian.org> Mon, 21 Apr 2003 12:06:57 +0200 119 -- Bastian Blank <waldi@debian.org> Mon, 21 Apr 2003 12:42:06 +0200
7 120
8busybox-cvs (0.60.99.cvs20030420-1) unstable; urgency=low 121busybox-cvs (0.60.99.cvs20030420-1) unstable; urgency=low
9 122
diff --git a/debian/config-deb b/debian/config-deb
index 4d63e690f..0ccc66829 100644
--- a/debian/config-deb
+++ b/debian/config-deb
@@ -16,6 +16,7 @@ CONFIG_FEATURE_INSTALLER=y
16# CONFIG_FEATURE_DEVPTS is not set 16# CONFIG_FEATURE_DEVPTS is not set
17# CONFIG_FEATURE_CLEAN_UP is not set 17# CONFIG_FEATURE_CLEAN_UP is not set
18# CONFIG_FEATURE_SUID is not set 18# CONFIG_FEATURE_SUID is not set
19# CONFIG_SELINUX is not set
19 20
20# 21#
21# Build Options 22# Build Options
@@ -80,6 +81,7 @@ CONFIG_FEATURE_FANCY_ECHO=y
80# CONFIG_ENV is not set 81# CONFIG_ENV is not set
81CONFIG_EXPR=y 82CONFIG_EXPR=y
82CONFIG_FALSE=y 83CONFIG_FALSE=y
84# CONFIG_FOLD is not set
83CONFIG_HEAD=y 85CONFIG_HEAD=y
84# CONFIG_FEATURE_FANCY_HEAD is not set 86# CONFIG_FEATURE_FANCY_HEAD is not set
85# CONFIG_HOSTID is not set 87# CONFIG_HOSTID is not set
@@ -107,6 +109,7 @@ CONFIG_PWD=y
107CONFIG_RM=y 109CONFIG_RM=y
108CONFIG_RMDIR=y 110CONFIG_RMDIR=y
109# CONFIG_SHA1SUM is not set 111# CONFIG_SHA1SUM is not set
112# CONFIG_FEATURE_SHA1SUM_CHECK is not set
110CONFIG_SLEEP=y 113CONFIG_SLEEP=y
111# CONFIG_FEATURE_FANCY_SLEEP is not set 114# CONFIG_FEATURE_FANCY_SLEEP is not set
112CONFIG_SORT=y 115CONFIG_SORT=y
@@ -168,12 +171,14 @@ CONFIG_RESET=y
168# CONFIG_MKTEMP is not set 171# CONFIG_MKTEMP is not set
169# CONFIG_READLINK is not set 172# CONFIG_READLINK is not set
170# CONFIG_RUN_PARTS is not set 173# CONFIG_RUN_PARTS is not set
174# CONFIG_START_STOP_DAEMON is not set
171CONFIG_WHICH=y 175CONFIG_WHICH=y
172 176
173# 177#
174# Editors 178# Editors
175# 179#
176# CONFIG_AWK is not set 180# CONFIG_AWK is not set
181# CONFIG_PATCH is not set
177CONFIG_SED=y 182CONFIG_SED=y
178# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set 183# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
179# CONFIG_VI is not set 184# CONFIG_VI is not set
@@ -190,6 +195,7 @@ CONFIG_FEATURE_FIND_NEWER=y
190CONFIG_FEATURE_FIND_INUM=y 195CONFIG_FEATURE_FIND_INUM=y
191CONFIG_GREP=y 196CONFIG_GREP=y
192# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set 197# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
198CONFIG_FEATURE_GREP_FGREP_ALIAS=y
193# CONFIG_FEATURE_GREP_CONTEXT is not set 199# CONFIG_FEATURE_GREP_CONTEXT is not set
194# CONFIG_XARGS is not set 200# CONFIG_XARGS is not set
195 201
@@ -204,7 +210,6 @@ CONFIG_FEATURE_INITRD=y
204CONFIG_HALT=y 210CONFIG_HALT=y
205CONFIG_POWEROFF=y 211CONFIG_POWEROFF=y
206CONFIG_REBOOT=y 212CONFIG_REBOOT=y
207# CONFIG_START_STOP_DAEMON is not set
208# CONFIG_MESG is not set 213# CONFIG_MESG is not set
209 214
210# 215#
@@ -229,17 +234,18 @@ CONFIG_REBOOT=y
229# CONFIG_CROND is not set 234# CONFIG_CROND is not set
230# CONFIG_CRONTAB is not set 235# CONFIG_CRONTAB is not set
231# CONFIG_DC is not set 236# CONFIG_DC is not set
232# CONFIG_DUTMP is not set 237# CONFIG_LAST is not set
238# CONFIG_HDPARM is not set
233# CONFIG_MAKEDEVS is not set 239# CONFIG_MAKEDEVS is not set
234# CONFIG_MT is not set 240# CONFIG_MT is not set
235# CONFIG_STRINGS is not set 241# CONFIG_STRINGS is not set
236# CONFIG_TIME is not set 242# CONFIG_TIME is not set
237# CONFIG_UPDATE is not set
238# CONFIG_WATCHDOG is not set 243# CONFIG_WATCHDOG is not set
239 244
240# 245#
241# Linux Module Utilities 246# Linux Module Utilities
242# 247#
248# CONFIG_DEPMOD is not set
243# CONFIG_INSMOD is not set 249# CONFIG_INSMOD is not set
244# CONFIG_LSMOD is not set 250# CONFIG_LSMOD is not set
245# CONFIG_MODPROBE is not set 251# CONFIG_MODPROBE is not set
@@ -330,6 +336,7 @@ CONFIG_LOGGER=y
330CONFIG_DMESG=y 336CONFIG_DMESG=y
331# CONFIG_FBSET is not set 337# CONFIG_FBSET is not set
332# CONFIG_FDFLUSH is not set 338# CONFIG_FDFLUSH is not set
339# CONFIG_FDFORMAT is not set
333# CONFIG_FDISK is not set 340# CONFIG_FDISK is not set
334# CONFIG_FREERAMDISK is not set 341# CONFIG_FREERAMDISK is not set
335# CONFIG_FSCK_MINIX is not set 342# CONFIG_FSCK_MINIX is not set
@@ -341,10 +348,6 @@ CONFIG_LOSETUP=y
341CONFIG_MKSWAP=y 348CONFIG_MKSWAP=y
342CONFIG_MORE=y 349CONFIG_MORE=y
343CONFIG_FEATURE_USE_TERMIOS=y 350CONFIG_FEATURE_USE_TERMIOS=y
344
345#
346# Common options for ls and more
347#
348# CONFIG_PIVOT_ROOT is not set 351# CONFIG_PIVOT_ROOT is not set
349# CONFIG_RDATE is not set 352# CONFIG_RDATE is not set
350CONFIG_SWAPONOFF=y 353CONFIG_SWAPONOFF=y
diff --git a/debian/config-static b/debian/config-static
index 454bbf25d..233822c16 100644
--- a/debian/config-static
+++ b/debian/config-static
@@ -16,6 +16,7 @@ CONFIG_FEATURE_DEVFS=y
16CONFIG_FEATURE_DEVPTS=y 16CONFIG_FEATURE_DEVPTS=y
17# CONFIG_FEATURE_CLEAN_UP is not set 17# CONFIG_FEATURE_CLEAN_UP is not set
18# CONFIG_FEATURE_SUID is not set 18# CONFIG_FEATURE_SUID is not set
19# CONFIG_SELINUX is not set
19 20
20# 21#
21# Build Options 22# Build Options
@@ -53,7 +54,7 @@ CONFIG_FEATURE_TAR_CREATE=y
53CONFIG_FEATURE_TAR_BZIP2=y 54CONFIG_FEATURE_TAR_BZIP2=y
54CONFIG_FEATURE_TAR_EXCLUDE=y 55CONFIG_FEATURE_TAR_EXCLUDE=y
55CONFIG_FEATURE_TAR_GZIP=y 56CONFIG_FEATURE_TAR_GZIP=y
56# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set 57CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
57CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y 58CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
58CONFIG_FEATURE_UNARCHIVE_TAPE=y 59CONFIG_FEATURE_UNARCHIVE_TAPE=y
59CONFIG_UNCOMPRESS=y 60CONFIG_UNCOMPRESS=y
@@ -82,6 +83,7 @@ CONFIG_DD=y
82CONFIG_DF=y 83CONFIG_DF=y
83CONFIG_DIRNAME=y 84CONFIG_DIRNAME=y
84CONFIG_DOS2UNIX=y 85CONFIG_DOS2UNIX=y
86CONFIG_UNIX2DOS=y
85CONFIG_DU=y 87CONFIG_DU=y
86CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y 88CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
87CONFIG_ECHO=y 89CONFIG_ECHO=y
@@ -89,8 +91,9 @@ CONFIG_FEATURE_FANCY_ECHO=y
89CONFIG_ENV=y 91CONFIG_ENV=y
90CONFIG_EXPR=y 92CONFIG_EXPR=y
91CONFIG_FALSE=y 93CONFIG_FALSE=y
94CONFIG_FOLD=y
92CONFIG_HEAD=y 95CONFIG_HEAD=y
93# CONFIG_FEATURE_FANCY_HEAD is not set 96CONFIG_FEATURE_FANCY_HEAD=y
94CONFIG_HOSTID=y 97CONFIG_HOSTID=y
95CONFIG_ID=y 98CONFIG_ID=y
96CONFIG_LENGTH=y 99CONFIG_LENGTH=y
@@ -112,12 +115,13 @@ CONFIG_MV=y
112CONFIG_OD=y 115CONFIG_OD=y
113CONFIG_PRINTF=y 116CONFIG_PRINTF=y
114CONFIG_PWD=y 117CONFIG_PWD=y
115# CONFIG_REALPATH is not set 118CONFIG_REALPATH=y
116CONFIG_RM=y 119CONFIG_RM=y
117CONFIG_RMDIR=y 120CONFIG_RMDIR=y
118# CONFIG_SHA1SUM is not set 121CONFIG_SHA1SUM=y
122CONFIG_FEATURE_SHA1SUM_CHECK=y
119CONFIG_SLEEP=y 123CONFIG_SLEEP=y
120# CONFIG_FEATURE_FANCY_SLEEP is not set 124CONFIG_FEATURE_FANCY_SLEEP=y
121CONFIG_SORT=y 125CONFIG_SORT=y
122CONFIG_FEATURE_SORT_REVERSE=y 126CONFIG_FEATURE_SORT_REVERSE=y
123CONFIG_FEATURE_SORT_UNIQUE=y 127CONFIG_FEATURE_SORT_UNIQUE=y
@@ -126,7 +130,7 @@ CONFIG_SYNC=y
126CONFIG_TAIL=y 130CONFIG_TAIL=y
127CONFIG_FEATURE_FANCY_TAIL=y 131CONFIG_FEATURE_FANCY_TAIL=y
128CONFIG_TEE=y 132CONFIG_TEE=y
129# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set 133CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
130CONFIG_TEST=y 134CONFIG_TEST=y
131 135
132# 136#
@@ -182,6 +186,7 @@ CONFIG_SETKEYCODES=y
182CONFIG_MKTEMP=y 186CONFIG_MKTEMP=y
183CONFIG_READLINK=y 187CONFIG_READLINK=y
184CONFIG_RUN_PARTS=y 188CONFIG_RUN_PARTS=y
189CONFIG_START_STOP_DAEMON=y
185CONFIG_WHICH=y 190CONFIG_WHICH=y
186 191
187# 192#
@@ -189,6 +194,7 @@ CONFIG_WHICH=y
189# 194#
190CONFIG_AWK=y 195CONFIG_AWK=y
191CONFIG_FEATURE_AWK_MATH=y 196CONFIG_FEATURE_AWK_MATH=y
197CONFIG_PATCH=y
192CONFIG_SED=y 198CONFIG_SED=y
193# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set 199# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
194CONFIG_VI=y 200CONFIG_VI=y
@@ -215,6 +221,7 @@ CONFIG_FEATURE_FIND_NEWER=y
215CONFIG_FEATURE_FIND_INUM=y 221CONFIG_FEATURE_FIND_INUM=y
216CONFIG_GREP=y 222CONFIG_GREP=y
217CONFIG_FEATURE_GREP_EGREP_ALIAS=y 223CONFIG_FEATURE_GREP_EGREP_ALIAS=y
224CONFIG_FEATURE_GREP_FGREP_ALIAS=y
218CONFIG_FEATURE_GREP_CONTEXT=y 225CONFIG_FEATURE_GREP_CONTEXT=y
219CONFIG_XARGS=y 226CONFIG_XARGS=y
220 227
@@ -229,7 +236,6 @@ CONFIG_FEATURE_INITRD=y
229CONFIG_HALT=y 236CONFIG_HALT=y
230CONFIG_POWEROFF=y 237CONFIG_POWEROFF=y
231CONFIG_REBOOT=y 238CONFIG_REBOOT=y
232CONFIG_START_STOP_DAEMON=y
233CONFIG_MESG=y 239CONFIG_MESG=y
234 240
235# 241#
@@ -259,14 +265,15 @@ CONFIG_USE_BB_SHADOW=y
259# 265#
260CONFIG_ADJTIMEX=y 266CONFIG_ADJTIMEX=y
261CONFIG_CROND=y 267CONFIG_CROND=y
268CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
262CONFIG_CRONTAB=y 269CONFIG_CRONTAB=y
263CONFIG_DC=y 270CONFIG_DC=y
264CONFIG_DUTMP=y 271CONFIG_LAST=y
272# CONFIG_HDPARM is not set
265CONFIG_MAKEDEVS=y 273CONFIG_MAKEDEVS=y
266CONFIG_MT=y 274CONFIG_MT=y
267CONFIG_STRINGS=y 275CONFIG_STRINGS=y
268CONFIG_TIME=y 276CONFIG_TIME=y
269CONFIG_UPDATE=y
270CONFIG_WATCHDOG=y 277CONFIG_WATCHDOG=y
271 278
272# 279#
@@ -288,11 +295,11 @@ CONFIG_HOSTNAME=y
288CONFIG_HTTPD=y 295CONFIG_HTTPD=y
289# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set 296# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
290CONFIG_FEATURE_HTTPD_BASIC_AUTH=y 297CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
291# CONFIG_FEATURE_HTTPD_CGI is not set 298# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
292# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set 299# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
293# CONFIG_FEATURE_HTTPD_SETUID is not set 300# CONFIG_FEATURE_HTTPD_SETUID is not set
294# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set 301# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
295# CONFIG_FEATURE_HTTPD_DECODE_URL_STR is not set 302# CONFIG_FEATURE_HTTPD_CGI is not set
296# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set 303# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
297CONFIG_IFCONFIG=y 304CONFIG_IFCONFIG=y
298CONFIG_FEATURE_IFCONFIG_STATUS=y 305CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -302,6 +309,7 @@ CONFIG_FEATURE_IFCONFIG_HW=y
302CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y 309CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
303CONFIG_IFUPDOWN=y 310CONFIG_IFUPDOWN=y
304# CONFIG_FEATURE_IFUPDOWN_IP is not set 311# CONFIG_FEATURE_IFUPDOWN_IP is not set
312CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
305CONFIG_FEATURE_IFUPDOWN_IPV4=y 313CONFIG_FEATURE_IFUPDOWN_IPV4=y
306CONFIG_FEATURE_IFUPDOWN_IPV6=y 314CONFIG_FEATURE_IFUPDOWN_IPV6=y
307CONFIG_FEATURE_IFUPDOWN_IPX=y 315CONFIG_FEATURE_IFUPDOWN_IPX=y
@@ -354,7 +362,6 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y
354CONFIG_FEATURE_TFTP_DEBUG=y 362CONFIG_FEATURE_TFTP_DEBUG=y
355CONFIG_TRACEROUTE=y 363CONFIG_TRACEROUTE=y
356CONFIG_FEATURE_TRACEROUTE_VERBOSE=y 364CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
357CONFIG_FEATURE_TRACEROUTE_SO_DEBUG=y
358# CONFIG_VCONFIG is not set 365# CONFIG_VCONFIG is not set
359CONFIG_WGET=y 366CONFIG_WGET=y
360CONFIG_FEATURE_WGET_STATUSBAR=y 367CONFIG_FEATURE_WGET_STATUSBAR=y
@@ -393,10 +400,6 @@ CONFIG_FEATURE_SH_IS_ASH=y
393CONFIG_ASH=y 400CONFIG_ASH=y
394 401
395# 402#
396# ash (forced enabled as default shell)
397#
398
399#
400# Ash Shell Options 403# Ash Shell Options
401# 404#
402CONFIG_ASH_JOB_CONTROL=y 405CONFIG_ASH_JOB_CONTROL=y
@@ -441,6 +444,7 @@ CONFIG_FBSET=y
441CONFIG_FEATURE_FBSET_FANCY=y 444CONFIG_FEATURE_FBSET_FANCY=y
442CONFIG_FEATURE_FBSET_READMODE=y 445CONFIG_FEATURE_FBSET_READMODE=y
443CONFIG_FDFLUSH=y 446CONFIG_FDFLUSH=y
447# CONFIG_FDFORMAT is not set
444CONFIG_FDISK=y 448CONFIG_FDISK=y
445CONFIG_FEATURE_FDISK_WRITABLE=y 449CONFIG_FEATURE_FDISK_WRITABLE=y
446CONFIG_FEATURE_AIX_LABEL=y 450CONFIG_FEATURE_AIX_LABEL=y
@@ -464,10 +468,6 @@ CONFIG_LOSETUP=y
464CONFIG_MKSWAP=y 468CONFIG_MKSWAP=y
465CONFIG_MORE=y 469CONFIG_MORE=y
466CONFIG_FEATURE_USE_TERMIOS=y 470CONFIG_FEATURE_USE_TERMIOS=y
467
468#
469# Common options for ls and more
470#
471CONFIG_PIVOT_ROOT=y 471CONFIG_PIVOT_ROOT=y
472CONFIG_RDATE=y 472CONFIG_RDATE=y
473CONFIG_SWAPONOFF=y 473CONFIG_SWAPONOFF=y
diff --git a/debian/config-udeb b/debian/config-udeb
index b78c6a583..967961122 100644
--- a/debian/config-udeb
+++ b/debian/config-udeb
@@ -16,6 +16,7 @@ CONFIG_FEATURE_DEVFS=y
16CONFIG_FEATURE_DEVPTS=y 16CONFIG_FEATURE_DEVPTS=y
17# CONFIG_FEATURE_CLEAN_UP is not set 17# CONFIG_FEATURE_CLEAN_UP is not set
18# CONFIG_FEATURE_SUID is not set 18# CONFIG_FEATURE_SUID is not set
19# CONFIG_SELINUX is not set
19 20
20# 21#
21# Build Options 22# Build Options
@@ -50,7 +51,7 @@ CONFIG_TAR=y
50# CONFIG_FEATURE_TAR_BZIP2 is not set 51# CONFIG_FEATURE_TAR_BZIP2 is not set
51# CONFIG_FEATURE_TAR_EXCLUDE is not set 52# CONFIG_FEATURE_TAR_EXCLUDE is not set
52CONFIG_FEATURE_TAR_GZIP=y 53CONFIG_FEATURE_TAR_GZIP=y
53# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set 54CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
54CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y 55CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
55# CONFIG_FEATURE_UNARCHIVE_TAPE is not set 56# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
56# CONFIG_UNCOMPRESS is not set 57# CONFIG_UNCOMPRESS is not set
@@ -80,6 +81,7 @@ CONFIG_FEATURE_FANCY_ECHO=y
80CONFIG_ENV=y 81CONFIG_ENV=y
81CONFIG_EXPR=y 82CONFIG_EXPR=y
82CONFIG_FALSE=y 83CONFIG_FALSE=y
84# CONFIG_FOLD is not set
83CONFIG_HEAD=y 85CONFIG_HEAD=y
84# CONFIG_FEATURE_FANCY_HEAD is not set 86# CONFIG_FEATURE_FANCY_HEAD is not set
85# CONFIG_HOSTID is not set 87# CONFIG_HOSTID is not set
@@ -101,7 +103,7 @@ CONFIG_MKDIR=y
101CONFIG_MKNOD=y 103CONFIG_MKNOD=y
102CONFIG_MV=y 104CONFIG_MV=y
103# CONFIG_OD is not set 105# CONFIG_OD is not set
104# CONFIG_PRINTF is not set 106CONFIG_PRINTF=y
105CONFIG_PWD=y 107CONFIG_PWD=y
106CONFIG_REALPATH=y 108CONFIG_REALPATH=y
107CONFIG_RM=y 109CONFIG_RM=y
@@ -171,12 +173,14 @@ CONFIG_FEATURE_HUMAN_READABLE=y
171# CONFIG_MKTEMP is not set 173# CONFIG_MKTEMP is not set
172CONFIG_READLINK=y 174CONFIG_READLINK=y
173# CONFIG_RUN_PARTS is not set 175# CONFIG_RUN_PARTS is not set
176# CONFIG_START_STOP_DAEMON is not set
174# CONFIG_WHICH is not set 177# CONFIG_WHICH is not set
175 178
176# 179#
177# Editors 180# Editors
178# 181#
179# CONFIG_AWK is not set 182# CONFIG_AWK is not set
183# CONFIG_PATCH is not set
180CONFIG_SED=y 184CONFIG_SED=y
181# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set 185# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
182# CONFIG_VI is not set 186# CONFIG_VI is not set
@@ -193,6 +197,7 @@ CONFIG_FEATURE_FIND_NEWER=y
193CONFIG_FEATURE_FIND_INUM=y 197CONFIG_FEATURE_FIND_INUM=y
194CONFIG_GREP=y 198CONFIG_GREP=y
195# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set 199# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
200# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
196# CONFIG_FEATURE_GREP_CONTEXT is not set 201# CONFIG_FEATURE_GREP_CONTEXT is not set
197# CONFIG_XARGS is not set 202# CONFIG_XARGS is not set
198 203
@@ -201,13 +206,12 @@ CONFIG_GREP=y
201# 206#
202CONFIG_INIT=y 207CONFIG_INIT=y
203CONFIG_FEATURE_USE_INITTAB=y 208CONFIG_FEATURE_USE_INITTAB=y
204# CONFIG_FEATURE_INITRD is not set 209CONFIG_FEATURE_INITRD=y
205# CONFIG_FEATURE_INIT_COREDUMPS is not set 210# CONFIG_FEATURE_INIT_COREDUMPS is not set
206# CONFIG_FEATURE_EXTRA_QUIET is not set 211# CONFIG_FEATURE_EXTRA_QUIET is not set
207CONFIG_HALT=y 212CONFIG_HALT=y
208# CONFIG_POWEROFF is not set 213# CONFIG_POWEROFF is not set
209CONFIG_REBOOT=y 214CONFIG_REBOOT=y
210# CONFIG_START_STOP_DAEMON is not set
211# CONFIG_MESG is not set 215# CONFIG_MESG is not set
212 216
213# 217#
@@ -232,12 +236,12 @@ CONFIG_USE_BB_PWD_GRP=y
232# CONFIG_CROND is not set 236# CONFIG_CROND is not set
233# CONFIG_CRONTAB is not set 237# CONFIG_CRONTAB is not set
234# CONFIG_DC is not set 238# CONFIG_DC is not set
235# CONFIG_DUTMP is not set 239# CONFIG_LAST is not set
240# CONFIG_HDPARM is not set
236# CONFIG_MAKEDEVS is not set 241# CONFIG_MAKEDEVS is not set
237# CONFIG_MT is not set 242# CONFIG_MT is not set
238# CONFIG_STRINGS is not set 243# CONFIG_STRINGS is not set
239# CONFIG_TIME is not set 244# CONFIG_TIME is not set
240# CONFIG_UPDATE is not set
241# CONFIG_WATCHDOG is not set 245# CONFIG_WATCHDOG is not set
242 246
243# 247#
@@ -321,10 +325,6 @@ CONFIG_FEATURE_SH_IS_ASH=y
321CONFIG_ASH=y 325CONFIG_ASH=y
322 326
323# 327#
324# ash (forced enabled as default shell)
325#
326
327#
328# Ash Shell Options 328# Ash Shell Options
329# 329#
330# CONFIG_ASH_JOB_CONTROL is not set 330# CONFIG_ASH_JOB_CONTROL is not set
@@ -366,6 +366,7 @@ CONFIG_LOGGER=y
366CONFIG_DMESG=y 366CONFIG_DMESG=y
367# CONFIG_FBSET is not set 367# CONFIG_FBSET is not set
368# CONFIG_FDFLUSH is not set 368# CONFIG_FDFLUSH is not set
369# CONFIG_FDFORMAT is not set
369# CONFIG_FDISK is not set 370# CONFIG_FDISK is not set
370# CONFIG_FREERAMDISK is not set 371# CONFIG_FREERAMDISK is not set
371# CONFIG_FSCK_MINIX is not set 372# CONFIG_FSCK_MINIX is not set
@@ -377,10 +378,6 @@ CONFIG_DMESG=y
377CONFIG_MKSWAP=y 378CONFIG_MKSWAP=y
378CONFIG_MORE=y 379CONFIG_MORE=y
379CONFIG_FEATURE_USE_TERMIOS=y 380CONFIG_FEATURE_USE_TERMIOS=y
380
381#
382# Common options for ls and more
383#
384CONFIG_PIVOT_ROOT=y 381CONFIG_PIVOT_ROOT=y
385# CONFIG_RDATE is not set 382# CONFIG_RDATE is not set
386CONFIG_SWAPONOFF=y 383CONFIG_SWAPONOFF=y
diff --git a/debian/control b/debian/control
index c0a500cc4..d45758c23 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: busybox-cvs
2Priority: optional 2Priority: optional
3Maintainer: Debian Install System Team <debian-boot@lists.debian.org> 3Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
4Uploaders: Erik Andersen <andersee@debian.org>, Bastian Blank <waldi@debian.org>, Tollef Fog Heen <tfheen@debian.org>, Glenn McGrath <bug1@debian.org> 4Uploaders: Erik Andersen <andersee@debian.org>, Bastian Blank <waldi@debian.org>, Tollef Fog Heen <tfheen@debian.org>, Glenn McGrath <bug1@debian.org>
5Build-Depends: debhelper (>= 2.1.18) 5Build-Depends: debhelper (>= 4.0.0)
6Standards-Version: 3.5.7.0 6Standards-Version: 3.6.0
7 7
8Package: busybox-cvs 8Package: busybox-cvs
9Architecture: any 9Architecture: any
@@ -52,6 +52,7 @@ Architecture: any
52Depends: ${shlibs:Depends} 52Depends: ${shlibs:Depends}
53Section: debian-installer 53Section: debian-installer
54Conflicts: busybox-udeb 54Conflicts: busybox-udeb
55Enhances: busybox-cvs-net-udeb
55Priority: extra 56Priority: extra
56Description: Tiny utilities for the debian-installer 57Description: Tiny utilities for the debian-installer
57 BusyBox combines tiny versions of many common UNIX utilities into a single 58 BusyBox combines tiny versions of many common UNIX utilities into a single