From 449bff84c0d2a6c234b6e8e10cd9cdfa6a39ac49 Mon Sep 17 00:00:00 2001 From: geos_one Date: Thu, 9 Apr 2009 14:51:04 +0000 Subject: [PATCH] net-fs/novell-novfs: Make it compile with 2.6.29 --- .../net-fs/novell-novfs/ChangeLog | 4 + .../net-fs/novell-novfs/Manifest | 5 +- .../files/novfs-2.0.0.444-2.6.29-1.patch | 148 ++++++++++++++++++ .../novell-novfs-2.0.0.444.ebuild | 1 + 4 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.29-1.patch diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog index ea8f2e6c..8c85ae08 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog +++ b/trunk/novell4gentoo/net-fs/novell-novfs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 Apr 2009; Mario Fetka + +files/novfs-2.0.0.444-2.6.29-1.patch, novell-novfs-2.0.0.444.ebuild: + Make it compile with 2.6.29 + 27 Jan 2009; Mario Fetka files/novfs-2.0.0.444-2.6.28-1.patch: 2.6.28.1 patch diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest index dc9bd83d..66f7f7c0 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/Manifest +++ b/trunk/novell4gentoo/net-fs/novell-novfs/Manifest @@ -2,12 +2,13 @@ AUX novell-novfs-2.0.0-section_mismatch-1.patch 1943 RMD160 e6a025066d935ff69669 AUX novell-novfs-2.0.0-vfs.patch 524 RMD160 caab5f55b21e0a84c90529af01018f076069e046 SHA1 e4ff839c81ea455975104f096c81a3f7e2564867 SHA256 b2a21ed547f05bd141f02062dd219e445ab1f4170dbf9f336f72281f2bea00ee AUX novfs-2.0.0-2.6.25.patch 1417 RMD160 60ba9006d215bc2bf2723bd466f1dcebb27ebe53 SHA1 fb067c32f29889a665df06c6763b93f497be5466 SHA256 1f532cd3aee291ca31c16d4e6b6dc17227c2052f70ededbf20740b23e6409666 AUX novfs-2.0.0.444-2.6.28-1.patch 1360 RMD160 f7e8442cc59f30a6fd324842eeaaeb09127252bb SHA1 8d1df6b40f66ec03b98a634ce532a0a8a6ce6c46 SHA256 a49b836bf6fa3e2cb240c75cd88c52b1c205b5220e85af8ee7d70b812b62e38e +AUX novfs-2.0.0.444-2.6.29-1.patch 4340 RMD160 6a92f6d3c797f8ad6b4f21f87eda16d86426d783 SHA1 90d006a7d5d96e139c817e22799651d1e37053a9 SHA256 5b8c4494e37d54887b86f5ff9ac7e1cac812acd50010a1a0d21cf2b0b4d1b09c AUX novfs-2.0.0.444-apparmor-1.patch 734 RMD160 f615b8f1f3631a17e251ea39dd5f093562a2eb4d SHA1 cbb850fd04091fbebd042a6ea5b5096651a564b1 SHA256 f08cecbfc61f78018222c6a7065c63ac9ad29aba76270d824e637d62e6b108eb 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 DIST novfs-2.0.0.444.tar.bz2 72449 RMD160 b285340a94fbcdc71d80f0296aaaeb173f68b59d SHA1 19320444cf66d457d2b4570ffe829ac2c2671f23 SHA256 f3b58275a9035c8712e1ed3b8d05040dbbad43bc6f1195f9364264d2dca60171 EBUILD novell-novfs-2.0.0.440.ebuild 989 RMD160 164cdb135d9982703837d10b6a6fb0f6c50b4a55 SHA1 475cf55237cf14d467c06dfa9ca4297c43c56404 SHA256 bb9edabbeae362b0fa2b4d4c337891fdc7a3fc5ede6bc1218eff6f968aa9740d -EBUILD novell-novfs-2.0.0.444.ebuild 978 RMD160 c0ab7ca6ceb4d8e3e284d3a1ec73a198a38890b7 SHA1 9c595198727eafa69741c05fa557e4a8cbac5070 SHA256 2b0aa390e12aede3a0350cc13e379855385e6d43f84d63da25c84c479571712d +EBUILD novell-novfs-2.0.0.444.ebuild 1029 RMD160 eb3fdf91bf603921287cc8954c09e4e5642d8ae6 SHA1 c8d8ab5ffc568b368b51a85e8ef6f6345f45eaf1 SHA256 84b20f8740e11f0cc91f55cfbfede440e63b4ea48b7e575eefc378653592d940 EBUILD novell-novfs-2.0.0_p23-r2.ebuild 1656 RMD160 e32d855e9ec2e3da63fcff498daadd3cf9496ffb SHA1 efbb12cde7c034d3bb06e2a008d492ee8db1dd3a SHA256 ad6321bb3e4ca534fd0abe389bceb0901a3f7f9fcd6daaa3eeec4652b04bf7ea -MISC ChangeLog 5322 RMD160 df5cc47287d4315a0b691d1017c5d39961e07ed8 SHA1 f67ffdad3539e712b067ec02c6369b3feff2dc8e SHA256 5a333e81082eb5f522d26f8be3759a36c4bd66e9183d9f67c7075748590a4463 +MISC ChangeLog 5476 RMD160 2bc9a8f03262f79eb4177aba7775c4b165f3af42 SHA1 29137a8e191d102cf819ef50bccbdf249863cf08 SHA256 880ff55541b18eac74f10c7e3db828743bb8d3746831bf7e7d10e6b8decf5b84 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.29-1.patch b/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.29-1.patch new file mode 100644 index 00000000..750c2f51 --- /dev/null +++ b/trunk/novell4gentoo/net-fs/novell-novfs/files/novfs-2.0.0.444-2.6.29-1.patch @@ -0,0 +1,148 @@ +Submitted By: Mario Fetka (mario dot fetka at gmail dot com) +Date: 2009-04-09 +Initial Package Version: 2.0.0.444 +Origin: me +Upstream Status: unknown +Description: make it compile with 2.6.29 + +diff -Naur novfs-2.0.0.444.orig/file.c novfs-2.0.0.444/file.c +--- novfs-2.0.0.444.orig/file.c 2009-04-09 14:15:42.656043713 +0000 ++++ novfs-2.0.0.444/file.c 2009-04-09 14:22:00.067362069 +0000 +@@ -185,8 +185,13 @@ + DbgPrint("novfs_Get_File_Info: Path = %s\n", Path); + + Info->mode = S_IFDIR | 0700; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ Info->uid = current_uid(); ++ Info->gid = current_gid(); ++#else + Info->uid = current->uid; + Info->gid = current->gid; ++#endif + Info->size = 0; + Info->atime = Info->mtime = Info->ctime = CURRENT_TIME; + +@@ -230,8 +235,13 @@ + Info->mode &= ~(S_IWUSR); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ Info->uid = current_euid(); ++ Info->gid = current_egid(); ++#else + Info->uid = current->euid; + Info->gid = current->egid; ++#endif + Info->size = reply->fileSize; + Info->atime.tv_sec = + reply->lastAccessTime; +@@ -717,8 +727,13 @@ + info->mode |= S_IXUSR; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ info->uid = current_euid(); ++ info->gid = current_egid(); ++#else + info->uid = current->euid; + info->gid = current->egid; ++#endif + info->size = data->size; + info->atime.tv_sec = + data->lastAccessTime; +diff -Naur novfs-2.0.0.444.orig/inode.c novfs-2.0.0.444/inode.c +--- novfs-2.0.0.444.orig/inode.c 2009-04-09 14:15:42.650832058 +0000 ++++ novfs-2.0.0.444/inode.c 2009-04-09 14:35:51.150978797 +0000 +@@ -1216,7 +1216,11 @@ + uid = novfs_scope_get_uid(((struct inode_data *) inode->i_private)->Scope); + } else { + SC_INITIALIZE(sessionId); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ uid = current_euid(); ++#else + uid = current->euid; ++#endif + } + + if (IS_ROOT(file->f_dentry) || // Root +@@ -2707,7 +2711,11 @@ + struct novfs_entry_info *info = NULL; + struct inode_data *id; + struct inode *inode = NULL; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ uid_t uid = current_euid(); ++#else + uid_t uid = current->euid; ++#endif + ino_t ino = 0; + struct qstr name; + char *buf; +diff -Naur novfs-2.0.0.444.orig/scope.c novfs-2.0.0.444/scope.c +--- novfs-2.0.0.444.orig/scope.c 2009-04-09 14:15:42.692656325 +0000 ++++ novfs-2.0.0.444/scope.c 2009-04-09 14:45:04.925672739 +0000 +@@ -92,11 +92,20 @@ + + task = current; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ DbgPrint("Scope_Find_Scope: %d %d %d %d\n", current_uid(), ++ current_euid(), current_suid(), current_fsuid()); ++ ++ //scopeId = task->euid; ++ UID_TO_SCHANDLE(scopeId, current_euid()); ++#else + DbgPrint("Scope_Find_Scope: %d %d %d %d\n", task->uid, task->euid, + task->suid, task->fsuid); + + //scopeId = task->euid; + UID_TO_SCHANDLE(scopeId, task->euid); ++#endif ++ + + scope = Scope_Search4Scope(scopeId, 0, 0); + +@@ -108,17 +117,30 @@ + scope->ScopePid = task->pid; + scope->ScopeTask = task; + scope->ScopeHash = 0; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ scope->ScopeUid = current_euid(); ++#else + scope->ScopeUid = task->euid; ++#endif + scope->ScopeUserName[0] = '\0'; + + if (!novfs_daemon_create_sessionId(&scope->SessionId)) { + DbgPrint("Scope_Find_Scope2: %d %d %d %d\n", ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ current_uid(), current_euid(), ++ current_suid(), current_fsuid()); ++#else + task->uid, task->euid, task->suid, + task->fsuid); ++#endif + memset(scope->ScopeUserName, 0, + sizeof(scope->ScopeUserName)); + scope->ScopeUserNameLength = 0; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ novfs_daemon_getpwuid(current_euid(), ++#else + novfs_daemon_getpwuid(task->euid, ++#endif + sizeof(scope->ScopeUserName), + scope->ScopeUserName); + scope->ScopeUserNameLength = +@@ -477,8 +499,13 @@ + rscope = NULL; + rcu_read_lock(); + for_each_process(task) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) ++ if ((task->cred->uid == scope->ScopeUid) ++ || (task->cred->euid == scope->ScopeUid)) { ++#else + if ((task->uid == scope->ScopeUid) + || (task->euid == scope->ScopeUid)) { ++#endif + rscope = scope; + break; + } diff --git a/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.444.ebuild b/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.444.ebuild index b037e995..4aa7f16c 100644 --- a/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.444.ebuild +++ b/trunk/novell4gentoo/net-fs/novell-novfs/novell-novfs-2.0.0.444.ebuild @@ -31,6 +31,7 @@ src_unpack() { unpack ${A} epatch ${FILESDIR}/novfs-2.0.0.444-apparmor-1.patch epatch ${FILESDIR}/novfs-2.0.0.444-2.6.28-1.patch + epatch ${FILESDIR}/novfs-2.0.0.444-2.6.29-1.patch } src_compile() {