diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2018-12-11 16:00:03 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2018-12-11 16:00:03 +0000 |
| commit | ad7465682e465adc4d142ffabb09d51b0e159f53 (patch) | |
| tree | e885467b70174a12a383dca1cc32966c357272f7 /main/iptables/iptables-1.8.2-musl-fixes.patch | |
| parent | 7a19ceeccda3561d6fd76836a8f6c618e9f9a3f4 (diff) | |
| download | aports-ad7465682e465adc4d142ffabb09d51b0e159f53.tar.bz2 aports-ad7465682e465adc4d142ffabb09d51b0e159f53.tar.xz | |
Revert "main/iptables: upgrade to 1.8.2"
This reverts commit 5721d5480eac1d1b0d0e14a3e3bff9b8e7a29982.
This version should be fixed because conflicts with ebtables
Diffstat (limited to 'main/iptables/iptables-1.8.2-musl-fixes.patch')
| -rw-r--r-- | main/iptables/iptables-1.8.2-musl-fixes.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/main/iptables/iptables-1.8.2-musl-fixes.patch b/main/iptables/iptables-1.8.2-musl-fixes.patch deleted file mode 100644 index 71d879b144..0000000000 --- a/main/iptables/iptables-1.8.2-musl-fixes.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/extensions/libip6t_ipv6header.c -+++ b/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, ---- 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, ---- a/include/linux/netfilter_ipv4/ip_tables.h -+++ b/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> - ---- a/extensions/libebt_vlan.c -+++ b/extensions/libebt_vlan.c -@@ -13,7 +13,11 @@ - #include <ctype.h> - #include <xtables.h> - #include <linux/netfilter_bridge/ebt_vlan.h> -+#if defined (__GLIBC__) - #include <linux/if_ether.h> -+#else -+#include <net/ethernet.h> -+#endif - #include "iptables/nft.h" - #include "iptables/nft-bridge.h" - |