IMQ patches updated for iptables 1.4.x. Added myself into metadata for l7filter and imq extensions.

Package-Manager: portage-2.1.3.19

6 files changed, 70 insertions, 41 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index c98541f918a7..724d7f6f0a68 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,10 @@
 # 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.157 2007/12/30 15:00:48 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.158 2008/01/08 16:23:30 pva Exp $
+
+  08 Jan 2008; <pva@gentoo.org> metadata.xml, iptables-1.4.0-r1.ebuild:
+  IMQ patches updated for iptables 1.4.x. Added myself into metadata for
+  l7filter and imq extensions.
 
 *iptables-1.4.0-r1 (30 Dec 2007)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 79890d87cf30..6601e5a83d06 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
@@ -67,6 +64,7 @@ DIST iptables-1.3.6-imq.diff 5723 RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9
 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 iptables-1.4.0-imq.diff 5345 RMD160 71e012358cb0ed274feb46f862d300cf0d877818 SHA1 8e243b15c20400402d60f627a40b08957ac96c10 SHA256 e23d5bce7845cbe6fecf9e93e4e8e329948adb8282efec932d629b3bb4cb9c82
 DIST iptables-1.4.0.tar.bz2 181610 RMD160 6f6a29cbe0e55261607acc1183e04482c444286e SHA1 b61064885ab20b62d6ac2a590ea429117248d9d7 SHA256 fd9a978035e6a8f73344f986c84a222dc4ac3706b901e0c1ecae9647db5e5d52
 DIST netfilter-layer7-v2.13.tar.gz 159622 RMD160 fbb27da483636729ca0cbf04d88f8b5bcfe95bce SHA1 30d6a046d11b3256192d96c45d88c41953642c86 SHA256 41ca603d745018e0d60e90ab042e8d23abbe7db428c06800b9f15e0d727493a6
 DIST netfilter-layer7-v2.17.tar.gz 160408 RMD160 9823d7b411e18160dc8501a6a5d2129f75e727e1 SHA1 fd05e5b5027ec5c143f2f63f5e48c05ffea8d50f SHA256 2e2893757a3b22f2786ead2045efae1d6a52942a89d0159c39ba907531b60c01
@@ -105,22 +103,22 @@ EBUILD iptables-1.3.8.ebuild 5655 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e
 MD5 d6927f7f20594172d561244f46382933 iptables-1.3.8.ebuild 5655
 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e0 iptables-1.3.8.ebuild 5655
 SHA256 1674842ce149e1e22c0f91e6348ca8f1369347acf7170b70c83bed5f11bd9289 iptables-1.3.8.ebuild 5655
-EBUILD iptables-1.4.0-r1.ebuild 6022 RMD160 d694275d1973d28d0258c9c87fa6e31b59e3156c SHA1 57adc55f7942dbf9dd10fb0658c06b25d4222ba0 SHA256 ff8f36a5ba56321907812083d991d9dd3d642fdc6fc564996d6bee99e044c5c2
-MD5 cb123337d5d8001294f60e6bf2438d52 iptables-1.4.0-r1.ebuild 6022
-RMD160 d694275d1973d28d0258c9c87fa6e31b59e3156c iptables-1.4.0-r1.ebuild 6022
-SHA256 ff8f36a5ba56321907812083d991d9dd3d642fdc6fc564996d6bee99e044c5c2 iptables-1.4.0-r1.ebuild 6022
-EBUILD iptables-1.4.0.ebuild 5975 RMD160 d48cba33009ae343bbd3e944a4e9c865fce98036 SHA1 606007f2320e7babe6a6ca24206c416711e2287f SHA256 fc6e19e81c5d1c463a2b9d6bfc7f3b79691c1bf410419d1c8c039f6e3a0c2544
-MD5 dfbe605c2ae547732887fb1c5f1743e7 iptables-1.4.0.ebuild 5975
-RMD160 d48cba33009ae343bbd3e944a4e9c865fce98036 iptables-1.4.0.ebuild 5975
-SHA256 fc6e19e81c5d1c463a2b9d6bfc7f3b79691c1bf410419d1c8c039f6e3a0c2544 iptables-1.4.0.ebuild 5975
-MISC ChangeLog 30611 RMD160 5b699afad184b16baa56b5c6c0d52a3bcb685f15 SHA1 8f33c352857f4c52ac04db360e53404be67e86db SHA256 e5d243f204866a1c691adb3be7b694fa7aeafc53e99689cb2f901afdbe2f099b
-MD5 b7fdb464230a14f6143a960a324ebbf7 ChangeLog 30611
-RMD160 5b699afad184b16baa56b5c6c0d52a3bcb685f15 ChangeLog 30611
-SHA256 e5d243f204866a1c691adb3be7b694fa7aeafc53e99689cb2f901afdbe2f099b ChangeLog 30611
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
-SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+EBUILD iptables-1.4.0-r1.ebuild 6625 RMD160 3041b7c1105e241ccff1cd086998bb1f9b255518 SHA1 aa1fb2f67ba01a8706775f9126341750dc1e84cc SHA256 89f5e9828d4684874211a4a3c08bcfa69c08f89d8aeb972293c473c9eb49a1f9
+MD5 3e54e0310ab458adb90c5752ba6995fc iptables-1.4.0-r1.ebuild 6625
+RMD160 3041b7c1105e241ccff1cd086998bb1f9b255518 iptables-1.4.0-r1.ebuild 6625
+SHA256 89f5e9828d4684874211a4a3c08bcfa69c08f89d8aeb972293c473c9eb49a1f9 iptables-1.4.0-r1.ebuild 6625
+EBUILD iptables-1.4.0.ebuild 5972 RMD160 8395840f3652843133b6267ff204e40e3ecd3ef2 SHA1 bcc1adc3e2ffb1b452ef35e6e7b7f477bf313398 SHA256 409f00e4342fde45648716a7613425cc8c8a8c0f676af8c18c50c5c704a29c5a
+MD5 b85a797643dcf9a42877d0df6c78eee9 iptables-1.4.0.ebuild 5972
+RMD160 8395840f3652843133b6267ff204e40e3ecd3ef2 iptables-1.4.0.ebuild 5972
+SHA256 409f00e4342fde45648716a7613425cc8c8a8c0f676af8c18c50c5c704a29c5a iptables-1.4.0.ebuild 5972
+MISC ChangeLog 30785 RMD160 e73b46a68b6046e00c68da595258b14464312ff5 SHA1 1c200c1536dc0756d5f4ce77ca4b2eb62ee23861 SHA256 b3378bb1ff5e3109f2a5630fe61931f984e00a26cf9a89de22252178c98caa26
+MD5 96a6c1a81203edabb70e165b4d02e0fd ChangeLog 30785
+RMD160 e73b46a68b6046e00c68da595258b14464312ff5 ChangeLog 30785
+SHA256 b3378bb1ff5e3109f2a5630fe61931f984e00a26cf9a89de22252178c98caa26 ChangeLog 30785
+MISC metadata.xml 1015 RMD160 0bb4f52ba327423420cdcc23db5cee7063c44d57 SHA1 5b4bae641caf5a6e8b55e1f152097b439ec64fed SHA256 5f5208578deb289580374039a678ee613fe0ed13fe131e24b82a4c5b3ee72a9c
+MD5 e1d9b68e6d1c597f0fb3de47b3378d1d metadata.xml 1015
+RMD160 0bb4f52ba327423420cdcc23db5cee7063c44d57 metadata.xml 1015
+SHA256 5f5208578deb289580374039a678ee613fe0ed13fe131e24b82a4c5b3ee72a9c metadata.xml 1015
 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
@@ -148,13 +146,6 @@ SHA256 31958f9bc65d8bb0aaf1af3d2cf744da7a2b279963085102f432d9a52b5b8e12 files/di
 MD5 279b185fe5ec6129f31f7aca28cd903a files/digest-iptables-1.4.0 515
 RMD160 99f6f29a5d212a3036e147add3e4f044bb1efcbf files/digest-iptables-1.4.0 515
 SHA256 9a53dfb37a3dd566aabfe2b7d3d4186c0f874753b2bcdcecea697d70e0bf4579 files/digest-iptables-1.4.0 515
-MD5 279b185fe5ec6129f31f7aca28cd903a files/digest-iptables-1.4.0-r1 515
-RMD160 99f6f29a5d212a3036e147add3e4f044bb1efcbf files/digest-iptables-1.4.0-r1 515
-SHA256 9a53dfb37a3dd566aabfe2b7d3d4186c0f874753b2bcdcecea697d70e0bf4579 files/digest-iptables-1.4.0-r1 515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkd313gACgkQj9hvisErhMJ2DwCfRNpd6JX110EV79huA9ZQ1P9K
-pDkAn1YLgUJrucmJTjqhjj6/XZ5DUvQO
-=Cjw/
------END PGP SIGNATURE-----
+MD5 ab0e2c1e5257362f67eb2ae238594702 files/digest-iptables-1.4.0-r1 759
+RMD160 1f4381f26567084206dd402410c22c0c9016d19e files/digest-iptables-1.4.0-r1 759
+SHA256 84dfcb5a2ad2cd24f6f73f1945176f5f4eb3d17a05bacc1695fbb4ce0f729e93 files/digest-iptables-1.4.0-r1 759
diff --git a/net-firewall/iptables/files/digest-iptables-1.4.0-r1 b/net-firewall/iptables/files/digest-iptables-1.4.0-r1
index 56c018717665..f1a2057e4aa4 100644
--- a/net-firewall/iptables/files/digest-iptables-1.4.0-r1
+++ b/net-firewall/iptables/files/digest-iptables-1.4.0-r1
@@ -1,3 +1,6 @@
+MD5 0289aa81badbab94d375a935c4d1e614 iptables-1.4.0-imq.diff 5345
+RMD160 71e012358cb0ed274feb46f862d300cf0d877818 iptables-1.4.0-imq.diff 5345
+SHA256 e23d5bce7845cbe6fecf9e93e4e8e329948adb8282efec932d629b3bb4cb9c82 iptables-1.4.0-imq.diff 5345
 MD5 90cfa8a554a29b0b859a625e701af2a7 iptables-1.4.0.tar.bz2 181610
 RMD160 6f6a29cbe0e55261607acc1183e04482c444286e iptables-1.4.0.tar.bz2 181610
 SHA256 fd9a978035e6a8f73344f986c84a222dc4ac3706b901e0c1ecae9647db5e5d52 iptables-1.4.0.tar.bz2 181610
diff --git a/net-firewall/iptables/iptables-1.4.0-r1.ebuild b/net-firewall/iptables/iptables-1.4.0-r1.ebuild
index 02d8a4b48f15..2618eded6565 100644
--- a/net-firewall/iptables/iptables-1.4.0-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.0-r1.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.1 2007/12/30 15:00:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.2 2008/01/08 16:23:30 pva Exp $
 
 inherit eutils toolchain-funcs linux-info
 
 L7_PV=2.17
 L7_P=netfilter-layer7-v${L7_PV}
+IMQ_PATCH=iptables-1.4.0-imq.diff
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.iptables.org/ http://l7-filter.sf.net/"
+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.actusa.net/~linuximq/${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 ipv6 l7filter static"
+IUSE="extensions imq ipv6 l7filter static"
 
 DEPEND="virtual/os-headers
-	l7filter? ( virtual/linux-sources )"
+	l7filter? ( virtual/linux-sources )
+	imq? ( virtual/linux-sources )"
 RDEPEND=""
 
 pkg_setup() {
-	if use l7filter || use extensions ; then
+	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."
@@ -46,6 +49,12 @@ pkg_setup() {
 		[ ! -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
+			eerror "For IMQ support add a patch from http://www.actusa.net/~linuximq/ or from"
+			eerror "http://www.linuximq.net/patches.html (for older kernels) to your kernel."
+			die "Please, patch your kernel to support IMQ."
+	fi
 }
 
 src_unpack() {
@@ -79,6 +88,11 @@ src_unpack() {
 		fi
 	done
 
+	if use imq ; then
+		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
+		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
@@ -116,7 +130,7 @@ src_defs() {
 	use ipv6 || myconf="${myconf} DO_IPV6=0"
 	use static && myconf="${myconf} NO_SHARED_LIBS=0"
 	export myconf
-	if ! use l7filter && ! use extensions ; then
+	if ! use l7filter && ! use imq && ! use extensions ; then
 		export KERNEL_DIR=$(
 			# ugh -- iptables has scripts which check for the existence of
 			# files so we need to give it the right path to our toolchains
@@ -127,7 +141,7 @@ src_defs() {
 		export KBUILD_OUTPUT=${KERNEL_DIR}
 		diemsg="failure"
 	else
-		diemsg="failure - with l7filter and/or other miscellanious patches added"
+		diemsg="failure - with l7filter and/or imq patch and/or other miscellanious patches added"
 	fi
 	export diemsg
 }
diff --git a/net-firewall/iptables/iptables-1.4.0.ebuild b/net-firewall/iptables/iptables-1.4.0.ebuild
index 18bd6b28829f..fb18e66873b3 100644
--- a/net-firewall/iptables/iptables-1.4.0.ebuild
+++ b/net-firewall/iptables/iptables-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.3 2007/12/27 21:48:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.4 2008/01/08 16:23:30 pva Exp $
 
 inherit eutils toolchain-funcs linux-info
 
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index 96a2d586367d..56a117cad3e1 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -2,4 +2,21 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<maintainer>
+	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
+	<description>imq and l7filter extensions</description>
+</maintainer>
+<longdescription>
+  iptables is the userspace command line program used to set up, maintain, and
+  inspect the tables of IPv4 packet filter rules in the Linux kernel. It's a
+  part of packet filtering framework which allows the stateless and stateful
+  packet filtering, all kinds of network address and port translation, and is a
+  flexible and extensible infrastructure with multiple layers of API's for 3rd
+  party extensions. The iptables package also includes ip6tables. ip6tables is
+  used for configuring the IPv6 packet filter.
+
+  Note that some extensions (e.g. imq and l7filter) are not included into
+  official kernel sources so you have to patch the sources before installation.
+</longdescription>
 </pkgmetadata>