aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-04-01 12:26:52 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-04-01 15:44:38 +0000
commit18d129a0e23a4c7dcab71eb620288a4dbda53ad7 (patch)
tree59cc2c292f3cd71721d1065a46a0a028946cac4f
parentabf67f5b1b42b82e7d98ea0b6bee349dab496aa3 (diff)
downloadalpine_aports-18d129a0e23a4c7dcab71eb620288a4dbda53ad7.tar.bz2
alpine_aports-18d129a0e23a4c7dcab71eb620288a4dbda53ad7.tar.xz
alpine_aports-18d129a0e23a4c7dcab71eb620288a4dbda53ad7.zip
main/busybox: upgrade to 1.16.1
(cherry picked from commit 4d0969774384e0d2a1d87b64990a83f17eacbb56)
Diffstat
-rw-r--r--main/busybox/0001-beep-the-d-option-takes-milliseconds-not-microsecond.patch25
-rw-r--r--main/busybox/APKBUILD30
-rw-r--r--main/busybox/busybox-1.16.0-POLLHUP.patch93
-rw-r--r--main/busybox/busybox-1.16.0-ash.patch35
-rw-r--r--main/busybox/busybox-1.16.0-compat.patch317
-rw-r--r--main/busybox/busybox-1.16.0-defconfig.patch438
-rw-r--r--main/busybox/busybox-1.16.0-defconfig.patch.1438
-rw-r--r--main/busybox/busybox-1.16.0-linux_swap.patch16
-rw-r--r--main/busybox/busybox-1.16.0-md5_sha_compat.patch16
-rw-r--r--main/busybox/busybox-1.16.0-syslogd.patch12
-rw-r--r--main/busybox/busybox-1.16.0-tftp.patch12
-rw-r--r--main/busybox/busybox-1.16.0-usage.patch1141
-rw-r--r--main/busybox/busybox-1.16.0-wc.patch12
-rw-r--r--main/busybox/busybox-1.16.0-wget.patch20
14 files changed, 3 insertions, 2602 deletions
diff --git a/main/busybox/0001-beep-the-d-option-takes-milliseconds-not-microsecond.patch b/main/busybox/0001-beep-the-d-option-takes-milliseconds-not-microsecond.patch
deleted file mode 100644
index 15d8e10927..0000000000
--- a/main/busybox/0001-beep-the-d-option-takes-milliseconds-not-microsecond.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 4d277601bdd3717ff304b2eef9823cc4c17134e2 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Thu, 11 Mar 2010 17:06:59 +0000
4Subject: [PATCH] beep: the -d option takes milliseconds not microseconds
5
6---
7 miscutils/beep.c | 2 +-
8 1 files changed, 1 insertions(+), 1 deletions(-)
9
10diff --git a/miscutils/beep.c b/miscutils/beep.c
11index c17cbfd..10768e7 100644
12--- a/miscutils/beep.c
13+++ b/miscutils/beep.c
14@@ -83,7 +83,7 @@ int beep_main(int argc, char **argv)
15 usleep(1000 * length);
16 ioctl(speaker, KIOCSOUND, (void*)0);
17 if (--rep)
18- usleep(delay);
19+ usleep(1000 * delay);
20 }
21 }
22
23--
241.7.0.2
25
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 57487c0ff6..bd0f178f64 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=busybox 2pkgname=busybox
3pkgver=1.16.0 3pkgver=1.16.1
4pkgrel=7 4pkgrel=0
5pkgdesc="Size optimized toolbox of many common UNIX utilities" 5pkgdesc="Size optimized toolbox of many common UNIX utilities"
6url=http://busybox.net 6url=http://busybox.net
7license="GPL-2" 7license="GPL-2"
@@ -10,18 +10,6 @@ install="$pkgname.post-install $pkgname.post-upgrade"
10triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" 10triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
11source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 11source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
12 $pkgname-1.11.1-bb.patch 12 $pkgname-1.11.1-bb.patch
13 busybox-1.16.0-POLLHUP.patch
14 busybox-1.16.0-ash.patch
15 busybox-1.16.0-compat.patch
16 busybox-1.16.0-defconfig.patch
17 busybox-1.16.0-linux_swap.patch
18 busybox-1.16.0-md5_sha_compat.patch
19 busybox-1.16.0-syslogd.patch
20 busybox-1.16.0-tftp.patch
21 busybox-1.16.0-usage.patch
22 busybox-1.16.0-wc.patch
23 busybox-1.16.0-wget.patch
24 0001-beep-the-d-option-takes-milliseconds-not-microsecond.patch
25 flock-bb.patch 13 flock-bb.patch
26 busyboxconfig" 14 busyboxconfig"
27 15
@@ -63,19 +51,7 @@ package() {
63 ln -s /bin/busybox "$pkgdir"/bin/sh 51 ln -s /bin/busybox "$pkgdir"/bin/sh
64} 52}
65 53
66md5sums="2130884e71a1648bfb63c3250c1d288c busybox-1.16.0.tar.bz2 54md5sums="319486ec65078d07fde26eb620fecde7 busybox-1.16.1.tar.bz2
674c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch 554c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
686d2d837cace2e681392fa1d1d430ed78 busybox-1.16.0-POLLHUP.patch
69b788742e46a848c02913c9bd070025b7 busybox-1.16.0-ash.patch
70940aff0065f875b165dac59cc7006c6a busybox-1.16.0-compat.patch
71118e94315a262a23af66c0d3ad83235e busybox-1.16.0-defconfig.patch
721a406fb181aab8d9667498ea64116d50 busybox-1.16.0-linux_swap.patch
73f4758daa8023f000228e9509cceb02d1 busybox-1.16.0-md5_sha_compat.patch
7486a27167971333a0ddad4f0e8bc0acc6 busybox-1.16.0-syslogd.patch
75e24dc9e56b5de4fff706cfbe5c75d9b2 busybox-1.16.0-tftp.patch
76289c8ee19cc43fe175bbd7933c6b5cdf busybox-1.16.0-usage.patch
776520ca5ad3b2a13d100065c4f07e610a busybox-1.16.0-wc.patch
78928ca5a26599cd1dbb80e08132140832 busybox-1.16.0-wget.patch
7900b2aca448952eeb3b579792070712fd 0001-beep-the-d-option-takes-milliseconds-not-microsecond.patch
8020d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch 5620d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch
814bc85af9dd659cbb83c9a819b3481a47 busyboxconfig" 574bc85af9dd659cbb83c9a819b3481a47 busyboxconfig"
diff --git a/main/busybox/busybox-1.16.0-POLLHUP.patch b/main/busybox/busybox-1.16.0-POLLHUP.patch
deleted file mode 100644
index 5ace56815c..0000000000
--- a/main/busybox/busybox-1.16.0-POLLHUP.patch
+++ /dev/null
@@ -1,93 +0,0 @@
1diff -urpN busybox-1.16.0/miscutils/microcom.c busybox-1.16.0-POLLHUP/miscutils/microcom.c
2--- busybox-1.16.0/miscutils/microcom.c 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-POLLHUP/miscutils/microcom.c 2010-03-02 23:53:28.000000000 +0100
4@@ -119,7 +119,7 @@ int microcom_main(int argc UNUSED_PARAM,
5 nfd = 2;
6 // Not safe_poll: we want to exit on signal
7 while (!bb_got_signal && poll(pfd, nfd, timeout) > 0) {
8- if (nfd > 1 && (pfd[1].revents & POLLIN)) {
9+ if (nfd > 1 && pfd[1].revents) {
10 char c;
11 // read from stdin -> write to device
12 if (safe_read(STDIN_FILENO, &c, 1) < 1) {
13@@ -143,7 +143,7 @@ int microcom_main(int argc UNUSED_PARAM,
14 safe_poll(pfd, 1, delay);
15 skip_write: ;
16 }
17- if (pfd[0].revents & POLLIN) {
18+ if (pfd[0].revents) {
19 #define iobuf bb_common_bufsiz1
20 ssize_t len;
21 // read from device -> write to stdout
22diff -urpN busybox-1.16.0/networking/httpd.c busybox-1.16.0-POLLHUP/networking/httpd.c
23--- busybox-1.16.0/networking/httpd.c 2010-01-25 01:59:38.000000000 +0100
24+++ busybox-1.16.0-POLLHUP/networking/httpd.c 2010-03-02 23:53:28.000000000 +0100
25@@ -1167,7 +1167,7 @@ static NOINLINE void cgi_io_loop_and_exi
26 break;
27 }
28
29- if (pfd[TO_CGI].revents & POLLOUT) {
30+ if (pfd[TO_CGI].revents) {
31 /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */
32 /* Have data from peer and can write to CGI */
33 count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt);
34@@ -1184,7 +1184,7 @@ static NOINLINE void cgi_io_loop_and_exi
35 }
36 }
37
38- if (pfd[0].revents & POLLIN) {
39+ if (pfd[0].revents) {
40 /* post_len > 0 && hdr_cnt == 0 here */
41 /* We expect data, prev data portion is eaten by CGI
42 * and there *is* data to read from the peer
43@@ -1202,7 +1202,7 @@ static NOINLINE void cgi_io_loop_and_exi
44 }
45 }
46
47- if (pfd[FROM_CGI].revents & POLLIN) {
48+ if (pfd[FROM_CGI].revents) {
49 /* There is something to read from CGI */
50 char *rbuf = iobuf;
51
52diff -urpN busybox-1.16.0/networking/telnet.c busybox-1.16.0-POLLHUP/networking/telnet.c
53--- busybox-1.16.0/networking/telnet.c 2010-01-25 01:59:38.000000000 +0100
54+++ busybox-1.16.0-POLLHUP/networking/telnet.c 2010-03-02 23:53:28.000000000 +0100
55@@ -618,7 +618,7 @@ int telnet_main(int argc UNUSED_PARAM, c
56 default:
57
58 #ifdef USE_POLL
59- if (ufds[0].revents & POLLIN)
60+ if (ufds[0].revents)
61 #else
62 if (FD_ISSET(STDIN_FILENO, &rfds))
63 #endif
64@@ -631,7 +631,7 @@ int telnet_main(int argc UNUSED_PARAM, c
65 }
66
67 #ifdef USE_POLL
68- if (ufds[1].revents & POLLIN)
69+ if (ufds[1].revents)
70 #else
71 if (FD_ISSET(netfd, &rfds))
72 #endif
73diff -urpN busybox-1.16.0/util-linux/script.c busybox-1.16.0-POLLHUP/util-linux/script.c
74--- busybox-1.16.0/util-linux/script.c 2010-01-25 01:59:39.000000000 +0100
75+++ busybox-1.16.0-POLLHUP/util-linux/script.c 2010-03-02 23:53:28.000000000 +0100
76@@ -119,7 +119,7 @@ int script_main(int argc UNUSED_PARAM, c
77 * for example, try "script -c true" */
78 break;
79 }
80- if (pfd[0].revents & POLLIN) {
81+ if (pfd[0].revents) {
82 errno = 0;
83 count = safe_read(pty, buf, sizeof(buf));
84 if (count <= 0 && errno != EAGAIN) {
85@@ -143,7 +143,7 @@ int script_main(int argc UNUSED_PARAM, c
86 }
87 }
88 }
89- if (pfd[1].revents & POLLIN) {
90+ if (pfd[1].revents) {
91 count = safe_read(STDIN_FILENO, buf, sizeof(buf));
92 if (count <= 0) {
93 /* err/eof from stdin: don't read stdin anymore */
diff --git a/main/busybox/busybox-1.16.0-ash.patch b/main/busybox/busybox-1.16.0-ash.patch
deleted file mode 100644
index 490cf83dff..0000000000
--- a/main/busybox/busybox-1.16.0-ash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1diff -urpN busybox-1.16.0/shell/ash.c busybox-1.16.0-ash/shell/ash.c
2--- busybox-1.16.0/shell/ash.c 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-ash/shell/ash.c 2010-02-21 01:52:22.000000000 +0100
4@@ -4539,7 +4539,7 @@ forkchild(struct job *jp, union node *n,
5 if (mode == FORK_NOJOB /* is it `xxx` ? */
6 && n && n->type == NCMD /* is it single cmd? */
7 /* && n->ncmd.args->type == NARG - always true? */
8- && strcmp(n->ncmd.args->narg.text, "trap") == 0
9+ && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "trap") == 0
10 && n->ncmd.args->narg.next == NULL /* "trap" with no arguments */
11 /* && n->ncmd.args->narg.backquote == NULL - do we need to check this? */
12 ) {
13@@ -4627,7 +4627,7 @@ forkchild(struct job *jp, union node *n,
14 }
15 #if JOBS
16 if (n && n->type == NCMD
17- && strcmp(n->ncmd.args->narg.text, "jobs") == 0
18+ && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "jobs") == 0
19 ) {
20 TRACE(("Job hack\n"));
21 /* "jobs": we do not want to clear job list for it,
22diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right
23--- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right 1970-01-01 01:00:00.000000000 +0100
24+++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right 2010-02-21 01:52:22.000000000 +0100
25@@ -0,0 +1,3 @@
26+Test 1
27+Test 2
28+Done
29diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests
30--- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests 1970-01-01 01:00:00.000000000 +0100
31+++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests 2010-02-21 01:52:22.000000000 +0100
32@@ -0,0 +1,3 @@
33+echo Test ` ` 1
34+echo Test `</dev/null` 2
35+echo Done
diff --git a/main/busybox/busybox-1.16.0-compat.patch b/main/busybox/busybox-1.16.0-compat.patch
deleted file mode 100644
index f84398827b..0000000000
--- a/main/busybox/busybox-1.16.0-compat.patch
+++ /dev/null
@@ -1,317 +0,0 @@
1diff -urpN busybox-1.16.0/coreutils/fsync.c busybox-1.16.0-compat/coreutils/fsync.c
2--- busybox-1.16.0/coreutils/fsync.c 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-compat/coreutils/fsync.c 2010-02-21 01:54:07.000000000 +0100
4@@ -7,6 +7,9 @@
5 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
6 */
7 #include "libbb.h"
8+#ifndef O_NOATIME
9+# define O_NOATIME 0
10+#endif
11
12 /* This is a NOFORK applet. Be very careful! */
13
14diff -urpN busybox-1.16.0/editors/diff.c busybox-1.16.0-compat/editors/diff.c
15--- busybox-1.16.0/editors/diff.c 2010-01-25 01:59:38.000000000 +0100
16+++ busybox-1.16.0-compat/editors/diff.c 2010-02-21 01:54:07.000000000 +0100
17@@ -227,10 +227,12 @@ struct cand {
18
19 static int search(const int *c, int k, int y, const struct cand *list)
20 {
21+ int i, j;
22+
23 if (list[c[k]].y < y) /* quick look for typical case */
24 return k + 1;
25
26- for (int i = 0, j = k + 1;;) {
27+ for (i = 0, j = k + 1;;) {
28 const int l = (i + j) >> 1;
29 if (l > i) {
30 const int t = list[c[l]].y;
31@@ -265,11 +267,13 @@ static void stone(const int *a, int n, c
32 int clistlen = 100;
33 int k = 0;
34 struct cand *clist = xzalloc(clistlen * sizeof(clist[0]));
35+ struct cand cand;
36+ struct cand *q;
37 int *klist = xzalloc((n + 2) * sizeof(klist[0]));
38 /*clist[0] = (struct cand){0}; - xzalloc did it */
39 /*klist[0] = 0; */
40
41- for (struct cand cand = {1}; cand.x <= n; cand.x++) {
42+ for (cand.x = 1; cand.x <= n; cand.x++) {
43 int j = a[cand.x], oldl = 0;
44 unsigned numtries = 0;
45 if (j == 0)
46@@ -303,7 +307,7 @@ static void stone(const int *a, int n, c
47 } while ((cand.y = b[++j]) > 0 && numtries < bound);
48 }
49 /* Unravel */
50- for (struct cand *q = clist + klist[k]; q->y; q = clist + q->pred)
51+ for (q = clist + klist[k]; q->y; q = clist + q->pred)
52 J[q->x + pref] = q->y + pref;
53 free(klist);
54 free(clist);
55@@ -348,10 +352,11 @@ static void equiv(struct line *a, int n,
56
57 static void unsort(const struct line *f, int l, int *b)
58 {
59+ int i;
60 int *a = xmalloc((l + 1) * sizeof(a[0]));
61- for (int i = 1; i <= l; i++)
62+ for (i = 1; i <= l; i++)
63 a[f[i].serial] = f[i].value;
64- for (int i = 1; i <= l; i++)
65+ for (i = 1; i <= l; i++)
66 b[i] = a[i];
67 free(a);
68 }
69@@ -370,12 +375,13 @@ static int line_compar(const void *a, co
70
71 static void fetch(FILE_and_pos_t *ft, const off_t *ix, int a, int b, int ch)
72 {
73- for (int i = a; i <= b; i++) {
74+ int i, j, col;
75+ for (i = a; i <= b; i++) {
76 seek_ft(ft, ix[i - 1]);
77 putchar(ch);
78 if (option_mask32 & FLAG(T))
79 putchar('\t');
80- for (int j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
81+ for (j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
82 int c = fgetc(ft->ft_fp);
83 if (c == EOF) {
84 printf("\n\\ No newline at end of file\n");
85@@ -410,19 +416,20 @@ static NOINLINE int *create_J(FILE_and_p
86 {
87 int *J, slen[2], *class, *member;
88 struct line *nfile[2], *sfile[2];
89- int pref = 0, suff = 0;
90+ int pref = 0, suff = 0, i, j, delta;
91
92 /* Lines of both files are hashed, and in the process
93 * their offsets are stored in the array ix[fileno]
94 * where fileno == 0 points to the old file, and
95 * fileno == 1 points to the new one.
96 */
97- for (int i = 0; i < 2; i++) {
98+ for (i = 0; i < 2; i++) {
99 unsigned hash;
100 token_t tok;
101 size_t sz = 100;
102 nfile[i] = xmalloc((sz + 3) * sizeof(nfile[i][0]));
103 /* ft gets here without the correct position, cant use seek_ft */
104+ ft[i].ft_pos = 0;
105 fseeko(ft[i].ft_fp, 0, SEEK_SET);
106
107 nlen[i] = 0;
108@@ -460,11 +467,11 @@ start:
109 nlen[i]--;
110 /* Now we copy the line offsets into ix */
111 ix[i] = xmalloc((nlen[i] + 2) * sizeof(ix[i][0]));
112- for (int j = 0; j < nlen[i] + 1; j++)
113+ for (j = 0; j < nlen[i] + 1; j++)
114 ix[i][j] = nfile[i][j].offset;
115 }
116
117- /* lenght of prefix and suffix is calculated */
118+ /* length of prefix and suffix is calculated */
119 for (; pref < nlen[0] && pref < nlen[1] &&
120 nfile[0][pref + 1].value == nfile[1][pref + 1].value;
121 pref++);
122@@ -475,10 +482,10 @@ start:
123 * the result being sorted and stored in sfile[fileno],
124 * and their sizes are stored in slen[fileno]
125 */
126- for (int j = 0; j < 2; j++) {
127+ for (j = 0; j < 2; j++) {
128 sfile[j] = nfile[j] + pref;
129 slen[j] = nlen[j] - pref - suff;
130- for (int i = 0; i <= slen[j]; i++)
131+ for (i = 0; i <= slen[j]; i++)
132 sfile[j][i].serial = i;
133 qsort(sfile[j] + 1, slen[j], sizeof(*sfile[j]), line_compar);
134 }
135@@ -494,7 +501,7 @@ start:
136 free(nfile[1]);
137
138 class = xmalloc((slen[0] + 1) * sizeof(class[0]));
139- for (int i = 1; i <= slen[0]; i++) /* Unsorting */
140+ for (i = 1; i <= slen[0]; i++) /* Unsorting */
141 class[sfile[0][i].serial] = sfile[0][i].value;
142 free(nfile[0]);
143 #else
144@@ -512,7 +519,7 @@ start:
145 * are initialized with 0 (no matches), so that function stone can
146 * then assign them their right values
147 */
148- for (int i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
149+ for (i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
150 J[i] = i <= pref ? i :
151 i > (nlen[0] - suff) ? (i + delta) : 0;
152 /* Here the magic is performed */
153@@ -526,14 +533,14 @@ start:
154 * which, due to limitations intrinsic to any hashing algorithm,
155 * are different but ended up confounded as the same
156 */
157- for (int i = 1; i <= nlen[0]; i++) {
158+ for (i = 1; i <= nlen[0]; i++) {
159 if (!J[i])
160 continue;
161
162 seek_ft(&ft[0], ix[0][i - 1]);
163 seek_ft(&ft[1], ix[1][J[i] - 1]);
164
165- for (int j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
166+ for (j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
167 token_t tok0 = 0, tok1 = 0;
168 do {
169 tok0 = read_token(&ft[0], tok0);
170@@ -555,13 +562,18 @@ static bool diff(FILE* fp[2], char *file
171 {
172 int nlen[2];
173 off_t *ix[2];
174- FILE_and_pos_t ft[2] = { { fp[0] }, { fp[1] } };
175- int *J = create_J(ft, nlen, ix);
176-
177- bool anychange = false;
178+ FILE_and_pos_t ft[2];
179 typedef struct { int a, b; } vec_t[2];
180 vec_t *vec = NULL;
181- int i = 1, idx = -1;
182+ int i = 1, j, k, idx = -1;
183+ bool anychange = false;
184+ int *J;
185+
186+ ft[0].ft_fp = fp[0];
187+ ft[1].ft_fp = fp[1];
188+ /* note that ft[i].ft_pos is unintitalized, create_J()
189+ * must not assume otherwise */
190+ J = create_J(ft, nlen, ix);
191
192 do {
193 bool nonempty = false;
194@@ -596,8 +608,8 @@ static bool diff(FILE* fp[2], char *file
195 break;
196 }
197
198- for (int j = 0; j < 2; j++)
199- for (int k = v[j].a; k < v[j].b; k++)
200+ for (j = 0; j < 2; j++)
201+ for (k = v[j].a; k < v[j].b; k++)
202 nonempty |= (ix[j][k+1] - ix[j][k] != 1);
203
204 vec = xrealloc_vector(vec, 6, ++idx);
205@@ -612,6 +624,7 @@ static bool diff(FILE* fp[2], char *file
206 if (idx < 0 || ((option_mask32 & FLAG(B)) && !nonempty))
207 goto cont;
208 if (!(option_mask32 & FLAG(q))) {
209+ int lowa;
210 vec_t span, *cvp = vec;
211
212 if (!anychange) {
213@@ -621,7 +634,7 @@ static bool diff(FILE* fp[2], char *file
214 }
215
216 printf("@@");
217- for (int j = 0; j < 2; j++) {
218+ for (j = 0; j < 2; j++) {
219 int a = span[j].a = MAX(1, (*cvp)[j].a - opt_U_context);
220 int b = span[j].b = MIN(nlen[j], vec[idx][j].b + opt_U_context);
221
222@@ -635,12 +648,12 @@ static bool diff(FILE* fp[2], char *file
223 * Output changes in "unified" diff format--the old and new lines
224 * are printed together.
225 */
226- for (int lowa = span[0].a; ; lowa = (*cvp++)[0].b + 1) {
227+ for (lowa = span[0].a; ; lowa = (*cvp++)[0].b + 1) {
228 bool end = cvp > &vec[idx];
229 fetch(&ft[0], ix[0], lowa, end ? span[0].b : (*cvp)[0].a - 1, ' ');
230 if (end)
231 break;
232- for (int j = 0; j < 2; j++)
233+ for (j = 0; j < 2; j++)
234 fetch(&ft[j], ix[j], (*cvp)[j].a, (*cvp)[j].b, j ? '+' : '-');
235 }
236 }
237@@ -660,9 +673,9 @@ static int diffreg(char *file[2])
238 {
239 FILE *fp[2] = { stdin, stdin };
240 bool binary = false, differ = false;
241- int status = STATUS_SAME;
242+ int status = STATUS_SAME, i;
243
244- for (int i = 0; i < 2; i++) {
245+ for (i = 0; i < 2; i++) {
246 int fd = open_or_warn_stdin(file[i]);
247 if (fd == -1)
248 goto out;
249@@ -688,7 +701,7 @@ static int diffreg(char *file[2])
250 const size_t sz = COMMON_BUFSIZE / 2;
251 char *const buf0 = bb_common_bufsiz1;
252 char *const buf1 = buf0 + sz;
253- int i, j;
254+ int j, k;
255 i = fread(buf0, 1, sz, fp[0]);
256 j = fread(buf1, 1, sz, fp[1]);
257 if (i != j) {
258@@ -697,7 +710,7 @@ static int diffreg(char *file[2])
259 }
260 if (i == 0)
261 break;
262- for (int k = 0; k < i; k++) {
263+ for (k = 0; k < i; k++) {
264 if (!buf0[k] || !buf1[k])
265 binary = true;
266 if (buf0[k] != buf1[k])
267@@ -771,9 +784,10 @@ static int FAST_FUNC skip_dir(const char
268 static void diffdir(char *p[2], const char *s_start)
269 {
270 struct dlist list[2];
271+ int i;
272
273 memset(&list, 0, sizeof(list));
274- for (int i = 0; i < 2; i++) {
275+ for (i = 0; i < 2; i++) {
276 /*list[i].s = list[i].e = 0; - memset did it */
277 /*list[i].dl = NULL; */
278
279@@ -815,7 +829,7 @@ static void diffdir(char *p[2], const ch
280 else {
281 char *fullpath[2], *path[2]; /* if -N */
282
283- for (int i = 0; i < 2; i++) {
284+ for (i = 0; i < 2; i++) {
285 if (pos == 0 || i == k) {
286 path[i] = fullpath[i] = concat_path_file(p[i], dp[i]);
287 stat(fullpath[i], &stb[i]);
288@@ -883,7 +897,7 @@ static const char diff_longopts[] ALIGN1
289 int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
290 int diff_main(int argc UNUSED_PARAM, char **argv)
291 {
292- int gotstdin = 0;
293+ int gotstdin = 0, i;
294 char *file[2], *s_start = NULL;
295 llist_t *L_arg = NULL;
296
297@@ -900,7 +914,7 @@ int diff_main(int argc UNUSED_PARAM, cha
298 while (L_arg)
299 label[!!label[0]] = llist_pop(&L_arg);
300 xfunc_error_retval = 2;
301- for (int i = 0; i < 2; i++) {
302+ for (i = 0; i < 2; i++) {
303 file[i] = argv[i];
304 /* Compat: "diff file name_which_doesnt_exist" exits with 2 */
305 if (LONE_DASH(file[i])) {
306diff -urpN busybox-1.16.0/miscutils/fbsplash.c busybox-1.16.0-compat/miscutils/fbsplash.c
307--- busybox-1.16.0/miscutils/fbsplash.c 2010-01-25 01:59:38.000000000 +0100
308+++ busybox-1.16.0-compat/miscutils/fbsplash.c 2010-02-21 01:54:07.000000000 +0100
309@@ -301,7 +301,7 @@ static void fb_drawimage(void)
310 */
311 static void init(const char *cfg_filename)
312 {
313- static const char const param_names[] ALIGN1 =
314+ static const char param_names[] ALIGN1 =
315 "BAR_WIDTH\0" "BAR_HEIGHT\0"
316 "BAR_LEFT\0" "BAR_TOP\0"
317 "BAR_R\0" "BAR_G\0" "BAR_B\0"
diff --git a/main/busybox/busybox-1.16.0-defconfig.patch b/main/busybox/busybox-1.16.0-defconfig.patch
deleted file mode 100644
index c053526ede..0000000000
--- a/main/busybox/busybox-1.16.0-defconfig.patch
+++ /dev/null
@@ -1,438 +0,0 @@
1diff -urpN busybox-1.16.0/scripts/defconfig busybox-1.16.0-defconfig/scripts/defconfig
2--- busybox-1.16.0/scripts/defconfig 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-defconfig/scripts/defconfig 2010-02-21 01:53:15.000000000 +0100
4@@ -1,7 +1,7 @@
5 #
6 # Automatically generated make config: don't edit
7-# Busybox version: 1.15.0.svn
8-# Fri Aug 21 00:14:11 2009
9+# Busybox version: 1.16.0
10+# Wed Jan 27 20:00:00 2010
11 #
12 CONFIG_HAVE_DOT_CONFIG=y
13
14@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
15 #
16 # CONFIG_DESKTOP is not set
17 # CONFIG_EXTRA_COMPAT is not set
18+CONFIG_INCLUDE_SUSv2=y
19+# CONFIG_USE_PORTABLE_CODE is not set
20 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
21 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
22 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
23@@ -22,7 +24,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
24 CONFIG_FEATURE_COMPRESS_USAGE=y
25 CONFIG_FEATURE_INSTALLER=y
26 CONFIG_LOCALE_SUPPORT=y
27-# CONFIG_FEATURE_ASSUME_UNICODE is not set
28+CONFIG_FEATURE_ASSUME_UNICODE=y
29 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
30 CONFIG_LONG_OPTS=y
31 CONFIG_FEATURE_DEVPTS=y
32@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
33 CONFIG_NO_DEBUG_LIB=y
34 # CONFIG_DMALLOC is not set
35 # CONFIG_EFENCE is not set
36-CONFIG_INCLUDE_SUSv2=y
37
38 #
39 # Installation Options
40@@ -120,10 +121,11 @@ CONFIG_FEATURE_CPIO_P=y
41 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
42 CONFIG_GUNZIP=y
43 CONFIG_GZIP=y
44+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
45 CONFIG_LZOP=y
46 # CONFIG_LZOP_COMPR_HIGH is not set
47-# CONFIG_RPM2CPIO is not set
48-# CONFIG_RPM is not set
49+CONFIG_RPM2CPIO=y
50+CONFIG_RPM=y
51 CONFIG_TAR=y
52 CONFIG_FEATURE_TAR_CREATE=y
53 CONFIG_FEATURE_TAR_AUTODETECT=y
54@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
55 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
56 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
57 CONFIG_FEATURE_TAR_UNAME_GNAME=y
58+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
59 CONFIG_UNCOMPRESS=y
60 CONFIG_UNLZMA=y
61 CONFIG_FEATURE_LZMA_FAST=y
62@@ -148,15 +151,19 @@ CONFIG_CATV=y
63 CONFIG_CHGRP=y
64 CONFIG_CHMOD=y
65 CONFIG_CHOWN=y
66+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
67 CONFIG_CHROOT=y
68 CONFIG_CKSUM=y
69 CONFIG_COMM=y
70 CONFIG_CP=y
71+CONFIG_FEATURE_CP_LONG_OPTIONS=y
72 CONFIG_CUT=y
73 CONFIG_DATE=y
74 CONFIG_FEATURE_DATE_ISOFMT=y
75+CONFIG_FEATURE_DATE_COMPAT=y
76 CONFIG_DD=y
77 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
78+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
79 CONFIG_FEATURE_DD_IBS_OBS=y
80 CONFIG_DF=y
81 CONFIG_FEATURE_DF_FANCY=y
82@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
83 CONFIG_FEATURE_HUMAN_READABLE=y
84
85 #
86-# Common options for md5sum, sha1sum
87+# Common options for md5sum, sha1sum, sha256sum, sha512sum
88 #
89 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
90
91@@ -318,9 +325,8 @@ CONFIG_AWK=y
92 CONFIG_FEATURE_AWK_LIBM=y
93 CONFIG_CMP=y
94 CONFIG_DIFF=y
95-CONFIG_FEATURE_DIFF_BINARY=y
96+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
97 CONFIG_FEATURE_DIFF_DIR=y
98-CONFIG_FEATURE_DIFF_MINIMAL=y
99 CONFIG_ED=y
100 CONFIG_PATCH=y
101 CONFIG_SED=y
102@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
103 CONFIG_FEATURE_FIND_PATH=y
104 CONFIG_FEATURE_FIND_REGEX=y
105 # CONFIG_FEATURE_FIND_CONTEXT is not set
106+CONFIG_FEATURE_FIND_LINKS=y
107 CONFIG_GREP=y
108 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
109 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
110@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
111 # Options common to multiple modutils
112 #
113 # CONFIG_FEATURE_2_4_MODULES is not set
114+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
115 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
116 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
117 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
118@@ -467,8 +475,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
119 #
120 # Linux System Utilities
121 #
122-# CONFIG_ACPID is not set
123-# CONFIG_FEATURE_ACPID_COMPAT is not set
124+CONFIG_ACPID=y
125+CONFIG_FEATURE_ACPID_COMPAT=y
126 CONFIG_BLKID=y
127 CONFIG_DMESG=y
128 CONFIG_FEATURE_DMESG_PRETTY=y
129@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
130 CONFIG_FINDFS=y
131 CONFIG_FREERAMDISK=y
132 CONFIG_FSCK_MINIX=y
133+CONFIG_MKFS_EXT2=y
134 CONFIG_MKFS_MINIX=y
135
136 #
137 # Minix filesystem support
138 #
139 CONFIG_FEATURE_MINIX2=y
140+# CONFIG_MKFS_REISER is not set
141 CONFIG_MKFS_VFAT=y
142 CONFIG_GETOPT=y
143 CONFIG_FEATURE_GETOPT_LONG=y
144@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
145 CONFIG_IPCRM=y
146 CONFIG_IPCS=y
147 CONFIG_LOSETUP=y
148+CONFIG_LSPCI=y
149+CONFIG_LSUSB=y
150 CONFIG_MDEV=y
151 CONFIG_FEATURE_MDEV_CONF=y
152 CONFIG_FEATURE_MDEV_RENAME=y
153@@ -518,6 +530,7 @@ CONFIG_MORE=y
154 CONFIG_FEATURE_USE_TERMIOS=y
155 CONFIG_VOLUMEID=y
156 CONFIG_FEATURE_VOLUMEID_EXT=y
157+CONFIG_FEATURE_VOLUMEID_BTRFS=y
158 CONFIG_FEATURE_VOLUMEID_REISERFS=y
159 CONFIG_FEATURE_VOLUMEID_FAT=y
160 CONFIG_FEATURE_VOLUMEID_HFS=y
161@@ -595,11 +608,12 @@ CONFIG_DEVMEM=y
162 CONFIG_EJECT=y
163 CONFIG_FEATURE_EJECT_SCSI=y
164 CONFIG_FBSPLASH=y
165-# CONFIG_FLASH_LOCK is not set
166-# CONFIG_FLASH_UNLOCK is not set
167-# CONFIG_FLASH_ERASEALL is not set
168+CONFIG_FLASHCP=y
169+CONFIG_FLASH_LOCK=y
170+CONFIG_FLASH_UNLOCK=y
171+CONFIG_FLASH_ERASEALL=y
172 CONFIG_IONICE=y
173-# CONFIG_INOTIFYD is not set
174+CONFIG_INOTIFYD=y
175 CONFIG_LAST=y
176 # CONFIG_FEATURE_LAST_SMALL is not set
177 CONFIG_FEATURE_LAST_FANCY=y
178@@ -632,8 +646,8 @@ CONFIG_RUNLEVEL=y
179 CONFIG_RX=y
180 CONFIG_SETSID=y
181 CONFIG_STRINGS=y
182-# CONFIG_TASKSET is not set
183-# CONFIG_FEATURE_TASKSET_FANCY is not set
184+CONFIG_TASKSET=y
185+CONFIG_FEATURE_TASKSET_FANCY=y
186 CONFIG_TIME=y
187 CONFIG_TIMEOUT=y
188 CONFIG_TTYSIZE=y
189@@ -658,6 +672,7 @@ CONFIG_ETHER_WAKE=y
190 CONFIG_FAKEIDENTD=y
191 CONFIG_FTPD=y
192 CONFIG_FEATURE_FTP_WRITE=y
193+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
194 CONFIG_FTPGET=y
195 CONFIG_FTPPUT=y
196 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
197@@ -723,6 +738,8 @@ CONFIG_NETSTAT=y
198 CONFIG_FEATURE_NETSTAT_WIDE=y
199 CONFIG_FEATURE_NETSTAT_PRG=y
200 CONFIG_NSLOOKUP=y
201+CONFIG_NTPD=y
202+CONFIG_FEATURE_NTPD_SERVER=y
203 CONFIG_PING=y
204 CONFIG_PING6=y
205 CONFIG_FEATURE_FANCY_PING=y
206@@ -734,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
207 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
208 CONFIG_TELNETD=y
209 CONFIG_FEATURE_TELNETD_STANDALONE=y
210+CONFIG_FEATURE_TELNETD_INETD_WAIT=y
211 CONFIG_TFTP=y
212 CONFIG_TFTPD=y
213 CONFIG_FEATURE_TFTP_GET=y
214 CONFIG_FEATURE_TFTP_PUT=y
215 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
216+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
217 # CONFIG_TFTP_DEBUG is not set
218 CONFIG_TRACEROUTE=y
219+CONFIG_TRACEROUTE6=y
220 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
221 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
222 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
223@@ -814,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
224 CONFIG_FEATURE_TOP_DECIMALS=y
225 CONFIG_FEATURE_TOP_SMP_PROCESS=y
226 CONFIG_FEATURE_TOPMEM=y
227+CONFIG_FEATURE_SHOW_THREADS=y
228 CONFIG_UPTIME=y
229 CONFIG_WATCH=y
230
231@@ -878,6 +899,7 @@ CONFIG_HUSH_CASE=y
232 CONFIG_HUSH_FUNCTIONS=y
233 CONFIG_HUSH_LOCAL=y
234 CONFIG_HUSH_EXPORT_N=y
235+CONFIG_HUSH_RANDOM_SUPPORT=y
236 # CONFIG_LASH is not set
237 CONFIG_MSH=y
238 CONFIG_SH_MATH_SUPPORT=y
239diff -urpN busybox-1.16.0/TODO_config_nommu busybox-1.16.0-defconfig/TODO_config_nommu
240--- busybox-1.16.0/TODO_config_nommu 2010-01-25 01:59:38.000000000 +0100
241+++ busybox-1.16.0-defconfig/TODO_config_nommu 2010-02-21 01:53:15.000000000 +0100
242@@ -1,7 +1,7 @@
243 #
244 # Automatically generated make config: don't edit
245-# Busybox version: 1.15.0.svn
246-# Fri Aug 21 00:13:18 2009
247+# Busybox version: 1.16.0
248+# Wed Jan 27 21:01:26 2010
249 #
250 CONFIG_HAVE_DOT_CONFIG=y
251
252@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
253 #
254 CONFIG_DESKTOP=y
255 CONFIG_EXTRA_COMPAT=y
256+CONFIG_INCLUDE_SUSv2=y
257+# CONFIG_USE_PORTABLE_CODE is not set
258 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
259 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
260 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
261@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
262 CONFIG_NO_DEBUG_LIB=y
263 # CONFIG_DMALLOC is not set
264 # CONFIG_EFENCE is not set
265-CONFIG_INCLUDE_SUSv2=y
266
267 #
268 # Installation Options
269@@ -120,6 +121,7 @@ CONFIG_DPKG_DEB=y
270 CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
271 CONFIG_GUNZIP=y
272 CONFIG_GZIP=y
273+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
274 CONFIG_LZOP=y
275 CONFIG_LZOP_COMPR_HIGH=y
276 CONFIG_RPM2CPIO=y
277@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
278 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
279 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
280 CONFIG_FEATURE_TAR_UNAME_GNAME=y
281+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
282 CONFIG_UNCOMPRESS=y
283 CONFIG_UNLZMA=y
284 CONFIG_FEATURE_LZMA_FAST=y
285@@ -148,15 +151,19 @@ CONFIG_CATV=y
286 CONFIG_CHGRP=y
287 CONFIG_CHMOD=y
288 CONFIG_CHOWN=y
289+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
290 CONFIG_CHROOT=y
291 CONFIG_CKSUM=y
292 CONFIG_COMM=y
293 CONFIG_CP=y
294+CONFIG_FEATURE_CP_LONG_OPTIONS=y
295 CONFIG_CUT=y
296 CONFIG_DATE=y
297 CONFIG_FEATURE_DATE_ISOFMT=y
298+CONFIG_FEATURE_DATE_COMPAT=y
299 CONFIG_DD=y
300 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
301+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
302 CONFIG_FEATURE_DD_IBS_OBS=y
303 CONFIG_DF=y
304 CONFIG_FEATURE_DF_FANCY=y
305@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
306 CONFIG_FEATURE_HUMAN_READABLE=y
307
308 #
309-# Common options for md5sum, sha1sum
310+# Common options for md5sum, sha1sum, sha256sum, sha512sum
311 #
312 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
313
314@@ -318,9 +325,8 @@ CONFIG_AWK=y
315 CONFIG_FEATURE_AWK_LIBM=y
316 CONFIG_CMP=y
317 CONFIG_DIFF=y
318-CONFIG_FEATURE_DIFF_BINARY=y
319+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
320 CONFIG_FEATURE_DIFF_DIR=y
321-CONFIG_FEATURE_DIFF_MINIMAL=y
322 CONFIG_ED=y
323 CONFIG_PATCH=y
324 CONFIG_SED=y
325@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
326 CONFIG_FEATURE_FIND_PATH=y
327 CONFIG_FEATURE_FIND_REGEX=y
328 CONFIG_FEATURE_FIND_CONTEXT=y
329+CONFIG_FEATURE_FIND_LINKS=y
330 CONFIG_GREP=y
331 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
332 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
333@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
334 # Options common to multiple modutils
335 #
336 # CONFIG_FEATURE_2_4_MODULES is not set
337+CONFIG_FEATURE_INSMOD_TRY_MMAP=y
338 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
339 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
340 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
341@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
342 CONFIG_FINDFS=y
343 CONFIG_FREERAMDISK=y
344 CONFIG_FSCK_MINIX=y
345+CONFIG_MKFS_EXT2=y
346 CONFIG_MKFS_MINIX=y
347
348 #
349 # Minix filesystem support
350 #
351 CONFIG_FEATURE_MINIX2=y
352+CONFIG_MKFS_REISER=y
353 CONFIG_MKFS_VFAT=y
354 CONFIG_GETOPT=y
355 CONFIG_FEATURE_GETOPT_LONG=y
356@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
357 CONFIG_IPCRM=y
358 CONFIG_IPCS=y
359 CONFIG_LOSETUP=y
360+CONFIG_LSPCI=y
361+CONFIG_LSUSB=y
362 CONFIG_MDEV=y
363 CONFIG_FEATURE_MDEV_CONF=y
364 CONFIG_FEATURE_MDEV_RENAME=y
365@@ -518,6 +530,7 @@ CONFIG_MORE=y
366 CONFIG_FEATURE_USE_TERMIOS=y
367 CONFIG_VOLUMEID=y
368 CONFIG_FEATURE_VOLUMEID_EXT=y
369+CONFIG_FEATURE_VOLUMEID_BTRFS=y
370 CONFIG_FEATURE_VOLUMEID_REISERFS=y
371 CONFIG_FEATURE_VOLUMEID_FAT=y
372 CONFIG_FEATURE_VOLUMEID_HFS=y
373@@ -595,6 +608,7 @@ CONFIG_DEVMEM=y
374 CONFIG_EJECT=y
375 CONFIG_FEATURE_EJECT_SCSI=y
376 CONFIG_FBSPLASH=y
377+CONFIG_FLASHCP=y
378 # CONFIG_FLASH_LOCK is not set
379 # CONFIG_FLASH_UNLOCK is not set
380 # CONFIG_FLASH_ERASEALL is not set
381@@ -638,6 +652,7 @@ CONFIG_TIME=y
382 CONFIG_TIMEOUT=y
383 CONFIG_TTYSIZE=y
384 CONFIG_VOLNAME=y
385+CONFIG_WALL=y
386 CONFIG_WATCHDOG=y
387
388 #
389@@ -657,6 +672,7 @@ CONFIG_ETHER_WAKE=y
390 CONFIG_FAKEIDENTD=y
391 CONFIG_FTPD=y
392 CONFIG_FEATURE_FTP_WRITE=y
393+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
394 CONFIG_FTPGET=y
395 CONFIG_FTPPUT=y
396 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
397@@ -722,6 +738,8 @@ CONFIG_NETSTAT=y
398 CONFIG_FEATURE_NETSTAT_WIDE=y
399 CONFIG_FEATURE_NETSTAT_PRG=y
400 CONFIG_NSLOOKUP=y
401+CONFIG_NTPD=y
402+CONFIG_FEATURE_NTPD_SERVER=y
403 CONFIG_PING=y
404 CONFIG_PING6=y
405 CONFIG_FEATURE_FANCY_PING=y
406@@ -733,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
407 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
408 CONFIG_TELNETD=y
409 CONFIG_FEATURE_TELNETD_STANDALONE=y
410+CONFIG_FEATURE_TELNETD_INETD_WAIT=y
411 CONFIG_TFTP=y
412 CONFIG_TFTPD=y
413 CONFIG_FEATURE_TFTP_GET=y
414 CONFIG_FEATURE_TFTP_PUT=y
415 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
416+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
417 CONFIG_TFTP_DEBUG=y
418 CONFIG_TRACEROUTE=y
419+CONFIG_TRACEROUTE6=y
420 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
421 CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
422 CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
423@@ -813,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
424 CONFIG_FEATURE_TOP_DECIMALS=y
425 CONFIG_FEATURE_TOP_SMP_PROCESS=y
426 CONFIG_FEATURE_TOPMEM=y
427+CONFIG_FEATURE_SHOW_THREADS=y
428 CONFIG_UPTIME=y
429 CONFIG_WATCH=y
430
431@@ -881,6 +903,7 @@ CONFIG_HUSH_CASE=y
432 CONFIG_HUSH_FUNCTIONS=y
433 CONFIG_HUSH_LOCAL=y
434 CONFIG_HUSH_EXPORT_N=y
435+CONFIG_HUSH_RANDOM_SUPPORT=y
436 CONFIG_LASH=y
437 CONFIG_MSH=y
438 CONFIG_SH_MATH_SUPPORT=y
diff --git a/main/busybox/busybox-1.16.0-defconfig.patch.1 b/main/busybox/busybox-1.16.0-defconfig.patch.1
deleted file mode 100644
index c053526ede..0000000000
--- a/main/busybox/busybox-1.16.0-defconfig.patch.1
+++ /dev/null
@@ -1,438 +0,0 @@
1diff -urpN busybox-1.16.0/scripts/defconfig busybox-1.16.0-defconfig/scripts/defconfig
2--- busybox-1.16.0/scripts/defconfig 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-defconfig/scripts/defconfig 2010-02-21 01:53:15.000000000 +0100
4@@ -1,7 +1,7 @@
5 #
6 # Automatically generated make config: don't edit
7-# Busybox version: 1.15.0.svn
8-# Fri Aug 21 00:14:11 2009
9+# Busybox version: 1.16.0
10+# Wed Jan 27 20:00:00 2010
11 #
12 CONFIG_HAVE_DOT_CONFIG=y
13
14@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
15 #
16 # CONFIG_DESKTOP is not set
17 # CONFIG_EXTRA_COMPAT is not set
18+CONFIG_INCLUDE_SUSv2=y
19+# CONFIG_USE_PORTABLE_CODE is not set
20 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
21 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
22 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
23@@ -22,7 +24,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
24 CONFIG_FEATURE_COMPRESS_USAGE=y
25 CONFIG_FEATURE_INSTALLER=y
26 CONFIG_LOCALE_SUPPORT=y
27-# CONFIG_FEATURE_ASSUME_UNICODE is not set
28+CONFIG_FEATURE_ASSUME_UNICODE=y
29 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
30 CONFIG_LONG_OPTS=y
31 CONFIG_FEATURE_DEVPTS=y
32@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
33 CONFIG_NO_DEBUG_LIB=y
34 # CONFIG_DMALLOC is not set
35 # CONFIG_EFENCE is not set
36-CONFIG_INCLUDE_SUSv2=y
37
38 #
39 # Installation Options
40@@ -120,10 +121,11 @@ CONFIG_FEATURE_CPIO_P=y
41 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
42 CONFIG_GUNZIP=y
43 CONFIG_GZIP=y
44+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
45 CONFIG_LZOP=y
46 # CONFIG_LZOP_COMPR_HIGH is not set
47-# CONFIG_RPM2CPIO is not set
48-# CONFIG_RPM is not set
49+CONFIG_RPM2CPIO=y
50+CONFIG_RPM=y
51 CONFIG_TAR=y
52 CONFIG_FEATURE_TAR_CREATE=y
53 CONFIG_FEATURE_TAR_AUTODETECT=y
54@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
55 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
56 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
57 CONFIG_FEATURE_TAR_UNAME_GNAME=y
58+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
59 CONFIG_UNCOMPRESS=y
60 CONFIG_UNLZMA=y
61 CONFIG_FEATURE_LZMA_FAST=y
62@@ -148,15 +151,19 @@ CONFIG_CATV=y
63 CONFIG_CHGRP=y
64 CONFIG_CHMOD=y
65 CONFIG_CHOWN=y
66+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
67 CONFIG_CHROOT=y
68 CONFIG_CKSUM=y
69 CONFIG_COMM=y
70 CONFIG_CP=y
71+CONFIG_FEATURE_CP_LONG_OPTIONS=y
72 CONFIG_CUT=y
73 CONFIG_DATE=y
74 CONFIG_FEATURE_DATE_ISOFMT=y
75+CONFIG_FEATURE_DATE_COMPAT=y
76 CONFIG_DD=y
77 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
78+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
79 CONFIG_FEATURE_DD_IBS_OBS=y
80 CONFIG_DF=y
81 CONFIG_FEATURE_DF_FANCY=y
82@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
83 CONFIG_FEATURE_HUMAN_READABLE=y
84
85 #
86-# Common options for md5sum, sha1sum
87+# Common options for md5sum, sha1sum, sha256sum, sha512sum
88 #
89 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
90
91@@ -318,9 +325,8 @@ CONFIG_AWK=y
92 CONFIG_FEATURE_AWK_LIBM=y
93 CONFIG_CMP=y
94 CONFIG_DIFF=y
95-CONFIG_FEATURE_DIFF_BINARY=y
96+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
97 CONFIG_FEATURE_DIFF_DIR=y
98-CONFIG_FEATURE_DIFF_MINIMAL=y
99 CONFIG_ED=y
100 CONFIG_PATCH=y
101 CONFIG_SED=y
102@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
103 CONFIG_FEATURE_FIND_PATH=y
104 CONFIG_FEATURE_FIND_REGEX=y
105 # CONFIG_FEATURE_FIND_CONTEXT is not set
106+CONFIG_FEATURE_FIND_LINKS=y
107 CONFIG_GREP=y
108 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
109 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
110@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
111 # Options common to multiple modutils
112 #
113 # CONFIG_FEATURE_2_4_MODULES is not set
114+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
115 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
116 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
117 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
118@@ -467,8 +475,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
119 #
120 # Linux System Utilities
121 #
122-# CONFIG_ACPID is not set
123-# CONFIG_FEATURE_ACPID_COMPAT is not set
124+CONFIG_ACPID=y
125+CONFIG_FEATURE_ACPID_COMPAT=y
126 CONFIG_BLKID=y
127 CONFIG_DMESG=y
128 CONFIG_FEATURE_DMESG_PRETTY=y
129@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
130 CONFIG_FINDFS=y
131 CONFIG_FREERAMDISK=y
132 CONFIG_FSCK_MINIX=y
133+CONFIG_MKFS_EXT2=y
134 CONFIG_MKFS_MINIX=y
135
136 #
137 # Minix filesystem support
138 #
139 CONFIG_FEATURE_MINIX2=y
140+# CONFIG_MKFS_REISER is not set
141 CONFIG_MKFS_VFAT=y
142 CONFIG_GETOPT=y
143 CONFIG_FEATURE_GETOPT_LONG=y
144@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
145 CONFIG_IPCRM=y
146 CONFIG_IPCS=y
147 CONFIG_LOSETUP=y
148+CONFIG_LSPCI=y
149+CONFIG_LSUSB=y
150 CONFIG_MDEV=y
151 CONFIG_FEATURE_MDEV_CONF=y
152 CONFIG_FEATURE_MDEV_RENAME=y
153@@ -518,6 +530,7 @@ CONFIG_MORE=y
154 CONFIG_FEATURE_USE_TERMIOS=y
155 CONFIG_VOLUMEID=y
156 CONFIG_FEATURE_VOLUMEID_EXT=y
157+CONFIG_FEATURE_VOLUMEID_BTRFS=y
158 CONFIG_FEATURE_VOLUMEID_REISERFS=y
159 CONFIG_FEATURE_VOLUMEID_FAT=y
160 CONFIG_FEATURE_VOLUMEID_HFS=y
161@@ -595,11 +608,12 @@ CONFIG_DEVMEM=y
162 CONFIG_EJECT=y
163 CONFIG_FEATURE_EJECT_SCSI=y
164 CONFIG_FBSPLASH=y
165-# CONFIG_FLASH_LOCK is not set
166-# CONFIG_FLASH_UNLOCK is not set
167-# CONFIG_FLASH_ERASEALL is not set
168+CONFIG_FLASHCP=y
169+CONFIG_FLASH_LOCK=y
170+CONFIG_FLASH_UNLOCK=y
171+CONFIG_FLASH_ERASEALL=y
172 CONFIG_IONICE=y
173-# CONFIG_INOTIFYD is not set
174+CONFIG_INOTIFYD=y
175 CONFIG_LAST=y
176 # CONFIG_FEATURE_LAST_SMALL is not set
177 CONFIG_FEATURE_LAST_FANCY=y
178@@ -632,8 +646,8 @@ CONFIG_RUNLEVEL=y
179 CONFIG_RX=y
180 CONFIG_SETSID=y
181 CONFIG_STRINGS=y
182-# CONFIG_TASKSET is not set
183-# CONFIG_FEATURE_TASKSET_FANCY is not set
184+CONFIG_TASKSET=y
185+CONFIG_FEATURE_TASKSET_FANCY=y
186 CONFIG_TIME=y
187 CONFIG_TIMEOUT=y
188 CONFIG_TTYSIZE=y
189@@ -658,6 +672,7 @@ CONFIG_ETHER_WAKE=y
190 CONFIG_FAKEIDENTD=y
191 CONFIG_FTPD=y
192 CONFIG_FEATURE_FTP_WRITE=y
193+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
194 CONFIG_FTPGET=y
195 CONFIG_FTPPUT=y
196 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
197@@ -723,6 +738,8 @@ CONFIG_NETSTAT=y
198 CONFIG_FEATURE_NETSTAT_WIDE=y
199 CONFIG_FEATURE_NETSTAT_PRG=y
200 CONFIG_NSLOOKUP=y
201+CONFIG_NTPD=y
202+CONFIG_FEATURE_NTPD_SERVER=y
203 CONFIG_PING=y
204 CONFIG_PING6=y
205 CONFIG_FEATURE_FANCY_PING=y
206@@ -734,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
207 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
208 CONFIG_TELNETD=y
209 CONFIG_FEATURE_TELNETD_STANDALONE=y
210+CONFIG_FEATURE_TELNETD_INETD_WAIT=y
211 CONFIG_TFTP=y
212 CONFIG_TFTPD=y
213 CONFIG_FEATURE_TFTP_GET=y
214 CONFIG_FEATURE_TFTP_PUT=y
215 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
216+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
217 # CONFIG_TFTP_DEBUG is not set
218 CONFIG_TRACEROUTE=y
219+CONFIG_TRACEROUTE6=y
220 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
221 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
222 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
223@@ -814,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
224 CONFIG_FEATURE_TOP_DECIMALS=y
225 CONFIG_FEATURE_TOP_SMP_PROCESS=y
226 CONFIG_FEATURE_TOPMEM=y
227+CONFIG_FEATURE_SHOW_THREADS=y
228 CONFIG_UPTIME=y
229 CONFIG_WATCH=y
230
231@@ -878,6 +899,7 @@ CONFIG_HUSH_CASE=y
232 CONFIG_HUSH_FUNCTIONS=y
233 CONFIG_HUSH_LOCAL=y
234 CONFIG_HUSH_EXPORT_N=y
235+CONFIG_HUSH_RANDOM_SUPPORT=y
236 # CONFIG_LASH is not set
237 CONFIG_MSH=y
238 CONFIG_SH_MATH_SUPPORT=y
239diff -urpN busybox-1.16.0/TODO_config_nommu busybox-1.16.0-defconfig/TODO_config_nommu
240--- busybox-1.16.0/TODO_config_nommu 2010-01-25 01:59:38.000000000 +0100
241+++ busybox-1.16.0-defconfig/TODO_config_nommu 2010-02-21 01:53:15.000000000 +0100
242@@ -1,7 +1,7 @@
243 #
244 # Automatically generated make config: don't edit
245-# Busybox version: 1.15.0.svn
246-# Fri Aug 21 00:13:18 2009
247+# Busybox version: 1.16.0
248+# Wed Jan 27 21:01:26 2010
249 #
250 CONFIG_HAVE_DOT_CONFIG=y
251
252@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
253 #
254 CONFIG_DESKTOP=y
255 CONFIG_EXTRA_COMPAT=y
256+CONFIG_INCLUDE_SUSv2=y
257+# CONFIG_USE_PORTABLE_CODE is not set
258 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
259 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
260 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
261@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
262 CONFIG_NO_DEBUG_LIB=y
263 # CONFIG_DMALLOC is not set
264 # CONFIG_EFENCE is not set
265-CONFIG_INCLUDE_SUSv2=y
266
267 #
268 # Installation Options
269@@ -120,6 +121,7 @@ CONFIG_DPKG_DEB=y
270 CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
271 CONFIG_GUNZIP=y
272 CONFIG_GZIP=y
273+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
274 CONFIG_LZOP=y
275 CONFIG_LZOP_COMPR_HIGH=y
276 CONFIG_RPM2CPIO=y
277@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
278 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
279 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
280 CONFIG_FEATURE_TAR_UNAME_GNAME=y
281+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
282 CONFIG_UNCOMPRESS=y
283 CONFIG_UNLZMA=y
284 CONFIG_FEATURE_LZMA_FAST=y
285@@ -148,15 +151,19 @@ CONFIG_CATV=y
286 CONFIG_CHGRP=y
287 CONFIG_CHMOD=y
288 CONFIG_CHOWN=y
289+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
290 CONFIG_CHROOT=y
291 CONFIG_CKSUM=y
292 CONFIG_COMM=y
293 CONFIG_CP=y
294+CONFIG_FEATURE_CP_LONG_OPTIONS=y
295 CONFIG_CUT=y
296 CONFIG_DATE=y
297 CONFIG_FEATURE_DATE_ISOFMT=y
298+CONFIG_FEATURE_DATE_COMPAT=y
299 CONFIG_DD=y
300 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
301+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
302 CONFIG_FEATURE_DD_IBS_OBS=y
303 CONFIG_DF=y
304 CONFIG_FEATURE_DF_FANCY=y
305@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
306 CONFIG_FEATURE_HUMAN_READABLE=y
307
308 #
309-# Common options for md5sum, sha1sum
310+# Common options for md5sum, sha1sum, sha256sum, sha512sum
311 #
312 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
313
314@@ -318,9 +325,8 @@ CONFIG_AWK=y
315 CONFIG_FEATURE_AWK_LIBM=y
316 CONFIG_CMP=y
317 CONFIG_DIFF=y
318-CONFIG_FEATURE_DIFF_BINARY=y
319+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
320 CONFIG_FEATURE_DIFF_DIR=y
321-CONFIG_FEATURE_DIFF_MINIMAL=y
322 CONFIG_ED=y
323 CONFIG_PATCH=y
324 CONFIG_SED=y
325@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
326 CONFIG_FEATURE_FIND_PATH=y
327 CONFIG_FEATURE_FIND_REGEX=y
328 CONFIG_FEATURE_FIND_CONTEXT=y
329+CONFIG_FEATURE_FIND_LINKS=y
330 CONFIG_GREP=y
331 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
332 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
333@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
334 # Options common to multiple modutils
335 #
336 # CONFIG_FEATURE_2_4_MODULES is not set
337+CONFIG_FEATURE_INSMOD_TRY_MMAP=y
338 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
339 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
340 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
341@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
342 CONFIG_FINDFS=y
343 CONFIG_FREERAMDISK=y
344 CONFIG_FSCK_MINIX=y
345+CONFIG_MKFS_EXT2=y
346 CONFIG_MKFS_MINIX=y
347
348 #
349 # Minix filesystem support
350 #
351 CONFIG_FEATURE_MINIX2=y
352+CONFIG_MKFS_REISER=y
353 CONFIG_MKFS_VFAT=y
354 CONFIG_GETOPT=y
355 CONFIG_FEATURE_GETOPT_LONG=y
356@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
357 CONFIG_IPCRM=y
358 CONFIG_IPCS=y
359 CONFIG_LOSETUP=y
360+CONFIG_LSPCI=y
361+CONFIG_LSUSB=y
362 CONFIG_MDEV=y
363 CONFIG_FEATURE_MDEV_CONF=y
364 CONFIG_FEATURE_MDEV_RENAME=y
365@@ -518,6 +530,7 @@ CONFIG_MORE=y
366 CONFIG_FEATURE_USE_TERMIOS=y
367 CONFIG_VOLUMEID=y
368 CONFIG_FEATURE_VOLUMEID_EXT=y
369+CONFIG_FEATURE_VOLUMEID_BTRFS=y
370 CONFIG_FEATURE_VOLUMEID_REISERFS=y
371 CONFIG_FEATURE_VOLUMEID_FAT=y
372 CONFIG_FEATURE_VOLUMEID_HFS=y
373@@ -595,6 +608,7 @@ CONFIG_DEVMEM=y
374 CONFIG_EJECT=y
375 CONFIG_FEATURE_EJECT_SCSI=y
376 CONFIG_FBSPLASH=y
377+CONFIG_FLASHCP=y
378 # CONFIG_FLASH_LOCK is not set
379 # CONFIG_FLASH_UNLOCK is not set
380 # CONFIG_FLASH_ERASEALL is not set
381@@ -638,6 +652,7 @@ CONFIG_TIME=y
382 CONFIG_TIMEOUT=y
383 CONFIG_TTYSIZE=y
384 CONFIG_VOLNAME=y
385+CONFIG_WALL=y
386 CONFIG_WATCHDOG=y
387
388 #
389@@ -657,6 +672,7 @@ CONFIG_ETHER_WAKE=y
390 CONFIG_FAKEIDENTD=y
391 CONFIG_FTPD=y
392 CONFIG_FEATURE_FTP_WRITE=y
393+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
394 CONFIG_FTPGET=y
395 CONFIG_FTPPUT=y
396 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
397@@ -722,6 +738,8 @@ CONFIG_NETSTAT=y
398 CONFIG_FEATURE_NETSTAT_WIDE=y
399 CONFIG_FEATURE_NETSTAT_PRG=y
400 CONFIG_NSLOOKUP=y
401+CONFIG_NTPD=y
402+CONFIG_FEATURE_NTPD_SERVER=y
403 CONFIG_PING=y
404 CONFIG_PING6=y
405 CONFIG_FEATURE_FANCY_PING=y
406@@ -733,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
407 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
408 CONFIG_TELNETD=y
409 CONFIG_FEATURE_TELNETD_STANDALONE=y
410+CONFIG_FEATURE_TELNETD_INETD_WAIT=y
411 CONFIG_TFTP=y
412 CONFIG_TFTPD=y
413 CONFIG_FEATURE_TFTP_GET=y
414 CONFIG_FEATURE_TFTP_PUT=y
415 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
416+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
417 CONFIG_TFTP_DEBUG=y
418 CONFIG_TRACEROUTE=y
419+CONFIG_TRACEROUTE6=y
420 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
421 CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
422 CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
423@@ -813,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
424 CONFIG_FEATURE_TOP_DECIMALS=y
425 CONFIG_FEATURE_TOP_SMP_PROCESS=y
426 CONFIG_FEATURE_TOPMEM=y
427+CONFIG_FEATURE_SHOW_THREADS=y
428 CONFIG_UPTIME=y
429 CONFIG_WATCH=y
430
431@@ -881,6 +903,7 @@ CONFIG_HUSH_CASE=y
432 CONFIG_HUSH_FUNCTIONS=y
433 CONFIG_HUSH_LOCAL=y
434 CONFIG_HUSH_EXPORT_N=y
435+CONFIG_HUSH_RANDOM_SUPPORT=y
436 CONFIG_LASH=y
437 CONFIG_MSH=y
438 CONFIG_SH_MATH_SUPPORT=y
diff --git a/main/busybox/busybox-1.16.0-linux_swap.patch b/main/busybox/busybox-1.16.0-linux_swap.patch
deleted file mode 100644
index 78d60a8de7..0000000000
--- a/main/busybox/busybox-1.16.0-linux_swap.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1diff -urpN busybox-1.16.0/util-linux/volume_id/linux_swap.c busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c
2--- busybox-1.16.0/util-linux/volume_id/linux_swap.c 2010-01-25 01:59:39.000000000 +0100
3+++ busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c 2010-02-21 01:53:21.000000000 +0100
4@@ -52,7 +52,11 @@ int FAST_FUNC volume_id_probe_linux_swap
5 goto found;
6 }
7
8- if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
9+ if (memcmp(buf, "SWAPSPACE2", 10) == 0
10+ || memcmp(buf, "S1SUSPEND", 9) == 0
11+ || memcmp(buf, "S2SUSPEND", 9) == 0
12+ || memcmp(buf, "ULSUSPEND", 9) == 0
13+ ) {
14 sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
15 if (sw == NULL)
16 return -1;
diff --git a/main/busybox/busybox-1.16.0-md5_sha_compat.patch b/main/busybox/busybox-1.16.0-md5_sha_compat.patch
deleted file mode 100644
index e982c0efba..0000000000
--- a/main/busybox/busybox-1.16.0-md5_sha_compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1diff -urpN busybox-1.16.0/coreutils/md5_sha1_sum.c busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c
2--- busybox-1.16.0/coreutils/md5_sha1_sum.c 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c 2010-02-21 01:53:28.000000000 +0100
4@@ -101,8 +101,10 @@ int md5_sha1_sum_main(int argc UNUSED_PA
5 unsigned flags;
6 /*hash_algo_t hash_algo = applet_name[3];*/
7
8- if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
9- flags = getopt32(argv, "scw");
10+ if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) {
11+ /* -b "binary", -t "text" are ignored (shaNNNsum compat) */
12+ flags = getopt32(argv, "scwbt");
13+ }
14 else optind = 1;
15 argv += optind;
16 //argc -= optind;
diff --git a/main/busybox/busybox-1.16.0-syslogd.patch b/main/busybox/busybox-1.16.0-syslogd.patch
deleted file mode 100644
index dcca134fd5..0000000000
--- a/main/busybox/busybox-1.16.0-syslogd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff -urpN busybox-1.16.0/sysklogd/syslogd.c busybox-1.16.0-syslogd/sysklogd/syslogd.c
2--- busybox-1.16.0/sysklogd/syslogd.c 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-syslogd/sysklogd/syslogd.c 2010-02-21 01:53:33.000000000 +0100
4@@ -698,7 +698,7 @@ int syslogd_main(int argc UNUSED_PARAM,
5 if (!(opts & OPT_nofork)) {
6 bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
7 }
8- umask(0);
9+ //umask(0); - why??
10 write_pidfile("/var/run/syslogd.pid");
11 do_syslogd();
12 /* return EXIT_SUCCESS; */
diff --git a/main/busybox/busybox-1.16.0-tftp.patch b/main/busybox/busybox-1.16.0-tftp.patch
deleted file mode 100644
index b6fb6c7b3e..0000000000
--- a/main/busybox/busybox-1.16.0-tftp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff -urpN busybox-1.16.0/networking/tftp.c busybox-1.16.0-tftp/networking/tftp.c
2--- busybox-1.16.0/networking/tftp.c 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-tftp/networking/tftp.c 2010-02-21 01:53:41.000000000 +0100
4@@ -308,7 +308,7 @@ static int tftp_protocol(
5
6 if (!ENABLE_TFTP || our_lsa) { /* tftpd */
7 /* Open file (must be after changing user) */
8- local_fd = open(local_file, open_mode);
9+ local_fd = open(local_file, open_mode, 0666);
10 if (local_fd < 0) {
11 error_pkt_reason = ERR_NOFILE;
12 strcpy((char*)error_pkt_str, "can't open file");
diff --git a/main/busybox/busybox-1.16.0-usage.patch b/main/busybox/busybox-1.16.0-usage.patch
deleted file mode 100644
index a2e884bb3c..0000000000
--- a/main/busybox/busybox-1.16.0-usage.patch
+++ /dev/null
@@ -1,1141 +0,0 @@
1diff -urpN busybox-1.16.0/include/usage.h busybox-1.16.0-usage/include/usage.h
2--- busybox-1.16.0/include/usage.h 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-usage/include/usage.h 2010-02-21 01:53:47.000000000 +0100
4@@ -16,7 +16,7 @@
5 #define NOUSAGE_STR "\b"
6
7 #define acpid_trivial_usage \
8- "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE...]"
9+ "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE]..."
10 #define acpid_full_usage "\n\n" \
11 "Listen to ACPI events and spawn specific helpers on event arrival\n" \
12 "\nOptions:" \
13@@ -33,7 +33,7 @@
14 "# acpid -d /dev/input/event*\n"
15
16 #define addgroup_trivial_usage \
17- "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[user_name] ") "group_name"
18+ "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
19 #define addgroup_full_usage "\n\n" \
20 "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n" \
21 "\nOptions:" \
22@@ -41,7 +41,7 @@
23 "\n -S Create a system group" \
24
25 #define adduser_trivial_usage \
26- "[OPTIONS] user_name"
27+ "[OPTIONS] USER"
28 #define adduser_full_usage "\n\n" \
29 "Add a user\n" \
30 "\nOptions:" \
31@@ -55,16 +55,16 @@
32 "\n -u UID User id" \
33
34 #define adjtimex_trivial_usage \
35- "[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
36+ "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
37 #define adjtimex_full_usage "\n\n" \
38- "Read and optionally set system timebase parameters. See adjtimex(2).\n" \
39+ "Read and optionally set system timebase parameters. See adjtimex(2)\n" \
40 "\nOptions:" \
41- "\n -q Quiet" \
42- "\n -o offset Time offset, microseconds" \
43- "\n -f frequency Frequency adjust, integer kernel units (65536 is 1ppm)" \
44- "\n (positive values make clock run faster)" \
45- "\n -t tick Microseconds per tick, usually 10000" \
46- "\n -p timeconstant" \
47+ "\n -q Quiet" \
48+ "\n -o OFF Time offset, microseconds" \
49+ "\n -f FREQ Frequency adjust, integer kernel units (65536 is 1ppm)" \
50+ "\n (positive values make clock run faster)" \
51+ "\n -t TICK Microseconds per tick, usually 10000" \
52+ "\n -p TCONST" \
53
54 #define ar_trivial_usage \
55 "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
56@@ -78,11 +78,11 @@
57 "\n -v Verbose" \
58
59 #define arp_trivial_usage \
60- "\n[-vn] [-H type] [-i if] -a [hostname]" \
61- "\n[-v] [-i if] -d hostname [pub]" \
62- "\n[-v] [-H type] [-i if] -s hostname hw_addr [temp]" \
63- "\n[-v] [-H type] [-i if] -s hostname hw_addr [netmask nm] pub" \
64- "\n[-v] [-H type] [-i if] -Ds hostname ifa [netmask nm] pub"
65+ "\n[-vn] [-H HWTYPE] [-i IF] -a [HOSTNAME]" \
66+ "\n[-v] [-i IF] -d HOSTNAME [pub]" \
67+ "\n[-v] [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [temp]" \
68+ "\n[-v] [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [netmask MASK] pub" \
69+ "\n[-v] [-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
70 #define arp_full_usage "\n\n" \
71 "Manipulate ARP cache\n" \
72 "\nOptions:" \
73@@ -97,7 +97,7 @@
74 "\n -H HWTYPE Hardware address type" \
75
76 #define arping_trivial_usage \
77- "[-fqbDUA] [-c count] [-w timeout] [-I dev] [-s sender] target"
78+ "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
79 #define arping_full_usage "\n\n" \
80 "Send ARP requests/replies\n" \
81 "\nOptions:" \
82@@ -108,10 +108,10 @@
83 "\n -U Unsolicited ARP mode, update your neighbors" \
84 "\n -A ARP answer mode, update your neighbors" \
85 "\n -c N Stop after sending N ARP requests" \
86- "\n -w timeout Time to wait for ARP reply, in seconds" \
87- "\n -I dev Interface to use (default eth0)" \
88- "\n -s sender Sender IP address" \
89- "\n target Target IP address" \
90+ "\n -w TIMEOUT Time to wait for ARP reply, seconds" \
91+ "\n -I IFACE Interface to use (default eth0)" \
92+ "\n -s SRC_IP Sender IP address" \
93+ "\n DST_IP Target IP address" \
94
95 #define sh_trivial_usage NOUSAGE_STR
96 #define sh_full_usage ""
97@@ -191,19 +191,19 @@
98 ) \
99
100 #define bunzip2_trivial_usage \
101- "[OPTIONS] [FILE]"
102+ "[OPTIONS] [FILE]..."
103 #define bunzip2_full_usage "\n\n" \
104- "Uncompress FILE (or standard input)\n" \
105+ "Uncompress FILEs (or stdin)\n" \
106 "\nOptions:" \
107- "\n -c Write to standard output" \
108+ "\n -c Write to stdout" \
109 "\n -f Force" \
110
111 #define bzip2_trivial_usage \
112 "[OPTIONS] [FILE]..."
113 #define bzip2_full_usage "\n\n" \
114- "Compress FILEs (or standard input) with bzip2 algorithm.\n" \
115+ "Compress FILEs (or stdin) with bzip2 algorithm\n" \
116 "\nOptions:" \
117- "\n -c Write to standard output" \
118+ "\n -c Write to stdout" \
119 "\n -d Decompress" \
120 "\n -f Force" \
121 "\n -1..-9 Compression level" \
122@@ -214,7 +214,7 @@
123 #define lzop_trivial_usage \
124 "[-cfvd123456789CF] [FILE]..."
125 #define lzop_full_usage "\n\n" \
126- " -c Write to standard output" \
127+ " -c Write to stdout" \
128 "\n -f Force" \
129 "\n -v Verbose" \
130 "\n -d Decompress" \
131@@ -231,7 +231,7 @@
132 #define unlzop_trivial_usage \
133 "[-cfvCF] [FILE]..."
134 #define unlzop_full_usage "\n\n" \
135- " -c Write to standard output" \
136+ " -c Write to stdout" \
137 "\n -f Force" \
138 "\n -v Verbose" \
139 "\n -F Don't store or verify checksum" \
140@@ -242,11 +242,11 @@
141 "Uncompress to stdout"
142
143 #define unlzma_trivial_usage \
144- "[OPTIONS] [FILE]"
145+ "[OPTIONS] [FILE]..."
146 #define unlzma_full_usage "\n\n" \
147- "Uncompress FILE (or standard input)\n" \
148+ "Uncompress FILE (or stdin)\n" \
149 "\nOptions:" \
150- "\n -c Write to standard output" \
151+ "\n -c Write to stdout" \
152 "\n -f Force" \
153
154 #define lzmacat_trivial_usage \
155@@ -255,7 +255,7 @@
156 "Uncompress to stdout"
157
158 #define cal_trivial_usage \
159- "[-jy] [[month] year]"
160+ "[-jy] [[MONTH] YEAR]"
161 #define cal_full_usage "\n\n" \
162 "Display a calendar\n" \
163 "\nOptions:" \
164@@ -436,21 +436,21 @@
165 "\n -c BYTES Limit core file size" \
166 "\n -v Verbose" \
167 "\n -P Create new process group" \
168- "\n -0 Close standard input" \
169- "\n -1 Close standard output" \
170- "\n -2 Close standard error" \
171+ "\n -0 Close stdin" \
172+ "\n -1 Close stdout" \
173+ "\n -2 Close stderr" \
174
175 #define setuidgid_trivial_usage \
176- "account prog args"
177+ "USER PROG ARGS"
178 #define setuidgid_full_usage "\n\n" \
179- "Set uid and gid to account's uid and gid, removing all supplementary\n" \
180+ "Set uid and gid to USER's uid and gid, removing all supplementary\n" \
181 "groups and run PROG"
182 #define envuidgid_trivial_usage \
183- "account prog args"
184+ "USER PROG ARGS"
185 #define envuidgid_full_usage "\n\n" \
186- "Set $UID to account's uid and $GID to account's gid and run PROG"
187+ "Set $UID to USER's uid and $GID to USER's gid and run PROG"
188 #define envdir_trivial_usage \
189- "dir prog args"
190+ "DIR PROG ARGS"
191 #define envdir_full_usage "\n\n" \
192 "Set various environment variables as specified by files\n" \
193 "in the directory dir and run PROG"
194@@ -477,7 +477,7 @@
195 "\n a SIGXCPU after N seconds" \
196
197 #define chroot_trivial_usage \
198- "NEWROOT [PROG [ARGS]]"
199+ "NEWROOT [PROG ARGS]"
200 #define chroot_full_usage "\n\n" \
201 "Run PROG with root directory set to NEWROOT"
202 #define chroot_example_usage \
203@@ -527,7 +527,7 @@
204 "Print the config file which built busybox"
205
206 #define chrt_trivial_usage \
207- "[OPTIONS] [PRIO] [PID | PROG [ARGS]]"
208+ "[OPTIONS] [PRIO] [PID | PROG ARGS]"
209 #define chrt_full_usage "\n\n" \
210 "Manipulate real-time attributes of a process\n" \
211 "\nOptions:" \
212@@ -567,7 +567,7 @@
213 "Extract or list files from a cpio archive" \
214 IF_FEATURE_CPIO_O(", or" \
215 "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)") \
216- " using file list on standard input" \
217+ " using file list on stdin" \
218 ) \
219 "\n" \
220 "\nMain operation mode:" \
221@@ -658,7 +658,7 @@
222 #define cut_trivial_usage \
223 "[OPTIONS] [FILE]..."
224 #define cut_full_usage "\n\n" \
225- "Print selected fields from each input FILE to standard output\n" \
226+ "Print selected fields from each input FILE to stdout\n" \
227 "\nOptions:" \
228 "\n -b LIST Output only bytes from LIST" \
229 "\n -c LIST Output only characters from LIST" \
230@@ -721,7 +721,7 @@
231 "p - print top of the stack (without altering the stack),\n" \
232 "f - print entire stack, o - pop the value and set output radix\n" \
233 "(value must be 10 or 16).\n" \
234- "Examples: 'dc 2 2 add' -> 4, 'dc 8 8 * 2 2 + /' -> 16.\n" \
235+ "Examples: 'dc 2 2 add' -> 4, 'dc 8 8 * 2 2 + /' -> 16\n" \
236
237 #define dc_example_usage \
238 "$ dc 2 2 + p\n" \
239@@ -815,7 +815,7 @@
240 "[-Pk" \
241 IF_FEATURE_HUMAN_READABLE("mh") \
242 IF_FEATURE_DF_FANCY("ai] [-B SIZE") \
243- "] [FILESYSTEM...]"
244+ "] [FILESYSTEM]..."
245 #define df_full_usage "\n\n" \
246 "Print filesystem usage statistics\n" \
247 "\nOptions:" \
248@@ -847,7 +847,7 @@
249 "/dev/sda3 17381728 17107080 274648 98% /\n"
250
251 #define dhcprelay_trivial_usage \
252- "CLIENT_IFACE[,CLIENT_IFACE2...] SERVER_IFACE [SERVER_IP]"
253+ "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]"
254 #define dhcprelay_full_usage "\n\n" \
255 "Relay DHCP requests between clients and server" \
256
257@@ -893,15 +893,20 @@
258 "\n -s SIZE Buffer size" \
259
260 #define dnsd_trivial_usage \
261- "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]"
262+ "[-dvs] [-c CONFFILE] [-t TTL_SEC] [-p PORT] [-i ADDR]"
263 #define dnsd_full_usage "\n\n" \
264 "Small static DNS server daemon\n" \
265 "\nOptions:" \
266- "\n -c Config filename" \
267- "\n -t TTL in seconds" \
268- "\n -p Listening port" \
269- "\n -i Listening ip (default all)" \
270+ "\n -c FILE Config file" \
271+ "\n -t SEC TTL" \
272+ "\n -p PORT Listen on PORT" \
273+ "\n -i ADDR Listen on ADDR" \
274 "\n -d Daemonize" \
275+ "\n -v Verbose" \
276+ "\n -s Send successful replies only. Use this if you want" \
277+ "\n to use /etc/resolv.conf with two nameserver lines:" \
278+ "\n nameserver DNSD_SERVER" \
279+ "\n nameserver NORNAL_DNS_SERVER" \
280
281 #define dos2unix_trivial_usage \
282 "[OPTIONS] [FILE]"
283@@ -922,7 +927,7 @@
284 "\n -d unix2dos" \
285
286 #define dpkg_trivial_usage \
287- "[-ilCPru] [-F option] package_name"
288+ "[-ilCPru] [-F OPT] PACKAGE"
289 #define dpkg_full_usage "\n\n" \
290 "Install, remove and manage Debian packages\n" \
291 "\nOptions:" \
292@@ -988,7 +993,7 @@
293 #define dumpkmap_trivial_usage \
294 "> keymap"
295 #define dumpkmap_full_usage "\n\n" \
296- "Print a binary keyboard translation table to standard output"
297+ "Print a binary keyboard translation table to stdout"
298 #define dumpkmap_example_usage \
299 "$ dumpkmap > keymap\n"
300
301@@ -1031,7 +1036,7 @@
302 */
303
304 #define echo_trivial_usage \
305- IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG...]"
306+ IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..."
307 #define echo_full_usage "\n\n" \
308 "Print the specified ARGs to stdout" \
309 IF_FEATURE_FANCY_ECHO( "\n" \
310@@ -1053,7 +1058,7 @@
311 #define eject_trivial_usage \
312 "[-t] [-T] [DEVICE]"
313 #define eject_full_usage "\n\n" \
314- "Eject specified DEVICE (or default /dev/cdrom)\n" \
315+ "Eject DEVICE or default /dev/cdrom\n" \
316 "\nOptions:" \
317 IF_FEATURE_EJECT_SCSI( \
318 "\n -s SCSI device" \
319@@ -1065,7 +1070,7 @@
320 #define ed_full_usage ""
321
322 #define env_trivial_usage \
323- "[-iu] [-] [name=value]... [PROG [ARGS]]"
324+ "[-iu] [-] [name=value]... [PROG ARGS]"
325 #define env_full_usage "\n\n" \
326 "Print the current environment or run PROG after setting up\n" \
327 "the specified environment\n" \
328@@ -1087,7 +1092,7 @@
329 #define expand_trivial_usage \
330 "[-i] [-t N] [FILE|-]"
331 #define expand_full_usage "\n\n" \
332- "Convert tabs to spaces, writing to standard output\n" \
333+ "Convert tabs to spaces, writing to stdout\n" \
334 "\nOptions:" \
335 IF_FEATURE_EXPAND_LONG_OPTIONS( \
336 "\n -i,--initial Don't convert tabs after non blanks" \
337@@ -1101,7 +1106,7 @@
338 #define expr_trivial_usage \
339 "EXPRESSION"
340 #define expr_full_usage "\n\n" \
341- "Print the value of EXPRESSION to standard output\n" \
342+ "Print the value of EXPRESSION to stdout\n" \
343 "\n" \
344 "EXPRESSION may be:\n" \
345 " ARG1 | ARG2 ARG1 if it is neither null nor 0, otherwise ARG2\n" \
346@@ -1216,7 +1221,7 @@
347 "$ findfs LABEL=MyDevice"
348
349 #define find_trivial_usage \
350- "[PATH...] [EXPRESSION]"
351+ "[PATH]... [EXPRESSION]"
352 #define find_full_usage "\n\n" \
353 "Search for files. The default PATH is the current directory,\n" \
354 "default EXPRESSION is '-print'\n" \
355@@ -1256,7 +1261,7 @@
356 IF_FEATURE_FIND_DEPTH( \
357 "\n -depth Process directory name after traversing it") \
358 IF_FEATURE_FIND_SIZE( \
359- "\n -size N[bck] File size is N (c:bytes,k:kbytes,b:512 bytes(def.))." \
360+ "\n -size N[bck] File size is N (c:bytes,k:kbytes,b:512 bytes(def.))" \
361 "\n +/-N: file size is bigger/smaller than N") \
362 IF_FEATURE_FIND_LINKS( \
363 "\n -links N Number of links is greater than (+N), less than (-N)," \
364@@ -1308,10 +1313,9 @@
365 "\n -v Verbose" \
366
367 #define fold_trivial_usage \
368- "[-bs] [-w WIDTH] [FILE]"
369+ "[-bs] [-w WIDTH] [FILE]..."
370 #define fold_full_usage "\n\n" \
371- "Wrap input lines in each FILE (standard input by default), writing to\n" \
372- "standard output\n" \
373+ "Wrap input lines in each FILE (or stdin), writing to stdout\n" \
374 "\nOptions:" \
375 "\n -b Count bytes rather than columns" \
376 "\n -s Break at spaces" \
377@@ -1336,7 +1340,7 @@
378 "$ freeramdisk /dev/ram2\n"
379
380 #define fsck_trivial_usage \
381- "[-ANPRTV] [-C fd] [-t fstype] [fs-options] [filesys...]"
382+ "[-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]..."
383 #define fsck_full_usage "\n\n" \
384 "Check and repair filesystems\n" \
385 "\nOptions:" \
386@@ -1347,10 +1351,10 @@
387 "\n -T Don't show title on startup" \
388 "\n -V Verbose" \
389 "\n -C n Write status information to specified filedescriptor" \
390- "\n -t type List of filesystem types to check" \
391+ "\n -t TYPE List of filesystem types to check" \
392
393 #define fsck_minix_trivial_usage \
394- "[-larvsmf] /dev/name"
395+ "[-larvsmf] BLOCKDEV"
396 #define fsck_minix_full_usage "\n\n" \
397 "Check MINIX filesystem\n" \
398 "\nOptions:" \
399@@ -1463,7 +1467,7 @@
400 "#!/bin/sh\n" \
401 "GETOPT=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \\\n" \
402 " -n 'example.busybox' -- \"$@\"`\n" \
403- "if [ $? != 0 ]; then exit 1; fi\n" \
404+ "if [ $? != 0 ]; then exit 1; fi\n" \
405 "eval set -- \"$GETOPT\"\n" \
406 "while true; do\n" \
407 " case $1 in\n" \
408@@ -1502,42 +1506,47 @@
409 "\n -H HOST Log HOST into the utmp file as the hostname" \
410
411 #define grep_trivial_usage \
412- "[-HhrilLnqvso" \
413+ "[-HhnlLoqvsri" \
414 IF_DESKTOP("w") \
415- "eF" \
416+ "F" \
417 IF_FEATURE_GREP_EGREP_ALIAS("E") \
418- IF_FEATURE_GREP_CONTEXT("ABC") \
419 IF_EXTRA_COMPAT("z") \
420- "] PATTERN [FILE]..."
421+ "] [-m N] " \
422+ IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") \
423+ "PATTERN/-e PATTERN.../-f FILE [FILE]..."
424 #define grep_full_usage "\n\n" \
425- "Search for PATTERN in each FILE or standard input\n" \
426+ "Search for PATTERN in FILEs (or stdin)\n" \
427 "\nOptions:" \
428- "\n -H Prefix output lines with filename where match was found" \
429- "\n -h Suppress the prefixing filename on output" \
430- "\n -r Recurse" \
431- "\n -i Ignore case distinctions" \
432- "\n -l List names of files that match" \
433- "\n -L List names of files that don't match" \
434- "\n -n Print line number with output lines" \
435+ "\n -H Add 'filename:' prefix" \
436+ "\n -h Do not add 'filename:' prefix" \
437+ "\n -n Add 'line_no:' prefix" \
438+ "\n -l Show only names of files that match" \
439+ "\n -L Show only names of files that don't match" \
440+ "\n -c Show only count of matching lines" \
441+ "\n -o Show only the matching part of line" \
442 "\n -q Quiet. Return 0 if PATTERN is found, 1 otherwise" \
443 "\n -v Select non-matching lines" \
444- "\n -s Suppress file open/read error messages" \
445- "\n -c Only print count of matching lines" \
446- "\n -o Show only the part of a line that matches PATTERN" \
447- "\n -m N Match up to N times per file" \
448+ "\n -s Suppress open and read errors" \
449+ "\n -r Recurse" \
450+ "\n -i Ignore case" \
451 IF_DESKTOP( \
452- "\n -w Match whole words only") \
453- "\n -F PATTERN is a set of newline-separated strings" \
454+ "\n -w Match whole words only" \
455+ ) \
456+ "\n -F PATTERN is a literal (not regexp)" \
457 IF_FEATURE_GREP_EGREP_ALIAS( \
458- "\n -E PATTERN is an extended regular expression") \
459- "\n -e PTRN Pattern to match" \
460- "\n -f FILE Read pattern from file" \
461+ "\n -E PATTERN is an extended regexp" \
462+ ) \
463+ IF_EXTRA_COMPAT( \
464+ "\n -z Input is NUL terminated" \
465+ ) \
466+ "\n -m N Match up to N times per file" \
467 IF_FEATURE_GREP_CONTEXT( \
468 "\n -A N Print N lines of trailing context" \
469 "\n -B N Print N lines of leading context" \
470- "\n -C N Print N lines of output context") \
471- IF_EXTRA_COMPAT( \
472- "\n -z Input is NUL terminated") \
473+ "\n -C N Same as '-A N -B N'" \
474+ ) \
475+ "\n -e PTRN Pattern to match" \
476+ "\n -f FILE Read pattern from file" \
477
478 #define grep_example_usage \
479 "$ grep root /etc/passwd\n" \
480@@ -1554,9 +1563,9 @@
481 #define gunzip_trivial_usage \
482 "[OPTIONS] [FILE]..."
483 #define gunzip_full_usage "\n\n" \
484- "Uncompress FILEs (or standard input)\n" \
485+ "Uncompress FILEs (or stdin)\n" \
486 "\nOptions:" \
487- "\n -c Write to standard output" \
488+ "\n -c Write to stdout" \
489 "\n -f Force" \
490 "\n -t Test file integrity" \
491
492@@ -1570,9 +1579,9 @@
493 #define gzip_trivial_usage \
494 "[OPTIONS] [FILE]..."
495 #define gzip_full_usage "\n\n" \
496- "Compress FILEs (or standard input)\n" \
497+ "Compress FILEs (or stdin)\n" \
498 "\nOptions:" \
499- "\n -c Write to standard output" \
500+ "\n -c Write to stdout" \
501 "\n -d Decompress" \
502 "\n -f Force" \
503
504@@ -1649,7 +1658,7 @@
505 #define head_trivial_usage \
506 "[OPTIONS] [FILE]..."
507 #define head_full_usage "\n\n" \
508- "Print first 10 lines of each FILE (or standard input) to standard output.\n" \
509+ "Print first 10 lines of each FILE (or stdin) to stdout.\n" \
510 "With more than one FILE, precede each with a header giving the file name.\n" \
511 "\nOptions:" \
512 "\n -n N Print first N lines instead of first 10" \
513@@ -1664,9 +1673,9 @@
514 "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
515
516 #define hexdump_trivial_usage \
517- "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] FILE..."
518+ "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
519 #define hexdump_full_usage "\n\n" \
520- "Display FILEs or standard input in a user specified format\n" \
521+ "Display FILEs (or stdin) in a user specified format\n" \
522 "\nOptions:" \
523 "\n -b One-byte octal display" \
524 "\n -c One-byte character display" \
525@@ -1795,7 +1804,7 @@
526 " [up|down] ..."
527
528 #define ifenslave_trivial_usage \
529- "[-cdf] master-iface <slave-iface...>"
530+ "[-cdf] MASTER_IFACE SLAVE_IFACE..."
531 #define ifenslave_full_usage "\n\n" \
532 "Configure network interfaces for parallel routing\n" \
533 "\nOptions:" \
534@@ -1847,7 +1856,7 @@
535 "\n -k Kill running daemon" \
536
537 #define ifup_trivial_usage \
538- "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
539+ "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] IFACE..."
540 #define ifup_full_usage "\n\n" \
541 "Options:" \
542 "\n -a De/configure all interfaces automatically" \
543@@ -2018,11 +2027,11 @@
544 " ::shutdown:/sbin/swapoff -a\n"
545
546 #define inotifyd_trivial_usage \
547- "PROG FILE1[:MASK] ..."
548+ "PROG FILE1[:MASK]..."
549 #define inotifyd_full_usage "\n\n" \
550 "Run PROG on filesystem changes." \
551 "\nWhen a filesystem event matching MASK occurs on FILEn," \
552- "\nPROG <actual_event(s)> <FILEn> [<subfile_name>] is run." \
553+ "\nPROG ACTUAL_EVENTS FILEn [SUBFILE] is run." \
554 "\nEvents:" \
555 "\n a File is accessed" \
556 "\n c File is modified" \
557@@ -2042,7 +2051,7 @@
558 "\n d Subfile is deleted" \
559 "\n" \
560 "\ninotifyd waits for PROG to exit." \
561- "\nWhen x event happens for all FILEs, inotifyd exits" \
562+ "\nWhen x event happens for all FILEs, inotifyd exits." \
563
564 /* 2.6 style insmod has no options and required filename
565 * (not module name - .ko can't be omitted) */
566@@ -2068,7 +2077,7 @@
567
568 /* -v, -b, -c are ignored */
569 #define install_trivial_usage \
570- "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [source] dest|directory"
571+ "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
572 #define install_full_usage "\n\n" \
573 "Copy files and set attributes\n" \
574 "\nOptions:" \
575@@ -2247,7 +2256,7 @@
576 "$ kill 252\n"
577
578 #define killall_trivial_usage \
579- "[-l] [-q] [-SIG] process-name..."
580+ "[-l] [-q] [-SIG] PROCESS_NAME..."
581 #define killall_full_usage "\n\n" \
582 "Send a signal (default: TERM) to given processes\n" \
583 "\nOptions:" \
584@@ -2287,8 +2296,7 @@
585 #define less_trivial_usage \
586 "[-EMNmh~I?] [FILE]..."
587 #define less_full_usage "\n\n" \
588- "View a file or list of files. The position within files can be\n" \
589- "changed, and files can be manipulated in various ways.\n" \
590+ "View FILE (or stdin) one screenful at a time\n" \
591 "\nOptions:" \
592 "\n -E Quit once the end of a file is reached" \
593 "\n -M,-m Display status line with line numbers" \
594@@ -2306,7 +2314,7 @@
595 #define linuxrc_full_usage ""
596
597 #define setarch_trivial_usage \
598- "personality program [args...]"
599+ "personality PROG ARGS"
600 #define setarch_full_usage "\n\n" \
601 "Personality may be:\n" \
602 " linux32 Set 32bit uname emulation\n" \
603@@ -2334,7 +2342,7 @@
604 #define loadfont_trivial_usage \
605 "< font"
606 #define loadfont_full_usage "\n\n" \
607- "Load a console font from standard input" \
608+ "Load a console font from stdin" \
609 /* "\n -C TTY Affect TTY instead of /dev/tty" */ \
610
611 #define loadfont_example_usage \
612@@ -2343,7 +2351,7 @@
613 #define loadkmap_trivial_usage \
614 "< keymap"
615 #define loadkmap_full_usage "\n\n" \
616- "Load a binary keyboard translation table from standard input\n" \
617+ "Load a binary keyboard translation table from stdin\n" \
618 /* "\n -C TTY Affect TTY instead of /dev/tty" */ \
619
620 #define loadkmap_example_usage \
621@@ -2352,7 +2360,7 @@
622 #define logger_trivial_usage \
623 "[OPTIONS] [MESSAGE]"
624 #define logger_full_usage "\n\n" \
625- "Write MESSAGE to the system log. If MESSAGE is omitted, log stdin.\n" \
626+ "Write MESSAGE (or stdin) to syslog\n" \
627 "\nOptions:" \
628 "\n -s Log to stderr as well as the system log" \
629 "\n -t TAG Log using the specified tag (defaults to user name)" \
630@@ -2415,7 +2423,7 @@
631 "\n tcpsvd -E 0 515 softlimit -m 999999 lpd /var/spool ./print" \
632
633 #define lpq_trivial_usage \
634- "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID...] [-fs]"
635+ "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID]... [-fs]"
636 #define lpq_full_usage "\n\n" \
637 "Options:" \
638 "\n -P lp service to connect to (else uses $PRINTER)" \
639@@ -2764,8 +2772,8 @@
640 "[-L LABEL] " \
641 /* "[-M last-mounted-directory] [-S] [-T filesystem-type] " */ \
642 "BLOCKDEV [KBYTES]"
643-#define mkfs_ext2_full_usage "\n" \
644- "\n -b BLK_SIZE Block size, bytes" \
645+#define mkfs_ext2_full_usage "\n\n" \
646+ " -b BLK_SIZE Block size, bytes" \
647 /* "\n -c Check device for bad blocks" */ \
648 /* "\n -E opts Set extended options" */ \
649 /* "\n -f size Fragment size in bytes" */ \
650@@ -2790,14 +2798,14 @@
651 /* "\n -v Verbose" */ \
652
653 #define mkfs_minix_trivial_usage \
654- "[-c | -l filename] [-nXX] [-iXX] BLOCKDEV [KBYTES]"
655+ "[-c | -l FILE] [-nXX] [-iXX] BLOCKDEV [KBYTES]"
656 #define mkfs_minix_full_usage "\n\n" \
657 "Make a MINIX filesystem\n" \
658 "\nOptions:" \
659 "\n -c Check device for bad blocks" \
660 "\n -n [14|30] Maximum length of filenames" \
661 "\n -i INODES Number of inodes for the filesystem" \
662- "\n -l FILENAME Read bad blocks list from FILENAME" \
663+ "\n -l FILE Read bad blocks list from FILE" \
664 "\n -v Make version 2 filesystem" \
665
666 #define mkfs_reiser_trivial_usage \
667@@ -2844,7 +2852,7 @@
668 "$ mknod -m 644 /tmp/pipe p\n"
669
670 #define mkswap_trivial_usage \
671- "[OPTIONS] BLOCKDEV" /* [SIZE_IN_KB] */
672+ "[OPTIONS] BLOCKDEV [KBYTES]"
673 #define mkswap_full_usage "\n\n" \
674 "Prepare BLOCKDEV to be used as swap partition\n" \
675 "\nOptions:" \
676@@ -2871,10 +2879,10 @@
677 "-rw------- 1 andersen andersen 0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
678
679 #define modprobe_trivial_usage \
680- IF_MODPROBE_SMALL("[-qfwrsv] MODULE [symbol=value...]") \
681+ IF_MODPROBE_SMALL("[-qfwrsv] MODULE [symbol=value]...") \
682 IF_NOT_MODPROBE_SMALL("[-" \
683 IF_FEATURE_2_4_MODULES("k")"nqrsv" \
684- IF_FEATURE_MODPROBE_BLACKLIST("b")"] MODULE [symbol=value...]")
685+ IF_FEATURE_MODPROBE_BLACKLIST("b")"] MODULE [symbol=value]...")
686 #define modprobe_full_usage "\n\n" \
687 "Options:" \
688 IF_MODPROBE_SMALL( \
689@@ -2962,7 +2970,7 @@
690 #define more_trivial_usage \
691 "[FILE]..."
692 #define more_full_usage "\n\n" \
693- "View FILE or standard input one screenful at a time"
694+ "View FILE (or stdin) one screenful at a time"
695
696 #define more_example_usage \
697 "$ dmesg | more\n"
698@@ -3180,7 +3188,7 @@
699 )
700
701 #define nice_trivial_usage \
702- "[-n ADJUST] [PROG [ARGS]]"
703+ "[-n ADJUST] [PROG ARGS]"
704 #define nice_full_usage "\n\n" \
705 "Run PROG with modified scheduling priority\n" \
706 "\nOptions:" \
707@@ -3212,7 +3220,7 @@
708 "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
709
710 #define nohup_trivial_usage \
711- "PROG [ARGS]"
712+ "PROG ARGS"
713 #define nohup_full_usage "\n\n" \
714 "Run PROG immune to hangups, with output to a non-tty"
715 #define nohup_example_usage \
716@@ -3251,10 +3259,10 @@
717 "[-aBbcDdeFfHhIiLlOovXx] " IF_DESKTOP("[-t TYPE] ") "[FILE]"
718 #define od_full_usage "\n\n" \
719 "Write an unambiguous representation, octal bytes by default, of FILE\n" \
720- "(or standard input) to standard output."
721+ "(or stdin) to stdout"
722
723 #define openvt_trivial_usage \
724- "[-c N] [-sw] [PROG [ARGS]]"
725+ "[-c N] [-sw] [PROG ARGS]"
726 #define openvt_full_usage "\n\n" \
727 "Start PROG on a new virtual terminal\n" \
728 "\nOptions:" \
729@@ -3334,11 +3342,11 @@
730
731 #if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
732 #define pidof_trivial_usage \
733- "[OPTIONS] [NAME...]"
734+ "[OPTIONS] [NAME]..."
735 #define USAGE_PIDOF "\n\nOptions:"
736 #else
737 #define pidof_trivial_usage \
738- "[NAME...]"
739+ "[NAME]..."
740 #define USAGE_PIDOF /* none */
741 #endif
742 #define pidof_full_usage "\n\n" \
743@@ -3473,13 +3481,13 @@
744 "\n -f Force power off (don't go through init)" \
745
746 #define printenv_trivial_usage \
747- "[VARIABLE...]"
748+ "[VARIABLE]..."
749 #define printenv_full_usage "\n\n" \
750- "Print all or part of environment.\n" \
751- "If no environment VARIABLE specified, print them all."
752+ "Print environment VARIABLEs.\n" \
753+ "If no VARIABLE specified, print all."
754
755 #define printf_trivial_usage \
756- "FORMAT [ARGUMENT...]"
757+ "FORMAT [ARGUMENT]..."
758 #define printf_full_usage "\n\n" \
759 "Format and print ARGUMENT(s) according to FORMAT,\n" \
760 "where FORMAT controls the output exactly as in C printf"
761@@ -3610,9 +3618,9 @@
762 "\n -n Disable byte order auto-detection" \
763
764 #define realpath_trivial_usage \
765- "pathname..."
766+ "FILE..."
767 #define realpath_full_usage "\n\n" \
768- "Return the absolute pathnames of given argument"
769+ "Return the absolute pathnames of given FILE"
770
771 #define reboot_trivial_usage \
772 "[-d DELAY] [-n] [-f]"
773@@ -3628,11 +3636,11 @@
774 #define reformime_full_usage "\n\n" \
775 "Parse MIME-encoded message\n" \
776 "\nOptions:" \
777- "\n -x prefix Extract content of MIME sections to files" \
778- "\n -X prog [args] Filter content of MIME sections through prog." \
779+ "\n -x PREFIX Extract content of MIME sections to files" \
780+ "\n -X PROG ARGS Filter content of MIME sections through PROG" \
781 "\n Must be the last option" \
782 "\n" \
783- "\nOther options are silently ignored." \
784+ "\nOther options are silently ignored" \
785
786 #define renice_trivial_usage \
787 "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
788@@ -3725,7 +3733,7 @@
789 "\n -A inet" IF_FEATURE_IPV6("{6}") " Select address family" \
790
791 #define rpm_trivial_usage \
792- "-i -q[ildc]p package.rpm"
793+ "-i -q[ildc]p PACKAGE.rpm"
794 #define rpm_full_usage "\n\n" \
795 "Manipulate RPM packages\n" \
796 "\nOptions:" \
797@@ -3766,8 +3774,8 @@
798 )
799
800 #define runcon_trivial_usage \
801- "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG [ARGS]\n" \
802- " runcon CONTEXT PROG [ARGS]"
803+ "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG ARGS\n" \
804+ " runcon CONTEXT PROG ARGS"
805 #define runcon_full_usage "\n\n" \
806 "Run PROG in a different security context\n" \
807 "\n CONTEXT Complete security context\n" \
808@@ -3813,23 +3821,23 @@
809 "+ shutdown -h +4m"
810
811 #define runlevel_trivial_usage \
812- "[utmp]"
813+ "[FILE]"
814 #define runlevel_full_usage "\n\n" \
815 "Find the current and previous system runlevel\n" \
816 "\n" \
817- "If no utmp file exists or if no runlevel record can be found,\n" \
818+ "If no utmp FILE exists or if no runlevel record can be found,\n" \
819 "print \"unknown\""
820 #define runlevel_example_usage \
821 "$ runlevel /var/run/utmp\n" \
822 "N 2"
823
824 #define runsv_trivial_usage \
825- "dir"
826+ "DIR"
827 #define runsv_full_usage "\n\n" \
828 "Start and monitor a service and optionally an appendant log service"
829
830 #define runsvdir_trivial_usage \
831- "[-P] [-s SCRIPT] dir"
832+ "[-P] [-s SCRIPT] DIR"
833 #define runsvdir_full_usage "\n\n" \
834 "Start a runsv process for each subdirectory. If it exits, restart it.\n" \
835 "\n -P Put each runsv in a new session" \
836@@ -3908,7 +3916,7 @@
837 "[-w] [-s SEP] [FIRST [INC]] LAST"
838 #define seq_full_usage "\n\n" \
839 "Print numbers from FIRST to LAST, in steps of INC.\n" \
840- "FIRST, INC default to 1\n" \
841+ "FIRST, INC default to 1.\n" \
842 "\nOptions:" \
843 "\n -w Pad to last with leading zeros" \
844 "\n -s SEP String separator" \
845@@ -3949,7 +3957,7 @@
846 "\n -e DIR Exclude DIR" \
847 "\n -F Force reset of context to match file_context for customizable files" \
848 "\n -o FILE Save list of files with incorrect context" \
849- "\n -s Take a list of files from standard input (instead of command line)" \
850+ "\n -s Take a list of files from stdin (instead of command line)" \
851 "\n -v Show changes in file labels, if type or role are changing" \
852 "\n -vv Show changes in file labels, if type, role, or user are changing" \
853 "\n -W Display warnings about entries that had no matching files" \
854@@ -3971,7 +3979,7 @@
855 "Set entries into the kernel's scancode-to-keycode map,\n" \
856 "allowing unusual keyboards to generate usable keycodes.\n\n" \
857 "SCANCODE may be either xx or e0xx (hexadecimal),\n" \
858- "and KEYCODE is given in decimal" \
859+ "and KEYCODE is given in decimal." \
860
861 #define setkeycodes_example_usage \
862 "$ setkeycodes e030 127\n"
863@@ -3988,7 +3996,7 @@
864 "Change boolean setting"
865
866 #define setsid_trivial_usage \
867- "PROG [ARG...]"
868+ "PROG ARGS"
869 #define setsid_full_usage "\n\n" \
870 "Run PROG in a new session. PROG will have no controlling terminal\n" \
871 "and will not be affected by keyboard signals (Ctrl-C etc).\n" \
872@@ -4103,7 +4111,7 @@
873 "$ cat TODO | split -a 2 -l 2 TODO_\n"
874
875 #define start_stop_daemon_trivial_usage \
876- "[OPTIONS] [-S|-K] ... [-- arguments...]"
877+ "[OPTIONS] [-S|-K] ... [-- ARGS...]"
878 #define start_stop_daemon_full_usage "\n\n" \
879 "Search for matching processes, and then\n" \
880 "-K: stop all matching processes.\n" \
881@@ -4256,7 +4264,7 @@
882 "\n -s SH Shell to use instead of default shell" \
883
884 #define sulogin_trivial_usage \
885- "[OPTIONS] [TTY]"
886+ "[-t N] [TTY]"
887 #define sulogin_full_usage "\n\n" \
888 "Single user login\n" \
889 "\nOptions:" \
890@@ -4271,7 +4279,7 @@
891 "\n -s Use System V sum algorithm (512byte blocks)" \
892
893 #define sv_trivial_usage \
894- "[-v] [-w SEC] command service..."
895+ "[-v] [-w SEC] CMD SERVICE_DIR..."
896 #define sv_full_usage "\n\n" \
897 "Control services monitored by runsv supervisor.\n" \
898 "Commands (only first character is enough):\n" \
899@@ -4289,7 +4297,7 @@
900 #define svlogd_trivial_usage \
901 "[-ttv] [-r c] [-R abc] [-l len] [-b buflen] dir..."
902 #define svlogd_full_usage "\n\n" \
903- "Continuously read log data from standard input, optionally\n" \
904+ "Continuously read log data from stdin, optionally\n" \
905 "filter log messages, and write the data to one or more automatically\n" \
906 "rotated logs" \
907
908@@ -4326,7 +4334,7 @@
909
910 #define fsync_trivial_usage \
911 "[OPTIONS] FILE..."
912-#define fsync_full_usage \
913+#define fsync_full_usage "\n\n" \
914 "Write files' buffered blocks to disk\n" \
915 "\nOptions:" \
916 "\n -d Avoid syncing metadata"
917@@ -4354,11 +4362,11 @@
918 "[OPTIONS]"
919 #define syslogd_full_usage "\n\n" \
920 "System logging utility.\n" \
921- "Note that this version of syslogd ignores /etc/syslog.conf.\n" \
922+ "This version of syslogd ignores /etc/syslog.conf\n" \
923 "\nOptions:" \
924 "\n -n Run in foreground" \
925 "\n -O FILE Log to given file (default:/var/log/messages)" \
926- "\n -l n Set local log level" \
927+ "\n -l N Set local log level" \
928 "\n -S Smaller logging output" \
929 IF_FEATURE_ROTATE_LOGFILE( \
930 "\n -s SIZE Max size (KB) before rotate (default:200KB, 0=off)" \
931@@ -4385,7 +4393,7 @@
932 #define tail_trivial_usage \
933 "[OPTIONS] [FILE]..."
934 #define tail_full_usage "\n\n" \
935- "Print last 10 lines of each FILE (or standard input) to standard output.\n" \
936+ "Print last 10 lines of each FILE (or stdin) to stdout.\n" \
937 "With more than one FILE, precede each with a header giving the file name.\n" \
938 "\nOptions:" \
939 IF_FEATURE_FANCY_TAIL( \
940@@ -4454,7 +4462,7 @@
941 "$ tar -cf /tmp/tarball.tar /usr/local\n"
942
943 #define taskset_trivial_usage \
944- "[-p] [MASK] [PID | PROG [ARGS]]"
945+ "[-p] [MASK] [PID | PROG ARGS]"
946 #define taskset_full_usage "\n\n" \
947 "Set or get CPU affinity\n" \
948 "\nOptions:" \
949@@ -4474,7 +4482,7 @@
950 #define tee_trivial_usage \
951 "[OPTIONS] [FILE]..."
952 #define tee_full_usage "\n\n" \
953- "Copy standard input to each FILE, and also to standard output\n" \
954+ "Copy stdin to each FILE, and also to stdout\n" \
955 "\nOptions:" \
956 "\n -a Append to the given FILEs, don't overwrite" \
957 "\n -i Ignore interrupt signals (SIGINT)" \
958@@ -4514,9 +4522,9 @@
959 "\n -p PORT Port to listen on" \
960 "\n -b ADDR[:PORT] Address to bind to" \
961 "\n -F Run in foreground" \
962- "\n -i Run as inetd service" \
963+ "\n -i Inetd mode" \
964 IF_FEATURE_TELNETD_INETD_WAIT( \
965- "\n -w SEC Run as inetd service in wait mode, linger time SEC" \
966+ "\n -w SEC Inetd 'wait' mode, linger time SEC" \
967 "\n -S Log to syslog (implied by -i or without -F and -w)" \
968 ) \
969 )
970@@ -4568,11 +4576,11 @@
971 /* with not-implemented options: */
972 /* "[-hpEvv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] [-i DIR|-x CDB] [-t SEC] IP PORT PROG" */
973 #define tcpsvd_full_usage "\n\n" \
974- "Create TCP socket, bind to IP:PORT and listen\n" \
975+ "Create TCP socket, bind to IP:PORT and listen\n" \
976 "for incoming connection. Run PROG for each connection.\n" \
977 "\n IP IP to listen on. '0' = all" \
978 "\n PORT Port to listen on" \
979- "\n PROG [ARGS] Program to run" \
980+ "\n PROG ARGS Program to run" \
981 "\n -l NAME Local hostname (else looks up local hostname in DNS)" \
982 "\n -u USER[:GRP] Change to user/group after bind" \
983 "\n -c N Handle up to N connections simultaneously" \
984@@ -4592,7 +4600,7 @@
985 "redirecting all further packets with same peer ip:port to it.\n" \
986 "\n IP IP to listen on. '0' = all" \
987 "\n PORT Port to listen on" \
988- "\n PROG [ARGS] Program to run" \
989+ "\n PROG ARGS Program to run" \
990 "\n -l NAME Local hostname (else looks up local hostname in DNS)" \
991 "\n -u USER[:GRP] Change to user/group after bind" \
992 "\n -c N Handle up to N connections simultaneously" \
993@@ -4633,14 +4641,14 @@
994 "\n -u Access files as USER" \
995
996 #define time_trivial_usage \
997- "[OPTIONS] PROG [ARGS]"
998+ "[OPTIONS] PROG ARGS"
999 #define time_full_usage "\n\n" \
1000- "Run PROG. When it finishes, its resource usage is displayed.\n" \
1001+ "Run PROG, display resource usage when it exits\n" \
1002 "\nOptions:" \
1003 "\n -v Verbose" \
1004
1005 #define timeout_trivial_usage \
1006- "[-t SECS] [-s SIG] PROG [ARGS]"
1007+ "[-t SECS] [-s SIG] PROG ARGS"
1008 #define timeout_full_usage "\n\n" \
1009 "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n" \
1010 "Defaults: SECS: 10, SIG: TERM." \
1011@@ -4650,7 +4658,8 @@
1012 #define top_full_usage "\n\n" \
1013 "Provide a view of process activity in real time.\n" \
1014 "Read the status of all processes from /proc each SECONDS\n" \
1015- "and show the status for however many processes will fit on the screen." \
1016+ "and display a screenful of them." \
1017+//TODO: add options and keyboard commands
1018
1019 #define touch_trivial_usage \
1020 "[-c] [-d DATE] FILE [FILE]..."
1021@@ -4670,8 +4679,7 @@
1022 #define tr_trivial_usage \
1023 "[-cds] STRING1 [STRING2]"
1024 #define tr_full_usage "\n\n" \
1025- "Translate, squeeze, and/or delete characters from\n" \
1026- "standard input, writing to standard output\n" \
1027+ "Translate, squeeze, or delete characters from stdin, writing to stdout\n" \
1028 "\nOptions:" \
1029 "\n -c Take complement of STRING1" \
1030 "\n -d Delete input characters coded STRING1" \
1031@@ -4693,7 +4701,7 @@
1032 ) \
1033 "\n -F Set the don't fragment bit" \
1034 "\n -I Use ICMP ECHO instead of UDP datagrams" \
1035- "\n -l Display the ttl value of the returned packet" \
1036+ "\n -l Display the TTL value of the returned packet" \
1037 "\n -d Set SO_DEBUG options to socket" \
1038 "\n -n Print numeric addresses" \
1039 "\n -r Bypass routing tables, send directly to HOST" \
1040@@ -4701,7 +4709,7 @@
1041 "\n -m Max time-to-live (max number of hops)" \
1042 "\n -p Base UDP port number used in probes" \
1043 "\n (default 33434)" \
1044- "\n -q Number of probes per 'ttl' (default 3)" \
1045+ "\n -q Number of probes per TTL (default 3)" \
1046 "\n -s IP address to use as the source address" \
1047 "\n -t Type-of-service in probe packets (default 0)" \
1048 "\n -w Time in seconds to wait for a response (default 3)" \
1049@@ -4721,7 +4729,7 @@
1050 "\n -m Max time-to-live (max number of hops)" \
1051 "\n -p Base UDP port number used in probes" \
1052 "\n (default is 33434)" \
1053- "\n -q Number of probes per 'ttl' (default 3)" \
1054+ "\n -q Number of probes per TTL (default 3)" \
1055 "\n -s IP address to use as the source address" \
1056 "\n -t Type-of-service in probe packets (default 0)" \
1057 "\n -w Time in seconds to wait for a response (default 3)" \
1058@@ -4738,7 +4746,7 @@
1059 #define tty_trivial_usage \
1060 ""
1061 #define tty_full_usage "\n\n" \
1062- "Print file name of standard input's terminal" \
1063+ "Print file name of stdin's terminal" \
1064 IF_INCLUDE_SUSv2( "\n" \
1065 "\nOptions:" \
1066 "\n -s Print nothing, only return exit status" \
1067@@ -4750,7 +4758,7 @@
1068 #define ttysize_trivial_usage \
1069 "[w] [h]"
1070 #define ttysize_full_usage "\n\n" \
1071- "Print dimension(s) of standard input's terminal, on error return 80x25"
1072+ "Print dimension(s) of stdin's terminal, on error return 80x25"
1073
1074 #define tunctl_trivial_usage \
1075 "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
1076@@ -4894,7 +4902,7 @@
1077 "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n"
1078
1079 #define uncompress_trivial_usage \
1080- "[-c] [-f] [FILE...]"
1081+ "[-c] [-f] [FILE]..."
1082 #define uncompress_full_usage "\n\n" \
1083 "Uncompress .Z file[s]\n" \
1084 "\nOptions:" \
1085@@ -4904,7 +4912,7 @@
1086 #define unexpand_trivial_usage \
1087 "[-f][-a][-t N] [FILE|-]"
1088 #define unexpand_full_usage "\n\n" \
1089- "Convert spaces to tabs, writing to standard output\n" \
1090+ "Convert spaces to tabs, writing to stdout\n" \
1091 "\nOptions:" \
1092 IF_FEATURE_UNEXPAND_LONG_OPTIONS( \
1093 "\n -a,--all Convert all blanks" \
1094@@ -5029,13 +5037,13 @@
1095 #define wall_trivial_usage \
1096 "[FILE]"
1097 #define wall_full_usage "\n\n" \
1098- "Write content of FILE or standard-input to all logged-in users"
1099+ "Write content of FILE or stdin to all logged-in users"
1100 #define wall_sample_usage \
1101 "echo foo | wall\n" \
1102 "wall ./mymessage"
1103
1104 #define watch_trivial_usage \
1105- "[-n seconds] [-t] PROG [ARGS]"
1106+ "[-n SEC] [-t] PROG ARGS"
1107 #define watch_full_usage "\n\n" \
1108 "Run PROG periodically\n" \
1109 "\nOptions:" \
1110@@ -5062,8 +5070,8 @@
1111 #define wc_trivial_usage \
1112 "[OPTIONS] [FILE]..."
1113 #define wc_full_usage "\n\n" \
1114- "Print line, word, and byte counts for each FILE, and a total line if\n" \
1115- "more than one FILE is specified. With no FILE, read standard input.\n" \
1116+ "Print line, word, and byte counts for each FILE (or stdin),\n" \
1117+ "and a total line if more than one FILE is specified\n" \
1118 "\nOptions:" \
1119 "\n -c Print the byte counts" \
1120 "\n -l Print the newline counts" \
1121@@ -5078,7 +5086,7 @@
1122 IF_FEATURE_WGET_LONG_OPTIONS( \
1123 "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document file]\n" \
1124 " [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
1125- " [-U|--user-agent agent] url" \
1126+ " [--no-check-certificate] [-U|--user-agent agent] url" \
1127 ) \
1128 IF_NOT_FEATURE_WGET_LONG_OPTIONS( \
1129 "[-csq] [-O file] [-Y on/off] [-P DIR] [-U agent] url" \
1130@@ -5115,9 +5123,9 @@
1131 "Print the user name associated with the current effective user id"
1132
1133 #define xargs_trivial_usage \
1134- "[OPTIONS] [PROG [ARGS]]"
1135+ "[OPTIONS] [PROG ARGS]"
1136 #define xargs_full_usage "\n\n" \
1137- "Run PROG on every item given by standard input\n" \
1138+ "Run PROG on every item given by stdin\n" \
1139 "\nOptions:" \
1140 IF_FEATURE_XARGS_SUPPORT_CONFIRMATION( \
1141 "\n -p Ask user whether to run each command") \
diff --git a/main/busybox/busybox-1.16.0-wc.patch b/main/busybox/busybox-1.16.0-wc.patch
deleted file mode 100644
index 5116fe23f7..0000000000
--- a/main/busybox/busybox-1.16.0-wc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff -urpN busybox-1.16.0/coreutils/wc.c busybox-1.16.0-wc/coreutils/wc.c
2--- busybox-1.16.0/coreutils/wc.c 2010-03-08 22:49:32.000000000 +0100
3+++ busybox-1.16.0-wc/coreutils/wc.c 2010-03-08 22:51:29.310086707 +0100
4@@ -88,6 +88,8 @@ int wc_main(int argc UNUSED_PARAM, char
5 if (!argv[0]) {
6 *--argv = (char *) bb_msg_standard_input;
7 fname_fmt = "\n";
8+ }
9+ if (!argv[1]) { /* zero or one filename? */
10 if (!((print_type-1) & print_type)) /* exactly one option? */
11 start_fmt = "%"COUNT_FMT;
12 }
diff --git a/main/busybox/busybox-1.16.0-wget.patch b/main/busybox/busybox-1.16.0-wget.patch
deleted file mode 100644
index 4750a005c1..0000000000
--- a/main/busybox/busybox-1.16.0-wget.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1diff -urpN busybox-1.16.0/networking/wget.c busybox-1.16.0-wget/networking/wget.c
2--- busybox-1.16.0/networking/wget.c 2010-01-25 01:59:38.000000000 +0100
3+++ busybox-1.16.0-wget/networking/wget.c 2010-02-21 01:53:53.000000000 +0100
4@@ -546,6 +546,8 @@ int wget_main(int argc UNUSED_PARAM, cha
5 "passive-ftp\0" No_argument "\xff"
6 "header\0" Required_argument "\xfe"
7 "post-data\0" Required_argument "\xfd"
8+ /* Ignored (we don't do ssl) */
9+ "no-check-certificate\0" No_argument "\xfc"
10 ;
11 #endif
12
13@@ -590,6 +592,7 @@ int wget_main(int argc UNUSED_PARAM, cha
14 if (use_proxy) {
15 proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
16 if (proxy && proxy[0]) {
17+ server.user = NULL;
18 parse_url(proxy, &server);
19 } else {
20 use_proxy = 0;
© 2015 Mike Crute