novfs now compiles on 2.6.15 - 2.6.20

trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog

@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2007; Mario Fetka <mario-fetka@gmx.at>
+  +novell-novfs-2.0.0_p2-r1.ebuild,
+  +files/novell-novfs-2.0.0-2_6_15-compat.patch:
+  novfs now compiles on 2.6.15 - 2.6.20
+
   26 Jan 2007; Mario Fetka <mario-fetka@gmx.at> 
   +files/novell-novfs-1.2.0_to_2.0.0.patch,
   +novell-novfs-2.0.0_p2.ebuild, +files/novell-novfs-2.0.0-config_h.patch,

trunk/novell4gentoo/net-fs/novell-novfs/Manifest

@@ -22,6 +22,10 @@ AUX novell-novfs-1.2.0_to_2.0.0.patch 934748 RMD160 83cf2e11354171acc045b3571e08
 MD5 e835b754e6295e6c912284f19a53fa1e files/novell-novfs-1.2.0_to_2.0.0.patch 934748
 RMD160 83cf2e11354171acc045b3571e08654e082833fc files/novell-novfs-1.2.0_to_2.0.0.patch 934748
 SHA256 5a53ea406ac75848301a2d4d2e6f64a2610e1be5901de7638cdac18fb1db4667 files/novell-novfs-1.2.0_to_2.0.0.patch 934748
+AUX novell-novfs-2.0.0-2_6_15-compat.patch 1076 RMD160 57db9103b3fffb4185fc1a979ecd85e63c6f56f3 SHA1 a6856987f3290baae804cbd24e6dfc05ec10b584 SHA256 79e055c4a0a2b9cf7e5e4d3ef2744af680a322ed4189831b53e497cc836faa5b
+MD5 e44ee72f6d2f79b1d8978d422b43dad2 files/novell-novfs-2.0.0-2_6_15-compat.patch 1076
+RMD160 57db9103b3fffb4185fc1a979ecd85e63c6f56f3 files/novell-novfs-2.0.0-2_6_15-compat.patch 1076
+SHA256 79e055c4a0a2b9cf7e5e4d3ef2744af680a322ed4189831b53e497cc836faa5b files/novell-novfs-2.0.0-2_6_15-compat.patch 1076
 AUX novell-novfs-2.0.0-config_h.patch 387 RMD160 c029426c8cfe7d6f8c63aefa3f94c801c8f397d8 SHA1 b43868344bc1d0d93ed12b325278a85fe49da767 SHA256 6ef79f82f4fbc2e15e0e914767166a9e7424426bc6a2a8a6597f6cc33738e17c
 MD5 ce1ba8bd6c62ed620571dfd89e97eb9c files/novell-novfs-2.0.0-config_h.patch 387
 RMD160 c029426c8cfe7d6f8c63aefa3f94c801c8f397d8 files/novell-novfs-2.0.0-config_h.patch 387
@@ -47,14 +51,18 @@ EBUILD novell-novfs-1.2.0_p17-r2.ebuild 1489 RMD160 ceb5173d5207ef5de76a81299baa
 MD5 656ac481e9df037933ac960dbff7055e novell-novfs-1.2.0_p17-r2.ebuild 1489
 RMD160 ceb5173d5207ef5de76a81299baaaf16c3db9ce4 novell-novfs-1.2.0_p17-r2.ebuild 1489
 SHA256 662bf378500afaa0d561f6779ef9a67c7d68a4b8215bef128b402dd976478592 novell-novfs-1.2.0_p17-r2.ebuild 1489
+EBUILD novell-novfs-2.0.0_p2-r1.ebuild 1776 RMD160 e4fc7ff47a9aba5dc8854faeb5b0e30917661236 SHA1 72f428d40440d611e6471c47fd0e0c7efea54e37 SHA256 c04fdfc306dc02d6eb3802bfe13263d8d5be2395dd291519c8902db416fe5911
+MD5 0ddb5f95a5d00c7854c04776600e713c novell-novfs-2.0.0_p2-r1.ebuild 1776
+RMD160 e4fc7ff47a9aba5dc8854faeb5b0e30917661236 novell-novfs-2.0.0_p2-r1.ebuild 1776
+SHA256 c04fdfc306dc02d6eb3802bfe13263d8d5be2395dd291519c8902db416fe5911 novell-novfs-2.0.0_p2-r1.ebuild 1776
 EBUILD novell-novfs-2.0.0_p2.ebuild 1555 RMD160 22b10dc232d47fb23783ac59fd39576f5e06b63b SHA1 a61b70010717297cd8e5ea15906cad4ad85edb7b SHA256 46721a52d5d4ad0b8a0bb048aee3e2f5689730209a4aa2f229507ea3be45ee1c
 MD5 c26f538973a4b4dc22a95fb3b0a0b716 novell-novfs-2.0.0_p2.ebuild 1555
 RMD160 22b10dc232d47fb23783ac59fd39576f5e06b63b novell-novfs-2.0.0_p2.ebuild 1555
 SHA256 46721a52d5d4ad0b8a0bb048aee3e2f5689730209a4aa2f229507ea3be45ee1c novell-novfs-2.0.0_p2.ebuild 1555
-MISC ChangeLog 1396 RMD160 8d1fe3595f578fac756bb4a216eb7b5e54f4f36e SHA1 b6a6629350b0017baaf79f8660f15b64689336e6 SHA256 e44940b42c7a20642947f0ca764b7e3892d5df49542d9fe792f5b4cc541ccd0c
+MISC ChangeLog 1570 RMD160 1038d8181fd0e784d949c00a304aabebbfcd9a43 SHA1 a7d1ef6bfe34c3bcc5179c853edd3adb3207f4ff SHA256 d142d44782c69f7f47aa35d46aefcaff48d0a3924baeba52a22fb671645bdd1d
-MD5 058ee7fa063da1a31644bdfd16862607 ChangeLog 1396
+MD5 ebd47f1d9bb7a47e4498ede48175fdcd ChangeLog 1570
-RMD160 8d1fe3595f578fac756bb4a216eb7b5e54f4f36e ChangeLog 1396
+RMD160 1038d8181fd0e784d949c00a304aabebbfcd9a43 ChangeLog 1570
-SHA256 e44940b42c7a20642947f0ca764b7e3892d5df49542d9fe792f5b4cc541ccd0c ChangeLog 1396
+SHA256 d142d44782c69f7f47aa35d46aefcaff48d0a3924baeba52a22fb671645bdd1d ChangeLog 1570
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -65,3 +73,6 @@ SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/di
 MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-novfs-2.0.0_p2 277
 RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-novfs-2.0.0_p2 277
 SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-novfs-2.0.0_p2 277
+MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-novfs-2.0.0_p2-r1 277
+RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-novfs-2.0.0_p2-r1 277
+SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-novfs-2.0.0_p2-r1 277

trunk/novell4gentoo/net-fs/novell-novfs/files/digest-novell-novfs-2.0.0_p2-r1

@@ -0,0 +1,3 @@
+MD5 2aab6c7358a733d1d8d9a4e893500a36 novell-client-1.2-SLE10.tar.gz 13963983
+RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 novell-client-1.2-SLE10.tar.gz 13963983
+SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241 novell-client-1.2-SLE10.tar.gz 13963983

trunk/novell4gentoo/net-fs/novell-novfs/files/novell-novfs-2.0.0-2_6_15-compat.patch

@@ -0,0 +1,31 @@
+--- novfs-2.0.0/src/vfs.h.orig	2007-02-18 13:09:59.000000000 +0100
++++ novfs-2.0.0/src/vfs.h	2007-02-18 13:07:14.000000000 +0100
+@@ -70,7 +70,7 @@
+ #define IOC_SESSION  0x4a540003
+ #define IOC_DEBUGPRINT  0x4a540004
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+ #define D_CHILD d_u.d_child
+ #define AS_TREE_LOCK(l)   read_lock_irq(l)
+ #define AS_TREE_UNLOCK(l) read_unlock_irq(l)
+--- novfs-2.0.0/src/daemon.c.orig	2007-02-18 13:06:44.000000000 +0100
++++ novfs-2.0.0/src/daemon.c	2007-02-18 13:12:00.000000000 +0100
+@@ -2769,7 +2769,7 @@
+       error = -EISDIR;
+       if (nd.last_type == LAST_NORM)
+       {
+-         mutex_lock(&nd.dentry->d_inode->i_mutex);
++         down(&nd.dentry->d_inode->i_sem);
+          dentry = lookup_create( &nd, 1);
+          DbgPrint("local_unlink: lookup_hash 0x%p\n", dentry);
+ 
+@@ -2792,7 +2792,7 @@
+             }
+             dput(dentry);
+          }
+-         mutex_unlock(&nd.dentry->d_inode->i_mutex);
++         up(&nd.dentry->d_inode->i_sem);
+ 
+       }
+    	path_release(&nd);

trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0_p2-r1.ebuild

@@ -0,0 +1,74 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils rpm linux-mod
+
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Novell Client for Linux Filesystem"
+HOMEPAGE="http://www.novell.com"
+SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/2JyMn7sWP_Q~/novell-client-1.2-SLE10.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+
+RDEPEND="virtual/linux-sources
+	!net-misc/novell-novfs"
+
+RESTRICT="nomirror"
+
+BUILD_PARAMS="-C $KERNEL_DIR SUBDIRS=${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/src"
+MODULE_NAMES="novfs(novfs:${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/src:${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src/src"
+BUILD_TARGETS="modules"
+MODULESD_NOVFS_ENABLED=""
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	rpm_unpack ${WORKDIR}/ncl_build_711/NCL_disk/novell/i586/${PN}-1.2.0-17.i586.rpm
+	cd ${WORKDIR}/${PN}-${MY_PV}/opt/novell/ncl/src
+	epatch ${FILESDIR}/novell-novfs-1.2.0_to_2.0.0.patch
+	
+	if kernel_is eq 2 6 15
+	then
+	    epatch ${FILESDIR}/novell-novfs-2.0.0-2_6_15-compat.patch
+	fi
+	if kernel_is ge 2 6 17
+	then
+	    epatch ${FILESDIR}/novell-novfs-2.0.0-config_h.patch
+	fi
+	if kernel_is ge 2 6 18 
+	then
+	    epatch ${FILESDIR}/novell-novfs-2.0.0-generic_file_read.patch
+	fi
+	if kernel_is ge 2 6 19 
+	then
+	    epatch ${FILESDIR}/novell-novfs-2.0.0-i_blksize.patch
+	    epatch ${FILESDIR}/novell-novfs-2.0.0-u.generic_ip.patch
+	fi
+	
+	epatch ${FILESDIR}/novell-novfs-2.0.0-dont_use_tasklist_lock.patch
+}
+
+src_compile() { 
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	generate_modulesd	
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+}