diff options
| author |   Daniel Ahlberg <aliz@gentoo.org> | 2004-09-10 15:09:39 +0000 |
|---|---|---|
| committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-09-10 15:09:39 +0000 |
| commit | 888192d0fd2df8bdf3e2dc8d69a4d8d12b8bc3ff (patch) | |
| tree | e97accec3af0c37f33d14fd057043226b27d5bd6 /net-firewall | |
| parent | Version bumped. Closes 63368 (Manifest recommit) (diff) | |
| download | gentoo-2-888192d0fd2df8bdf3e2dc8d69a4d8d12b8bc3ff.tar.gz gentoo-2-888192d0fd2df8bdf3e2dc8d69a4d8d12b8bc3ff.tar.bz2 gentoo-2-888192d0fd2df8bdf3e2dc8d69a4d8d12b8bc3ff.zip | |
Closing #60979
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/iptables/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/iptables/files/1.2.11-files/round-robin.patch | 30 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.2.11-r2.ebuild | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog index 25db14182c93..63d6afc85997 100644 --- a/net-firewall/iptables/ChangeLog +++ b/net-firewall/iptables/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/iptables # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.46 2004/09/05 14:02:18 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.47 2004/09/10 15:09:39 aliz Exp $ + + 10 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11-r2.ebuild, + files/1.2.11-files/round-robin.patch: + Added round-robin patch, closing #60979. 05 Sep 2004; Guy Martin <gmsoft@gentoo.org> -files/1.2.11-files/hppa.patch.bz2, iptables-1.2.11-r2.ebuild: diff --git a/net-firewall/iptables/files/1.2.11-files/round-robin.patch b/net-firewall/iptables/files/1.2.11-files/round-robin.patch new file mode 100644 index 000000000000..ed9c90481c21 --- /dev/null +++ b/net-firewall/iptables/files/1.2.11-files/round-robin.patch @@ -0,0 +1,30 @@ +=================================================================== +RCS file: /data/cvspublic/iptables/iptables.c,v +retrieving revision 1.68 +retrieving revision 1.70 +diff -u -r1.68 -r1.70 +--- iptables/iptables.c 2004/05/26 16:04:48 1.68 ++++ iptables/iptables.c 2004/08/03 22:38:39 1.70 +@@ -551,7 +551,7 @@ + + while (host->h_addr_list[*naddr] != (char *) NULL) + (*naddr)++; +- addr = fw_calloc(*naddr, sizeof(struct in_addr)); ++ addr = fw_calloc(*naddr, sizeof(struct in_addr) * *naddr); + for (i = 0; i < *naddr; i++) + inaddrcpy(&(addr[i]), + (struct in_addr *) host->h_addr_list[i]); +@@ -2339,11 +2339,8 @@ + e = NULL; + } + +- for (c = 0; c < nsaddrs; c++) +- free(&saddrs[c]); +- +- for (c = 0; c < ndaddrs; c++) +- free(&daddrs[c]); ++ free(saddrs); ++ free(daddrs); + + if (opts != original_opts) { + free(opts); diff --git a/net-firewall/iptables/iptables-1.2.11-r2.ebuild b/net-firewall/iptables/iptables-1.2.11-r2.ebuild index 5563e858bc40..4ba7fefc48a1 100644 --- a/net-firewall/iptables/iptables-1.2.11-r2.ebuild +++ b/net-firewall/iptables/iptables-1.2.11-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r2.ebuild,v 1.11 2004/09/05 14:02:18 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r2.ebuild,v 1.12 2004/09/10 15:09:39 aliz Exp $ inherit eutils flag-o-matic @@ -38,6 +38,7 @@ src_unpack() { epatch ${FILESDIR}/${PV}-files/grsecurity-1.2.8-iptables.patch.bz2 epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch.bz2 epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch.bz2 + epatch ${FILESDIR}/${PV}-files/round-robin.patch sed -i "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" extensions/Makefile |