diff options
| author | Adam Duskett <Aduskett@gmail.com> | 2017-01-28 17:58:59 -0500 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-01-29 14:44:23 +0100 |
| commit | 08a15442bf053705e4147eed74e1e4e8e80b5ea9 (patch) | |
| tree | b33181ac2f309272b37df4d047b127d0e2febce3 /package/iptables/0001-fix-build-with-musl.patch | |
| parent | 3ca1370c321fafd784b11c114e59473deec6221b (diff) | |
| download | buildroot-08a15442bf053705e4147eed74e1e4e8e80b5ea9.tar.gz buildroot-08a15442bf053705e4147eed74e1e4e8e80b5ea9.zip | |
iptables: bump to version 1.6.1
Also removed the 3 patches as they have been added into the latest
version.
Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
[Thomas: drop autoreconf, no longer needed.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/iptables/0001-fix-build-with-musl.patch')
| -rw-r--r-- | package/iptables/0001-fix-build-with-musl.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/package/iptables/0001-fix-build-with-musl.patch b/package/iptables/0001-fix-build-with-musl.patch deleted file mode 100644 index d5e0c2ed6c..0000000000 --- a/package/iptables/0001-fix-build-with-musl.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2f2fde48594ec34e93ab409cd83442efe58e10ad Mon Sep 17 00:00:00 2001 -From: Brendan Heading <brendanheading@gmail.com> -Date: Mon, 31 Aug 2015 15:24:44 +0100 -Subject: [PATCH 3/3] fix build with musl - -Add needed headers they are just not needed for glibc6+ but also -for musl -Define additional TCOPTS if not there - -u_initX types are in sys/types.h be explicit about it - -Upstream-Status: Pending - -bh: this is a copy of the patch at the link below, modified to remove -the changes to include/libiptc/ipt_kernel_headers.h as these are -already integrated in the upstream tree. See : - -http://lists.openembedded.org/pipermail/openembedded-core/2015-April/103613.html - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Brendan Heading <brendanheading@gmail.com> ---- - extensions/libxt_TCPOPTSTRIP.c | 15 +++++++++++++++ - include/linux/netfilter_ipv4/ip_tables.h | 1 + - 2 files changed, 16 insertions(+) - -diff --git a/extensions/libxt_TCPOPTSTRIP.c b/extensions/libxt_TCPOPTSTRIP.c -index 6897857..8a170b2 100644 ---- a/extensions/libxt_TCPOPTSTRIP.c -+++ b/extensions/libxt_TCPOPTSTRIP.c -@@ -12,6 +12,21 @@ - #ifndef TCPOPT_MD5SIG - # define TCPOPT_MD5SIG 19 - #endif -+#ifndef TCPOPT_MAXSEG -+# define TCPOPT_MAXSEG 2 -+#endif -+#ifndef TCPOPT_WINDOW -+# define TCPOPT_WINDOW 3 -+#endif -+#ifndef TCPOPT_SACK_PERMITTED -+# define TCPOPT_SACK_PERMITTED 4 -+#endif -+#ifndef TCPOPT_SACK -+# define TCPOPT_SACK 5 -+#endif -+#ifndef TCPOPT_TIMESTAMP -+# define TCPOPT_TIMESTAMP 8 -+#endif - - enum { - O_STRIP_OPTION = 0, -diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h -index 57fd82a..4807246 100644 ---- a/include/linux/netfilter_ipv4/ip_tables.h -+++ b/include/linux/netfilter_ipv4/ip_tables.h -@@ -15,6 +15,7 @@ - #ifndef _IPTABLES_H - #define _IPTABLES_H - -+#include <sys/types.h> - #include <linux/types.h> - - #include <linux/netfilter_ipv4.h> --- -2.4.3 - |
