qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-07-05 03:28:34 +03:00
Code

busybox: refresh busybox patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14590 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2009-02-21 15:07:45 +00:00
parent 4ca144deb8
commit 2db05e4bbb
20 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/busybox/patches/000-autoconf.patch
View File

@ -1,6 +1,6 @@
--- a/applets/Kbuild --- a/applets/Kbuild
+++ b/applets/Kbuild +++ b/applets/Kbuild
@@ -18,13 +18,13 @@ @@ -18,13 +18,13 @@ HOSTCFLAGS_usage.o = -I$(srctree)/includ
applets/applets.o: include/usage_compressed.h include/applet_tables.h applets/applets.o: include/usage_compressed.h include/applet_tables.h

2
package/busybox/patches/001-init_avoid_loop_opening_tty.patch
View File

@ -1,6 +1,6 @@
--- a/init/init.c --- a/init/init.c
+++ b/init/init.c +++ b/init/init.c
@@ -505,12 +505,11 @@ @@ -505,12 +505,11 @@ static void run_actions(int action_type)
for (a = init_action_list; a; a = tmp) { for (a = init_action_list; a; a = tmp) {
tmp = a->next; tmp = a->next;
if (a->action_type & action_type) { if (a->action_type & action_type) {

2
package/busybox/patches/110-wget_getopt_fix.patch
View File

@ -1,6 +1,6 @@
--- a/networking/wget.c --- a/networking/wget.c
+++ b/networking/wget.c +++ b/networking/wget.c
@@ -437,7 +437,7 @@ @@ -437,7 +437,7 @@ int wget_main(int argc ATTRIBUTE_UNUSED,
"directory-prefix\0" Required_argument "P" "directory-prefix\0" Required_argument "P"
"proxy\0" Required_argument "Y" "proxy\0" Required_argument "Y"
"user-agent\0" Required_argument "U" "user-agent\0" Required_argument "U"

4
package/busybox/patches/240-udhcpc_retries.patch
View File

@ -1,6 +1,6 @@
--- a/networking/udhcp/dhcpc.c --- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
switch (state) { switch (state) {
case INIT_SELECTING: case INIT_SELECTING:
@ -9,7 +9,7 @@
if (packet_num == 0) if (packet_num == 0)
xid = random_xid(); xid = random_xid();
@@ -382,7 +382,7 @@ @@ -382,7 +382,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
continue; continue;
case RENEW_REQUESTED: case RENEW_REQUESTED:
case REQUESTING: case REQUESTING:

10
package/busybox/patches/241-udhcpc-oversized_packets.patch
View File

@ -1,6 +1,6 @@
--- a/networking/udhcp/packet.c --- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c
@@ -114,6 +114,10 @@ @@ -114,6 +114,10 @@ uint16_t udhcp_checksum(void *addr, int
return ~sum; return ~sum;
} }
@ -11,7 +11,7 @@
/* Construct a ip/udp header for a packet, send packet */ /* Construct a ip/udp header for a packet, send packet */
int udhcp_send_raw_packet(struct dhcpMessage *payload, int udhcp_send_raw_packet(struct dhcpMessage *payload,
@@ -125,11 +129,7 @@ @@ -125,11 +129,7 @@ int udhcp_send_raw_packet(struct dhcpMes
int fd; int fd;
int result = -1; int result = -1;
const char *msg; const char *msg;
@ -24,7 +24,7 @@
fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
if (fd < 0) { if (fd < 0) {
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@ int udhcp_send_raw_packet(struct dhcpMes
memset(&dest, 0, sizeof(dest)); memset(&dest, 0, sizeof(dest));
memset(&packet, 0, sizeof(packet)); memset(&packet, 0, sizeof(packet));
@ -33,7 +33,7 @@
dest.sll_family = AF_PACKET; dest.sll_family = AF_PACKET;
dest.sll_protocol = htons(ETH_P_IP); dest.sll_protocol = htons(ETH_P_IP);
@@ -156,23 +156,18 @@ @@ -156,23 +156,18 @@ int udhcp_send_raw_packet(struct dhcpMes
packet.ip.daddr = dest_ip; packet.ip.daddr = dest_ip;
packet.udp.source = htons(source_port); packet.udp.source = htons(source_port);
packet.udp.dest = htons(dest_port); packet.udp.dest = htons(dest_port);
@ -63,7 +63,7 @@
(struct sockaddr *) &dest, sizeof(dest)); (struct sockaddr *) &dest, sizeof(dest));
msg = "sendto"; msg = "sendto";
ret_close: ret_close:
@@ -224,8 +219,7 @@ @@ -224,8 +219,7 @@ int udhcp_send_kernel_packet(struct dhcp
goto ret_close; goto ret_close;
} }

4
package/busybox/patches/242-udhcpc_msgs.patch
View File

@ -1,6 +1,6 @@
--- a/networking/udhcp/clientpacket.c --- a/networking/udhcp/clientpacket.c
+++ b/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c
@@ -101,6 +101,7 @@ @@ -101,6 +101,7 @@ int send_decline(uint32_t xid, uint32_t
int send_discover(uint32_t xid, uint32_t requested) int send_discover(uint32_t xid, uint32_t requested)
{ {
struct dhcpMessage packet; struct dhcpMessage packet;
@ -8,7 +8,7 @@
init_packet(&packet, DHCPDISCOVER); init_packet(&packet, DHCPDISCOVER);
packet.xid = xid; packet.xid = xid;
@@ -113,6 +114,7 @@ @@ -113,6 +114,7 @@ int send_discover(uint32_t xid, uint32_t
add_param_req_option(&packet); add_param_req_option(&packet);

2
package/busybox/patches/243-udhcpc_changed_ifindex.patch
View File

@ -1,6 +1,6 @@
--- a/networking/udhcp/dhcpc.c --- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c
@@ -319,6 +319,12 @@ @@ -319,6 +319,12 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSE
for (;;) { for (;;) {
unsigned timestamp_before_wait; unsigned timestamp_before_wait;

4
package/busybox/patches/250-ash_export-n.patch
View File

@ -1,6 +1,6 @@
--- a/shell/ash.c --- a/shell/ash.c
+++ b/shell/ash.c +++ b/shell/ash.c
@@ -11909,8 +11909,17 @@ @@ -11909,8 +11909,17 @@ exportcmd(int argc ATTRIBUTE_UNUSED, cha
const char *p; const char *p;
char **aptr; char **aptr;
int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT; int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
@ -19,7 +19,7 @@
aptr = argptr; aptr = argptr;
name = *aptr; name = *aptr;
if (name) { if (name) {
@@ -11922,10 +11931,12 @@ @@ -11922,10 +11931,12 @@ exportcmd(int argc ATTRIBUTE_UNUSED, cha
vp = *findvar(hashvar(name), name); vp = *findvar(hashvar(name), name);
if (vp) { if (vp) {
vp->flags |= flag; vp->flags |= flag;

6
package/busybox/patches/300-netmsg.patch
View File

@ -1,6 +1,6 @@
--- a/include/applets.h --- a/include/applets.h
+++ b/include/applets.h +++ b/include/applets.h
@@ -257,6 +257,7 @@ @@ -257,6 +257,7 @@ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_
USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
@ -22,7 +22,7 @@
#define netstat_full_usage "\n\n" \ #define netstat_full_usage "\n\n" \
--- a/networking/Config.in --- a/networking/Config.in
+++ b/networking/Config.in +++ b/networking/Config.in
@@ -602,6 +602,12 @@ @@ -602,6 +602,12 @@ config NC
A simple Unix utility which reads and writes data across network A simple Unix utility which reads and writes data across network
connections. connections.
@ -37,7 +37,7 @@
default n default n
--- a/networking/Kbuild --- a/networking/Kbuild
+++ b/networking/Kbuild +++ b/networking/Kbuild
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@ lib-$(CONFIG_IP) += ip.o
lib-$(CONFIG_IPCALC) += ipcalc.o lib-$(CONFIG_IPCALC) += ipcalc.o
lib-$(CONFIG_NAMEIF) += nameif.o lib-$(CONFIG_NAMEIF) += nameif.o
lib-$(CONFIG_NC) += nc.o lib-$(CONFIG_NC) += nc.o

6
package/busybox/patches/340-lock_util.patch
View File

@ -1,6 +1,6 @@
--- a/include/applets.h --- a/include/applets.h
+++ b/include/applets.h +++ b/include/applets.h
@@ -220,6 +220,7 @@ @@ -220,6 +220,7 @@ USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN
USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
@ -22,7 +22,7 @@
#define logger_full_usage "\n\n" \ #define logger_full_usage "\n\n" \
--- a/miscutils/Config.in --- a/miscutils/Config.in
+++ b/miscutils/Config.in +++ b/miscutils/Config.in
@@ -364,6 +364,12 @@ @@ -364,6 +364,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
Enables the 'hdparm -d' option to get/set using_dma flag. Enables the 'hdparm -d' option to get/set using_dma flag.
This is dangerous stuff, so you should probably say N. This is dangerous stuff, so you should probably say N.
@ -37,7 +37,7 @@
default n default n
--- a/miscutils/Kbuild --- a/miscutils/Kbuild
+++ b/miscutils/Kbuild +++ b/miscutils/Kbuild
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@ lib-$(CONFIG_INOTIFYD) += inotifyd.o
lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o
lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o
lib-$(CONFIG_LESS) += less.o lib-$(CONFIG_LESS) += less.o

12
package/busybox/patches/350-httpd_redir.patch
View File

@ -21,7 +21,7 @@
USE_GETOPT_LONG( \ USE_GETOPT_LONG( \
--- a/networking/httpd.c --- a/networking/httpd.c
+++ b/networking/httpd.c +++ b/networking/httpd.c
@@ -247,6 +247,8 @@ @@ -247,6 +247,8 @@ struct globals {
const char *found_mime_type; const char *found_mime_type;
const char *found_moved_temporarily; const char *found_moved_temporarily;
@ -30,7 +30,7 @@
Htaccess_IP *ip_a_d; /* config allow/deny lines */ Htaccess_IP *ip_a_d; /* config allow/deny lines */
USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
@@ -292,6 +294,8 @@ @@ -292,6 +294,8 @@ struct globals {
#define index_page (G.index_page ) #define index_page (G.index_page )
#define found_mime_type (G.found_mime_type ) #define found_mime_type (G.found_mime_type )
#define found_moved_temporarily (G.found_moved_temporarily) #define found_moved_temporarily (G.found_moved_temporarily)
@ -39,7 +39,7 @@
#define last_mod (G.last_mod ) #define last_mod (G.last_mod )
#define ip_a_d (G.ip_a_d ) #define ip_a_d (G.ip_a_d )
#define g_realm (G.g_realm ) #define g_realm (G.g_realm )
@@ -991,8 +995,11 @@ @@ -991,8 +995,11 @@ static void send_headers(int responseNum
} }
#endif #endif
if (responseNum == HTTP_MOVED_TEMPORARILY) { if (responseNum == HTTP_MOVED_TEMPORARILY) {
@ -52,7 +52,7 @@
(g_query ? "?" : ""), (g_query ? "?" : ""),
(g_query ? g_query : "")); (g_query ? g_query : ""));
} }
@@ -1923,8 +1930,12 @@ @@ -1923,8 +1930,12 @@ static void handle_incoming_and_exit(con
} while (*++tptr); } while (*++tptr);
*++urlp = '\0'; /* terminate after last character */ *++urlp = '\0'; /* terminate after last character */
@ -66,7 +66,7 @@
if (is_directory(urlcopy + 1, 1, &sb)) { if (is_directory(urlcopy + 1, 1, &sb)) {
found_moved_temporarily = urlcopy; found_moved_temporarily = urlcopy;
} }
@@ -2274,7 +2285,9 @@ @@ -2274,7 +2285,9 @@ static void sighup_handler(int sig)
#endif #endif
enum { enum {
@ -77,7 +77,7 @@
d_opt_decode_url, d_opt_decode_url,
h_opt_home_httpd, h_opt_home_httpd,
USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
@@ -2323,12 +2336,13 @@ @@ -2323,12 +2336,13 @@ int httpd_main(int argc ATTRIBUTE_UNUSED
/* We do not "absolutize" path given by -h (home) opt. /* We do not "absolutize" path given by -h (home) opt.
* If user gives relative path in -h, * If user gives relative path in -h,
* $SCRIPT_FILENAME will not be set. */ * $SCRIPT_FILENAME will not be set. */

2
package/busybox/patches/410-httpd_cgi_headers.patch
View File

@ -1,6 +1,6 @@
--- a/networking/httpd.c --- a/networking/httpd.c
+++ b/networking/httpd.c +++ b/networking/httpd.c
@@ -1247,10 +1247,10 @@ @@ -1247,10 +1247,10 @@ static NOINLINE void cgi_io_loop_and_exi
if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1) if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1)
break; break;
} }

2
package/busybox/patches/430-uniq_memleak.patch
View File

@ -1,6 +1,6 @@
--- a/coreutils/uniq.c --- a/coreutils/uniq.c
+++ b/coreutils/uniq.c +++ b/coreutils/uniq.c
@@ -82,6 +82,8 @@ @@ -82,6 +82,8 @@ int uniq_main(int argc ATTRIBUTE_UNUSED,
if (!s0 || strncmp(e0, e1, max_chars)) { if (!s0 || strncmp(e0, e1, max_chars)) {
break; break;

2
package/busybox/patches/440-httpd_chdir.patch
View File

@ -1,6 +1,6 @@
--- a/networking/httpd.c --- a/networking/httpd.c
+++ b/networking/httpd.c +++ b/networking/httpd.c
@@ -1808,6 +1808,7 @@ @@ -1808,6 +1808,7 @@ static void handle_incoming_and_exit(con
char *header_ptr = header_ptr; char *header_ptr = header_ptr;
Htaccess_Proxy *proxy_entry; Htaccess_Proxy *proxy_entry;
#endif #endif

8
package/busybox/patches/450-httpd_accept_header.patch
View File

@ -1,6 +1,6 @@
--- a/networking/httpd.c --- a/networking/httpd.c
+++ b/networking/httpd.c +++ b/networking/httpd.c
@@ -255,6 +255,8 @@ @@ -255,6 +255,8 @@ struct globals {
USE_FEATURE_HTTPD_BASIC_AUTH(char *remoteuser;) USE_FEATURE_HTTPD_BASIC_AUTH(char *remoteuser;)
USE_FEATURE_HTTPD_CGI(char *referer;) USE_FEATURE_HTTPD_CGI(char *referer;)
USE_FEATURE_HTTPD_CGI(char *user_agent;) USE_FEATURE_HTTPD_CGI(char *user_agent;)
@ -9,7 +9,7 @@
off_t file_size; /* -1 - unknown */ off_t file_size; /* -1 - unknown */
#if ENABLE_FEATURE_HTTPD_RANGES #if ENABLE_FEATURE_HTTPD_RANGES
@@ -302,6 +304,8 @@ @@ -302,6 +304,8 @@ struct globals {
#define remoteuser (G.remoteuser ) #define remoteuser (G.remoteuser )
#define referer (G.referer ) #define referer (G.referer )
#define user_agent (G.user_agent ) #define user_agent (G.user_agent )
@ -18,7 +18,7 @@
#define file_size (G.file_size ) #define file_size (G.file_size )
#if ENABLE_FEATURE_HTTPD_RANGES #if ENABLE_FEATURE_HTTPD_RANGES
#define range_start (G.range_start ) #define range_start (G.range_start )
@@ -1383,6 +1387,10 @@ @@ -1383,6 +1387,10 @@ static void send_cgi_and_exit(
} }
} }
setenv1("HTTP_USER_AGENT", user_agent); setenv1("HTTP_USER_AGENT", user_agent);
@ -29,7 +29,7 @@
if (post_len) if (post_len)
putenv(xasprintf("CONTENT_LENGTH=%d", post_len)); putenv(xasprintf("CONTENT_LENGTH=%d", post_len));
if (cookie) if (cookie)
@@ -2020,6 +2028,10 @@ @@ -2020,6 +2028,10 @@ static void handle_incoming_and_exit(con
referer = xstrdup(skip_whitespace(iobuf + sizeof("Referer:")-1)); referer = xstrdup(skip_whitespace(iobuf + sizeof("Referer:")-1));
} else if (STRNCASECMP(iobuf, "User-Agent:") == 0) { } else if (STRNCASECMP(iobuf, "User-Agent:") == 0) {
user_agent = xstrdup(skip_whitespace(iobuf + sizeof("User-Agent:")-1)); user_agent = xstrdup(skip_whitespace(iobuf + sizeof("User-Agent:")-1));

8
package/busybox/patches/460-truncated_ping_results.patch
View File

@ -1,6 +1,6 @@
--- a/networking/ping.c --- a/networking/ping.c
+++ b/networking/ping.c +++ b/networking/ping.c
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@ static void ping4(len_and_sockaddr *lsa)
struct sockaddr_in pingaddr; struct sockaddr_in pingaddr;
struct icmp *pkt; struct icmp *pkt;
int pingsock, c; int pingsock, c;
@ -9,7 +9,7 @@
pingsock = create_icmp_socket(); pingsock = create_icmp_socket();
pingaddr = lsa->u.sin; pingaddr = lsa->u.sin;
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@ static void ping4(len_and_sockaddr *lsa)
pkt->icmp_type = ICMP_ECHO; pkt->icmp_type = ICMP_ECHO;
pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
@ -18,7 +18,7 @@
(struct sockaddr *) &pingaddr, sizeof(pingaddr)); (struct sockaddr *) &pingaddr, sizeof(pingaddr));
/* listen for replies */ /* listen for replies */
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@ static void ping6(len_and_sockaddr *lsa)
struct icmp6_hdr *pkt; struct icmp6_hdr *pkt;
int pingsock, c; int pingsock, c;
int sockopt; int sockopt;
@ -27,7 +27,7 @@
pingsock = create_icmp6_socket(); pingsock = create_icmp6_socket();
pingaddr = lsa->u.sin6; pingaddr = lsa->u.sin6;
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@ static void ping6(len_and_sockaddr *lsa)
sockopt = offsetof(struct icmp6_hdr, icmp6_cksum); sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt)); setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));

54
package/busybox/patches/470-insmod_search.patch
View File

@ -123,7 +123,7 @@
#if ENABLE_FEATURE_INSMOD_LOADINKMEM #if ENABLE_FEATURE_INSMOD_LOADINKMEM
#define LOADBITS 0 #define LOADBITS 0
#else #else
@@ -184,7 +280,6 @@ @@ -184,7 +280,6 @@ static int insmod_ng_main(int argc, char
/* Microblaze */ /* Microblaze */
#if defined(__microblaze__) #if defined(__microblaze__)
#define USE_SINGLE #define USE_SINGLE
@ -131,7 +131,7 @@
#define MATCH_MACHINE(x) (x == EM_XILINX_MICROBLAZE) #define MATCH_MACHINE(x) (x == EM_XILINX_MICROBLAZE)
#define SHT_RELM SHT_RELA #define SHT_RELM SHT_RELA
#define Elf32_RelM Elf32_Rela #define Elf32_RelM Elf32_Rela
@@ -452,7 +547,7 @@ @@ -452,7 +547,7 @@ enum {
/* The system calls unchanged between 2.0 and 2.1. */ /* The system calls unchanged between 2.0 and 2.1. */
unsigned long create_module(const char *, size_t); unsigned long create_module(const char *, size_t);
@ -140,7 +140,7 @@
#endif /* module.h */ #endif /* module.h */
@@ -652,7 +747,7 @@ @@ -652,7 +747,7 @@ static struct obj_symbol *arch_new_symbo
static enum obj_reloc arch_apply_relocation(struct obj_file *f, static enum obj_reloc arch_apply_relocation(struct obj_file *f,
struct obj_section *targsec, struct obj_section *targsec,
@ -149,7 +149,7 @@
struct obj_symbol *sym, struct obj_symbol *sym,
ElfW(RelM) *rel, ElfW(Addr) value); ElfW(RelM) *rel, ElfW(Addr) value);
@@ -673,6 +768,7 @@ @@ -673,6 +768,7 @@ static int obj_gpl_license(struct obj_fi
#define SPFX "" #define SPFX ""
#endif #endif
@ -157,7 +157,7 @@
enum { STRVERSIONLEN = 64 }; enum { STRVERSIONLEN = 64 };
/*======================================================================*/ /*======================================================================*/
@@ -788,28 +884,6 @@ @@ -788,28 +884,6 @@ static char *m_filename;
static char *m_fullName; static char *m_fullName;
@ -186,7 +186,7 @@
/*======================================================================*/ /*======================================================================*/
@@ -835,32 +909,20 @@ @@ -835,32 +909,20 @@ static struct obj_symbol *arch_new_symbo
static enum obj_reloc static enum obj_reloc
arch_apply_relocation(struct obj_file *f, arch_apply_relocation(struct obj_file *f,
struct obj_section *targsec, struct obj_section *targsec,
@ -220,7 +220,7 @@
#if defined(USE_PLT_ENTRIES) #if defined(USE_PLT_ENTRIES)
ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0; ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0;
unsigned long *ip; unsigned long *ip;
@@ -954,7 +1016,6 @@ @@ -954,7 +1016,6 @@ arch_apply_relocation(struct obj_file *f
case R_386_PLT32: case R_386_PLT32:
case R_386_PC32: case R_386_PC32:
@ -228,7 +228,7 @@
*loc += v - dot; *loc += v - dot;
break; break;
@@ -973,6 +1034,9 @@ @@ -973,6 +1034,9 @@ arch_apply_relocation(struct obj_file *f
case R_386_GOT32: case R_386_GOT32:
goto bb_use_got; goto bb_use_got;
@ -238,7 +238,7 @@
break; break;
#elif defined(__microblaze__) #elif defined(__microblaze__)
@@ -1759,7 +1823,7 @@ @@ -1759,7 +1823,7 @@ static int arch_list_add(ElfW(RelM) *rel
#if defined(USE_SINGLE) #if defined(USE_SINGLE)
@ -247,7 +247,7 @@
int offset, int size) int offset, int size)
{ {
if (single->allocated == 0) { if (single->allocated == 0) {
@@ -1907,7 +1971,7 @@ @@ -1907,7 +1971,7 @@ static void arch_create_got(struct obj_f
#if defined(USE_GOT_ENTRIES) #if defined(USE_GOT_ENTRIES)
if (got_allocate) { if (got_allocate) {
got_offset += arch_single_init( got_offset += arch_single_init(
@ -256,7 +256,7 @@
got_offset, GOT_ENTRY_SIZE); got_offset, GOT_ENTRY_SIZE);
got_needed = 1; got_needed = 1;
@@ -1921,7 +1985,7 @@ @@ -1921,7 +1985,7 @@ static void arch_create_got(struct obj_f
plt_offset, PLT_ENTRY_SIZE); plt_offset, PLT_ENTRY_SIZE);
#else #else
plt_offset += arch_single_init( plt_offset += arch_single_init(
@ -265,7 +265,7 @@
plt_offset, PLT_ENTRY_SIZE); plt_offset, PLT_ENTRY_SIZE);
#endif #endif
plt_needed = 1; plt_needed = 1;
@@ -1959,8 +2023,7 @@ @@ -1959,8 +2023,7 @@ static unsigned long obj_elf_hash_n(cons
while (n > 0) { while (n > 0) {
ch = *name++; ch = *name++;
h = (h << 4) + ch; h = (h << 4) + ch;
@ -275,7 +275,7 @@
h ^= g >> 24; h ^= g >> 24;
h &= ~g; h &= ~g;
} }
@@ -2039,7 +2102,7 @@ @@ -2039,7 +2102,7 @@ obj_add_symbol(struct obj_file *f, const
int n_type = ELF_ST_TYPE(info); int n_type = ELF_ST_TYPE(info);
int n_binding = ELF_ST_BIND(info); int n_binding = ELF_ST_BIND(info);
@ -284,7 +284,7 @@
if (f->symbol_cmp(sym->name, name) == 0) { if (f->symbol_cmp(sym->name, name) == 0) {
int o_secidx = sym->secidx; int o_secidx = sym->secidx;
int o_info = sym->info; int o_info = sym->info;
@@ -2098,14 +2161,14 @@ @@ -2098,14 +2161,14 @@ obj_add_symbol(struct obj_file *f, const
return sym; return sym;
} }
} }
@ -301,7 +301,7 @@
if (symidx >= f->local_symtab_size) if (symidx >= f->local_symtab_size)
bb_error_msg("local symbol %s with index %ld exceeds local_symtab_size %ld", bb_error_msg("local symbol %s with index %ld exceeds local_symtab_size %ld",
name, (long) symidx, (long) f->local_symtab_size); name, (long) symidx, (long) f->local_symtab_size);
@@ -3228,7 +3291,7 @@ @@ -3228,7 +3291,7 @@ static int obj_relocate(struct obj_file
/* Do it! */ /* Do it! */
switch (arch_apply_relocation switch (arch_apply_relocation
@ -310,7 +310,7 @@
) { ) {
case obj_reloc_ok: case obj_reloc_ok:
break; break;
@@ -3307,11 +3370,11 @@ @@ -3307,11 +3370,11 @@ static int obj_create_image(struct obj_f
/*======================================================================*/ /*======================================================================*/
@ -324,7 +324,7 @@
char *shstrtab; char *shstrtab;
/* Read the file header. */ /* Read the file header. */
@@ -3583,7 +3646,7 @@ @@ -3583,7 +3646,7 @@ static int obj_gpl_license(struct obj_fi
while (ptr < endptr) { while (ptr < endptr) {
value = strchr(ptr, '='); value = strchr(ptr, '=');
if (value && strncmp(ptr, "license", value-ptr) == 0) { if (value && strncmp(ptr, "license", value-ptr) == 0) {
@ -333,7 +333,7 @@
if (license) if (license)
*license = value+1; *license = value+1;
for (i = 0; i < ARRAY_SIZE(gpl_licenses); ++i) { for (i = 0; i < ARRAY_SIZE(gpl_licenses); ++i) {
@@ -3687,9 +3750,6 @@ @@ -3687,9 +3750,6 @@ static void check_tainted_module(struct
* start of some sections. this info is used by ksymoops to do better * start of some sections. this info is used by ksymoops to do better
* debugging. * debugging.
*/ */
@ -343,7 +343,7 @@
static int static int
get_module_version(struct obj_file *f, char str[STRVERSIONLEN]) get_module_version(struct obj_file *f, char str[STRVERSIONLEN])
{ {
@@ -3722,8 +3782,7 @@ @@ -3722,8 +3782,7 @@ add_ksymoops_symbols(struct obj_file *f,
struct obj_symbol *sym; struct obj_symbol *sym;
char *name, *absolute_filename; char *name, *absolute_filename;
char str[STRVERSIONLEN]; char str[STRVERSIONLEN];
@ -353,7 +353,7 @@
struct stat statbuf; struct stat statbuf;
/* WARNING: was using realpath, but replaced by readlink to stop using /* WARNING: was using realpath, but replaced by readlink to stop using
@@ -3910,145 +3969,57 @@ @@ -3910,145 +3969,57 @@ static void print_load_map(struct obj_fi
void print_load_map(struct obj_file *f); void print_load_map(struct obj_file *f);
#endif #endif
@ -521,7 +521,7 @@
f = obj_load(fp, LOADBITS); f = obj_load(fp, LOADBITS);
@@ -4075,7 +4046,7 @@ @@ -4075,7 +4046,7 @@ int insmod_main(int argc, char **argv)
"\t%s was compiled for kernel version %s\n" "\t%s was compiled for kernel version %s\n"
"\twhile this kernel is version %s", "\twhile this kernel is version %s",
flag_force_load ? "warning: " : "", flag_force_load ? "warning: " : "",
@ -530,7 +530,7 @@
if (!flag_force_load) if (!flag_force_load)
goto out; goto out;
} }
@@ -4117,7 +4088,7 @@ @@ -4117,7 +4088,7 @@ int insmod_main(int argc, char **argv)
hide_special_symbols(f); hide_special_symbols(f);
#if ENABLE_FEATURE_INSMOD_KSYMOOPS_SYMBOLS #if ENABLE_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
@ -539,7 +539,7 @@
#endif /* FEATURE_INSMOD_KSYMOOPS_SYMBOLS */ #endif /* FEATURE_INSMOD_KSYMOOPS_SYMBOLS */
new_create_module_ksymtab(f); new_create_module_ksymtab(f);
@@ -4126,7 +4097,7 @@ @@ -4126,7 +4097,7 @@ int insmod_main(int argc, char **argv)
m_size = obj_load_size(f); m_size = obj_load_size(f);
m_addr = create_module(m_name, m_size); m_addr = create_module(m_name, m_size);
@ -548,7 +548,7 @@
case EEXIST: case EEXIST:
bb_error_msg_and_die("a module named %s already exists", m_name); bb_error_msg_and_die("a module named %s already exists", m_name);
case ENOMEM: case ENOMEM:
@@ -4142,36 +4113,37 @@ @@ -4142,36 +4113,37 @@ int insmod_main(int argc, char **argv)
* now we can load them directly into the kernel memory * now we can load them directly into the kernel memory
*/ */
if (!obj_load_progbits(fp, f, (char*)m_addr)) { if (!obj_load_progbits(fp, f, (char*)m_addr)) {
@ -594,7 +594,7 @@
} }
#endif /* ENABLE_FEATURE_2_4_MODULES */ #endif /* ENABLE_FEATURE_2_4_MODULES */
@@ -4183,15 +4155,8 @@ @@ -4183,15 +4155,8 @@ int insmod_main(int argc, char **argv)
#if ENABLE_FEATURE_2_6_MODULES #if ENABLE_FEATURE_2_6_MODULES
#include <sys/mman.h> #include <sys/mman.h>
@ -610,7 +610,7 @@
/* We use error numbers in a loose translation... */ /* We use error numbers in a loose translation... */
static const char *moderror(int err) static const char *moderror(int err)
@@ -4210,22 +4175,32 @@ @@ -4210,22 +4175,32 @@ static const char *moderror(int err)
} }
} }
@ -651,7 +651,7 @@
/* Rest is options */ /* Rest is options */
options = xzalloc(1); options = xzalloc(1);
optlen = 0; optlen = 0;
@@ -4235,41 +4210,47 @@ @@ -4235,41 +4210,47 @@ static int insmod_ng_main(int argc ATTRI
optlen += sprintf(options + optlen, (strchr(*argv,' ') ? "\"%s\" " : "%s "), *argv); optlen += sprintf(options + optlen, (strchr(*argv,' ') ? "\"%s\" " : "%s "), *argv);
} }

6
package/busybox/patches/480-vi_search.patch
View File

@ -1,6 +1,6 @@
--- a/editors/vi.c --- a/editors/vi.c
+++ b/editors/vi.c +++ b/editors/vi.c
@@ -3313,7 +3313,7 @@ @@ -3313,7 +3313,7 @@ static void do_cmd(char c)
buf[1] = '\0'; buf[1] = '\0';
q = get_input_line(buf); // get input line- use "status line" q = get_input_line(buf); // get input line- use "status line"
if (q[0] && !q[1]) { if (q[0] && !q[1]) {
@ -9,7 +9,7 @@
last_search_pattern[0] = c; last_search_pattern[0] = c;
goto dc3; // if no pat re-use old pat goto dc3; // if no pat re-use old pat
} }
@@ -3329,6 +3329,10 @@ @@ -3329,6 +3329,10 @@ static void do_cmd(char c)
if (cmdcnt-- > 1) { if (cmdcnt-- > 1) {
do_cmd(c); do_cmd(c);
} // repeat cnt } // repeat cnt
@ -20,7 +20,7 @@
dir = BACK; // assume BACKWARD search dir = BACK; // assume BACKWARD search
p = dot - 1; p = dot - 1;
if (last_search_pattern[0] == '?') { if (last_search_pattern[0] == '?') {
@@ -3348,10 +3352,8 @@ @@ -3348,10 +3352,8 @@ static void do_cmd(char c)
msg = "No previous regular expression"; msg = "No previous regular expression";
goto dc2; goto dc2;
} }

2
package/busybox/patches/524-udhcpc_renew.patch
View File

@ -1,6 +1,6 @@
--- a/networking/udhcp/dhcpc.c --- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c
@@ -63,7 +63,6 @@ @@ -63,7 +63,6 @@ static void perform_renew(void)
state = RENEW_REQUESTED; state = RENEW_REQUESTED;
break; break;
case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ case RENEW_REQUESTED: /* impatient are we? fine, square 1 */

2
package/busybox/patches/530-unsigned_bitwise_ops.patch
View File

@ -1,6 +1,6 @@
--- a/editors/awk.c --- a/editors/awk.c
+++ b/editors/awk.c +++ b/editors/awk.c
@@ -2035,27 +2035,27 @@ @@ -2041,27 +2041,27 @@ static var *exec_builtin(node *op, var *
break; break;
case B_an: case B_an: