Fixes for bug #69279 kernel 2.6.9 support. bug #65770 - kernel 2.4 support.

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index de8ddf9071d72af81197256521029656f785aa61..511fdf50f219a5656798d80196fd401a25a03884 100644 (file)
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,11 @@
 # 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.2 2004/08/28 15:27:08 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.3 2004/12/02 11:38:54 dragonheart Exp $
+
+  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.
+  Thanks to John Barberio <barberio@lineone.net> and Jean Blignaut
+  <jean@megaweb.biz>
 
   28 Aug 2004; David Holm <dholm@gentoo.org> l7-filter-0.9.1.ebuild:
   Added to ~ppc.

diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index e344c3192db849be3bf1421eed0407c255bc73d0..eb4ccb06d1951e5adcc0702a5a196c80b15692d6 100644 (file)
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -1,4 +1,14 @@
-MD5 82665be1465f0e00805e63bc135904d5 ChangeLog 536
-MD5 6559fae6a337f50ab9cf56a92faf1186 l7-filter-0.9.1.ebuild 1852
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f153c05327a8b4e5084bcf6d3c1dd401 l7-filter-0.9.1.ebuild 2126
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
-MD5 206e258328173ccfc34ba6b19f5b1464 files/digest-l7-filter-0.9.1 74
+MD5 d5871517e8c624d4c4d5f11c52056697 ChangeLog 786
+MD5 006fbe75d4408bba49e102262ea75a34 files/digest-l7-filter-0.9.1 166
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBrv7VmdTrptrqvGERAoR9AJ9drpXkRktDOkGa/lJoB9HwDSNyPACfQho2
+5C2TCptcuRujVp79FcdJR68=
+=oyIp
+-----END PGP SIGNATURE-----

diff --git a/net-misc/l7-filter/files/digest-l7-filter-0.9.1 b/net-misc/l7-filter/files/digest-l7-filter-0.9.1
index 13daa59ad583c6e4a105cdf8041af6dc873ce624..c031b37d2db453d6dc40d31590b8e1009b2a0249 100644 (file)
--- a/net-misc/l7-filter/files/digest-l7-filter-0.9.1
+++ b/net-misc/l7-filter/files/digest-l7-filter-0.9.1
@@ -1 +1,2 @@
 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

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 f95f409b5e1dd23b008b1415de4a0aaa961c9aba..696f688f63fbed11ff64081e8598d0b5b21dfde0 100644 (file)
--- a/net-misc/l7-filter/l7-filter-0.9.1.ebuild
+++ b/net-misc/l7-filter/l7-filter-0.9.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 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.2 2004/08/28 15:27:08 dholm Exp $
+# $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 $
 
-inherit kmod eutils
+inherit kernel-mod 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"
-RESTRICT="nomirror"
+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"
 LICENSE="GPL-2"
 SLOT="${KV}"
 KEYWORDS="x86 ~ppc"
@@ -23,11 +23,29 @@ src_unpack() {
        ewarn "This only patches the current kernel source code. (${KV_OUTPUT})"
        ewarn "Its up to you to recompile the kernel with the l7 options"
 
-       # Unpack and set some variables
-       kmod_src_unpack
+       unpack ${MY_P}.tar.gz
+
+       kernel-mod_getversion
 
        cd ${S}
-       PATCH=kernel-${KV_MAJOR}.${KV_MINOR}-layer7-${PV}.patch
+
+       mkdir  kernel
+       mkdir  kernel/Documentation
+
+
+       local PATCH
+       if kernel-mod_is_2_4_kernel
+       then
+               PATCH=${S}/kernel-${KV_MAJOR}.${KV_MINOR}-layer7-${PV}.patch
+       else
+               if [ "${KV_PATCH}" -ge 9 ]
+               then
+                       PATCH=${DISTDIR}/kernel-2.6-layer7-${PV}+working_with_2.6.9.patch
+               else
+                       PATCH=${S}/kernel-${KV_MAJOR}.${KV_MINOR}-layer7-${PV}.patch
+               fi
+       fi
+
        if [ ! -f ${PATCH} ];
        then
                die "Kernel version ${KV_VERSION_FULL} no supported"
@@ -37,11 +55,11 @@ src_unpack() {
        mkdir -p ${S}/kernel/net/ipv4/netfilter/regexp/
        mkdir -p ${S}/kernel/include/linux/netfilter_ipv4/
 
-       cd ${KV_OUTPUT}
+       cd ${KERNEL_DIR}
 
 
        # start to copy needed files, if file not exists create an empty file
-       FILES=$(patch -t --dry-run -p1 < ${S}/${PATCH} | cut -f 3 -d ' ')
+       FILES=$(patch -t --dry-run -p1 < ${PATCH} | grep "^patching file" | cut -f 3 -d ' ')
        for F in ${FILES};
        do
                if [ -f ${F} ];
@@ -52,23 +70,22 @@ src_unpack() {
                fi
        done
 
+       #patch the copied kernel source
+       cd ${S}/kernel
+       epatch ${PATCH} || die "Failed to apply patch"
 }
 
 src_compile() {
-       #patch the copied kernel source
-       cd ${S}/kernel
-       epatch ${S}/${PATCH} || die "Failed to apply patch"
+       einfo "no compiling - just patching source"
 }
 
 src_install() {
-       dodir ${KV_OUTPUT}
-       cp -a kernel/* ${D}/${KV_OUTPUT}
+       dodir ${KERNEL_DIR}
+       cp -a kernel/* ${D}/${KERNEL_DIR}
 }
 
 
 pkg_postinst() {
        ewarn "This may not work with all kernels."
-       ewarn "This only patches the current kernel source code (${KV_OUTPUT})"
-       ewarn "To change this kernel see http://www.gentoo.org/doc/en/2.6-koutput-user.xml"
-       ewarn "Its up to you to recompile the kernel with the l7 options"
+       ewarn "This only patches the current kernel source code (${KERNEL_DIR})"
 }