summaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/patches/000-busybox-1.25.0-ip.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>2016-09-21 20:02:01 +0100
committerJohn Crispin <john@phrozen.org>2016-09-27 17:50:22 +0200
commit78ae7d8efda344075c7991c731afdbd47ae1cee9 (patch)
tree43539cb8d9b71a14ed0a82137bbd34ae2a8a001d /package/utils/busybox/patches/000-busybox-1.25.0-ip.patch
parentedbc8fec8a9747a746fc321e97d9b96f7e95fa7e (diff)
downloadmaster-31e0f0ae-78ae7d8efda344075c7991c731afdbd47ae1cee9.tar.gz
master-31e0f0ae-78ae7d8efda344075c7991c731afdbd47ae1cee9.tar.bz2
master-31e0f0ae-78ae7d8efda344075c7991c731afdbd47ae1cee9.zip
busybox: v1.25.0 upstream patches
Include upstream patches for gzip, ip & ntpd. Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/utils/busybox/patches/000-busybox-1.25.0-ip.patch')
-rw-r--r--package/utils/busybox/patches/000-busybox-1.25.0-ip.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/package/utils/busybox/patches/000-busybox-1.25.0-ip.patch b/package/utils/busybox/patches/000-busybox-1.25.0-ip.patch
new file mode 100644
index 0000000000..50cd77509e
--- /dev/null
+++ b/package/utils/busybox/patches/000-busybox-1.25.0-ip.patch
@@ -0,0 +1,17 @@
+ip: fix an improper optimization: req.r.rtm_scope may be nonzero here
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+
+--- a/networking/libiproute/iproute.c
++++ b/networking/libiproute/iproute.c
+@@ -362,10 +362,9 @@ IF_FEATURE_IP_RULE(ARG_table,)
+ 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;
+ }