From 25fa936ba991e1c8291e448515ae95dae3b25032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Sat, 26 Mar 2016 14:23:17 +0000 Subject: Revert "main/iptables: new upstream verison 1.6.0" This reverts commit 00efbea7aa2a383c4f3a7322a6a669bdea5c04bb. --- main/iptables/APKBUILD | 21 ++-- main/iptables/iptables-1.4.14-musl-fixes.patch | 127 +++++++++++++++++++++++++ main/iptables/iptables-1.6.0-musl-fixes.patch | 45 --------- 3 files changed, 138 insertions(+), 55 deletions(-) create mode 100644 main/iptables/iptables-1.4.14-musl-fixes.patch delete mode 100644 main/iptables/iptables-1.6.0-musl-fixes.patch diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD index 7a9a9a0fb6..611f3befdf 100644 --- a/main/iptables/APKBUILD +++ b/main/iptables/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa pkgname=iptables -pkgver=1.6.0 -pkgrel=0 +pkgver=1.4.21 +pkgrel=4 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="http://www.netfilter.org/projects/iptables/index.html" arch="all" license="GPL2+" source="http://ftp.netfilter.org/pub/iptables/iptables-$pkgver.tar.bz2 - iptables-1.6.0-musl-fixes.patch + iptables-1.4.14-musl-fixes.patch iptables.initd iptables.confd @@ -16,12 +16,13 @@ source="http://ftp.netfilter.org/pub/iptables/iptables-$pkgver.tar.bz2 " depends_dev="linux-headers" -makedepends="$depends_dev libnftnl-dev bison flex autoconf automake" +makedepends="$depends_dev autoconf automake" subpackages="ip6tables $pkgname-doc $pkgname-dev" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + update_config_sub || return 1 local i for i in $source; do case $i in @@ -87,18 +88,18 @@ ip6tables() { install -m644 "$startdir"/ip6tables.confd "$subpkgdir"/etc/conf.d/ip6tables } -md5sums="27ba3451cb622467fc9267a176f19a31 iptables-1.6.0.tar.bz2 -92fcad4dc7b3e34d5bf944f53e34563b iptables-1.6.0-musl-fixes.patch +md5sums="536d048c8e8eeebcd9757d0863ebb0c0 iptables-1.4.21.tar.bz2 +cd9f429bf0dbd73be5f95bf0d7169728 iptables-1.4.14-musl-fixes.patch 2e8175456a98221c0be9b758d064ee09 iptables.initd c91286c54f8fe0de6ed8950f375cb7a5 iptables.confd d3f37ebc2cd3fbfc326c3a8df5a79e11 ip6tables.confd" -sha256sums="4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60 iptables-1.6.0.tar.bz2 -0b7c73ebbb1f207ff6a1d36cb460b654eda7993eda9053fd469a493cae310d80 iptables-1.6.0-musl-fixes.patch +sha256sums="52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 iptables-1.4.21.tar.bz2 +3ad64af68ea70aa6de0649a68176c2ac68e1c0db567babb472648695dbff8f90 iptables-1.4.14-musl-fixes.patch f297f985ad35fe45800f0c1c7aaf348c3fa920b97be2020c76983ab54e384ba0 iptables.initd 421acbcd310f9c51e20e22e59af9452b1ba5d0db33e8960eba0095271060c3db iptables.confd 31ef5d759c64afd0ecbcb56b3982ed2bdb5ed9c8553c628c13d4a3b5687118a3 ip6tables.confd" -sha512sums="60360910db76e3265fb7b6456a55b91708263bde9c4e5b9cadf3832d2e2a9db3e6cb60c82e278ea0672618bd5c9566c374e00d19d35a2e8f330116c3ab6aaf51 iptables-1.6.0.tar.bz2 -e79344cab67c4fa0449dfeef6d1504bcd41d16d595010a18a7d9e75eba46021617d31fbb79c62894fd35898ec643b542a6111b06d405c79ffff41a3078327b62 iptables-1.6.0-musl-fixes.patch +sha512sums="dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b iptables-1.4.21.tar.bz2 +bc1cb36957d5afb80b770fe15f951de3074e2b1b28015372fb6f121fd551dd0e86c76c1819022dc468d11750b3969db40ef2dc9651c654c9f99212c0f2746985 iptables-1.4.14-musl-fixes.patch 059b3bd8dd7dec60060ec5eb1e639fe8203207629f3a7dd4fdbe5ebca3f7e9b80df5592ebb27542e31830fd15a53cffac5772567053c104dfccf9b78613a31a1 iptables.initd cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd" diff --git a/main/iptables/iptables-1.4.14-musl-fixes.patch b/main/iptables/iptables-1.4.14-musl-fixes.patch new file mode 100644 index 0000000000..547d0df42e --- /dev/null +++ b/main/iptables/iptables-1.4.14-musl-fixes.patch @@ -0,0 +1,127 @@ +--- iptables-1.4.12.1.o/extensions/libip6t_ipv6header.c ++++ iptables-1.4.12.1/extensions/libip6t_ipv6header.c +@@ -10,6 +10,9 @@ + #include + #include + #include ++#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 + +-#if defined(__GLIBC__) && __GLIBC__ == 2 + #include + #include + #include +@@ -13,15 +12,4 @@ + #include + #include + #include +-#else /* libc5 */ +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#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 ++#include + + #include + +--- iptables-1.4.12.1.o/iptables/ip6tables-restore.c ++++ iptables-1.4.12.1/iptables/ip6tables-restore.c +@@ -9,7 +9,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include +--- 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 +-#include ++#include + #include + #include + #include +--- iptables-1.4.12.1.o/iptables/iptables-restore.c ++++ iptables-1.4.12.1/iptables/iptables-restore.c +@@ -6,7 +6,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include +--- iptables-1.4.12.1.o/iptables/iptables-save.c ++++ iptables-1.4.12.1/iptables/iptables-save.c +@@ -6,7 +6,7 @@ + * + */ + #include +-#include ++#include + #include + #include + #include +--- iptables-1.4.12.1.o/iptables/iptables-xml.c ++++ iptables-1.4.12.1/iptables/iptables-xml.c +@@ -7,7 +7,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include diff --git a/main/iptables/iptables-1.6.0-musl-fixes.patch b/main/iptables/iptables-1.6.0-musl-fixes.patch deleted file mode 100644 index 4a89e19999..0000000000 --- a/main/iptables/iptables-1.6.0-musl-fixes.patch +++ /dev/null @@ -1,45 +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 - #include - #include -+#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/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 -+#include - - #include -- cgit v1.2.3