Cleanup commit.

8 files changed, 282 insertions, 16 deletions

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 0d01e0f7f3cc..1bd165ad0deb 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,31 +1,37 @@
-MD5 3f1964bbbc5a55928ed0b9bffac49bb8 ChangeLog 10592
 MD5 dafaffff331fd6b7689e9d2fb90c2363 iptables-1.2.7a-r3.ebuild 1971
+MD5 8cdfb2c45dac4da73a18209bf45a5731 iptables-1.2.9-r2.ebuild 4504
+MD5 efc10ad0d8a21e4d81c550cb9f4caf36 iptables-1.2.9.ebuild 2789
 MD5 8dc8edd101e75586fc02c0d31fd68989 iptables-1.2.9-r1.ebuild 3508
+MD5 3f1964bbbc5a55928ed0b9bffac49bb8 ChangeLog 10592
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 efc10ad0d8a21e4d81c550cb9f4caf36 iptables-1.2.9.ebuild 2789
-MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
-MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
-MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
-MD5 04a4f2f4455c1c5df002cde52d354dee files/ip6tables.init 2108
+MD5 3eca51d6af7afdb931046306f58a115a iptables-1.2.11.ebuild 3521
 MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
-MD5 a691c35088525c77c3c9b107cdb74da1 files/iptables.init 2092
+MD5 11b6d4adeda9db7a96bc9c1238320fb5 files/ip6tables.init 2107
 MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
+MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
+MD5 521c8e99785dfc3c424a6b7bcdbed140 files/iptables-1.2.9-r1.init 1787
+MD5 3b47fcf66505ee6154949e600a501e32 files/iptables.init 2091
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r1 67
+MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9-r2 67
+MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
+MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
+MD5 23c4c7ee1b86cd191e7b17b046289c91 files/iptables-1.2.9-hppa.patch.bz2 278
 MD5 9a6203c5e509f5c1fdcb62d9f2da7bb7 files/ip6tables-1.2.9-r1.confd 213
-MD5 1b471ec513634d33e2074998b0a9942d files/ip6tables-1.2.9-r1.init 1796
-MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
+MD5 b4abd6e2518af2b4a14ba14c0392fe02 files/iptables-1.2.7a-hppa.diff 345
+MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11 68
 MD5 20f328b3b857860fe333c14a71eb5e20 files/iptables-1.2.9-r1.confd 211
-MD5 1025b42a35b4bb5855b2e023c6acbf25 files/iptables-1.2.9-r1.init 1788
+MD5 7e146122ae2bb424410cb64f54ad0a9b files/ip6tables-1.2.9-r1.init 1795
 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 d0e0fa48b2181f3cf1fe8d145d202dc6 files/1.2.8-files/01_all_grsecurity.patch.bz2 1180
-MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/1.2.8-files/02_all_imq.patch.bz2 2936
-MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.8-files/03_hppa_gentoo.patch.bz2 278
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2 334
 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 2599393f05041feef25abb4f204e72cb files/1.2.9-files/05_all_install_all_dev_files.patch.bz2 1056
+MD5 88d477ca9a41c15b1cc2d5253e371ada files/extensions/iptables-1.2.9-l7-patch.bz2 4455
+MD5 c4f9d5d795f4ab2c221681e55ebac8dd files/extensions/iptables-1.2.9-imq.patch.bz2 2936
+MD5 d5afce91314f40a8448cd20a8b585ee5 files/extensions/iptables-1.2.9-grsecurity.patch.bz2 1224
+MD5 23c4c7ee1b86cd191e7b17b046289c91 files/1.2.11-files/03_all_gentoo.patch.bz2 278
diff --git a/net-firewall/iptables/files/1.2.8-files/01_all_grsecurity.patch.bz2 b/net-firewall/iptables/files/1.2.8-files/01_all_grsecurity.patch.bz2
deleted file mode 100644
index 56d081bdfb69..000000000000
--- a/net-firewall/iptables/files/1.2.8-files/01_all_grsecurity.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/1.2.8-files/02_all_imq.patch.bz2 b/net-firewall/iptables/files/1.2.8-files/02_all_imq.patch.bz2
deleted file mode 100644
index 85a7f00124f2..000000000000
--- a/net-firewall/iptables/files/1.2.8-files/02_all_imq.patch.bz2
+++ /dev/null
diff --git a/net-firewall/iptables/files/digest-iptables-1.2.11 b/net-firewall/iptables/files/digest-iptables-1.2.11
new file mode 100644
index 000000000000..5f9f67fb7252
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.2.11
@@ -0,0 +1 @@
+MD5 0a5f5f226e41ce408a895bec995e8c05 iptables-1.2.11.tar.bz2 156988
diff --git a/net-firewall/iptables/files/digest-iptables-1.2.9-r2 b/net-firewall/iptables/files/digest-iptables-1.2.9-r2
new file mode 100644
index 000000000000..ef4d9437364b
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.2.9-r2
@@ -0,0 +1 @@
+MD5 8299db6ffbe98496d7f57dbb00f17e7d iptables-1.2.9.tar.bz2 186808
diff --git a/net-firewall/iptables/files/1.2.8-files/03_hppa_gentoo.patch.bz2 b/net-firewall/iptables/files/iptables-1.2.9-hppa.patch.bz2
index 6e1093b07157..6e1093b07157 100644
--- a/net-firewall/iptables/files/1.2.8-files/03_hppa_gentoo.patch.bz2
+++ b/net-firewall/iptables/files/iptables-1.2.9-hppa.patch.bz2
diff --git a/net-firewall/iptables/iptables-1.2.11.ebuild b/net-firewall/iptables/iptables-1.2.11.ebuild
new file mode 100644
index 000000000000..f1043bec8086
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.2.11.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11.ebuild,v 1.1 2004/06/23 18:43:16 aliz Exp $
+
+inherit eutils flag-o-matic
+
+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="-*"
+#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64"
+IUSE="ipv6 static"
+
+# iptables is dependent on kernel sources.  Strange but true.
+DEPEND="virtual/linux-sources"
+
+src_unpack() {
+	replace-flags -O0 -O2
+
+	if [ -z `get-flag O` ]; then
+		append-flags -O2
+	fi
+
+	unpack ${A} ; cd ${S}
+
+#	epatch ${FILESDIR}/${PV}-files
+
+	# The folowing hack is needed because ${ARCH} is "sparc" and not "sparc64"
+	# and epatch uses ??_${ARCH}_foo.${EPATCH_SUFFIX} when reading from directories
+#	[ "${PROFILE_ARCH}" = "sparc64" ] && 
+#epatch ${FILESDIR}/sparc64_limit_fix.patch.bz2
+
+	chmod +x extensions/.IMQ-test*
+	chmod +x extensions/.childlevel-test*
+	chmod +x extensions/.layer7-test*
+
+	sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile
+}
+
+src_compile() {
+	# Only check_KV if /usr/src/linux exists
+	if [ -L ${ROOT}/usr/src/linux -o -d ${ROOT}/usr/src/linux ]; then
+		check_KV
+	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"
+
+	make ${myconf} \
+		LIBDIR=/lib \
+		BINDIR=/sbin \
+		MANDIR=/usr/share/man \
+		INCDIR=/usr/include \
+		KERNEL_DIR=/usr/src/linux \
+		|| die
+}
+
+src_install() {
+	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install
+	make DESTDIR=${D} ${myconf} \
+		LIBDIR=/usr/lib \
+		MANDIR=/usr/share/man \
+		INCDIR=/usr/include \
+		install-devel
+
+	dodoc COPYING
+	dodir /var/lib/iptables ; keepdir /var/lib/iptables
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PF}.init iptables
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PF}.confd iptables
+
+	if use ipv6; then
+		dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/${PF/iptables/ip6tables}.init ip6tables
+		insinto /etc/conf.d
+		newins ${FILESDIR}/${PF/iptables/ip6tables}.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 uprading 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
+}
diff --git a/net-firewall/iptables/iptables-1.2.9-r2.ebuild b/net-firewall/iptables/iptables-1.2.9-r2.ebuild
new file mode 100644
index 000000000000..cbcc4b98c96b
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.2.9-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.9-r2.ebuild,v 1.1 2004/06/23 18:43:16 aliz Exp $
+
+inherit eutils flag-o-matic
+
+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="-*"
+#KEYWORDS="x86 ~ppc sparc ~mips alpha arm hppa amd64 ia64"
+IUSE="ipv6 static extensions"
+
+# iptables is dependent on kernel sources.  Strange but true.
+DEPEND="virtual/linux-sources"
+
+pkg_preinst() {
+	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() {
+	replace-flags -O0 -O2
+
+	if [ -z `get-flag O` ]; then
+		append-flags -O2
+	fi
+
+	unpack ${A} ; cd ${S}
+
+	if [ "`use extensions`" ]; then
+		epatch ${FILESDIR}/extensions/${P}-grsecurity.patch.bz2
+		epatch ${FILESDIR}/extensions/${P}-imq.patch.bz2
+		epatch ${FILESDIR}/extensions/${P}-l7.patch.bz2
+
+		chmod +x extensions/.IMQ-test*
+		chmod +x extensions/.childlevel-test*
+		chmod +x extensions/.layer7-test*
+	fi
+
+	# The folowing hack is needed because ${ARCH} is "sparc" and not "sparc64"
+	# and epatch uses ??_${ARCH}_foo.${EPATCH_SUFFIX} when reading from directories
+	[ "${PROFILE_ARCH}" = "sparc64" ] && epatch ${FILESDIR}/sparc64_limit_fix.patch.bz2
+	usr hppa && epatch ${FILESDIR}/${P}-hppa.patch.bz2
+
+	sed -i -e "s:-O2:${CFLAGS} -Iinclude:g" -e "s:/usr/local::g" -e "s:-Iinclude/::" Makefile
+}
+
+src_compile() {
+	# Only check_KV if /usr/src/linux exists
+	if [ -L ${ROOT}/usr/src/linux -o -d ${ROOT}/usr/src/linux ]; then
+		check_KV
+	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
+		make ${myconf} \
+			LIBDIR=/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr/src/linux \
+			|| (
+				eerror "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
+				die
+			)
+	else
+		make ${myconf} \
+			LIBDIR=/lib \
+			BINDIR=/sbin \
+			MANDIR=/usr/share/man \
+			INCDIR=/usr/include \
+			KERNEL_DIR=/usr \
+			|| die
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} MANDIR=/usr/share/man ${myconf} install
+	make DESTDIR=${D} ${myconf} \
+		LIBDIR=/usr/lib \
+		MANDIR=/usr/share/man \
+		INCDIR=/usr/include \
+		install-devel
+
+	dodoc COPYING
+	dodir /var/lib/iptables ; keepdir /var/lib/iptables
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PF}.init iptables
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PF}.confd iptables
+
+	if use ipv6; then
+		dodir /var/lib/ip6tables ; keepdir /var/lib/ip6tables
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/${PF/iptables/ip6tables}.init ip6tables
+		insinto /etc/conf.d
+		newins ${FILESDIR}/${PF/iptables/ip6tables}.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 uprading 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
+}