Clean up 1.3.1 ebuilds, and forcable mark as KEYWORDS=~x86 ONLY, as I want arches to test it first.

(Portage version: 2.0.51.21)

5 files changed, 232 insertions, 38 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 46d81534079f..ccce8746d51f 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.63 2005/04/21 12:17:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.64 2005/05/03 09:40:10 robbat2 Exp $
+
+*iptables-1.3.1-r3 (03 May 2005)
+
+  03 May 2005; Robin H. Johnson <robbat2@gentoo.org> :
+  iptables-1.3.1-r2.ebuild, +iptables-1.3.1-r3.ebuild
+  Clean up 1.3.1 ebuilds, and forcable mark as KEYWORDS=~x86 ONLY, as I want
+  arches to test it first.
 
 *iptables-1.3.1-r2 (21 Apr 2005)
 
@@ -15,7 +22,7 @@
 
   28 Mar 2005; Daniel Black <dragonheart@gentoo.org> iptables-1.3.1-r1.ebuild,
   iptables-1.3.1.ebuild:
-  added conditional unpack on l7-filter thanks to Marcelo Góes (vanquirius)
+  added conditional unpack on l7-filter thanks to Marcelo Góes (vanquirius)
 
 *iptables-1.3.1-r1 (23 Mar 2005)
 
@@ -47,7 +54,7 @@
   08 Nov 2004; Simon Stelling <blubb@gentoo.org> iptables-1.2.11-r3.ebuild:
   stable for security reasons (bug #70240)
 
-  08 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  08 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
   iptables-1.2.11-r3.ebuild:
   Stable on alpha, bug 70240.
 
@@ -88,7 +95,7 @@
   fix spelling error. Thanks to: Kurt McKee <kurtmckee@northwestern.edu> in bug
   #61325
 
-  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> iptables-1.2.11-r2.ebuild:
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> iptables-1.2.11-r2.ebuild:
   Stable on alpha.
 
   20 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index bd92ed3b875c..3c75d8c4f8e7 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,49 +1,51 @@
-MD5 819ac2b60de164f661c0759578517de6 ChangeLog 16821
 MD5 cdf47a369303ed0da3bb2f6888dc1aa8 iptables-1.2.7a-r3.ebuild 1982
-MD5 d8db7c69648295e17016d8bbe4c55c07 iptables-1.2.9-r1.ebuild 3526
+MD5 86d3dea64a43de144cddbac1a213e1b0 iptables-1.3.1-r3.ebuild 5568
+MD5 c3b7afaef1230c12fc9afbfadd53472b iptables-1.2.11-r3.ebuild 5514
 MD5 e2158f065e3c8a603eb424a8ff613e4e iptables-1.2.9-r4.ebuild 5435
 MD5 20d154d66f67db6a04208bda433d9823 iptables-1.2.9.ebuild 2805
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 5c9fe97964cdb981c75f43f20ba48c15 iptables-1.2.11-r2.ebuild 5379
-MD5 c3b7afaef1230c12fc9afbfadd53472b iptables-1.2.11-r3.ebuild 5514
 MD5 c3837a503fead3e60811e7cd8ab3f1a1 iptables-1.3.1-r2.ebuild 5602
-MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r2 68
-MD5 183ec92f9fee7f072d9edb36917b4f9e files/digest-iptables-1.2.7a-r3 68
+MD5 d8db7c69648295e17016d8bbe4c55c07 iptables-1.2.9-r1.ebuild 3526
+MD5 5c9fe97964cdb981c75f43f20ba48c15 iptables-1.2.11-r2.ebuild 5379
+MD5 819ac2b60de164f661c0759578517de6 ChangeLog 16821
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
+MD5 6fcbeff4b5ce0f79f66265cb8af3d55f files/ip6tables.init 2020
+MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
 MD5 9366ae3d4d34c4dbf665b8539c609dd0 files/digest-iptables-1.2.9 67
+MD5 c95cf8f2b5a1dbfb3f53df2714055988 files/iptables-1.2.9-r1.init 1778
+MD5 6db1e09fe93492ab7a8590ca43cf56f5 files/iptables.init 2004
 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 abfb063fae350f729105aec89f18f0b4 files/ip6tables-1.2.9-r1.init 1793
+MD5 c237fdc6fd86d64642da7c9751d317af files/digest-iptables-1.3.1-r2 206
+MD5 c237fdc6fd86d64642da7c9751d317af files/digest-iptables-1.3.1-r3 206
 MD5 e16ca98d9b770d5e61b3eb760b13b7c7 files/ip6tables.confd 384
-MD5 6fcbeff4b5ce0f79f66265cb8af3d55f files/ip6tables.init 2020
-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 c95cf8f2b5a1dbfb3f53df2714055988 files/iptables-1.2.9-r1.init 1778
-MD5 f876be872ec78bc824f2503059338d8d files/iptables.confd 382
-MD5 6db1e09fe93492ab7a8590ca43cf56f5 files/iptables.init 2004
-MD5 1d34d1326df13874bd2f1997f3ee4d59 files/sparc64_limit_fix.patch.bz2 1227
-MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r3 68
-MD5 c237fdc6fd86d64642da7c9751d317af files/digest-iptables-1.3.1-r2 206
+MD5 abfb063fae350f729105aec89f18f0b4 files/ip6tables-1.2.9-r1.init 1793
+MD5 628b6569018552e77bd5543d98baa664 files/1.3.1-files/iptables-1.3.1-compilefix.patch 539
+MD5 76a42dd64d1a4f419a5f07de5a6cb0c2 files/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 1098
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.3.1-files/install_ipv6_apps.patch.bz2 334
+MD5 bcbdd7e40a2fd78796c9a00a5ae463cb files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 801
 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 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 756f721b4c0c0646a174993befa199c4 files/1.2.11-files/CAN-2004-0986.patch 1365
+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 bcbdd7e40a2fd78796c9a00a5ae463cb files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 801
-MD5 76a42dd64d1a4f419a5f07de5a6cb0c2 files/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 1098
-MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.3.1-files/install_ipv6_apps.patch.bz2 334
-MD5 628b6569018552e77bd5543d98baa664 files/1.3.1-files/iptables-1.3.1-compilefix.patch 539
+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/digest-iptables-1.3.1-r3 b/net-firewall/iptables/files/digest-iptables-1.3.1-r3
new file mode 100644
index 000000000000..2cd860dcf77a
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.3.1-r3
@@ -0,0 +1,3 @@
+MD5 c3358a3bd0d7755df0b64a5063db296b iptables-1.3.1.tar.bz2 180670
+MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369
+MD5 24963993a6f0727206a3a2d1a9c5e83b netfilter-layer7-v1.2.tar.gz 71697
diff --git a/net-firewall/iptables/iptables-1.3.1-r2.ebuild b/net-firewall/iptables/iptables-1.3.1-r2.ebuild
index fc9850502919..0ce17fca7afe 100644
--- a/net-firewall/iptables/iptables-1.3.1-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.1-r2.ebuild,v 1.1 2005/04/21 12:17:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.1-r2.ebuild,v 1.2 2005/05/03 09:40:10 robbat2 Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="http://www.iptables.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~x86"
 IUSE="ipv6 static extensions"
 
 DEPEND="virtual/os-headers
diff --git a/net-firewall/iptables/iptables-1.3.1-r3.ebuild b/net-firewall/iptables/iptables-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..8dc1dd63030e
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.3.1-r3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.1-r3.ebuild,v 1.1 2005/05/03 09:40:10 robbat2 Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+#extensions versions
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.iptables.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ipv6 static extensions"
+
+DEPEND="virtual/os-headers
+		extensions? ( virtual/linux-sources )"
+RDEPEND=""
+
+L7_PN="netfilter-layer7"
+L7_PV="1.2"
+L7_P="${L7_PN}-v${L7_PV}"
+L7_PATCH="iptables-layer7-${L7_PV}.patch"
+IMQ_PATCH="iptables-1.3.0-imq1.diff"
+
+SRC_URI="http://www.iptables.org/files/${P}.tar.bz2
+		extensions? (
+			http://www.linuximq.net/patchs/${IMQ_PATCH}
+			mirror://sourceforge/l7-filter/${L7_P}.tar.gz
+		)"
+
+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 ${KERNEL_DIR} as headers for iptables."
+		einfo ""
+		einfo "You may have to patch your kernel to allow iptables to build."
+		einfo "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
+		einfo "for your kernel."
+		einfo ""
+		einfo "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
+		linux-info_pkg_setup
+	fi
+}
+
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use extensions && unpack ${L7_P}.tar.gz
+	cd ${S}
+
+	EPATCH_OPTS="-p0" \
+	epatch ${FILESDIR}/${PV}-files/install_ipv6_apps.patch.bz2 \
+	|| die "epatch install_ipv6_apps.patch.bz2"
+	EPATCH_OPTS="-p1" \
+	epatch ${FILESDIR}/${PV}-files/install_all_dev_files.patch-${PV}.bz2 \
+	|| die "epatch install_all_dev_files.patch-${PV}.bz2"
+
+	# Both of these have been merged upstream
+	# EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PV}-files/round-robin.patch
+	# security bug 70240
+	# EPATCH_OPTS="-p2" epatch ${FILESDIR}/${PV}-files/CAN-2004-0986.patch
+
+	# this provide's grsec's stealth match
+	EPATCH_OPTS="-p0" \
+	epatch ${FILESDIR}/${PV}-files/grsecurity-1.2.8-iptables.patch-${PV}.bz2 \
+	|| die "epatch grsecurity-1.2.8-iptables.patch-${PV}.bz2"
+
+	
+	sed -i "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" extensions/Makefile \
+	|| die "failed to enable stealth extension"
+
+	EPATCH_OPTS="-p1" \
+	epatch ${FILESDIR}/${PV}-files/${P}-compilefix.patch \
+	|| die "epatch ${P}-compilefix.patch"
+
+	if use extensions; then
+		EPATCH_OPTS="-p1" epatch ${DISTDIR}/${IMQ_PATCH} \
+		|| die "epatch ${IMQ_PATCH}"
+		EPATCH_OPTS="-p1" epatch ${WORKDIR}/${L7_P}/${L7_PATCH} \
+		|| die "epatch ${L7_PATCH}"
+		chmod +x extensions/{.IMQ-test*,.childlevel-test*,.layer7-test*}
+	fi
+}
+
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/lib"
+	myconf="${myconf} BINDIR=/sbin"
+	myconf="${myconf} MANDIR=/usr/share/man"
+	myconf="${myconf} INCDIR=/usr/include"
+	# 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"
+	export myconf
+	diemsg="Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
+	export diemsg
+}
+
+
+src_compile() {
+	src_defs
+
+	# iptables will NOT work correctly unless -O[123] are present!
+	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"
+
+	if use extensions; then
+		make COPT_FLAGS="${CFLAGS}" ${myconf} \
+			KERNEL_DIR="${KERNEL_DIR}" \
+			CC="$(tc-getCC)" \
+			|| die "${diemsg}"
+	else
+		make COPT_FLAGS="${CFLAGS}" ${myconf} \
+			KERNEL_DIR="/usr" \
+			CC="$(tc-getCC)" \
+			|| die
+	fi
+}
+
+src_install() {
+	src_defs
+	if use extensions; then
+		make ${myconf} \
+			DESTDIR="${D}" \
+			KERNEL_DIR="${KERNEL_DIR}" \
+			install install-devel || die "${diemsg}"
+	else
+		make ${myconf} \
+			DESTDIR="${D}" \
+			KERNEL_DIR="/usr" \
+			install install-devel || die
+	fi
+
+	dodir /usr/lib
+	mv -f ${D}/lib/*.a ${D}/usr/lib
+
+	dodoc COPYING
+	keepdir /var/lib/iptables
+	newinitd ${FILESDIR}/${PN}-1.2.9-r1.init iptables
+	newconfd ${FILESDIR}/${PN}-1.2.9-r1.confd iptables
+
+	if use ipv6; then
+		keepdir /var/lib/ip6tables
+		newinitd ${FILESDIR}/${PN/iptables/ip6tables}-1.2.9-r1.init ip6tables
+		newconfd ${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"
+	useq 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
+}