version bump to fix bug #158803 as reported by Tomasz Bukowski

(Portage version: 2.1.2_rc3-r9)

3 files changed, 178 insertions, 1 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index 25efe32f19b8..b043be046a5e 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.37 2006/10/14 21:42:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.38 2006/12/22 10:58:46 dragonheart Exp $
+
+*l7-filter-2.8 (22 Dec 2006)
+
+  22 Dec 2006; Daniel Black <dragonheart@gentoo.org> +l7-filter-2.8.ebuild:
+  version bump to fix bug #158803 as reported by Tomasz Bukowski
 
   14 Oct 2006; Aron Griffis <agriffis@gentoo.org> l7-filter-2.6.ebuild:
   Mark 2.6 ~ia64. #150343
diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.8 b/net-misc/l7-filter/files/digest-l7-filter-2.8
new file mode 100644
index 000000000000..e5554391ce33
--- /dev/null
+++ b/net-misc/l7-filter/files/digest-l7-filter-2.8
@@ -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 a7cf8b1e9e4ebe5117d20d3cea5ab310 netfilter-layer7-v2.8.tar.gz 122377
+RMD160 cd70ce6c0631d5099d44f52a06414562552fb546 netfilter-layer7-v2.8.tar.gz 122377
+SHA256 09ecd9a000ab7595694b85f2bc9fa2b2f5bd8debd36c78fe5564fd23bdbbe9f3 netfilter-layer7-v2.8.tar.gz 122377
diff --git a/net-misc/l7-filter/l7-filter-2.8.ebuild b/net-misc/l7-filter/l7-filter-2.8.ebuild
new file mode 100644
index 000000000000..bbd356cb8f6e
--- /dev/null
+++ b/net-misc/l7-filter/l7-filter-2.8.ebuild
@@ -0,0 +1,166 @@
+# 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.8.ebuild,v 1.1 2006/12/22 10:58:46 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 ~hppa ~ia64 ~ppc ~ppc64 ~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 18
+	then
+		PATCH=kernel-2.6.18-2.6.19-layer7-2.8.patch
+	elif kernel_is ge 2 6 17
+	then
+		PATCH=for_older_kernels/kernel-2.6.17-layer7-2.5.patch
+	elif kernel_is ge 2 6 13
+	then
+		PATCH=for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.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 ge 2 6 0
+	then
+		PATCH=for_older_kernels/kernel-2.6.0-2.6.8.1-layer7-0.9.2.patch
+	elif kernel_is 2 4
+	then
+		PATCH=kernel-2.4-layer7-2.8.patch
+	else
+		die "No L7-filter patch for Kernel version ${KV_FULL} - sorry not supported"
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	pkg_preinstall
+	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 "$(/bin/readlink -f ${KV_DIR})"
+	doins -r kernel/*
+	dodoc CHANGELOG README
+}
+
+pkg_preinstall() {
+	if has collision-protect ${FEATURES}; then
+		ewarn
+		ewarn "Collisions are expected as this patches kernel code. Disable"
+		ewarn "FEATURES=collision-protect before use"
+		die 'incompatible FEATURES=collision-protect'
+	fi
+}
+
+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" or'
+	ewarn '"l7filter" USE flag (depend which version of iptables you emerge)'
+}
+
+#
+# Unpatching of patched files is required to avoid a broken kernel source tree
+
+pkg_prerm() {
+	# How to determine what version it was installed against? - measily
+	eval $(/bin/fgrep KV=2 ${ROOT}/var/db/pkg/net-misc/${PF}/environment |\
+		/bin/head -1)
+	KV_DIR=/usr/src/linux-"${KV}"
+	if [ -d  ${KV_DIR} ]; then
+		ewarn "${KV_DIR} nolonger exists"
+		return 0;
+	fi
+	echo "KV_DIR=$KV_DIR"
+	if [ -f ${KV_DIR}/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 "${KV_DIR}" -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 "${KV_DIR}" -R" epatch "${T}/${MY_P}/${PATCH}"
+	fi
+}