diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk index 78cd0ff164..e86bf9370d 100644 --- a/packages/network/iptables/package.mk +++ b/packages/network/iptables/package.mk @@ -17,13 +17,13 @@ ################################################################################ PKG_NAME="iptables" -PKG_VERSION="1.4.21" +PKG_VERSION="1.6.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.netfilter.org/" PKG_URL="http://www.netfilter.org/projects/iptables/files/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain linux" +PKG_DEPENDS_TARGET="toolchain linux libmnl libnftnl" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="iptables: IP packet filter administration" diff --git a/packages/network/iptables/patches/iptables-buildfix.patch b/packages/network/iptables/patches/iptables-buildfix.patch new file mode 100644 index 0000000000..cb7327868c --- /dev/null +++ b/packages/network/iptables/patches/iptables-buildfix.patch @@ -0,0 +1,24 @@ +diff -Naur iptables-1.6.0/extensions/GNUmakefile.in iptables-1.6.0.patch/extensions/GNUmakefile.in +--- iptables-1.6.0/extensions/GNUmakefile.in 2015-12-09 13:55:06.000000000 +0100 ++++ iptables-1.6.0.patch/extensions/GNUmakefile.in 2015-12-21 07:57:44.698366669 +0100 +@@ -21,7 +21,7 @@ + kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@ ++AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@ + AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ + AM_LDFLAGS = @noundef_LDFLAGS@ + +diff -Naur iptables-1.6.0/iptables/Makefile.am iptables-1.6.0.patch/iptables/Makefile.am +--- iptables-1.6.0/iptables/Makefile.am 2015-12-09 13:55:06.000000000 +0100 ++++ iptables-1.6.0.patch/iptables/Makefile.am 2015-12-21 08:03:22.245954635 +0100 +@@ -1,7 +1,7 @@ + # -*- Makefile -*- + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS} ++AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS} + AM_YFLAGS = -d + + xtables_multi_SOURCES = xtables-multi.c iptables-xml.c