l7-filters back as upstream does not provide patch.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 41 insertions, 19 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index c0ff5511ad2a..975daadd16d1 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.189 2009/02/08 15:59:31 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.190 2009/02/09 17:53:26 pva Exp $
+
+  09 Feb 2009; Peter Volkov <pva@gentoo.org> iptables-1.4.2-r2.ebuild:
+  l7-filters back as upstream does not provide patch.
 
   08 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
   iptables-1.4.2-r2.ebuild:
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 97c6ba57ef8a..346a38a40e6c 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
 AUX 1.3.1-files/install_all_dev_files.patch-1.3.1 2748 RMD160 9df4ee7b0a26e83b02ef6cbe071d00841d9a070b SHA1 c854c1d520a923d1616ba1d374bfa5729a122767 SHA256 c61769413e3a71e008f927b0639d26db6586f921f371a89b3db0e892d064af28
 AUX 1.3.1-files/install_ipv6_apps.patch 826 RMD160 505c5832d20fad96839936da900a12b5f4209045 SHA1 6e5808694e17002f2312ea9a45b46fb577694a83 SHA256 0a7f666962e586b2be8d2d3d2947497b3e3837c78b57056ce065455518c78722
@@ -30,14 +27,7 @@ EBUILD iptables-1.3.8-r3.ebuild 7132 RMD160 9da9caa232f1fc421828715a74d18db0d10f
 EBUILD iptables-1.4.0-r1.ebuild 6295 RMD160 60d28cb1ba3e54acdee3a7afeebeb82fe4956eb4 SHA1 29f2cf21aeeea06733811f7757af8fd5412d0ddf SHA256 171847cdcc42344ff5d7ea38c230b7ce0a1bd43ec93a0d00434486592ab7f5e6
 EBUILD iptables-1.4.1.1.ebuild 1646 RMD160 3e0c302b1e766445b91c8bf9798089e4efa91381 SHA1 a0d2be782633920f1816a96685e43f13863ae03c SHA256 044362f3b320f1bcea7bc0ed2932bef9b47a294eb784c3f21852b895a9c57614
 EBUILD iptables-1.4.2-r1.ebuild 1989 RMD160 007f0955a21c967da4560e0e61b715b5309ea0fa SHA1 b0623fdf97fdb345e3defe6652f7852cecbceed2 SHA256 a2ce9f62b4747130a0ea9e36d75100e0856e50c91c4236e6c3751433587c1690
-EBUILD iptables-1.4.2-r2.ebuild 2197 RMD160 a5784bb84338dba74585fe3b6baccfba0113567b SHA1 66fabf02d56599dbaa24907e9fb754916598f9c0 SHA256 c73b24dee6f271551cdab1b47eeddbe0e2c4f7aedbedc80844cbfcaff8cae125
+EBUILD iptables-1.4.2-r2.ebuild 3263 RMD160 5e18a0e5338b852c898d52aa4df57b3843ce52b2 SHA1 d727b40fde5d7a1fc7a82e3ce98e86fde00b74d8 SHA256 75bfc54e23634745377514106da4147ccdaf2602cdc1d8fc19f976a37bd9cfff
 EBUILD iptables-1.4.2.ebuild 1826 RMD160 0929b6dc312ad004e87d0403aa57a41aa5995d76 SHA1 2905f88badc9bf96dc52ad7f9b1e88fc0fb3eab2 SHA256 88497a971a618a2c8ae743397e78a9c927ffdc6e4b2dfed61f05608d7338ae88
-MISC ChangeLog 35565 RMD160 d6ba3039fb202899fd9d5ae6e91f50cd7dee73da SHA1 55a9481efb92686223da2c9c56f176adf60c1eef SHA256 77d9aa86ae9864bfb4e18bd18eda4ff6192c7492922b98a7f1569a3b9d63acae
+MISC ChangeLog 35686 RMD160 a9a852455c1a84fcbd6e287a6b7582c59737dbf9 SHA1 3fe5ff1de2655b57eff6177c46bd6ce1b9566754 SHA256 fcf0f4d5b6765ae0f163db762a32a95ace923fc25543a2affa92281b82dc7766
 MISC metadata.xml 1278 RMD160 5453b196b5ae00ad8fc8dd0d27731cb5425339d4 SHA1 3e0dabdca50df87aa78c5c9236e04ed747f3bc82 SHA256 d6d81511d3e81d6bb2097be63ea6bc9a8871519f1727e6d0b89bf231bd6ba92b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmPMCwACgkQn/5bYzqsSmEgkACcDZ9V5XnRyv10ylGSfQul6Wfw
-2/kAni2JzXhg6vpr3g1Jy6pbNvGs8wQp
-=8eYy
------END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.4.2-r2.ebuild b/net-firewall/iptables/iptables-1.4.2-r2.ebuild
index f0c0742a7176..fe7a92cbf639 100644
--- a/net-firewall/iptables/iptables-1.4.2-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.4.2-r2.ebuild
@@ -1,23 +1,48 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r2.ebuild,v 1.5 2009/02/08 19:19:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.2-r2.ebuild,v 1.6 2009/02/09 17:53:26 pva Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs linux-info
+
+L7_PV=2.21
+L7_P=netfilter-layer7-v${L7_PV}
 
 DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
 HOMEPAGE="http://www.iptables.org/"
-SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
+SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
+	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=""
+IUSE="l7filter"
 
 DEPEND="virtual/os-headers"
 RDEPEND=""
 
+pkg_setup() {
+	if use l7filter ; 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."
+		linux-info_pkg_setup
+
+		if kernel_is lt 2 6 20 ; then
+			eerror "Currently there is no l7-filter patch available for iptables-1.4.x"
+			eerror "and kernel version before 2.6.20."
+			eerror "If you need to compile iptables 1.4.x against Linux 2.6.19.x"
+			eerror "or earlier, with l7-filter patch, please, report upstream."
+			die "No patch available."
+		fi
+
+		[[ ! -f ${KERNEL_DIR}/include/linux/netfilter/xt_layer7.h ]] && \
+			die "For layer 7 support emerge net-misc/l7-filter-${L7_PV} before this."
+	fi
+}
+
 src_unpack() {
 	unpack ${P}.tar.bz2
+	use l7filter && unpack ${L7_P}.tar.gz
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-glibc.patch
 	epatch "${FILESDIR}"/${P}-no-ldconfig.patch
@@ -40,18 +65,22 @@ src_unpack() {
 			break
 		fi
 	done
+
+	if use l7filter ; then
+		cp "${WORKDIR}/${L7_P}/iptables-1.4.1.1-for-kernel-2.6.20forward"/* extensions \
+			|| die "Failed to copy l7filter sources"
+	fi
 }
 
 src_compile() {
 	econf \
 		--sbindir=/sbin \
 		--libexecdir=/$(get_libdir) \
-		--without-kernel \
 		--enable-devel \
 		--enable-libipq \
 		--enable-shared \
 		--enable-static \
-		|| die
+		$(use_with l7filter kernel ${KERNEL_DIR})
 	emake V=1 || die
 }