Changeset 26738
- Timestamp:
- 2011-04-20T04:56:23+02:00 (7 years ago)
- Location:
- trunk/package/busybox/patches
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
r22660 r26738 1 1 --- a/init/init.c 2 2 +++ b/init/init.c 3 @@ - 460,8 +460,11 @@ static void run_actions(int action_type)3 @@ -572,8 +572,11 @@ static void run_actions(int action_type) 4 4 /* Only run stuff with pid == 0. If pid != 0, 5 5 * it is already running -
trunk/package/busybox/patches/003-brctl_show_fix.patch
r22660 r26738 21 21 --- a/networking/Config.src 22 22 +++ b/networking/Config.src 23 @@ - 79,12 +79,12 @@ config FEATURE_BRCTL_FANCY23 @@ -82,12 +82,12 @@ config FEATURE_BRCTL_FANCY 24 24 This adds about 600 bytes. 25 25 -
trunk/package/busybox/patches/110-wget_getopt_fix.patch
r22660 r26738 1 1 --- a/networking/wget.c 2 2 +++ b/networking/wget.c 3 @@ -545,7 +545,7 @@ int wget_main(int argc UNUSED_PARAM, cha 3 @@ -597,7 +597,7 @@ int wget_main(int argc UNUSED_PARAM, cha 4 /* Ignored: */ 4 5 // "tries\0" Required_argument "t" 5 // "timeout\0" Required_argument "T"6 6 /* Ignored (we always use PASV): */ 7 7 - "passive-ftp\0" No_argument "\xff" -
trunk/package/busybox/patches/200-etc_crontabs.patch
r17782 r26738 8 8 +#define CRONTABS "/etc/crontabs" 9 9 #ifndef SENDMAIL 10 # define SENDMAIL"sendmail"10 # define SENDMAIL "sendmail" 11 11 #endif 12 12 --- a/miscutils/crontab.c -
trunk/package/busybox/patches/240-udhcpc_retries.patch
r22660 r26738 1 1 --- a/networking/udhcp/dhcpc.c 2 2 +++ b/networking/udhcp/dhcpc.c 3 @@ -1 017,7 +1017,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c3 @@ -1196,7 +1196,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 4 4 5 5 switch (state) { … … 10 10 xid = random_xid(); 11 11 /* broadcast */ 12 @@ -1 046,7 +1046,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c12 @@ -1225,7 +1225,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 13 13 packet_num = 0; 14 14 continue; -
trunk/package/busybox/patches/241-udhcpc-oversized_packets.patch
r26455 r26738 1 diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c2 index 2b7528c..94e53dc 1006443 1 --- a/networking/udhcp/packet.c 4 2 +++ b/networking/udhcp/packet.c 5 @@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * addr, int count)3 @@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * 6 4 return ~sum; 7 5 } … … 15 13 int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, 16 14 uint32_t source_nip, int source_port, 17 @@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru ct dhcp_packet *dhcp_pkt,15 @@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru 18 16 { 19 17 struct sockaddr_ll dest_sll; … … 27 25 fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); 28 26 if (fd < 0) { 29 @@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru ct dhcp_packet *dhcp_pkt,27 @@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru 30 28 } 31 29 … … 38 36 dest_sll.sll_family = AF_PACKET; 39 37 dest_sll.sll_protocol = htons(ETH_P_IP); 40 @@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru ct dhcp_packet *dhcp_pkt,38 @@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru 41 39 goto ret_close; 42 40 } … … 81 79 msg = "sendto"; 82 80 ret_close: 83 @@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s truct dhcp_packet *dhcp_pkt,81 @@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s 84 82 uint32_t dest_nip, int dest_port) 85 83 { … … 89 87 int result = -1; 90 88 const char *msg; 91 @@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s truct dhcp_packet *dhcp_pkt,89 @@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s 92 90 } 93 91 -
trunk/package/busybox/patches/242-udhcpc_msgs.patch
r22659 r26738 1 1 --- a/networking/udhcp/dhcpc.c 2 2 +++ b/networking/udhcp/dhcpc.c 3 @@ -4 28,6 +428,7 @@ static int raw_bcast_from_client_config_4 static int send_discover(uint32_t xid, uint32_t requested)3 @@ -436,6 +436,7 @@ static int raw_bcast_from_client_config_ 4 static NOINLINE int send_discover(uint32_t xid, uint32_t requested) 5 5 { 6 6 struct dhcp_packet packet; 7 7 + static int msgs = 0; 8 8 9 init_packet(&packet, DHCPDISCOVER);10 packet.xid = xid;11 @@ -4 38,6 +439,7 @@ static int send_discover(uint32_t xid, u12 udhcp_add_simple_option(&packet, DHCP_MAX_SIZE, htons(576));9 /* Fill in: op, htype, hlen, cookie, chaddr fields, 10 * random xid field (we override it below), 11 @@ -453,6 +454,7 @@ static NOINLINE int send_discover(uint32 12 */ 13 13 add_client_options(&packet); 14 14 -
trunk/package/busybox/patches/243-udhcpc_changed_ifindex.patch
r22660 r26738 1 1 --- a/networking/udhcp/dhcpc.c 2 2 +++ b/networking/udhcp/dhcpc.c 3 @@ - 980,6 +980,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c3 @@ -1144,6 +1144,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 4 4 /* silence "uninitialized!" warning */ 5 5 unsigned timestamp_before_wait = timestamp_before_wait; -
trunk/package/busybox/patches/250-ash_export-n.patch
r22665 r26738 1 1 --- a/shell/ash.c 2 2 +++ b/shell/ash.c 3 @@ -12 429,8 +12429,17 @@ exportcmd(int argc UNUSED_PARAM, char **3 @@ -12532,8 +12532,17 @@ exportcmd(int argc UNUSED_PARAM, char ** 4 4 const char *p; 5 5 char **aptr; … … 20 20 name = *aptr; 21 21 if (name) { 22 @@ -12 442,10 +12451,12 @@ exportcmd(int argc UNUSED_PARAM, char **22 @@ -12545,10 +12554,12 @@ exportcmd(int argc UNUSED_PARAM, char ** 23 23 vp = *findvar(hashvar(name), name); 24 24 if (vp) { -
trunk/package/busybox/patches/300-netmsg.patch
r26455 r26738 1 diff --git a/include/applets.src.h b/include/applets.src.h2 index f4fab53..f97f2d8 1006443 1 --- a/include/applets.src.h 4 2 +++ b/include/applets.src.h 5 @@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D ROP))3 @@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D 6 4 IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP)) 7 5 IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP)) … … 11 9 IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP)) 12 10 IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 13 diff --git a/include/usage.src.h b/include/usage.src.h14 index 30fef24..ac78992 10064415 11 --- a/include/usage.src.h 16 12 +++ b/include/usage.src.h … … 30 26 "format_string" 31 27 #define nmeter_full_usage "\n\n" \ 32 diff --git a/networking/Config.src b/networking/Config.src33 index 6dd7df7..4682dd3 10064434 28 --- a/networking/Config.src 35 29 +++ b/networking/Config.src … … 47 41 bool "netstat" 48 42 default y 49 diff --git a/networking/Kbuild.src b/networking/Kbuild.src50 index f41a2df..6070a40 10064451 43 --- a/networking/Kbuild.src 52 44 +++ b/networking/Kbuild.src … … 59 51 lib-$(CONFIG_NSLOOKUP) += nslookup.o 60 52 lib-$(CONFIG_NTPD) += ntpd.o 61 diff --git a/networking/netmsg.c b/networking/netmsg.c62 new file mode 10064463 index 0000000..43aba0d64 53 --- /dev/null 65 54 +++ b/networking/netmsg.c -
trunk/package/busybox/patches/310-passwd_access.patch
r22953 r26738 4 4 --- a/networking/httpd.c 5 5 +++ b/networking/httpd.c 6 @@ -17 17,21 +1717,32 @@ static int check_user_passwd(const char6 @@ -1742,21 +1742,32 @@ static int check_user_passwd(const char 7 7 8 8 if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { -
trunk/package/busybox/patches/340-lock_util.patch
r22665 r26738 1 1 --- a/include/applets.src.h 2 2 +++ b/include/applets.src.h 3 @@ -2 29,6 +229,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN,3 @@ -213,6 +213,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, 4 4 IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) 5 5 IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) … … 11 11 --- a/include/usage.src.h 12 12 +++ b/include/usage.src.h 13 @@ -2 320,6 +2320,9 @@ INSERT13 @@ -2089,6 +2089,9 @@ INSERT 14 14 #define loadkmap_example_usage \ 15 15 "$ loadkmap < /etc/i18n/lang-keymap\n" … … 23 23 --- a/miscutils/Config.src 24 24 +++ b/miscutils/Config.src 25 @@ -4 65,6 +465,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA25 @@ -485,6 +485,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 26 26 help 27 27 Enables the 'hdparm -d' option to get/set using_dma flag. -
trunk/package/busybox/patches/350-httpd_redir.patch
r22665 r26738 1 1 --- a/include/usage.src.h 2 2 +++ b/include/usage.src.h 3 @@ -1 719,7 +1719,8 @@ INSERT3 @@ -1623,7 +1623,8 @@ INSERT 4 4 IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \ 5 5 IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ … … 11 11 "Listen for incoming HTTP requests\n" \ 12 12 "\nOptions:" \ 13 @@ -1 737,6 +1738,8 @@ INSERT13 @@ -1641,6 +1642,8 @@ INSERT 14 14 "\n -m STRING MD5 crypt STRING") \ 15 15 "\n -e STRING HTML encode STRING" \ … … 22 22 --- a/networking/httpd.c 23 23 +++ b/networking/httpd.c 24 @@ -2 50,6 +250,8 @@ struct globals {24 @@ -243,6 +243,8 @@ struct globals { 25 25 26 26 const char *found_mime_type; … … 31 31 32 32 IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) 33 @@ -29 6,6 +298,8 @@ struct globals {33 @@ -293,6 +295,8 @@ struct globals { 34 34 #define index_page (G.index_page ) 35 35 #define found_mime_type (G.found_mime_type ) … … 40 40 #define ip_a_d (G.ip_a_d ) 41 41 #define g_realm (G.g_realm ) 42 @@ -99 7,8 +1001,11 @@ static void send_headers(int responseNum42 @@ -999,8 +1003,11 @@ static void send_headers(int responseNum 43 43 } 44 44 #endif … … 53 53 (g_query ? g_query : "")); 54 54 } 55 @@ -19 42,8 +1949,12 @@ static void handle_incoming_and_exit(con55 @@ -1967,8 +1974,12 @@ static void handle_incoming_and_exit(con 56 56 } while (*++tptr); 57 57 *++urlp = '\0'; /* terminate after last character */ … … 67 67 found_moved_temporarily = urlcopy; 68 68 } 69 @@ -2 283,7 +2294,9 @@ static void sighup_handler(int sig UNUSE69 @@ -2325,7 +2336,9 @@ static void sighup_handler(int sig UNUSE 70 70 } 71 71 … … 78 78 h_opt_home_httpd, 79 79 IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) 80 @@ -23 32,12 +2345,13 @@ int httpd_main(int argc UNUSED_PARAM, ch80 @@ -2374,12 +2387,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 81 81 /* We do not "absolutize" path given by -h (home) opt. 82 82 * If user gives relative path in -h, -
trunk/package/busybox/patches/410-httpd_cgi_headers.patch
r22660 r26738 1 1 --- a/networking/httpd.c 2 2 +++ b/networking/httpd.c 3 @@ -12 55,10 +1255,10 @@ static NOINLINE void cgi_io_loop_and_exi3 @@ -1261,10 +1261,10 @@ static NOINLINE void cgi_io_loop_and_exi 4 4 if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1) 5 5 break; -
trunk/package/busybox/patches/440-httpd_chdir.patch
r22660 r26738 1 1 --- a/networking/httpd.c 2 2 +++ b/networking/httpd.c 3 @@ -18 28,6 +1828,7 @@ static void handle_incoming_and_exit(con3 @@ -1853,6 +1853,7 @@ static void handle_incoming_and_exit(con 4 4 char *header_ptr = header_ptr; 5 5 Htaccess_Proxy *proxy_entry; -
trunk/package/busybox/patches/470-insmod_search.patch
r22665 r26738 1 1 --- a/modutils/insmod.c 2 2 +++ b/modutils/insmod.c 3 @@ - 9,6 +9,99 @@3 @@ -11,6 +11,99 @@ 4 4 5 5 #include "libbb.h" … … 101 101 /* 2.6 style insmod has no options and required filename 102 102 * (not module name - .ko can't be omitted) */ 103 @@ -5 5,9 +148,15 @@ int insmod_main(int argc UNUSED_PARAM, c103 @@ -59,9 +152,15 @@ int insmod_main(int argc UNUSED_PARAM, c 104 104 if (!filename) 105 105 bb_show_usage(); … … 120 120 --- a/modutils/Config.src 121 121 +++ b/modutils/Config.src 122 @@ -22 8,7 +228,7 @@ config FEATURE_MODUTILS_SYMBOLS122 @@ -229,7 +229,7 @@ config FEATURE_MODUTILS_SYMBOLS 123 123 config DEFAULT_MODULES_DIR 124 124 string "Default directory containing modules" -
trunk/package/busybox/patches/510-awk_include.patch
r22665 r26738 6 6 /* 7 7 * awk implementation for busybox 8 @@ -7 0,9 +71,14 @@ typedef struct chain_s {8 @@ -74,9 +75,14 @@ typedef struct chain_s { 9 9 } chain; 10 10 … … 21 21 22 22 /* I/O stream */ 23 @@ -14 53,7 +1459,8 @@ static void parse_program(char *p)23 @@ -1466,7 +1472,8 @@ static void parse_program(char *p) 24 24 next_token(TC_FUNCTION); 25 25 g_pos++; … … 31 31 while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) { 32 32 v = findvar(ahash, t_string); 33 @@ -14 62,7 +1469,7 @@ static void parse_program(char *p)33 @@ -1475,7 +1482,7 @@ static void parse_program(char *p) 34 34 if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM) 35 35 break; … … 40 40 clear_array(ahash); 41 41 42 @@ -25 47,7 +2554,8 @@ static var *evaluate(node *op, var *res)42 @@ -2573,7 +2580,8 @@ static var *evaluate(node *op, var *res) 43 43 var *vbeg, *v; 44 44 const char *sv_progname; … … 50 50 51 51 vbeg = v = nvalloc(op->r.f->nargs + 1); 52 @@ -25 64,7 +2572,10 @@ static var *evaluate(node *op, var *res)52 @@ -2590,7 +2598,10 @@ static var *evaluate(node *op, var *res) 53 53 fnargs = vbeg; 54 54 sv_progname = g_progname; … … 62 62 g_progname = sv_progname; 63 63 nvfree(fnargs); 64 @@ -29 42,6 +2953,143 @@ static rstream *next_input_file(void)64 @@ -2984,6 +2995,143 @@ static rstream *next_input_file(void) 65 65 #undef files_happen 66 66 } … … 206 206 int awk_main(int argc, char **argv) 207 207 { 208 @@ -30 07,6 +3155,9 @@ int awk_main(int argc, char **argv)208 @@ -3049,6 +3197,9 @@ int awk_main(int argc, char **argv) 209 209 *s1 = '='; 210 210 } -
trunk/package/busybox/patches/524-udhcpc_renew.patch
r24245 r26738 1 1 --- a/networking/udhcp/dhcpc.c 2 2 +++ b/networking/udhcp/dhcpc.c 3 @@ - 793,7 +793,6 @@ static void perform_renew(void)3 @@ -874,7 +874,6 @@ static void perform_renew(void) 4 4 state = RENEW_REQUESTED; 5 5 break; -
trunk/package/busybox/patches/803-id_getgrouplist.patch
r22953 r26738 6 6 --- a/coreutils/id.c 7 7 +++ b/coreutils/id.c 8 @@ -1 7,10 +17,12 @@8 @@ -19,10 +19,12 @@ 9 9 10 #include "libbb.h"10 /* This is a NOEXEC applet. Be very careful! */ 11 11 12 12 +#define HAVE_GETGROUPLIST 1 … … 20 20 #endif 21 21 #endif 22 @@ -8 2,7 +84,11 @@ static int get_groups(const char *userna22 @@ -84,7 +86,11 @@ static int get_groups(const char *userna 23 23 /* If the user is a member of more than 24 24 * *n groups, then -1 is returned. Otherwise >= 0. … … 32 32 * malloc'ing -1 bytes won't be good, so: */ 33 33 //if (*n < 0) 34 @@ -15 4,6 +160,7 @@ int id_main(int argc UNUSED_PARAM, char34 @@ -156,6 +162,7 @@ int id_main(int argc UNUSED_PARAM, char 35 35 if (egid != rgid) 36 36 status |= print_group(egid, " "); … … 40 40 * to not run get_groups() twice. That might be slow 41 41 * ("user database in remote SQL server" case) */ 42 @@ -18 1,6 +188,7 @@ int id_main(int argc UNUSED_PARAM, char42 @@ -183,6 +190,7 @@ int id_main(int argc UNUSED_PARAM, char 43 43 } 44 44 if (ENABLE_FEATURE_CLEAN_UP) -
trunk/package/busybox/patches/910-insmod-q-flag.patch
r22660 r26738 1 1 --- a/modutils/insmod.c 2 2 +++ b/modutils/insmod.c 3 @@ -1 29,7 +129,7 @@ int insmod_main(int argc, char **argv) M3 @@ -133,7 +133,7 @@ int insmod_main(int argc, char **argv) M 4 4 int insmod_main(int argc UNUSED_PARAM, char **argv) 5 5 { … … 10 10 /* Compat note: 11 11 * 2.6 style insmod has no options and required filename 12 @@ -1 39,10 +139,8 @@ int insmod_main(int argc UNUSED_PARAM, c12 @@ -143,10 +143,8 @@ int insmod_main(int argc UNUSED_PARAM, c 13 13 * or in $MODPATH. 14 14 */ … … 23 23 filename = *++argv; 24 24 if (!filename) 25 @@ -15 3,7 +151,7 @@ int insmod_main(int argc UNUSED_PARAM, c25 @@ -157,7 +155,7 @@ int insmod_main(int argc UNUSED_PARAM, c 26 26 goto done; 27 27
Note: See TracChangeset
for help on using the changeset viewer.