diff options
Diffstat (limited to 'main')
18 files changed, 440 insertions, 729 deletions
diff --git a/main/busybox/0001-ash-exec-busybox.static.patch b/main/busybox/0001-ash-exec-busybox.static.patch index f5f0e54bd8a..7bdf874275b 100644 --- a/main/busybox/0001-ash-exec-busybox.static.patch +++ b/main/busybox/0001-ash-exec-busybox.static.patch @@ -1,17 +1,17 @@ -From 1e3c84d780b94719575dc8afbe4a08050596a6d8 Mon Sep 17 00:00:00 2001 +From 6ad2305eb299c864dbe04b368a9921e91fd41bcb Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Thu, 4 Aug 2016 11:03:07 +0200 -Subject: [PATCH 01/15] ash: exec busybox.static +Subject: [PATCH 01/12] ash: exec busybox.static --- shell/ash.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/ash.c b/shell/ash.c -index faa45a8..1348ece 100644 +index 8d8cc466b..1b1012e76 100644 --- a/shell/ash.c +++ b/shell/ash.c -@@ -7380,6 +7380,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char ** +@@ -7552,6 +7552,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char ** } /* re-exec ourselves with the new arguments */ execve(bb_busybox_exec_path, argv, envp); @@ -21,5 +21,5 @@ index faa45a8..1348ece 100644 * executable, fall through */ } -- -2.9.1 +2.11.0 diff --git a/main/busybox/0002-app-location-for-vi-and-lspci.patch b/main/busybox/0002-app-location-for-vi-and-lspci.patch new file mode 100644 index 00000000000..eb2e069e69b --- /dev/null +++ b/main/busybox/0002-app-location-for-vi-and-lspci.patch @@ -0,0 +1,39 @@ +From a3016293eb42eb3679400148ed4520005ff6b8a7 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 27 Dec 2016 20:46:59 +0100 +Subject: [PATCH 02/12] app location for vi and lspci + +--- + editors/vi.c | 2 +- + util-linux/lspci.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/editors/vi.c b/editors/vi.c +index 38a4692fd..dd3efda75 100644 +--- a/editors/vi.c ++++ b/editors/vi.c +@@ -166,7 +166,7 @@ + //config: Unless you want more (or less) frequent "undo points" while typing, + //config: you should probably leave this unchanged. + +-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP)) ++//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP)) + + //kbuild:lib-$(CONFIG_VI) += vi.o + +diff --git a/util-linux/lspci.c b/util-linux/lspci.c +index 8b38a2366..f918f0972 100644 +--- a/util-linux/lspci.c ++++ b/util-linux/lspci.c +@@ -16,7 +16,7 @@ + //config: + //config: This version uses sysfs (/sys/bus/pci/devices) only. + +-//applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP)) ++//applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_SBIN, BB_SUID_DROP)) + + //kbuild:lib-$(CONFIG_LSPCI) += lspci.o + +-- +2.11.0 + diff --git a/main/busybox/0002-set-applet-location-to-correspond-to-upstream-for-vi.patch b/main/busybox/0002-set-applet-location-to-correspond-to-upstream-for-vi.patch deleted file mode 100644 index bbb68e3c2c5..00000000000 --- a/main/busybox/0002-set-applet-location-to-correspond-to-upstream-for-vi.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0dab6f340920d1e5c61bda6640205a9e376b9a97 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 4 Aug 2016 11:05:02 +0200 -Subject: [PATCH 02/15] set applet location to correspond to upstream for vi - and lspci - ---- - editors/vi.c | 2 +- - include/applets.src.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/editors/vi.c b/editors/vi.c -index 974f997..05d39ea 100644 ---- a/editors/vi.c -+++ b/editors/vi.c -@@ -166,7 +166,7 @@ - //config: Unless you want more (or less) frequent "undo points" while typing, - //config: you should probably leave this unchanged. - --//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP)) -+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP)) - - //kbuild:lib-$(CONFIG_VI) += vi.o - -diff --git a/include/applets.src.h b/include/applets.src.h -index 6e1b02f..03ee70d 100644 ---- a/include/applets.src.h -+++ b/include/applets.src.h -@@ -199,7 +199,7 @@ IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP)) - IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname)) - IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP)) - IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls)) --IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP)) -+IF_LSPCI(APPLET(lspci, BB_DIR_USR_SBIN, BB_SUID_DROP)) - IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_MAKEDEVS(APPLET(makedevs, BB_DIR_SBIN, BB_SUID_DROP)) - IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP)) --- -2.9.1 - diff --git a/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch index bcbc8bc4e62..89cf6cd1878 100644 --- a/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch +++ b/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch @@ -1,7 +1,7 @@ -From 929842100057fd4cb842129bd5adb5bab167ae92 Mon Sep 17 00:00:00 2001 +From 5b9fc802f7f3bb7e1b0c539a3d6101dcca5399e9 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Thu, 4 Aug 2016 11:08:35 +0200 -Subject: [PATCH 03/15] udhcpc: set default discover retries to 5 +Subject: [PATCH 03/12] udhcpc: set default discover retries to 5 Some slower nics needs more attempts to get a lease --- @@ -9,10 +9,10 @@ Some slower nics needs more attempts to get a lease 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index fc7b621..e802878 100644 +index 0e236261b..3c36bc39b 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -1172,7 +1172,7 @@ static void client_background(void) +@@ -1189,7 +1189,7 @@ static void client_background(void) //usage: "\n -s,--script PROG Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" //usage: "\n -p,--pidfile FILE Create pidfile" //usage: "\n -B,--broadcast Request broadcast replies" @@ -21,7 +21,7 @@ index fc7b621..e802878 100644 //usage: "\n -T,--timeout SEC Pause between packets (default 3)" //usage: "\n -A,--tryagain SEC Wait if lease is not obtained (default 20)" //usage: "\n -n,--now Exit if lease is not obtained" -@@ -1255,7 +1255,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) +@@ -1272,7 +1272,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) llist_t *list_x = NULL; int tryagain_timeout = 20; int discover_timeout = 3; @@ -31,5 +31,5 @@ index fc7b621..e802878 100644 uint32_t requested_ip = 0; uint32_t xid = xid; /* for compiler */ -- -2.9.1 +2.11.0 diff --git a/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch b/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch index 65e5ae44388..91befa65910 100644 --- a/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch +++ b/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch @@ -1,14 +1,14 @@ -From dc3cf4277f672ed1ce567c6915e28341e7963380 Mon Sep 17 00:00:00 2001 +From 9432235d7dc8d4a2bc9b546e63e52e84b7cad5ce Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Tue, 29 Mar 2016 18:59:22 +0200 -Subject: [PATCH 04/15] ping: make ping work without root privileges +Subject: [PATCH 04/12] ping: make ping work without root privileges --- networking/ping.c | 103 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 87 insertions(+), 16 deletions(-) diff --git a/networking/ping.c b/networking/ping.c -index cfe6826..e4474ae 100644 +index d0ef7ba62..73e903927 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -155,6 +155,7 @@ enum { @@ -46,7 +46,7 @@ index cfe6826..e4474ae 100644 } xmove_fd(sock, pingsock); -@@ -224,10 +239,12 @@ static void ping4(len_and_sockaddr *lsa) +@@ -226,10 +241,12 @@ static void ping4(len_and_sockaddr *lsa) bb_perror_msg("recvfrom"); continue; } @@ -59,10 +59,10 @@ index cfe6826..e4474ae 100644 - pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2)); /* skip ip hdr */ + pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2)); /* skip ip hdr */ + } else pkt = (struct icmp *) G.packet; + if (pkt->icmp_id != G.myid) + continue; /* not our ping */ if (pkt->icmp_type == ICMP_ECHOREPLY) - break; - } -@@ -619,19 +636,21 @@ static void unpack_tail(int sz, uint32_t *tp, +@@ -627,19 +644,21 @@ static void unpack_tail(int sz, uint32_t *tp, } static void unpack4(char *buf, int sz, struct sockaddr_in *from) { @@ -90,7 +90,7 @@ index cfe6826..e4474ae 100644 if (icmppkt->icmp_id != myid) return; /* not our ping */ -@@ -643,7 +662,7 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from) +@@ -651,7 +670,7 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from) tp = (uint32_t *) icmppkt->icmp_data; unpack_tail(sz, tp, inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr), @@ -99,7 +99,7 @@ index cfe6826..e4474ae 100644 } else if (icmppkt->icmp_type != ICMP_ECHO) { bb_error_msg("warning: got ICMP %d (%s)", icmppkt->icmp_type, -@@ -687,11 +706,31 @@ static void ping4(len_and_sockaddr *lsa) +@@ -695,11 +714,31 @@ static void ping4(len_and_sockaddr *lsa) int sockopt; pingaddr.sin = lsa->u.sin; @@ -132,7 +132,7 @@ index cfe6826..e4474ae 100644 } /* enable broadcast pings */ -@@ -708,6 +747,15 @@ static void ping4(len_and_sockaddr *lsa) +@@ -716,6 +755,15 @@ static void ping4(len_and_sockaddr *lsa) setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl); } @@ -148,7 +148,7 @@ index cfe6826..e4474ae 100644 signal(SIGINT, print_stats_and_exit); /* start the ping's going ... */ -@@ -741,10 +789,33 @@ static void ping6(len_and_sockaddr *lsa) +@@ -749,10 +797,33 @@ static void ping6(len_and_sockaddr *lsa) char control_buf[CMSG_SPACE(36)]; pingaddr.sin6 = lsa->u.sin6; @@ -183,7 +183,7 @@ index cfe6826..e4474ae 100644 { struct icmp6_filter filt; if (!(option_mask32 & OPT_VERBOSE)) { -@@ -872,7 +943,7 @@ static int common_ping_main(int opt, char **argv) +@@ -880,7 +951,7 @@ static int common_ping_main(int opt, char **argv) if (opt & OPT_p) G.pattern = xstrtou_range(str_p, 16, 0, 255); @@ -193,5 +193,5 @@ index cfe6826..e4474ae 100644 #if ENABLE_PING6 { -- -2.9.1 +2.11.0 diff --git a/main/busybox/0005-fbsplash-support-console-switching.patch b/main/busybox/0005-fbsplash-support-console-switching.patch index 7ffa5da1cd9..0d9b87861ce 100644 --- a/main/busybox/0005-fbsplash-support-console-switching.patch +++ b/main/busybox/0005-fbsplash-support-console-switching.patch @@ -1,7 +1,7 @@ -From 44be65aa1de3ad093cd754574734175884048285 Mon Sep 17 00:00:00 2001 +From f5660f60455d2a86fd78d5a8949a31864233faf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Mon, 24 Sep 2012 07:58:29 +0300 -Subject: [PATCH 05/15] fbsplash: support console switching +Subject: [PATCH 05/12] fbsplash: support console switching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,11 +12,11 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> 1 file changed, 76 insertions(+), 7 deletions(-) diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index 3ddf8a2..aaaca39 100644 +index fc6c9b953..ec5947314 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c -@@ -22,7 +22,7 @@ - */ +@@ -47,7 +47,7 @@ + //kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o //usage:#define fbsplash_trivial_usage -//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]" @@ -24,7 +24,7 @@ index 3ddf8a2..aaaca39 100644 //usage:#define fbsplash_full_usage "\n\n" //usage: " -s Image" //usage: "\n -c Hide cursor" -@@ -32,11 +32,17 @@ +@@ -57,11 +57,17 @@ //usage: "\n BAR_R,BAR_G,BAR_B" //usage: "\n -f Control pipe (else exit after drawing image)" //usage: "\n commands: 'NN' (% for progress bar) or 'exit'" @@ -42,7 +42,7 @@ index 3ddf8a2..aaaca39 100644 /* If you want logging messages on /tmp/fbsplash.log... */ #define DEBUG 0 -@@ -48,6 +54,8 @@ struct globals { +@@ -73,6 +79,8 @@ struct globals { unsigned char *addr; // pointer to framebuffer memory unsigned ns[7]; // n-parameters const char *image_filename; @@ -51,7 +51,7 @@ index 3ddf8a2..aaaca39 100644 struct fb_var_screeninfo scr_var; struct fb_fix_screeninfo scr_fix; unsigned bytes_per_pixel; -@@ -458,6 +466,11 @@ static void init(const char *cfg_filename) +@@ -483,6 +491,11 @@ static void init(const char *cfg_filename) config_close(parser); } @@ -63,7 +63,7 @@ index 3ddf8a2..aaaca39 100644 int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int fbsplash_main(int argc UNUSED_PARAM, char **argv) -@@ -467,6 +480,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -492,6 +505,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) char *num_buf; unsigned num; bool bCursorOff; @@ -73,7 +73,7 @@ index 3ddf8a2..aaaca39 100644 INIT_G(); -@@ -474,8 +490,10 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -499,8 +515,10 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) fb_device = "/dev/fb0"; cfg_filename = NULL; fifo_filename = NULL; @@ -86,7 +86,7 @@ index 3ddf8a2..aaaca39 100644 // parse configuration file if (cfg_filename) -@@ -485,11 +503,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -510,11 +528,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) if (!G.image_filename) bb_show_usage(); @@ -131,7 +131,7 @@ index 3ddf8a2..aaaca39 100644 } fb_drawimage(); -@@ -497,6 +547,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -522,6 +572,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) if (!fifo_filename) return EXIT_SUCCESS; @@ -139,7 +139,7 @@ index 3ddf8a2..aaaca39 100644 fp = xfopen_stdin(fifo_filename); if (fp != stdin) { // For named pipes, we want to support this: -@@ -512,8 +563,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -537,8 +588,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) // and become an additional writer :) open(fifo_filename, O_WRONLY); // errors are ignored } @@ -150,7 +150,7 @@ index 3ddf8a2..aaaca39 100644 // Block on read, waiting for some input. // Use of <stdio.h> style I/O allows to correctly // handle a case when we have many buffered lines -@@ -528,12 +580,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -553,12 +605,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) #if DEBUG DEBUG_MESSAGE(itoa(num)); #endif @@ -183,5 +183,5 @@ index 3ddf8a2..aaaca39 100644 return EXIT_SUCCESS; -- -2.9.1 +2.11.0 diff --git a/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch b/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch index a2886202f04..b930cb1167f 100644 --- a/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch +++ b/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch @@ -1,7 +1,7 @@ -From 942f123dce1f36144b200731df7abfd3dbc92f22 Mon Sep 17 00:00:00 2001 +From 1dab8b58ff051d529fd3fd74caf6016e51b10ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Fri, 21 Nov 2014 16:06:34 +0200 -Subject: [PATCH 06/15] fbsplash: support image and bar alignment and +Subject: [PATCH 06/12] fbsplash: support image and bar alignment and positioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -13,10 +13,10 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> 1 file changed, 76 insertions(+), 15 deletions(-) diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index aaaca39..ea0dc22 100644 +index ec5947314..34bbf81f5 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c -@@ -28,6 +28,7 @@ +@@ -53,6 +53,7 @@ //usage: "\n -c Hide cursor" //usage: "\n -d Framebuffer device (default /dev/fb0)" //usage: "\n -i Config file (var=value):" @@ -24,7 +24,7 @@ index aaaca39..ea0dc22 100644 //usage: "\n BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" //usage: "\n BAR_R,BAR_G,BAR_B" //usage: "\n -f Control pipe (else exit after drawing image)" -@@ -46,13 +47,38 @@ +@@ -71,13 +72,38 @@ /* If you want logging messages on /tmp/fbsplash.log... */ #define DEBUG 0 @@ -64,7 +64,7 @@ index aaaca39..ea0dc22 100644 const char *image_filename; int silent_tty, fd_tty_s; bool do_not_draw; -@@ -69,14 +95,6 @@ struct globals { +@@ -94,14 +120,6 @@ struct globals { SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ } while (0) @@ -79,7 +79,7 @@ index aaaca39..ea0dc22 100644 #if DEBUG #define DEBUG_MESSAGE(strMessage, args...) \ if (G.bdebug_messages) { \ -@@ -357,7 +375,7 @@ static void fb_drawimage(void) +@@ -382,7 +400,7 @@ static void fb_drawimage(void) FILE *theme_file; char *read_ptr; unsigned char *pixline; @@ -88,7 +88,7 @@ index aaaca39..ea0dc22 100644 if (LONE_DASH(G.image_filename)) { theme_file = stdin; -@@ -407,18 +425,46 @@ static void fb_drawimage(void) +@@ -432,18 +450,46 @@ static void fb_drawimage(void) line_size = width*3; pixline = xmalloc(line_size); @@ -137,7 +137,7 @@ index aaaca39..ea0dc22 100644 for (i = 0; i < width; i++) { unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]); fb_write_pixel(src, thispix); -@@ -437,9 +483,17 @@ static void fb_drawimage(void) +@@ -462,9 +508,17 @@ static void fb_drawimage(void) */ static void init(const char *cfg_filename) { @@ -155,7 +155,7 @@ index aaaca39..ea0dc22 100644 "BAR_R\0" "BAR_G\0" "BAR_B\0" #if DEBUG "DEBUG\0" -@@ -449,14 +503,21 @@ static void init(const char *cfg_filename) +@@ -474,14 +528,21 @@ static void init(const char *cfg_filename) parser_t *parser = config_open2(cfg_filename, xfopen_stdin); while (config_read(parser, token, 2, 2, "#=", (PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) { @@ -181,5 +181,5 @@ index aaaca39..ea0dc22 100644 if (G.bdebug_messages) G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log"); -- -2.9.1 +2.11.0 diff --git a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch index 95341016920..ccd4f25ffa0 100644 --- a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch +++ b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch @@ -1,7 +1,7 @@ -From 62748c093b0fcf79880b330eea82c84e64daae59 Mon Sep 17 00:00:00 2001 +From 0445b9734e02856a66cc7925a6816f26fedc822d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Sun, 25 Oct 2015 22:21:41 +0200 -Subject: [PATCH 07/15] depmod: support generating kmod binary index files +Subject: [PATCH 07/12] depmod: support generating kmod binary index files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -16,17 +16,17 @@ the code size a little bit. Signed-off-by: Timo Teräs <timo.teras@iki.fi> --- modutils/Config.src | 10 ++ - modutils/depmod.c | 279 ++++++++++++++++++++++++++++++++++++++++++---------- + modutils/depmod.c | 281 ++++++++++++++++++++++++++++++++++++++++++---------- modutils/modprobe.c | 15 --- modutils/modutils.c | 27 ++++- modutils/modutils.h | 15 +++ - 5 files changed, 280 insertions(+), 66 deletions(-) + 5 files changed, 281 insertions(+), 67 deletions(-) diff --git a/modutils/Config.src b/modutils/Config.src -index 0b11832..09db515 100644 +index 4227f356a..6680044fc 100644 --- a/modutils/Config.src +++ b/modutils/Config.src -@@ -229,6 +229,16 @@ config FEATURE_MODUTILS_ALIAS +@@ -118,6 +118,16 @@ config FEATURE_MODUTILS_ALIAS Say Y if unsure. @@ -44,7 +44,7 @@ index 0b11832..09db515 100644 bool "Support for module.symbols file" default y diff --git a/modutils/depmod.c b/modutils/depmod.c -index e5f0e3d..b73c1e5 100644 +index b9347027e..e3cea18c1 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c @@ -2,7 +2,7 @@ @@ -56,7 +56,7 @@ index e5f0e3d..b73c1e5 100644 * Copyright (c) 2008 Vladimir Dronnikov * * Licensed under GPLv2 or later, see file LICENSE in this source tree. -@@ -14,6 +14,24 @@ +@@ -25,6 +25,24 @@ #include "modutils.h" #include <sys/utsname.h> /* uname() */ @@ -81,7 +81,7 @@ index e5f0e3d..b73c1e5 100644 /* * Theory of operation: * - iterate over all modules and record their full path -@@ -41,18 +59,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA +@@ -52,18 +70,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA for (ptr = image; ptr < image + len - 10; ptr++) { if (is_prefixed_with(ptr, "depends=")) { @@ -102,7 +102,7 @@ index e5f0e3d..b73c1e5 100644 } else if (ENABLE_FEATURE_MODUTILS_SYMBOLS && is_prefixed_with(ptr, "__ksymtab_") ) { -@@ -62,9 +74,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA +@@ -73,9 +85,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA ) { continue; } @@ -116,7 +116,7 @@ index e5f0e3d..b73c1e5 100644 } free(image); -@@ -96,12 +109,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add +@@ -107,12 +120,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add } } @@ -129,7 +129,7 @@ index e5f0e3d..b73c1e5 100644 //usage:#if !ENABLE_MODPROBE_SMALL //usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..." //usage:#define depmod_full_usage "\n\n" -@@ -155,6 +162,169 @@ enum { +@@ -166,6 +173,169 @@ enum { OPT_C = (1 << 9), /* -C,--config etc_modules_conf: ignored */ }; @@ -299,7 +299,7 @@ index e5f0e3d..b73c1e5 100644 int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int depmod_main(int argc UNUSED_PARAM, char **argv) { -@@ -166,6 +336,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) +@@ -177,6 +347,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) unsigned i; int tmp; @@ -308,7 +308,7 @@ index e5f0e3d..b73c1e5 100644 getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL); argv += optind; -@@ -198,53 +370,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) +@@ -209,53 +381,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) } /* Generate dependency and alias files */ @@ -335,8 +335,7 @@ index e5f0e3d..b73c1e5 100644 - bb_putchar('\n'); + index_add(m->modname, buf, ""); } -+ index_dump(CONFIG_DEFAULT_DEPMOD_FILE, 1); - +- -#if ENABLE_FEATURE_MODUTILS_ALIAS - if (!(option_mask32 & OPT_n)) - xfreopen_write("modules.alias", stdout); @@ -351,6 +350,8 @@ index e5f0e3d..b73c1e5 100644 - printf("alias %s %s\n", - (char*)llist_pop(&m->aliases), - m->modname); ++ index_dump(CONFIG_DEFAULT_DEPMOD_FILE, 1); ++ + if (ENABLE_FEATURE_MODUTILS_ALIAS) { + index_init("modules.alias"); + moddb_foreach_module(&modules, m, i) { @@ -402,10 +403,10 @@ index e5f0e3d..b73c1e5 100644 if (ENABLE_FEATURE_CLEAN_UP) moddb_free(&modules); diff --git a/modutils/modprobe.c b/modutils/modprobe.c -index 8130c40..ec64477 100644 +index d404ef92f..72f449978 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c -@@ -167,21 +167,6 @@ struct globals { +@@ -189,21 +189,6 @@ struct globals { static int read_config(const char *path); @@ -428,10 +429,10 @@ index 8130c40..ec64477 100644 { return moddb_get_or_create(&G.db, module); diff --git a/modutils/modutils.c b/modutils/modutils.c -index 0a05673..8b6298b 100644 +index d36caaf68..aecfc2acb 100644 --- a/modutils/modutils.c +++ b/modutils/modutils.c -@@ -67,6 +67,21 @@ void FAST_FUNC moddb_free(module_db *db) +@@ -70,6 +70,21 @@ void FAST_FUNC moddb_free(module_db *db) } } @@ -453,7 +454,7 @@ index 0a05673..8b6298b 100644 void FAST_FUNC replace(char *s, char what, char with) { while (*s) { -@@ -78,7 +93,17 @@ void FAST_FUNC replace(char *s, char what, char with) +@@ -81,7 +96,17 @@ void FAST_FUNC replace(char *s, char what, char with) char* FAST_FUNC replace_underscores(char *s) { @@ -473,7 +474,7 @@ index 0a05673..8b6298b 100644 } diff --git a/modutils/modutils.h b/modutils/modutils.h -index 2cbd144..dd6f173 100644 +index 2cbd1448a..dd6f173f3 100644 --- a/modutils/modutils.h +++ b/modutils/modutils.h @@ -18,6 +18,20 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN @@ -506,5 +507,5 @@ index 2cbd144..dd6f173 100644 char *replace_underscores(char *s) FAST_FUNC; int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; -- -2.9.1 +2.11.0 diff --git a/main/busybox/0008-login-move-check_securetty-to-libbb.patch b/main/busybox/0008-login-move-check_securetty-to-libbb.patch index c470623a9e4..bc3c3a002e9 100644 --- a/main/busybox/0008-login-move-check_securetty-to-libbb.patch +++ b/main/busybox/0008-login-move-check_securetty-to-libbb.patch @@ -1,7 +1,7 @@ -From 76769ad16cfe28984fe31ec595a7435c8a10d15c Mon Sep 17 00:00:00 2001 +From 49cc996bd0c049c37e98506409c2e3ec30790bf0 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> Date: Thu, 5 Nov 2015 16:27:34 +0200 -Subject: [PATCH 08/15] login: move check_securetty to libbb +Subject: [PATCH 08/12] login: move check_securetty to libbb --- include/libbb.h | 1 + @@ -12,10 +12,10 @@ Subject: [PATCH 08/15] login: move check_securetty to libbb create mode 100644 libbb/securetty.c diff --git a/include/libbb.h b/include/libbb.h -index e39021e..25c5868 100644 +index abdc8c2b8..38d6d0b1e 100644 --- a/include/libbb.h +++ b/include/libbb.h -@@ -1374,6 +1374,7 @@ extern void selinux_or_die(void) FAST_FUNC; +@@ -1390,6 +1390,7 @@ extern void selinux_or_die(void) FAST_FUNC; #define SETUP_ENV_NO_CHDIR (1 << 4) void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; void nuke_str(char *str) FAST_FUNC; @@ -24,7 +24,7 @@ index e39021e..25c5868 100644 int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC; int ask_and_check_password(const struct passwd *pw) FAST_FUNC; diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src -index 52a90e9..ddaa873 100644 +index e426f3c7e..84f3ff477 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src @@ -83,6 +83,7 @@ lib-y += safe_gethostname.o @@ -37,7 +37,7 @@ index 52a90e9..ddaa873 100644 lib-y += simplify_path.o diff --git a/libbb/securetty.c b/libbb/securetty.c new file mode 100644 -index 0000000..95edbc9 +index 000000000..95edbc944 --- /dev/null +++ b/libbb/securetty.c @@ -0,0 +1,27 @@ @@ -69,7 +69,7 @@ index 0000000..95edbc9 +ALWAYS_INLINE int check_securetty(const char *short_tty UNUSED_PARAM) { return 1; } +#endif diff --git a/loginutils/login.c b/loginutils/login.c -index 94b6c45..9ecf606 100644 +index 52abc1886..30aa63aee 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -173,25 +173,6 @@ static void die_if_nologin(void) @@ -99,5 +99,5 @@ index 94b6c45..9ecf606 100644 static void initselinux(char *username, char *full_tty, security_context_t *user_sid) -- -2.9.1 +2.11.0 diff --git a/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch b/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch index 529e52200f8..72dc0482a97 100644 --- a/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch +++ b/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch @@ -1,7 +1,7 @@ -From 8d3fc4e28975b6789d6ccbf9b12bc3bb811dfc2d Mon Sep 17 00:00:00 2001 +From 7d2e6a0a89ba11a98ce665e307d7acf86b5f00b6 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> Date: Thu, 5 Nov 2015 16:27:35 +0200 -Subject: [PATCH 09/15] libbb: allow_blank argument for +Subject: [PATCH 09/12] libbb: allow_blank argument for ask_and_check_password_extended() --- @@ -11,10 +11,10 @@ Subject: [PATCH 09/15] libbb: allow_blank argument for 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/libbb.h b/include/libbb.h -index 25c5868..1348a46 100644 +index 38d6d0b1e..f0ddce94f 100644 --- a/include/libbb.h +++ b/include/libbb.h -@@ -1376,7 +1376,7 @@ void setup_environment(const char *shell, int flags, const struct passwd *pw) FA +@@ -1392,7 +1392,7 @@ void setup_environment(const char *shell, int flags, const struct passwd *pw) FA void nuke_str(char *str) FAST_FUNC; int check_securetty(const char *short_tty); int check_password(const struct passwd *pw, const char *plaintext) FAST_FUNC; @@ -24,7 +24,7 @@ index 25c5868..1348a46 100644 /* Returns a malloced string */ #if !ENABLE_USE_BB_CRYPT diff --git a/libbb/correct_password.c b/libbb/correct_password.c -index 513c930..57cd2b8 100644 +index 513c93028..57cd2b890 100644 --- a/libbb/correct_password.c +++ b/libbb/correct_password.c @@ -96,7 +96,7 @@ int FAST_FUNC check_password(const struct passwd *pw, const char *plaintext) @@ -53,10 +53,10 @@ index 513c930..57cd2b8 100644 + return ask_and_check_password_extended(pw, 0, 1, "Password: "); } diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c -index f324695..b26db96 100644 +index 2e32e2bbd..d2ddc6afa 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c -@@ -63,7 +63,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv) +@@ -62,7 +62,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv) while (1) { int r; @@ -66,5 +66,5 @@ index f324695..b26db96 100644 "(or type Control-D for normal startup):" ); -- -2.9.1 +2.11.0 diff --git a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch b/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch index 9de531c37e3..13c464e4a00 100644 --- a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch +++ b/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch @@ -1,7 +1,7 @@ -From 8b337b84dec2765d9fc9a0b2be6341e4bd7e1fcb Mon Sep 17 00:00:00 2001 +From d9c09138d91566af49ef8179d9995c84294e2486 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> Date: Thu, 5 Nov 2015 16:27:36 +0200 -Subject: [PATCH 10/15] su: FEATURE_SU_NULLOK_SECURE +Subject: [PATCH 10/12] su: FEATURE_SU_NULLOK_SECURE When this feature is enabled, blank passwords are not accepted by su unless the user is on a secure TTY defined in /etc/securetty. This @@ -12,7 +12,7 @@ specify the nullok_secure option for pam_unix.so. 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/loginutils/su.c b/loginutils/su.c -index 3c0e8c1..bdcc6a9 100644 +index 24ffbde86..086445243 100644 --- a/loginutils/su.c +++ b/loginutils/su.c @@ -24,6 +24,11 @@ @@ -35,7 +35,7 @@ index 3c0e8c1..bdcc6a9 100644 #if ENABLE_FEATURE_UTMP char user_buf[64]; #endif -@@ -96,6 +102,12 @@ int su_main(int argc UNUSED_PARAM, char **argv) +@@ -100,6 +106,12 @@ int su_main(int argc UNUSED_PARAM, char **argv) argv++; } @@ -48,7 +48,7 @@ index 3c0e8c1..bdcc6a9 100644 if (ENABLE_FEATURE_SU_SYSLOG) { /* The utmp entry (via getlogin) is probably the best way to * identify the user, especially if someone su's from a su-shell. -@@ -109,16 +121,12 @@ int su_main(int argc UNUSED_PARAM, char **argv) +@@ -113,16 +125,12 @@ int su_main(int argc UNUSED_PARAM, char **argv) pw = getpwuid(cur_uid); old_user = pw ? xstrdup(pw->pw_name) : ""; } @@ -67,5 +67,5 @@ index 3c0e8c1..bdcc6a9 100644 syslog(LOG_NOTICE, "%c %s %s:%s", '+', tty, old_user, opt_username); -- -2.9.1 +2.11.0 diff --git a/main/busybox/0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch b/main/busybox/0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch deleted file mode 100644 index 519613a2d82..00000000000 --- a/main/busybox/0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 55df9f8c24c2ed9c03d5761b45f0916d4bcfc88b Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 23 Jun 2016 10:42:40 +0200 -Subject: [PATCH 11/15] df: use f_frsize instead of f_bsize for correct sizes - -Use the correct field f_frsize instead of f_bsize. - -The statfs f_bsize is the "Optimal transfer block size" while the -f_frsize is the "Fragment size (since Linux 2.6)". On some FUSE -filesystems those may differ. - -Fixes bug 9046 - -URL: https://bugs.busybox.net/show_bug.cgi?id=9046 - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - coreutils/df.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/coreutils/df.c b/coreutils/df.c -index d79c11a..06b2920 100644 ---- a/coreutils/df.c -+++ b/coreutils/df.c -@@ -188,7 +188,7 @@ int df_main(int argc UNUSED_PARAM, char **argv) - if (opt & OPT_INODE) { - s.f_blocks = s.f_files; - s.f_bavail = s.f_bfree = s.f_ffree; -- s.f_bsize = 1; -+ s.f_frsize = 1; - - if (df_disp_hr) - df_disp_hr = 1; -@@ -246,26 +246,26 @@ int df_main(int argc UNUSED_PARAM, char **argv) - - #if ENABLE_FEATURE_HUMAN_READABLE - printf(" %9s ", -- /* f_blocks x f_bsize / df_disp_hr, show one fractional, -+ /* f_blocks x f_frsize / df_disp_hr, show one fractional, - * use suffixes if df_disp_hr == 0 */ -- make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); -+ make_human_readable_str(s.f_blocks, s.f_frsize, df_disp_hr)); - - printf(" %9s " + 1, -- /* EXPR x f_bsize / df_disp_hr, show one fractional, -+ /* EXPR x f_frsize / df_disp_hr, show one fractional, - * use suffixes if df_disp_hr == 0 */ - make_human_readable_str((s.f_blocks - s.f_bfree), -- s.f_bsize, df_disp_hr)); -+ s.f_frsize, df_disp_hr)); - - printf("%9s %3u%% %s\n", -- /* f_bavail x f_bsize / df_disp_hr, show one fractional, -+ /* f_bavail x f_frsize / df_disp_hr, show one fractional, - * use suffixes if df_disp_hr == 0 */ -- make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr), -+ make_human_readable_str(s.f_bavail, s.f_frsize, df_disp_hr), - blocks_percent_used, mount_point); - #else - printf(" %9lu %9lu %9lu %3u%% %s\n", -- kscale(s.f_blocks, s.f_bsize), -- kscale(s.f_blocks - s.f_bfree, s.f_bsize), -- kscale(s.f_bavail, s.f_bsize), -+ kscale(s.f_blocks, s.f_frsize), -+ kscale(s.f_blocks - s.f_bfree, s.f_frsize), -+ kscale(s.f_bavail, s.f_frsize), - blocks_percent_used, mount_point); - #endif - } --- -2.9.1 - diff --git a/main/busybox/0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch b/main/busybox/0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch index 75bf231ed55..a7e5d14fd13 100644 --- a/main/busybox/0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch +++ b/main/busybox/0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch @@ -1,18 +1,26 @@ -From 789325996ab38d1b8be5c2d204b536c355105844 Mon Sep 17 00:00:00 2001 +From 838188511cb2085d8980956b270cc68ed9911102 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> Date: Thu, 4 Aug 2016 12:26:56 +0200 -Subject: [PATCH 13/15] ntpd: postpone hostname resolution if fails on startup +Subject: [PATCH 11/12] ntpd: postpone hostname resolution if fails on startup Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> --- - networking/ntpd.c | 129 ++++++++++++++++++++++++++---------------------------- - 1 file changed, 63 insertions(+), 66 deletions(-) + networking/ntpd.c | 130 +++++++++++++++++++++++++++--------------------------- + 1 file changed, 64 insertions(+), 66 deletions(-) diff --git a/networking/ntpd.c b/networking/ntpd.c -index 98158a3..7f7d69e 100644 +index b7fa5dce9..c6d07adac 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c -@@ -267,6 +267,7 @@ typedef struct { +@@ -155,6 +155,7 @@ + #define RETRY_INTERVAL 32 /* on send/recv error, retry in N secs (need to be power of 2) */ + #define NOREPLY_INTERVAL 512 /* sent, but got no reply: cap next query by this many seconds */ + #define RESPONSE_INTERVAL 16 /* wait for reply up to N secs */ ++#define HOSTNAME_INTERVAL 4 /* hostname lookup failed. Wait N secs for next try */ + + /* Step threshold (sec). std ntpd uses 0.128. + */ +@@ -293,6 +294,7 @@ typedef struct { typedef struct { len_and_sockaddr *p_lsa; @@ -20,7 +28,7 @@ index 98158a3..7f7d69e 100644 char *p_dotted; int p_fd; int datapoint_idx; -@@ -292,7 +293,6 @@ typedef struct { +@@ -318,7 +320,6 @@ typedef struct { datapoint_t filter_datapoint[NUM_DATAPOINTS]; /* last sent packet: */ msg_t p_xmt_msg; @@ -28,7 +36,7 @@ index 98158a3..7f7d69e 100644 } peer_t; -@@ -765,27 +765,17 @@ reset_peer_stats(peer_t *p, double offset) +@@ -791,27 +792,17 @@ reset_peer_stats(peer_t *p, double offset) } static void @@ -62,11 +70,11 @@ index 98158a3..7f7d69e 100644 - free(p->p_dotted); - p->p_lsa = lsa; - p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa); -+ set_next(p, lsa ? 0 : RETRY_INTERVAL); ++ set_next(p, lsa ? 0 : HOSTNAME_INTERVAL); } static void -@@ -794,28 +784,29 @@ add_peers(const char *s) +@@ -820,28 +811,29 @@ add_peers(const char *s) llist_t *item; peer_t *p; @@ -109,7 +117,7 @@ index 98158a3..7f7d69e 100644 reset_peer_stats(p, STEP_THRESHOLD); llist_add_to(&G.ntp_peers, p); -@@ -2340,44 +2331,50 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv) +@@ -2378,44 +2370,50 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv) for (item = G.ntp_peers; item != NULL; item = item->link) { peer_t *p = (peer_t *) item->data; @@ -193,5 +201,5 @@ index 98158a3..7f7d69e 100644 timeout = nextaction - G.cur_time; -- -2.9.1 +2.11.0 diff --git a/main/busybox/0015-diff-add-support-for-no-dereference.patch b/main/busybox/0012-diff-add-support-for-no-dereference.patch index 06c97413e8b..8e522937913 100644 --- a/main/busybox/0015-diff-add-support-for-no-dereference.patch +++ b/main/busybox/0012-diff-add-support-for-no-dereference.patch @@ -1,7 +1,7 @@ -From 6621d1956090bbef82d2efd6940983f0a82fb762 Mon Sep 17 00:00:00 2001 +From 56c14ec7f75a68c191f2fc210915108f428e849c Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Fri, 25 Jul 2014 15:28:33 +0200 -Subject: [PATCH 15/15] diff: add support for --no-dereference +Subject: [PATCH 12/12] diff: add support for --no-dereference Add flag for not following symlinks when recursing @@ -19,7 +19,7 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/editors/diff.c b/editors/diff.c -index ff26936..585b7f6 100644 +index 75229ad8c..6266bde0d 100644 --- a/editors/diff.c +++ b/editors/diff.c @@ -117,6 +117,9 @@ @@ -59,5 +59,5 @@ index ff26936..585b7f6 100644 #endif -- -2.9.1 +2.11.0 diff --git a/main/busybox/0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch b/main/busybox/0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch deleted file mode 100644 index 0dafec292a2..00000000000 --- a/main/busybox/0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 431610ad7ea53d2f9f1bf926e1d353d533bdb27f Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar <mlichvar@redhat.com> -Date: Mon, 1 Aug 2016 20:24:24 +0200 -Subject: [PATCH 14/15] ntpd: respond only to client and symmetric active - packets - -The busybox NTP implementation doesn't check the NTP mode of packets -received on the server port and responds to any packet with the right -size. This includes responses from another NTP server. An attacker can -send a packet with a spoofed source address in order to create an -infinite loop of responses between two busybox NTP servers. Adding -more packets to the loop increases the traffic between the servers -until one of them has a fully loaded CPU and/or network. - -Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com> -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - networking/ntpd.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/networking/ntpd.c b/networking/ntpd.c -index 7f7d69e..182dd58 100644 ---- a/networking/ntpd.c -+++ b/networking/ntpd.c -@@ -2042,6 +2042,13 @@ recv_and_process_client_pkt(void /*int fd*/) - goto bail; - } - -+ /* Respond only to client and symmetric active packets */ -+ if ((msg.m_status & MODE_MASK) != MODE_CLIENT -+ && (msg.m_status & MODE_MASK) != MODE_SYM_ACT -+ ) { -+ goto bail; -+ } -+ - query_status = msg.m_status; - query_xmttime = msg.m_xmttime; - --- -2.9.1 - diff --git a/main/busybox/0016-whois-make-it-actually-work.patch b/main/busybox/0016-whois-make-it-actually-work.patch deleted file mode 100644 index fe7cfe17ce0..00000000000 --- a/main/busybox/0016-whois-make-it-actually-work.patch +++ /dev/null @@ -1,185 +0,0 @@ -From f8e33d70806d0dee740e5451aedfe5089a4d156a Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko <vda.linux@googlemail.com> -Date: Wed, 6 Jul 2016 15:45:41 +0200 -Subject: [PATCH 16/16] whois: make it actually work - -It was doing way too simplistic work of just querying the server, -no redirects, no query massaging. This required user to know a lot about whois, -and enter at least three queries for each host to get meaningful information. - -function old new delta -whois_main 209 646 +437 - -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - networking/whois.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 124 insertions(+), 13 deletions(-) - -diff --git a/networking/whois.c b/networking/whois.c -index bf33033..5ef8367 100644 ---- a/networking/whois.c -+++ b/networking/whois.c -@@ -28,36 +28,147 @@ - - #include "libbb.h" - --static void pipe_out(int fd) -+static char *query(const char *host, int port, const char *domain) - { -+ int fd; - FILE *fp; -- char buf[1024]; -+ bool success; -+ char *redir = NULL; -+ const char *pfx = ""; -+ char linebuf[1024]; -+ char *buf = NULL; -+ unsigned bufpos = 0; - -+ again: -+ printf("[Querying %s:%d '%s%s']\n", host, port, pfx, domain); -+ fd = create_and_connect_stream_or_die(host, port); -+ success = 0; -+ fdprintf(fd, "%s%s\r\n", pfx, domain); - fp = xfdopen_for_read(fd); -- while (fgets(buf, sizeof(buf), fp)) { -- char *p = strpbrk(buf, "\r\n"); -- if (p) -- *p = '\0'; -- puts(buf); -- } - -+ while (fgets(linebuf, sizeof(linebuf), fp)) { -+ unsigned len = strcspn(linebuf, "\r\n"); -+ linebuf[len++] = '\n'; -+ -+ buf = xrealloc(buf, bufpos + len + 1); -+ memcpy(buf + bufpos, linebuf, len); -+ bufpos += len; -+ -+ if (!redir || !success) { -+ trim(linebuf); -+ str_tolower(linebuf); -+ if (!success) { -+ success = is_prefixed_with(linebuf, "domain:") -+ || is_prefixed_with(linebuf, "domain name:"); -+ } -+ else if (!redir) { -+ char *p = is_prefixed_with(linebuf, "whois server:"); -+ if (!p) -+ p = is_prefixed_with(linebuf, "whois:"); -+ if (p) -+ redir = xstrdup(skip_whitespace(p)); -+ } -+ } -+ } - fclose(fp); /* closes fd too */ -+ if (!success && !pfx[0]) { -+ /* -+ * Looking at jwhois.conf, some whois servers use -+ * "domain = DOMAIN", "DOMAIN ID <DOMAIN>" -+ * and "domain=DOMAIN_WITHOUT_LAST_COMPONENT" -+ * formats, but those are rare. -+ * (There are a few even more contrived ones.) -+ * We are trying only "domain DOMAIN", the typical one. -+ */ -+ pfx = "domain "; -+ bufpos = 0; -+ goto again; -+ } -+ -+ /* Success */ -+ if (redir && strcmp(redir, host) == 0) { -+ /* Redirect to self does not count */ -+ free(redir); -+ redir = NULL; -+ } -+ if (!redir) { -+ /* Output saved text */ -+ printf("[%s]\n", host); -+ buf[bufpos] = '\0'; -+ fputs(buf, stdout); -+ } -+ free(buf); -+ return redir; - } - -+static void recursive_query(const char *host, int port, const char *domain) -+{ -+ char *free_me = NULL; -+ char *redir; -+ again: -+ redir = query(host, port, domain); -+ free(free_me); -+ if (redir) { -+ printf("[Redirected to %s]\n", redir); -+ host = free_me = redir; -+ port = 43; -+ goto again; -+ } -+} -+ -+/* One of "big" whois implementations has these options: -+ * -+ * $ whois --help -+ * jwhois version 4.0, Copyright (C) 1999-2007 Free Software Foundation, Inc. -+ * -v, --verbose verbose debug output -+ * -c FILE, --config=FILE use FILE as configuration file -+ * -h HOST, --host=HOST explicitly query HOST -+ * -n, --no-redirect disable content redirection -+ * -s, --no-whoisservers disable whois-servers.net service support -+ * -a, --raw disable reformatting of the query -+ * -i, --display-redirections display all redirects instead of hiding them -+ * -p PORT, --port=PORT use port number PORT (in conjunction with HOST) -+ * -r, --rwhois force an rwhois query to be made -+ * --rwhois-display=DISPLAY sets the display option in rwhois queries -+ * --rwhois-limit=LIMIT sets the maximum number of matches to return -+ * -+ * Example of its output: -+ * $ whois cnn.com -+ * [Querying whois.verisign-grs.com] -+ * [Redirected to whois.corporatedomains.com] -+ * [Querying whois.corporatedomains.com] -+ * [whois.corporatedomains.com] -+ * ...text of the reply... -+ * -+ * With -i, reply from each server is printed, after all redirects are done: -+ * [Querying whois.verisign-grs.com] -+ * [Redirected to whois.corporatedomains.com] -+ * [Querying whois.corporatedomains.com] -+ * [whois.verisign-grs.com] -+ * ...text of the reply... -+ * [whois.corporatedomains.com] -+ * ...text of the reply... -+ * -+ * With -a, no "DOMAIN" -> "domain DOMAIN" transformation is attempted. -+ -+ * With -n, the first reply is shown, redirects are not followed: -+ * [Querying whois.verisign-grs.com] -+ * [whois.verisign-grs.com] -+ * ...text of the reply... -+ */ -+ - int whois_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int whois_main(int argc UNUSED_PARAM, char **argv) - { - int port = 43; -- const char *host = "whois-servers.net"; -+ const char *host = "whois.iana.org"; - - opt_complementary = "-1:p+"; - getopt32(argv, "h:p:", &host, &port); -- - argv += optind; -+ - do { -- int fd = create_and_connect_stream_or_die(host, port); -- fdprintf(fd, "%s\r\n", *argv); -- pipe_out(fd); -+ recursive_query(host, port, *argv); - } - while (*++argv); - --- -2.9.1 - diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 4e9f3d89713..6c64caa8c2c 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox -pkgver=1.25.1 -pkgrel=1 +pkgver=1.26.0 +pkgrel=0 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -16,7 +16,7 @@ options="suid" triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*" source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0001-ash-exec-busybox.static.patch - 0002-set-applet-location-to-correspond-to-upstream-for-vi.patch + 0002-app-location-for-vi-and-lspci.patch 0003-udhcpc-set-default-discover-retries-to-5.patch 0004-ping-make-ping-work-without-root-privileges.patch 0005-fbsplash-support-console-switching.patch @@ -25,11 +25,8 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0008-login-move-check_securetty-to-libbb.patch 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch 0010-su-FEATURE_SU_NULLOK_SECURE.patch - 0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch - 0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch - 0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch - 0015-diff-add-support-for-no-dereference.patch - 0016-whois-make-it-actually-work.patch + 0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch + 0012-diff-add-support-for-no-dereference.patch acpid.logrotate busyboxconfig @@ -147,66 +144,57 @@ static() { "$subpkgdir"/bin/busybox.static } -md5sums="4f4c5de50b479b11ff636d7d8eb902a2 busybox-1.25.1.tar.bz2 -59028ad98544ec71c37f637df9d5c8f8 0001-ash-exec-busybox.static.patch -d6ca0a022af2f68746297b3673ca0467 0002-set-applet-location-to-correspond-to-upstream-for-vi.patch -f06a9dd453e9527a8c46ededed00a30e 0003-udhcpc-set-default-discover-retries-to-5.patch -c0ee8629bb7f2c75e6da39431b736572 0004-ping-make-ping-work-without-root-privileges.patch -50505c0b575943c85b396bbf0dad73b3 0005-fbsplash-support-console-switching.patch -b4a95d78733e08c3b960b60e70a5b965 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch -c03e2940828e8c2bc9494aee74422bd3 0007-depmod-support-generating-kmod-binary-index-files.patch -17a39b0672afe6a626cd0ea81623ab00 0008-login-move-check_securetty-to-libbb.patch -5fb24a9688a638e6bea5921bcc565bb6 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch -208869f8a34ef531437c4ece55115a78 0010-su-FEATURE_SU_NULLOK_SECURE.patch -5fab4d6b3461a399d66a42f9385c6ad5 0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch -f39e2d23f00d9a94a08d5159bd285ea5 0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch -bcfa838ecc36ea8f2012a27561d6910d 0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch -83c0e05df23b2327e6e71fa93e911154 0015-diff-add-support-for-no-dereference.patch -6234d8817d3c0ee9f4c01e83bf6a96c4 0016-whois-make-it-actually-work.patch +md5sums="362acc60bd94343aa36d98beb1f0831f busybox-1.26.0.tar.bz2 +5784516439ec6dc4e60612b094fc6fda 0001-ash-exec-busybox.static.patch +e35fc8b29faf1742c0f09f5c3b95db94 0002-app-location-for-vi-and-lspci.patch +5c356ff8346936d1f545750456edb1b2 0003-udhcpc-set-default-discover-retries-to-5.patch +04daa6589029bea08381153997cb9b4f 0004-ping-make-ping-work-without-root-privileges.patch +41d1f17aae5fb141d47fca05e2a128d6 0005-fbsplash-support-console-switching.patch +5d2501b4ef3cff23fa1c45e7bdc3d166 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch +2e30ea0f9597ae181907b83f74c171f2 0007-depmod-support-generating-kmod-binary-index-files.patch +2b6008e4b808822758d5a543c03aff66 0008-login-move-check_securetty-to-libbb.patch +3999f781c0647edf8bda494c6a2ad615 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch +5f97342f411c5ad237a509066f757c1e 0010-su-FEATURE_SU_NULLOK_SECURE.patch +723a879123be8df4726455d857d910aa 0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch +14746b0d10711cb4a824a166fc147706 0012-diff-add-support-for-no-dereference.patch 4046b78ee6a25259954797d73b94f4bd acpid.logrotate -09ad409662df7d086f0f0485aa8ce259 busyboxconfig +2e94a4ce16cdc0721b53a08e5e61a183 busyboxconfig 378058009a1d6b1e321617b32b933e28 bbsuid.c 5c2d151c173f5618d404af4bb5a91769 dad.if-up d64b58a30892c558bdbab7f0d0997577 nologin.c" -sha256sums="27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e busybox-1.25.1.tar.bz2 -4c28b5613123af696399cd6caed99aaa1a86715fde3ebc00c704425c4f086b0c 0001-ash-exec-busybox.static.patch -7a955bf237e965394ee4c96c3cbe39aa41fa638531b9185838df7ee5b2d97240 0002-set-applet-location-to-correspond-to-upstream-for-vi.patch -10fedac0023498fc68b589fec3149801475b08882254fc2a5cc1d3c9dab2d750 0003-udhcpc-set-default-discover-retries-to-5.patch -b9766d28fa8dcee8ffcbc00795c1b2edea82d99ef7a39b024876c54d258a6b59 0004-ping-make-ping-work-without-root-privileges.patch -fc8bad08a5f43e32ac2f9c169a441567266dd551f9b2b82c6f227445a745413a 0005-fbsplash-support-console-switching.patch -8fe309313982fbe560cc3bdb3c61395bb22945942f1ebe768a5b0377f35e50a6 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch -e1e3f6efaba68a12a481bdb6ad4826fa10d1a3af5c6693c4066d12fb3c7ba676 0007-depmod-support-generating-kmod-binary-index-files.patch -4d5e3691b7d0e0c33c0ba1be48db65d1978a78fefb4c0bc5d0757c8c087093b0 0008-login-move-check_securetty-to-libbb.patch -a063e8a8acae6c42a8b47316279dc28b44e2d59aa924a6295cade00a08284a3a 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch -28573f6d49bd8be27beb535581b3b227489f43955d68669bea868128dfdb84cb 0010-su-FEATURE_SU_NULLOK_SECURE.patch -243520c9ba069d7b58f440ce890357eca464c77f62a152eba6173f5de3968441 0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch -30aaba169312101b45ee113cd3daa4ca5bfdee76298cb73c692a890484888e23 0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch -0c4d7b8ea3844c0f771361deb52e7553f4cf198d3d591ed476fa43be56107a8e 0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch -cbe87aa26c161892f82cd319222c1a21768eabcd5b706c8b582a988e981aca10 0015-diff-add-support-for-no-dereference.patch -1be53b0d1aa3c3f44bff31e092bc786259c7475de4b24dfaa71e70c50672f421 0016-whois-make-it-actually-work.patch +sha256sums="3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c busybox-1.26.0.tar.bz2 +985aeb3f592bfae16a0f24be4b6a39616401927ff1b4cf47e01f15d4559120d5 0001-ash-exec-busybox.static.patch +6a43bbc49ed29ed5c506e0010f9f23df4c9696299b569549aff242c1aceb450b 0002-app-location-for-vi-and-lspci.patch +e3f85c4679f0884303c5a8848f0ef6307e002e51cfd209caaf4f776b853dd055 0003-udhcpc-set-default-discover-retries-to-5.patch +234e5649d9219c4334553ee10d2c1717d363c6193b654f48f45cef9b3f4e5abd 0004-ping-make-ping-work-without-root-privileges.patch +c1f8356d3a2a1b40d42a9753130bf4af3a22ff940f7e0dafe45b4649280c6e7d 0005-fbsplash-support-console-switching.patch +bc6349a441fca2e81e80178078d8ebcbaef337a8a871a89c1d4683d23d1186b1 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch +9a71642e381662dbf55c6f4b6ba09bf87f90e82980bea8d12aa25d412fc5af45 0007-depmod-support-generating-kmod-binary-index-files.patch +c158a8f317a327edb2f134178ffd7d1d3027a3644e925d93c031448cf35b4b2f 0008-login-move-check_securetty-to-libbb.patch +3b200f6df58de952b1bf81e338e279a73dbbc536b9a56759cdc5b74a41ddd141 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch +343cb66bead0b2a0069263069642ce95f139772dfd4d44d8b81db6d0c142a54d 0010-su-FEATURE_SU_NULLOK_SECURE.patch +9bc67c6af540cbfdc05c020f517e5f0b8def2cb789f83891e6599ff310e999cb 0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch +c77369008d38b2e4622bc61a2d546f0005bed5c8e5d6a59c0a24bbad7ad04ea2 0012-diff-add-support-for-no-dereference.patch f7cbeb5a5a47395ad30454ce8262abcd3e91c33ef803c2ae31a9258d7142dd48 acpid.logrotate -c94b126d5957e9fafe6270b5e191024ff0374bff074db6ec98fbbeaa5e82de95 busyboxconfig +f32006d2fecb30d26679e8ed093a60cd3b62d8e33d7324c8ad8aaefbb8e0bcd7 busyboxconfig 52bd2c7c44779f910eedd2fea73ec0de520add400894cc132276587e25c73e39 bbsuid.c 5a42f9dbe272b5ce792ebf0d67bb5808ede2e470b0fbfbc23192f17e0b7410ae dad.if-up 9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d nologin.c" -sha512sums="9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb busybox-1.25.1.tar.bz2 -1d5eaba0531263c2b60697d5c7652a2f700a23132c6d2923b45127ba6d7dcc8ccc6c9bd9054e1639fe0dc40e61147348399692c4f08dbf6a6b7bac3c1f2811f7 0001-ash-exec-busybox.static.patch -14a8c43be87b6d6c19787f476405ad6de1a575198ff2420e32d7f952bc72f4869419ef8189ff0e7b11f078a48013eb1f6c73e4b82aff316abba287a5bda96195 0002-set-applet-location-to-correspond-to-upstream-for-vi.patch -1c4393102465de46481dfb2c7d652e76890da567b075a8b11674ae7608f6f0e6966a89961408c396607439bdb5a2f98c00e443102917254f338d05b0676e6ef2 0003-udhcpc-set-default-discover-retries-to-5.patch -91033878d9e5efa8b1e5cebb6b18ea9a87af68b9939ac9441f791c8493b144dff46bafcc9c8d2ff3f8bc3b2c4891faad8fddf3e7335417c099b4b3051cbe9ba4 0004-ping-make-ping-work-without-root-privileges.patch -d69050a60588669b5a7719b63d13d6ecbcb5748cd7d80d0066c22c2571e3136964437c2263f33bbf1d2d17011cdbe972cc05ff753e669d8fc20844fcc211f1b8 0005-fbsplash-support-console-switching.patch -3b31d019441c2a555c5ac01c4c0a3636c7fa5000b992a487729f6fa6929d836417b81118ea422fcb6cb8509b783ab244faf8c04e132c24400a202f8c4c087334 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch -c0ae0f753b7024bd24637ce2225dc0be3d4f5fe91a52824662bc030b9ae6adce6cb92baa633fa4c14b4fd225501d9dd1feec4f5b9b42212af4787325958a2388 0007-depmod-support-generating-kmod-binary-index-files.patch -a0f02c60f47035ddde11795f6dbf51194d2e516a88dec787ef00e7c79627dce79957e397690b6c75d2a0eccff50bffcb7ce362fefe34d505b7da559877855e42 0008-login-move-check_securetty-to-libbb.patch -af7f538953f7ff7ef527e41fbf9e8f345049d33a138d5d20942d3ee2615abc303ca59cb62cb99e3e6fcbfd27975da8220d90e44aafec3de991b6cdfba2c27ce1 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch -00a2e73fd2af72ba798b5a914a01314b161ff2dce2ec6c3cb01a1816e065a20b3110c1558a2fcd4c76cd78223033737592ee1cdcabcc6d35b944ee9010fc1a83 0010-su-FEATURE_SU_NULLOK_SECURE.patch -c1d9742d0045c6d62e731bee50ce3bfdc338601d0d61571271e8a24431d2ba1e3ee522346871fc50011d4047fcdb1eed5a4321e5364eb4e42dd4b65e698dce4c 0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch -d7a4ee28e0bf924b372ecb2f8da67f566f3c9e78199d81085e83dfb9fc9f5655fb8d6d904285d09bfee07d5e93b50603ea5f04e37e0feaaf01375170f158b829 0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch -1e188dfa8c74c9e01f98edab42271260bf6b181b083ef81b76bd3af34ddbca5884a0fe7c3d0352855d0754015d0c0d8da0f1390f5db808b1237153a183a90681 0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch -e04ebc53049be29e5ac0c90dd789b2d275c10175629787f729c06aa323ef688b2ed266961d4f841bae90d00ff4ee454de48d6b92f84f0e5c8729d6c55d9650cd 0015-diff-add-support-for-no-dereference.patch -09cb1bf25c9442986e7d9816277e75591a2af8ba78117869c5cba35d2e189db351455137e9511cf61788864812056133fc9ec5e204f9eb18ae86c34dd8493ae8 0016-whois-make-it-actually-work.patch +sha512sums="9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3 busybox-1.26.0.tar.bz2 +ed16b7a38d99eb309ed03d3212ffd1c1993e292724665be2aaefcf645c9a37d1b0c5d24308dac7dbb093afde5b700961c55336d67be4f2bb788c85550e5f1de8 0001-ash-exec-busybox.static.patch +cd6b0b59ca8006bfc545ba521a92de81be320c0dd3ed0a41d6a60339b73f44c80f1ac36fb05d35a8555fd173167b792f73ae279115d23d59f8f623ae01aed7d1 0002-app-location-for-vi-and-lspci.patch +3fef7a3f47ca798859c5cf8d78bc36ed98c4b9f841a3593bca71b9242ca15719bbe9b683437f8ea61b9a5f6c31c9272b7f72dcb6ef6fc2a42fd3219e302113eb 0003-udhcpc-set-default-discover-retries-to-5.patch +36d1090b35db49fd81ca5a39f5c5050f3173d628ac5e1b9b1c5873a3d0641942c9ffc5448533baa6c4512f4e539e8eb81d53c526a8f6e41b12f6f7606746793f 0004-ping-make-ping-work-without-root-privileges.patch +6fc8fd411daec7989632b448ff73cbac05d8e4c497167f24c0b2a55517449f9c89fcc0131fa64973f163f0d5d0c5ed75613682b95b0f11900d340366693acf2a 0005-fbsplash-support-console-switching.patch +7b6300130ca72b6842283b696c5138ac119b7b79d926ef336395246549b48a0f9c7c97c4708dfc45192d90898da3cad5b9bfe309072751615c012c8fcccfbb42 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch +11529fe845bbd4094dd57f99c8150aefeed69822d04bc0692975ea4f70c1691698d0b76d7522741eca9e45e8baaa877e55aed3ef21809bbaeecf67be7049bf70 0007-depmod-support-generating-kmod-binary-index-files.patch +29589a224a432363620fa1b56c605ca93e39c879d263087f58c531aa4331ca366baa531b7464c41a8fdee96e7750b155e5e00f2bb0aeaa8da50d2cae01eab4f4 0008-login-move-check_securetty-to-libbb.patch +fc291167b2e026166e283d98d2d61cb3c9701e5e83c09062692d0c5a77f3b838ba73065706461095039f9adcbd9a7e4ae60a8b578986d0499caa33789fea3050 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch +f82caa1dc4395f266b024a7face267a916a80ead95f3d392b10fd397d0fdf62703e3078357bc71962616d6531ea913aef80e1a7cdf8180bca70e723c7d331238 0010-su-FEATURE_SU_NULLOK_SECURE.patch +16b513b34b3bf16002f14566aae66aab986403cb7a0f416c27264b739706bbd624a99fd37d5b56ff6efe623f3cc48aef3e8fe51c4ae2e94eda3fe9e8e618e3a1 0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch +361959788bc11b7f20d4029bb0f561759d270983b09c44fe2a01817378c4eb1c98cd8ef73e7ef8c168b7540170f58ddb36b9e4f80a97565f3fe3ba85b593a471 0012-diff-add-support-for-no-dereference.patch dadb4c953ebc755b88ee95c1489feb0c2d352f6e44abc716166024e6eea11ab9d10c84fad62c081775834d205cb04aa1be3c994676c88f4284495c54b9188e8b acpid.logrotate -2f7c256b92f939a88f287529144f25a6bba0cd3491158680237c879507c617e571f95dab302aab586a6ce0261c2337c8210bf29048fb2c472786e55d2295b223 busyboxconfig +87a2c1d5e15c8d9941a8468b7b43948883a4a7973a39ddfed55fb09f3b8e6bfc02f888fcde16516144a41da140e084ce3720673ee2ad78abab8747d619ca1304 busyboxconfig c1dd56509277c59751907a27f067f1622191ddfd498acfe390d83136d36a41f2bdfc2fd4daf35af77219a66fb00fea20483f34112afd5df2ccd9f36ab548e66f bbsuid.c a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2 nologin.c" diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig index a6d3832fd2b..dd94178fb03 100644 --- a/main/busybox/busyboxconfig +++ b/main/busybox/busyboxconfig @@ -1,44 +1,25 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.25.0 -# Thu Aug 4 13:18:39 2016 +# Busybox version: 1.26.0 +# Thu Dec 29 16:31:41 2016 # CONFIG_HAVE_DOT_CONFIG=y # # Busybox Settings # - -# -# General Configuration -# CONFIG_DESKTOP=y # CONFIG_EXTRA_COMPAT is not set # CONFIG_INCLUDE_SUSv2 is not set # CONFIG_USE_PORTABLE_CODE is not set CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_BUSYBOX=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set -CONFIG_LOCALE_SUPPORT=y -CONFIG_UNICODE_SUPPORT=y -CONFIG_UNICODE_USING_LOCALE=y -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=1114111 -CONFIG_UNICODE_COMBINING_WCHARS=y -CONFIG_UNICODE_WIDE_WCHARS=y -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -CONFIG_UNICODE_PRESERVE_BROKEN=y # CONFIG_PAM is not set -CONFIG_FEATURE_USE_SENDFILE=y CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set @@ -72,18 +53,6 @@ CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_DEBUG_SANITIZE is not set -# CONFIG_UNIT_TEST is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# # Installation Options ("make install" behavior) # # CONFIG_INSTALL_APPLET_SYMLINKS is not set @@ -96,10 +65,25 @@ CONFIG_INSTALL_APPLET_DONT=y CONFIG_PREFIX="/home/ncopa/aports/main/busybox/pkg/busybox" # +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_DEBUG_SANITIZE is not set +# CONFIG_UNIT_TEST is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# # Busybox Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=0 CONFIG_SHA3_SMALL=0 @@ -117,8 +101,20 @@ CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_USERNAME_COMPLETION=y CONFIG_FEATURE_EDITING_FANCY_PROMPT=y CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +CONFIG_UNICODE_USING_LOCALE=y +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=1114111 +CONFIG_UNICODE_COMBINING_WCHARS=y +CONFIG_UNICODE_WIDE_WCHARS=y +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +CONFIG_UNICODE_PRESERVE_BROKEN=y CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_FEATURE_COPYBUF_KB=16 CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_MONOTONIC_SYSCALL=y @@ -142,12 +138,16 @@ CONFIG_FEATURE_SEAMLESS_Z=y # CONFIG_FEATURE_AR_CREATE is not set # CONFIG_UNCOMPRESS is not set CONFIG_GUNZIP=y +CONFIG_ZCAT=y CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y CONFIG_BUNZIP2=y +CONFIG_BZCAT=y CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZCAT=y CONFIG_LZMA=y +CONFIG_FEATURE_LZMA_FAST=y CONFIG_UNXZ=y +CONFIG_XZCAT=y # CONFIG_XZ is not set CONFIG_BZIP2=y CONFIG_CPIO=y @@ -155,12 +155,13 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GZIP=y # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set CONFIG_GZIP_FAST=2 CONFIG_FEATURE_GZIP_LEVELS=y CONFIG_LZOP=y +CONFIG_UNLZOP=y +CONFIG_LZOPCAT=y # CONFIG_LZOP_COMPR_HIGH is not set # CONFIG_RPM is not set # CONFIG_RPM2CPIO is not set @@ -182,39 +183,8 @@ CONFIG_UNZIP=y # Coreutils # CONFIG_BASENAME=y -CONFIG_CAT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set -CONFIG_FEATURE_DATE_COMPAT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_FEATURE_DD_STATUS=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_GROUPS=y -CONFIG_SHUF=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_FEATURE_STAT_FILESYSTEM=y -CONFIG_SYNC=y -CONFIG_FEATURE_SYNC_FANCY=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y -CONFIG_FEATURE_TOUCH_SUSV3=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUNCATE=y -CONFIG_UNLINK=y -CONFIG_BASE64=y -# CONFIG_WHO is not set -# CONFIG_USERS is not set CONFIG_CAL=y +CONFIG_CAT=y CONFIG_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y @@ -226,6 +196,15 @@ CONFIG_COMM=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y @@ -239,6 +218,8 @@ CONFIG_ENV=y # CONFIG_FEATURE_ENV_LONG_OPTIONS is not set CONFIG_EXPAND=y # CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_UNEXPAND=y +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FALSE=y @@ -246,6 +227,9 @@ CONFIG_FOLD=y CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_GROUPS=y CONFIG_INSTALL=y # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set CONFIG_LN=y @@ -260,6 +244,15 @@ CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y CONFIG_MD5SUM=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y CONFIG_MKDIR=y # CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set CONFIG_MKFIFO=y @@ -279,10 +272,7 @@ CONFIG_RM=y CONFIG_RMDIR=y # CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SHA3SUM=y +CONFIG_SHUF=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -290,25 +280,43 @@ CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y CONFIG_SPLIT=y # CONFIG_FEATURE_SPLIT_FANCY is not set +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_FEATURE_STAT_FILESYSTEM=y CONFIG_STTY=y CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_FEATURE_SYNC_FANCY=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y +CONFIG_TEST1=y +CONFIG_TEST2=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y +CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="Linux" -CONFIG_UNEXPAND=y -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_UNIQ=y +CONFIG_UNLINK=y CONFIG_USLEEP=y CONFIG_UUDECODE=y +CONFIG_BASE64=y CONFIG_UUENCODE=y CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set CONFIG_WHOAMI=y CONFIG_YES=y @@ -333,20 +341,24 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# # Console Utilities # CONFIG_CHVT=y -# CONFIG_FGCONSOLE is not set CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y +# CONFIG_FGCONSOLE is not set CONFIG_KBD_MODE=y CONFIG_LOADFONT=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share" + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y CONFIG_LOADKMAP=y CONFIG_OPENVT=y CONFIG_RESET=y @@ -354,20 +366,11 @@ CONFIG_RESIZE=y CONFIG_FEATURE_RESIZE_PRINT=y CONFIG_SETCONSOLE=y # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETFONT=y -CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y -CONFIG_DEFAULT_SETFONT_DIR="/usr/share" CONFIG_SETKEYCODES=y CONFIG_SETLOGCONS=y CONFIG_SHOWKEY=y # -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# # Debian Utilities # CONFIG_MKTEMP=y @@ -440,8 +443,8 @@ CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set CONFIG_FEATURE_FIND_LINKS=y CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_EGREP=y +CONFIG_FGREP=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y @@ -457,6 +460,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set CONFIG_HALT=y +CONFIG_POWEROFF=y +CONFIG_REBOOT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y @@ -526,17 +531,17 @@ CONFIG_FSCK=y # # Linux Module Utilities # +CONFIG_DEPMOD=y +CONFIG_INSMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y CONFIG_MODINFO=y # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y CONFIG_MODPROBE=y CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_DEPMOD=y +CONFIG_RMMOD=y # # Options common to multiple modutils @@ -558,42 +563,18 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # -CONFIG_BLKDISCARD=y -CONFIG_BLOCKDEV=y -CONFIG_FATATTR=y -CONFIG_FSTRIM=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -# CONFIG_FEATURE_MOUNT_NFS is not set -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -# CONFIG_FEATURE_MOUNT_OTHERTAB is not set -CONFIG_NSENTER=y -CONFIG_FEATURE_NSENTER_LONG_OPTS=y -CONFIG_REV=y -# CONFIG_SETARCH is not set -# CONFIG_UEVENT is not set -CONFIG_UNSHARE=y CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKDISCARD=y CONFIG_BLKID=y CONFIG_FEATURE_BLKID_TYPE=y +CONFIG_BLOCKDEV=y CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FATATTR=y CONFIG_FBSET=y CONFIG_FEATURE_FBSET_FANCY=y CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y CONFIG_FDFORMAT=y CONFIG_FDISK=y # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set @@ -606,13 +587,10 @@ CONFIG_FEATURE_GPT_LABEL=y CONFIG_FEATURE_FDISK_ADVANCED=y CONFIG_FINDFS=y CONFIG_FLOCK=y +CONFIG_FDFLUSH=y # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -CONFIG_MKFS_VFAT=y +CONFIG_FSTRIM=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y @@ -626,22 +604,54 @@ CONFIG_IPCS=y CONFIG_LOSETUP=y CONFIG_LSPCI=y CONFIG_LSUSB=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +# CONFIG_MKE2FS is not set +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +CONFIG_MKDOSFS=y +CONFIG_MKFS_VFAT=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_FEATURE_MOUNT_OTHERTAB is not set +CONFIG_NSENTER=y +CONFIG_FEATURE_NSENTER_LONG_OPTS=y # CONFIG_PIVOT_ROOT is not set CONFIG_RDATE=y CONFIG_RDEV=y CONFIG_READPROFILE=y +CONFIG_REV=y # CONFIG_RTCWAKE is not set # CONFIG_SCRIPT is not set # CONFIG_SCRIPTREPLAY is not set -CONFIG_SWAPONOFF=y +# CONFIG_SETARCH is not set +CONFIG_LINUX32=y +CONFIG_LINUX64=y +CONFIG_SWAPON=y CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWAPOFF=y CONFIG_SWITCH_ROOT=y +# CONFIG_UEVENT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y +CONFIG_UNSHARE=y # # Common options for mount/umount @@ -674,46 +684,13 @@ CONFIG_FEATURE_VOLUMEID_REISERFS=y # CONFIG_FEATURE_VOLUMEID_ROMFS is not set CONFIG_FEATURE_VOLUMEID_SQUASHFS=y # CONFIG_FEATURE_VOLUMEID_SYSV is not set +CONFIG_FEATURE_VOLUMEID_UBIFS=y CONFIG_FEATURE_VOLUMEID_UDF=y CONFIG_FEATURE_VOLUMEID_XFS=y # # Miscellaneous Utilities # -CONFIG_CONSPY=y -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -CONFIG_FEATURE_CROND_CALL_SENDMAIL=y -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" -# CONFIG_I2CGET is not set -# CONFIG_I2CSET is not set -# CONFIG_I2CDUMP is not set -# CONFIG_I2CDETECT is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_TRUNCATE=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_FEATURE_LESS_WINCH=y -CONFIG_FEATURE_LESS_ASK_TERMINAL=y -CONFIG_FEATURE_LESS_DASHCMD=y -CONFIG_FEATURE_LESS_LINENUMS=y -CONFIG_NANDWRITE=y -CONFIG_NANDDUMP=y -CONFIG_RFKILL=y -CONFIG_SETSERIAL=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_UBIRENAME is not set -# CONFIG_WALL is not set CONFIG_ADJTIMEX=y CONFIG_BBCONFIG=y CONFIG_FEATURE_COMPRESS_BBCONFIG=y @@ -729,6 +706,11 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=30 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set # CONFIG_CHRT is not set +CONFIG_CONSPY=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_CRONTAB=y CONFIG_DC=y CONFIG_FEATURE_DC_LIBM=y @@ -741,14 +723,10 @@ CONFIG_FEATURE_DC_LIBM=y CONFIG_EJECT=y CONFIG_FEATURE_EJECT_SCSI=y CONFIG_FBSPLASH=y -# CONFIG_FLASHCP is not set +# CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -CONFIG_IONICE=y -CONFIG_INOTIFYD=y -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_FANCY is not set +# CONFIG_FLASHCP is not set CONFIG_HDPARM=y # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -756,6 +734,25 @@ CONFIG_HDPARM=y # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_I2CGET is not set +# CONFIG_I2CSET is not set +# CONFIG_I2CDUMP is not set +# CONFIG_I2CDETECT is not set +CONFIG_INOTIFYD=y +CONFIG_IONICE=y +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_TRUNCATE=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y # CONFIG_MAKEDEVS is not set # CONFIG_FEATURE_MAKEDEVS_LEAF is not set # CONFIG_FEATURE_MAKEDEVS_TABLE is not set @@ -763,39 +760,35 @@ CONFIG_HDPARM=y CONFIG_MICROCOM=y CONFIG_MOUNTPOINT=y # CONFIG_MT is not set +CONFIG_NANDWRITE=y +CONFIG_NANDDUMP=y CONFIG_RAIDAUTORUN=y CONFIG_READAHEAD=y +CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +CONFIG_SETSERIAL=y CONFIG_SETSID=y CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +# CONFIG_UBIRENAME is not set CONFIG_VOLNAME=y +# CONFIG_WALL is not set CONFIG_WATCHDOG=y # # Networking Utilities # -CONFIG_NAMEIF=y -CONFIG_FEATURE_NAMEIF_EXTENDED=y -CONFIG_NBDCLIENT=y -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -CONFIG_NC_110_COMPAT=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -CONFIG_FEATURE_WGET_TIMEOUT=y -CONFIG_FEATURE_WGET_OPENSSL=y -CONFIG_FEATURE_WGET_SSL_HELPER=y -CONFIG_WHOIS=y CONFIG_FEATURE_IPV6=y CONFIG_FEATURE_UNIX_LOCAL=y CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y @@ -807,15 +800,15 @@ CONFIG_FEATURE_BRCTL_FANCY=y CONFIG_FEATURE_BRCTL_SHOW=y CONFIG_DNSD=y CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y CONFIG_FTPD=y -CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_WRITE=y CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y -# CONFIG_FEATURE_FTP_AUTHENTICATION is not set +CONFIG_FEATURE_FTPD_AUTHENTICATION=y CONFIG_FTPGET=y CONFIG_FTPPUT=y # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y +CONFIG_DNSDOMAINNAME=y CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y CONFIG_FEATURE_HTTPD_SETUID=y @@ -836,7 +829,8 @@ CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y CONFIG_IFENSLAVE=y # CONFIG_IFPLUGD is not set -CONFIG_IFUPDOWN=y +CONFIG_IFUP=y +CONFIG_IFDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" CONFIG_FEATURE_IFUPDOWN_IP=y CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y @@ -871,6 +865,14 @@ CONFIG_IPNEIGH=y CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_FAKEIDENTD=y +CONFIG_NAMEIF=y +CONFIG_FEATURE_NAMEIF_EXTENDED=y +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +CONFIG_NC_110_COMPAT=y CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y @@ -878,10 +880,14 @@ CONFIG_NSLOOKUP=y CONFIG_NTPD=y CONFIG_FEATURE_NTPD_SERVER=y CONFIG_FEATURE_NTPD_CONF=y +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y CONFIG_PSCAN=y CONFIG_ROUTE=y CONFIG_SLATTACH=y # CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y @@ -902,10 +908,19 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y CONFIG_TRACEROUTE=y CONFIG_TRACEROUTE6=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_FEATURE_WGET_OPENSSL=y +CONFIG_FEATURE_WGET_SSL_HELPER=y +CONFIG_WHOIS=y +# CONFIG_ZCIP is not set CONFIG_UDHCPC6=y CONFIG_UDHCPD=y # CONFIG_DHCPRELAY is not set @@ -922,10 +937,7 @@ CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" -# CONFIG_UDPSVD is not set -CONFIG_VCONFIG=y -# CONFIG_ZCIP is not set +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # # Print Utilities @@ -938,25 +950,43 @@ CONFIG_VCONFIG=y # Mail Utilities # CONFIG_MAKEMIME=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set CONFIG_REFORMIME=y CONFIG_FEATURE_REFORMIME_COMPAT=y CONFIG_SENDMAIL=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" # # Process Utilities # +CONFIG_FREE=y +CONFIG_FUSER=y CONFIG_IOSTAT=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y CONFIG_LSOF=y CONFIG_MPSTAT=y CONFIG_NMETER=y +CONFIG_PGREP=y +CONFIG_PKILL=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y CONFIG_PMAP=y CONFIG_POWERTOP=y +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_PSTREE=y CONFIG_PWDX=y +CONFIG_RENICE=y CONFIG_SMEMCAP=y +CONFIG_BB_SYSCTL=y CONFIG_TOP=y CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y @@ -966,26 +996,8 @@ CONFIG_FEATURE_TOP_SMP_PROCESS=y CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_LONG is not set -CONFIG_FEATURE_PS_TIME=y -CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -# CONFIG_FEATURE_SHOW_THREADS is not set CONFIG_WATCH=y +# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1000,6 +1012,7 @@ CONFIG_WATCH=y # CONFIG_FEATURE_RUNSVDIR_LOG is not set # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVC is not set # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set @@ -1007,20 +1020,24 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_GETSEBOOL is not set # CONFIG_LOAD_POLICY is not set # CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set # CONFIG_RUNCON is not set # CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set # CONFIG_SELINUXENABLED is not set +# CONFIG_SESTATUS is not set # CONFIG_SETENFORCE is not set # CONFIG_SETFILES is not set # CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_RESTORECON is not set # CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set # # Shells # CONFIG_ASH=y +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_INTERNAL_GLOB is not set +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y CONFIG_ASH_BASH_COMPAT=y CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_JOB_CONTROL=y @@ -1032,9 +1049,6 @@ CONFIG_ASH_BUILTIN_TEST=y CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set |