diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2013-11-26 08:58:08 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-11-26 16:06:56 +0100 |
| commit | 8372954b5b15273d95c46eb1aae6ed007ef05644 (patch) | |
| tree | 613d3d0abe3dad9660076cd9998ab789534c1e9b /package/iptables | |
| parent | 8984eeaf2cf2fae608c43e00417b24f7c6936f16 (diff) | |
iptables: bump to version 1.4.21
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/iptables')
| -rw-r--r-- | package/iptables/iptables-01-fix-static-link.patch | 5 | ||||
| -rw-r--r-- | package/iptables/iptables.mk | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/iptables/iptables-01-fix-static-link.patch b/package/iptables/iptables-01-fix-static-link.patch index d4bcfa607..ce2ea4886 100644 --- a/package/iptables/iptables-01-fix-static-link.patch +++ b/package/iptables/iptables-01-fix-static-link.patch @@ -14,6 +14,7 @@ If libnetfilter_conntrack is not found, @libnetfilter_conntrack_CFLAGS@ and @libnetfilter_conntrack_LIBS@ (and their ${} ones) should be empty, therefore producing no harm to include unconditionally. +[Gustavo: update for iptables 1.4.21] Reported-and-tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Florian Westphal <fw@strlen.de> --- @@ -25,8 +26,8 @@ index 14e7c57..780e715 100644 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} -+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} ++AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ AM_LDFLAGS = @noundef_LDFLAGS@ diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 65470691a..dbd2dc70a 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.4.20 +IPTABLES_VERSION = 1.4.21 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables IPTABLES_INSTALL_STAGING = YES |