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

(Portage version: 2.1.3.19)

5 files changed, 50 insertions, 12 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/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>