Remove shfs as per bug #274105.

16 files changed, 0 insertions, 1269 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
deleted file mode 100644
index f1bfb7fd20f0..000000000000
--- a/net-fs/shfs/ChangeLog
+++ /dev/null
@@ -1,192 +0,0 @@
-# ChangeLog for net-fs/shfs
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.44 2009/03/20 04:07:52 jmbsvicetto Exp $
-
-  20 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  metadata.xml, shfs-0.35-r3.ebuild, shfs-0.35-r4.ebuild:
-  Removing compnerd as a maintainer since he was retired. Fixed some QA
-  warnings.
-
-  16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  08 May 2007; Marius Mauch <genone@gentoo.org> shfs-0.35-r3.ebuild,
-  shfs-0.35-r4.ebuild:
-  Replacing einfo with elog
-
-  06 May 2007; Saleem Abdulrasool <compnerd@gentoo.org> shfs-0.35-r3.ebuild,
-  shfs-0.35-r4.ebuild:
-  Update deps, add a check for the kernel version instead of a dependency
-  string which does not guarantee the sources
-
-*shfs-0.35-r4 (04 Jan 2007)
-
-  04 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
-  +files/0.35/shfs-0.35-inode-and-fs.patch, +shfs-0.35-r4.ebuild:
-  Revbump to unstable, add a new patch to allow compiling with kernels <2.6.19
-  (bug #157111).
-
-  04 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
-  -shfs-0.35-r1.ebuild, -shfs-0.35-r2.ebuild:
-  prune old versions
-
-  04 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org> shfs-0.35-r3.ebuild:
-  Require a kernel <2.6.19 for the last stable version
-
-  25 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> shfs-0.35-r3.ebuild:
-  Stable on Alpha, bug 133613.
-
-  17 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> shfs-0.35-r3.ebuild:
-  Stable on sparc wrt #133613
-
-  16 Oct 2006; <compnerd@gentoo.org>
-  +files/0.35/shfs-0.35-2.6.18-dentry.patch:
-  Add a patch for compiling with kernel >=2.6.17 from Daniel Drake <dsd (at)
-  gentoo (dot) org>
-
-  12 Jul 2006; Aron Griffis <agriffis@gentoo.org> shfs-0.35-r3.ebuild:
-  Mark 0.35-r3 stable on ia64. #133613
-
-  06 Jun 2006; Simon Stelling <blubb@gentoo.org> shfs-0.35-r3.ebuild:
-  stable on amd64
-
-  25 May 2006; Michael Hanselmann <hansmi@gentoo.org> shfs-0.35-r3.ebuild:
-  Stable on ppc.
-
-  24 May 2006; Mark Loeser <halcy0n@gentoo.org> shfs-0.35-r3.ebuild:
-  Stable on x86; bug #133613
-
-  04 Apr 2006; Aron Griffis <agriffis@gentoo.org> shfs-0.35-r2.ebuild:
-  Mark 0.35-r2 stable on ia64
-
-*shfs-0.35-r3 (22 Mar 2006)
-
-  22 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
-  +files/shfs-0.35-2.6.16-dentry.patch, +shfs-0.35-r3.ebuild:
-  Adding X useflag as per bug #81581.  Added patch to allow compiling against
-  2.6.16's new dentry struct.  Patch submitted by Torsten Krah, authored by
-  Miroslav Spousta.
-
-  16 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> shfs-0.35-r2.ebuild:
-  Stable on sparc
-
-  07 Feb 2006; Aron Griffis <agriffis@gentoo.org> shfs-0.35-r2.ebuild:
-  Mark 0.35-r2 ~ia64
-
-  06 Feb 2006; Aron Griffis <agriffis@gentoo.org> shfs-0.35-r1.ebuild:
-  Mark 0.35-r1 stable on alpha
-
-  06 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> shfs-0.35-r2.ebuild:
-  Keyworded ~sparc wrt #117832
-
-*shfs-0.35-r2 (04 Jan 2006)
-
-  04 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
-  +files/0.35/shfs-0.35-clean-inode-clear.patch, +shfs-0.35-r2.ebuild:
-  Revbump to clean up some problems.  Resolves bugs #78387, #81581, #112874,
-  #101091.
-
-  04 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
-  -files/shfs-amd64-makefile.patch,
-  -files/shfs-gentoo-0.31-makefile-root.diff,
-  -files/shfs-gentoo-0.31-ppc.diff,
-  -files/shfs-gentoo-0.32-makefile-debug.diff, -shfs-0.31.ebuild,
-  -shfs-0.31-r1.ebuild, -shfs-0.32.ebuild, -shfs-0.32-r1.ebuild,
-  -shfs-0.34.ebuild, -shfs-0.35.ebuild:
-  A long needed pruning.
-
-  23 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org> metadata.xml:
-  Marking myself as the maintainer.
-
-  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> shfs-0.35-r1.ebuild:
-  Mark 0.35-r1 ~alpha
-
-  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> shfs-0.35-r1.ebuild:
-  Stable on ppc.
-
-  09 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
-  +files/0.35/shfs-0.35-gcc4.patch:
-  Adding patch to fix compilation with GCC4
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org> shfs-0.35-r1.ebuild:
-  stable on amd64
-
-  19 Dec 2004; Stuart Herbert <stuart@gentoo.org> +files/0.35/df.patch,
-  +files/0.35/space_chars.patch, +files/0.35/uidgid32.patch:
-  Added patches; see bug #60270; thanks to S.Caglar Onur
-  <caglar.onur@tubitak.gov.tr>
-
-  14 Dec 2004; Stuart Herbert <stuart@gentoo.org> shfs-0.35.ebuild:
-  Marked stable on x86 after plenty of user feedback ;)
-
-*shfs-0.35 (26 Jun 2004)
-
-  26 Jun 2004; Stuart Herbert <stuart@gentoo.org> +shfs-0.35.ebuild:
-  Version bump; closes bug #52711
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> shfs-0.31-r1.ebuild,
-  shfs-0.31.ebuild, shfs-0.32-r1.ebuild, shfs-0.32.ebuild, shfs-0.34.ebuild:
-  Fix use invocation
-
-*shfs-0.34 (28 May 2004)
-
-  28 May 2004; Stuart Herbert <stuart@gentoo.org> shfs-0.34.ebuild:
-  Version bump; for bug #45642
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> shfs-0.31-r1.ebuild,
-  shfs-0.31.ebuild, shfs-0.32-r1.ebuild:
-  Add inherit eutils
-
-*shfs-0.32-r1 (16 Apr 2004)
-
-  16 Apr 2004; <coxj@gentoo.org> shfs-0.32-r1.ebuild,
-  files/shfs-gentoo-0.32-makefile-debug.diff:
-  Patch to prevent extra debug info.
-
-  05 Jan 2004; zhen <zhen@gentoo.org> metadata.xml:
-  adding to net-fs herd
-
-  30 Dec 2003; Luca Barbato <lu_zero@gentoo.org> shfs-0.32.ebuild:
-  Minor fix (bug #35309)
-
-  11 Nov 2003; Luca Barbato <lu_zero@gentoo.org> shfs-0.32.ebuild:
-  Minor fix, thanks to Sven Wegener <sven.wegener@stealer.net>
-
-*shfs-0.32 (11 Nov 2003)
-
-  11 Nov 2003; Luca Barbato <lu_zero@gentoo.org> shfs-0.32.ebuild:
-  New version, linux-2.6 support available.
-
-  21 Oct 2003; <lu_zero@gentoo.org> shfs-0.31-r1.ebuild: Fixed the ppc patch 
-  and made it use src_unpack. Works again on ppc.
-
-  16 Oct 2003; <drobbins@gentoo.org> shfs-0.31-r1.ebuild: Now works on AMD64;
-  much thanks to Ray Russell Reese III <russ@zerotech.net> for submitting this
-  fix (see bug #31175)
-  
-  12 Jun 2003; <msterret@gentoo.org> shfs-0.31-r1.ebuild, shfs-0.31.ebuild: add
-  Header
-
-*shfs-0.31-r1 (06 Jun 2003)
-
-  06 Jun 2003; Dylan Carlson <absinthe@gentoo.org> shfs-0.31-r1.ebuild:
-  More secure permissions on the mount binaries, and some helpful notes after
-  package install.
-
-*shfs-0.31 (03 Jun 2003)
-
-  03 Jun 2003; Dylan Carlson <absinthe@gentoo.org> shfs-0.31.ebuild,
-  files/shfs-gentoo-0.31-makefile-root.diff, 
-  files/shfs-gentoo-0.31-ppc.diff:
-  
-  Initial import.  Closes #20882.  Add the 'amd' USE if you want to take 
-  advantage of the AMD (BSD) automounter support included in this ebuild.
-  
-  Thanks to: 
-  	Gilberto Ficara <g.ficara@oltrelinux.com>
-  	Jesse Dearing <countzero@zerothdimension.net>
-  	Matt Klosterman <matt@klosterman.net>
-  	Jonathan Hitchcock <vhata-gentoo@rucus.ru.ac.za>
-  
-  Still needs testing, and integration by other archs (sparc and alpha). 
-  But let's fly with it for now.  Cheers.
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
deleted file mode 100644
index 1b46ffd43825..000000000000
--- a/net-fs/shfs/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX 0.35/df.patch 1652 RMD160 88344860762ea85470e330e971707b24ffe07030 SHA1 5852a033b0706ec6b69592cd7e7927fb3bf04ad7 SHA256 7d775f368e42e250040d48487c1123bd17ba0c953b7d5a5ec9538df6e12a2db4
-AUX 0.35/shfs-0.35-2.6.18-dentry.patch 4055 RMD160 a487e70f18089855236c35eb24ba46fa19abdc78 SHA1 0c6c7b85e8a19feb24e061bde9362d0df07c2685 SHA256 2555c9f26793a353946732f9f9b210d89b8d7ec350f7f2866fb77f1ca472e6e4
-AUX 0.35/shfs-0.35-clean-inode-clear.patch 496 RMD160 950527770374b1a55f08cf1d779a7ae5940bcf8c SHA1 285b782e575f568f9038177deb3b9866d0921680 SHA256 7513c2a3f25a7ac42c94c89f9dda3e658558fcd716210dde94cc1c8df16915a9
-AUX 0.35/shfs-0.35-gcc4.patch 1008 RMD160 364fd4820d5041211809293131d1850bc5f6577a SHA1 c72e308362b135aa8517dba565163129dc98736d SHA256 62dece02a5bec68f34e0d9b5eb4bc69d087772bb983ec6f3ab91c1ca1f899414
-AUX 0.35/shfs-0.35-inode-and-fs.patch 9871 RMD160 f96a10616f4613b3b0963683f82ebffee2250ee7 SHA1 7af82b98495551991dea704e064a08a6d63991f0 SHA256 fcef3ed44a63b8a722e552f4886f7f19aeaf62656ea5aed10f77677ab5c9b126
-AUX 0.35/space_chars.patch 1276 RMD160 6f68980f39716570772ed3b340c70220fdcd66ed SHA1 674b396a588a7ed4efec2fdca1afff2e47775cfd SHA256 e071e9fed81cbb5c4ecd7e62574136014fec1916a79277216d036233700fd859
-AUX 0.35/uidgid32.patch 940 RMD160 d4a3c057c61d1f352bb36bb4d605c85154fc8bff SHA1 68dbf2d1afef7d667ba6e13ff71df63913c367bd SHA256 d1b50f56d8a51cedd42746d5fd5dc75208f31134f2099d73d876a93d09787118
-AUX amd.conf 842 RMD160 e5db7b84f8d201e95580e5ae4fb6afacc6d56423 SHA1 3969213591a66b9c092ba27f474df0ed60dce7e0 SHA256 d680f3f50b2d4f7bfb7f81b42ae55eea00a97a875ce3472ee809ee8e2b8423ec
-AUX amd.shfs 152 RMD160 0c91fe76c5c76654131a3e3c853ff6f75ffa26d5 SHA1 b23709d40e0add4f6e7fbdd9cf9a5aff8f15858d SHA256 678e7a1c5f5d6288390f5900f98d2fa8d7b54e9dd99432bcddb6a6a391ce7583
-AUX shfs-0.35-2.6.16-dentry.patch 763 RMD160 d2e5cec4121d946ece0796f0900e55af8eaafad9 SHA1 d9b358729b99eded6a971bad79a4c42b81deff5f SHA256 a286c101a7c8e545d7fdb05bed61698e0f654ecbf6ae292245cc5b803481867d
-AUX shfs.mount 1346 RMD160 8ff7a10528136c6b3820a898a6bb69739d1b2561 SHA1 45ef2c050fcd7f684139a0ef5e46c2b1a258947a SHA256 c3885bc209d6533ea5396d0f6cea22753e8115b64c1c0df9261a4e4be8b79910
-DIST shfs-0.35.tar.gz 128656 RMD160 84bc1c1d6bf5bd722fe1e4b3a4055843b11eda7a SHA1 c34bed491d144cc91dbf0c6df73e854271b6d365 SHA256 0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2
-EBUILD shfs-0.35-r3.ebuild 3075 RMD160 e7466d7e4978131d40d8b973cb84b3cc4266ec72 SHA1 5d7571e97d29bb8fbcd70e05da6e03244dc8be61 SHA256 3edb7029858688de162a7cc747487ef16bbb73af691a207350e0112000887e75
-EBUILD shfs-0.35-r4.ebuild 2937 RMD160 378a766fe87d4abef2fe33f27c8eb20200a9bbf3 SHA1 7c9e5728d3a85968c4c4e5e4547853fe0d75696e SHA256 8c22aec0494a34d7665a68f2a09d1be3036211505aab192171f621f0b64bbc2e
-MISC ChangeLog 6868 RMD160 15dfa22251fb5c3c60dab7f9df6842c0adf1af44 SHA1 93f857f864c23791e51b1db2998349126f4af2c0 SHA256 b7bdfd704207c0eeb73c2ea60db61cd1293cce4ffbb127b1bc6d418678f6cf86
-MISC metadata.xml 285 RMD160 dba6d5a0fbcdce093b1ea531aaab584d8cf39415 SHA1 306fe94529a213f234b2f400310c2a6d869b05ad SHA256 101045fdd5aa963987281bd366223b8339677bde99dc849d4a01e48fe9159636
diff --git a/net-fs/shfs/files/0.35/df.patch b/net-fs/shfs/files/0.35/df.patch
deleted file mode 100644
index 0258dc429d75..000000000000
--- a/net-fs/shfs/files/0.35/df.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- TODO	1 Jun 2004 13:03:21 -0000	1.10
-+++ TODO	18 Jun 2004 12:19:52 -0000
-@@ -1,5 +1,8 @@
- TODO for shfs:
- 
-+* revise 2.6 kernel module install (according to lk post)
-+* more comprehensive error messages
-+* local uid preserve..
- * rewrite stack allocations -> kmalloc
- * sftp server code support
- * autoconf
---- shfs/Linux-2.4/shell.c	3 Jun 2004 13:20:44 -0000	1.8
-+++ shfs/Linux-2.4/shell.c	18 Jun 2004 12:19:52 -0000
-@@ -961,11 +961,11 @@
- 
- 	s = info->sockbuf;
- 	if ((p = strsep(&s, " ")))
--		attr->f_blocks = simple_strtoull(p, NULL, 10);
-+		attr->f_blocks = simple_strtoull(p, NULL, 10) >> 2;
- 	if ((p = strsep(&s, " ")))
--		attr->f_bfree = attr->f_blocks - simple_strtoull(p, NULL, 10);
-+		attr->f_bfree = attr->f_blocks - (simple_strtoull(p, NULL, 10) >> 2);
- 	if ((p = strsep(&s, " ")))
--		attr->f_bavail = simple_strtoull(p, NULL, 10);
-+		attr->f_bavail = simple_strtoull(p, NULL, 10) >> 2;
- 
- 	result = sock_readln(info, info->sockbuf, SOCKBUF_SIZE);
- 	if (result < 0)
---- shfs/Linux-2.6/shell.c	3 Jun 2004 13:20:47 -0000	1.9
-+++ shfs/Linux-2.6/shell.c	18 Jun 2004 12:19:53 -0000
-@@ -974,11 +974,11 @@
- 
- 	s = info->sockbuf;
- 	if ((p = strsep(&s, " ")))
--		attr->f_blocks = simple_strtoull(p, NULL, 10);
-+		attr->f_blocks = simple_strtoull(p, NULL, 10) >> 2;
- 	if ((p = strsep(&s, " ")))
--		attr->f_bfree = attr->f_blocks - simple_strtoull(p, NULL, 10);
-+		attr->f_bfree = attr->f_blocks - (simple_strtoull(p, NULL, 10) >> 2);
- 	if ((p = strsep(&s, " ")))
--		attr->f_bavail = simple_strtoull(p, NULL, 10);
-+		attr->f_bavail = simple_strtoull(p, NULL, 10) >> 2;
- 
- 	result = sock_readln(info, info->sockbuf, SOCKBUF_SIZE);
- 	if (result < 0)
diff --git a/net-fs/shfs/files/0.35/shfs-0.35-2.6.18-dentry.patch b/net-fs/shfs/files/0.35/shfs-0.35-2.6.18-dentry.patch
deleted file mode 100644
index 972b0ef0016f..000000000000
--- a/net-fs/shfs/files/0.35/shfs-0.35-2.6.18-dentry.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Index: shfs-0.35/shfs/Linux-2.6/inode.c
-===================================================================
---- shfs-0.35.orig/shfs/Linux-2.6/inode.c
-+++ shfs-0.35/shfs/Linux-2.6/inode.c
-@@ -341,12 +341,21 @@ out:
- 	return -EINVAL;
- }
- 
-+#ifdef NEW_VFS_DENTRY_API
-+static int
-+shfs_get_sb(struct file_system_type *fs_type,
-+	    int flags, const char *dev_name, void *data, struct vfsmount *mnt)
-+{
-+	return get_sb_nodev(fs_type, flags, data, shfs_read_super, mnt);
-+}
-+#else
- static struct super_block *
- shfs_get_sb(struct file_system_type *fs_type,
- 	    int flags, const char *dev_name, void *data)
- {
- 	return get_sb_nodev(fs_type, flags, data, shfs_read_super);
- }
-+#endif
- 
- static struct file_system_type sh_fs_type = {
- 	.owner		= THIS_MODULE,
-Index: shfs-0.35/shfs/Linux-2.6/file.c
-===================================================================
---- shfs-0.35.orig/shfs/Linux-2.6/file.c
-+++ shfs-0.35/shfs/Linux-2.6/file.c
-@@ -199,7 +199,7 @@ shfs_file_open(struct inode *inode, stru
- }
- 
- static int
--shfs_file_flush(struct file *f)
-+do_file_flush(struct file *f)
- {
- 	struct dentry *dentry = f->f_dentry;
- 	struct shfs_sb_info *info = info_from_dentry(dentry);
-@@ -222,6 +222,16 @@ shfs_file_flush(struct file *f)
- }
- 
- static int
-+#ifdef FLUSH_HAS_LOCK_OWNER
-+shfs_file_flush(struct file *f, fl_owner_t id)
-+#else
-+shfs_file_flush(struct file *f)
-+#endif
-+{
-+	return do_file_flush(f);
-+}
-+
-+static int
- shfs_file_release(struct inode *inode, struct file *f)
- {
- 	struct dentry *dentry = f->f_dentry;
-@@ -311,7 +321,7 @@ shfs_slow_write(struct file *f, const ch
- 	DEBUG("\n");
- 	written = generic_file_write(f, buf, count, offset);
- 	if (written > 0) {
--		result = shfs_file_flush(f);
-+		result = do_file_flush(f);
- 		written = result < 0 ? result: written;
- 	}
- 	
-Index: shfs-0.35/shfs/Linux-2.6/proc.c
-===================================================================
---- shfs-0.35.orig/shfs/Linux-2.6/proc.c
-+++ shfs-0.35/shfs/Linux-2.6/proc.c
-@@ -570,6 +570,16 @@ error:
- 	return result;
- }
- 
-+#ifdef NEW_VFS_DENTRY_API
-+int
-+shfs_statfs(struct dentry *dentry, struct kstatfs *attr)
-+{
-+	struct shfs_sb_info *info = info_from_sb(dentry->d_sb);
-+
-+	DEBUG("\n");
-+	return info->fops.statfs(info, attr);
-+}
-+#else
- int
- shfs_statfs(struct super_block *sb, struct kstatfs *attr)
- {
-@@ -578,4 +588,5 @@ shfs_statfs(struct super_block *sb, stru
- 	DEBUG("\n");
- 	return info->fops.statfs(info, attr);
- }
-+#endif
- 
-Index: shfs-0.35/shfs/Linux-2.6/shfs_fs.h
-===================================================================
---- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h
-+++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h
-@@ -9,6 +9,12 @@
- 
- #include <linux/ioctl.h>
- #include <linux/pagemap.h>
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)
-+#define NEW_VFS_DENTRY_API
-+#define FLUSH_HAS_LOCK_OWNER
-+#endif
- 
- #define SHFS_MAX_AGE(info)	(((info)->ttl * HZ) / 1000)
- #define SOCKBUF_SIZE		(SHFS_PATH_MAX * 10)
-@@ -100,7 +106,12 @@ int reply(char *s);
- void set_garbage(struct shfs_sb_info *info, int write, int count);
- int get_name(struct dentry *d, char *name);
- int shfs_notify_change(struct dentry *dentry, struct iattr *attr);
-+
-+#ifdef NEW_VFS_DENTRY_API
-+int shfs_statfs(struct dentry *dentry, struct kstatfs *attr);
-+#else
- int shfs_statfs(struct super_block *sb, struct kstatfs *attr);
-+#endif
- 	
- /* shfs/inode.c */
- void shfs_set_inode_attr(struct inode *inode, struct shfs_fattr *fattr);
-Index: shfs-0.35/shfs/Linux-2.6/symlink.c
-===================================================================
---- shfs-0.35.orig/shfs/Linux-2.6/symlink.c
-+++ shfs-0.35/shfs/Linux-2.6/symlink.c
-@@ -41,7 +41,7 @@ error:
- 	return result;
- }
- 
--static int
-+static void *
- shfs_follow_link(struct dentry *dentry, struct nameidata *nd)
- {
- 	struct shfs_sb_info *info = info_from_dentry(dentry);
-@@ -61,7 +61,7 @@ shfs_follow_link(struct dentry *dentry, 
- 	DEBUG("%s\n", real_name);
- 	result = vfs_follow_link(nd, real_name);
- error:
--	return result;
-+	return NULL;
- }
- 
- struct inode_operations shfs_symlink_inode_operations = {
diff --git a/net-fs/shfs/files/0.35/shfs-0.35-clean-inode-clear.patch b/net-fs/shfs/files/0.35/shfs-0.35-clean-inode-clear.patch
deleted file mode 100644
index 0cc4b30889a3..000000000000
--- a/net-fs/shfs/files/0.35/shfs-0.35-clean-inode-clear.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- shfs/Linux-2.6/inode.c.orig	2006-01-04 16:23:11.000000000 -0600
-+++ shfs/Linux-2.6/inode.c	2006-01-04 16:24:45.000000000 -0600
-@@ -8,6 +8,7 @@
- #include <linux/modversions.h>
- #endif
- 
-+#include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -118,6 +119,9 @@
- 	}
- 	KMEM_FREE("inode", inode_cache, i);
- out:
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13))
-+   truncate_inode_pages(&inode->i_data, 0);
-+#endif
- 	clear_inode(inode);
- }
- 
diff --git a/net-fs/shfs/files/0.35/shfs-0.35-gcc4.patch b/net-fs/shfs/files/0.35/shfs-0.35-gcc4.patch
deleted file mode 100644
index c4fd36629b51..000000000000
--- a/net-fs/shfs/files/0.35/shfs-0.35-gcc4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur shfs-0.35/shfs/Linux-2.6/dir.c shfs-0.35-new/shfs/Linux-2.6/dir.c
---- shfs-0.35/shfs/Linux-2.6/dir.c	2004-06-01 09:16:19.000000000 -0400
-+++ shfs-0.35-new/shfs/Linux-2.6/dir.c	2005-02-11 18:12:00.000000000 -0500
-@@ -19,6 +19,8 @@
- #include "shfs_debug.h"
- #include "proc.h"
- 
-+static struct dentry_operations shfs_dentry_operations;
-+	
- static int
- shfs_dir_open(struct inode *inode, struct file *filp)
- {
-diff -ur shfs-0.35/shfs/Linux-2.6/shfs_fs.h shfs-0.35-new/shfs/Linux-2.6/shfs_fs.h
---- shfs-0.35/shfs/Linux-2.6/shfs_fs.h	2004-06-01 09:16:19.000000000 -0400
-+++ shfs-0.35-new/shfs/Linux-2.6/shfs_fs.h	2005-02-11 18:12:03.000000000 -0500
-@@ -50,7 +50,6 @@
- #define ROUND_TO_MINS(x) do { (x).tv_sec = ((x).tv_sec / 60) * 60; (x).tv_nsec = 0; } while (0)
- 
- /* shfs/dir.c */
--extern struct dentry_operations shfs_dentry_operations;
- extern struct file_operations shfs_dir_operations;
- extern struct inode_operations shfs_dir_inode_operations;
- extern void shfs_new_dentry(struct dentry *dentry);
diff --git a/net-fs/shfs/files/0.35/shfs-0.35-inode-and-fs.patch b/net-fs/shfs/files/0.35/shfs-0.35-inode-and-fs.patch
deleted file mode 100644
index 7bdee206befd..000000000000
--- a/net-fs/shfs/files/0.35/shfs-0.35-inode-and-fs.patch
+++ /dev/null
@@ -1,367 +0,0 @@
---- shfs/Linux-2.6/fcache.c	2007-01-03 22:29:26.000000000 -0600
-+++ shfs/Linux-2.6/fcache.c	2007-01-03 22:34:21.000000000 -0600
-@@ -100,7 +100,11 @@
- 		VERBOSE("dir in file cache?\n");
- 		return -EINVAL;
- 	}
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	p = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	p = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	if (!p) {
- 		VERBOSE("inode without info\n");
- 		return -EINVAL;
-@@ -127,7 +131,11 @@
- 		VERBOSE("dir in file cache?\n");
- 		return -EINVAL;
- 	}
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	p = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	p = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	if (!p) {
- 		VERBOSE("inode without info\n");
- 		return -EINVAL;
-@@ -160,7 +168,11 @@
- 	if (result == 0) {
- 		struct shfs_inode_info *p;
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+		p = (struct shfs_inode_info *)f->f_dentry->d_inode->i_private;
-+#else
- 		p = (struct shfs_inode_info *)f->f_dentry->d_inode->u.generic_ip;
-+#endif
- 		if (!p) {
- 			VERBOSE("inode without info\n");
- 			return -EINVAL;
-@@ -184,7 +196,11 @@
- 		return -EINVAL;
- 	}
- 	DEBUG("ino: %lu\n", inode->i_ino);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	p = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	p = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	if (!p) {
- 		VERBOSE("inode without info\n");
- 		return -EINVAL;
-@@ -226,7 +242,11 @@
- 		VERBOSE("dir in file cache?\n");
- 		return -EINVAL;
- 	}
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	p = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	p = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	if (!p) {
- 		VERBOSE("inode without info\n");
- 		return -EINVAL;
-@@ -327,7 +347,11 @@
- 		VERBOSE("dir in file cache?\n");
- 		return -EINVAL;
- 	}
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	p = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	p = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	if (!p) {
- 		VERBOSE("inode without info\n");
- 		return -EINVAL;
---- shfs/Linux-2.6/inode.c	2004-06-01 08:16:19.000000000 -0500
-+++ shfs/Linux-2.6/inode.c	2007-01-03 22:39:44.000000000 -0600
-@@ -35,7 +36,11 @@
- shfs_set_inode_attr(struct inode *inode, struct shfs_fattr *fattr)
- {
- 	struct shfs_sb_info *info = info_from_inode(inode);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	struct shfs_inode_info *i = inode->i_private;
-+#else
- 	struct shfs_inode_info *i = inode->u.generic_ip;
-+#endif
- 	struct timespec last_time = inode->i_mtime;
- 	loff_t last_size = inode->i_size;
- 
-@@ -52,7 +57,9 @@
- 	inode->i_ctime	= fattr->f_ctime;
- 	inode->i_atime	= fattr->f_atime;
- 	inode->i_mtime	= fattr->f_mtime;
-+#ifdef STRUCT_INODE_HAS_I_BLKSIZE
- 	inode->i_blksize= fattr->f_blksize;
-+#endif
- 	inode->i_blocks	= fattr->f_blocks;
- 	inode->i_size	= fattr->f_size;
- 
-@@ -75,7 +82,11 @@
- 	if (!inode)
- 		return NULL;
- 	inode->i_ino = fattr->f_ino;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	i = inode->i_private = (struct shfs_inode_info *)KMEM_ALLOC("inode", inode_cache, GFP_KERNEL);
-+#else
- 	i = inode->u.generic_ip = (struct shfs_inode_info *)KMEM_ALLOC("inode", inode_cache, GFP_KERNEL);
-+#endif
- 	if (!i)
- 		return NULL;
- 	i->cache = NULL;
-@@ -107,7 +118,11 @@
- 	struct shfs_inode_info *i;
- 
- 	DEBUG("ino: %lu\n", inode->i_ino);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	i = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	i = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	if (!i) {
- 		VERBOSE("invalid inode\n");
- 		goto out;
-@@ -172,7 +190,11 @@
- {
- 	struct shfs_sb_info *info = info_from_dentry(dentry);
- 	struct inode *inode = dentry->d_inode;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	struct shfs_inode_info *i = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	struct shfs_inode_info *i = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	int result;
- 
-         DEBUG("%s\n", dentry->d_name.name);
---- shfs/Linux-2.6/dir.c	2007-01-03 22:38:23.000000000 -0600
-+++ shfs/Linux-2.6/dir.c	2007-01-03 22:39:06.000000000 -0600
-@@ -302,8 +302,13 @@
- 	
- 	shfs_invalid_dir_cache(dir);
- 	result = shfs_instantiate(dentry);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	if (forced_write && dentry->d_inode && dentry->d_inode->i_private)
-+		((struct shfs_inode_info *)dentry->d_inode->i_private)->unset_write_on_close = 1;
-+#else
- 	if (forced_write && dentry->d_inode && dentry->d_inode->u.generic_ip)
- 		((struct shfs_inode_info *)dentry->d_inode->u.generic_ip)->unset_write_on_close = 1;
-+#endif
- 	return result;
- }
- 
---- shfs/Linux-2.6/file.c	2007-01-03 22:40:24.000000000 -0600
-+++ shfs/Linux-2.6/file.c	2007-01-03 22:45:11.000000000 -0600
-@@ -90,7 +90,11 @@
- 	struct dentry *dentry = f->f_dentry;
- 	struct shfs_sb_info *info = info_from_dentry(dentry);
- 	struct inode *inode = p->mapping->host;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	struct shfs_inode_info *i = (struct shfs_inode_info *)inode->i_private;
-+#else
- 	struct shfs_inode_info *i = (struct shfs_inode_info *)inode->u.generic_ip;
-+#endif
- 	char *buffer = kmap(p) + offset;
- 	int written = 0, result;
- 	unsigned count = to - offset;
-@@ -252,8 +256,13 @@
- 		}
- 	}
- 	/* if file was forced to be writeable, change attrs back on close */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	if (dentry->d_inode && dentry->d_inode->i_private) {
-+		if  (((struct shfs_inode_info *)dentry->d_inode->i_private)->unset_write_on_close) {
-+#else
- 	if (dentry->d_inode && dentry->d_inode->u.generic_ip) {
- 		if  (((struct shfs_inode_info *)dentry->d_inode->u.generic_ip)->unset_write_on_close) {
-+#endif
- 			char name[SHFS_PATH_MAX];
- 
- 			if (get_name(dentry, name) < 0)
-@@ -302,7 +311,8 @@
- 		goto error;
- 	}
- 	if (result != 0) {
--		copy_to_user(buf, (char *)page, result);
-+		if (copy_to_user(buf, (char *)page, result))
-+			goto error;
- 		*ppos += result;
- 	}
- error:
-@@ -315,11 +325,15 @@
- static ssize_t 
- shfs_slow_write(struct file *f, const char *buf, size_t count, loff_t *offset)
- {
--	int written = 0;
-+	ssize_t written = 0;
- 	int result;
- 	
- 	DEBUG("\n");
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	written = do_sync_write(f, buf, count, offset);
-+#else
- 	written = generic_file_write(f, buf, count, offset);
-+#endif
- 	if (written > 0) {
- 		result = do_file_flush(f);
- 		written = result < 0 ? result: written;
-@@ -330,14 +344,23 @@
- 
- struct file_operations shfs_file_operations = {
- 	.llseek		= generic_file_llseek,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	.read		= do_sync_read,
-+	.write		= do_sync_write,
-+#else
- 	.read		= generic_file_read,
- 	.write		= generic_file_write,
-+#endif
- 	.ioctl		= shfs_ioctl,
- 	.mmap		= generic_file_mmap,
- 	.open		= shfs_file_open,
- 	.flush		= shfs_file_flush,
- 	.release	= shfs_file_release,
- 	.fsync		= shfs_file_sync,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	.aio_read	= generic_file_aio_read,
-+	.aio_write	= generic_file_aio_write,
-+#endif
- };
- 
- struct file_operations shfs_slow_operations = {
---- shfs/Linux-2.6/proc.c	2007-01-03 22:45:32.000000000 -0600
-+++ shfs/Linux-2.6/proc.c	2007-01-03 22:57:17.000000000 -0600
-@@ -149,7 +149,12 @@
- {
- 	struct file *f = info->sock;
- 	mm_segment_t fs;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	ssize_t result = 0;
-+	loff_t begin;
-+#else
- 	int c, result = 0;
-+#endif
- 	unsigned long flags, sigpipe;
- 	sigset_t old_set;
- 
-@@ -161,7 +166,9 @@
- 			return result;
- 	}
- 	
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
- 	c = count;
-+#endif
- 
- 	fs = get_fs();
- 	set_fs(get_ds());
-@@ -173,6 +180,16 @@
- 	SIGRECALC;
- 	SIGUNLOCK(flags);
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	begin = f->f_pos;
-+	result = do_sync_write(f, buffer, count, &f->f_pos);
-+
-+	if (result < 0) {
-+		DEBUG("error: %d\n", result);
-+		fput(f);
-+		info->sock = NULL;
-+	}
-+#else
- 	do {
- 		struct iovec vec[1];
- 
-@@ -190,6 +207,7 @@
- 		buffer += result;
- 		c -= result;
- 	} while (c > 0);
-+#endif
- 
- 	SIGLOCK(flags);
- 	if (result == -EPIPE && !sigpipe) {
-@@ -204,7 +222,11 @@
- 
- 	DEBUG(">%d\n", result);
- 	if (result < 0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+		set_garbage(info, 1, count - (f->f_pos - begin));
-+#else
- 		set_garbage(info, 1, c);
-+#endif
- 	else
- 		result = count;
- 	return result;
-@@ -222,6 +244,9 @@
- 	int c, result = 0;
- 	unsigned long flags, sigpipe;
- 	sigset_t old_set;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	loff_t begin;
-+#endif
- 
- 	if (!f)
- 		return -EIO;
-@@ -256,6 +281,20 @@
- 	fs = get_fs();
- 	set_fs(get_ds());
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+	begin = f->f_pos;
-+	result = do_sync_read(f, buffer, c, &f->f_pos);
-+
-+	if (!result) {
-+		/* peer has closed socket */
-+		result = -EIO;
-+	}
-+	if (result < 0) {
-+		DEBUG("error: %d\n", result);
-+		fput(f);
-+		info->sock = NULL;
-+	}
-+#else
- 	do {
- 		struct iovec vec[1];
- 
-@@ -277,6 +316,7 @@
- 		buffer += result;
- 		c -= result;
- 	} while (c > 0);
-+#endif
- 
- 	SIGLOCK(flags);
- 	if (result == -EPIPE && !sigpipe) {
-@@ -291,7 +331,11 @@
- 	
- 	DEBUG("<%d\n", result);
- 	if (result < 0)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+		set_garbage(info, 0, count - (f->f_pos - begin));
-+#else
- 		set_garbage(info, 0, c);
-+#endif
- 	else
- 		result = count;
- 	return result;
-@@ -316,8 +360,10 @@
- 			return result;
- 	}
- 	while (1) {
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
- 		struct iovec vec[1];
- 
-+#endif
- 		nl = memchr(BUFFER, '\n', LEN);
- 		if (nl) {
- 			*nl = '\0';
-@@ -348,9 +394,13 @@
- 		fs = get_fs();
- 		set_fs(get_ds());
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
-+		result = do_sync_read(f, BUFFER+LEN, c, &f->f_pos);
-+#else
- 		vec[0].iov_base = BUFFER+LEN;
- 		vec[0].iov_len = c;
- 		result = f->f_op->readv(f, (const struct iovec *)&vec, 1, &f->f_pos);
-+#endif
- 		SIGLOCK(flags);
- 		if (result == -EPIPE && !sigpipe) {
- 			sigdelset(&current->pending.signal, SIGPIPE);
diff --git a/net-fs/shfs/files/0.35/space_chars.patch b/net-fs/shfs/files/0.35/space_chars.patch
deleted file mode 100644
index 1c47a20809ac..000000000000
--- a/net-fs/shfs/files/0.35/space_chars.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- shfs/Linux-2.4/shell.c	31 May 2004 16:32:13 -0000	1.6
-+++ shfs/Linux-2.4/shell.c	3 Jun 2004 09:09:54 -0000
-@@ -213,6 +213,7 @@
- 	int c = 0;
- 	int is_space = 1;
- 	int device = 0;
-+	char *start = s;
- 
- 	while (*s) {
- 		if (c == DIR_COLS)
-@@ -227,17 +228,20 @@
- 						s++;
- 				}
- 				*s = '\0';
-+				start = s+1;
- 				is_space = 1;
-+			} else {
-+				if (c != DIR_NAME)
-+					start = s+1;
- 			}
- 		} else {
- 			if (is_space) {
- 				/* (b)lock/(c)haracter device hack */
--				col[c++] = s;
-+				col[c++] = start;
- 				is_space = 0;
- 				if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
- 					device = 1;
- 				}
--
- 			}
- 		}
- 		s++;
---- shfs/Linux-2.6/shell.c	31 May 2004 16:32:13 -0000	1.7
-+++ shfs/Linux-2.6/shell.c	3 Jun 2004 09:09:57 -0000
-@@ -225,6 +225,7 @@
- 	int c = 0;
- 	int is_space = 1;
- 	int device = 0;
-+	char *start = s;
- 
- 	while (*s) {
- 		if (c == DIR_COLS)
-@@ -239,17 +240,20 @@
- 						s++;
- 				}
- 				*s = '\0';
-+				start = s+1;
- 				is_space = 1;
-+			} else {
-+				if (c != DIR_NAME)
-+					start = s+1;
- 			}
- 		} else {
- 			if (is_space) {
- 				/* (b)lock/(c)haracter device hack */
--				col[c++] = s;
-+				col[c++] = start;
- 				is_space = 0;
- 				if ((c-1 == DIR_PERM) && ((*s == 'b')||(*s == 'c'))) {
- 					device = 1;
- 				}
--
- 			}
- 		}
- 		s++;
diff --git a/net-fs/shfs/files/0.35/uidgid32.patch b/net-fs/shfs/files/0.35/uidgid32.patch
deleted file mode 100644
index 3edb47a20e00..000000000000
--- a/net-fs/shfs/files/0.35/uidgid32.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- shfs/Linux-2.4/shfs_fs_sb.h	24 Mar 2004 13:40:02 -0000	1.2
-+++ shfs/Linux-2.4/shfs_fs_sb.h	3 Jun 2004 17:12:28 -0000
-@@ -38,10 +38,10 @@
- 	struct shfs_fileops fops;
- 	int version;
- 	int ttl;
--	__kernel_uid_t uid;
--	__kernel_gid_t gid;
--	__kernel_mode_t root_mode;
--	__kernel_mode_t fmask;
-+	uid_t uid;
-+	gid_t gid;
-+	mode_t root_mode;
-+	mode_t fmask;
- 	char mount_point[SHFS_PATH_MAX];
- 	struct semaphore sock_sem;	/* next 4 vars are guarded */
- 	struct file *sock;
---- shfs/Linux-2.6/shfs_fs_sb.h	24 Mar 2004 13:40:02 -0000	1.2
-+++ shfs/Linux-2.6/shfs_fs_sb.h	3 Jun 2004 17:12:28 -0000
-@@ -38,10 +38,10 @@
- 	struct shfs_fileops fops;
- 	int version;
- 	int ttl;
--	__kernel_uid_t uid;
--	__kernel_gid_t gid;
--	__kernel_mode_t root_mode;
--	__kernel_mode_t fmask;
-+	uid_t uid;
-+	gid_t gid;
-+	mode_t root_mode;
-+	mode_t fmask;
- 	char mount_point[SHFS_PATH_MAX];
- 	struct semaphore sock_sem;	/* next 4 vars are guarded */
- 	struct file *sock;
diff --git a/net-fs/shfs/files/amd.conf b/net-fs/shfs/files/amd.conf
deleted file mode 100644
index 65ccb242f0a7..000000000000
--- a/net-fs/shfs/files/amd.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# amd default config file
-#
-# check amd.conf(5) man page for details about options in this file
-#
-# $Id: amd.conf,v 1.1 2003/06/03 07:38:29 absinthe Exp $
-
-# GLOBAL OPTIONS SECTION
-[ global ]
-normalize_hostnames     = no
-print_pid               = yes
-pid_file                = /var/run/amd.pid
-restart_mounts          = yes
-auto_dir                = /.automount
-log_file                = syslog
-log_options             = all
-plock                   = no
-selectors_on_default    = yes
-print_version           = no
-map_type                = file
-search_path             = /etc/amd
-browsable_dirs          = no
-show_statfs_entries     = no
-fully_qualified_hosts   = no
-cache_duration          = 300
-
-# DEFINE AN AMD MOUNT POINT
-[ /net ]
-map_name = amd.net
-map_type = file
-
-# SHFS: AUTO ADDED
-[ /shfs ]
-map_name = /etc/amd/amd.shfs
-# SHFS: END
diff --git a/net-fs/shfs/files/amd.shfs b/net-fs/shfs/files/amd.shfs
deleted file mode 100644
index 3b150a84980f..000000000000
--- a/net-fs/shfs/files/amd.shfs
+++ /dev/null
@@ -1 +0,0 @@
-*       type:=program;fs:=${autodir}/${rhost}${rfs};mount:="/etc/amd/shfs.mount mount ${uid} ${key} ${fs}";unmount:="/etc/amd/shfs.umount umount ${fs}"
diff --git a/net-fs/shfs/files/shfs-0.35-2.6.16-dentry.patch b/net-fs/shfs/files/shfs-0.35-2.6.16-dentry.patch
deleted file mode 100644
index a1534bc221d9..000000000000
--- a/net-fs/shfs/files/shfs-0.35-2.6.16-dentry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- shfs/Linux-2.6/dcache.c	2004-06-01 15:16:19.000000000 +0200
-+++ shfs/Linux-2.6/dcache.c	2006-02-17 17:36:02.000000000 +0100
-@@ -68,7 +68,7 @@
- 	spin_lock(&dcache_lock);
- 	next = parent->d_subdirs.next;
- 	while (next != &parent->d_subdirs) {
--		dentry = list_entry(next, struct dentry, d_child);
-+		dentry = list_entry(next, struct dentry, d_u.d_child);
- 		dentry->d_fsdata = NULL;
- 		shfs_age_dentry(info, dentry);
- 		next = next->next;
-@@ -101,7 +101,7 @@
- 	spin_lock(&dcache_lock);
- 	next = parent->d_subdirs.next;
- 	while (next != &parent->d_subdirs) {
--		dent = list_entry(next, struct dentry, d_child);
-+		dent = list_entry(next, struct dentry, d_u.d_child);
- 		if ((unsigned long)dent->d_fsdata == fpos) {
- 			if (dent->d_inode)
- 				dget_locked(dent);
diff --git a/net-fs/shfs/files/shfs.mount b/net-fs/shfs/files/shfs.mount
deleted file mode 100644
index b69fde488bae..000000000000
--- a/net-fs/shfs/files/shfs.mount
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# This amd automounter script is called when remote host should be
-# (un)mounted under /shfs directory. Feel free to modify this script 
-# to satisfy your needs (e.g add special options to shfsmount, 
-# restrict mount to some users, etc.).
-#
-# mount user-id key dir
-# umount dir
-
-umask 022
-
-case `basename $0` in
-    "mount")
-	ID="$1"; KEY="$2"; DIR="$3"
-	if [ -z "$ID" -o -z "$KEY" -o -z "$DIR" ]; then
-		echo "Invalid usage."
-		exit 2
-	fi
-
-	RUSER=`echo "$KEY" | cut -d"%" -f1`
-	RHOST=`echo "$KEY" | cut -d"%" -f2-`
-
-	SSH_AGENT_PID=`ps -C ssh-agent -opid=,uid= | sed -n "s/^[ \t]\{1,\}\([0-9]\{1,\}\)\{1,\}[ \t]\{1,\}$ID\$/\1/p" | tail -n 1`
-	SSH_AUTH_SOCK=`find /tmp -follow -maxdepth 4 -type s -user "$ID" | grep ssh | grep agent | tail -n 1`
-
-	if [ ! -z "$SSH_AGENT_PID" -a ! -z "$SSH_AUTH_SOCK" ]; then
-		export SSH_AGENT_PID SSH_AUTH_SOCK
-	fi
-
-	IDG=`grep "^[^:]*:[^:]*:$ID:.*$" /etc/passwd | cut -d":" -f4`
-
-	mkdir -p $DIR
-	shfsmount -u "$ID" -O "-o BatchMode=yes" "$RUSER@$RHOST" "$DIR" -o uid="$ID",gid="$IDG" >/dev/null 2>&1
-
-	if [ $? -ne 0 ]; then
-		rmdir $DIR
-		exit 2
-	else
-		exit 0
-	fi
-	;;
-	
-     umount)
-	DIR="$1"
-	if [ -z "$DIR" ]; then
-		echo "Invalid usage."
-		exit 2
-	fi
-
-	if umount "$DIR" >/dev/null 2>&1; then
-		rmdir "$DIR" >/dev/null 2>&1
-		exit 0;
-	fi
-	exit 2
-    ;;
-
-    *)
-	echo "Invalid usage."
-	exit 2
-esac
diff --git a/net-fs/shfs/metadata.xml b/net-fs/shfs/metadata.xml
deleted file mode 100644
index 5bf5d9b2389e..000000000000
--- a/net-fs/shfs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-fs</herd>
-	<longdescription>Secure Shell File System</longdescription>
-<use>
-	<flag name="amd">Enable automounter support</flag>
-</use>
-</pkgmetadata>
diff --git a/net-fs/shfs/shfs-0.35-r3.ebuild b/net-fs/shfs/shfs-0.35-r3.ebuild
deleted file mode 100644
index 184f7aaa4442..000000000000
--- a/net-fs/shfs/shfs-0.35-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r3.ebuild,v 1.11 2009/03/20 04:07:52 jmbsvicetto Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="Secure Shell File System"
-HOMEPAGE="http://shfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="X amd doc"
-
-RDEPEND="net-misc/openssh
-		 amd? ( net-fs/am-utils )"
-DEPEND="${RDEPEND}"
-PDEPEND="X? ( net-misc/x11-ssh-askpass )"
-
-CONFIG_CHECK="@SH_FS:shfs"
-SH_FS_ERROR="SHFS is built into the kernel.  Only userland utilities will be provided."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 6 ; then
-		if [[ ${KV_PATCH} -gt 19 ]] ; then
-			die "This package will not build against kernels newer than 2.6.19"
-		fi
-	fi
-
-	# Setup the Kernel module build
-	BUILD_PARAMS="-j1 KERNEL_SOURCES=${KV_DIR}"
-
-	# List the kernel modules that will be built
-	MODULE_NAMES="shfs(misc/fs:${S}/shfs/Linux-${KV_MAJOR}.${KV_MINOR})"
-
-	case "${KV_MAJOR}.${KV_MINOR}" in
-		"2.4") BUILD_TARGETS="all" ;;
-		"2.6") BUILD_TARGETS="default" ;;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/0.35/*.patch"
-
-	# Take care of 2.6 Kernels <= 2.6.6
-	if [[ "${KV_MAJOR}.${KV_MINOR}" == "2.6" ]]  ; then
-		convert_to_m "${S}/shfs/Linux-2.6/Makefile"
-	fi
-
-	# 2.6.16 has a modified dentry struct.  Patch by Miroslav Spousta
-	# <qiq@ucw.cz>.  Submitted by Torsten Krah (bug #127092).
-	if kernel_is ge 2 6 16 ; then
-		epatch "${FILESDIR}/${PN}-0.35-2.6.16-dentry.patch"
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	cd "${S}/shfsmount"
-	emake || die "failed to build userland utilities"
-}
-
-src_install() {
-	# Install kernel module
-	linux-mod_src_install
-
-	# Install userland utilities
-	cd "${S}/shfsmount"
-	dobin shfsmount
-	dobin shfsumount
-
-	if use amd ; then
-		insinto /etc/amd
-		doins "${FILESDIR}/amd.conf"
-		doins "${FILESDIR}/amd.shfs"
-
-		exeinto /etc/amd
-		doexe "${FILESDIR}/shfs.mount"
-		dosym /etc/amd/shfs.mount /etc/amd/shfs.unmount
-	fi
-
-	# Setup permissions
-	einfo "Setting SUID bit on /usr/bin executables..."
-	fperms 4511 /usr/bin/shfsmount
-	fperms 4511 /usr/bin/shfsumount
-
-	# Create symlinks to support mount(8)
-	einfo "Adding /sbin/mount.shfs symlink..."
-	dodir /sbin
-	dosym /usr/bin/shfsmount /sbin/mount.shfs
-
-	# Install docs
-	doman "${S}/docs/manpages/shfsmount.8" "${S}/docs/manpages/shfsumount.8"
-	use doc && dohtml -r "${S}/docs/html"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	echo
-	elog "Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	elog "filesystems into your local filesystem."
-	elog
-	elog "Note the following:"
-	elog
-	elog " 1. The shfs kernel module has to be loaded first before you can"
-	elog "    start mounting filesystems."
-	elog "    Try: 'modprobe shfs' as root."
-	elog
-	elog " 2. When mouting, you must enter the absolute path of the remote"
-	elog "    filesystem without any special characters such as tilde (~),"
-	elog "    for example as they will not be evaluated."
-	echo
-}
diff --git a/net-fs/shfs/shfs-0.35-r4.ebuild b/net-fs/shfs/shfs-0.35-r4.ebuild
deleted file mode 100644
index ac33200ad269..000000000000
--- a/net-fs/shfs/shfs-0.35-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.35-r4.ebuild,v 1.4 2009/03/20 04:07:52 jmbsvicetto Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="Secure Shell File System"
-HOMEPAGE="http://shfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="X amd doc"
-
-RDEPEND="net-misc/openssh
-		 amd? ( net-fs/am-utils )"
-DEPEND="${RDEPEND}"
-PDEPEND="X? ( net-misc/x11-ssh-askpass )"
-
-CONFIG_CHECK="@SH_FS:shfs"
-SH_FS_ERROR="SHFS is built into the kernel.  Only userland utilities will be provided."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	# Setup the Kernel module build
-	BUILD_PARAMS="-j1 KERNEL_SOURCES=${KV_DIR}"
-
-	# List the kernel modules that will be built
-	MODULE_NAMES="shfs(misc/fs:${S}/shfs/Linux-${KV_MAJOR}.${KV_MINOR})"
-
-	case "${KV_MAJOR}.${KV_MINOR}" in
-		"2.4") BUILD_TARGETS="all" ;;
-		"2.6") BUILD_TARGETS="default" ;;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/0.35/*.patch"
-
-	# Take care of 2.6 Kernels <= 2.6.6
-	if [[ "${KV_MAJOR}.${KV_MINOR}" == "2.6" ]]  ; then
-		convert_to_m "${S}/shfs/Linux-2.6/Makefile"
-	fi
-
-	# 2.6.16 has a modified dentry struct.  Patch by Miroslav Spousta
-	# <qiq@ucw.cz>.  Submitted by Torsten Krah (bug #127092).
-	if kernel_is ge 2 6 16 ; then
-		epatch "${FILESDIR}/${PN}-0.35-2.6.16-dentry.patch"
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	cd "${S}/shfsmount"
-	emake || die "failed to build userland utilities"
-}
-
-src_install() {
-	# Install kernel module
-	linux-mod_src_install
-
-	# Install userland utilities
-	cd "${S}/shfsmount"
-	dobin shfsmount
-	dobin shfsumount
-
-	if use amd ; then
-		insinto /etc/amd
-		doins "${FILESDIR}/amd.conf"
-		doins "${FILESDIR}/amd.shfs"
-
-		exeinto /etc/amd
-		doexe "${FILESDIR}/shfs.mount"
-		dosym /etc/amd/shfs.mount /etc/amd/shfs.unmount
-	fi
-
-	# Setup permissions
-	einfo "Setting SUID bit on /usr/bin executables..."
-	fperms 4511 /usr/bin/shfsmount
-	fperms 4511 /usr/bin/shfsumount
-
-	# Create symlinks to support mount(8)
-	einfo "Adding /sbin/mount.shfs symlink..."
-	dodir /sbin
-	dosym /usr/bin/shfsmount /sbin/mount.shfs
-
-	# Install docs
-	doman "${S}/docs/manpages/shfsmount.8" "${S}/docs/manpages/shfsumount.8"
-	use doc && dohtml -r "${S}/docs/html"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	echo
-	elog "Use either 'shfsmount' or 'mount -t shfs' to mount remote"
-	elog "filesystems into your local filesystem."
-	elog
-	elog "Note the following:"
-	elog
-	elog " 1. The shfs kernel module has to be loaded first before you can"
-	elog "    start mounting filesystems."
-	elog "    Try: 'modprobe shfs' as root."
-	elog
-	elog " 2. When mouting, you must enter the absolute path of the remote"
-	elog "    filesystem without any special characters such as tilde (~),"
-	elog "    for example as they will not be evaluated."
-	echo
-}