busybox: refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33661 3c298f89-4303-0410-b956-a3cf2f4a3e73

9 files changed, 25 insertions, 26 deletions

diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch
index a9f4f3d1e..0e26864e8 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
-@@ -1257,7 +1257,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+@@ -1319,7 +1319,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 */
-@@ -1286,7 +1286,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+@@ -1348,7 +1348,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
  				packet_num = 0;
  				continue;
  			case REQUESTING:
diff --git a/package/busybox/patches/242-udhcpc_msgs.patch b/package/busybox/patches/242-udhcpc_msgs.patch
index 998e3b664..c1c609669 100644
--- a/package/busybox/patches/242-udhcpc_msgs.patch
+++ b/package/busybox/patches/242-udhcpc_msgs.patch
@@ -1,6 +1,6 @@
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
-@@ -540,6 +540,7 @@ static int raw_bcast_from_client_config_
+@@ -602,6 +602,7 @@ static int raw_bcast_from_client_config_
  static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
  {
  	struct dhcp_packet packet;
@@ -8,7 +8,7 @@
  
  	/* Fill in: op, htype, hlen, cookie, chaddr fields,
  	 * random xid field (we override it below),
-@@ -557,6 +558,7 @@ static NOINLINE int send_discover(uint32
+@@ -619,6 +620,7 @@ static NOINLINE int send_discover(uint32
  	 */
  	add_client_options(&packet);
  
diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
index 4b28166bc..cb0df224c 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
-@@ -1205,6 +1205,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+@@ -1267,6 +1267,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/244-udhcpc_add_6rd_option.patch b/package/busybox/patches/244-udhcpc_add_6rd_option.patch
index 9e30ef79a..b423ec98c 100644
--- a/package/busybox/patches/244-udhcpc_add_6rd_option.patch
+++ b/package/busybox/patches/244-udhcpc_add_6rd_option.patch
@@ -9,7 +9,7 @@
  	{ OPTION_STRING                           , 0xfc }, /* DHCP_WPAD          */
  
  	/* Options below have no match in dhcp_option_strings[],
-@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1
+@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1 
  	"vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */
  #endif
  	"msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
@@ -18,7 +18,7 @@
  	"wpad" "\0"        /* DHCP_WPAD           */
  	;
  
-@@ -154,6 +158,7 @@ const uint8_t dhcp_option_lengths[] ALIG
+@@ -155,6 +159,7 @@ const uint8_t dhcp_option_lengths[] ALIG
  	[OPTION_S32] =     4,
  	/* Just like OPTION_STRING, we use minimum length here */
  	[OPTION_STATIC_ROUTES] = 5,
@@ -28,7 +28,7 @@
  
 --- a/networking/udhcp/common.h
 +++ b/networking/udhcp/common.h
-@@ -88,6 +88,7 @@ enum {
+@@ -91,6 +91,7 @@ enum {
  	OPTION_S32,
  	OPTION_BIN,
  	OPTION_STATIC_ROUTES,
@@ -44,9 +44,9 @@
  	[OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
 +	[OPTION_6RD             ] = sizeof("32 128 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF 255.255.255.255 "),
  	[OPTION_STRING          ] = 1,
+ 	[OPTION_STRING_HOST     ] = 1,
  #if ENABLE_FEATURE_UDHCP_RFC3397
- 	[OPTION_DNS_STRING      ] = 1, /* unused */
-@@ -123,6 +124,23 @@ static int sprint_nip(char *dest, const
+@@ -124,6 +125,23 @@ static int sprint_nip(char *dest, const 
  	return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
  }
  
@@ -70,11 +70,10 @@
  /* really simple implementation, just count the bits */
  static int mton(uint32_t mask)
  {
-@@ -231,6 +249,70 @@ static NOINLINE char *xmalloc_optname_op
- 			}
+@@ -293,6 +311,70 @@ static NOINLINE char *xmalloc_optname_op
  
  			return ret;
-+		}
+ 		}
 +		case OPTION_6RD: {
 +			/* Option binary format:
 +			 *  0                   1                   2                   3
@@ -138,6 +137,7 @@
 +			}
 +
 +			return ret;
- 		}
++		}
  #if ENABLE_FEATURE_UDHCP_RFC3397
  		case OPTION_DNS_STRING:
+ 			/* unpack option into dest; use ret for prefix (i.e., "optname=") */
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index daa1b9998..b995599de 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
-@@ -1700,21 +1700,32 @@ static int check_user_passwd(const char
+@@ -1700,21 +1700,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 eb346421a..fd657b698 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
-@@ -218,6 +218,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN,
+@@ -218,6 +218,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))
diff --git a/package/busybox/patches/524-udhcpc_renew.patch b/package/busybox/patches/524-udhcpc_renew.patch
index 01edda3a5..c22fa52ea 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
-@@ -983,7 +983,6 @@ static void perform_renew(void)
+@@ -1045,7 +1045,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 638305ee7..66c184959 100644
--- a/package/busybox/patches/803-id_getgrouplist.patch
+++ b/package/busybox/patches/803-id_getgrouplist.patch
@@ -31,7 +31,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
  		/* I guess *n < 0 might indicate error. Anyway,
  		 * malloc'ing -1 bytes won't be good, so: */
  		if (*n < 0)
-@@ -210,6 +216,7 @@ int id_main(int argc UNUSED_PARAM, char
+@@ -210,6 +216,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 <nico@openwrt.org>
  		/* We are supplying largish buffer, trying
  		 * to not run get_groups() twice. That might be slow
  		 * ("user database in remote SQL server" case) */
-@@ -236,6 +243,7 @@ int id_main(int argc UNUSED_PARAM, char
+@@ -236,6 +243,7 @@ int id_main(int argc UNUSED_PARAM, char 
  		}
  		if (ENABLE_FEATURE_CLEAN_UP)
  			free(groups);
diff --git a/package/busybox/patches/950-partial-checksum.patch b/package/busybox/patches/950-partial-checksum.patch
index e595162c6..6e8a69e9a 100644
--- a/package/busybox/patches/950-partial-checksum.patch
+++ b/package/busybox/patches/950-partial-checksum.patch
@@ -1,6 +1,5 @@
-diff -ur busybox-1.19.4.orig/networking/udhcp/dhcpc.c busybox-1.19.4/networking/udhcp/dhcpc.c
---- busybox-1.19.4.orig/networking/udhcp/dhcpc.c	2012-09-06 22:33:53.476998721 +0400
-+++ busybox-1.19.4/networking/udhcp/dhcpc.c	2012-09-07 01:09:46.693372304 +0400
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
 @@ -26,8 +26,8 @@
  #include "dhcpc.h"
  
@@ -11,7 +10,7 @@ diff -ur busybox-1.19.4.orig/networking/udhcp/dhcpc.c busybox-1.19.4/networking/
  
  /* struct client_config_t client_config is in bb_common_bufsiz1 */
  
-@@ -784,17 +784,41 @@
+@@ -846,17 +846,41 @@ static int send_release(uint32_t server,
  static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
  {
  	int bytes;
@@ -54,7 +53,7 @@ diff -ur busybox-1.19.4.orig/networking/udhcp/dhcpc.c busybox-1.19.4/networking/
  	if (bytes < (int) (sizeof(packet.ip) + sizeof(packet.udp))) {
  		log1("Packet is too short, ignoring");
  		return -2;
-@@ -834,7 +858,7 @@
+@@ -896,7 +920,7 @@ static NOINLINE int udhcp_recv_raw_packe
  	packet.ip.tot_len = packet.udp.len; /* yes, this is needed */
  	check = packet.udp.check;
  	packet.udp.check = 0;
@@ -63,7 +62,7 @@ diff -ur busybox-1.19.4.orig/networking/udhcp/dhcpc.c busybox-1.19.4/networking/
  		log1("Packet with bad UDP checksum received, ignoring");
  		return -2;
  	}
-@@ -880,6 +904,7 @@
+@@ -942,6 +966,7 @@ static int udhcp_raw_socket(int ifindex)
  {
  	int fd;
  	struct sockaddr_ll sock;
@@ -71,7 +70,7 @@ diff -ur busybox-1.19.4.orig/networking/udhcp/dhcpc.c busybox-1.19.4/networking/
  
  	/*
  	 * Comment:
-@@ -946,6 +971,13 @@
+@@ -1008,6 +1033,13 @@ static int udhcp_raw_socket(int ifindex)
  			log1("Attached filter to raw socket fd %d", fd); // log?
  	}