From f76167751c63f94f8b5670755e475453ac630ad1 Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 17 Jun 2008 19:46:39 +0000 Subject: [PATCH] net-fs/novell-novfs: Bump --- .../net-fs/novell-novfs/ChangeLog | 4 ++ .../net-fs/novell-novfs/Manifest | 23 ++------- .../files/novfs-2.0.0-2.6.25.patch | 46 +++++++++++++++++ .../novell-novfs-2.0.0.440.ebuild | 51 +++++++++++++++++++ 4 files changed, 105 insertions(+), 19 deletions(-) create mode 100644 trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0-2.6.25.patch create mode 100644 trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.440.ebuild diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog index 46c87625..0634937a 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog +++ b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Jun 2008; Mario Fetka + +files/novfs-2.0.0-2.6.25.patch, +novell-novfs-2.0.0.440.ebuild: + Bump + 26 Jan 2008; Mario Fetka -files/novell-novfs-1.2.0-dentry.patch, -files/novell-novfs-1.2.0-dont_use_tasklist_lock.patch, diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest index 0ab355ff..edef7582 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest +++ b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest @@ -1,24 +1,9 @@ AUX novell-novfs-2.0.0-section_mismatch-1.patch 1943 RMD160 e6a025066d935ff69669b67eb77157a6cb96c525 SHA1 0caa5ee241ed56cd52741815192659612eefae2b SHA256 38b1be3c3b61c15212063af75cfbd84ac46b4aab8248a11c9ec121a5496a86d6 -MD5 e01e6b6064f80d50788b08949d34ef07 files/novell-novfs-2.0.0-section_mismatch-1.patch 1943 -RMD160 e6a025066d935ff69669b67eb77157a6cb96c525 files/novell-novfs-2.0.0-section_mismatch-1.patch 1943 -SHA256 38b1be3c3b61c15212063af75cfbd84ac46b4aab8248a11c9ec121a5496a86d6 files/novell-novfs-2.0.0-section_mismatch-1.patch 1943 AUX novell-novfs-2.0.0-vfs.patch 524 RMD160 caab5f55b21e0a84c90529af01018f076069e046 SHA1 e4ff839c81ea455975104f096c81a3f7e2564867 SHA256 b2a21ed547f05bd141f02062dd219e445ab1f4170dbf9f336f72281f2bea00ee -MD5 3e4d80662503382a5c234d39d701b72f files/novell-novfs-2.0.0-vfs.patch 524 -RMD160 caab5f55b21e0a84c90529af01018f076069e046 files/novell-novfs-2.0.0-vfs.patch 524 -SHA256 b2a21ed547f05bd141f02062dd219e445ab1f4170dbf9f336f72281f2bea00ee files/novell-novfs-2.0.0-vfs.patch 524 +AUX novfs-2.0.0-2.6.25.patch 1417 RMD160 60ba9006d215bc2bf2723bd466f1dcebb27ebe53 SHA1 fb067c32f29889a665df06c6763b93f497be5466 SHA256 1f532cd3aee291ca31c16d4e6b6dc17227c2052f70ededbf20740b23e6409666 DIST novfs-2.0.0-23.src.rpm 133355 RMD160 67a07d2eb8b12cefe40d44dab9c94670c64cc54d SHA1 0a3573587b06a4c82e2f34b40749df04ff2b414b SHA256 e5e4c234a39220b8f86c6bc45d446abe0ec20b46d6b72792541ad5e3bc3ebbeb +DIST novfs-2.0.0.440.tar.bz2 72449 RMD160 6b4576a06e83669ab03dc53f80f681aa7f54babf SHA1 54bcca34bf5104adf7287a5d07464cc0e583819d SHA256 2038c4f54f73e0fd8711f44913e7a43c1270efcd037536054053b0c6a2df8166 +EBUILD novell-novfs-2.0.0.440.ebuild 992 RMD160 139540d14dfdbb410f8e7b8c8af37aadbf2b80a8 SHA1 4a4026a885002088b5cf9232a08bbf1aa5fc28ed SHA256 89333f06deb1107fbe379f2de8d5c60dd6cf1379444325347918f7c252ba9f58 EBUILD novell-novfs-2.0.0_p23-r2.ebuild 1684 RMD160 68eae5c17878d7a6afbd70aa518aa23b7e705a59 SHA1 e131648245a9f61cb56b58b1ca1d3ac63fecd514 SHA256 bc435ad3c2c3319e934c5898e39c2d0cb9d1e9e10c37a8b68969184291244f4a -MD5 ae458c06838a249a0cf8c69952953953 novell-novfs-2.0.0_p23-r2.ebuild 1684 -RMD160 68eae5c17878d7a6afbd70aa518aa23b7e705a59 novell-novfs-2.0.0_p23-r2.ebuild 1684 -SHA256 bc435ad3c2c3319e934c5898e39c2d0cb9d1e9e10c37a8b68969184291244f4a novell-novfs-2.0.0_p23-r2.ebuild 1684 -MISC ChangeLog 4380 RMD160 2b9408135bc27ab58e53d9cdc07565f688913651 SHA1 72ef0696d5dfd6cc83859794182f2c7a8155f92d SHA256 113ede7bff1719818f2e648a781bb2d48cfec6e33b3572343fa1bea0eac23c08 -MD5 6dd4d7b6cd14a26d8789a8ad908a4258 ChangeLog 4380 -RMD160 2b9408135bc27ab58e53d9cdc07565f688913651 ChangeLog 4380 -SHA256 113ede7bff1719818f2e648a781bb2d48cfec6e33b3572343fa1bea0eac23c08 ChangeLog 4380 +MISC ChangeLog 4503 RMD160 8ed4f3468904f3ff9107a9798855cb2bd4563554 SHA1 b09b3e0e2de5a7aa30639f3ffab41a964cca0be4 SHA256 c1703b17ec38cbaf862dbb237c2adb764add51aa6cd9c6ae0edab29260f0bf1c MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 -MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 -RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 -SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170 -MD5 e8b7312e808e27084790108e845e0c21 files/digest-novell-novfs-2.0.0_p23-r2 247 -RMD160 744d3703c6bc402e76b9bdba60a9b5477868c098 files/digest-novell-novfs-2.0.0_p23-r2 247 -SHA256 d30f90e6742bf18ada297495ef702f3f18b4648a55a1ecc73a31c3a5a7d7648c files/digest-novell-novfs-2.0.0_p23-r2 247 diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0-2.6.25.patch b/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0-2.6.25.patch new file mode 100644 index 00000000..86a88f74 --- /dev/null +++ b/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0-2.6.25.patch @@ -0,0 +1,46 @@ +--- src/daemon.c ++++ src/daemon.c +@@ -2783,7 +2783,7 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) + // Version of 2.6.20 changed the number of + // parameters passed to vfs_unlink. +- error = vfs_unlink(nd.dentry->d_inode, dentry, nd.mnt); ++ error = vfs_unlink(nd.path.dentry->d_inode, dentry, nd.path.mnt); + #else + error = vfs_unlink(nd.dentry->d_inode, dentry); + #endif +@@ -2791,10 +2791,10 @@ + } + dput(dentry); + } +- mutex_unlock(&nd.dentry->d_inode->i_mutex); ++ mutex_unlock(&nd.path.dentry->d_inode->i_mutex); + + } +- path_release(&nd); ++ path_put(&nd.path); + } + + if (inode) +--- src/inode.c ++++ src/inode.c +@@ -376,7 +376,6 @@ + }; + + static struct super_operations Novfs_ops = { +- .read_inode = Novfs_read_inode, + .statfs = Novfs_statfs, + .clear_inode = Novfs_clear_inode, + .drop_inode = generic_delete_inode, +@@ -4596,7 +4595,10 @@ + buf = (char *)Novfs_Malloc(PATH_LENGTH_BUFFER, GFP_KERNEL); + if (buf) + { +- path = d_path(m->mnt_root, m, buf, PATH_LENGTH_BUFFER); ++ struct path my_path; ++ my_path.mnt = m; ++ my_path.dentry= m->mnt_root; ++ path = d_path(&my_path, buf, PATH_LENGTH_BUFFER); + if (path) + { + if ( !Novfs_CurrentMount || (Novfs_CurrentMount && strcmp(Novfs_CurrentMount, path))) diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.440.ebuild b/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.440.ebuild new file mode 100644 index 00000000..942de72b --- /dev/null +++ b/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.440.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils linux-mod + +DESCRIPTION="Novell Client for Linux Filesystem" +HOMEPAGE="http://www.novell.com" +SRC_URI="http://ftp.mars.arge.at/n4g/novfs-${PV}.tar.bz2 + ftp://mars.arge.at/n4g/novfs-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" + +DEPEND="" + +RDEPEND="virtual/linux-sources" + +RESTRICT="nomirror" + +S=${WORKDIR}/novfs-${PV} + +MODULE_NAMES="novfs(novfs:${WORKDIR}/novfs-${PV}:${WORKDIR}/novfs-${PV}:${WORKDIR}/novfs-${PV}/)" +BUILD_TARGETS="all" +BUILD_PARAMS="KDIR=${KERNEL_DIR}" +MODULESD_NOVFS_ENABLED="" + +src_unpack() { + unpack ${A} + #epatch ${FILESDIR}/novell-novfs-2.0.0-vfs.patch + #epatch ${FILESDIR}/novell-novfs-2.0.0-section_mismatch-1.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 +}