fixed patch as per bug #124663 and bug #131098.

(Portage version: 2.1_pre10)
 (Signed Manifest commit)

3 files changed, 16 insertions, 159 deletions

diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index ea941a121cee..ec8d61e63212 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -5,7 +5,7 @@ DIST additional_patch_for_2.6.13.diff 4962 RMD160 8faa60214d5695c797b24a11fe9585
 DIST netfilter-layer7-v1.4.tar.gz 72293 RMD160 7d9376e2c7708249ee92a0c460600b145eb1da0f SHA256 a52ef64864a285bf96a7408ef61a73e7df1931fdcd70c90d1f76044f9a026cb3 size 72293
 DIST netfilter-layer7-v1.5.tar.gz 88140 RMD160 4b9cf87ea743385f3a861f915152e917c406fbe6 SHA256 53d6da316a17069facfb818e6ad8497c3c225907d6930c067a6004defb50b725 size 88140
 DIST netfilter-layer7-v2.0.tar.gz 88489 RMD160 8e2f76f44db06d5b1b098c2ea37a10befd28e8a8 SHA256 1a454c77a07c6447a2c641cc9d5f255023f1c1d5363b463825da5f3d5942168f size 88489
-DIST netfilter-layer7-v2.1.tar.gz 89247 RMD160 cd2d455a16761b4fe2318d6d8a5671a535176d62 SHA256 5022e8a349135f67045f4add47405af0d626c90a5e8b86ee01745755946e1390 size 89247
+DIST netfilter-layer7-v2.1-p1.tar.gz 89286 RMD160 4c553e60d27dd117def62a89f9065d1e2767e33f SHA256 49b518b3560bb08d8f49e84fc1e5131213ed7ef5153ff523c14c8bebc2b8ce8f size 89286
 EBUILD l7-filter-1.4.ebuild 3081 RMD160 9f3e3a14b0d2bf6f57419a00fa246e83ece32287 SHA1 15b737dca549368ca8be43665fe438fa67fe3526 SHA256 06c1844bc6691a7b73310c9a42b99d627cfec72280a5e581b9eafdde4ff885f9 size 3081
 MD5 2f14aeee750e32e2e8339fc234f17acb l7-filter-1.4.ebuild 3081
 RMD160 9f3e3a14b0d2bf6f57419a00fa246e83ece32287 l7-filter-1.4.ebuild 3081
@@ -18,14 +18,14 @@ EBUILD l7-filter-2.0.ebuild 3279 RMD160 8bcde54cebea47ba98af0914613757ac1c63eb55
 MD5 b1bc21b845b873fa46c88ec0eefff8de l7-filter-2.0.ebuild 3279
 RMD160 8bcde54cebea47ba98af0914613757ac1c63eb55 l7-filter-2.0.ebuild 3279
 SHA256 eb7de7c021df4a5eef53d42ff95d50f4e154d6b2cb9b66cb89bc93580d3bd46c l7-filter-2.0.ebuild 3279
-EBUILD l7-filter-2.1.ebuild 3279 RMD160 02ea6d46cc74d5447e0093d29c3fc558895506f4 SHA1 0815677fd6e51e3e6586bb8be8045f1c164ab739 SHA256 904815fbc4e736f7a219c23806994102b5ee4c42f2ecc30b2a63ad44a29eb9dc size 3279
-MD5 659231efb287c297ba121c4a463c4f6d l7-filter-2.1.ebuild 3279
-RMD160 02ea6d46cc74d5447e0093d29c3fc558895506f4 l7-filter-2.1.ebuild 3279
-SHA256 904815fbc4e736f7a219c23806994102b5ee4c42f2ecc30b2a63ad44a29eb9dc l7-filter-2.1.ebuild 3279
-MISC ChangeLog 4644 RMD160 823b030592a44bbc08b1ba7f6889e74fc1d49c4e SHA1 124d285e33109f2d6dc7e6d1a65d28c8ba4cef39 SHA256 8ea3e597db1a71fd2308e0ceb73e1c3739eb00e7a0bcb0646e644e6d0888b4a9 size 4644
-MD5 86ccb5977d5acb8795cd9c4297b58fc2 ChangeLog 4644
-RMD160 823b030592a44bbc08b1ba7f6889e74fc1d49c4e ChangeLog 4644
-SHA256 8ea3e597db1a71fd2308e0ceb73e1c3739eb00e7a0bcb0646e644e6d0888b4a9 ChangeLog 4644
+EBUILD l7-filter-2.1_p1.ebuild 3333 RMD160 695b52d7f3410d5aad7c87889b13f871f8595ee6 SHA1 7bdd9a07e0c83cf8d4787e07e62dedb596f78363 SHA256 98930d9d8e772eb59ecaf6212bd27af20ea77fc717b920ddf76294c73759531f size 3333
+MD5 15e56700d39f52634d12de89e06cbf8b l7-filter-2.1_p1.ebuild 3333
+RMD160 695b52d7f3410d5aad7c87889b13f871f8595ee6 l7-filter-2.1_p1.ebuild 3333
+SHA256 98930d9d8e772eb59ecaf6212bd27af20ea77fc717b920ddf76294c73759531f l7-filter-2.1_p1.ebuild 3333
+MISC ChangeLog 4917 RMD160 98f60518688d3731cf5f456257b299b962eb15b4 SHA1 ebd5e8c6bcb27a705cc3425808de5e6a5f70c851 SHA256 d3e1e5669ba372af4a63526c15245d039d08c2d8351871044051b97de5055cb6 size 4917
+MD5 4853e481a36749f0a4bda1870532a95b ChangeLog 4917
+RMD160 98f60518688d3731cf5f456257b299b962eb15b4 ChangeLog 4917
+SHA256 d3e1e5669ba372af4a63526c15245d039d08c2d8351871044051b97de5055cb6 ChangeLog 4917
 MISC metadata.xml 374 RMD160 36c7b587b04bba133b9b106083dd7b485d9d2e45 SHA1 1d33c3e413603911ecb01f7a6ac8bb89c544562b SHA256 4638653661df3aa277ddfab4579d87598d17211e8b4d10114d4eeba5ddf2b7f1 size 374
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
 RMD160 36c7b587b04bba133b9b106083dd7b485d9d2e45 metadata.xml 374
@@ -33,23 +33,19 @@ SHA256 4638653661df3aa277ddfab4579d87598d17211e8b4d10114d4eeba5ddf2b7f1 metadata
 MD5 5d1ea11da08f36510569be1cea5af300 files/digest-l7-filter-1.4 533
 RMD160 21179657609388944e15b29837004d1f76ce1fd8 files/digest-l7-filter-1.4 533
 SHA256 181a4c32ab2661c1358356027bacf57fb9752cc9910e7eab05bbebcd305010d3 files/digest-l7-filter-1.4 533
-size 533 files/digest-l7-filter-1.4 533
 MD5 0fd27f4a359058785fbb9d3811792960 files/digest-l7-filter-1.5 262
 RMD160 736fa368379a7b5a08bcf6f6edfaef342f376ed5 files/digest-l7-filter-1.5 262
 SHA256 c01939160e058150286e162d5baf4cf10d00edf52d4f734bd4ed96764360bc68 files/digest-l7-filter-1.5 262
-size 262 files/digest-l7-filter-1.5 262
 MD5 07f018c5172bb29e2f4a2b2cd9edc97d files/digest-l7-filter-2.0 533
 RMD160 c25c08aeeccd8d7d037e78a186c4778f42766bd9 files/digest-l7-filter-2.0 533
 SHA256 4936370dcfceb8af806e2947915bb60a9d8439d1719f0e7451ae1311914a8abd files/digest-l7-filter-2.0 533
-size 533 files/digest-l7-filter-2.0 533
-MD5 02bf0cdaa678993fb12499da9cfd01e8 files/digest-l7-filter-2.1 533
-RMD160 cb0b5ffbc44d52a9ea2e67dc17beb6b5328188ed files/digest-l7-filter-2.1 533
-SHA256 de04ccd8ebb08ccbf7328f317a554ae3d542ad762bfdb8243b93e3c70a0f1e90 files/digest-l7-filter-2.1 533
-size 533 files/digest-l7-filter-2.1 533
+MD5 5906a49dbc1ff487c7ca9c8ffdce422d files/digest-l7-filter-2.1_p1 542
+RMD160 04f05aad2c64a0e6aa130dd19563032b88547e51 files/digest-l7-filter-2.1_p1 542
+SHA256 88d814b8babe72cbcde7691068ba411fd6024e810f63a890b45110259612703a files/digest-l7-filter-2.1_p1 542
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFESvtrmdTrptrqvGERAo8XAJ41d1UsuOaaTbOajl7V0PUAruo9EgCdEkw/
-iWt/Y1k39Lp/EdqnBngAAI4=
-=9Q8s
+iD8DBQFEV039mdTrptrqvGERAq2lAJ4nj2KQbJBPFif+tTmxeCBTg8Yy+wCgn7Fp
+gOBDp2ChrQT8D3KJJPEasm0=
+=gVMW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.1 b/net-misc/l7-filter/files/digest-l7-filter-2.1
deleted file mode 100644
index 75378690d021..000000000000
--- a/net-misc/l7-filter/files/digest-l7-filter-2.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6e8ff4d1b7b0281a7596a74789b79f8d additional_patch_for_2.6.13.diff 4962
-RMD160 8faa60214d5695c797b24a11fe95858a785258a3 additional_patch_for_2.6.13.diff 4962
-SHA256 c0e2b7bb7024c8e35b554eb33263b5c34dd2356aaea739b07231f717eae8f58d additional_patch_for_2.6.13.diff 4962
-MD5 551626a158c2a2cbfd937d27ecc7fac1 netfilter-layer7-v2.1.tar.gz 89247
-RMD160 cd2d455a16761b4fe2318d6d8a5671a535176d62 netfilter-layer7-v2.1.tar.gz 89247
-SHA256 5022e8a349135f67045f4add47405af0d626c90a5e8b86ee01745755946e1390 netfilter-layer7-v2.1.tar.gz 89247
diff --git a/net-misc/l7-filter/l7-filter-2.1.ebuild b/net-misc/l7-filter/l7-filter-2.1.ebuild
deleted file mode 100644
index 19c645bb81be..000000000000
--- a/net-misc/l7-filter/l7-filter-2.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2006 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.1.ebuild,v 1.1 2006/04/23 03:52:40 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://gentoo/additional_patch_for_2.6.13.diff"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-#break repoman
-#SLOT="${KV}"
-SLOT="0"
-S=${WORKDIR}/${MY_P}
-RDEPEND="net-misc/l7-protocols"
-
-
-which_patch() {
-	if kernel_is ge 2 6 13
-	then
-		PATCH=kernel-2.6.13-2.6.15-layer7-2.1.patch
-	elif kernel_is ge 2 6 11
-	then
-		PATCH=for_older_kernels/kernel-2.6.11-2.6.12-layer7-1.4.patch
-	elif kernel_is ge 2 6 9
-	then
-		PATCH=for_older_kernels/kernel-2.6.9-2.6.10-layer7-1.2.patch
-	elif kernel_is 2 4
-	then
-		PATCH=kernel-2.4-layer7-2.0.patch
-	else
-		die "No L7-filter patch for Kernel version ${KV_FULL} - sorry not supported"
-	fi
-}
-
-pkg_setup() {
-	pkg_postinst
-}
-
-src_unpack() {
-
-	which_patch
-
-	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
-	then
-		ewarn "already installed ${PN} for kernel ${KV_FULL}"
-		ewarn "If this is an upgrade attempt, try unmerging first."
-		ewarn "If this failes remove your kernel source from /usr/src"
-		ewarn "and remerge your kernel sources"
-		die
-	fi
-
-	unpack ${MY_P}.tar.gz
-
-	[ ! -f "${S}/${PATCH}" ] && \
-		die "patch ${PATCH} not found. Please enter a bug at bugs.gentoo.org"
-
-
-	cd ${S}
-
-	mkdir  kernel
-	mkdir  kernel/Documentation
-
-
-	# 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_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() {
-	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. If it does not work please enter a bug at bugs.gentoo.org"
-	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'
-}
-
-pkg_prerm() {
-	if [ -f ${ROOT}/usr/src/linux/include/linux/netfilter_ipv4/ipt_layer7.h ]
-	then
-		einfo 'attempting to unpatch l7-patch from kernel ${KV_FULL}'
-		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" \
-			EPATCH_OPTS="-F 3 -d ${ROOT}/usr/src/linux -R" epatch "${T}/${MY_P}/${PATCH}"
-	fi
-}