From c6dfe2002d27d340bb5da6891bdf37e04c8abeae Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 20 Apr 2011 02:56:23 +0000 Subject: busybox: refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26738 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/001-init_avoid_loop_opening_tty.patch | 2 +- package/busybox/patches/003-brctl_show_fix.patch | 2 +- package/busybox/patches/110-wget_getopt_fix.patch | 4 ++-- package/busybox/patches/200-etc_crontabs.patch | 2 +- package/busybox/patches/240-udhcpc_retries.patch | 4 ++-- .../busybox/patches/241-udhcpc-oversized_packets.patch | 14 ++++++-------- package/busybox/patches/242-udhcpc_msgs.patch | 12 ++++++------ package/busybox/patches/243-udhcpc_changed_ifindex.patch | 2 +- package/busybox/patches/250-ash_export-n.patch | 4 ++-- package/busybox/patches/300-netmsg.patch | 13 +------------ package/busybox/patches/310-passwd_access.patch | 2 +- package/busybox/patches/340-lock_util.patch | 6 +++--- package/busybox/patches/350-httpd_redir.patch | 16 ++++++++-------- package/busybox/patches/410-httpd_cgi_headers.patch | 2 +- package/busybox/patches/440-httpd_chdir.patch | 2 +- package/busybox/patches/470-insmod_search.patch | 6 +++--- package/busybox/patches/510-awk_include.patch | 14 +++++++------- package/busybox/patches/524-udhcpc_renew.patch | 2 +- package/busybox/patches/803-id_getgrouplist.patch | 10 +++++----- package/busybox/patches/910-insmod-q-flag.patch | 6 +++--- 20 files changed, 56 insertions(+), 69 deletions(-) (limited to 'package/busybox/patches') diff --git a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch index d6e000752f..1097720c33 100644 --- a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch +++ b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch @@ -1,6 +1,6 @@ --- a/init/init.c +++ b/init/init.c -@@ -460,8 +460,11 @@ static void run_actions(int action_type) +@@ -572,8 +572,11 @@ static void run_actions(int action_type) /* Only run stuff with pid == 0. If pid != 0, * it is already running */ diff --git a/package/busybox/patches/003-brctl_show_fix.patch b/package/busybox/patches/003-brctl_show_fix.patch index d36ffc5c12..57e35d495d 100644 --- a/package/busybox/patches/003-brctl_show_fix.patch +++ b/package/busybox/patches/003-brctl_show_fix.patch @@ -20,7 +20,7 @@ int fd; --- a/networking/Config.src +++ b/networking/Config.src -@@ -79,12 +79,12 @@ config FEATURE_BRCTL_FANCY +@@ -82,12 +82,12 @@ config FEATURE_BRCTL_FANCY This adds about 600 bytes. config FEATURE_BRCTL_SHOW diff --git a/package/busybox/patches/110-wget_getopt_fix.patch b/package/busybox/patches/110-wget_getopt_fix.patch index 078872cf0b..d9ae982a6a 100644 --- a/package/busybox/patches/110-wget_getopt_fix.patch +++ b/package/busybox/patches/110-wget_getopt_fix.patch @@ -1,8 +1,8 @@ --- a/networking/wget.c +++ b/networking/wget.c -@@ -545,7 +545,7 @@ int wget_main(int argc UNUSED_PARAM, cha +@@ -597,7 +597,7 @@ int wget_main(int argc UNUSED_PARAM, cha + /* Ignored: */ // "tries\0" Required_argument "t" - // "timeout\0" Required_argument "T" /* Ignored (we always use PASV): */ - "passive-ftp\0" No_argument "\xff" + "passive-ftp\0" No_argument "\xfd" diff --git a/package/busybox/patches/200-etc_crontabs.patch b/package/busybox/patches/200-etc_crontabs.patch index 936ef7ef81..f83ac02a9d 100644 --- a/package/busybox/patches/200-etc_crontabs.patch +++ b/package/busybox/patches/200-etc_crontabs.patch @@ -7,7 +7,7 @@ -#define CRONTABS CONFIG_FEATURE_CROND_DIR "/crontabs" +#define CRONTABS "/etc/crontabs" #ifndef SENDMAIL - #define SENDMAIL "sendmail" + # define SENDMAIL "sendmail" #endif --- a/miscutils/crontab.c +++ b/miscutils/crontab.c diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch index c78dae533e..73240aa801 100644 --- a/package/busybox/patches/240-udhcpc_retries.patch +++ b/package/busybox/patches/240-udhcpc_retries.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -1017,7 +1017,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c +@@ -1196,7 +1196,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c switch (state) { case INIT_SELECTING: @@ -9,7 +9,7 @@ if (packet_num == 0) xid = random_xid(); /* broadcast */ -@@ -1046,7 +1046,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c +@@ -1225,7 +1225,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c packet_num = 0; continue; case REQUESTING: diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/busybox/patches/241-udhcpc-oversized_packets.patch index d83bf0b413..56f4e93127 100644 --- a/package/busybox/patches/241-udhcpc-oversized_packets.patch +++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch @@ -1,8 +1,6 @@ -diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c -index 2b7528c..94e53dc 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c -@@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void *addr, int count) +@@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * return ~sum; } @@ -14,7 +12,7 @@ index 2b7528c..94e53dc 100644 /* Construct a ip/udp header for a packet, send packet */ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, uint32_t source_nip, int source_port, -@@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, +@@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru { struct sockaddr_ll dest_sll; struct ip_udp_dhcp_packet packet; @@ -26,7 +24,7 @@ index 2b7528c..94e53dc 100644 fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); if (fd < 0) { -@@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, +@@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru } memset(&dest_sll, 0, sizeof(dest_sll)); @@ -37,7 +35,7 @@ index 2b7528c..94e53dc 100644 dest_sll.sll_family = AF_PACKET; dest_sll.sll_protocol = htons(ETH_P_IP); -@@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, +@@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru goto ret_close; } @@ -80,7 +78,7 @@ index 2b7528c..94e53dc 100644 (struct sockaddr *) &dest_sll, sizeof(dest_sll)); msg = "sendto"; ret_close: -@@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt, +@@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s uint32_t dest_nip, int dest_port) { struct sockaddr_in client; @@ -88,7 +86,7 @@ index 2b7528c..94e53dc 100644 int fd; int result = -1; const char *msg; -@@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt, +@@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s } udhcp_dump_packet(dhcp_pkt); diff --git a/package/busybox/patches/242-udhcpc_msgs.patch b/package/busybox/patches/242-udhcpc_msgs.patch index ea606ecc3c..7d390f1667 100644 --- a/package/busybox/patches/242-udhcpc_msgs.patch +++ b/package/busybox/patches/242-udhcpc_msgs.patch @@ -1,15 +1,15 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -428,6 +428,7 @@ static int raw_bcast_from_client_config_ - static int send_discover(uint32_t xid, uint32_t requested) +@@ -436,6 +436,7 @@ static int raw_bcast_from_client_config_ + static NOINLINE int send_discover(uint32_t xid, uint32_t requested) { struct dhcp_packet packet; + static int msgs = 0; - init_packet(&packet, DHCPDISCOVER); - packet.xid = xid; -@@ -438,6 +439,7 @@ static int send_discover(uint32_t xid, u - udhcp_add_simple_option(&packet, DHCP_MAX_SIZE, htons(576)); + /* Fill in: op, htype, hlen, cookie, chaddr fields, + * random xid field (we override it below), +@@ -453,6 +454,7 @@ static NOINLINE int send_discover(uint32 + */ add_client_options(&packet); + if (msgs++ < 3) diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/busybox/patches/243-udhcpc_changed_ifindex.patch index 45339242bf..71bfe01933 100644 --- a/package/busybox/patches/243-udhcpc_changed_ifindex.patch +++ b/package/busybox/patches/243-udhcpc_changed_ifindex.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -980,6 +980,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c +@@ -1144,6 +1144,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c /* silence "uninitialized!" warning */ unsigned timestamp_before_wait = timestamp_before_wait; diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch index 9c23920b88..1c34b2cd7b 100644 --- a/package/busybox/patches/250-ash_export-n.patch +++ b/package/busybox/patches/250-ash_export-n.patch @@ -1,6 +1,6 @@ --- a/shell/ash.c +++ b/shell/ash.c -@@ -12429,8 +12429,17 @@ exportcmd(int argc UNUSED_PARAM, char ** +@@ -12532,8 +12532,17 @@ exportcmd(int argc UNUSED_PARAM, char ** const char *p; char **aptr; int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT; @@ -19,7 +19,7 @@ aptr = argptr; name = *aptr; if (name) { -@@ -12442,10 +12451,12 @@ exportcmd(int argc UNUSED_PARAM, char ** +@@ -12545,10 +12554,12 @@ exportcmd(int argc UNUSED_PARAM, char ** vp = *findvar(hashvar(name), name); if (vp) { vp->flags |= flag; diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch index d9d2f14a87..795ebb3623 100644 --- a/package/busybox/patches/300-netmsg.patch +++ b/package/busybox/patches/300-netmsg.patch @@ -1,8 +1,6 @@ -diff --git a/include/applets.src.h b/include/applets.src.h -index f4fab53..f97f2d8 100644 --- a/include/applets.src.h +++ b/include/applets.src.h -@@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_DROP)) +@@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP)) IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP)) @@ -10,8 +8,6 @@ index f4fab53..f97f2d8 100644 IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP)) IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP)) IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP)) -diff --git a/include/usage.src.h b/include/usage.src.h -index 30fef24..ac78992 100644 --- a/include/usage.src.h +++ b/include/usage.src.h @@ -1,3 +1,4 @@ @@ -29,8 +25,6 @@ index 30fef24..ac78992 100644 #define nmeter_trivial_usage \ "format_string" #define nmeter_full_usage "\n\n" \ -diff --git a/networking/Config.src b/networking/Config.src -index 6dd7df7..4682dd3 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -640,6 +640,12 @@ config FEATURE_NAMEIF_EXTENDED @@ -46,8 +40,6 @@ index 6dd7df7..4682dd3 100644 config NETSTAT bool "netstat" default y -diff --git a/networking/Kbuild.src b/networking/Kbuild.src -index f41a2df..6070a40 100644 --- a/networking/Kbuild.src +++ b/networking/Kbuild.src @@ -27,6 +27,7 @@ lib-$(CONFIG_IP) += ip.o @@ -58,9 +50,6 @@ index f41a2df..6070a40 100644 lib-$(CONFIG_NETSTAT) += netstat.o lib-$(CONFIG_NSLOOKUP) += nslookup.o lib-$(CONFIG_NTPD) += ntpd.o -diff --git a/networking/netmsg.c b/networking/netmsg.c -new file mode 100644 -index 0000000..43aba0d --- /dev/null +++ b/networking/netmsg.c @@ -0,0 +1,63 @@ diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch index 24241c1260..a8581db728 100644 --- a/package/busybox/patches/310-passwd_access.patch +++ b/package/busybox/patches/310-passwd_access.patch @@ -3,7 +3,7 @@ --- a/networking/httpd.c +++ b/networking/httpd.c -@@ -1717,21 +1717,32 @@ static int check_user_passwd(const char +@@ -1742,21 +1742,32 @@ static int check_user_passwd(const char if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { char *md5_passwd; diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch index 473d1b9ac1..568391298e 100644 --- a/package/busybox/patches/340-lock_util.patch +++ b/package/busybox/patches/340-lock_util.patch @@ -1,6 +1,6 @@ --- a/include/applets.src.h +++ b/include/applets.src.h -@@ -229,6 +229,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, +@@ -213,6 +213,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_DROP)) @@ -10,7 +10,7 @@ IF_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_DROP, logname)) --- a/include/usage.src.h +++ b/include/usage.src.h -@@ -2320,6 +2320,9 @@ INSERT +@@ -2089,6 +2089,9 @@ INSERT #define loadkmap_example_usage \ "$ loadkmap < /etc/i18n/lang-keymap\n" @@ -22,7 +22,7 @@ #define logger_full_usage "\n\n" \ --- a/miscutils/Config.src +++ b/miscutils/Config.src -@@ -465,6 +465,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA +@@ -485,6 +485,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA help Enables the 'hdparm -d' option to get/set using_dma flag. diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index 7437d898c2..3fae94a096 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -1,6 +1,6 @@ --- a/include/usage.src.h +++ b/include/usage.src.h -@@ -1719,7 +1719,8 @@ INSERT +@@ -1623,7 +1623,8 @@ INSERT IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \ IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ " [-h HOME]\n" \ @@ -10,7 +10,7 @@ #define httpd_full_usage "\n\n" \ "Listen for incoming HTTP requests\n" \ "\nOptions:" \ -@@ -1737,6 +1738,8 @@ INSERT +@@ -1641,6 +1642,8 @@ INSERT "\n -m STRING MD5 crypt STRING") \ "\n -e STRING HTML encode STRING" \ "\n -d STRING URL decode STRING" \ @@ -21,7 +21,7 @@ IF_FEATURE_HWCLOCK_LONG_OPTIONS( \ --- a/networking/httpd.c +++ b/networking/httpd.c -@@ -250,6 +250,8 @@ struct globals { +@@ -243,6 +243,8 @@ struct globals { const char *found_mime_type; const char *found_moved_temporarily; @@ -30,7 +30,7 @@ Htaccess_IP *ip_a_d; /* config allow/deny lines */ IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) -@@ -296,6 +298,8 @@ struct globals { +@@ -293,6 +295,8 @@ struct globals { #define index_page (G.index_page ) #define found_mime_type (G.found_mime_type ) #define found_moved_temporarily (G.found_moved_temporarily) @@ -39,7 +39,7 @@ #define last_mod (G.last_mod ) #define ip_a_d (G.ip_a_d ) #define g_realm (G.g_realm ) -@@ -997,8 +1001,11 @@ static void send_headers(int responseNum +@@ -999,8 +1003,11 @@ static void send_headers(int responseNum } #endif if (responseNum == HTTP_MOVED_TEMPORARILY) { @@ -52,7 +52,7 @@ (g_query ? "?" : ""), (g_query ? g_query : "")); } -@@ -1942,8 +1949,12 @@ static void handle_incoming_and_exit(con +@@ -1967,8 +1974,12 @@ static void handle_incoming_and_exit(con } while (*++tptr); *++urlp = '\0'; /* terminate after last character */ @@ -66,7 +66,7 @@ if (is_directory(urlcopy + 1, 1, NULL)) { found_moved_temporarily = urlcopy; } -@@ -2283,7 +2294,9 @@ static void sighup_handler(int sig UNUSE +@@ -2325,7 +2336,9 @@ static void sighup_handler(int sig UNUSE } enum { @@ -77,7 +77,7 @@ d_opt_decode_url, h_opt_home_httpd, IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) -@@ -2332,12 +2345,13 @@ int httpd_main(int argc UNUSED_PARAM, ch +@@ -2374,12 +2387,13 @@ int httpd_main(int argc UNUSED_PARAM, ch /* We do not "absolutize" path given by -h (home) opt. * If user gives relative path in -h, * $SCRIPT_FILENAME will not be set. */ diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch index b47751a809..19e1f94142 100644 --- a/package/busybox/patches/410-httpd_cgi_headers.patch +++ b/package/busybox/patches/410-httpd_cgi_headers.patch @@ -1,6 +1,6 @@ --- a/networking/httpd.c +++ b/networking/httpd.c -@@ -1255,10 +1255,10 @@ static NOINLINE void cgi_io_loop_and_exi +@@ -1261,10 +1261,10 @@ static NOINLINE void cgi_io_loop_and_exi if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1) break; } diff --git a/package/busybox/patches/440-httpd_chdir.patch b/package/busybox/patches/440-httpd_chdir.patch index 2f44111dcb..66e41b55f2 100644 --- a/package/busybox/patches/440-httpd_chdir.patch +++ b/package/busybox/patches/440-httpd_chdir.patch @@ -1,6 +1,6 @@ --- a/networking/httpd.c +++ b/networking/httpd.c -@@ -1828,6 +1828,7 @@ static void handle_incoming_and_exit(con +@@ -1853,6 +1853,7 @@ static void handle_incoming_and_exit(con char *header_ptr = header_ptr; Htaccess_Proxy *proxy_entry; #endif diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch index 8f52d985f7..8c5741d17f 100644 --- a/package/busybox/patches/470-insmod_search.patch +++ b/package/busybox/patches/470-insmod_search.patch @@ -1,6 +1,6 @@ --- a/modutils/insmod.c +++ b/modutils/insmod.c -@@ -9,6 +9,99 @@ +@@ -11,6 +11,99 @@ #include "libbb.h" #include "modutils.h" @@ -100,7 +100,7 @@ /* 2.6 style insmod has no options and required filename * (not module name - .ko can't be omitted) */ -@@ -55,9 +148,15 @@ int insmod_main(int argc UNUSED_PARAM, c +@@ -59,9 +152,15 @@ int insmod_main(int argc UNUSED_PARAM, c if (!filename) bb_show_usage(); @@ -119,7 +119,7 @@ } --- a/modutils/Config.src +++ b/modutils/Config.src -@@ -228,7 +228,7 @@ config FEATURE_MODUTILS_SYMBOLS +@@ -229,7 +229,7 @@ config FEATURE_MODUTILS_SYMBOLS config DEFAULT_MODULES_DIR string "Default directory containing modules" default "/lib/modules" diff --git a/package/busybox/patches/510-awk_include.patch b/package/busybox/patches/510-awk_include.patch index 07f28c9de1..9465cdad83 100644 --- a/package/busybox/patches/510-awk_include.patch +++ b/package/busybox/patches/510-awk_include.patch @@ -5,7 +5,7 @@ /* vi: set sw=4 ts=4: */ /* * awk implementation for busybox -@@ -70,9 +71,14 @@ typedef struct chain_s { +@@ -74,9 +75,14 @@ typedef struct chain_s { } chain; /* Function */ @@ -20,7 +20,7 @@ } func; /* I/O stream */ -@@ -1453,7 +1459,8 @@ static void parse_program(char *p) +@@ -1466,7 +1472,8 @@ static void parse_program(char *p) next_token(TC_FUNCTION); g_pos++; f = newfunc(t_string); @@ -30,7 +30,7 @@ f->nargs = 0; while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) { v = findvar(ahash, t_string); -@@ -1462,7 +1469,7 @@ static void parse_program(char *p) +@@ -1475,7 +1482,7 @@ static void parse_program(char *p) if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM) break; } @@ -39,7 +39,7 @@ chain_group(); clear_array(ahash); -@@ -2547,7 +2554,8 @@ static var *evaluate(node *op, var *res) +@@ -2573,7 +2580,8 @@ static var *evaluate(node *op, var *res) var *vbeg, *v; const char *sv_progname; @@ -49,7 +49,7 @@ syntax_error(EMSG_UNDEF_FUNC); vbeg = v = nvalloc(op->r.f->nargs + 1); -@@ -2564,7 +2572,10 @@ static var *evaluate(node *op, var *res) +@@ -2590,7 +2598,10 @@ static var *evaluate(node *op, var *res) fnargs = vbeg; sv_progname = g_progname; @@ -61,7 +61,7 @@ g_progname = sv_progname; nvfree(fnargs); -@@ -2942,6 +2953,143 @@ static rstream *next_input_file(void) +@@ -2984,6 +2995,143 @@ static rstream *next_input_file(void) #undef files_happen } @@ -205,7 +205,7 @@ int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int awk_main(int argc, char **argv) { -@@ -3007,6 +3155,9 @@ int awk_main(int argc, char **argv) +@@ -3049,6 +3197,9 @@ int awk_main(int argc, char **argv) *s1 = '='; } } diff --git a/package/busybox/patches/524-udhcpc_renew.patch b/package/busybox/patches/524-udhcpc_renew.patch index 2a8e1c1449..64b075a593 100644 --- a/package/busybox/patches/524-udhcpc_renew.patch +++ b/package/busybox/patches/524-udhcpc_renew.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -793,7 +793,6 @@ static void perform_renew(void) +@@ -874,7 +874,6 @@ static void perform_renew(void) state = RENEW_REQUESTED; break; case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ diff --git a/package/busybox/patches/803-id_getgrouplist.patch b/package/busybox/patches/803-id_getgrouplist.patch index 48aa57c04f..04d8dc4067 100644 --- a/package/busybox/patches/803-id_getgrouplist.patch +++ b/package/busybox/patches/803-id_getgrouplist.patch @@ -5,9 +5,9 @@ Signed-off-by: Nicolas Thill --- a/coreutils/id.c +++ b/coreutils/id.c -@@ -17,10 +17,12 @@ +@@ -19,10 +19,12 @@ - #include "libbb.h" + /* This is a NOEXEC applet. Be very careful! */ +#define HAVE_GETGROUPLIST 1 + @@ -19,7 +19,7 @@ Signed-off-by: Nicolas Thill #endif #endif #endif -@@ -82,7 +84,11 @@ static int get_groups(const char *userna +@@ -84,7 +86,11 @@ static int get_groups(const char *userna /* If the user is a member of more than * *n groups, then -1 is returned. Otherwise >= 0. * (and no defined way of detecting errors?!) */ @@ -31,7 +31,7 @@ Signed-off-by: Nicolas Thill /* I guess *n < 0 might indicate error. Anyway, * malloc'ing -1 bytes won't be good, so: */ //if (*n < 0) -@@ -154,6 +160,7 @@ int id_main(int argc UNUSED_PARAM, char +@@ -156,6 +162,7 @@ int id_main(int argc UNUSED_PARAM, char if (egid != rgid) status |= print_group(egid, " "); } @@ -39,7 +39,7 @@ Signed-off-by: Nicolas Thill /* We are supplying largish buffer, trying * to not run get_groups() twice. That might be slow * ("user database in remote SQL server" case) */ -@@ -181,6 +188,7 @@ int id_main(int argc UNUSED_PARAM, char +@@ -183,6 +190,7 @@ int id_main(int argc UNUSED_PARAM, char } if (ENABLE_FEATURE_CLEAN_UP) free(groups); diff --git a/package/busybox/patches/910-insmod-q-flag.patch b/package/busybox/patches/910-insmod-q-flag.patch index e77b0a7d37..596fe910de 100644 --- a/package/busybox/patches/910-insmod-q-flag.patch +++ b/package/busybox/patches/910-insmod-q-flag.patch @@ -1,6 +1,6 @@ --- a/modutils/insmod.c +++ b/modutils/insmod.c -@@ -129,7 +129,7 @@ int insmod_main(int argc, char **argv) M +@@ -133,7 +133,7 @@ int insmod_main(int argc, char **argv) M int insmod_main(int argc UNUSED_PARAM, char **argv) { char *filename; @@ -9,7 +9,7 @@ /* Compat note: * 2.6 style insmod has no options and required filename -@@ -139,10 +139,8 @@ int insmod_main(int argc UNUSED_PARAM, c +@@ -143,10 +143,8 @@ int insmod_main(int argc UNUSED_PARAM, c * or in $MODPATH. */ @@ -22,7 +22,7 @@ filename = *++argv; if (!filename) -@@ -153,7 +151,7 @@ int insmod_main(int argc UNUSED_PARAM, c +@@ -157,7 +155,7 @@ int insmod_main(int argc UNUSED_PARAM, c goto done; rc = bb_init_module(g_filename, parse_cmdline_module_options(argv)); -- cgit v1.2.3