Selaa lähdekoodia

fix busybox ip default gw issue, add all hotfixes

Waldemar Brodkorb 7 vuotta sitten
vanhempi
commit
baeceef2b2
2 muutettua tiedostoa jossa 48 lisäystä ja 1 poistoa
  1. 1 1
      package/busybox/Makefile
  2. 47 0
      package/busybox/patches/011-hotfixes.patch

+ 1 - 1
package/busybox/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.25.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		5a0fe06885ee1b805fb459ab6aaa023fe4f2eccee4fb8c0fd9a6c17c0daca2fc
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base/apps

+ 47 - 0
package/busybox/patches/011-hotfixes.patch

@@ -0,0 +1,47 @@
+diff -Nur busybox-1.25.0.orig/archival/gzip.c busybox-1.25.0/archival/gzip.c
+--- busybox-1.25.0.orig/archival/gzip.c	2016-06-20 01:43:06.000000000 +0200
++++ busybox-1.25.0/archival/gzip.c	2016-09-07 17:12:42.763524056 +0200
+@@ -2220,10 +2220,7 @@
+ 	opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */
+ 	if (opt == 0)
+ 		opt = 1 << 6; /* default: 6 */
+-	/* Map 1..3 to 4 */
+-	if (opt & 0x7)
+-		opt |= 1 << 4;
+-	opt = ffs(opt >> 3);
++	opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */
+ 	max_chain_length = 1 << gzip_level_config[opt].chain_shift;
+ 	good_match	 = gzip_level_config[opt].good;
+ 	max_lazy_match	 = gzip_level_config[opt].lazy2 * 2;
+diff -Nur busybox-1.25.0.orig/networking/libiproute/iproute.c busybox-1.25.0/networking/libiproute/iproute.c
+--- busybox-1.25.0.orig/networking/libiproute/iproute.c	2016-05-26 19:42:44.000000000 +0200
++++ busybox-1.25.0/networking/libiproute/iproute.c	2016-09-07 17:12:46.235747275 +0200
+@@ -362,10 +362,9 @@
+ 		req.r.rtm_scope = RT_SCOPE_NOWHERE;
+ 
+ 	if (cmd != RTM_DELROUTE) {
++		req.r.rtm_scope = RT_SCOPE_UNIVERSE;
+ 		if (RTPROT_BOOT != 0)
+ 			req.r.rtm_protocol = RTPROT_BOOT;
+-		if (RT_SCOPE_UNIVERSE != 0)
+-			req.r.rtm_scope = RT_SCOPE_UNIVERSE;
+ 		if (RTN_UNICAST != 0)
+ 			req.r.rtm_type = RTN_UNICAST;
+ 	}
+diff -Nur busybox-1.25.0.orig/networking/ntpd.c busybox-1.25.0/networking/ntpd.c
+--- busybox-1.25.0.orig/networking/ntpd.c	2016-06-06 02:26:04.000000000 +0200
++++ busybox-1.25.0/networking/ntpd.c	2016-09-07 17:12:38.979280766 +0200
+@@ -2051,6 +2051,13 @@
+ 		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;
+