diff options
| author | Michael Forney <mforney@mforney.org> | 2016-10-12 17:31:48 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-10-12 17:31:48 -0700 |
| commit | 4c47091251d4afa7fa46c65601b4e00b89850b74 (patch) | |
| tree | 5c0d6b998161bfc66a4602635876fa03092fe0ec /core/iproute2/patch | |
| parent | 58a5a1df86648234b4e201629826fbe741418e1f (diff) | |
iproute2: Update to 4.8.0
Diffstat (limited to 'core/iproute2/patch')
| -rw-r--r-- | core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch | 23 | ||||
| -rw-r--r-- | core/iproute2/patch/0002-ss-fix-build-with-musl-libc.patch | 27 |
2 files changed, 19 insertions, 31 deletions
diff --git a/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch b/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch index c9a3ed84..5c970a38 100644 --- a/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch +++ b/core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch @@ -1,16 +1,17 @@ -From 7e7a0b23d4d59ed69a0bb7106409c86cd534deeb Mon Sep 17 00:00:00 2001 +From 26ae3ca3f65a72f980c4e7821944c796be0494a7 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 25 Apr 2015 17:37:46 +0000 Subject: [PATCH] Remove redundant linux/in{,6}.h includes --- include/linux/if_bridge.h | 1 - + include/linux/if_tunnel.h | 2 -- include/linux/netfilter.h | 2 -- include/linux/xfrm.h | 1 - - 3 files changed, 4 deletions(-) + 4 files changed, 6 deletions(-) diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h -index fc3dcfa..b78b35a 100644 +index d9c76fe..016b4cc 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -15,7 +15,6 @@ @@ -21,6 +22,20 @@ index fc3dcfa..b78b35a 100644 #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" +diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h +index 24aa175..19d557d 100644 +--- a/include/linux/if_tunnel.h ++++ b/include/linux/if_tunnel.h +@@ -2,9 +2,7 @@ + #define _IF_TUNNEL_H_ + + #include <linux/types.h> +-#include <linux/if.h> + #include <linux/ip.h> +-#include <linux/in6.h> + #include <asm/byteorder.h> + + diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index b71b4c9..3e4e6ae 100644 --- a/include/linux/netfilter.h @@ -47,5 +62,5 @@ index d09be24..237e9ad 100644 /* All of the structures in this file may not change size as they are -- -2.9.2 +2.10.0 diff --git a/core/iproute2/patch/0002-ss-fix-build-with-musl-libc.patch b/core/iproute2/patch/0002-ss-fix-build-with-musl-libc.patch deleted file mode 100644 index abeebaf5..00000000 --- a/core/iproute2/patch/0002-ss-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 973bb7cb4e5f5a5e630850fe281757c0d2779dc8 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Sat, 20 Aug 2016 00:11:10 -0300 -Subject: [PATCH] ss: fix build with musl libc - -UINT_MAX usage requires limits.h, so include it. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> ---- - misc/ss.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/misc/ss.c b/misc/ss.c -index e758f57..3b268d9 100644 ---- a/misc/ss.c -+++ b/misc/ss.c -@@ -26,6 +26,7 @@ - #include <fnmatch.h> - #include <getopt.h> - #include <stdbool.h> -+#include <limits.h> - - #include "utils.h" - #include "rt_names.h" --- -2.9.2 - |