l7 & imq patch update as per bug ##184164 thanks to cilly

Package-Manager: portage-2.1.2.7

4 files changed, 231 insertions, 15 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 8d2c10056f37..7625b254c9b6 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.135 2007/06/25 17:00:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.136 2007/07/07 02:35:09 dragonheart Exp $
+
+*iptables-1.3.8-r1 (07 Jul 2007)
+
+  07 Jul 2007; Daniel Black <dragonheart@gentoo.org>
+  +iptables-1.3.8-r1.ebuild:
+  l7 & imq patch update as per bug ##184164 thanks to cilly
 
 *iptables-1.3.8 (25 Jun 2007)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 2e65ba6a9bdc..1720fed9716f 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 1315 RMD160 3665aaa6788261f16372c1e34810fe99fd60453c SHA1 b3c88dc5ceebc15aca73fcc02afdf8d0fa6a389f SHA256 f86e32f84af0e68b927b712a60e5d02d1bc27972537f476c71a311711fdcfc12
 MD5 319d0b089a495ce1ab8ca02b3820dfe3 files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 1315
 RMD160 3665aaa6788261f16372c1e34810fe99fd60453c files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1 1315
@@ -59,9 +56,11 @@ RMD160 9767d237580dfe162f1377dd65bc928b57db8c19 files/iptables-1.3.7-test-dir.pa
 SHA256 1ad36b68840396e45ca71fe93984caaaac105fddf102fda92fe24067206bccf1 files/iptables-1.3.7-test-dir.patch 890
 DIST iptables-1.3.0-imq1.diff 5369 RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 SHA1 bdf665cacc985fceaadf119ae7a756caca1589ad SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b
 DIST iptables-1.3.5.tar.bz2 191820 RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e528 SHA1 6dbeeee13517fa02852960b6f6e51115c7548a09 SHA256 1d8ee8634d167b0f1a8872b6547910c11bae676699faf2b4bc2c84a128449c3c
+DIST iptables-1.3.6-imq.diff 5723 RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c SHA1 1a2d7d9bcb10e7d4e69f445d4882ab598b57855e SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7
 DIST iptables-1.3.6.tar.bz2 185438 RMD160 54d9777f2116ad57253446c42619c726f68ae8f0 SHA1 d0c873b4ce1a928424f38fa8419c96be22fef5d0 SHA256 4394c3de8c55776e54a36a6fcd4f9eeed381f451883049f8268c34c3482f5f1b
 DIST iptables-1.3.7.tar.bz2 196205 RMD160 8109f2d58eb33905bbbbc0cf871abc8172e7ddc0 SHA1 2f25e7a81fb3e81f92b0121d9dcd5a536854dc60 SHA256 0e00cea0029eaf7923a4a901265d5aa8159804b520fda9c12df54d350073ce02
 DIST iptables-1.3.8.tar.bz2 172584 RMD160 851b223eef0ca008ad1f375aa0ebdab46ff6f886 SHA1 948f361b194e989b39de4cfa3e95dbe634269ed0 SHA256 c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
+DIST netfilter-layer7-v2.12.tar.gz 160071 RMD160 a9e5ae2650837f64564e27daf6c3c0652c97bd55 SHA1 f3121f04473c78334a800170c23d584009b0de6b SHA256 1ea9c8952e70a1a43d8bdf30478d46ce9d10a0a77b0bca99e6931deb6d753b6d
 DIST netfilter-layer7-v2.3.tar.gz 105587 RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d SHA1 cfbe80a6c5725732e4935692e4b0cf5b42abd4f0 SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa
 DIST netfilter-layer7-v2.6.tar.gz 122514 RMD160 31b68ae3baa0a340f2e4a555fd5124c3b977629d SHA1 6120eae8bd405d35d079774d191830d137643147 SHA256 c5a842c037e915eb72576e5861f0b048837719f1edf448775d9218b42c48e0aa
 DIST netfilter-layer7-v2.9.tar.gz 122497 RMD160 0398b8b61b24eb5d28309a53af0279e9f201318d SHA1 c4a1d92855ad51413fbd7229fe9decfe45aac084 SHA256 7db0e22297f7ecec41bb973733d6970bab922b4c54f779239616fa26a2315969
@@ -81,14 +80,18 @@ EBUILD iptables-1.3.7.ebuild 5861 RMD160 71d46e076b0e1090a0abddaf85a96c9a4f1c6fc
 MD5 cea0c6b176e410cb01b8eeb367607cdd iptables-1.3.7.ebuild 5861
 RMD160 71d46e076b0e1090a0abddaf85a96c9a4f1c6fca iptables-1.3.7.ebuild 5861
 SHA256 9f6c7b865272b95e4143b6e01525345c240fd525a87e061ebe26082cf7336463 iptables-1.3.7.ebuild 5861
+EBUILD iptables-1.3.8-r1.ebuild 6236 RMD160 7fc9ff81d4dd08754370b6fda51fc92a71676efb SHA1 3467c93463e97dd06da7f75f2c118160655eba3a SHA256 da52253611ea470ccd362124bb0d492e78730f3c39ef5e9a0f706bc73fc87061
+MD5 ed8ead2927a1da68150787b6e32dafd9 iptables-1.3.8-r1.ebuild 6236
+RMD160 7fc9ff81d4dd08754370b6fda51fc92a71676efb iptables-1.3.8-r1.ebuild 6236
+SHA256 da52253611ea470ccd362124bb0d492e78730f3c39ef5e9a0f706bc73fc87061 iptables-1.3.8-r1.ebuild 6236
 EBUILD iptables-1.3.8.ebuild 5655 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e0 SHA1 d8b0f148549e5ffa6d86674291e0bb8f21f3d0db SHA256 1674842ce149e1e22c0f91e6348ca8f1369347acf7170b70c83bed5f11bd9289
 MD5 d6927f7f20594172d561244f46382933 iptables-1.3.8.ebuild 5655
 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e0 iptables-1.3.8.ebuild 5655
 SHA256 1674842ce149e1e22c0f91e6348ca8f1369347acf7170b70c83bed5f11bd9289 iptables-1.3.8.ebuild 5655
-MISC ChangeLog 27740 RMD160 c39281f6d7164167217bf611c523494e07e552af SHA1 f735f6e2bac584396d58dc451fd548b8d2f57069 SHA256 c0cfe7100641e4e1e363e9ce52f4ff67497d53282b7eeb797b331c3afbd26378
-MD5 6b777b9aac5b4c13f7aa1152ac9bed1b ChangeLog 27740
-RMD160 c39281f6d7164167217bf611c523494e07e552af ChangeLog 27740
-SHA256 c0cfe7100641e4e1e363e9ce52f4ff67497d53282b7eeb797b331c3afbd26378 ChangeLog 27740
+MISC ChangeLog 27922 RMD160 b6efbc3564f19a138e5d665fcfc7c27aeb80c107 SHA1 738418716a21d7f3130a9a7809a71aeab9061d55 SHA256 8515750c253638803adf4e0873e31dd31ec9b2c8cb95480557e08e5b91b32deb
+MD5 4071745744a0959c675a8f3d8de74d03 ChangeLog 27922
+RMD160 b6efbc3564f19a138e5d665fcfc7c27aeb80c107 ChangeLog 27922
+SHA256 8515750c253638803adf4e0873e31dd31ec9b2c8cb95480557e08e5b91b32deb ChangeLog 27922
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -108,10 +111,6 @@ SHA256 7d47914b31c063817423c4f38b8f047f2f9094f749991b37e12b3987f644d990 files/di
 MD5 cf2fd4771f41148812bf1b53201e9517 files/digest-iptables-1.3.8 759
 RMD160 83f20c342498fb255b672fbb73aef9e79b4d7705 files/digest-iptables-1.3.8 759
 SHA256 8048b01e4f6f9fb10439865f89148da4ec062c2cf58f173d8c0f972fc30da0e6 files/digest-iptables-1.3.8 759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGf/VIp/wUKkr7RBoRAm02AKDON5UIBoAl/MsMA7ybPftZmSzzkwCfdTso
-6zqixtPd8s29hsbZiRsYjVo=
-=1f6x
------END PGP SIGNATURE-----
+MD5 486117331b93802e0200f0683f7a185f files/digest-iptables-1.3.8-r1 759
+RMD160 be5c34e2dd5c0b94f6fd71854ca523d1fa66fb60 files/digest-iptables-1.3.8-r1 759
+SHA256 917bf3902facf3326971e1bbbfa10242ec0f306a6511e95088cbb2bbdd5f6a1f files/digest-iptables-1.3.8-r1 759
diff --git a/net-firewall/iptables/files/digest-iptables-1.3.8-r1 b/net-firewall/iptables/files/digest-iptables-1.3.8-r1
new file mode 100644
index 000000000000..adec1e229e4b
--- /dev/null
+++ b/net-firewall/iptables/files/digest-iptables-1.3.8-r1
@@ -0,0 +1,9 @@
+MD5 133a27ce2aa95581e91d364827f68293 iptables-1.3.6-imq.diff 5723
+RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c iptables-1.3.6-imq.diff 5723
+SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7 iptables-1.3.6-imq.diff 5723
+MD5 0a9209f928002e5eee9cdff8fef4d4b3 iptables-1.3.8.tar.bz2 172584
+RMD160 851b223eef0ca008ad1f375aa0ebdab46ff6f886 iptables-1.3.8.tar.bz2 172584
+SHA256 c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c iptables-1.3.8.tar.bz2 172584
+MD5 9eff148d529760fa6f9323fe05c0247c netfilter-layer7-v2.12.tar.gz 160071
+RMD160 a9e5ae2650837f64564e27daf6c3c0652c97bd55 netfilter-layer7-v2.12.tar.gz 160071
+SHA256 1ea9c8952e70a1a43d8bdf30478d46ce9d10a0a77b0bca99e6931deb6d753b6d netfilter-layer7-v2.12.tar.gz 160071
diff --git a/net-firewall/iptables/iptables-1.3.8-r1.ebuild b/net-firewall/iptables/iptables-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..7d344f7792f1
--- /dev/null
+++ b/net-firewall/iptables/iptables-1.3.8-r1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r1.ebuild,v 1.1 2007/07/07 02:35:09 dragonheart Exp $
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+L7_PV=2.12
+L7_P=netfilter-layer7-v${L7_PV}
+IMQ_PATCH=iptables-1.3.6-imq.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="extensions imq ipv6 l7filter static"
+
+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 kernel_is ge 2 6 20
+	then
+		L7FILE=${KERNEL_DIR}/net/netfilter/xt_layer7.c
+	else
+		L7FILE=${KERNEL_DIR}/net/ipv4/netfilter/ipt_layer7.c
+	fi
+	if use l7filter && \
+		[ ! -f "${L7FILE}" ]; 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
+	if use l7filter
+	then
+		unpack ${L7_P}.tar.gz
+	fi
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.3.7-sparc64.patch #166201
+	epatch "${FILESDIR}"/${PN}-1.3.7-kernel-dir.patch #172209
+
+	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"
+
+	if use imq ; then
+		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
+		for OA in extensions/.IMQ-test extensions/.IMQ-test6 ; do
+			mv ${OA} ${OA}.orig
+			tr '\015' '\012'  < ${OA}.orig > ${OA}
+			rm ${OA}.orig
+		done
+		chmod +x extensions/.IMQ-test*
+	fi
+	if use l7filter ; then
+		#yes choosing 2.6.20 was deliberate - upstream mistake possibly
+		if kernel_is ge 2 6 20
+		then
+			L7_PATCH=iptables-for-kernel-2.6.22forward-layer7-${L7_PV}.patch
+		else
+			L7_PATCH=iptables-for-kernel-pre2.6.22-layer7-${L7_PV}.patch
+		fi
+		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
+		chmod +x extensions/.layer7-test*
+	fi
+
+	# the net directory is moving around so account for new/old locations
+	cd "${S}"/extensions
+	local x
+	for x in .*-test* ; do
+		sed -e 's:net/ipv[46]/netfilter:net/netfilter:g' ${x} > .new-${x}
+		if cmp ${x} .new-${x} > /dev/null ; then
+			rm -f .new-${x}
+		else
+			chmod a+rx .new-${x}
+		fi
+	done
+}
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	myconf=""
+	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 && ! use extensions ; then
+		export KERNEL_DIR=""
+		diemsg="failure"
+	else
+		diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches 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
+	# cannot work with the following according to Makefile near check:
+	# -g -pg -DIPTC_DEBUG
+
+	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() {
+	elog "This package now includes an initscript which loads and saves"
+	elog "rules stored in /var/lib/iptables/rules-save"
+	use ipv6 && elog "and /var/lib/ip6tables/rules-save"
+	elog "This location can be changed in /etc/conf.d/iptables"
+	elog
+	elog "If you are using the iptables initsscript you should save your"
+	elog "rules using the new iptables version before rebooting."
+	elog
+	elog "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
+	elog "iptables."
+	elog
+	ewarn "!!! ipforwarding is not a part of the iptables initscripts."
+	ewarn
+	ewarn "To enable ipforwarding at bootup:"
+	ewarn "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
+	if use ipv6 ; then
+		ewarn "and/or"
+		ewarn "  net.ipv6.ip_forward = 1"
+		ewarn "for ipv6."
+	fi
+	if has_version '=net-firewall/iptables-1.2*' ; then
+		ewarn
+		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
+}