Bump iptables to 1.4.6

Closes #913.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias
2010-01-19 15:09:28 -03:00
committed by Peter Korsgaard
parent d77120e3de
commit 0908e85ce3
4 changed files with 8 additions and 23 deletions

View File

@@ -1,19 +0,0 @@
--- iptables-1.4.5/xtables.c.org 2009-09-14 18:36:55.000000000 +0200
+++ iptables-1.4.5/xtables.c 2009-09-20 13:24:11.000000000 +0200
@@ -1484,6 +1484,7 @@
xtables_ip6parse_multiple(const char *name, struct in6_addr **addrpp,
struct in6_addr **maskpp, unsigned int *naddrs)
{
+ static const struct in6_addr zero_addr;
struct in6_addr *addrp;
char buf[256], *p;
unsigned int len, i, j, n, count = 1;
@@ -1526,7 +1527,7 @@
memcpy(*maskpp + i, addrp, sizeof(*addrp));
/* if a null mask is given, the name is ignored, like in "any/0" */
- if (memcmp(*maskpp + i, &in6addr_any, sizeof(in6addr_any)) == 0)
+ if (memcmp(*maskpp + i, &zero_addr, sizeof(zero_addr)) == 0)
strcpy(buf, "::");
addrp = ip6parse_hostnetwork(buf, &n);

View File

@@ -3,7 +3,7 @@
# iptables
#
#############################################################
IPTABLES_VERSION = 1.4.5
IPTABLES_VERSION = 1.4.6
IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables