Add extensions USE flag back for misc patch-o-matic extensions. Bump

l7filter patch to 2.3.

Package-Manager: portage-2.1.1_pre3-r5

4 files changed, 209 insertions, 9 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 2163aaf90f3d..ee96faedaf77 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.105 2006/07/09 06:27:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.106 2006/07/28 07:36:39 azarah Exp $
+
+*iptables-1.3.5-r4 (28 Jul 2006)
+
+  28 Jul 2006; Martin Schlemmer <azarah@gentoo.org>
+  +iptables-1.3.5-r4.ebuild:
+  Add extensions USE flag back for misc patch-o-matic extensions. Bump
+  l7filter patch to 2.3.
 
 *iptables-1.3.5-r3 (09 Jul 2006)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index abfd034df9e0..29a43e9d3bed 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -84,6 +84,7 @@ DIST iptables-1.3.5.tar.bz2 191820 RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e5
 DIST netfilter-layer7-v2.0.tar.gz 88489 RMD160 8e2f76f44db06d5b1b098c2ea37a10befd28e8a8 SHA1 ea3b4276ec593f2aebc502fa3b1c4556c2d8af3c SHA256 1a454c77a07c6447a2c641cc9d5f255023f1c1d5363b463825da5f3d5942168f
 DIST netfilter-layer7-v2.1.tar.gz 89247 RMD160 cd2d455a16761b4fe2318d6d8a5671a535176d62 SHA1 5dc0c9bd1e3df3110cf724f3437a4b68d62b4dd3 SHA256 5022e8a349135f67045f4add47405af0d626c90a5e8b86ee01745755946e1390
 DIST netfilter-layer7-v2.2.tar.gz 88944 RMD160 cf421e6ef4acf5b9107feacaee6566d55ad21683 SHA1 55eaad3b4e46feff09910cd5e3c76c57ac12dc58 SHA256 e82cc356ece2bea3da2bb4b467063a96337ced4bde6127a44f0296245e74d57d
+DIST netfilter-layer7-v2.3.tar.gz 105587 RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d SHA1 cfbe80a6c5725732e4935692e4b0cf5b42abd4f0 SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa
 EBUILD iptables-1.2.11-r3.ebuild 5335 RMD160 be0e4f868b4f24b39b1a684a6b120d5120ec0763 SHA1 77755490bb3a7fde4779c0ef633bfe65b238601f SHA256 8ffed50f6d6ebbf4159b72279adda848f5932f615901c4066cbbd466f089054f
 MD5 fc6e50abc57966f2b5655301809a6d15 iptables-1.2.11-r3.ebuild 5335
 RMD160 be0e4f868b4f24b39b1a684a6b120d5120ec0763 iptables-1.2.11-r3.ebuild 5335
@@ -104,14 +105,18 @@ EBUILD iptables-1.3.5-r3.ebuild 5241 RMD160 5991dc79f8ad2ccaa452df9bc0360ee2c4dd
 MD5 394593497a454f0f24dcf449aacd07a7 iptables-1.3.5-r3.ebuild 5241
 RMD160 5991dc79f8ad2ccaa452df9bc0360ee2c4dd2326 iptables-1.3.5-r3.ebuild 5241
 SHA256 d5102e65285357386d6635c1ac816320bfc8770ad0f6e1bad9c9dde38089faac iptables-1.3.5-r3.ebuild 5241
+EBUILD iptables-1.3.5-r4.ebuild 5500 RMD160 417a7da1d34bbaa77ce93595a193e8403fdac080 SHA1 0ba05c3285e6af25f22f69155afe1b9f27806a2e SHA256 6610007e69b62bcaa3f5c9bab245052f67ee7be9f9672db31aee4dd97c800696
+MD5 b1c7dbc292d2da3dd1fcdb2be16834e4 iptables-1.3.5-r4.ebuild 5500
+RMD160 417a7da1d34bbaa77ce93595a193e8403fdac080 iptables-1.3.5-r4.ebuild 5500
+SHA256 6610007e69b62bcaa3f5c9bab245052f67ee7be9f9672db31aee4dd97c800696 iptables-1.3.5-r4.ebuild 5500
 EBUILD iptables-1.3.5.ebuild 5064 RMD160 f8e01015e5804862da12168cca8da9bf451dfb14 SHA1 d1b64266e3cadc4932729d10219ba37962abbc54 SHA256 1a37910c39e95ed8efbf2aaf132fc8c6878b61e0cbeb635ca072d9a68193f94e
 MD5 925412ddd3ef1cda9a5c0016c2268c06 iptables-1.3.5.ebuild 5064
 RMD160 f8e01015e5804862da12168cca8da9bf451dfb14 iptables-1.3.5.ebuild 5064
 SHA256 1a37910c39e95ed8efbf2aaf132fc8c6878b61e0cbeb635ca072d9a68193f94e iptables-1.3.5.ebuild 5064
-MISC ChangeLog 22756 RMD160 20a244972032969fed86e7d4b05365025282167e SHA1 c8c2bfea92d1a4b17a7d4b45609d0f06911d1af7 SHA256 af5ea455f1e876ef5d097d96452d6615851af7b9c37ef85dc0528083714be915
-MD5 66b5e25829455c11e1032071b9756ff8 ChangeLog 22756
-RMD160 20a244972032969fed86e7d4b05365025282167e ChangeLog 22756
-SHA256 af5ea455f1e876ef5d097d96452d6615851af7b9c37ef85dc0528083714be915 ChangeLog 22756
+MISC ChangeLog 22963 RMD160 f6d747ade4728716bfcc94f68cdfc328850034f8 SHA1 7e14ae8f63c3bd2eab08eb0c01873e367e488a53 SHA256 3b891ea15c81c8e9b6cae4555757d37b22c41ada2e2652ec4347aea196216e04
+MD5 de2ce8399b18aa8dace1881908935c9e ChangeLog 22963
+RMD160 f6d747ade4728716bfcc94f68cdfc328850034f8 ChangeLog 22963
+SHA256 3b891ea15c81c8e9b6cae4555757d37b22c41ada2e2652ec4347aea196216e04 ChangeLog 22963
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -134,10 +139,13 @@ SHA256 5526edeb288993a93689f0d39cacd94bc6dbd0f8f41ea3b4e30b1d4790acee72 files/di
 MD5 d82cc3133eb927e81ab276517942bda8 files/digest-iptables-1.3.5-r3 756
 RMD160 d25e371e2340dab6d400d7b05a185b5dea41ae6d files/digest-iptables-1.3.5-r3 756
 SHA256 5526edeb288993a93689f0d39cacd94bc6dbd0f8f41ea3b4e30b1d4790acee72 files/digest-iptables-1.3.5-r3 756
+MD5 aad33073eeb74d8f8b7b7c1d8a15feda files/digest-iptables-1.3.5-r4 759
+RMD160 b1301d3acf934885365d3dc23a56a0254f97f266 files/digest-iptables-1.3.5-r4 759
+SHA256 77bb5fb7a5d08a68d83c29526ac411e6e40c1a8ae103bf446895f7b355bc5e7c files/digest-iptables-1.3.5-r4 759
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEsKNLmdTrptrqvGERAsHLAJ9nMXHTcIyv4sihbmj4VE/L0iPDmQCfa39w
-Ab/O7NHwimq//P0EPbBKg6M=
-=5F37
+iD8DBQFEyb9A1ZcsMnZjRyIRAsUdAJ4qLWqewoKkb2wUMBOnkXpUaMQJagCdGmGy
+51LDgcP8VvhxcN7s5YRGGO0=
+=63i0
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/digest-iptables-1.3.5-r4 b/net-firewall/iptables/files/digest-iptables-1.3.5-r4
new file mode 100644
index 000000000000..093eaeff280d
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.3.5-r4
@@ -0,0 +1,9 @@
+MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369
+RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 iptables-1.3.0-imq1.diff 5369
+SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b iptables-1.3.0-imq1.diff 5369
+MD5 00fb916fa8040ca992a5ace56d905ea5 iptables-1.3.5.tar.bz2 191820
+RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e528 iptables-1.3.5.tar.bz2 191820
+SHA256 1d8ee8634d167b0f1a8872b6547910c11bae676699faf2b4bc2c84a128449c3c iptables-1.3.5.tar.bz2 191820
+MD5 5d8ee8f7b41f562296bfff3eb43406ee netfilter-layer7-v2.3.tar.gz 105587
+RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d netfilter-layer7-v2.3.tar.gz 105587
+SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa netfilter-layer7-v2.3.tar.gz 105587
diff --git a/net-firewall/iptables/iptables-1.3.5-r4.ebuild b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
new file mode 100644
index 000000000000..0b2aea670fe1
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.1 2006/07/28 07:36:39 azarah Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+L7_PV="2.3"
+L7_P="netfilter-layer7-v${L7_PV}"
+L7_PATCH="iptables-layer7-${L7_PV}.patch"
+IMQ_PATCH="iptables-1.3.0-imq1.diff"
+
+DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
+HOMEPAGE="http://www.iptables.org/ http://www.linuximq.net/ http://l7-filter.sf.net/"
+SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
+	imq? (	http://www.linuximq.net/patchs/${IMQ_PATCH} )
+	l7filter? (	mirror://sourceforge/l7-filter/${L7_P}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 static imq l7filter extensions"
+
+DEPEND="virtual/os-headers
+	l7filter? ( virtual/linux-sources )
+	imq? ( virtual/linux-sources )"
+RDEPEND=""
+
+pkg_setup() {
+	if use l7filter || use imq || use extensions ; then
+		ewarn "WARNING: 3rd party extensions has been enabled."
+		ewarn "This means that iptables will use your currently installed"
+		ewarn "kernel in ${KERNEL_DIR} as headers for iptables."
+		ewarn
+		if use extensions ; then
+			ewarn "You may have to patch your kernel to allow iptables to build."
+			ewarn "Please check http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/ for patches"
+			ewarn "for your kernel."
+			ewarn
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use l7filter && \
+		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c" ]; then
+		die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this"
+	fi
+	if use imq && \
+		[ ! -f "${KERNEL_DIR}/net/ipv4/netfilter/ipt_IMQ.c" ]; then
+		die "For IMQ support add a patch from http://www.linuximq.net/patches.html to your kernel"
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use l7filter && unpack ${L7_P}.tar.gz
+	cd "${S}"
+
+	EPATCH_OPTS="-p0" \
+	epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch
+	EPATCH_OPTS="-p1" \
+	epatch "${FILESDIR}"/1.3.1-files/install_all_dev_files.patch-1.3.1
+
+	# this provide's grsec's stealth match
+	EPATCH_OPTS="-p0" \
+	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1
+	sed -i \
+		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
+		extensions/Makefile || die "failed to enable stealth extension"
+
+	EPATCH_OPTS="-p1" \
+	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
+
+	# bug #139726
+	epatch "${FILESDIR}"/1.3.5-files/${P}-errno.patch
+
+	if use imq ; then
+		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
+		chmod +x extensions/{.IMQ-test*,.childlevel-test*}
+	fi
+	if use l7filter ; then
+		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
+		chmod +x extensions/.layer7-test*
+	fi
+}
+
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/$(get_libdir)"
+	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
+	if ! use l7filter && ! use imq; then
+		export KERNEL_DIR="/usr"
+		diemsg="failure"
+	else
+		diemsg="failure - with l7filter or imq patch added"
+	fi
+	export diemsg
+}
+
+
+src_compile() {
+	src_defs
+
+	# iptables will NOT work correctly unless -O[123] are present!
+	replace-flags -O0 -O2
+	get-flag -O || append-flags -O2
+
+	# prevent it from causing ICMP errors.
+	# http://bugs.gentoo.org/show_bug.cgi?id=23645
+	filter-flags -fstack-protector
+
+	emake -j1 \
+		COPT_FLAGS="${CFLAGS}" ${myconf} \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		CC="$(tc-getCC)" \
+		|| die "${diemsg}"
+}
+
+src_install() {
+	src_defs
+	make ${myconf} \
+		DESTDIR="${D}" \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		install install-devel || die "${diemsg}"
+
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)
+
+	keepdir /var/lib/iptables
+	newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables
+	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
+
+	if use ipv6 ; then
+		keepdir /var/lib/ip6tables
+		newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables
+		newconfd "${FILESDIR}"/ip6tables-1.3.2.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 && 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 not a part of the iptables initscripts."
+	einfo
+	einfo "To enable ipforwarding at bootup:"
+	einfo "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
+	if use ipv6 ; then
+		einfo "and/or"
+		einfo "  net.ipv6.ip_forward = 1"
+		einfo "for ipv6."
+	fi
+	if has_version '=net-firewall/iptables-1.2*' ; then
+		echo
+		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
+		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
+		ewarn "http://bugs.gentoo.org/92535"
+	fi
+}