additional patch required for 2.6.12 kernels - https://bugs.gentoo.org/show_bug.cgi?id=106009#c5

(Portage version: 2.0.51.22-r2)

5 files changed, 29 insertions, 20 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index 625ba065d5c7..2d2bc14778b2 100644
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/l7-filter
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.20 2005/09/24 23:26:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.21 2005/10/02 13:55:22 dragonheart Exp $
+
+  02 Oct 2005; Daniel Black <dragonheart@gentoo.org> l7-filter-1.4.ebuild,
+  l7-filter-2.0_beta.ebuild:
+  additional patch required for 2.6.12 kernels -
+  https://bugs.gentoo.org/show_bug.cgi?id=106009#c5 thanks to Rumen Yotov.
+  additional patch nolonger on sf so mirrored on gentoo now.
 
 *l7-filter-2.0_beta (24 Sep 2005)
 
diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index 3208a2d7ec73..ad7c9594ac15 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e4482333234bfcbf6b53c2a0f1190054 l7-filter-1.4.ebuild 2932
-MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
 MD5 4233a27ab3952f48a8adddfc7b5bfd36 ChangeLog 3655
-MD5 a463995d3bbc74163de05f2146962bd8 l7-filter-1.5.ebuild 2880
-MD5 84a77dc1e9fb8873a9ce9cfda6824d4f l7-filter-2.0_beta.ebuild 2885
 MD5 1900e66a8dde525ef974d0b0615218fc files/digest-l7-filter-1.4 147
 MD5 2d66a9bc9bf0c44d3ed5f5981eba4c3e files/digest-l7-filter-1.5 72
-MD5 5fb1153edd1165192db3933bfb5fe642 files/digest-l7-filter-2.0_beta 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDNeCxmdTrptrqvGERAgC3AKCU6Ue3s2ShR/HfhGhVu2rI2FjCOwCfXPRU
-AX7heeDCIBr4tuOwhXRhszM=
-=sGFe
------END PGP SIGNATURE-----
+MD5 79eda629dc6521b2d9fc7443cffa279b files/digest-l7-filter-2.0_beta 152
+MD5 a99064bd8a1a26259900dba7a54cd087 l7-filter-1.4.ebuild 2917
+MD5 a463995d3bbc74163de05f2146962bd8 l7-filter-1.5.ebuild 2880
+MD5 942f007461651289d74406020c511920 l7-filter-2.0_beta.ebuild 3213
+MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.0_beta b/net-misc/l7-filter/files/digest-l7-filter-2.0_beta
index c1752ccf46ad..40e018569421 100644
--- a/net-misc/l7-filter/files/digest-l7-filter-2.0_beta
+++ b/net-misc/l7-filter/files/digest-l7-filter-2.0_beta
@@ -1 +1,2 @@
+MD5 6e8ff4d1b7b0281a7596a74789b79f8d additional_patch_for_2.6.13.diff 4962
 MD5 c760af92bc31c0fbd86faa3155e3f551 netfilter-layer7-v2.0-beta.tar.gz 88369
diff --git a/net-misc/l7-filter/l7-filter-1.4.ebuild b/net-misc/l7-filter/l7-filter-1.4.ebuild
index 2129ccb78c56..9b75b83593c2 100644
--- a/net-misc/l7-filter/l7-filter-1.4.ebuild
+++ b/net-misc/l7-filter/l7-filter-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-1.4.ebuild,v 1.7 2005/09/17 09:17:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-1.4.ebuild,v 1.8 2005/10/02 13:55:22 dragonheart Exp $
 
 inherit linux-info eutils
 
@@ -8,7 +8,7 @@ MY_P=netfilter-layer7-v${PV}
 DESCRIPTION="Kernel modules for layer 7 iptables filtering"
 HOMEPAGE="http://l7-filter.sourceforge.net"
 SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz
-	mirror://sourceforge/l7-filter/additional_patch_for_2.6.13.diff"
+	mirror://gentoo/additional_patch_for_2.6.13.diff"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc ~sparc x86"
diff --git a/net-misc/l7-filter/l7-filter-2.0_beta.ebuild b/net-misc/l7-filter/l7-filter-2.0_beta.ebuild
index 89bc67373f70..cd220e616897 100644
--- a/net-misc/l7-filter/l7-filter-2.0_beta.ebuild
+++ b/net-misc/l7-filter/l7-filter-2.0_beta.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-2.0_beta.ebuild,v 1.1 2005/09/24 23:26:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-2.0_beta.ebuild,v 1.2 2005/10/02 13:55:22 dragonheart Exp $
 
 inherit linux-info eutils
 
 MY_P=netfilter-layer7-v${PV/_/-}
 DESCRIPTION="Kernel modules for layer 7 iptables filtering"
 HOMEPAGE="http://l7-filter.sourceforge.net"
-SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz
+	mirror://gentoo/additional_patch_for_2.6.13.diff"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -88,6 +89,12 @@ src_unpack() {
 	#patch the copied kernel source
 	cd ${S}/kernel
 	EPATCH_OPTS="-F 3" epatch "${S}/${PATCH}"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=106009#c5
+	if kernel_is eq 2 6 12
+	then
+		epatch ${DISTDIR}/additional_patch_for_2.6.13.diff
+	fi
 }
 
 src_compile() {
@@ -114,6 +121,11 @@ pkg_prerm() {
 	then
 		einfo 'attempting to unpatch l7-patch from kernel'
 		which_patch
+		if kernel_is eq 2 6 12
+		then
+				patch -F 3 -d ${ROOT}/usr/src/linux -R -p1 \
+					<	${DISTDIR}/additional_patch_for_2.6.13.diff
+		fi
 		cd ${T}
 		unpack ${MY_P}.tar.gz
 		EPATCH_SINGLE_MSG="removing previous patch" \