security bump. Exception handling error. bug 70240

5 files changed, 259 insertions, 24 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 63d6afc85997..deded2147cf6 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2004/09/10 15:09:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.48 2004/11/06 16:43:41 solar Exp $
+
+*iptables-1.2.11-r3 (06 Nov 2004)
+
+  06 Nov 2004; <solar@gentoo.org> +files/1.2.11-files/CAN-2004-0986.patch,
+  +iptables-1.2.11-r3.ebuild:
+  security bump. Exception handling error. bug 70240
 
   10 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11-r2.ebuild,
   files/1.2.11-files/round-robin.patch:
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 68da32df17c6..ce0f8c0fdb6e 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,40 +1,43 @@
-MD5 03f103288106114edf2f8e3b11b716ac ChangeLog 14229
-MD5 c4cbf208c965f5a9c1a1042b058b24f1 iptables-1.2.11-r2.ebuild 5381
 MD5 446359a0182a0a43d1ef826288ed6abf iptables-1.2.7a-r3.ebuild 1981
-MD5 cf710eb268d1f501b4917425877a0f48 iptables-1.2.9-r1.ebuild 3526
+MD5 533e538cb2f840d4a3670fd4ec5093c3 iptables-1.2.11-r3.ebuild 5462
 MD5 f0dd3e706a06dfff3b1f1b746f56cdd6 iptables-1.2.9-r4.ebuild 5435
 MD5 2e35947618db05b61050b554b5c69eb4 iptables-1.2.9.ebuild 2806
+MD5 cf710eb268d1f501b4917425877a0f48 iptables-1.2.9-r1.ebuild 3526
+MD5 c4cbf208c965f5a9c1a1042b058b24f1 iptables-1.2.11-r2.ebuild 5381
+MD5 03f103288106114edf2f8e3b11b716ac ChangeLog 14229
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r2 68
-MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
+MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
+MD5 cc47b162c1a113d2de67762963ba7b0a files/ip6tables.init 2104
+MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
+MD5 3ec239b461aa2724ec737824cf5615be files/iptables-1.2.9-r1.init 1842
+MD5 23da9a56b3162ef3cd18fcc8cc45a33f files/iptables.init 2087
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r4 67
-MD5 dd4f4563c89d33fc6987043d95531e05 files/ip6tables-1.2.9-r1.confd 266
-MD5 d01fea0fed4592571090b2fe958a395a files/ip6tables-1.2.9-r1.init 1878
 MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
-MD5 cc47b162c1a113d2de67762963ba7b0a files/ip6tables.init 2104
-MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
+MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r2 68
+MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r3 68
+MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278
+MD5 dd4f4563c89d33fc6987043d95531e05 files/ip6tables-1.2.9-r1.confd 266
+MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
 MD5 4e055c59114fd6abc5a27bdaa97d2946 files/iptables-1.2.9-r1.confd 264
-MD5 3ec239b461aa2724ec737824cf5615be files/iptables-1.2.9-r1.init 1842
-MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
-MD5 23da9a56b3162ef3cd18fcc8cc45a33f files/iptables.init 2087
-MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
-MD5 1d104ede1329b4433cd31e2bf734aaaa files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 763
-MD5 e501a7bffac71e8c86aa8c62414d1621 files/1.2.11-files/install_all_dev_files.patch.bz2 1041
-MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.11-files/install_ipv6_apps.patch.bz2 334
-MD5 3e4bb17303647ee7a43279f6aa6f0d61 files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2 1420
-MD5 66834df31d6b9d23cac3f4226a865cb2 files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 3815
-MD5 b0150e53cd00cec2a3c1cff0e2e7673f files/1.2.11-files/round-robin.patch 830
+MD5 d01fea0fed4592571090b2fe958a395a files/ip6tables-1.2.9-r1.init 1878
 MD5 ea3ad4b64a781b66b711cb587d4a718b files/1.2.7a-files/01_all_grsecurity.patch.bz2 1163
 MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.7a-files/02_all_imq.patch.bz2 2936
 MD5 0b7b54af1ab69e8e10ddcaab93fd62ff files/1.2.7a-files/03_all_mac_fix.patch.bz2 305
 MD5 76d3e579f6be5bc9d4f22f7cdbfd8c71 files/1.2.7a-files/04_all_no_optimize_fix.patch.bz2 549
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2 334
+MD5 1d34d1326df13874bd2f1997f3ee4d59 files/1.2.9-files/sparc64_limit_fix.patch.bz2 1227
 MD5 d5afce91314f40a8448cd20a8b585ee5 files/1.2.9-files/01_all_grsecurity.patch.bz2 1224
-MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.9-files/02_all_imq.patch.bz2 2936
 MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.9-files/03_hppa_gentoo.patch.bz2 278
-MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2 334
-MD5 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056
+MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.9-files/02_all_imq.patch.bz2 2936
 MD5 88d477ca9a41c15b1cc2d5253e371ada files/1.2.9-files/06_all_l7.patch.bz2 4455
-MD5 1d34d1326df13874bd2f1997f3ee4d59 files/1.2.9-files/sparc64_limit_fix.patch.bz2 1227
+MD5 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056
+MD5 b0150e53cd00cec2a3c1cff0e2e7673f files/1.2.11-files/round-robin.patch 830
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.11-files/install_ipv6_apps.patch.bz2 334
+MD5 66834df31d6b9d23cac3f4226a865cb2 files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 3815
+MD5 e501a7bffac71e8c86aa8c62414d1621 files/1.2.11-files/install_all_dev_files.patch.bz2 1041
+MD5 3e4bb17303647ee7a43279f6aa6f0d61 files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2 1420
+MD5 1d104ede1329b4433cd31e2bf734aaaa files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 763
+MD5 756f721b4c0c0646a174993befa199c4 files/1.2.11-files/CAN-2004-0986.patch 1365
diff --git a/net-firewall/iptables/files/1.2.11-files/CAN-2004-0986.patch b/net-firewall/iptables/files/1.2.11-files/CAN-2004-0986.patch
new file mode 100644
index 000000000000..14a65e2dd190
--- /dev/null
+++ b/net-firewall/iptables/files/1.2.11-files/CAN-2004-0986.patch
@@ -0,0 +1,48 @@
+--- old/iptables_profectio/iptables.c	(revision 3243)
++++ new/iptables_profectio/iptables.c	(working copy)
+@@ -1593,15 +1593,17 @@
+ 	int procfile;
+ 	char *ret;
+ 
++#define PROCFILE_BUFSIZ	1024
+ 	procfile = open(PROC_SYS_MODPROBE, O_RDONLY);
+ 	if (procfile < 0)
+ 		return NULL;
+ 
+-	ret = malloc(1024);
++	ret = (char *) malloc(PROCFILE_BUFSIZ);
+ 	if (ret) {
+-		switch (read(procfile, ret, 1024)) {
++		memset(ret, 0, PROCFILE_BUFSIZ);
++		switch (read(procfile, ret, PROCFILE_BUFSIZ)) {
+ 		case -1: goto fail;
+-		case 1024: goto fail; /* Partial read.  Wierd */
++		case PROCFILE_BUFSIZ: goto fail; /* Partial read.  Wierd */
+ 		}
+ 		if (ret[strlen(ret)-1]=='\n') 
+ 			ret[strlen(ret)-1]=0;
+
+--- old/iptables_profectio/ip6tables.c	(revision 3243)
++++ new/iptables_profectio/ip6tables.c	(working copy)
+@@ -1595,15 +1595,17 @@
+ 	int procfile;
+ 	char *ret;
+ 
++#define PROCFILE_BUFSIZ 1024
+ 	procfile = open(PROC_SYS_MODPROBE, O_RDONLY);
+ 	if (procfile < 0)
+ 		return NULL;
+ 
+-	ret = malloc(1024);
++	ret = malloc(PROCFILE_BUFSIZ);
+ 	if (ret) {
+-		switch (read(procfile, ret, 1024)) {
++		memset(ret, 0, PROCFILE_BUFSIZ);
++		switch (read(procfile, ret, PROCFILE_BUFSIZ)) {
+ 		case -1: goto fail;
+-		case 1024: goto fail; /* Partial read.  Wierd */
++		case PROCFILE_BUFSIZ: goto fail; /* Partial read.  Wierd */
+ 		}
+ 		if (ret[strlen(ret)-1]=='\n') 
+ 			ret[strlen(ret)-1]=0;
+
diff --git a/net-firewall/iptables/files/digest-iptables-1.2.11-r3 b/net-firewall/iptables/files/digest-iptables-1.2.11-r3
new file mode 100644
index 000000000000..5f9f67fb7252
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.2.11-r3
@@ -0,0 +1 @@
+MD5 0a5f5f226e41ce408a895bec995e8c05 iptables-1.2.11.tar.bz2 156988
diff --git a/net-firewall/iptables/iptables-1.2.11-r3.ebuild b/net-firewall/iptables/iptables-1.2.11-r3.ebuild
new file mode 100644
index 000000000000..3756d2c1c8dc
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.2.11-r3.ebuild
@@ -0,0 +1,177 @@
+# 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-r3.ebuild,v 1.1 2004/11/06 16:43:41 solar Exp $
+
+inherit eutils flag-o-matic
+
+#extensions versions
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.iptables.org/"
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE="ipv6 static extensions"
+
+DEPEND="virtual/os-headers
+	extensions? ( virtual/linux-sources )"
+RDEPEND=""
+
+pkg_setup() {
+	if use extensions; then
+		einfo "WARNING: 3rd party extensions has been enabled."
+		einfo "This means that iptables will use your currently installed"
+		einfo "kernel in /usr/src/linux as headers for iptables."
+		einfo ""
+		einfo "You may have to patch your kernel to allow iptables to build."
+		einfo "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ for patches"
+		einfo "for your kernel."
+	fi
+}
+
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	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
+	epatch ${FILESDIR}/${PV}-files/CAN-2004-0986.patch ; # security bug 70240
+	sed -i "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" extensions/Makefile
+
+	if use extensions; then
+		epatch ${FILESDIR}/${PV}-files/iptables-1.2.9-imq1.diff.bz2
+		epatch ${FILESDIR}/${PV}-files/iptables-layer7-0.9.0.patch.bz2
+
+		chmod +x extensions/.IMQ-test*
+		chmod +x extensions/.childlevel-test*
+		chmod +x extensions/.layer7-test*
+
+	fi
+}
+
+src_compile() {
+	replace-flags -O0 -O2
+
+	if [ -z `get-flag O` ]; then
+		append-flags -O2
+	fi
+
+	# prevent it from causing ICMP errors.
+	# http://bugs.gentoo.org/show_bug.cgi?id=23645
+	filter-flags "-fstack-protector"
+
+	# iptables and libraries are now installed to /sbin and /lib, so that
+	# systems with remote network-mounted /usr filesystems can get their
+	# network interfaces up and running correctly without /usr.
+
+	use ipv6 || myconf="${myconf} DO_IPV6=0"
+	use static && myconf="${myconf} NO_SHARED_LIBS=0"
+
+	if use extensions; then
+		# Only check_KV if /usr/src/linux exists
+		if [ -L ${ROOT}/usr/src/linux -o -d ${ROOT}/usr/src/linux ]; then
+			check_KV
+		else
+			ewarn "You don't have kernel sources available at /usr/src/linux."
+			ewarn "Iptables will be built against linux-headers."
+		fi
+
+		make COPT_FLAGS="${CFLAGS}" ${myconf} \
+			PREFIX= \
+			LIBDIR=/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr/src/linux \
+			|| die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
+	else
+		make COPT_FLAGS="${CFLAGS}" ${myconf} \
+			PREFIX= \
+			LIBDIR=/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr \
+			|| die
+	fi
+}
+
+src_install() {
+	if use extensions; then
+		make DESTDIR=${D} ${myconf} \
+			PREFIX= \
+			LIBDIR=/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr/src/linux \
+			install || die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
+
+		make DESTDIR=${D} ${myconf} \
+			PREFIX= \
+			LIBDIR=/usr/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr/src/linux \
+			install-devel || die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
+	else
+		make DESTDIR=${D} ${myconf} \
+			LIBDIR=/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr \
+			install || die
+
+		make DESTDIR=${D} ${myconf} \
+			LIBDIR=/usr/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr \
+			install-devel || die
+	fi
+
+	dodoc COPYING
+	dodir /var/lib/iptables ; keepdir /var/lib/iptables
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PN}-1.2.9-r1.init iptables
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PN}-1.2.9-r1.confd iptables
+
+	if use ipv6; then
+		dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/${PN/iptables/ip6tables}-1.2.9-r1.init ip6tables
+		insinto /etc/conf.d
+		newins ${FILESDIR}/${PN/iptables/ip6tables}-1.2.9-r1.confd ip6tables
+	fi
+}
+
+pkg_postinst() {
+	einfo "This package now includes an initscript which loads and saves"
+	einfo "rules stored in /var/lib/iptables/rules-save"
+	use ipv6 >/dev/null && einfo "and /var/lib/ip6tables/rules-save"
+	einfo "This location can be changed in /etc/conf.d/iptables"
+	einfo ""
+	einfo "If you are using the iptables initsscript you should save your"
+	einfo "rules using the new iptables version before rebooting."
+	einfo ""
+	einfo "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
+	einfo "iptables."
+	einfo ""
+	ewarn "!!! ipforwarding is now not a part of the iptables initscripts."
+	einfo "Until a more permanent solution is implemented adding the following"
+	einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:"
+	einfo "  echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding"
+	if useq ipv6; then
+		einfo "and/or"
+		einfo "  echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding"
+		einfo "for ipv6."
+	fi
+}