Fixing compiling against 2.6.16, adding X useflag

(Portage version: 2.1_pre6-r5)

5 files changed, 188 insertions, 12 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
index 4a861f45de89..de9d174d3bce 100644
--- a/net-fs/shfs/ChangeLog
+++ b/net-fs/shfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/shfs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.28 2006/02/16 14:34:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.29 2006/03/22 20:55:14 compnerd Exp $
+
+*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
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
index 12602fe4d08d..e539f73a86e2 100644
--- a/net-fs/shfs/Manifest
+++ b/net-fs/shfs/Manifest
@@ -1,24 +1,51 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 02ad2d1bccadb5eed8de713ff22b8e7a ChangeLog 4487
+MD5 22311239e63e1144de3719e98bbe1ea1 ChangeLog 4809
+RMD160 3be31b536f724275dec80b310627e92d9ce1ca21 ChangeLog 4809
+SHA256 8e87b23784a8fe1b030f4863d6e9339d0074aa25568164c81a94245708ce2a6c ChangeLog 4809
 MD5 29b3f063e5feb8c259abc86d07f92f85 files/0.35/df.patch 1652
+RMD160 88344860762ea85470e330e971707b24ffe07030 files/0.35/df.patch 1652
+SHA256 7d775f368e42e250040d48487c1123bd17ba0c953b7d5a5ec9538df6e12a2db4 files/0.35/df.patch 1652
 MD5 47388261d70d4dc5210fd93021dc8479 files/0.35/shfs-0.35-clean-inode-clear.patch 496
+RMD160 950527770374b1a55f08cf1d779a7ae5940bcf8c files/0.35/shfs-0.35-clean-inode-clear.patch 496
+SHA256 7513c2a3f25a7ac42c94c89f9dda3e658558fcd716210dde94cc1c8df16915a9 files/0.35/shfs-0.35-clean-inode-clear.patch 496
 MD5 aa8bade7210ab4840af4a009378a96c3 files/0.35/shfs-0.35-gcc4.patch 1008
+RMD160 364fd4820d5041211809293131d1850bc5f6577a files/0.35/shfs-0.35-gcc4.patch 1008
+SHA256 62dece02a5bec68f34e0d9b5eb4bc69d087772bb983ec6f3ab91c1ca1f899414 files/0.35/shfs-0.35-gcc4.patch 1008
 MD5 e5f37f793e95acdfd8e89affe9949160 files/0.35/space_chars.patch 1276
+RMD160 6f68980f39716570772ed3b340c70220fdcd66ed files/0.35/space_chars.patch 1276
+SHA256 e071e9fed81cbb5c4ecd7e62574136014fec1916a79277216d036233700fd859 files/0.35/space_chars.patch 1276
 MD5 29e5b080a1744f8283b8f55d5b904a60 files/0.35/uidgid32.patch 940
+RMD160 d4a3c057c61d1f352bb36bb4d605c85154fc8bff files/0.35/uidgid32.patch 940
+SHA256 d1b50f56d8a51cedd42746d5fd5dc75208f31134f2099d73d876a93d09787118 files/0.35/uidgid32.patch 940
 MD5 d9c3f912bc5642882b84fa7f3edd8db8 files/amd.conf 842
+RMD160 e5db7b84f8d201e95580e5ae4fb6afacc6d56423 files/amd.conf 842
+SHA256 d680f3f50b2d4f7bfb7f81b42ae55eea00a97a875ce3472ee809ee8e2b8423ec files/amd.conf 842
 MD5 97e8d1e483ac538a072e0e82af787eeb files/amd.shfs 152
+RMD160 0c91fe76c5c76654131a3e3c853ff6f75ffa26d5 files/amd.shfs 152
+SHA256 678e7a1c5f5d6288390f5900f98d2fa8d7b54e9dd99432bcddb6a6a391ce7583 files/amd.shfs 152
 MD5 75f65e3cf2f6e55b656d19c95e20e8a7 files/digest-shfs-0.35-r1 229
+RMD160 aab2140106e569b8d91bc8a8db139f638258a6ae files/digest-shfs-0.35-r1 229
+SHA256 7614062a06a4db97cf760425cf5ba053774a670dc17f455c426f6213c38671f5 files/digest-shfs-0.35-r1 229
 MD5 8bdaeb75d54befa6b5d6f2bfe6657a60 files/digest-shfs-0.35-r2 61
+RMD160 0ef92536e9004dc0d831a1d050c3205edfe76b42 files/digest-shfs-0.35-r2 61
+SHA256 aecba5236f435448ccac9dabb2cae7c73a51fb9c5092bc532d49213888dd91b2 files/digest-shfs-0.35-r2 61
+MD5 75f65e3cf2f6e55b656d19c95e20e8a7 files/digest-shfs-0.35-r3 229
+RMD160 aab2140106e569b8d91bc8a8db139f638258a6ae files/digest-shfs-0.35-r3 229
+SHA256 7614062a06a4db97cf760425cf5ba053774a670dc17f455c426f6213c38671f5 files/digest-shfs-0.35-r3 229
+MD5 23d4ad14fd92a038647d1f21b7abac18 files/shfs-0.35-2.6.16-dentry.patch 763
+RMD160 d2e5cec4121d946ece0796f0900e55af8eaafad9 files/shfs-0.35-2.6.16-dentry.patch 763
+SHA256 a286c101a7c8e545d7fdb05bed61698e0f654ecbf6ae292245cc5b803481867d files/shfs-0.35-2.6.16-dentry.patch 763
 MD5 bdf9a4a620ff5bcd7828251c144ec02b files/shfs.mount 1346
+RMD160 8ff7a10528136c6b3820a898a6bb69739d1b2561 files/shfs.mount 1346
+SHA256 c3885bc209d6533ea5396d0f6cea22753e8115b64c1c0df9261a4e4be8b79910 files/shfs.mount 1346
 MD5 b66027267bc1b372e656d834984ad137 metadata.xml 316
+RMD160 30fe60772d122936494f213695185bb0813573cd metadata.xml 316
+SHA256 b35b4409d798f1bbed76ec77c74cd92f7a039d9ce6a46a354d923dadaacbf5f2 metadata.xml 316
 MD5 c3536676fb9853643bdb2482cbef8412 shfs-0.35-r1.ebuild 2861
+RMD160 e36f7c36745c3c5881f6566042a6bdf1f5c48b57 shfs-0.35-r1.ebuild 2861
+SHA256 4f3fd49697a57dd4a707bd7ca5902e6b474b33d06ba3c53a3b7efaba718db025 shfs-0.35-r1.ebuild 2861
 MD5 6944b6c55014314530bdfb473333809b shfs-0.35-r2.ebuild 2754
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFD9I2jKRy60XGEcJIRAupTAJ9CjOplwv+R4d0/IdeV/c109Dvg2gCglANv
-P+3nX8Szux5LfhaDh1hw+Fg=
-=nv6K
------END PGP SIGNATURE-----
+RMD160 3366627d20e4521d05d87d1cbf703d06330a4a69 shfs-0.35-r2.ebuild 2754
+SHA256 c0f676646c8c22114da547fd07422696896cadb6637b785375a7c37fdd877dfa shfs-0.35-r2.ebuild 2754
+MD5 c19bfbd9e774593752da2bd8db624024 shfs-0.35-r3.ebuild 2978
+RMD160 a8538fa49c5832c98667ec1dfaa8f63315505cf2 shfs-0.35-r3.ebuild 2978
+SHA256 f8bf69c693ebc9ab45953ed4c7c38bc19ef6b2c5fb55bc3aaf499c07bc450714 shfs-0.35-r3.ebuild 2978
diff --git a/net-fs/shfs/files/digest-shfs-0.35-r3 b/net-fs/shfs/files/digest-shfs-0.35-r3
new file mode 100644
index 000000000000..5d55d11b9c37
--- /dev/null
+++ b/net-fs/shfs/files/digest-shfs-0.35-r3
@@ -0,0 +1,3 @@
+MD5 016f49d71bc32eee2b5d11fc1600cfbe shfs-0.35.tar.gz 128656
+RMD160 84bc1c1d6bf5bd722fe1e4b3a4055843b11eda7a shfs-0.35.tar.gz 128656
+SHA256 0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2 shfs-0.35.tar.gz 128656
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
new file mode 100644
index 000000000000..a1534bc221d9
--- /dev/null
+++ b/net-fs/shfs/files/shfs-0.35-2.6.16-dentry.patch
@@ -0,0 +1,20 @@
+--- 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/shfs-0.35-r3.ebuild b/net-fs/shfs/shfs-0.35-r3.ebuild
new file mode 100644
index 000000000000..822b05fa444c
--- /dev/null
+++ b/net-fs/shfs/shfs-0.35-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2006 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.1 2006/03/22 20:55:14 compnerd 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="virtual/modutils
+		net-misc/openssh
+		amd? ( net-fs/am-utils )"
+DEPEND="virtual/linux-sources
+		sys-apps/sed
+		${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
+	einfo "Use either 'shfsmount' or 'mount -t shfs' to mount remote"
+	einfo "filesystems into your local filesystem."
+	echo
+	einfo "Note the following:"
+	einfo
+	einfo " 1. The shfs kernel module has to be loaded first before you can"
+	einfo "    start mounting filesystems."
+	einfo "    Try: 'modprobe shfs' as root."
+	einfo
+	einfo " 2. When mouting, you must enter the absolute path of the remote"
+	einfo "    filesystem without any special characters such as tilde (~),"
+	einfo "    for example as they will not be evaluated."
+	echo
+}