diff options
author | Christian Kampka <christian@kampka.net> | 2016-03-23 22:05:19 +0100 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2016-03-26 10:16:30 +0000 |
commit | 00efbea7aa2a383c4f3a7322a6a669bdea5c04bb (patch) | |
tree | 868ee6f012e9a9ec63761aeaaf740a2bbc98ee20 /main/iptables/iptables-1.4.14-musl-fixes.patch | |
parent | 3388cf5f81e2d4cc1ef065d621b52b6ee06b29c5 (diff) | |
download | aports-00efbea7aa2a383c4f3a7322a6a669bdea5c04bb.tar.bz2 aports-00efbea7aa2a383c4f3a7322a6a669bdea5c04bb.tar.xz |
main/iptables: new upstream verison 1.6.0
Diffstat (limited to 'main/iptables/iptables-1.4.14-musl-fixes.patch')
-rw-r--r-- | main/iptables/iptables-1.4.14-musl-fixes.patch | 127 |
1 files changed, 0 insertions, 127 deletions
diff --git a/main/iptables/iptables-1.4.14-musl-fixes.patch b/main/iptables/iptables-1.4.14-musl-fixes.patch deleted file mode 100644 index 547d0df42e..0000000000 --- a/main/iptables/iptables-1.4.14-musl-fixes.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- iptables-1.4.12.1.o/extensions/libip6t_ipv6header.c -+++ iptables-1.4.12.1/extensions/libip6t_ipv6header.c -@@ -10,6 +10,9 @@ - #include <netdb.h> - #include <xtables.h> - #include <linux/netfilter_ipv6/ip6t_ipv6header.h> -+#ifndef IPPROTO_HOPOPTS -+# define IPPROTO_HOPOPTS 0 -+#endif - - enum { - O_HEADER = 0, ---- iptables-1.4.12.1.o/extensions/libxt_TCPOPTSTRIP.c -+++ iptables-1.4.12.1/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, ---- iptables-1.4.12.1.o/include/libiptc/ipt_kernel_headers.h -+++ iptables-1.4.12.1/include/libiptc/ipt_kernel_headers.h -@@ -5,7 +5,6 @@ - - #include <limits.h> - --#if defined(__GLIBC__) && __GLIBC__ == 2 - #include <netinet/ip.h> - #include <netinet/in.h> - #include <netinet/ip_icmp.h> -@@ -13,15 +12,4 @@ - #include <netinet/udp.h> - #include <net/if.h> - #include <sys/types.h> --#else /* libc5 */ --#include <sys/socket.h> --#include <linux/ip.h> --#include <linux/in.h> --#include <linux/if.h> --#include <linux/icmp.h> --#include <linux/tcp.h> --#include <linux/udp.h> --#include <linux/types.h> --#include <linux/in6.h> --#endif - #endif ---- iptables-1.4.12.1.o/include/linux/netfilter_ipv4/ip_tables.h -+++ iptables-1.4.12.1/include/linux/netfilter_ipv4/ip_tables.h -@@ -16,6 +16,7 @@ - #define _IPTABLES_H - - #include <linux/types.h> -+#include <sys/types.h> - - #include <linux/netfilter_ipv4.h> - ---- iptables-1.4.12.1.o/iptables/ip6tables-restore.c -+++ iptables-1.4.12.1/iptables/ip6tables-restore.c -@@ -9,7 +9,7 @@ - */ - - #include <getopt.h> --#include <sys/errno.h> -+#include <errno.h> - #include <stdbool.h> - #include <string.h> - #include <stdio.h> ---- iptables-1.4.12.1.o/iptables/ip6tables-save.c -+++ iptables-1.4.12.1/iptables/ip6tables-save.c -@@ -6,7 +6,7 @@ - * This code is distributed under the terms of GNU GPL v2 - */ - #include <getopt.h> --#include <sys/errno.h> -+#include <errno.h> - #include <stdio.h> - #include <fcntl.h> - #include <stdlib.h> ---- iptables-1.4.12.1.o/iptables/iptables-restore.c -+++ iptables-1.4.12.1/iptables/iptables-restore.c -@@ -6,7 +6,7 @@ - */ - - #include <getopt.h> --#include <sys/errno.h> -+#include <errno.h> - #include <stdbool.h> - #include <string.h> - #include <stdio.h> ---- iptables-1.4.12.1.o/iptables/iptables-save.c -+++ iptables-1.4.12.1/iptables/iptables-save.c -@@ -6,7 +6,7 @@ - * - */ - #include <getopt.h> --#include <sys/errno.h> -+#include <errno.h> - #include <stdio.h> - #include <fcntl.h> - #include <stdlib.h> ---- iptables-1.4.12.1.o/iptables/iptables-xml.c -+++ iptables-1.4.12.1/iptables/iptables-xml.c -@@ -7,7 +7,7 @@ - */ - - #include <getopt.h> --#include <sys/errno.h> -+#include <errno.h> - #include <string.h> - #include <stdio.h> - #include <stdlib.h> |