6 files changed, 124 insertions, 18 deletions
diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index 511fdf50f219..6aa588efc715 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.3 2004/12/02 11:38:54 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.4 2005/01/04 09:28:13 dragonheart Exp $
+
+*l7-filter-0.9.1-r1 (04 Jan 2005)
+
+  04 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +l7-filter-0.9.1-r1.ebuild:
+  revision bump to transition to linux-info eclass and 2.6.10 support added
 
   02 Dec 2004; Daniel Black <dragonheart@gentoo.org> l7-filter-0.9.1.ebuild:
   Fixes for bug #69279 kernel 2.6.9 support. bug #65770 - kernel 2.4 support.
diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index eb4ccb06d195..f1106aa4135c 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f153c05327a8b4e5084bcf6d3c1dd401 l7-filter-0.9.1.ebuild 2126
+MD5 021cbf953d89a0c834c0f6c545d615dd l7-filter-0.9.1.ebuild 2126
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
-MD5 d5871517e8c624d4c4d5f11c52056697 ChangeLog 786
+MD5 cc7921a7deb8c5d3a4747812f7df0a45 ChangeLog 981
+MD5 c69470dbb50e2255fce3d34be5739b4c l7-filter-0.9.1-r1.ebuild 2360
 MD5 006fbe75d4408bba49e102262ea75a34 files/digest-l7-filter-0.9.1 166
+MD5 3b5e56dbb295b185a8c4dabd56868feb files/digest-l7-filter-0.9.1-r1 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBrv7VmdTrptrqvGERAoR9AJ9drpXkRktDOkGa/lJoB9HwDSNyPACfQho2
-5C2TCptcuRujVp79FcdJR68=
-=oyIp
+iD8DBQFB2mGzmdTrptrqvGERApR2AJ9Z+fWSR6YtowunU5lgPmb7LldLtACfTpuR
+IFBSLzBRnS3hqNgjzlpBgx0=
+=cZE3
 -----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
new file mode 100644
index 000000000000..b9a9e383d324
--- /dev/null
+++ b/net-misc/l7-filter/files/digest-l7-filter-0.9.1-r1
@@ -0,0 +1,3 @@
+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/l7-filter-0.9.1-r1.ebuild b/net-misc/l7-filter/l7-filter-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..99d3b0cf716f
--- /dev/null
+++ b/net-misc/l7-filter/l7-filter-0.9.1-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.1 2005/01/04 09:28:13 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}
+DEPEND=""
+
+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-0.9.1.ebuild b/net-misc/l7-filter/l7-filter-0.9.1.ebuild
index 696f688f63fb..b20f03847d32 100644
--- a/net-misc/l7-filter/l7-filter-0.9.1.ebuild
+++ b/net-misc/l7-filter/l7-filter-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.3 2004/12/02 11:38:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-0.9.1.ebuild,v 1.4 2005/01/04 09:28:13 dragonheart Exp $
 
 inherit kernel-mod eutils
 
diff --git a/net-misc/l7-protocols/Manifest b/net-misc/l7-protocols/Manifest
index 8e5be77aee32..ac77f17d28d3 100644
--- a/net-misc/l7-protocols/Manifest
+++ b/net-misc/l7-protocols/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
-MD5 5c8c85294b325d2aebabcf746e1306a2 ChangeLog 1082
-MD5 8ea9e9e2c207b1befddc550d7e2d4747 l7-protocols-2004.11.28.ebuild 1508
-MD5 3bd1756f513852327b11b91c6880c392 l7-protocols-2004.09.13.ebuild 1508
-MD5 c259f63137c6b8ea57503b096bea55c1 files/digest-l7-protocols-2004.09.13 74
+MD5 2c07c67d49a932e9f1df75b128804b29 ChangeLog 1280
+MD5 314c6440baf3a6bfeafe76d0ed56c843 l7-protocols-2004.11.28.ebuild 1508
+MD5 e4bf922fd421a058a4ec34b17ec529bd l7-protocols-2004.12.29.ebuild 1509
 MD5 e2e2ce8241adcb9567fc998a42740601 files/digest-l7-protocols-2004.11.28 74
+MD5 c65fb9a32f65fd401777dd65d0466dfa files/digest-l7-protocols-2004.12.29 74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBrvU9mdTrptrqvGERAg2NAJ9ghcXjqMjzJOabaPihzaH9nZrungCfaWOE
-3j1U0h1YSmTHJBA5SPy7GA4=
-=nP71
+iD8DBQFB2mKsmdTrptrqvGERAuPWAJ47We5j+uB1rGaoZINrOGyz2PM5dQCfes0t
+FrRsPRmk4MIiorQRg+yLAOM=
+=GF6v
 -----END PGP SIGNATURE-----