diff options
| author |  Peter Korsgaard <peter@korsgaard.com> | 2013-12-01 20:31:43 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-12-01 20:32:00 +0100 |
| commit | 50ce7ffb76b989c90636876153e568da7615b8c3 (patch) | |
| tree | 1de9424dd5332431d2a30d3aafe332e7c0999476 /package/iptables | |
| parent | 9b3904543ca04c5d5fe5f6974539eed376de2290 (diff) | |
| parent | cb08d7b05db54eb7b2c52deabbd57c541777a422 (diff) | |
| download | buildroot-50ce7ffb76b989c90636876153e568da7615b8c3.tar.gz buildroot-50ce7ffb76b989c90636876153e568da7615b8c3.tar.bz2 | |
Merge branch 'next'
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 d4bcfa6078..ce2ea48866 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 65470691a0..dbd2dc70a2 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 |