added more fuzz to epatch to allow hardened-2.4.31 to work - bug #104886 + old version cleanout

(Portage version: 2.0.51.22-r2)

7 files changed, 12 insertions, 209 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index acbf0741451f..3f9c81036985 100644
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2005/08/20 04:37:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.17 2005/09/05 22:16:50 dragonheart Exp $
+
+  05 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -l7-filter-0.9.1-r1.ebuild, -l7-filter-1.2.ebuild, l7-filter-1.4.ebuild:
+  added more fuzz to epatch to allow hardened-2.4.31 to work - bug #104886
+  thanks to tomas charvat. old version cleanout
 
   20 Aug 2005; Daniel Black <dragonheart@gentoo.org> l7-filter-1.4.ebuild:
   added patch to work with 2.6.12/13 headers (bug #102813). Added check for
diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index 3443aae7973a..a9dfdf45e4af 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 70a58cf7748d75f901509d9a091f5e1b l7-filter-1.4.ebuild 2403
+MD5 1c6e8273b6cd736068ccd9ec8a77c746 l7-filter-1.4.ebuild 2422
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
 MD5 2f24cd7e250adc6c055e8f85cf70da6e ChangeLog 2888
 MD5 403258fe9b30334286b62ac488a6086f l7-filter-0.9.1-r1.ebuild 2380
@@ -9,10 +6,3 @@ MD5 4aeb2dca0ae76a5ff88e192e8a9f9636 l7-filter-1.2.ebuild 2071
 MD5 1900e66a8dde525ef974d0b0615218fc files/digest-l7-filter-1.4 147
 MD5 3b5e56dbb295b185a8c4dabd56868feb files/digest-l7-filter-0.9.1-r1 259
 MD5 69654182b56d25fafc1bd63eae5d35ee files/digest-l7-filter-1.2 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDBrOXmdTrptrqvGERAvv4AJ4ozaduU7y1F6NIeiBy2NFG4MHo8gCdEU5L
-Fs/kStkn404TukclfHAxyvQ=
-=A1D+
------END PGP SIGNATURE-----
diff --git a/net-misc/l7-filter/files/digest-l7-filter-0.9.1-r1 b/net-misc/l7-filter/files/digest-l7-filter-0.9.1-r1
deleted file mode 100644
index b9a9e383d324..000000000000
--- a/net-misc/l7-filter/files/digest-l7-filter-0.9.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6190f1152bf243bb5e30cf9d0592928f netfilter-layer7-v0.9.1.tar.gz 38606
-MD5 292ef3578eacec54efcd0eb122e063a7 kernel-2.6-layer7-0.9.1+working_with_2.6.9.patch 58525
-MD5 172dd90981e32e9fea2e2fcd085e9e1c kernel-2.6-layer7-0.9.1+working_with_2.6.10.patch 58530
diff --git a/net-misc/l7-filter/files/digest-l7-filter-1.2 b/net-misc/l7-filter/files/digest-l7-filter-1.2
deleted file mode 100644
index 12d7f1c56ad2..000000000000
--- a/net-misc/l7-filter/files/digest-l7-filter-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24963993a6f0727206a3a2d1a9c5e83b netfilter-layer7-v1.2.tar.gz 71697
diff --git a/net-misc/l7-filter/l7-filter-0.9.1-r1.ebuild b/net-misc/l7-filter/l7-filter-0.9.1-r1.ebuild
deleted file mode 100644
index 1e76e2bf8b0e..000000000000
--- a/net-misc/l7-filter/l7-filter-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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-0.9.1-r1.ebuild,v 1.3 2005/06/08 14:34:31 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
-	mirror://sourceforge/l7-filter/kernel-2.6-layer7-${PV}+working_with_2.6.9.patch
-	mirror://gentoo/kernel-2.6-layer7-0.9.1+working_with_2.6.10.patch"
-
-# 2.6.10 patch from
-# http://sourceforge.net/tracker/download.php?group_id=80085&atid=558670&file_id=113753&aid=1092484
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-IUSE=""
-SLOT="${KV}"
-S=${WORKDIR}/${MY_P}
-RDEPEND="net-misc/l7-protocols"
-
-src_unpack() {
-
-	ewarn "This may not work with all kernels."
-	ewarn "This only patches the current kernel source code. (${KV_DIR})"
-	ewarn "Its up to you to recompile the kernel with the l7 options"
-
-	unpack ${MY_P}.tar.gz
-
-	cd ${S}
-
-	mkdir  kernel
-	mkdir  kernel/Documentation
-
-
-	local PATCH
-	if kernel_is 2 4
-	then
-		PATCH=${S}/kernel-${KV_MAJOR}.${KV_MINOR}-layer7-${PV}.patch
-	elif kernel_is 2 6 9
-	then
-		PATCH=${DISTDIR}/kernel-2.6-layer7-${PV}+working_with_2.6.9.patch
-	elif kernel_is ge 2 6 10
-	then
-		PATCH=${DISTDIR}/kernel-2.6-layer7-0.9.1+working_with_2.6.10.patch
-	else
-		PATCH=${S}/kernel-${KV_MAJOR}.${KV_MINOR}-layer7-${PV}.patch
-	fi
-
-	if [ ! -f ${PATCH} ];
-	then
-		die "Kernel version ${KV_FULL} no supported"
-	fi
-
-	# create needed directories
-	mkdir -p ${S}/kernel/net/ipv4/netfilter/regexp/
-	mkdir -p ${S}/kernel/include/linux/netfilter_ipv4/
-
-	cd ${KV_DIR}
-
-
-	# start to copy needed files, if file not exists create an empty file
-	FILES=$(patch -t --dry-run -p1 < ${PATCH} | grep "^patching file" | cut -f 3 -d ' ')
-	for F in ${FILES};
-	do
-		if [ -f ${F} ];
-		then
-			cp -P ${F} ${S}/kernel/${F}
-		else
-			touch ${S}/kernel/${F}
-		fi
-	done
-
-	#patch the copied kernel source
-	cd ${S}/kernel
-	epatch ${PATCH} || die "Failed to apply patch"
-}
-
-src_compile() {
-	einfo "no compiling - just patching source"
-}
-
-src_install() {
-	dodir ${KV_DIR}
-	cp -a kernel/* ${D}/${KV_DIR}
-	chown -R root:root ${D}
-}
-
-
-pkg_postinst() {
-	ewarn "This may not work with all kernels."
-	ewarn "This only patches the current kernel source code (${KV_DIR})"
-}
diff --git a/net-misc/l7-filter/l7-filter-1.2.ebuild b/net-misc/l7-filter/l7-filter-1.2.ebuild
deleted file mode 100644
index 73aa6b626671..000000000000
--- a/net-misc/l7-filter/l7-filter-1.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.2.ebuild,v 1.3 2005/06/08 14:34:31 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"
-
-LICENSE="GPL-2"
-KEYWORDS="~ppc x86"
-IUSE=""
-SLOT="${KV}"
-S=${WORKDIR}/${MY_P}
-RDEPEND="net-misc/l7-protocols"
-
-src_unpack() {
-
-	pkg_postinst
-
-	unpack ${A}
-
-	cd ${S}
-
-	mkdir  kernel
-	mkdir  kernel/Documentation
-
-
-	local PATCH
-	if kernel_is 2 4
-	then
-		PATCH=for_older_kernels/kernel-${KV_MAJOR}.${KV_MINOR}-layer7-0.9.1.patch
-	elif kernel_is ge 2 6 9
-	then
-		if kernel_is ge 2 6 11
-		then
-			PATCH=kernel-2.6.11-layer7-${PV}.patch
-		else
-			PATCH=for_older_kernels/kernel-2.6.9-2.6.10-layer7-${PV}.patch
-		fi
-	else
-		# 2.6.0-2.6.8.1
-		PATCH=for_older_kernels/kernel-2.6.0-2.6.8.1-layer7-0.9.1.patch
-	fi
-
-	if [ ! -f ${PATCH} ];
-	then
-		die "Kernel version ${KV_FULL} not supported"
-	fi
-
-	# create needed directories
-	mkdir -p ${S}/kernel/net/ipv4/netfilter/regexp/
-	mkdir -p ${S}/kernel/include/linux/netfilter_ipv4/
-
-	cd ${KV_DIR}
-
-
-	# start to copy needed files, if file not exists create an empty file
-	FILES=$(patch -t --dry-run -p1 < ${S}/${PATCH} | grep "^patching file" | cut -f 3 -d ' ')
-	for F in ${FILES};
-	do
-		if [ -f ${F} ];
-		then
-			cp -P ${F} ${S}/kernel/${F}
-		else
-			touch ${S}/kernel/${F}
-		fi
-	done
-
-	#patch the copied kernel source
-	cd ${S}/kernel
-	epatch ${S}/${PATCH}
-}
-
-src_compile() {
-	einfo "no compiling - just patching source"
-}
-
-src_install() {
-	insinto ${KV_DIR}
-	doins -r kernel/*
-	dodoc CHANGELOG README
-}
-
-
-pkg_postinst() {
-	ewarn "This may not work with all kernels."
-	ewarn "This only patches the current kernel source code. (${KV_DIR})"
-	ewarn "Its up to you to recompile the kernel with the l7 options"
-	ewarn
-	ewarn 'You will also need to emerge iptables with the "extensions" USE flag'
-}
-
diff --git a/net-misc/l7-filter/l7-filter-1.4.ebuild b/net-misc/l7-filter/l7-filter-1.4.ebuild
index 9d30263014d6..f19531a207aa 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.5 2005/08/20 04:37:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-1.4.ebuild,v 1.6 2005/09/05 22:16:50 dragonheart Exp $
 
 inherit linux-info eutils
 
@@ -13,7 +13,9 @@ SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
-SLOT="${KV}"
+#break repoman
+#SLOT="${KV}"
+SLOT="0"
 S=${WORKDIR}/${MY_P}
 RDEPEND="net-misc/l7-protocols"
 
@@ -78,7 +80,7 @@ src_unpack() {
 
 	#patch the copied kernel source
 	cd ${S}/kernel
-	epatch ${S}/${PATCH}
+	EPATCH_OPTS="-F 3" epatch ${S}/${PATCH}
 
 	# bug #102813
 	if kernel_is ge 2 6 11