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

(Portage version: 2.1_pre10)

3 files changed, 148 insertions, 1 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index b3c6ccf27827..f270a4323bae 100644
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/l7-filter
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.24 2006/04/23 03:52:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.25 2006/05/02 12:14:54 dragonheart Exp $
+
+*l7-filter-2.1_p1 (02 May 2006)
+
+  02 May 2006; Daniel Black <dragonheart@gentoo.org> -l7-filter-2.1.ebuild,
+  +l7-filter-2.1_p1.ebuild:
+  fixed patch as per bug #124663 and bug #131098. Patch fix thanks to Stefan
+  Knoblich. Thanks to testers and reporters on both bugs.
 
 *l7-filter-2.1 (23 Apr 2006)
 
diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.1_p1 b/net-misc/l7-filter/files/digest-l7-filter-2.1_p1
new file mode 100644
index 000000000000..78a8ad94cf7a
--- /dev/null
+++ b/net-misc/l7-filter/files/digest-l7-filter-2.1_p1
@@ -0,0 +1,6 @@
+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 650386d2042abda3bb96edf9b2b10927 netfilter-layer7-v2.1-p1.tar.gz 89286
+RMD160 4c553e60d27dd117def62a89f9065d1e2767e33f netfilter-layer7-v2.1-p1.tar.gz 89286
+SHA256 49b518b3560bb08d8f49e84fc1e5131213ed7ef5153ff523c14c8bebc2b8ce8f netfilter-layer7-v2.1-p1.tar.gz 89286
diff --git a/net-misc/l7-filter/l7-filter-2.1_p1.ebuild b/net-misc/l7-filter/l7-filter-2.1_p1.ebuild
new file mode 100644
index 000000000000..a2137b074271
--- /dev/null
+++ b/net-misc/l7-filter/l7-filter-2.1_p1.ebuild
@@ -0,0 +1,134 @@
+# 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_p1.ebuild,v 1.1 2006/05/02 12:14:54 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://gentoo/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
+}