diff options
| author | Michael Forney <mforney@mforney.org> | 2016-08-26 15:20:22 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-08-26 15:20:22 -0700 |
| commit | 2c0f21d42ea4adbcc2be085c80add00c48541e5f (patch) | |
| tree | 9e190be1e737739337959c1f8f832023036363b9 /core/iproute2/patch | |
| parent | 5256eb1a1aa87f1e1bb0de276ef18c5e17ff03bd (diff) | |
iproute2: Update to 4.7.0
Diffstat (limited to 'core/iproute2/patch')
| -rw-r--r-- | core/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch | 8 | ||||
| -rw-r--r-- | core/iproute2/patch/0002-ss-fix-build-with-musl-libc.patch | 27 |
2 files changed, 31 insertions, 4 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 52cc265e..c9a3ed84 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,4 +1,4 @@ -From e6033e1b9851c13f6aa24395150450b664500d4c Mon Sep 17 00:00:00 2001 +From 7e7a0b23d4d59ed69a0bb7106409c86cd534deeb 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 @@ -10,7 +10,7 @@ Subject: [PATCH] Remove redundant linux/in{,6}.h includes 3 files changed, 4 deletions(-) diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h -index ee197a3..f823aa4 100644 +index fc3dcfa..b78b35a 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -15,7 +15,6 @@ @@ -35,7 +35,7 @@ index b71b4c9..3e4e6ae 100644 /* Responses from hook functions. */ #define NF_DROP 0 diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h -index b8f5451..a9761a5 100644 +index d09be24..237e9ad 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -1,7 +1,6 @@ @@ -47,5 +47,5 @@ index b8f5451..a9761a5 100644 /* All of the structures in this file may not change size as they are -- -2.8.0 +2.9.2 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 new file mode 100644 index 00000000..abeebaf5 --- /dev/null +++ b/core/iproute2/patch/0002-ss-fix-build-with-musl-libc.patch @@ -0,0 +1,27 @@ +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 + |