summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2017-10-03 17:38:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:33:21 +0000
commit3bbc1577d92d2e56354a34a774e702418c82c2aa (patch)
tree8297b0b46c3fb5cc67a84cee4d489a36dfc31858 /meta/recipes-core/busybox
parent7515e9f0bca31aaaf7460701101baf22808fd46a (diff)
downloadpoky-3bbc1577d92d2e56354a34a774e702418c82c2aa.tar.gz
busybox: 1.24.1 -> 1.27.2
- fixed link creation to shell - reported bug with suid shells [https://bugs.busybox.net/show_bug.cgi?id=10346] - removed and modified already merged patches - updated defconfig regarding to new version (From OE-Core rev: 55740077a1f3bed5956fe02ef17ba1d99176ea24) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox-1.24.1/ifupdown-pass-interface-device-name-for-ipv6-route-c.patch52
-rw-r--r--meta/recipes-core/busybox/busybox.inc16
-rw-r--r--meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch64
-rw-r--r--meta/recipes-core/busybox/busybox/0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch33
-rw-r--r--meta/recipes-core/busybox/busybox/0001-iproute-support-scope-.-Closes-8561.patch122
-rw-r--r--meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch134
-rw-r--r--meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch72
-rw-r--r--meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch53
-rw-r--r--meta/recipes-core/busybox/busybox/CVE-2016-2147.patch57
-rw-r--r--meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch32
-rw-r--r--meta/recipes-core/busybox/busybox/CVE-2016-2148.patch74
-rw-r--r--meta/recipes-core/busybox/busybox/CVE-2016-6301.patch37
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch81
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch143
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch118
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch18
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch53
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-tar-add-IF_FEATURE_-checks.patch70
-rw-r--r--meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch68
-rw-r--r--meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch61
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig572
-rw-r--r--meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch90
-rw-r--r--meta/recipes-core/busybox/busybox/makefile-fix-backport.patch40
-rw-r--r--meta/recipes-core/busybox/busybox_1.27.2.bb (renamed from meta/recipes-core/busybox/busybox_1.24.1.bb)23
24 files changed, 384 insertions, 1699 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.24.1/ifupdown-pass-interface-device-name-for-ipv6-route-c.patch b/meta/recipes-core/busybox/busybox-1.24.1/ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
deleted file mode 100644
index 5715378afc..0000000000
--- a/meta/recipes-core/busybox/busybox-1.24.1/ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 06fcf98f6ca40dc6b823d7d6231a240a1794ef2d Mon Sep 17 00:00:00 2001
2From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Tue, 28 Feb 2017 10:40:37 +0800
4Subject: [PATCH] ifupdown: pass interface device name for ipv6 route commands
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9commit 028524317d8d0011ed38e86e507a06738a5b5a97 from upstream
10
11IPv6 routes need the device argument for link-local routes, or they
12cannot be used at all. E.g. "gateway fe80::def" seems to be used in
13some places, but kernel refuses to insert the route unless device
14name is explicitly specified in the route addition.
15
16Signed-off-by: Timo Teräs <timo.teras@iki.fi>
17Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
18
19Upstream-Status: Backport
20Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
21---
22 networking/ifupdown.c | 7 ++++---
23 1 file changed, 4 insertions(+), 3 deletions(-)
24
25diff --git a/networking/ifupdown.c b/networking/ifupdown.c
26index 17bc4e9..a00f68d 100644
27--- a/networking/ifupdown.c
28+++ b/networking/ifupdown.c
29@@ -394,8 +394,8 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
30 # if ENABLE_FEATURE_IFUPDOWN_IP
31 result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
32 result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
33- /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
34- result += execute("[[ip route add ::/0 via %gateway%]][[ metric %metric%]]", ifd, exec);
35+ /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
36+ result += execute("[[ip route add ::/0 via %gateway% dev %iface%]][[ metric %metric%]]", ifd, exec);
37 # else
38 result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
39 result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
40@@ -421,7 +421,8 @@ static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
41 "%endpoint%[[ local %local%]][[ ttl %ttl%]]", ifd, exec);
42 result += execute("ip link set %iface% up", ifd, exec);
43 result += execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec);
44- result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
45+ /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
46+ result += execute("[[ip route add ::/0 via %gateway% dev %iface%]]", ifd, exec);
47 return ((result == 4) ? 4 : 0);
48 }
49
50--
511.9.1
52
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 48910ca33a..86f0c60249 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -156,6 +156,12 @@ do_compile() {
156 cp .config .config.orig 156 cp .config .config.orig
157 oe_runmake busybox.cfg.suid 157 oe_runmake busybox.cfg.suid
158 oe_runmake busybox.cfg.nosuid 158 oe_runmake busybox.cfg.nosuid
159
160 # workaround for suid bug 10346
161 if ! grep -q "CONFIG_SH_IS_NONE" busybox.cfg.nosuid; then
162 echo "CONFIG_SH_IS_NONE" >> busybox.cfg.suid
163 fi
164
159 for i in `cat busybox.cfg.suid busybox.cfg.nosuid`; do 165 for i in `cat busybox.cfg.suid busybox.cfg.nosuid`; do
160 echo "# $i is not set" >> .config.disable.apps 166 echo "# $i is not set" >> .config.disable.apps
161 done 167 done
@@ -165,6 +171,12 @@ do_compile() {
165 cat busybox.cfg.$s | while read item; do 171 cat busybox.cfg.$s | while read item; do
166 grep -w "$item" .config.orig 172 grep -w "$item" .config.orig
167 done > .config.app.$s 173 done > .config.app.$s
174
175 # workaround for suid bug 10346
176 if [ "$s" == "suid" ] ; then
177 sed "s/.*CONFIG_SH_IS_NONE.*$/CONFIG_SH_IS_NONE=y/" -i .config.app.suid
178 fi
179
168 merge_config.sh -m .config.nonapps .config.app.$s 180 merge_config.sh -m .config.nonapps .config.app.$s
169 oe_runmake busybox_unstripped 181 oe_runmake busybox_unstripped
170 mv busybox_unstripped busybox.$s 182 mv busybox_unstripped busybox.$s
@@ -204,7 +216,7 @@ do_install () {
204 install -m 0755 ${B}/busybox.nosuid ${D}${base_bindir} 216 install -m 0755 ${B}/busybox.nosuid ${D}${base_bindir}
205 install -m 0644 ${S}/busybox.links.suid ${D}${sysconfdir} 217 install -m 0644 ${S}/busybox.links.suid ${D}${sysconfdir}
206 install -m 0644 ${S}/busybox.links.nosuid ${D}${sysconfdir} 218 install -m 0644 ${S}/busybox.links.nosuid ${D}${sysconfdir}
207 if grep -q "CONFIG_FEATURE_SH_IS_ASH=y" ${B}/.config; then 219 if grep -q "CONFIG_SH_IS_ASH=y" ${B}/.config; then
208 ln -sf busybox.nosuid ${D}${base_bindir}/sh 220 ln -sf busybox.nosuid ${D}${base_bindir}/sh
209 fi 221 fi
210 # Keep a default busybox for people who want to invoke busybox directly. 222 # Keep a default busybox for people who want to invoke busybox directly.
@@ -218,7 +230,7 @@ do_install () {
218 install -m 0755 ${B}/busybox ${D}${base_bindir} 230 install -m 0755 ${B}/busybox ${D}${base_bindir}
219 fi 231 fi
220 install -m 0644 ${S}/busybox.links ${D}${sysconfdir} 232 install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
221 if grep -q "CONFIG_FEATURE_SH_IS_ASH=y" ${B}/.config; then 233 if grep -q "CONFIG_SH_IS_ASH=y" ${B}/.config; then
222 ln -sf busybox ${D}${base_bindir}/sh 234 ln -sf busybox ${D}${base_bindir}/sh
223 fi 235 fi
224 # We make this symlink here to eliminate the error when upgrading together 236 # We make this symlink here to eliminate the error when upgrading together
diff --git a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch b/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
deleted file mode 100644
index 78520f0d90..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From e1d426fd65c00a6d01a10d85edf8a294ae8a2d2b Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Sun, 24 Apr 2016 18:19:49 +0200
4Subject: [PATCH] flock: fix -c; improve error handling of fork+exec
5
6function old new delta
7flock_main 254 334 +80
8
9Upstream-Status: Backport
10
11Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 util-linux/flock.c | 19 +++++++++++++++++--
15 1 file changed, 17 insertions(+), 2 deletions(-)
16
17diff --git a/util-linux/flock.c b/util-linux/flock.c
18index 05a747f..539a835 100644
19--- a/util-linux/flock.c
20+++ b/util-linux/flock.c
21@@ -57,7 +57,6 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
22 /* If it is "flock FILE -c PROG", then -c isn't caught by getopt32:
23 * we use "+" in order to support "flock -opt FILE PROG -with-opts",
24 * we need to remove -c by hand.
25- * TODO: in upstream, -c 'PROG ARGS' means "run sh -c 'PROG ARGS'"
26 */
27 if (argv[0]
28 && argv[0][0] == '-'
29@@ -66,6 +65,9 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
30 )
31 ) {
32 argv++;
33+ if (argv[1])
34+ bb_error_msg_and_die("-c takes only one argument");
35+ opt |= OPT_c;
36 }
37
38 if (OPT_s == LOCK_SH && OPT_x == LOCK_EX && OPT_n == LOCK_NB && OPT_u == LOCK_UN) {
39@@ -90,8 +92,21 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
40 bb_perror_nomsg_and_die();
41 }
42
43- if (argv[0])
44+ if (argv[0]) {
45+ if (!(opt & OPT_c)) {
46+ int rc = spawn_and_wait(argv);
47+ if (rc < 0)
48+ bb_simple_perror_msg(argv[0]);
49+ return rc;
50+ }
51+ /* -c 'PROG ARGS' means "run sh -c 'PROG ARGS'" */
52+ argv -= 2;
53+ argv[0] = (char*)get_shell_name();
54+ argv[1] = (char*)"-c";
55+ /* argv[2] = "PROG ARGS"; */
56+ /* argv[3] = NULL; */
57 return spawn_and_wait(argv);
58+ }
59
60 return EXIT_SUCCESS;
61 }
62--
632.4.0
64
diff --git a/meta/recipes-core/busybox/busybox/0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch b/meta/recipes-core/busybox/busybox/0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch
deleted file mode 100644
index 812a507489..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 34ecc3b7aefdd6c31e8691bd5485037bbabedbd4 Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Sun, 14 Aug 2016 01:30:34 +0200
4Subject: [PATCH] ip: fix an improper optimization: req.r.rtm_scope may be
5 nonzero here
6
7Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
8---
9Upstream-Status: Backport
10Signed-off-by: André Draszik <adraszik@tycoint.com>
11
12 networking/libiproute/iproute.c | 3 +--
13 1 file changed, 1 insertion(+), 2 deletions(-)
14
15diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
16index e674e9a0d..48dc6e3d9 100644
17--- a/networking/libiproute/iproute.c
18+++ b/networking/libiproute/iproute.c
19@@ -362,10 +362,9 @@ IF_FEATURE_IP_RULE(ARG_table,)
20 req.r.rtm_scope = RT_SCOPE_NOWHERE;
21
22 if (cmd != RTM_DELROUTE) {
23+ req.r.rtm_scope = RT_SCOPE_UNIVERSE;
24 if (RTPROT_BOOT != 0)
25 req.r.rtm_protocol = RTPROT_BOOT;
26- if (RT_SCOPE_UNIVERSE != 0)
27- req.r.rtm_scope = RT_SCOPE_UNIVERSE;
28 if (RTN_UNICAST != 0)
29 req.r.rtm_type = RTN_UNICAST;
30 }
31--
322.11.0
33
diff --git a/meta/recipes-core/busybox/busybox/0001-iproute-support-scope-.-Closes-8561.patch b/meta/recipes-core/busybox/busybox/0001-iproute-support-scope-.-Closes-8561.patch
deleted file mode 100644
index 66bc76e65e..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-iproute-support-scope-.-Closes-8561.patch
+++ /dev/null
@@ -1,122 +0,0 @@
1From ce4bc1ed048233e89ee4cb95830bf6f01d523d1e Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Wed, 30 Dec 2015 17:32:51 +0100
4Subject: [PATCH] iproute: support "scope". Closes 8561
5
6function old new delta
7iproute_modify 1051 1120 +69
8
9Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
10
11Upstream-Status: Backport
12Modified patch to build against busybox 1.24.1:
13- s/invarg_1_to_2/invarg
14Signed-off-by: André Draszik <adraszik@tycoint.com>
15---
16 networking/libiproute/iproute.c | 52 ++++++++++++++++++++++++++---------------
17 1 file changed, 33 insertions(+), 19 deletions(-)
18
19diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
20index d232ee6fd..82827488f 100644
21--- a/networking/libiproute/iproute.c
22+++ b/networking/libiproute/iproute.c
23@@ -313,12 +313,13 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
24 static int iproute_modify(int cmd, unsigned flags, char **argv)
25 {
26 static const char keywords[] ALIGN1 =
27- "src\0""via\0""mtu\0""lock\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
28+ "src\0""via\0""mtu\0""lock\0""scope\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
29 "dev\0""oif\0""to\0""metric\0""onlink\0";
30 enum {
31 ARG_src,
32 ARG_via,
33 ARG_mtu, PARM_lock,
34+ ARG_scope,
35 ARG_protocol,
36 IF_FEATURE_IP_RULE(ARG_table,)
37 ARG_dev,
38@@ -344,6 +345,7 @@ IF_FEATURE_IP_RULE(ARG_table,)
39 unsigned mxlock = 0;
40 char *d = NULL;
41 smalluint ok = 0;
42+ smalluint scope_ok = 0;
43 int arg;
44
45 memset(&req, 0, sizeof(req));
46@@ -352,15 +354,18 @@ IF_FEATURE_IP_RULE(ARG_table,)
47 req.n.nlmsg_flags = NLM_F_REQUEST | flags;
48 req.n.nlmsg_type = cmd;
49 req.r.rtm_family = preferred_family;
50- if (RT_TABLE_MAIN) /* if it is zero, memset already did it */
51+ if (RT_TABLE_MAIN != 0) /* if it is zero, memset already did it */
52 req.r.rtm_table = RT_TABLE_MAIN;
53- if (RT_SCOPE_NOWHERE)
54+ if (RT_SCOPE_NOWHERE != 0)
55 req.r.rtm_scope = RT_SCOPE_NOWHERE;
56
57 if (cmd != RTM_DELROUTE) {
58- req.r.rtm_protocol = RTPROT_BOOT;
59- req.r.rtm_scope = RT_SCOPE_UNIVERSE;
60- req.r.rtm_type = RTN_UNICAST;
61+ if (RTPROT_BOOT != 0)
62+ req.r.rtm_protocol = RTPROT_BOOT;
63+ if (RT_SCOPE_UNIVERSE != 0)
64+ req.r.rtm_scope = RT_SCOPE_UNIVERSE;
65+ if (RTN_UNICAST != 0)
66+ req.r.rtm_type = RTN_UNICAST;
67 }
68
69 mxrta->rta_type = RTA_METRICS;
70@@ -393,6 +398,13 @@ IF_FEATURE_IP_RULE(ARG_table,)
71 }
72 mtu = get_unsigned(*argv, "mtu");
73 rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
74+ } else if (arg == ARG_scope) {
75+ uint32_t scope;
76+ NEXT_ARG();
77+ if (rtnl_rtscope_a2n(&scope, *argv))
78+ invarg(*argv, "scope");
79+ req.r.rtm_scope = scope;
80+ scope_ok = 1;
81 } else if (arg == ARG_protocol) {
82 uint32_t prot;
83 NEXT_ARG();
84@@ -469,20 +481,22 @@ IF_FEATURE_IP_RULE(ARG_table,)
85 addattr_l(&req.n, sizeof(req), RTA_METRICS, RTA_DATA(mxrta), RTA_PAYLOAD(mxrta));
86 }
87
88- if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
89- req.r.rtm_scope = RT_SCOPE_HOST;
90- else
91- if (req.r.rtm_type == RTN_BROADCAST
92- || req.r.rtm_type == RTN_MULTICAST
93- || req.r.rtm_type == RTN_ANYCAST
94- ) {
95- req.r.rtm_scope = RT_SCOPE_LINK;
96- }
97- else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
98- if (cmd == RTM_DELROUTE)
99- req.r.rtm_scope = RT_SCOPE_NOWHERE;
100- else if (!(ok & gw_ok))
101+ if (!scope_ok) {
102+ if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
103+ req.r.rtm_scope = RT_SCOPE_HOST;
104+ else
105+ if (req.r.rtm_type == RTN_BROADCAST
106+ || req.r.rtm_type == RTN_MULTICAST
107+ || req.r.rtm_type == RTN_ANYCAST
108+ ) {
109 req.r.rtm_scope = RT_SCOPE_LINK;
110+ }
111+ else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
112+ if (cmd == RTM_DELROUTE)
113+ req.r.rtm_scope = RT_SCOPE_NOWHERE;
114+ else if (!(ok & gw_ok))
115+ req.r.rtm_scope = RT_SCOPE_LINK;
116+ }
117 }
118
119 if (req.r.rtm_family == AF_UNSPEC) {
120--
1212.11.0
122
diff --git a/meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch b/meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
deleted file mode 100644
index aac5b4029b..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
+++ /dev/null
@@ -1,134 +0,0 @@
1From b5a9234272e6084557224c73ab7737ed47f09848 Mon Sep 17 00:00:00 2001
2From: Lukasz Nowak <lnowak@tycoint.com>
3Date: Wed, 23 Nov 2016 12:48:21 +0000
4Subject: [PATCH v2] libiproute: handle table ids larger than 255
5
6Linux kernel, starting from 2.6.19 allows ip table ids to have 32-bit values.
7In order to preserve compatibility, the old 8-bit field: rtm_table is still
8in use when table id is lower than 256.
9
10Add support for the 32-bit table id (RTA_TABLE attribute) in:
11- ip route print
12- ip route modify
13- ip rule print
14- ip rule modify
15
16Add printing of table ids to ip route.
17
18Changes are compatible with the mainline iproute2 utilities.
19
20These changes are required for compatibility with ConnMan, which by default
21uses table ids greater than 255.
22
23Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2016-December/084989.html]
24
25Signed-off-by: Lukasz Nowak <lnowak@tycoint.com>
26---
27 networking/libiproute/iproute.c | 24 ++++++++++++++++++++----
28 networking/libiproute/iprule.c | 11 +++++++++--
29 2 files changed, 29 insertions(+), 6 deletions(-)
30
31diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
32index 6ecd5f7..d5af498 100644
33--- a/networking/libiproute/iproute.c
34+++ b/networking/libiproute/iproute.c
35@@ -87,6 +87,7 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
36 inet_prefix dst;
37 inet_prefix src;
38 int host_len = -1;
39+ uint32_t tid;
40
41 if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
42 fprintf(stderr, "Not a route: %08x %08x %08x\n",
43@@ -99,6 +100,14 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
44 if (len < 0)
45 bb_error_msg_and_die("wrong nlmsg len %d", len);
46
47+ memset(tb, 0, sizeof(tb));
48+ parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
49+
50+ if (tb[RTA_TABLE])
51+ tid = *(uint32_t *)RTA_DATA(tb[RTA_TABLE]);
52+ else
53+ tid = r->rtm_table;
54+
55 if (r->rtm_family == AF_INET6)
56 host_len = 128;
57 else if (r->rtm_family == AF_INET)
58@@ -128,7 +137,7 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
59 }
60 }
61 } else {
62- if (G_filter.tb > 0 && G_filter.tb != r->rtm_table) {
63+ if (G_filter.tb > 0 && G_filter.tb != tid) {
64 return 0;
65 }
66 }
67@@ -157,10 +166,8 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
68 return 0;
69 }
70
71- memset(tb, 0, sizeof(tb));
72 memset(&src, 0, sizeof(src));
73 memset(&dst, 0, sizeof(dst));
74- parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
75
76 if (tb[RTA_SRC]) {
77 src.bitlen = r->rtm_src_len;
78@@ -283,6 +290,10 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
79 if (tb[RTA_OIF]) {
80 printf("dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
81 }
82+#if ENABLE_FEATURE_IP_RULE
83+ if (tid && tid != RT_TABLE_MAIN && !G_filter.tb)
84+ printf("table %s ", rtnl_rttable_n2a(tid));
85+#endif
86
87 /* Todo: parse & show "proto kernel", "scope link" here */
88
89@@ -434,7 +445,12 @@ IF_FEATURE_IP_RULE(ARG_table,)
90 NEXT_ARG();
91 if (rtnl_rttable_a2n(&tid, *argv))
92 invarg(*argv, "table");
93- req.r.rtm_table = tid;
94+ if (tid < 256)
95+ req.r.rtm_table = tid;
96+ else {
97+ req.r.rtm_table = RT_TABLE_UNSPEC;
98+ addattr32(&req.n, sizeof(req), RTA_TABLE, tid);
99+ }
100 #endif
101 } else if (arg == ARG_dev || arg == ARG_oif) {
102 NEXT_ARG();
103diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
104index 774a3e2..3fac7c5 100644
105--- a/networking/libiproute/iprule.c
106+++ b/networking/libiproute/iprule.c
107@@ -119,7 +119,9 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
108 printf("iif %s ", (char*)RTA_DATA(tb[RTA_IIF]));
109 }
110
111- if (r->rtm_table)
112+ if (tb[RTA_TABLE])
113+ printf("lookup %s ", rtnl_rttable_n2a(*(uint32_t*)RTA_DATA(tb[RTA_TABLE])));
114+ else if (r->rtm_table)
115 printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table));
116
117 if (tb[RTA_FLOW]) {
118@@ -259,7 +261,12 @@ static int iprule_modify(int cmd, char **argv)
119 NEXT_ARG();
120 if (rtnl_rttable_a2n(&tid, *argv))
121 invarg(*argv, "table ID");
122- req.r.rtm_table = tid;
123+ if (tid < 256)
124+ req.r.rtm_table = tid;
125+ else {
126+ req.r.rtm_table = RT_TABLE_UNSPEC;
127+ addattr32(&req.n, sizeof(req), RTA_TABLE, tid);
128+ }
129 table_ok = 1;
130 } else if (key == ARG_dev ||
131 key == ARG_iif
132--
1332.7.4
134
diff --git a/meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch b/meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
deleted file mode 100644
index 4f539848cb..0000000000
--- a/meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1From 903542f7331c58007a3ef938d41e1c55fc329648 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 31 Aug 2016 23:40:43 -0400
4Subject: [PATCH] sed: fix "sed n (flushes pattern space, terminates early)"
5 testcase failure
6
7This patch fix "sed n (flushes pattern space, terminates early)"
8testcase failure. We can see it at:
9
10 https://git.busybox.net/busybox/commit/?id=76d72376e0244a5cafd4880cdc623e37d86a75e4
11
12Upstream-Status: Backport
13
14Signed-off-by: Dengke Du <dengke.du@windriver.com>
15---
16 editors/sed.c | 19 ++++++++++---------
17 testsuite/sed.tests | 6 +-----
18 2 files changed, 11 insertions(+), 14 deletions(-)
19
20diff --git a/editors/sed.c b/editors/sed.c
21index 7bbf820..259c39c 100644
22--- a/editors/sed.c
23+++ b/editors/sed.c
24@@ -1274,16 +1274,17 @@ static void process_files(void)
25 case 'n':
26 if (!G.be_quiet)
27 sed_puts(pattern_space, last_gets_char);
28- if (next_line) {
29- free(pattern_space);
30- pattern_space = next_line;
31- last_gets_char = next_gets_char;
32- next_line = get_next_line(&next_gets_char, &last_puts_char, last_gets_char);
33- substituted = 0;
34- linenum++;
35- break;
36+ if (next_line == NULL) {
37+ /* If no next line, jump to end of script and exit. */
38+ goto discard_line;
39 }
40- /* fall through */
41+ free(pattern_space);
42+ pattern_space = next_line;
43+ last_gets_char = next_gets_char;
44+ next_line = get_next_line(&next_gets_char, &last_puts_char, last_gets_char);
45+ substituted = 0;
46+ linenum++;
47+ break;
48
49 /* Quit. End of script, end of input. */
50 case 'q':
51diff --git a/testsuite/sed.tests b/testsuite/sed.tests
52index 34479e5..96ff7a5 100755
53--- a/testsuite/sed.tests
54+++ b/testsuite/sed.tests
55@@ -73,13 +73,9 @@ testing "sed t (test/branch clears test bit)" "sed -e 's/a/b/;:loop;t loop'" \
56 testing "sed T (!test/branch)" "sed -e 's/a/1/;T notone;p;: notone;p'" \
57 "1\n1\n1\nb\nb\nc\nc\n" "" "a\nb\nc\n"
58
59-test x"$SKIP_KNOWN_BUGS" = x"" && {
60-# Normal sed end-of-script doesn't print "c" because n flushed the pattern
61-# space. If n hits EOF, pattern space is empty when script ends.
62-# Query: how does this interact with no newline at EOF?
63 testing "sed n (flushes pattern space, terminates early)" "sed -e 'n;p'" \
64 "a\nb\nb\nc\n" "" "a\nb\nc\n"
65-}
66+
67 # non-GNU sed: N does _not_ flush pattern space, therefore c is eaten @ script end
68 # GNU sed: N flushes pattern space, therefore c is printed too @ script end
69 testing "sed N (flushes pattern space (GNU behavior))" "sed -e 'N;p'" \
70--
712.8.1
72
diff --git a/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch b/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch
deleted file mode 100644
index 828694cbb9..0000000000
--- a/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1busybox1.24.1: Fix busybox - (local) cmdline stack buffer overwrite
2
3[No upstream tracking] -- https://bugs.busybox.net/show_bug.cgi?id=9071
4
5busybox - (local) cmdline stack buffer overwrite
6
7Busybox provides an `arp` applet which is missing an array bounds check for
8command-line parameter `IFNAME`. It is therefore vulnerable to a command-line
9based local stack buffer overwrite effectively allowing local users to write
10past a 16 bytes fixed stack buffer. This leads to two scenarios, one (A) where
11an IOCTL for GET_HW_ADDRESS (`SIOCGIFHWADDR`) fails and results in a corrupted
12`va_list` being passed to `*printf()` and one (B) where an attacker might provide
13valid params for the IOCTL and trick the program to proceed and result in a
14`RET eip overwrite` eventually gaining code execution.
15
16Upstream-Status: Backport [https://git.busybox.net/busybox/commit/networking/arp.c?id=88e2b1cb626761b1924305b761a5dfc723613c4e]
17BUG: BUG9071
18Signed-off-by: Martin Balik <martin.balik@siemens.com>
19Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
20
21--
22
23diff --git a/networking/arp.c b/networking/arp.c
24index 0099aa5..87eb327 100644
25--- a/networking/arp.c
26+++ b/networking/arp.c
27@@ -176,7 +176,7 @@ static int arp_del(char **args)
28 if (flags == 0)
29 flags = 3;
30
31- strncpy(req.arp_dev, device, sizeof(req.arp_dev));
32+ strncpy_IFNAMSIZ(req.arp_dev, device);
33
34 err = -1;
35
36@@ -217,7 +217,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa)
37 struct ifreq ifr;
38 const struct hwtype *xhw;
39
40- strcpy(ifr.ifr_name, ifname);
41+ strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
42 ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr,
43 "can't get HW-Address for '%s'", ifname);
44 if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) {
45@@ -330,7 +330,7 @@ static int arp_set(char **args)
46 /* Fill in the remainder of the request. */
47 req.arp_flags = flags;
48
49- strncpy(req.arp_dev, device, sizeof(req.arp_dev));
50+ strncpy_IFNAMSIZ(req.arp_dev, device);
51
52 /* Call the kernel. */
53 if (option_mask32 & ARP_OPT_v)
diff --git a/meta/recipes-core/busybox/busybox/CVE-2016-2147.patch b/meta/recipes-core/busybox/busybox/CVE-2016-2147.patch
deleted file mode 100644
index 84cae6aa2c..0000000000
--- a/meta/recipes-core/busybox/busybox/CVE-2016-2147.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From d474ffc68290e0a83651c4432eeabfa62cd51e87 Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Thu, 10 Mar 2016 11:47:58 +0100
4Subject: [PATCH] udhcp: fix a SEGV on malformed RFC1035-encoded domain name
5
6Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7
8Upstream-Status: Backport
9CVE: CVE-2016-2147
10
11https://git.busybox.net/busybox/commit/?id=d474ffc
12Signed-off-by: Armin Kuster <akuster@mvista.com>
13
14---
15 networking/udhcp/domain_codec.c | 13 +++++++++----
16 1 file changed, 9 insertions(+), 4 deletions(-)
17
18Index: busybox-1.23.2/networking/udhcp/domain_codec.c
19===================================================================
20--- busybox-1.23.2.orig/networking/udhcp/domain_codec.c
21+++ busybox-1.23.2/networking/udhcp/domain_codec.c
22@@ -63,11 +63,10 @@ char* FAST_FUNC dname_dec(const uint8_t
23 if (crtpos + *c + 1 > clen) /* label too long? abort */
24 return NULL;
25 if (dst)
26- memcpy(dst + len, c + 1, *c);
27+ /* \3com ---> "com." */
28+ ((char*)mempcpy(dst + len, c + 1, *c))[0] = '.';
29 len += *c + 1;
30 crtpos += *c + 1;
31- if (dst)
32- dst[len - 1] = '.';
33 } else {
34 /* NUL: end of current domain name */
35 if (retpos == 0) {
36@@ -78,7 +77,10 @@ char* FAST_FUNC dname_dec(const uint8_t
37 crtpos = retpos;
38 retpos = depth = 0;
39 }
40- if (dst)
41+ if (dst && len != 0)
42+ /* \4host\3com\0\4host and we are at \0:
43+ * \3com was converted to "com.", change dot to space.
44+ */
45 dst[len - 1] = ' ';
46 }
47
48@@ -228,6 +230,9 @@ int main(int argc, char **argv)
49 int len;
50 uint8_t *encoded;
51
52+ uint8_t str[6] = { 0x00, 0x00, 0x02, 0x65, 0x65, 0x00 };
53+ printf("NUL:'%s'\n", dname_dec(str, 6, ""));
54+
55 #define DNAME_DEC(encoded,pre) dname_dec((uint8_t*)(encoded), sizeof(encoded), (pre))
56 printf("'%s'\n", DNAME_DEC("\4host\3com\0", "test1:"));
57 printf("test2:'%s'\n", DNAME_DEC("\4host\3com\0\4host\3com\0", ""));
diff --git a/meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch b/meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch
deleted file mode 100644
index b8349c04a9..0000000000
--- a/meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 1b7c17391de66502dd7a97c866e0a33681edbb1f Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Fri, 11 Mar 2016 00:26:58 +0100
4Subject: [PATCH] udhcpc: fix a warning in debug code
5
6Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
7Upstream-Status: Backport
8CVE: CVE-2016-2147 regression fix
9
10https://git.busybox.net/busybox/commit/?id=1b7c17
11
12Signed-off-by: Armin Kuster <akuster@mvista.com>
13
14---
15 networking/udhcp/domain_codec.c | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/networking/udhcp/domain_codec.c b/networking/udhcp/domain_codec.c
19index cee31f1..5a923cc 100644
20--- a/networking/udhcp/domain_codec.c
21+++ b/networking/udhcp/domain_codec.c
22@@ -7,6 +7,7 @@
23 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
24 */
25 #ifdef DNS_COMPR_TESTING
26+# define _GNU_SOURCE
27 # define FAST_FUNC /* nothing */
28 # define xmalloc malloc
29 # include <stdlib.h>
30--
312.3.5
32
diff --git a/meta/recipes-core/busybox/busybox/CVE-2016-2148.patch b/meta/recipes-core/busybox/busybox/CVE-2016-2148.patch
deleted file mode 100644
index af04a7f5bd..0000000000
--- a/meta/recipes-core/busybox/busybox/CVE-2016-2148.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 352f79acbd759c14399e39baef21fc4ffe180ac2 Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Fri, 26 Feb 2016 15:54:56 +0100
4Subject: [PATCH] udhcpc: fix OPTION_6RD parsing (could overflow its malloced
5 buffer)
6
7Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
8
9Upstream-Status: Backport
10CVE: CVE-2016-2148
11https://git.busybox.net/busybox/commit/?id=352f79
12
13Signed-off-by: Armin Kuster <akuster@mvista.com>
14
15---
16 networking/udhcp/common.c | 15 +++++++++++++--
17 networking/udhcp/dhcpc.c | 4 ++--
18 2 files changed, 15 insertions(+), 4 deletions(-)
19
20Index: busybox-1.23.2/networking/udhcp/common.c
21===================================================================
22--- busybox-1.23.2.orig/networking/udhcp/common.c
23+++ busybox-1.23.2/networking/udhcp/common.c
24@@ -142,7 +142,7 @@ const char dhcp_option_strings[] ALIGN1
25 * udhcp_str2optset: to determine how many bytes to allocate.
26 * xmalloc_optname_optval: to estimate string length
27 * from binary option length: (option[LEN] / dhcp_option_lengths[opt_type])
28- * is the number of elements, multiply in by one element's string width
29+ * is the number of elements, multiply it by one element's string width
30 * (len_of_option_as_string[opt_type]) and you know how wide string you need.
31 */
32 const uint8_t dhcp_option_lengths[] ALIGN1 = {
33@@ -162,7 +162,18 @@ const uint8_t dhcp_option_lengths[] ALIG
34 [OPTION_S32] = 4,
35 /* Just like OPTION_STRING, we use minimum length here */
36 [OPTION_STATIC_ROUTES] = 5,
37- [OPTION_6RD] = 22, /* ignored by udhcp_str2optset */
38+ [OPTION_6RD] = 12, /* ignored by udhcp_str2optset */
39+ /* The above value was chosen as follows:
40+ * len_of_option_as_string[] for this option is >60: it's a string of the form
41+ * "32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 ".
42+ * Each additional ipv4 address takes 4 bytes in binary option and appends
43+ * another "255.255.255.255 " 16-byte string. We can set [OPTION_6RD] = 4
44+ * but this severely overestimates string length: instead of 16 bytes,
45+ * it adds >60 for every 4 bytes in binary option.
46+ * We cheat and declare here that option is in units of 12 bytes.
47+ * This adds more than 60 bytes for every three ipv4 addresses - more than enough.
48+ * (Even 16 instead of 12 should work, but let's be paranoid).
49+ */
50 };
51
52
53Index: busybox-1.23.2/networking/udhcp/dhcpc.c
54===================================================================
55--- busybox-1.23.2.orig/networking/udhcp/dhcpc.c
56+++ busybox-1.23.2/networking/udhcp/dhcpc.c
57@@ -103,7 +103,7 @@ static const uint8_t len_of_option_as_st
58 [OPTION_IP ] = sizeof("255.255.255.255 "),
59 [OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2,
60 [OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "),
61- [OPTION_6RD ] = sizeof("32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
62+ [OPTION_6RD ] = sizeof("132 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
63 [OPTION_STRING ] = 1,
64 [OPTION_STRING_HOST ] = 1,
65 #if ENABLE_FEATURE_UDHCP_RFC3397
66@@ -214,7 +214,7 @@ static NOINLINE char *xmalloc_optname_op
67 type = optflag->flags & OPTION_TYPE_MASK;
68 optlen = dhcp_option_lengths[type];
69 upper_length = len_of_option_as_string[type]
70- * ((unsigned)(len + optlen - 1) / (unsigned)optlen);
71+ * ((unsigned)(len + optlen) / (unsigned)optlen);
72
73 dest = ret = xmalloc(upper_length + strlen(opt_name) + 2);
74 dest += sprintf(ret, "%s=", opt_name);
diff --git a/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch b/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch
deleted file mode 100644
index 851bc20f79..0000000000
--- a/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1busybox1.24.1: Fix CVE-2016-6301
2
3[No upstream tracking] -- https://bugzilla.redhat.com/show_bug.cgi?id=1363710
4
5ntpd: NTP server denial of service flaw
6
7The busybox NTP implementation doesn't check the NTP mode of packets
8received on the server port and responds to any packet with the right
9size. This includes responses from another NTP server. An attacker can
10send a packet with a spoofed source address in order to create an
11infinite loop of responses between two busybox NTP servers. Adding
12more packets to the loop increases the traffic between the servers
13until one of them has a fully loaded CPU and/or network.
14
15Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=150dc7a2b483b8338a3e185c478b4b23ee884e71]
16CVE: CVE-2016-6301
17Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
18Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
19
20diff --git a/networking/ntpd.c b/networking/ntpd.c
21index 9732c9b..0f6a55f 100644
22--- a/networking/ntpd.c
23+++ b/networking/ntpd.c
24@@ -1985,6 +1985,13 @@ recv_and_process_client_pkt(void /*int fd*/)
25 goto bail;
26 }
27
28+ /* Respond only to client and symmetric active packets */
29+ if ((msg.m_status & MODE_MASK) != MODE_CLIENT
30+ && (msg.m_status & MODE_MASK) != MODE_SYM_ACT
31+ ) {
32+ goto bail;
33+ }
34+
35 query_status = msg.m_status;
36 query_xmttime = msg.m_xmttime;
37
diff --git a/meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch b/meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch
deleted file mode 100644
index cdc91082bc..0000000000
--- a/meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1Upstream-Status: Backport
2
3 http://busybox.net/downloads/fixes-1.24.1/
4 https://git.busybox.net/busybox/commit/?id=e111a1640494fe87fc913f94fae3bb805de0fc99
5 https://git.busybox.net/busybox/commit/?h=1_24_stable&id=be729c1d3b5c923f10871dd68ea94156d0f8c803
6
7Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
8
9From be729c1d3b5c923f10871dd68ea94156d0f8c803 Mon Sep 17 00:00:00 2001
10From: Ari Sundholm <ari@tuxera.com>
11Date: Mon, 4 Jan 2016 15:40:37 +0200
12Subject: [PATCH] truncate: always set mode when opening file to avoid fortify
13 errors
14
15Busybox crashes due to no mode being given when opening:
16$ ./busybox truncate -s 1M foo
17*** invalid open64 call: O_CREAT without mode ***: ./busybox terminated
18======= Backtrace: =========
19/lib/x86_64-linux-gnu/libc.so.6(+0x7338f)[0x7f66d921338f]
20/lib/x86_64-linux-gnu/libc.so.6(__fortify_fail+0x5c)[0x7f66d92aac9c]
21/lib/x86_64-linux-gnu/libc.so.6(+0xeb6aa)[0x7f66d928b6aa]
22./busybox[0x4899f9]
23======= Memory map: ========
2400400000-004d0000 r-xp 00000000 00:1a 137559 /home/ari/busybox/busybox
25006cf000-006d0000 r--p 000cf000 00:1a 137559 /home/ari/busybox/busybox
26006d0000-006d1000 rw-p 000d0000 00:1a 137559 /home/ari/busybox/busybox
27006d1000-006d4000 rw-p 00000000 00:00 0
28014e7000-01508000 rw-p 00000000 00:00 0 [heap]
297f66d8f8a000-7f66d8fa0000 r-xp 00000000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1
307f66d8fa0000-7f66d919f000 ---p 00016000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1
317f66d919f000-7f66d91a0000 rw-p 00015000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1
327f66d91a0000-7f66d935b000 r-xp 00000000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
337f66d935b000-7f66d955a000 ---p 001bb000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
347f66d955a000-7f66d955e000 r--p 001ba000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
357f66d955e000-7f66d9560000 rw-p 001be000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so
367f66d9560000-7f66d9565000 rw-p 00000000 00:00 0
377f66d9565000-7f66d966a000 r-xp 00000000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
387f66d966a000-7f66d9869000 ---p 00105000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
397f66d9869000-7f66d986a000 r--p 00104000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
407f66d986a000-7f66d986b000 rw-p 00105000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so
417f66d986b000-7f66d988e000 r-xp 00000000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so
427f66d9a64000-7f66d9a67000 rw-p 00000000 00:00 0
437f66d9a8a000-7f66d9a8d000 rw-p 00000000 00:00 0
447f66d9a8d000-7f66d9a8e000 r--p 00022000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so
457f66d9a8e000-7f66d9a8f000 rw-p 00023000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so
467f66d9a8f000-7f66d9a90000 rw-p 00000000 00:00 0
477ffc47761000-7ffc47782000 rw-p 00000000 00:00 0 [stack]
487ffc477ab000-7ffc477ad000 r-xp 00000000 00:00 0 [vdso]
49ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]
50Aborted (core dumped)
51$
52
53Fix this by simply always setting the mode, as it doesn't hurt even
54when O_CREAT is not specified.
55
56This bug is a regression introduced in fc3e40e, as xopen(), which
57was originally used, would automatically set the mode.
58
59Signed-off-by: Ari Sundholm <ari@tuxera.com>
60Signed-off-by: Mike Frysinger <vapier@gentoo.org>
61(cherry picked from commit e111a1640494fe87fc913f94fae3bb805de0fc99)
62---
63 coreutils/truncate.c | 2 +-
64 1 file changed, 1 insertion(+), 1 deletion(-)
65
66diff --git a/coreutils/truncate.c b/coreutils/truncate.c
67index e5fa656..4c997bf 100644
68--- a/coreutils/truncate.c
69+++ b/coreutils/truncate.c
70@@ -64,7 +64,7 @@ int truncate_main(int argc UNUSED_PARAM, char **argv)
71
72 argv += optind;
73 while (*argv) {
74- int fd = open(*argv, flags);
75+ int fd = open(*argv, flags, 0666);
76 if (fd < 0) {
77 if (errno != ENOENT || !(opts & OPT_NOCREATE)) {
78 bb_perror_msg("%s: open", *argv);
79--
802.6.2
81
diff --git a/meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch b/meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch
deleted file mode 100644
index e3c502091f..0000000000
--- a/meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch
+++ /dev/null
@@ -1,143 +0,0 @@
1Upstream-Status: Backport
2
3 http://busybox.net/downloads/fixes-1.24.1/
4 http://git.busybox.net/busybox/commit/?id=092fabcf1df5d46cd22be4ffcd3b871f6180eb9c
5 http://git.busybox.net/busybox/commit/?h=1_24_stable&id=092fabcf1df5d46cd22be4ffcd3b871f6180eb9c
6
7Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
8
9From 092fabcf1df5d46cd22be4ffcd3b871f6180eb9c Mon Sep 17 00:00:00 2001
10From: Denys Vlasenko <vda.linux@googlemail.com>
11Date: Fri, 30 Oct 2015 23:41:53 +0100
12Subject: [PATCH] [g]unzip: fix recent breakage.
13
14Also, do emit error message we so painstakingly pass from gzip internals
15
16Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
17(cherry picked from commit 6bd3fff51aa74e2ee2d87887b12182a3b09792ef)
18Signed-off-by: Mike Frysinger <vapier@gentoo.org>
19---
20 archival/libarchive/decompress_gunzip.c | 33 +++++++++++++++++++++------------
21 testsuite/unzip.tests | 1 +
22 2 files changed, 22 insertions(+), 12 deletions(-)
23
24diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
25index c76fd31..357c9bf 100644
26--- a/archival/libarchive/decompress_gunzip.c
27+++ b/archival/libarchive/decompress_gunzip.c
28@@ -309,8 +309,7 @@ static int huft_build(const unsigned *b, const unsigned n,
29 huft_t *q; /* points to current table */
30 huft_t r; /* table entry for structure assignment */
31 huft_t *u[BMAX]; /* table stack */
32- unsigned v[N_MAX]; /* values in order of bit length */
33- unsigned v_end;
34+ unsigned v[N_MAX + 1]; /* values in order of bit length. last v[] is never used */
35 int ws[BMAX + 1]; /* bits decoded stack */
36 int w; /* bits decoded */
37 unsigned x[BMAX + 1]; /* bit offsets, then code stack */
38@@ -365,15 +364,17 @@ static int huft_build(const unsigned *b, const unsigned n,
39 *xp++ = j;
40 }
41
42- /* Make a table of values in order of bit lengths */
43+ /* Make a table of values in order of bit lengths.
44+ * To detect bad input, unused v[i]'s are set to invalid value UINT_MAX.
45+ * In particular, last v[i] is never filled and must not be accessed.
46+ */
47+ memset(v, 0xff, sizeof(v));
48 p = b;
49 i = 0;
50- v_end = 0;
51 do {
52 j = *p++;
53 if (j != 0) {
54 v[x[j]++] = i;
55- v_end = x[j];
56 }
57 } while (++i < n);
58
59@@ -435,7 +436,9 @@ static int huft_build(const unsigned *b, const unsigned n,
60
61 /* set up table entry in r */
62 r.b = (unsigned char) (k - w);
63- if (p >= v + v_end) { // Was "if (p >= v + n)" but v[] can be shorter!
64+ if (/*p >= v + n || -- redundant, caught by the second check: */
65+ *p == UINT_MAX /* do we access uninited v[i]? (see memset(v))*/
66+ ) {
67 r.e = 99; /* out of values--invalid code */
68 } else if (*p < s) {
69 r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */
70@@ -520,8 +523,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
71 e = t->e;
72 if (e > 16)
73 do {
74- if (e == 99)
75- abort_unzip(PASS_STATE_ONLY);;
76+ if (e == 99) {
77+ abort_unzip(PASS_STATE_ONLY);
78+ }
79 bb >>= t->b;
80 k -= t->b;
81 e -= 16;
82@@ -557,8 +561,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
83 e = t->e;
84 if (e > 16)
85 do {
86- if (e == 99)
87+ if (e == 99) {
88 abort_unzip(PASS_STATE_ONLY);
89+ }
90 bb >>= t->b;
91 k -= t->b;
92 e -= 16;
93@@ -824,8 +829,9 @@ static int inflate_block(STATE_PARAM smallint *e)
94
95 b_dynamic >>= 4;
96 k_dynamic -= 4;
97- if (nl > 286 || nd > 30)
98+ if (nl > 286 || nd > 30) {
99 abort_unzip(PASS_STATE_ONLY); /* bad lengths */
100+ }
101
102 /* read in bit-length-code lengths */
103 for (j = 0; j < nb; j++) {
104@@ -906,12 +912,14 @@ static int inflate_block(STATE_PARAM smallint *e)
105 bl = lbits;
106
107 i = huft_build(ll, nl, 257, cplens, cplext, &inflate_codes_tl, &bl);
108- if (i != 0)
109+ if (i != 0) {
110 abort_unzip(PASS_STATE_ONLY);
111+ }
112 bd = dbits;
113 i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &inflate_codes_td, &bd);
114- if (i != 0)
115+ if (i != 0) {
116 abort_unzip(PASS_STATE_ONLY);
117+ }
118
119 /* set up data for inflate_codes() */
120 inflate_codes_setup(PASS_STATE bl, bd);
121@@ -999,6 +1007,7 @@ inflate_unzip_internal(STATE_PARAM transformer_state_t *xstate)
122 error_msg = "corrupted data";
123 if (setjmp(error_jmp)) {
124 /* Error from deep inside zip machinery */
125+ bb_error_msg(error_msg);
126 n = -1;
127 goto ret;
128 }
129diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
130index ca0a458..d8738a3 100755
131--- a/testsuite/unzip.tests
132+++ b/testsuite/unzip.tests
133@@ -34,6 +34,7 @@ rm foo.zip
134 testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
135 "Archive: bad.zip
136 inflating: ]3j½r«IK-%Ix
137+unzip: corrupted data
138 unzip: inflate error
139 1
140 " \
141--
1422.6.2
143
diff --git a/meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch b/meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch
deleted file mode 100644
index 718672695c..0000000000
--- a/meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch
+++ /dev/null
@@ -1,118 +0,0 @@
1Upstream-Status: Backport
2
3 http://busybox.net/downloads/fixes-1.24.1/
4 http://git.busybox.net/busybox/commit/?id=1de25a6e87e0e627aa34298105a3d17c60a1f44e
5 http://git.busybox.net/busybox/commit/?h=1_24_stable&id=6767af17f11144c7cd3cfe9ef799d7f89a78fe65
6
7Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
8
9From 1de25a6e87e0e627aa34298105a3d17c60a1f44e Mon Sep 17 00:00:00 2001
10From: Denys Vlasenko <vda.linux@googlemail.com>
11Date: Mon, 26 Oct 2015 19:33:05 +0100
12Subject: [PATCH] unzip: test for bad archive SEGVing
13
14function old new delta
15huft_build 1296 1300 +4
16
17Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
18---
19 archival/libarchive/decompress_gunzip.c | 11 +++++++----
20 testsuite/unzip.tests | 23 ++++++++++++++++++++++-
21 2 files changed, 29 insertions(+), 5 deletions(-)
22
23diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
24index 7b6f459..30bf451 100644
25--- a/archival/libarchive/decompress_gunzip.c
26+++ b/archival/libarchive/decompress_gunzip.c
27@@ -305,11 +305,12 @@ static int huft_build(const unsigned *b, const unsigned n,
28 unsigned i; /* counter, current code */
29 unsigned j; /* counter */
30 int k; /* number of bits in current code */
31- unsigned *p; /* pointer into c[], b[], or v[] */
32+ const unsigned *p; /* pointer into c[], b[], or v[] */
33 huft_t *q; /* points to current table */
34 huft_t r; /* table entry for structure assignment */
35 huft_t *u[BMAX]; /* table stack */
36 unsigned v[N_MAX]; /* values in order of bit length */
37+ unsigned v_end;
38 int ws[BMAX + 1]; /* bits decoded stack */
39 int w; /* bits decoded */
40 unsigned x[BMAX + 1]; /* bit offsets, then code stack */
41@@ -324,7 +325,7 @@ static int huft_build(const unsigned *b, const unsigned n,
42
43 /* Generate counts for each bit length */
44 memset(c, 0, sizeof(c));
45- p = (unsigned *) b; /* cast allows us to reuse p for pointing to b */
46+ p = b;
47 i = n;
48 do {
49 c[*p]++; /* assume all entries <= BMAX */
50@@ -365,12 +366,14 @@ static int huft_build(const unsigned *b, const unsigned n,
51 }
52
53 /* Make a table of values in order of bit lengths */
54- p = (unsigned *) b;
55+ p = b;
56 i = 0;
57+ v_end = 0;
58 do {
59 j = *p++;
60 if (j != 0) {
61 v[x[j]++] = i;
62+ v_end = x[j];
63 }
64 } while (++i < n);
65
66@@ -432,7 +435,7 @@ static int huft_build(const unsigned *b, const unsigned n,
67
68 /* set up table entry in r */
69 r.b = (unsigned char) (k - w);
70- if (p >= v + n) {
71+ if (p >= v + v_end) { // Was "if (p >= v + n)" but v[] can be shorter!
72 r.e = 99; /* out of values--invalid code */
73 } else if (*p < s) {
74 r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */
75diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
76index 8677a03..ca0a458 100755
77--- a/testsuite/unzip.tests
78+++ b/testsuite/unzip.tests
79@@ -7,7 +7,7 @@
80
81 . ./testing.sh
82
83-# testing "test name" "options" "expected result" "file input" "stdin"
84+# testing "test name" "commands" "expected result" "file input" "stdin"
85 # file input will be file called "input"
86 # test can create a file "actual" instead of writing to stdout
87
88@@ -30,6 +30,27 @@ testing "unzip (subdir only)" "unzip -q foo.zip foo/ && test -d foo && test ! -f
89 rmdir foo
90 rm foo.zip
91
92+# File containing some damaged encrypted stream
93+testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
94+"Archive: bad.zip
95+ inflating: ]3j½r«IK-%Ix
96+unzip: inflate error
97+1
98+" \
99+"" "\
100+begin-base64 644 bad.zip
101+UEsDBBQAAgkIAAAAIQA5AAAANwAAADwAAAAQAAcAXTNqwr1ywqtJGxJLLSVJ
102+eCkBD0AdKBk8JzQsIj01JC0/ORJQSwMEFAECCAAAAAAhADoAAAAPAAAANgAA
103+AAwAAQASw73Ct1DCokohPXQiNjoUNTUiHRwgLT4WHlBLAQIQABQAAggIAAAA
104+oQA5AAAANwAAADwAAAAQQAcADAAAACwAMgCAAAAAAABdM2rCvXLCq0kbEkst
105+JUl4KQEPQB0oGSY4Cz4QNgEnJSYIPVBLAQIAABQAAggAAAAAIQAqAAAADwAA
106+BDYAAAAMAAEADQAAADIADQAAAEEAAAASw73Ct1DKokohPXQiNzA+FAI1HCcW
107+NzITNFBLBQUKAC4JAA04Cw0EOhZQSwUGAQAABAIAAgCZAAAAeQAAAAIALhM=
108+====
109+"
110+
111+rm *
112+
113 # Clean up scratch directory.
114
115 cd ..
116--
1172.6.2
118
diff --git a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch b/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
index bda86859dc..6faca227f7 100644
--- a/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
+++ b/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
@@ -33,7 +33,7 @@ cc: linux-kbuild@vger.kernel.org
33 scripts/kconfig/lxdialog/Makefile | 2 +- 33 scripts/kconfig/lxdialog/Makefile | 2 +-
34 scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ 34 scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++
35 2 files changed, 9 insertions(+), 1 deletion(-) 35 2 files changed, 9 insertions(+), 1 deletion(-)
36 36
37--- a/scripts/kconfig/lxdialog/check-lxdialog.sh 37--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
38+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh 38+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
39@@ -4,6 +4,10 @@ 39@@ -4,6 +4,10 @@
@@ -44,10 +44,10 @@ cc: linux-kbuild@vger.kernel.org
44+ echo "$CROSS_CURSES_LIB" 44+ echo "$CROSS_CURSES_LIB"
45+ exit 45+ exit
46+ fi 46+ fi
47 for ext in so a dylib ; do 47 pkg-config --libs ncursesw 2>/dev/null && exit
48 for lib in ncursesw ncurses curses ; do 48 pkg-config --libs ncurses 2>/dev/null && exit
49 $cc -print-file-name=lib${lib}.${ext} | grep -q / 49 for ext in so a dll.a dylib ; do
50@@ -19,6 +23,10 @@ ldflags() 50@@ -21,6 +25,10 @@
51 # Where is ncurses.h? 51 # Where is ncurses.h?
52 ccflags() 52 ccflags()
53 { 53 {
@@ -55,12 +55,12 @@ cc: linux-kbuild@vger.kernel.org
55+ echo "$CROSS_CURSES_INC" 55+ echo "$CROSS_CURSES_INC"
56+ exit 56+ exit
57+ fi 57+ fi
58 if [ -f /usr/include/ncursesw/ncurses.h ]; then 58 if pkg-config --cflags ncursesw 2>/dev/null; then
59 echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"' 59 echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
60 elif [ -f /usr/include/ncursesw/curses.h ]; then 60 elif pkg-config --cflags ncurses 2>/dev/null; then
61--- a/scripts/kconfig/lxdialog/Makefile 61--- a/scripts/kconfig/lxdialog/Makefile
62+++ b/scripts/kconfig/lxdialog/Makefile 62+++ b/scripts/kconfig/lxdialog/Makefile
63@@ -5,7 +5,7 @@ check-lxdialog := $(srctree)/$(src)/che 63@@ -5,7 +5,7 @@
64 64
65 # Use reursively expanded variables so we do not call gcc unless 65 # Use reursively expanded variables so we do not call gcc unless
66 # we really need to do so. (Do not call gcc as part of make mrproper) 66 # we really need to do so. (Do not call gcc as part of make mrproper)
diff --git a/meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch b/meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
deleted file mode 100644
index 38302e0b68..0000000000
--- a/meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1Upstream-Status: Backport
2
3Patch addressing a parallel make race in Busybox
4
5 http://git.busybox.net/busybox/commit/?id=d8e61bbf13d0cf38d477255cfd5dc71c5d51d575
6
7Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
8
9From d8e61bbf13d0cf38d477255cfd5dc71c5d51d575 Mon Sep 17 00:00:00 2001
10From: Denys Vlasenko <vda.linux@googlemail.com>
11Date: Sun, 21 Aug 2016 22:00:20 +0200
12Subject: build system: different fix for
13 include/applet_tables.h/include/NUM_APPLETS.h
14
15Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
16
17diff --git a/applets/Kbuild.src b/applets/Kbuild.src
18index 5cc1827..3aedbbf 100644
19--- a/applets/Kbuild.src
20+++ b/applets/Kbuild.src
21@@ -29,7 +29,7 @@ applets/applets.o: include/usage_compressed.h include/applet_tables.h
22
23 applets/applet_tables: .config include/applets.h
24 applets/usage: .config include/applets.h
25-applets/usage_pod: .config include/applets.h include/applet_tables.h include/NUM_APPLETS.h
26+applets/usage_pod: .config include/applets.h include/applet_tables.h
27
28 quiet_cmd_gen_usage_compressed = GEN include/usage_compressed.h
29 cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
30@@ -37,8 +37,21 @@ quiet_cmd_gen_usage_compressed = GEN include/usage_compressed.h
31 include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compressed
32 $(call cmd,gen_usage_compressed)
33
34-quiet_cmd_gen_applet_tables = GEN include/applet_tables.h
35+quiet_cmd_gen_applet_tables = GEN include/applet_tables.h include/NUM_APPLETS.h
36 cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h include/NUM_APPLETS.h
37
38-include/applet_tables.h include/NUM_APPLETS.h: applets/applet_tables
39+include/NUM_APPLETS.h: applets/applet_tables
40+ $(call cmd,gen_applet_tables)
41+
42+# In fact, include/applet_tables.h depends only on applets/applet_tables,
43+# and is generated by it. But specifying only it can run
44+# applets/applet_tables twice, possibly in parallel.
45+# We say that it also needs NUM_APPLETS.h
46+#
47+# Unfortunately, we need to list the same command,
48+# and it can be executed twice (sequentially).
49+# The alternative is to not list any command,
50+# and then if include/applet_tables.h is deleted, it won't be rebuilt.
51+#
52+include/applet_tables.h: include/NUM_APPLETS.h applets/applet_tables
53 $(call cmd,gen_applet_tables)
diff --git a/meta/recipes-core/busybox/busybox/busybox-tar-add-IF_FEATURE_-checks.patch b/meta/recipes-core/busybox/busybox/busybox-tar-add-IF_FEATURE_-checks.patch
deleted file mode 100644
index 0c3c9c0f42..0000000000
--- a/meta/recipes-core/busybox/busybox/busybox-tar-add-IF_FEATURE_-checks.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From f94412f6bb49136694c5478d0aecb19118d1b08d Mon Sep 17 00:00:00 2001
2From: Ming Liu <peter.x.liu@external.atlascopco.com>
3Date: Wed, 31 May 2017 11:48:09 +0200
4Subject: [PATCH] tar: add IF_FEATURE_* checks
5
6A following linking error was observed:
7| ==========
8| archival/lib.a(tar.o): In function `tar_main':
9| archival/tar.c:1168: undefined reference to `unpack_Z_stream'
10| archival/tar.c:1168: undefined reference to `unpack_Z_stream'
11| ld: busybox_unstripped: hidden symbol `unpack_Z_stream' isn't defined
12| ld: final link failed: Bad value
13
14this happened with clang compiler, with the following configs:
15| CONFIG_TAR=y
16| # CONFIG_FEATURE_SEAMLESS_Z is not set
17
18which can be fixed by adding IF_FEATURE_* checks in.
19
20Upstream-Status: Pending [ Sent to busybox upstream on 2017-06-02 ]
21
22Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
23---
24 archival/tar.c | 25 +++++++++++++++----------
25 1 file changed, 15 insertions(+), 10 deletions(-)
26
27diff --git a/archival/tar.c b/archival/tar.c
28index b70e00a..7598b71 100644
29--- a/archival/tar.c
30+++ b/archival/tar.c
31@@ -1216,21 +1216,26 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
32 USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);)
33 USE_FOR_NOMMU(const char *xformer_prog;)
34
35- if (opt & OPT_COMPRESS)
36- USE_FOR_MMU(xformer = unpack_Z_stream;)
37+ if (opt & OPT_COMPRESS) {
38+ USE_FOR_MMU(IF_FEATURE_SEAMLESS_Z(xformer = unpack_Z_stream;))
39 USE_FOR_NOMMU(xformer_prog = "uncompress";)
40- if (opt & OPT_GZIP)
41- USE_FOR_MMU(xformer = unpack_gz_stream;)
42+ }
43+ if (opt & OPT_GZIP) {
44+ USE_FOR_MMU(IF_FEATURE_SEAMLESS_GZ(xformer = unpack_gz_stream;))
45 USE_FOR_NOMMU(xformer_prog = "gunzip";)
46- if (opt & OPT_BZIP2)
47- USE_FOR_MMU(xformer = unpack_bz2_stream;)
48+ }
49+ if (opt & OPT_BZIP2) {
50+ USE_FOR_MMU(IF_FEATURE_SEAMLESS_BZ2(xformer = unpack_bz2_stream;))
51 USE_FOR_NOMMU(xformer_prog = "bunzip2";)
52- if (opt & OPT_LZMA)
53- USE_FOR_MMU(xformer = unpack_lzma_stream;)
54+ }
55+ if (opt & OPT_LZMA) {
56+ USE_FOR_MMU(IF_FEATURE_SEAMLESS_LZMA(xformer = unpack_lzma_stream;))
57 USE_FOR_NOMMU(xformer_prog = "unlzma";)
58- if (opt & OPT_XZ)
59- USE_FOR_MMU(xformer = unpack_xz_stream;)
60+ }
61+ if (opt & OPT_XZ) {
62+ USE_FOR_MMU(IF_FEATURE_SEAMLESS_XZ(xformer = unpack_xz_stream;))
63 USE_FOR_NOMMU(xformer_prog = "unxz";)
64+ }
65
66 fork_transformer_with_sig(tar_handle->src_fd, xformer, xformer_prog);
67 /* Can't lseek over pipes */
68--
692.7.4
70
diff --git a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
index 4c9ce3b711..582a258939 100644
--- a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
+++ b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
@@ -28,24 +28,23 @@ Fixed options -b, -a and -P.
28 28
29Signed-off-by: Andreas Oberritter <obi@opendreambox.org> 29Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
30--- 30---
31 networking/udhcp/dhcpc.c | 29 +++++++++++++++++++++-------- 31 networking/udhcp/dhcpc.c | 29 ++++++++++++++++------
32 1 files changed, 21 insertions(+), 8 deletions(-) 32 1 file changed, 21 insertions(+), 8 deletions(-)
33 33
34Index: busybox-1.20.2/networking/udhcp/dhcpc.c 34Index: busybox-1.27.2/networking/udhcp/dhcpc.c
35=================================================================== 35===================================================================
36--- busybox-1.20.2.orig/networking/udhcp/dhcpc.c 36--- busybox-1.27.2.orig/networking/udhcp/dhcpc.c
37+++ busybox-1.20.2/networking/udhcp/dhcpc.c 37+++ busybox-1.27.2/networking/udhcp/dhcpc.c
38@@ -29,6 +29,9 @@ 38@@ -49,6 +49,8 @@ struct tpacket_auxdata {
39 #include <netpacket/packet.h> 39 };
40 #include <linux/filter.h> 40 #endif
41 41
42+/* option whether to down the interface when reconfiguring */ 42+/* option whether to down the interface when reconfiguring */
43+static int allow_deconfig = 1; 43+static int allow_deconfig = 1;
44+
45 /* "struct client_config_t client_config" is in bb_common_bufsiz1 */
46 44
45 /* "struct client_config_t client_config" is in bb_common_bufsiz1 */
47 46
48@@ -81,8 +84,9 @@ enum { 47@@ -104,8 +106,9 @@ enum {
49 OPT_x = 1 << 18, 48 OPT_x = 1 << 18,
50 OPT_f = 1 << 19, 49 OPT_f = 1 << 19,
51 OPT_B = 1 << 20, 50 OPT_B = 1 << 20,
@@ -56,7 +55,7 @@ Index: busybox-1.20.2/networking/udhcp/dhcpc.c
56 USE_FOR_MMU( OPTBIT_b,) 55 USE_FOR_MMU( OPTBIT_b,)
57 IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) 56 IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
58 IF_FEATURE_UDHCP_PORT( OPTBIT_P,) 57 IF_FEATURE_UDHCP_PORT( OPTBIT_P,)
59@@ -1040,7 +1044,8 @@ static void perform_renew(void) 58@@ -1110,7 +1113,8 @@ static void perform_renew(void)
60 state = RENEW_REQUESTED; 59 state = RENEW_REQUESTED;
61 break; 60 break;
62 case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ 61 case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
@@ -66,36 +65,37 @@ Index: busybox-1.20.2/networking/udhcp/dhcpc.c
66 case REQUESTING: 65 case REQUESTING:
67 case RELEASED: 66 case RELEASED:
68 change_listen_mode(LISTEN_RAW); 67 change_listen_mode(LISTEN_RAW);
69@@ -1064,7 +1069,8 @@ static void perform_release(uint32_t ser 68@@ -1146,7 +1150,8 @@ static void perform_release(uint32_t server_addr, uint32_t requested_ip)
70 bb_info_msg("Unicasting a release of %s to %s", 69 * Users requested to be notified in all cases, even if not in one
71 inet_ntoa(temp_addr), buffer); 70 * of the states above.
72 send_release(server_addr, requested_ip); /* unicast */ 71 */
73- udhcp_run_script(NULL, "deconfig"); 72- udhcp_run_script(NULL, "deconfig");
74+ if (allow_deconfig) 73+ if (allow_deconfig)
75+ udhcp_run_script(NULL, "deconfig"); 74+ udhcp_run_script(NULL, "deconfig");
76 }
77 bb_info_msg("Entering released state");
78 75
79@@ -1215,7 +1221,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 76 change_listen_mode(LISTEN_NONE);
77 state = RELEASED;
78@@ -1298,7 +1303,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
80 /* O,x: list; -T,-t,-A take numeric param */ 79 /* O,x: list; -T,-t,-A take numeric param */
81 opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ; 80 IF_UDHCP_VERBOSE(opt_complementary = "vv";)
82 IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) 81 IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
83- opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB" 82- opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
84+ opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fBD" 83+ opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD"
85 USE_FOR_MMU("b") 84 USE_FOR_MMU("b")
86 IF_FEATURE_UDHCPC_ARPING("a") 85 IF_FEATURE_UDHCPC_ARPING("a::")
87 IF_FEATURE_UDHCP_PORT("P:") 86 IF_FEATURE_UDHCP_PORT("P:")
88@@ -1316,6 +1322,9 @@ int udhcpc_main(int argc UNUSED_PARAM, c 87@@ -1409,6 +1414,10 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
89 logmode |= LOGMODE_SYSLOG; 88 logmode |= LOGMODE_SYSLOG;
90 } 89 }
91 90
92+ if (opt & OPT_D) 91+ if (opt & OPT_D) {
93+ allow_deconfig = 0; 92+ allow_deconfig = 0;
93+ }
94+ 94+
95 /* Make sure fd 0,1,2 are open */ 95 /* Make sure fd 0,1,2 are open */
96 bb_sanitize_stdio(); 96 bb_sanitize_stdio();
97 /* Equivalent of doing a fflush after every \n */ 97 /* Equivalent of doing a fflush after every \n */
98@@ -1330,7 +1339,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c 98@@ -1423,7 +1432,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
99 srand(monotonic_us()); 99 srand(monotonic_us());
100 100
101 state = INIT_SELECTING; 101 state = INIT_SELECTING;
@@ -105,17 +105,17 @@ Index: busybox-1.20.2/networking/udhcp/dhcpc.c
105 change_listen_mode(LISTEN_RAW); 105 change_listen_mode(LISTEN_RAW);
106 packet_num = 0; 106 packet_num = 0;
107 timeout = 0; 107 timeout = 0;
108@@ -1484,7 +1494,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c 108@@ -1577,7 +1587,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
109 } 109 }
110 /* Timed out, enter init state */ 110 /* Timed out, enter init state */
111 bb_info_msg("Lease lost, entering init state"); 111 bb_error_msg("lease lost, entering init state");
112- udhcp_run_script(NULL, "deconfig"); 112- udhcp_run_script(NULL, "deconfig");
113+ if (allow_deconfig) 113+ if (allow_deconfig)
114+ udhcp_run_script(NULL, "deconfig"); 114+ udhcp_run_script(NULL, "deconfig");
115 state = INIT_SELECTING; 115 state = INIT_SELECTING;
116 client_config.first_secs = 0; /* make secs field count from 0 */ 116 client_config.first_secs = 0; /* make secs field count from 0 */
117 /*timeout = 0; - already is */ 117 /*timeout = 0; - already is */
118@@ -1667,7 +1678,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c 118@@ -1770,7 +1781,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
119 send_decline(/*xid,*/ server_addr, packet.yiaddr); 119 send_decline(/*xid,*/ server_addr, packet.yiaddr);
120 120
121 if (state != REQUESTING) 121 if (state != REQUESTING)
@@ -125,8 +125,8 @@ Index: busybox-1.20.2/networking/udhcp/dhcpc.c
125 change_listen_mode(LISTEN_RAW); 125 change_listen_mode(LISTEN_RAW);
126 state = INIT_SELECTING; 126 state = INIT_SELECTING;
127 client_config.first_secs = 0; /* make secs field count from 0 */ 127 client_config.first_secs = 0; /* make secs field count from 0 */
128@@ -1711,7 +1723,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c 128@@ -1840,7 +1852,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
129 bb_info_msg("Received DHCP NAK"); 129 bb_error_msg("received %s", "DHCP NAK");
130 udhcp_run_script(&packet, "nak"); 130 udhcp_run_script(&packet, "nak");
131 if (state != REQUESTING) 131 if (state != REQUESTING)
132- udhcp_run_script(NULL, "deconfig"); 132- udhcp_run_script(NULL, "deconfig");
diff --git a/meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch b/meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch
deleted file mode 100644
index 7f80a1d915..0000000000
--- a/meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1Upstream-Status: Backport
2
3Patch addressing a parallel make race in Busybox
4
5 http://git.busybox.net/busybox/commit/?id=0dddbc1a59795a77679d8c5ef48a2795cb470563
6
7Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
8
9From 0dddbc1a59795a77679d8c5ef48a2795cb470563 Mon Sep 17 00:00:00 2001
10From: Denys Vlasenko <vda.linux@googlemail.com>
11Date: Tue, 23 Aug 2016 20:21:36 +0200
12Subject: build system: always rewrite NUM_APPLETS.h
13
14Conditional rewrite can keep NUM_APPLETS.h mtime old,
15this causes make to try to regenerate it at every invocation.
16
17Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
18
19diff --git a/applets/applet_tables.c b/applets/applet_tables.c
20index 8401a15..ef911a4 100644
21--- a/applets/applet_tables.c
22+++ b/applets/applet_tables.c
23@@ -192,27 +192,28 @@ int main(int argc, char **argv)
24 printf("};\n");
25 #endif
26 //printf("#endif /* SKIP_definitions */\n");
27+
28 // printf("\n");
29 // printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN);
30
31 if (argv[2]) {
32- char line_old[80];
33- char line_new[80];
34 FILE *fp;
35+ char line_new[80];
36+// char line_old[80];
37
38- line_old[0] = 0;
39- fp = fopen(argv[2], "r");
40- if (fp) {
41- fgets(line_old, sizeof(line_old), fp);
42- fclose(fp);
43- }
44 sprintf(line_new, "#define NUM_APPLETS %u\n", NUM_APPLETS);
45- if (strcmp(line_old, line_new) != 0) {
46+// line_old[0] = 0;
47+// fp = fopen(argv[2], "r");
48+// if (fp) {
49+// fgets(line_old, sizeof(line_old), fp);
50+// fclose(fp);
51+// }
52+// if (strcmp(line_old, line_new) != 0) {
53 fp = fopen(argv[2], "w");
54 if (!fp)
55 return 1;
56 fputs(line_new, fp);
57- }
58+// }
59 }
60
61 return 0;
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index cc68bea986..fbb5fd852c 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1,43 +1,25 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.24.1 3# Busybox version: 1.27.2
4# Tue Oct 31 11:00:00 2015 4# Wed Sep 27 08:56:13 2017
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
8# 8#
9# Busybox Settings 9# Busybox Settings
10# 10#
11
12#
13# General Configuration
14#
15# CONFIG_DESKTOP is not set 11# CONFIG_DESKTOP is not set
16# CONFIG_EXTRA_COMPAT is not set 12# CONFIG_EXTRA_COMPAT is not set
13# CONFIG_FEDORA_COMPAT is not set
17# CONFIG_INCLUDE_SUSv2 is not set 14# CONFIG_INCLUDE_SUSv2 is not set
18# CONFIG_USE_PORTABLE_CODE is not set 15# CONFIG_USE_PORTABLE_CODE is not set
19CONFIG_PLATFORM_LINUX=y
20CONFIG_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
23CONFIG_SHOW_USAGE=y 16CONFIG_SHOW_USAGE=y
24# CONFIG_FEATURE_VERBOSE_USAGE is not set 17# CONFIG_FEATURE_VERBOSE_USAGE is not set
25CONFIG_FEATURE_COMPRESS_USAGE=y 18CONFIG_FEATURE_COMPRESS_USAGE=y
19CONFIG_BUSYBOX=y
26# CONFIG_FEATURE_INSTALLER is not set 20# CONFIG_FEATURE_INSTALLER is not set
27# CONFIG_INSTALL_NO_USR is not set 21# CONFIG_INSTALL_NO_USR is not set
28# CONFIG_LOCALE_SUPPORT is not set
29# CONFIG_UNICODE_SUPPORT is not set
30# CONFIG_UNICODE_USING_LOCALE is not set
31# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
32CONFIG_SUBST_WCHAR=0
33CONFIG_LAST_SUPPORTED_WCHAR=0
34# CONFIG_UNICODE_COMBINING_WCHARS is not set
35# CONFIG_UNICODE_WIDE_WCHARS is not set
36# CONFIG_UNICODE_BIDI_SUPPORT is not set
37# CONFIG_UNICODE_NEUTRAL_TABLE is not set
38# CONFIG_UNICODE_PRESERVE_BROKEN is not set
39# CONFIG_PAM is not set 22# CONFIG_PAM is not set
40CONFIG_FEATURE_USE_SENDFILE=y
41CONFIG_LONG_OPTS=y 23CONFIG_LONG_OPTS=y
42CONFIG_FEATURE_DEVPTS=y 24CONFIG_FEATURE_DEVPTS=y
43# CONFIG_FEATURE_CLEAN_UP is not set 25# CONFIG_FEATURE_CLEAN_UP is not set
@@ -53,6 +35,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
53CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" 35CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
54CONFIG_FEATURE_SYSLOG=y 36CONFIG_FEATURE_SYSLOG=y
55# CONFIG_FEATURE_HAVE_RPC is not set 37# CONFIG_FEATURE_HAVE_RPC is not set
38CONFIG_PLATFORM_LINUX=y
56 39
57# 40#
58# Build Options 41# Build Options
@@ -71,17 +54,6 @@ CONFIG_EXTRA_LDFLAGS=""
71CONFIG_EXTRA_LDLIBS="" 54CONFIG_EXTRA_LDLIBS=""
72 55
73# 56#
74# Debugging Options
75#
76# CONFIG_DEBUG is not set
77# CONFIG_DEBUG_PESSIMIZE is not set
78# CONFIG_UNIT_TEST is not set
79# CONFIG_WERROR is not set
80CONFIG_NO_DEBUG_LIB=y
81# CONFIG_DMALLOC is not set
82# CONFIG_EFENCE is not set
83
84#
85# Installation Options ("make install" behavior) 57# Installation Options ("make install" behavior)
86# 58#
87CONFIG_INSTALL_APPLET_SYMLINKS=y 59CONFIG_INSTALL_APPLET_SYMLINKS=y
@@ -94,16 +66,30 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y
94CONFIG_PREFIX="./_install" 66CONFIG_PREFIX="./_install"
95 67
96# 68#
69# Debugging Options
70#
71# CONFIG_DEBUG is not set
72# CONFIG_DEBUG_PESSIMIZE is not set
73# CONFIG_DEBUG_SANITIZE is not set
74# CONFIG_UNIT_TEST is not set
75# CONFIG_WERROR is not set
76CONFIG_NO_DEBUG_LIB=y
77# CONFIG_DMALLOC is not set
78# CONFIG_EFENCE is not set
79
80#
97# Busybox Library Tuning 81# Busybox Library Tuning
98# 82#
99CONFIG_FEATURE_SYSTEMD=y 83# CONFIG_FEATURE_USE_BSS_TAIL is not set
100CONFIG_FEATURE_RTMINMAX=y 84CONFIG_FEATURE_RTMINMAX=y
85CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
86# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
87# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
101CONFIG_PASSWORD_MINLEN=6 88CONFIG_PASSWORD_MINLEN=6
102CONFIG_MD5_SMALL=1 89CONFIG_MD5_SMALL=1
103CONFIG_SHA3_SMALL=1 90CONFIG_SHA3_SMALL=1
104CONFIG_FEATURE_FAST_TOP=y 91CONFIG_FEATURE_FAST_TOP=y
105# CONFIG_FEATURE_ETC_NETWORKS is not set 92# CONFIG_FEATURE_ETC_NETWORKS is not set
106CONFIG_FEATURE_USE_TERMIOS=y
107CONFIG_FEATURE_EDITING=y 93CONFIG_FEATURE_EDITING=y
108CONFIG_FEATURE_EDITING_MAX_LEN=1024 94CONFIG_FEATURE_EDITING_MAX_LEN=1024
109# CONFIG_FEATURE_EDITING_VI is not set 95# CONFIG_FEATURE_EDITING_VI is not set
@@ -115,8 +101,20 @@ CONFIG_FEATURE_TAB_COMPLETION=y
115CONFIG_FEATURE_USERNAME_COMPLETION=y 101CONFIG_FEATURE_USERNAME_COMPLETION=y
116CONFIG_FEATURE_EDITING_FANCY_PROMPT=y 102CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
117# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set 103# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
104# CONFIG_LOCALE_SUPPORT is not set
105# CONFIG_UNICODE_SUPPORT is not set
106# CONFIG_UNICODE_USING_LOCALE is not set
107# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
108CONFIG_SUBST_WCHAR=0
109CONFIG_LAST_SUPPORTED_WCHAR=0
110# CONFIG_UNICODE_COMBINING_WCHARS is not set
111# CONFIG_UNICODE_WIDE_WCHARS is not set
112# CONFIG_UNICODE_BIDI_SUPPORT is not set
113# CONFIG_UNICODE_NEUTRAL_TABLE is not set
114# CONFIG_UNICODE_PRESERVE_BROKEN is not set
118CONFIG_FEATURE_NON_POSIX_CP=y 115CONFIG_FEATURE_NON_POSIX_CP=y
119# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set 116# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
117CONFIG_FEATURE_USE_SENDFILE=y
120CONFIG_FEATURE_COPYBUF_KB=4 118CONFIG_FEATURE_COPYBUF_KB=4
121CONFIG_FEATURE_SKIP_ROOTFS=y 119CONFIG_FEATURE_SKIP_ROOTFS=y
122CONFIG_MONOTONIC_SYSCALL=y 120CONFIG_MONOTONIC_SYSCALL=y
@@ -140,76 +138,59 @@ CONFIG_FEATURE_SEAMLESS_Z=y
140# CONFIG_FEATURE_AR_CREATE is not set 138# CONFIG_FEATURE_AR_CREATE is not set
141# CONFIG_UNCOMPRESS is not set 139# CONFIG_UNCOMPRESS is not set
142CONFIG_GUNZIP=y 140CONFIG_GUNZIP=y
141CONFIG_ZCAT=y
142CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
143CONFIG_BUNZIP2=y 143CONFIG_BUNZIP2=y
144CONFIG_BZCAT=y
144# CONFIG_UNLZMA is not set 145# CONFIG_UNLZMA is not set
145# CONFIG_FEATURE_LZMA_FAST is not set 146CONFIG_LZCAT=y
146# CONFIG_LZMA is not set 147# CONFIG_LZMA is not set
148# CONFIG_FEATURE_LZMA_FAST is not set
147# CONFIG_UNXZ is not set 149# CONFIG_UNXZ is not set
150CONFIG_XZCAT=y
148# CONFIG_XZ is not set 151# CONFIG_XZ is not set
149# CONFIG_BZIP2 is not set 152# CONFIG_BZIP2 is not set
153CONFIG_FEATURE_BZIP2_DECOMPRESS=y
150CONFIG_CPIO=y 154CONFIG_CPIO=y
151# CONFIG_FEATURE_CPIO_O is not set 155# CONFIG_FEATURE_CPIO_O is not set
152# CONFIG_FEATURE_CPIO_P is not set 156# CONFIG_FEATURE_CPIO_P is not set
153# CONFIG_DPKG is not set 157# CONFIG_DPKG is not set
154# CONFIG_DPKG_DEB is not set 158# CONFIG_DPKG_DEB is not set
155# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
156CONFIG_GZIP=y 159CONFIG_GZIP=y
157# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set 160# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
158CONFIG_GZIP_FAST=0 161CONFIG_GZIP_FAST=0
159# CONFIG_FEATURE_GZIP_LEVELS is not set 162# CONFIG_FEATURE_GZIP_LEVELS is not set
163CONFIG_FEATURE_GZIP_DECOMPRESS=y
160# CONFIG_LZOP is not set 164# CONFIG_LZOP is not set
165# CONFIG_UNLZOP is not set
166# CONFIG_LZOPCAT is not set
161# CONFIG_LZOP_COMPR_HIGH is not set 167# CONFIG_LZOP_COMPR_HIGH is not set
162# CONFIG_RPM is not set 168# CONFIG_RPM is not set
163# CONFIG_RPM2CPIO is not set 169# CONFIG_RPM2CPIO is not set
164CONFIG_TAR=y 170CONFIG_TAR=y
171# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
165CONFIG_FEATURE_TAR_CREATE=y 172CONFIG_FEATURE_TAR_CREATE=y
166CONFIG_FEATURE_TAR_AUTODETECT=y 173CONFIG_FEATURE_TAR_AUTODETECT=y
167CONFIG_FEATURE_TAR_FROM=y 174CONFIG_FEATURE_TAR_FROM=y
168CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y 175CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
169# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set 176# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
170CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y 177CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
171# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
172# CONFIG_FEATURE_TAR_TO_COMMAND is not set 178# CONFIG_FEATURE_TAR_TO_COMMAND is not set
173# CONFIG_FEATURE_TAR_UNAME_GNAME is not set 179# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
174CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y 180CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
175# CONFIG_FEATURE_TAR_SELINUX is not set 181# CONFIG_FEATURE_TAR_SELINUX is not set
176CONFIG_UNZIP=y 182CONFIG_UNZIP=y
183CONFIG_FEATURE_UNZIP_CDF=y
184# CONFIG_FEATURE_UNZIP_BZIP2 is not set
185# CONFIG_FEATURE_UNZIP_LZMA is not set
186# CONFIG_FEATURE_UNZIP_XZ is not set
177 187
178# 188#
179# Coreutils 189# Coreutils
180# 190#
181CONFIG_BASENAME=y 191CONFIG_BASENAME=y
182CONFIG_CAT=y 192CONFIG_CAT=y
183CONFIG_DATE=y 193# CONFIG_FEATURE_CATV is not set
184# CONFIG_FEATURE_DATE_ISOFMT is not set
185# CONFIG_FEATURE_DATE_NANO is not set
186CONFIG_FEATURE_DATE_COMPAT=y
187CONFIG_DD=y
188CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
189# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
190# CONFIG_FEATURE_DD_IBS_OBS is not set
191# CONFIG_FEATURE_DD_STATUS is not set
192# CONFIG_HOSTID is not set
193CONFIG_ID=y
194CONFIG_GROUPS=y
195CONFIG_SHUF=y
196CONFIG_SYNC=y
197# CONFIG_FEATURE_SYNC_FANCY is not set
198CONFIG_TEST=y
199CONFIG_FEATURE_TEST_64=y
200CONFIG_TOUCH=y
201CONFIG_FEATURE_TOUCH_NODEREF=y
202CONFIG_FEATURE_TOUCH_SUSV3=y
203CONFIG_TR=y
204CONFIG_FEATURE_TR_CLASSES=y
205# CONFIG_FEATURE_TR_EQUIV is not set
206# CONFIG_TRUNCATE is not set
207CONFIG_UNLINK=y
208# CONFIG_BASE64 is not set
209CONFIG_WHO=y
210CONFIG_USERS=y
211# CONFIG_CAL is not set
212# CONFIG_CATV is not set
213CONFIG_CHGRP=y 194CONFIG_CHGRP=y
214CONFIG_CHMOD=y 195CONFIG_CHMOD=y
215CONFIG_CHOWN=y 196CONFIG_CHOWN=y
@@ -220,6 +201,15 @@ CONFIG_CHROOT=y
220CONFIG_CP=y 201CONFIG_CP=y
221# CONFIG_FEATURE_CP_LONG_OPTIONS is not set 202# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
222CONFIG_CUT=y 203CONFIG_CUT=y
204CONFIG_DATE=y
205# CONFIG_FEATURE_DATE_ISOFMT is not set
206# CONFIG_FEATURE_DATE_NANO is not set
207CONFIG_FEATURE_DATE_COMPAT=y
208CONFIG_DD=y
209CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
210# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
211# CONFIG_FEATURE_DD_IBS_OBS is not set
212# CONFIG_FEATURE_DD_STATUS is not set
223CONFIG_DF=y 213CONFIG_DF=y
224# CONFIG_FEATURE_DF_FANCY is not set 214# CONFIG_FEATURE_DF_FANCY is not set
225CONFIG_DIRNAME=y 215CONFIG_DIRNAME=y
@@ -233,36 +223,57 @@ CONFIG_ENV=y
233CONFIG_FEATURE_ENV_LONG_OPTIONS=y 223CONFIG_FEATURE_ENV_LONG_OPTIONS=y
234# CONFIG_EXPAND is not set 224# CONFIG_EXPAND is not set
235# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set 225# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
226# CONFIG_UNEXPAND is not set
227# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
236CONFIG_EXPR=y 228CONFIG_EXPR=y
237CONFIG_EXPR_MATH_SUPPORT_64=y 229CONFIG_EXPR_MATH_SUPPORT_64=y
230# CONFIG_FACTOR is not set
238CONFIG_FALSE=y 231CONFIG_FALSE=y
239# CONFIG_FOLD is not set 232# CONFIG_FOLD is not set
240# CONFIG_FSYNC is not set 233# CONFIG_FSYNC is not set
241CONFIG_HEAD=y 234CONFIG_HEAD=y
242# CONFIG_FEATURE_FANCY_HEAD is not set 235# CONFIG_FEATURE_FANCY_HEAD is not set
236# CONFIG_HOSTID is not set
237CONFIG_ID=y
238CONFIG_GROUPS=y
243# CONFIG_INSTALL is not set 239# CONFIG_INSTALL is not set
244# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set 240# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
241# CONFIG_LINK is not set
245CONFIG_LN=y 242CONFIG_LN=y
246CONFIG_LOGNAME=y 243CONFIG_LOGNAME=y
247CONFIG_LS=y 244CONFIG_LS=y
248CONFIG_FEATURE_LS_FILETYPES=y 245CONFIG_FEATURE_LS_FILETYPES=y
249CONFIG_FEATURE_LS_FOLLOWLINKS=y 246CONFIG_FEATURE_LS_FOLLOWLINKS=y
250CONFIG_FEATURE_LS_RECURSIVE=y 247CONFIG_FEATURE_LS_RECURSIVE=y
248CONFIG_FEATURE_LS_WIDTH=y
251CONFIG_FEATURE_LS_SORTFILES=y 249CONFIG_FEATURE_LS_SORTFILES=y
252CONFIG_FEATURE_LS_TIMESTAMPS=y 250CONFIG_FEATURE_LS_TIMESTAMPS=y
253CONFIG_FEATURE_LS_USERNAME=y 251CONFIG_FEATURE_LS_USERNAME=y
254CONFIG_FEATURE_LS_COLOR=y 252CONFIG_FEATURE_LS_COLOR=y
255# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set 253# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
256CONFIG_MD5SUM=y 254CONFIG_MD5SUM=y
255# CONFIG_SHA1SUM is not set
256# CONFIG_SHA256SUM is not set
257# CONFIG_SHA512SUM is not set
258# CONFIG_SHA3SUM is not set
259
260#
261# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
262#
263CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
257CONFIG_MKDIR=y 264CONFIG_MKDIR=y
258CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y 265CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
259CONFIG_MKFIFO=y 266CONFIG_MKFIFO=y
260CONFIG_MKNOD=y 267CONFIG_MKNOD=y
268CONFIG_MKTEMP=y
261CONFIG_MV=y 269CONFIG_MV=y
262# CONFIG_FEATURE_MV_LONG_OPTIONS is not set 270# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
263# CONFIG_NICE is not set 271# CONFIG_NICE is not set
272# CONFIG_NL is not set
264CONFIG_NOHUP=y 273CONFIG_NOHUP=y
274CONFIG_NPROC=y
265CONFIG_OD=y 275CONFIG_OD=y
276# CONFIG_PASTE is not set
266# CONFIG_PRINTENV is not set 277# CONFIG_PRINTENV is not set
267CONFIG_PRINTF=y 278CONFIG_PRINTF=y
268CONFIG_PWD=y 279CONFIG_PWD=y
@@ -273,10 +284,8 @@ CONFIG_RM=y
273CONFIG_RMDIR=y 284CONFIG_RMDIR=y
274# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set 285# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
275CONFIG_SEQ=y 286CONFIG_SEQ=y
276# CONFIG_SHA1SUM is not set 287# CONFIG_SHRED is not set
277# CONFIG_SHA256SUM is not set 288CONFIG_SHUF=y
278# CONFIG_SHA512SUM is not set
279# CONFIG_SHA3SUM is not set
280CONFIG_SLEEP=y 289CONFIG_SLEEP=y
281CONFIG_FEATURE_FANCY_SLEEP=y 290CONFIG_FEATURE_FANCY_SLEEP=y
282CONFIG_FEATURE_FLOAT_SLEEP=y 291CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -286,25 +295,43 @@ CONFIG_FEATURE_SORT_BIG=y
286# CONFIG_FEATURE_SPLIT_FANCY is not set 295# CONFIG_FEATURE_SPLIT_FANCY is not set
287CONFIG_STAT=y 296CONFIG_STAT=y
288CONFIG_FEATURE_STAT_FORMAT=y 297CONFIG_FEATURE_STAT_FORMAT=y
298CONFIG_FEATURE_STAT_FILESYSTEM=y
289CONFIG_STTY=y 299CONFIG_STTY=y
290# CONFIG_SUM is not set 300# CONFIG_SUM is not set
301CONFIG_SYNC=y
302# CONFIG_FEATURE_SYNC_FANCY is not set
291# CONFIG_TAC is not set 303# CONFIG_TAC is not set
292CONFIG_TAIL=y 304CONFIG_TAIL=y
293CONFIG_FEATURE_FANCY_TAIL=y 305CONFIG_FEATURE_FANCY_TAIL=y
294CONFIG_TEE=y 306CONFIG_TEE=y
295# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set 307# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
308CONFIG_TEST=y
309CONFIG_TEST1=y
310CONFIG_TEST2=y
311CONFIG_FEATURE_TEST_64=y
312# CONFIG_TIMEOUT is not set
313CONFIG_TOUCH=y
314CONFIG_FEATURE_TOUCH_NODEREF=y
315CONFIG_FEATURE_TOUCH_SUSV3=y
316CONFIG_TR=y
317CONFIG_FEATURE_TR_CLASSES=y
318# CONFIG_FEATURE_TR_EQUIV is not set
296CONFIG_TRUE=y 319CONFIG_TRUE=y
320# CONFIG_TRUNCATE is not set
297CONFIG_TTY=y 321CONFIG_TTY=y
298CONFIG_UNAME=y 322CONFIG_UNAME=y
299CONFIG_UNAME_OSNAME="GNU/Linux" 323CONFIG_UNAME_OSNAME="GNU/Linux"
300# CONFIG_UNEXPAND is not set
301# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
302CONFIG_UNIQ=y 324CONFIG_UNIQ=y
325CONFIG_UNLINK=y
303CONFIG_USLEEP=y 326CONFIG_USLEEP=y
304# CONFIG_UUDECODE is not set 327# CONFIG_UUDECODE is not set
328# CONFIG_BASE64 is not set
305# CONFIG_UUENCODE is not set 329# CONFIG_UUENCODE is not set
306CONFIG_WC=y 330CONFIG_WC=y
307# CONFIG_FEATURE_WC_LARGE is not set 331# CONFIG_FEATURE_WC_LARGE is not set
332CONFIG_WHO=y
333# CONFIG_W is not set
334CONFIG_USERS=y
308CONFIG_WHOAMI=y 335CONFIG_WHOAMI=y
309CONFIG_YES=y 336CONFIG_YES=y
310 337
@@ -319,30 +346,29 @@ CONFIG_FEATURE_VERBOSE=y
319# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set 346# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
320 347
321# 348#
322# Common options for ls, more and telnet
323#
324CONFIG_FEATURE_AUTOWIDTH=y
325
326#
327# Common options for df, du, ls 349# Common options for df, du, ls
328# 350#
329CONFIG_FEATURE_HUMAN_READABLE=y 351CONFIG_FEATURE_HUMAN_READABLE=y
330 352
331# 353#
332# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
333#
334CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
335
336#
337# Console Utilities 354# Console Utilities
338# 355#
339CONFIG_CHVT=y 356CONFIG_CHVT=y
340# CONFIG_FGCONSOLE is not set
341CONFIG_CLEAR=y 357CONFIG_CLEAR=y
342CONFIG_DEALLOCVT=y 358CONFIG_DEALLOCVT=y
343CONFIG_DUMPKMAP=y 359CONFIG_DUMPKMAP=y
360# CONFIG_FGCONSOLE is not set
344# CONFIG_KBD_MODE is not set 361# CONFIG_KBD_MODE is not set
345CONFIG_LOADFONT=y 362CONFIG_LOADFONT=y
363# CONFIG_SETFONT is not set
364# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
365CONFIG_DEFAULT_SETFONT_DIR=""
366
367#
368# Common options for loadfont and setfont
369#
370# CONFIG_FEATURE_LOADFONT_PSF2 is not set
371# CONFIG_FEATURE_LOADFONT_RAW is not set
346CONFIG_LOADKMAP=y 372CONFIG_LOADKMAP=y
347CONFIG_OPENVT=y 373CONFIG_OPENVT=y
348CONFIG_RESET=y 374CONFIG_RESET=y
@@ -350,30 +376,20 @@ CONFIG_RESET=y
350# CONFIG_FEATURE_RESIZE_PRINT is not set 376# CONFIG_FEATURE_RESIZE_PRINT is not set
351CONFIG_SETCONSOLE=y 377CONFIG_SETCONSOLE=y
352# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set 378# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
353# CONFIG_SETFONT is not set
354# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
355CONFIG_DEFAULT_SETFONT_DIR=""
356# CONFIG_SETKEYCODES is not set 379# CONFIG_SETKEYCODES is not set
357# CONFIG_SETLOGCONS is not set 380# CONFIG_SETLOGCONS is not set
358# CONFIG_SHOWKEY is not set 381# CONFIG_SHOWKEY is not set
359 382
360# 383#
361# Common options for loadfont and setfont
362#
363# CONFIG_FEATURE_LOADFONT_PSF2 is not set
364# CONFIG_FEATURE_LOADFONT_RAW is not set
365
366#
367# Debian Utilities 384# Debian Utilities
368# 385#
369CONFIG_MKTEMP=y
370# CONFIG_PIPE_PROGRESS is not set 386# CONFIG_PIPE_PROGRESS is not set
371CONFIG_RUN_PARTS=y 387CONFIG_RUN_PARTS=y
372CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y 388CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
373# CONFIG_FEATURE_RUN_PARTS_FANCY is not set 389# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
374CONFIG_START_STOP_DAEMON=y 390CONFIG_START_STOP_DAEMON=y
375CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
376CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y 391CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
392CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
377CONFIG_WHICH=y 393CONFIG_WHICH=y
378 394
379# 395#
@@ -436,8 +452,8 @@ CONFIG_FEATURE_FIND_REGEX=y
436# CONFIG_FEATURE_FIND_CONTEXT is not set 452# CONFIG_FEATURE_FIND_CONTEXT is not set
437# CONFIG_FEATURE_FIND_LINKS is not set 453# CONFIG_FEATURE_FIND_LINKS is not set
438CONFIG_GREP=y 454CONFIG_GREP=y
439CONFIG_FEATURE_GREP_EGREP_ALIAS=y 455CONFIG_EGREP=y
440CONFIG_FEATURE_GREP_FGREP_ALIAS=y 456CONFIG_FGREP=y
441CONFIG_FEATURE_GREP_CONTEXT=y 457CONFIG_FEATURE_GREP_CONTEXT=y
442CONFIG_XARGS=y 458CONFIG_XARGS=y
443# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set 459# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
@@ -453,40 +469,45 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
453# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set 469# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
454# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set 470# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
455CONFIG_HALT=y 471CONFIG_HALT=y
472CONFIG_POWEROFF=y
473CONFIG_REBOOT=y
456# CONFIG_FEATURE_CALL_TELINIT is not set 474# CONFIG_FEATURE_CALL_TELINIT is not set
457CONFIG_TELINIT_PATH="" 475CONFIG_TELINIT_PATH=""
458# CONFIG_INIT is not set 476# CONFIG_INIT is not set
477# CONFIG_LINUXRC is not set
459# CONFIG_FEATURE_USE_INITTAB is not set 478# CONFIG_FEATURE_USE_INITTAB is not set
460# CONFIG_FEATURE_KILL_REMOVED is not set 479# CONFIG_FEATURE_KILL_REMOVED is not set
461CONFIG_FEATURE_KILL_DELAY=0 480CONFIG_FEATURE_KILL_DELAY=0
462# CONFIG_FEATURE_INIT_SCTTY is not set 481# CONFIG_FEATURE_INIT_SCTTY is not set
463# CONFIG_FEATURE_INIT_SYSLOG is not set 482# CONFIG_FEATURE_INIT_SYSLOG is not set
464# CONFIG_FEATURE_EXTRA_QUIET is not set 483# CONFIG_FEATURE_INIT_QUIET is not set
465# CONFIG_FEATURE_INIT_COREDUMPS is not set 484# CONFIG_FEATURE_INIT_COREDUMPS is not set
466# CONFIG_FEATURE_INITRD is not set
467CONFIG_INIT_TERMINAL_TYPE="" 485CONFIG_INIT_TERMINAL_TYPE=""
468CONFIG_MESG=y 486# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
469# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
470 487
471# 488#
472# Login/Password Management Utilities 489# Login/Password Management Utilities
473# 490#
474# CONFIG_ADD_SHELL is not set
475# CONFIG_REMOVE_SHELL is not set
476# CONFIG_FEATURE_SHADOWPASSWDS is not set 491# CONFIG_FEATURE_SHADOWPASSWDS is not set
477# CONFIG_USE_BB_PWD_GRP is not set 492# CONFIG_USE_BB_PWD_GRP is not set
478# CONFIG_USE_BB_SHADOW is not set 493# CONFIG_USE_BB_SHADOW is not set
479CONFIG_USE_BB_CRYPT=y 494CONFIG_USE_BB_CRYPT=y
480# CONFIG_USE_BB_CRYPT_SHA is not set 495# CONFIG_USE_BB_CRYPT_SHA is not set
496# CONFIG_ADD_SHELL is not set
497# CONFIG_REMOVE_SHELL is not set
498# CONFIG_ADDGROUP is not set
499# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
500# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
481# CONFIG_ADDUSER is not set 501# CONFIG_ADDUSER is not set
482# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set 502# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
483# CONFIG_FEATURE_CHECK_NAMES is not set 503# CONFIG_FEATURE_CHECK_NAMES is not set
484CONFIG_LAST_ID=60000 504CONFIG_LAST_ID=60000
485CONFIG_FIRST_SYSTEM_ID=100 505CONFIG_FIRST_SYSTEM_ID=100
486CONFIG_LAST_SYSTEM_ID=999 506CONFIG_LAST_SYSTEM_ID=999
487# CONFIG_ADDGROUP is not set 507# CONFIG_CHPASSWD is not set
488# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set 508CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
489# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set 509# CONFIG_CRYPTPW is not set
510# CONFIG_MKPASSWD is not set
490# CONFIG_DELUSER is not set 511# CONFIG_DELUSER is not set
491# CONFIG_DELGROUP is not set 512# CONFIG_DELGROUP is not set
492# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set 513# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
@@ -498,12 +519,10 @@ CONFIG_LAST_SYSTEM_ID=999
498# CONFIG_FEATURE_SECURETTY is not set 519# CONFIG_FEATURE_SECURETTY is not set
499# CONFIG_PASSWD is not set 520# CONFIG_PASSWD is not set
500# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set 521# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
501# CONFIG_CRYPTPW is not set
502# CONFIG_CHPASSWD is not set
503CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
504# CONFIG_SU is not set 522# CONFIG_SU is not set
505# CONFIG_FEATURE_SU_SYSLOG is not set 523# CONFIG_FEATURE_SU_SYSLOG is not set
506# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set 524# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
525# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
507# CONFIG_SULOGIN is not set 526# CONFIG_SULOGIN is not set
508# CONFIG_VLOCK is not set 527# CONFIG_VLOCK is not set
509 528
@@ -518,29 +537,29 @@ CONFIG_FSCK=y
518# 537#
519# Linux Module Utilities 538# Linux Module Utilities
520# 539#
521# CONFIG_MODINFO is not set
522# CONFIG_MODPROBE_SMALL is not set 540# CONFIG_MODPROBE_SMALL is not set
523# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set 541CONFIG_DEPMOD=y
524# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
525CONFIG_INSMOD=y 542CONFIG_INSMOD=y
526CONFIG_RMMOD=y
527CONFIG_LSMOD=y 543CONFIG_LSMOD=y
528# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set 544# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
545# CONFIG_MODINFO is not set
529CONFIG_MODPROBE=y 546CONFIG_MODPROBE=y
530# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set 547# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
531CONFIG_DEPMOD=y 548CONFIG_RMMOD=y
532 549
533# 550#
534# Options common to multiple modutils 551# Options common to multiple modutils
535# 552#
553CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
554# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
536# CONFIG_FEATURE_2_4_MODULES is not set 555# CONFIG_FEATURE_2_4_MODULES is not set
537# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
538# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set 556# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
539# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set 557# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
540# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set 558# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
541# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set 559# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
542# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set 560# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
543CONFIG_FEATURE_CHECK_TAINTED_MODULE=y 561CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
562# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
544CONFIG_FEATURE_MODUTILS_ALIAS=y 563CONFIG_FEATURE_MODUTILS_ALIAS=y
545CONFIG_FEATURE_MODUTILS_SYMBOLS=y 564CONFIG_FEATURE_MODUTILS_SYMBOLS=y
546CONFIG_DEFAULT_MODULES_DIR="/lib/modules" 565CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
@@ -549,40 +568,23 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
549# 568#
550# Linux System Utilities 569# Linux System Utilities
551# 570#
552# CONFIG_BLOCKDEV is not set
553# CONFIG_FATATTR is not set
554CONFIG_FSTRIM=y
555# CONFIG_MDEV is not set
556# CONFIG_FEATURE_MDEV_CONF is not set
557# CONFIG_FEATURE_MDEV_RENAME is not set
558# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
559# CONFIG_FEATURE_MDEV_EXEC is not set
560# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
561CONFIG_MOUNT=y
562# CONFIG_FEATURE_MOUNT_FAKE is not set
563# CONFIG_FEATURE_MOUNT_VERBOSE is not set
564# CONFIG_FEATURE_MOUNT_HELPERS is not set
565# CONFIG_FEATURE_MOUNT_LABEL is not set
566# CONFIG_FEATURE_MOUNT_NFS is not set
567# CONFIG_FEATURE_MOUNT_CIFS is not set
568CONFIG_FEATURE_MOUNT_FLAGS=y
569CONFIG_FEATURE_MOUNT_FSTAB=y
570# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
571# CONFIG_REV is not set
572# CONFIG_UEVENT is not set
573# CONFIG_ACPID is not set 571# CONFIG_ACPID is not set
574# CONFIG_FEATURE_ACPID_COMPAT is not set 572# CONFIG_FEATURE_ACPID_COMPAT is not set
573# CONFIG_BLKDISCARD is not set
575# CONFIG_BLKID is not set 574# CONFIG_BLKID is not set
576# CONFIG_FEATURE_BLKID_TYPE is not set 575# CONFIG_FEATURE_BLKID_TYPE is not set
576# CONFIG_BLOCKDEV is not set
577# CONFIG_CAL is not set
577CONFIG_DMESG=y 578CONFIG_DMESG=y
578CONFIG_FEATURE_DMESG_PRETTY=y 579CONFIG_FEATURE_DMESG_PRETTY=y
580# CONFIG_FALLOCATE is not set
581# CONFIG_FATATTR is not set
579CONFIG_FBSET=y 582CONFIG_FBSET=y
580CONFIG_FEATURE_FBSET_FANCY=y 583CONFIG_FEATURE_FBSET_FANCY=y
581CONFIG_FEATURE_FBSET_READMODE=y 584CONFIG_FEATURE_FBSET_READMODE=y
582# CONFIG_FDFLUSH is not set
583# CONFIG_FDFORMAT is not set 585# CONFIG_FDFORMAT is not set
584CONFIG_FDISK=y 586CONFIG_FDISK=y
585CONFIG_FDISK_SUPPORT_LARGE_DISKS=y 587# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
586CONFIG_FEATURE_FDISK_WRITABLE=y 588CONFIG_FEATURE_FDISK_WRITABLE=y
587# CONFIG_FEATURE_AIX_LABEL is not set 589# CONFIG_FEATURE_AIX_LABEL is not set
588# CONFIG_FEATURE_SGI_LABEL is not set 590# CONFIG_FEATURE_SGI_LABEL is not set
@@ -592,43 +594,82 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
592# CONFIG_FEATURE_FDISK_ADVANCED is not set 594# CONFIG_FEATURE_FDISK_ADVANCED is not set
593# CONFIG_FINDFS is not set 595# CONFIG_FINDFS is not set
594CONFIG_FLOCK=y 596CONFIG_FLOCK=y
597# CONFIG_FDFLUSH is not set
595# CONFIG_FREERAMDISK is not set 598# CONFIG_FREERAMDISK is not set
596# CONFIG_FSCK_MINIX is not set 599# CONFIG_FSCK_MINIX is not set
597# CONFIG_MKFS_EXT2 is not set 600# CONFIG_FSFREEZE is not set
598# CONFIG_MKFS_MINIX is not set 601CONFIG_FSTRIM=y
599# CONFIG_FEATURE_MINIX2 is not set
600# CONFIG_MKFS_REISER is not set
601# CONFIG_MKFS_VFAT is not set
602# CONFIG_GETOPT is not set 602# CONFIG_GETOPT is not set
603# CONFIG_FEATURE_GETOPT_LONG is not set 603# CONFIG_FEATURE_GETOPT_LONG is not set
604CONFIG_HEXDUMP=y 604CONFIG_HEXDUMP=y
605# CONFIG_FEATURE_HEXDUMP_REVERSE is not set 605# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
606# CONFIG_HD is not set 606# CONFIG_HD is not set
607# CONFIG_XXD is not set
607CONFIG_HWCLOCK=y 608CONFIG_HWCLOCK=y
608CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y 609CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
609CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y 610CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
610# CONFIG_IPCRM is not set 611# CONFIG_IPCRM is not set
611# CONFIG_IPCS is not set 612# CONFIG_IPCS is not set
613# CONFIG_LAST is not set
614# CONFIG_FEATURE_LAST_FANCY is not set
612CONFIG_LOSETUP=y 615CONFIG_LOSETUP=y
613# CONFIG_LSPCI is not set 616# CONFIG_LSPCI is not set
614# CONFIG_LSUSB is not set 617# CONFIG_LSUSB is not set
618# CONFIG_MDEV is not set
619# CONFIG_FEATURE_MDEV_CONF is not set
620# CONFIG_FEATURE_MDEV_RENAME is not set
621# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
622# CONFIG_FEATURE_MDEV_EXEC is not set
623# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
624CONFIG_MESG=y
625# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
626# CONFIG_MKE2FS is not set
627# CONFIG_MKFS_EXT2 is not set
628# CONFIG_MKFS_MINIX is not set
629# CONFIG_FEATURE_MINIX2 is not set
630# CONFIG_MKFS_REISER is not set
631# CONFIG_MKDOSFS is not set
632# CONFIG_MKFS_VFAT is not set
615CONFIG_MKSWAP=y 633CONFIG_MKSWAP=y
616# CONFIG_FEATURE_MKSWAP_UUID is not set 634# CONFIG_FEATURE_MKSWAP_UUID is not set
617CONFIG_MORE=y 635CONFIG_MORE=y
636CONFIG_MOUNT=y
637# CONFIG_FEATURE_MOUNT_FAKE is not set
638# CONFIG_FEATURE_MOUNT_VERBOSE is not set
639# CONFIG_FEATURE_MOUNT_HELPERS is not set
640# CONFIG_FEATURE_MOUNT_LABEL is not set
641# CONFIG_FEATURE_MOUNT_NFS is not set
642# CONFIG_FEATURE_MOUNT_CIFS is not set
643CONFIG_FEATURE_MOUNT_FLAGS=y
644CONFIG_FEATURE_MOUNT_FSTAB=y
645# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
646# CONFIG_NSENTER is not set
647# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set
618CONFIG_PIVOT_ROOT=y 648CONFIG_PIVOT_ROOT=y
619CONFIG_RDATE=y 649CONFIG_RDATE=y
620# CONFIG_RDEV is not set 650# CONFIG_RDEV is not set
621# CONFIG_READPROFILE is not set 651# CONFIG_READPROFILE is not set
652CONFIG_RENICE=y
653# CONFIG_REV is not set
622# CONFIG_RTCWAKE is not set 654# CONFIG_RTCWAKE is not set
623# CONFIG_SCRIPT is not set 655# CONFIG_SCRIPT is not set
624# CONFIG_SCRIPTREPLAY is not set 656# CONFIG_SCRIPTREPLAY is not set
625# CONFIG_SETARCH is not set 657# CONFIG_SETARCH is not set
626CONFIG_SWAPONOFF=y 658# CONFIG_LINUX32 is not set
659# CONFIG_LINUX64 is not set
660# CONFIG_SETPRIV is not set
661CONFIG_SWAPON=y
627CONFIG_FEATURE_SWAPON_DISCARD=y 662CONFIG_FEATURE_SWAPON_DISCARD=y
628CONFIG_FEATURE_SWAPON_PRI=y 663CONFIG_FEATURE_SWAPON_PRI=y
664CONFIG_SWAPOFF=y
629CONFIG_SWITCH_ROOT=y 665CONFIG_SWITCH_ROOT=y
666# CONFIG_TASKSET is not set
667# CONFIG_FEATURE_TASKSET_FANCY is not set
668# CONFIG_UEVENT is not set
630CONFIG_UMOUNT=y 669CONFIG_UMOUNT=y
631CONFIG_FEATURE_UMOUNT_ALL=y 670CONFIG_FEATURE_UMOUNT_ALL=y
671# CONFIG_UNSHARE is not set
672# CONFIG_WALL is not set
632 673
633# 674#
634# Common options for mount/umount 675# Common options for mount/umount
@@ -637,6 +678,7 @@ CONFIG_FEATURE_MOUNT_LOOP=y
637CONFIG_FEATURE_MOUNT_LOOP_CREATE=y 678CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
638# CONFIG_FEATURE_MTAB_SUPPORT is not set 679# CONFIG_FEATURE_MTAB_SUPPORT is not set
639# CONFIG_VOLUMEID is not set 680# CONFIG_VOLUMEID is not set
681# CONFIG_FEATURE_VOLUMEID_BCACHE is not set
640# CONFIG_FEATURE_VOLUMEID_BTRFS is not set 682# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
641# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set 683# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
642# CONFIG_FEATURE_VOLUMEID_EXFAT is not set 684# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
@@ -656,17 +698,33 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
656# CONFIG_FEATURE_VOLUMEID_ROMFS is not set 698# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
657# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set 699# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
658# CONFIG_FEATURE_VOLUMEID_SYSV is not set 700# CONFIG_FEATURE_VOLUMEID_SYSV is not set
701# CONFIG_FEATURE_VOLUMEID_UBIFS is not set
659# CONFIG_FEATURE_VOLUMEID_UDF is not set 702# CONFIG_FEATURE_VOLUMEID_UDF is not set
660# CONFIG_FEATURE_VOLUMEID_XFS is not set 703# CONFIG_FEATURE_VOLUMEID_XFS is not set
661 704
662# 705#
663# Miscellaneous Utilities 706# Miscellaneous Utilities
664# 707#
708# CONFIG_BEEP is not set
709CONFIG_FEATURE_BEEP_FREQ=0
710CONFIG_FEATURE_BEEP_LENGTH_MS=0
665# CONFIG_CONSPY is not set 711# CONFIG_CONSPY is not set
666# CONFIG_CROND is not set 712# CONFIG_CROND is not set
667# CONFIG_FEATURE_CROND_D is not set 713# CONFIG_FEATURE_CROND_D is not set
668# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set 714# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
669CONFIG_FEATURE_CROND_DIR="" 715CONFIG_FEATURE_CROND_DIR=""
716# CONFIG_DEVFSD is not set
717# CONFIG_DEVFSD_MODLOAD is not set
718# CONFIG_DEVFSD_FG_NP is not set
719# CONFIG_DEVFSD_VERBOSE is not set
720# CONFIG_FEATURE_DEVFS is not set
721# CONFIG_HDPARM is not set
722# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
723# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
724# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
725# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
726# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
727# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
670# CONFIG_I2CGET is not set 728# CONFIG_I2CGET is not set
671# CONFIG_I2CSET is not set 729# CONFIG_I2CSET is not set
672# CONFIG_I2CDUMP is not set 730# CONFIG_I2CDUMP is not set
@@ -682,19 +740,19 @@ CONFIG_FEATURE_LESS_FLAGS=y
682# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set 740# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
683# CONFIG_FEATURE_LESS_DASHCMD is not set 741# CONFIG_FEATURE_LESS_DASHCMD is not set
684# CONFIG_FEATURE_LESS_LINENUMS is not set 742# CONFIG_FEATURE_LESS_LINENUMS is not set
743# CONFIG_LSSCSI is not set
685# CONFIG_NANDWRITE is not set 744# CONFIG_NANDWRITE is not set
686# CONFIG_NANDDUMP is not set 745# CONFIG_NANDDUMP is not set
746# CONFIG_PARTPROBE is not set
687CONFIG_RFKILL=y 747CONFIG_RFKILL=y
688# CONFIG_SETSERIAL is not set 748# CONFIG_SETSERIAL is not set
689# CONFIG_TASKSET is not set
690# CONFIG_FEATURE_TASKSET_FANCY is not set
691# CONFIG_UBIATTACH is not set 749# CONFIG_UBIATTACH is not set
692# CONFIG_UBIDETACH is not set 750# CONFIG_UBIDETACH is not set
693# CONFIG_UBIMKVOL is not set 751# CONFIG_UBIMKVOL is not set
694# CONFIG_UBIRMVOL is not set 752# CONFIG_UBIRMVOL is not set
695# CONFIG_UBIRSVOL is not set 753# CONFIG_UBIRSVOL is not set
696# CONFIG_UBIUPDATEVOL is not set 754# CONFIG_UBIUPDATEVOL is not set
697# CONFIG_WALL is not set 755# CONFIG_UBIRENAME is not set
698# CONFIG_ADJTIMEX is not set 756# CONFIG_ADJTIMEX is not set
699# CONFIG_BBCONFIG is not set 757# CONFIG_BBCONFIG is not set
700# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set 758# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -729,7 +787,6 @@ CONFIG_DC=y
729# CONFIG_IONICE is not set 787# CONFIG_IONICE is not set
730# CONFIG_INOTIFYD is not set 788# CONFIG_INOTIFYD is not set
731# CONFIG_LAST is not set 789# CONFIG_LAST is not set
732# CONFIG_FEATURE_LAST_SMALL is not set
733# CONFIG_FEATURE_LAST_FANCY is not set 790# CONFIG_FEATURE_LAST_FANCY is not set
734# CONFIG_HDPARM is not set 791# CONFIG_HDPARM is not set
735# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set 792# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
@@ -760,24 +817,6 @@ CONFIG_TIME=y
760# 817#
761# Networking Utilities 818# Networking Utilities
762# 819#
763# CONFIG_NAMEIF is not set
764# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
765# CONFIG_NBDCLIENT is not set
766CONFIG_NC=y
767# CONFIG_NC_SERVER is not set
768# CONFIG_NC_EXTRA is not set
769# CONFIG_NC_110_COMPAT is not set
770CONFIG_PING=y
771CONFIG_PING6=y
772CONFIG_FEATURE_FANCY_PING=y
773CONFIG_WGET=y
774CONFIG_FEATURE_WGET_STATUSBAR=y
775CONFIG_FEATURE_WGET_AUTHENTICATION=y
776CONFIG_FEATURE_WGET_LONG_OPTIONS=y
777CONFIG_FEATURE_WGET_TIMEOUT=y
778# CONFIG_FEATURE_WGET_OPENSSL is not set
779# CONFIG_FEATURE_WGET_SSL_HELPER is not set
780# CONFIG_WHOIS is not set
781CONFIG_FEATURE_IPV6=y 820CONFIG_FEATURE_IPV6=y
782# CONFIG_FEATURE_UNIX_LOCAL is not set 821# CONFIG_FEATURE_UNIX_LOCAL is not set
783CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y 822CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -789,15 +828,15 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
789# CONFIG_FEATURE_BRCTL_SHOW is not set 828# CONFIG_FEATURE_BRCTL_SHOW is not set
790# CONFIG_DNSD is not set 829# CONFIG_DNSD is not set
791# CONFIG_ETHER_WAKE is not set 830# CONFIG_ETHER_WAKE is not set
792# CONFIG_FAKEIDENTD is not set
793# CONFIG_FTPD is not set 831# CONFIG_FTPD is not set
794# CONFIG_FEATURE_FTP_WRITE is not set 832# CONFIG_FEATURE_FTPD_WRITE is not set
795# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set 833# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
796# CONFIG_FEATURE_FTP_AUTHENTICATION is not set 834# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
797# CONFIG_FTPGET is not set 835# CONFIG_FTPGET is not set
798# CONFIG_FTPPUT is not set 836# CONFIG_FTPPUT is not set
799# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set 837# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
800CONFIG_HOSTNAME=y 838CONFIG_HOSTNAME=y
839CONFIG_DNSDOMAINNAME=y
801# CONFIG_HTTPD is not set 840# CONFIG_HTTPD is not set
802# CONFIG_FEATURE_HTTPD_RANGES is not set 841# CONFIG_FEATURE_HTTPD_RANGES is not set
803# CONFIG_FEATURE_HTTPD_SETUID is not set 842# CONFIG_FEATURE_HTTPD_SETUID is not set
@@ -818,11 +857,10 @@ CONFIG_FEATURE_IFCONFIG_HW=y
818# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set 857# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
819# CONFIG_IFENSLAVE is not set 858# CONFIG_IFENSLAVE is not set
820# CONFIG_IFPLUGD is not set 859# CONFIG_IFPLUGD is not set
821CONFIG_IFUPDOWN=y 860CONFIG_IFUP=y
861CONFIG_IFDOWN=y
822CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" 862CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
823CONFIG_FEATURE_IFUPDOWN_IP=y 863CONFIG_FEATURE_IFUPDOWN_IP=y
824CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
825# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
826CONFIG_FEATURE_IFUPDOWN_IPV4=y 864CONFIG_FEATURE_IFUPDOWN_IPV4=y
827CONFIG_FEATURE_IFUPDOWN_IPV6=y 865CONFIG_FEATURE_IFUPDOWN_IPV6=y
828CONFIG_FEATURE_IFUPDOWN_MAPPING=y 866CONFIG_FEATURE_IFUPDOWN_MAPPING=y
@@ -835,22 +873,31 @@ CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
835# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set 873# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
836# CONFIG_FEATURE_INETD_RPC is not set 874# CONFIG_FEATURE_INETD_RPC is not set
837CONFIG_IP=y 875CONFIG_IP=y
876# CONFIG_IPADDR is not set
877# CONFIG_IPLINK is not set
878# CONFIG_IPROUTE is not set
879# CONFIG_IPTUNNEL is not set
880# CONFIG_IPRULE is not set
881# CONFIG_IPNEIGH is not set
838CONFIG_FEATURE_IP_ADDRESS=y 882CONFIG_FEATURE_IP_ADDRESS=y
839CONFIG_FEATURE_IP_LINK=y 883CONFIG_FEATURE_IP_LINK=y
840CONFIG_FEATURE_IP_ROUTE=y 884CONFIG_FEATURE_IP_ROUTE=y
841CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" 885CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
842CONFIG_FEATURE_IP_TUNNEL=y 886CONFIG_FEATURE_IP_TUNNEL=y
843# CONFIG_FEATURE_IP_RULE is not set 887# CONFIG_FEATURE_IP_RULE is not set
844# CONFIG_FEATURE_IP_SHORT_FORMS is not set 888# CONFIG_FEATURE_IP_NEIGH is not set
845# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set 889# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
846# CONFIG_IPADDR is not set
847# CONFIG_IPLINK is not set
848# CONFIG_IPROUTE is not set
849# CONFIG_IPTUNNEL is not set
850# CONFIG_IPRULE is not set
851# CONFIG_IPCALC is not set 890# CONFIG_IPCALC is not set
852# CONFIG_FEATURE_IPCALC_FANCY is not set
853# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set 891# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
892# CONFIG_FEATURE_IPCALC_FANCY is not set
893# CONFIG_FAKEIDENTD is not set
894# CONFIG_NAMEIF is not set
895# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
896# CONFIG_NBDCLIENT is not set
897CONFIG_NC=y
898# CONFIG_NC_SERVER is not set
899# CONFIG_NC_EXTRA is not set
900# CONFIG_NC_110_COMPAT is not set
854CONFIG_NETSTAT=y 901CONFIG_NETSTAT=y
855# CONFIG_FEATURE_NETSTAT_WIDE is not set 902# CONFIG_FEATURE_NETSTAT_WIDE is not set
856# CONFIG_FEATURE_NETSTAT_PRG is not set 903# CONFIG_FEATURE_NETSTAT_PRG is not set
@@ -858,13 +905,19 @@ CONFIG_NSLOOKUP=y
858# CONFIG_NTPD is not set 905# CONFIG_NTPD is not set
859# CONFIG_FEATURE_NTPD_SERVER is not set 906# CONFIG_FEATURE_NTPD_SERVER is not set
860# CONFIG_FEATURE_NTPD_CONF is not set 907# CONFIG_FEATURE_NTPD_CONF is not set
908CONFIG_PING=y
909CONFIG_PING6=y
910CONFIG_FEATURE_FANCY_PING=y
861# CONFIG_PSCAN is not set 911# CONFIG_PSCAN is not set
862CONFIG_ROUTE=y 912CONFIG_ROUTE=y
863# CONFIG_SLATTACH is not set 913# CONFIG_SLATTACH is not set
914# CONFIG_SSL_CLIENT is not set
864# CONFIG_TCPSVD is not set 915# CONFIG_TCPSVD is not set
916# CONFIG_UDPSVD is not set
865CONFIG_TELNET=y 917CONFIG_TELNET=y
866# CONFIG_FEATURE_TELNET_TTYPE is not set 918# CONFIG_FEATURE_TELNET_TTYPE is not set
867CONFIG_FEATURE_TELNET_AUTOLOGIN=y 919CONFIG_FEATURE_TELNET_AUTOLOGIN=y
920CONFIG_FEATURE_TELNET_WIDTH=y
868# CONFIG_TELNETD is not set 921# CONFIG_TELNETD is not set
869# CONFIG_FEATURE_TELNETD_STANDALONE is not set 922# CONFIG_FEATURE_TELNETD_STANDALONE is not set
870# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set 923# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
@@ -879,33 +932,43 @@ CONFIG_FEATURE_TFTP_PUT=y
879# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set 932# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
880# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set 933# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
881# CONFIG_TFTP_DEBUG is not set 934# CONFIG_TFTP_DEBUG is not set
935CONFIG_TLS=y
882CONFIG_TRACEROUTE=y 936CONFIG_TRACEROUTE=y
883# CONFIG_TRACEROUTE6 is not set 937# CONFIG_TRACEROUTE6 is not set
884# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set 938# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
885# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
886# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set 939# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
887# CONFIG_TUNCTL is not set 940# CONFIG_TUNCTL is not set
888# CONFIG_FEATURE_TUNCTL_UG is not set 941# CONFIG_FEATURE_TUNCTL_UG is not set
942# CONFIG_VCONFIG is not set
943CONFIG_WGET=y
944CONFIG_FEATURE_WGET_LONG_OPTIONS=y
945CONFIG_FEATURE_WGET_STATUSBAR=y
946CONFIG_FEATURE_WGET_AUTHENTICATION=y
947CONFIG_FEATURE_WGET_TIMEOUT=y
948CONFIG_FEATURE_WGET_HTTPS=y
949# CONFIG_FEATURE_WGET_OPENSSL is not set
950# CONFIG_WHOIS is not set
951# CONFIG_ZCIP is not set
889# CONFIG_UDHCPC6 is not set 952# CONFIG_UDHCPC6 is not set
953# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
954# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
955# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
890CONFIG_UDHCPD=y 956CONFIG_UDHCPD=y
891# CONFIG_DHCPRELAY is not set
892CONFIG_DUMPLEASES=y
893# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set 957# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
894# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set 958# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
895CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" 959CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
960CONFIG_DUMPLEASES=y
961# CONFIG_DHCPRELAY is not set
896CONFIG_UDHCPC=y 962CONFIG_UDHCPC=y
897CONFIG_FEATURE_UDHCPC_ARPING=y 963CONFIG_FEATURE_UDHCPC_ARPING=y
898CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y 964CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
965CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
899# CONFIG_FEATURE_UDHCP_PORT is not set 966# CONFIG_FEATURE_UDHCP_PORT is not set
900CONFIG_UDHCP_DEBUG=0 967CONFIG_UDHCP_DEBUG=0
901# CONFIG_FEATURE_UDHCP_RFC3397 is not set 968# CONFIG_FEATURE_UDHCP_RFC3397 is not set
902# CONFIG_FEATURE_UDHCP_8021Q is not set 969# CONFIG_FEATURE_UDHCP_8021Q is not set
903CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
904CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 970CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
905CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" 971CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"
906# CONFIG_UDPSVD is not set
907# CONFIG_VCONFIG is not set
908# CONFIG_ZCIP is not set
909 972
910# 973#
911# Print Utilities 974# Print Utilities
@@ -918,26 +981,45 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
918# Mail Utilities 981# Mail Utilities
919# 982#
920# CONFIG_MAKEMIME is not set 983# CONFIG_MAKEMIME is not set
921CONFIG_FEATURE_MIME_CHARSET=""
922# CONFIG_POPMAILDIR is not set 984# CONFIG_POPMAILDIR is not set
923# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set 985# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
924# CONFIG_REFORMIME is not set 986# CONFIG_REFORMIME is not set
925# CONFIG_FEATURE_REFORMIME_COMPAT is not set 987# CONFIG_FEATURE_REFORMIME_COMPAT is not set
926# CONFIG_SENDMAIL is not set 988# CONFIG_SENDMAIL is not set
989CONFIG_FEATURE_MIME_CHARSET=""
927 990
928# 991#
929# Process Utilities 992# Process Utilities
930# 993#
994CONFIG_FREE=y
995CONFIG_FUSER=y
931# CONFIG_IOSTAT is not set 996# CONFIG_IOSTAT is not set
997CONFIG_KILL=y
998CONFIG_KILLALL=y
999# CONFIG_KILLALL5 is not set
932# CONFIG_LSOF is not set 1000# CONFIG_LSOF is not set
933# CONFIG_MPSTAT is not set 1001# CONFIG_MPSTAT is not set
934# CONFIG_NMETER is not set 1002# CONFIG_NMETER is not set
1003# CONFIG_PGREP is not set
1004# CONFIG_PKILL is not set
1005CONFIG_PIDOF=y
1006# CONFIG_FEATURE_PIDOF_SINGLE is not set
1007# CONFIG_FEATURE_PIDOF_OMIT is not set
935# CONFIG_PMAP is not set 1008# CONFIG_PMAP is not set
936# CONFIG_POWERTOP is not set 1009# CONFIG_POWERTOP is not set
1010# CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set
1011CONFIG_PS=y
1012CONFIG_FEATURE_PS_WIDE=y
1013CONFIG_FEATURE_PS_LONG=y
1014# CONFIG_FEATURE_PS_TIME is not set
1015# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
1016# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
937# CONFIG_PSTREE is not set 1017# CONFIG_PSTREE is not set
938# CONFIG_PWDX is not set 1018# CONFIG_PWDX is not set
939# CONFIG_SMEMCAP is not set 1019# CONFIG_SMEMCAP is not set
1020CONFIG_BB_SYSCTL=y
940CONFIG_TOP=y 1021CONFIG_TOP=y
1022# CONFIG_FEATURE_TOP_INTERACTIVE is not set
941CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y 1023CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
942CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y 1024CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
943# CONFIG_FEATURE_TOP_SMP_CPU is not set 1025# CONFIG_FEATURE_TOP_SMP_CPU is not set
@@ -946,84 +1028,69 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
946# CONFIG_FEATURE_TOPMEM is not set 1028# CONFIG_FEATURE_TOPMEM is not set
947CONFIG_UPTIME=y 1029CONFIG_UPTIME=y
948# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set 1030# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
949CONFIG_FREE=y
950CONFIG_FUSER=y
951CONFIG_KILL=y
952CONFIG_KILLALL=y
953# CONFIG_KILLALL5 is not set
954# CONFIG_PGREP is not set
955CONFIG_PIDOF=y
956# CONFIG_FEATURE_PIDOF_SINGLE is not set
957# CONFIG_FEATURE_PIDOF_OMIT is not set
958# CONFIG_PKILL is not set
959CONFIG_PS=y
960CONFIG_FEATURE_PS_WIDE=y
961CONFIG_FEATURE_PS_LONG=y
962# CONFIG_FEATURE_PS_TIME is not set
963# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
964# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
965CONFIG_RENICE=y
966CONFIG_BB_SYSCTL=y
967# CONFIG_FEATURE_SHOW_THREADS is not set
968CONFIG_WATCH=y 1031CONFIG_WATCH=y
1032# CONFIG_FEATURE_SHOW_THREADS is not set
969 1033
970# 1034#
971# Runit Utilities 1035# Runit Utilities
972# 1036#
1037# CONFIG_CHPST is not set
1038# CONFIG_SETUIDGID is not set
1039# CONFIG_ENVUIDGID is not set
1040# CONFIG_ENVDIR is not set
1041# CONFIG_SOFTLIMIT is not set
973# CONFIG_RUNSV is not set 1042# CONFIG_RUNSV is not set
974# CONFIG_RUNSVDIR is not set 1043# CONFIG_RUNSVDIR is not set
975# CONFIG_FEATURE_RUNSVDIR_LOG is not set 1044# CONFIG_FEATURE_RUNSVDIR_LOG is not set
976# CONFIG_SV is not set 1045# CONFIG_SV is not set
977CONFIG_SV_DEFAULT_SERVICE_DIR="" 1046CONFIG_SV_DEFAULT_SERVICE_DIR=""
1047# CONFIG_SVC is not set
978# CONFIG_SVLOGD is not set 1048# CONFIG_SVLOGD is not set
979# CONFIG_CHPST is not set
980# CONFIG_SETUIDGID is not set
981# CONFIG_ENVUIDGID is not set
982# CONFIG_ENVDIR is not set
983# CONFIG_SOFTLIMIT is not set
984
985#
986# SELinux utilities
987#
988# CONFIG_CHCON is not set 1049# CONFIG_CHCON is not set
989# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set 1050# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
990# CONFIG_GETENFORCE is not set 1051# CONFIG_GETENFORCE is not set
991# CONFIG_GETSEBOOL is not set 1052# CONFIG_GETSEBOOL is not set
992# CONFIG_LOAD_POLICY is not set 1053# CONFIG_LOAD_POLICY is not set
993# CONFIG_MATCHPATHCON is not set 1054# CONFIG_MATCHPATHCON is not set
994# CONFIG_RESTORECON is not set
995# CONFIG_RUNCON is not set 1055# CONFIG_RUNCON is not set
996# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set 1056# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
997# CONFIG_SELINUXENABLED is not set 1057# CONFIG_SELINUXENABLED is not set
1058# CONFIG_SESTATUS is not set
998# CONFIG_SETENFORCE is not set 1059# CONFIG_SETENFORCE is not set
999# CONFIG_SETFILES is not set 1060# CONFIG_SETFILES is not set
1000# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set 1061# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
1062# CONFIG_RESTORECON is not set
1001# CONFIG_SETSEBOOL is not set 1063# CONFIG_SETSEBOOL is not set
1002# CONFIG_SESTATUS is not set
1003 1064
1004# 1065#
1005# Shells 1066# Shells
1006# 1067#
1068CONFIG_SH_IS_ASH=y
1069# CONFIG_SH_IS_HUSH is not set
1070# CONFIG_SH_IS_NONE is not set
1071# CONFIG_BASH_IS_ASH is not set
1072# CONFIG_BASH_IS_HUSH is not set
1073CONFIG_BASH_IS_NONE=y
1007CONFIG_ASH=y 1074CONFIG_ASH=y
1075CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
1076CONFIG_ASH_INTERNAL_GLOB=y
1008CONFIG_ASH_BASH_COMPAT=y 1077CONFIG_ASH_BASH_COMPAT=y
1009# CONFIG_ASH_IDLE_TIMEOUT is not set
1010CONFIG_ASH_JOB_CONTROL=y 1078CONFIG_ASH_JOB_CONTROL=y
1011CONFIG_ASH_ALIAS=y 1079CONFIG_ASH_ALIAS=y
1012CONFIG_ASH_GETOPTS=y
1013CONFIG_ASH_BUILTIN_ECHO=y
1014CONFIG_ASH_BUILTIN_PRINTF=y
1015CONFIG_ASH_BUILTIN_TEST=y
1016CONFIG_ASH_HELP=y
1017CONFIG_ASH_CMDCMD=y
1018# CONFIG_ASH_MAIL is not set
1019CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
1020# CONFIG_ASH_RANDOM_SUPPORT is not set 1080# CONFIG_ASH_RANDOM_SUPPORT is not set
1021CONFIG_ASH_EXPAND_PRMT=y 1081CONFIG_ASH_EXPAND_PRMT=y
1082# CONFIG_ASH_IDLE_TIMEOUT is not set
1083# CONFIG_ASH_MAIL is not set
1084CONFIG_ASH_ECHO=y
1085CONFIG_ASH_PRINTF=y
1086CONFIG_ASH_TEST=y
1087CONFIG_ASH_HELP=y
1088CONFIG_ASH_GETOPTS=y
1089CONFIG_ASH_CMDCMD=y
1022# CONFIG_CTTYHACK is not set 1090# CONFIG_CTTYHACK is not set
1023# CONFIG_HUSH is not set 1091# CONFIG_HUSH is not set
1024# CONFIG_HUSH_BASH_COMPAT is not set 1092# CONFIG_HUSH_BASH_COMPAT is not set
1025# CONFIG_HUSH_BRACE_EXPANSION is not set 1093# CONFIG_HUSH_BRACE_EXPANSION is not set
1026# CONFIG_HUSH_HELP is not set
1027# CONFIG_HUSH_INTERACTIVE is not set 1094# CONFIG_HUSH_INTERACTIVE is not set
1028# CONFIG_HUSH_SAVEHISTORY is not set 1095# CONFIG_HUSH_SAVEHISTORY is not set
1029# CONFIG_HUSH_JOB is not set 1096# CONFIG_HUSH_JOB is not set
@@ -1034,17 +1101,30 @@ CONFIG_ASH_EXPAND_PRMT=y
1034# CONFIG_HUSH_FUNCTIONS is not set 1101# CONFIG_HUSH_FUNCTIONS is not set
1035# CONFIG_HUSH_LOCAL is not set 1102# CONFIG_HUSH_LOCAL is not set
1036# CONFIG_HUSH_RANDOM_SUPPORT is not set 1103# CONFIG_HUSH_RANDOM_SUPPORT is not set
1037# CONFIG_HUSH_EXPORT_N is not set
1038# CONFIG_HUSH_MODE_X is not set 1104# CONFIG_HUSH_MODE_X is not set
1105# CONFIG_HUSH_ECHO is not set
1106# CONFIG_HUSH_PRINTF is not set
1107# CONFIG_HUSH_TEST is not set
1108# CONFIG_HUSH_HELP is not set
1109# CONFIG_HUSH_EXPORT is not set
1110# CONFIG_HUSH_EXPORT_N is not set
1111# CONFIG_HUSH_KILL is not set
1112# CONFIG_HUSH_WAIT is not set
1113# CONFIG_HUSH_TRAP is not set
1114# CONFIG_HUSH_TYPE is not set
1115# CONFIG_HUSH_READ is not set
1116# CONFIG_HUSH_SET is not set
1117# CONFIG_HUSH_UNSET is not set
1118# CONFIG_HUSH_ULIMIT is not set
1119# CONFIG_HUSH_UMASK is not set
1120# CONFIG_HUSH_MEMLEAK is not set
1039# CONFIG_MSH is not set 1121# CONFIG_MSH is not set
1040CONFIG_FEATURE_SH_IS_ASH=y 1122
1041# CONFIG_FEATURE_SH_IS_HUSH is not set 1123#
1042# CONFIG_FEATURE_SH_IS_NONE is not set 1124# Options common to all shells
1043# CONFIG_FEATURE_BASH_IS_ASH is not set 1125#
1044# CONFIG_FEATURE_BASH_IS_HUSH is not set 1126CONFIG_FEATURE_SH_MATH=y
1045CONFIG_FEATURE_BASH_IS_NONE=y 1127# CONFIG_FEATURE_SH_MATH_64 is not set
1046CONFIG_SH_MATH_SUPPORT=y
1047# CONFIG_SH_MATH_SUPPORT_64 is not set
1048CONFIG_FEATURE_SH_EXTRA_QUIET=y 1128CONFIG_FEATURE_SH_EXTRA_QUIET=y
1049# CONFIG_FEATURE_SH_STANDALONE is not set 1129# CONFIG_FEATURE_SH_STANDALONE is not set
1050# CONFIG_FEATURE_SH_NOFORK is not set 1130# CONFIG_FEATURE_SH_NOFORK is not set
@@ -1053,19 +1133,17 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
1053# 1133#
1054# System Logging Utilities 1134# System Logging Utilities
1055# 1135#
1136CONFIG_KLOGD=y
1137CONFIG_FEATURE_KLOGD_KLOGCTL=y
1138CONFIG_LOGGER=y
1139# CONFIG_LOGREAD is not set
1140# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
1056# CONFIG_SYSLOGD is not set 1141# CONFIG_SYSLOGD is not set
1057# CONFIG_FEATURE_ROTATE_LOGFILE is not set 1142# CONFIG_FEATURE_ROTATE_LOGFILE is not set
1058# CONFIG_FEATURE_REMOTE_LOG is not set 1143# CONFIG_FEATURE_REMOTE_LOG is not set
1059# CONFIG_FEATURE_SYSLOGD_DUP is not set 1144# CONFIG_FEATURE_SYSLOGD_DUP is not set
1060# CONFIG_FEATURE_SYSLOGD_CFG is not set 1145# CONFIG_FEATURE_SYSLOGD_CFG is not set
1146CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
1061# CONFIG_FEATURE_IPC_SYSLOG is not set 1147# CONFIG_FEATURE_IPC_SYSLOG is not set
1062# CONFIG_LOGREAD is not set 1148CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
1063# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
1064# CONFIG_FEATURE_KMSG_SYSLOG is not set 1149# CONFIG_FEATURE_KMSG_SYSLOG is not set
1065CONFIG_KLOGD=y
1066
1067#
1068# klogd should not be used together with syslog to kernel printk buffer
1069#
1070CONFIG_FEATURE_KLOGD_KLOGCTL=y
1071CONFIG_LOGGER=y
diff --git a/meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch b/meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
deleted file mode 100644
index 41c5656586..0000000000
--- a/meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
+++ /dev/null
@@ -1,90 +0,0 @@
1From 4ab372d49a6e82b0bf097dedb96d26330c5f2d5f Mon Sep 17 00:00:00 2001
2From: Szabolcs Nagy <nsz@port70.net>
3Date: Sun, 24 Apr 2016 17:39:02 +0200
4Subject: [PATCH] ip: fix problem on mips64 n64 big endian musl systems
5
6Use designated initializers for struct msghdr.
7The struct layout is non-portable and musl libc does not match what busybox expects.
8
9Signed-off-by: Szabolcs Nagy <nsz@port70.net>
10Tested-by: Waldemar Brodkorb <wbx@openadk.org>
11Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
12
13Upstream-Status: Backport
14
15https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f
16
17Signed-off-by: Armin Kuster <akuster@mvista.com>
18
19---
20 networking/libiproute/libnetlink.c | 37 ++++++++++++++++++++++++-------------
21 1 file changed, 24 insertions(+), 13 deletions(-)
22
23diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
24index c7533a4..cbb5daf 100644
25--- a/networking/libiproute/libnetlink.c
26+++ b/networking/libiproute/libnetlink.c
27@@ -71,11 +71,15 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in
28 struct nlmsghdr nlh;
29 struct sockaddr_nl nladdr;
30 struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
31+ /* Use designated initializers, struct layout is non-portable */
32 struct msghdr msg = {
33- (void*)&nladdr, sizeof(nladdr),
34- iov, 2,
35- NULL, 0,
36- 0
37+ .msg_name = (void*)&nladdr,
38+ .msg_namelen = sizeof(nladdr),
39+ .msg_iov = iov,
40+ .msg_iovlen = 2,
41+ .msg_control = NULL,
42+ .msg_controllen = 0,
43+ .msg_flags = 0
44 };
45
46 memset(&nladdr, 0, sizeof(nladdr));
47@@ -104,12 +108,15 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
48 while (1) {
49 int status;
50 struct nlmsghdr *h;
51-
52+ /* Use designated initializers, struct layout is non-portable */
53 struct msghdr msg = {
54- (void*)&nladdr, sizeof(nladdr),
55- &iov, 1,
56- NULL, 0,
57- 0
58+ .msg_name = (void*)&nladdr,
59+ .msg_namelen = sizeof(nladdr),
60+ .msg_iov = &iov,
61+ .msg_iovlen = 1,
62+ .msg_control = NULL,
63+ .msg_controllen = 0,
64+ .msg_flags = 0
65 };
66
67 status = recvmsg(rth->fd, &msg, 0);
68@@ -211,11 +218,15 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
69 struct sockaddr_nl nladdr;
70 struct iovec iov = { (void*)n, n->nlmsg_len };
71 char *buf = xmalloc(8*1024); /* avoid big stack buffer */
72+ /* Use designated initializers, struct layout is non-portable */
73 struct msghdr msg = {
74- (void*)&nladdr, sizeof(nladdr),
75- &iov, 1,
76- NULL, 0,
77- 0
78+ .msg_name = (void*)&nladdr,
79+ .msg_namelen = sizeof(nladdr),
80+ .msg_iov = &iov,
81+ .msg_iovlen = 1,
82+ .msg_control = NULL,
83+ .msg_controllen = 0,
84+ .msg_flags = 0
85 };
86
87 memset(&nladdr, 0, sizeof(nladdr));
88--
892.3.5
90
diff --git a/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch b/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch
deleted file mode 100644
index 2e9842e5ec..0000000000
--- a/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 9e5820a86277818c2f83c11c2aa76d7f0a38283e Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Sun, 14 Aug 2016 02:54:27 +0200
4Subject: build system: fix include/NUM_APPLETS.h generation
5
6TBH, it's more like "work around my bad makefile-fu" than "fix"...
7
8Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
9---
10 applets/Kbuild.src | 7 ++-----
11 1 file changed, 2 insertions(+), 5 deletions(-)
12
13Upstream-Status: Backport
14
15diff --git a/applets/Kbuild.src b/applets/Kbuild.src
16index b612399..5cc1827 100644
17--- a/applets/Kbuild.src
18+++ b/applets/Kbuild.src
19@@ -29,7 +29,7 @@ applets/applets.o: include/usage_compressed.h include/applet_tables.h
20
21 applets/applet_tables: .config include/applets.h
22 applets/usage: .config include/applets.h
23-applets/usage_pod: .config include/applet_tables.h include/applets.h
24+applets/usage_pod: .config include/applets.h include/applet_tables.h include/NUM_APPLETS.h
25
26 quiet_cmd_gen_usage_compressed = GEN include/usage_compressed.h
27 cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
28@@ -40,8 +40,5 @@ include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compress
29 quiet_cmd_gen_applet_tables = GEN include/applet_tables.h
30 cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h include/NUM_APPLETS.h
31
32-include/applet_tables.h: applets/applet_tables
33- $(call cmd,gen_applet_tables)
34-
35-include/NUM_APPLETS.h: applets/applet_tables
36+include/applet_tables.h include/NUM_APPLETS.h: applets/applet_tables
37 $(call cmd,gen_applet_tables)
38--
39cgit v0.12
40
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.27.2.bb
index 1c8580876a..47b4f48761 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.27.2.bb
@@ -29,10 +29,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
29 file://recognize_connmand.patch \ 29 file://recognize_connmand.patch \
30 file://busybox-cross-menuconfig.patch \ 30 file://busybox-cross-menuconfig.patch \
31 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ 31 file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
32 file://busybox-1.24.1-unzip.patch \
33 file://busybox-1.24.1-unzip-regression.patch \
34 file://busybox-1.24.1-truncate-open-mode.patch \
35 file://0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch \
36 file://mount-via-label.cfg \ 32 file://mount-via-label.cfg \
37 file://sha1sum.cfg \ 33 file://sha1sum.cfg \
38 file://sha256sum.cfg \ 34 file://sha256sum.cfg \
@@ -45,24 +41,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
45 file://rcS \ 41 file://rcS \
46 file://rcK \ 42 file://rcK \
47 file://runlevel \ 43 file://runlevel \
48 file://CVE-2016-2148.patch \
49 file://CVE-2016-2147.patch \
50 file://CVE-2016-2147_2.patch \
51 file://CVE-2016-6301.patch \
52 file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \
53 file://makefile-fix-backport.patch \
54 file://0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch \
55 file://busybox-kbuild-race-fix-commit-d8e61bb.patch \
56 file://commit-applet_tables-fix-commit-0dddbc1.patch \
57 file://makefile-libbb-race.patch \ 44 file://makefile-libbb-race.patch \
58 file://0001-libiproute-handle-table-ids-larger-than-255.patch \
59 file://ifupdown-pass-interface-device-name-for-ipv6-route-c.patch \
60 file://BUG9071_buffer_overflow_arp.patch \
61 file://busybox-tar-add-IF_FEATURE_-checks.patch \
62 file://0001-iproute-support-scope-.-Closes-8561.patch \
63 file://0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch \
64" 45"
65SRC_URI_append_libc-musl = " file://musl.cfg " 46SRC_URI_append_libc-musl = " file://musl.cfg "
66 47
67SRC_URI[tarball.md5sum] = "be98a40cadf84ce2d6b05fa41a275c6a" 48SRC_URI[tarball.md5sum] = "476186f4bab81781dab2369bfd42734e"
68SRC_URI[tarball.sha256sum] = "37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d" 49SRC_URI[tarball.sha256sum] = "9d4be516b61e6480f156b11eb42577a13529f75d3383850bb75c50c285de63df"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 11:10:05 +0000