Updated l7-filter patches for iptables-1.4.x.

Package-Manager: portage-2.1.3.19

3 files changed, 19 insertions, 22 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 9522ed30630d..21ff9edfc0d0 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,9 @@
 # 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.154 2007/12/24 11:25:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.155 2007/12/24 11:53:40 pva Exp $
+
+  24 Dec 2007; <pva@gentoo.org> iptables-1.4.0.ebuild:
+  Updated l7-filter patches for iptables-1.4.x.
 
 *iptables-1.4.0 (24 Dec 2007)
 
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index d736f51e4324..6be83aacaad3 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
@@ -101,14 +98,14 @@ 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.ebuild 6362 RMD160 ea6346075b1decb536d4c92e9e957e2fbe2e30b4 SHA1 13026f01ceb62fa3becb8dc74ca4917c0e8c27ec SHA256 63991d4a7c571947429dacb5a4e52070110e3ff3a5ac402d335ce144880cc7c2
-MD5 58b5f069c19bacc5c21cd1b509e5311d iptables-1.4.0.ebuild 6362
-RMD160 ea6346075b1decb536d4c92e9e957e2fbe2e30b4 iptables-1.4.0.ebuild 6362
-SHA256 63991d4a7c571947429dacb5a4e52070110e3ff3a5ac402d335ce144880cc7c2 iptables-1.4.0.ebuild 6362
-MISC ChangeLog 30185 RMD160 55f8d2d0c5c55aee3409afc58b6c718a6ec8fc29 SHA1 559f3450af960a0a15b193c9b144e65c598de70b SHA256 f9a146ccfc4a7fb9083e8871694942800b20e08ec4ca92d6c554e0dd24b2dca4
-MD5 0fc191ec0057fcfd1732bb4aa3093ddc ChangeLog 30185
-RMD160 55f8d2d0c5c55aee3409afc58b6c718a6ec8fc29 ChangeLog 30185
-SHA256 f9a146ccfc4a7fb9083e8871694942800b20e08ec4ca92d6c554e0dd24b2dca4 ChangeLog 30185
+EBUILD iptables-1.4.0.ebuild 6596 RMD160 f1c621f07e1a687e2b69c8b76564af2e435c407b SHA1 0ebae53a65380e93e4d1bce90af7d24cb4d6b447 SHA256 5689cd0df999e0248192eac183a469e74a2c058dfb4627a87920b1e6e3363358
+MD5 7c56b26519e1992a245242f2f3eb71bc iptables-1.4.0.ebuild 6596
+RMD160 f1c621f07e1a687e2b69c8b76564af2e435c407b iptables-1.4.0.ebuild 6596
+SHA256 5689cd0df999e0248192eac183a469e74a2c058dfb4627a87920b1e6e3363358 iptables-1.4.0.ebuild 6596
+MISC ChangeLog 30286 RMD160 72a62481938af5d8e21014d8bc02e81c78808c91 SHA1 8ac606a61883e376940ba5de2293a8f4b400be0d SHA256 7503c873d6e9798ee93191829dfa22f2048df72cff9c351ea3e628f1833c4c0f
+MD5 b243efbef8b0353f848e1c98450b1ddd ChangeLog 30286
+RMD160 72a62481938af5d8e21014d8bc02e81c78808c91 ChangeLog 30286
+SHA256 7503c873d6e9798ee93191829dfa22f2048df72cff9c351ea3e628f1833c4c0f ChangeLog 30286
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -140,10 +137,3 @@ SHA256 31958f9bc65d8bb0aaf1af3d2cf744da7a2b279963085102f432d9a52b5b8e12 files/di
 MD5 9eaed4efb7625102e729db2b80313b5a files/digest-iptables-1.4.0 759
 RMD160 e04548d38d88ed0819db6275ef7ac0894ce3e60a files/digest-iptables-1.4.0 759
 SHA256 bae58746bad3fa30ef6aa21a29812a8f6fe66eda46334c8dd754d153a33bafb2 files/digest-iptables-1.4.0 759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkdvlt8ACgkQj9hvisErhMKfIQCgvP5aVrrso+O01cpt69ac3qcJ
-QwMAnisKma7mTnTVEtBHdmd/9LG7x7ic
-=2HaV
------END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.4.0.ebuild b/net-firewall/iptables/iptables-1.4.0.ebuild
index e944fe82066f..13990d5ebf57 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
 # 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.1 2007/12/24 11:25:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.2 2007/12/24 11:53:40 pva Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -97,9 +97,13 @@ src_unpack() {
 		#yes choosing 2.6.20 was deliberate - upstream mistake possibly
 		if kernel_is ge 2 6 20
 		then
-			L7_PATCH=iptables-1.3-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
+			L7_PATCH=iptables-1.4-for-kernel-2.6.20forward-layer7-${L7_PV}.patch
 		else
-			L7_PATCH=iptables-1.3-for-kernel-pre2.6.20-layer7-${L7_PV}.patch
+			eerror "Currently there is no l7-filter patch available for this"
+			eerror "kernel iptables-1.4 and kernel version pre 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
 		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
 		chmod +x extensions/.layer7-test*