Version bump

5 files changed, 132 insertions, 9 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
index bf21366f0f7a..adafbcfaac99 100644
--- a/net-fs/shfs/ChangeLog
+++ b/net-fs/shfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/shfs
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.11 2004/04/27 21:48:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.12 2004/05/28 20:28:19 stuart Exp $
+
+*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:
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
index 87bbebf4dbdb..403e13469352 100644
--- a/net-fs/shfs/Manifest
+++ b/net-fs/shfs/Manifest
@@ -1,17 +1,19 @@
+MD5 876332f6cf904bd50bdc79be65d22242 shfs-0.32.ebuild 2971
 MD5 068baecac7ff22e907a6fc19f888df0e shfs-0.31.ebuild 1777
 MD5 0651fbb1f340aab29c2bbd69c8af8821 shfs-0.31-r1.ebuild 2677
-MD5 b107b0ca5c71cadffb2106402799c489 ChangeLog 2198
-MD5 876332f6cf904bd50bdc79be65d22242 shfs-0.32.ebuild 2971
-MD5 a7fa145e6dc507227d786a36139b9ba0 metadata.xml 220
+MD5 12cbba65066bb5b331406657f029c36d ChangeLog 2322
+MD5 9e3de9f34b9e3248eb5ff2e24ad1c819 metadata.xml 281
+MD5 3b12fd29cc71e1ad7a804bfdb8d5ad79 shfs-0.34.ebuild 3092
 MD5 8e271f482d10a5a7b961f8f9171c005b shfs-0.32-r1.ebuild 3057
+MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31-r1 62
+MD5 307c4e9fea61efad863724d214fcb916 files/shfs-amd64-makefile.patch 653
+MD5 a47ecfb8f1ab11f208660d0b45c1a3d7 files/shfs-gentoo-0.31-makefile-root.diff 612
 MD5 d9c3f912bc5642882b84fa7f3edd8db8 files/amd.conf 842
 MD5 97e8d1e483ac538a072e0e82af787eeb files/amd.shfs 152
-MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31 62
-MD5 a47ecfb8f1ab11f208660d0b45c1a3d7 files/shfs-gentoo-0.31-makefile-root.diff 612
-MD5 dadc96e2e75365f207cbb3e90f565821 files/shfs-gentoo-0.31-ppc.diff 707
 MD5 bdf9a4a620ff5bcd7828251c144ec02b files/shfs.mount 1346
-MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31-r1 62
-MD5 307c4e9fea61efad863724d214fcb916 files/shfs-amd64-makefile.patch 653
+MD5 dadc96e2e75365f207cbb3e90f565821 files/shfs-gentoo-0.31-ppc.diff 707
+MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31 62
 MD5 50149869ad714fe5e5b4e9e0a94359ca files/digest-shfs-0.32 60
+MD5 cad92b9330844a369507b489cf37d18c files/digest-shfs-0.34 61
 MD5 50149869ad714fe5e5b4e9e0a94359ca files/digest-shfs-0.32-r1 60
 MD5 6313c7875b293c2a942bdad09f3937cc files/shfs-gentoo-0.32-makefile-debug.diff 657
diff --git a/net-fs/shfs/files/digest-shfs-0.34 b/net-fs/shfs/files/digest-shfs-0.34
new file mode 100644
index 000000000000..9278d795f1a9
--- /dev/null
+++ b/net-fs/shfs/files/digest-shfs-0.34
@@ -0,0 +1 @@
+MD5 8c3bb47cdf46c96a6c46465e9b34296c shfs-0.34.tar.gz 128294
diff --git a/net-fs/shfs/metadata.xml b/net-fs/shfs/metadata.xml
index 714be0db7012..beb7a62155aa 100644
--- a/net-fs/shfs/metadata.xml
+++ b/net-fs/shfs/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 <herd>net-fs</herd>
 	<longdescription>Secure Shell File System</longdescription>
+<maintainer>
+	<email>stuart@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-fs/shfs/shfs-0.34.ebuild b/net-fs/shfs/shfs-0.34.ebuild
new file mode 100644
index 000000000000..e1c967685634
--- /dev/null
+++ b/net-fs/shfs/shfs-0.34.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/shfs-0.34.ebuild,v 1.1 2004/05/28 20:28:19 stuart Exp $
+
+inherit eutils
+
+IUSE="amd doc"
+
+DESCRIPTION="Secure Shell File System"
+HOMEPAGE="http://shfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+DEPEND="virtual/linux-sources
+		net-misc/openssh
+		amd? ( net-fs/am-utils )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# epatch ${FILESDIR}/shfs-gentoo-${PV}-makefile-debug.diff
+}
+
+src_compile() {
+
+	cd ${S}/shfsmount
+	emake ROOT=${D} MODULESDIR=${D}/lib/modules/${KV} \
+	KERNEL_SOURCES=/usr/src/linux || die
+
+	if [ "`echo ${KV}|grep 2.6`" ] ; then
+		cd ${S}/shfs/Linux-2.6/
+		GENTOO_ARCH=${ARCH}
+		unset ARCH
+		addwrite "/usr/src/${FK}"
+		export _POSIX2_VERSION=199209
+		emake -j1 -C /usr/src/linux SUBDIRS="`pwd`" modules	|| die
+		export ARCH=GENTOO_ARCH
+	else
+		cd ${S}/shfs/Linux-2.4/
+		emake ROOT=${D} MODULESDIR=${D}/lib/modules/${KV} \
+		KERNEL_SOURCES=/usr/src/linux || die
+	fi
+
+	cd ${S}
+	emake docs || die
+}
+
+src_install() {
+	# Install kernel module
+	cd ${S}/shfs/Linux-`echo ${KV}|sed "s/^\([0-9]*\.[0-9]*\).*/\1/"`
+
+	dodir /lib/modules/${KV}/kernel/fs/shfs/
+	insinto /lib/modules/${KV}/kernel/fs/shfs/
+
+	if [ "`echo ${KV}|grep 2.6`" ] ; then
+	doins shfs.ko || die
+	else
+	doins shfs.o || die
+	fi
+
+# Install binaries
+	cd ${S}/shfsmount
+	dobin shfsmount
+	dobin shfsumount
+
+	# Allows users to mount/umount
+	einfo " Setting suid bit on /usr/bin executables..."
+	fperms 4511 /usr/bin/shfsmount
+	fperms 4511 /usr/bin/shfsumount
+
+	# Performs symlink to support use of mount(8)
+	dodir /sbin
+	einfo " Adding /sbin/mount.shfs symlink..."
+	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
+
+	# Install automount support (if desired)
+	if [ -n "`use amd`" ] ; then
+		einfo " Installing am-utils config files..."
+		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
+}
+
+pkg_postinst() {
+	echo "running depmod...."
+	depmod -aq || die
+
+	echo " "
+	einfo " Use either 'shfsmount' or 'mount -t shfs' to mount remote"
+	einfo " filesystems to into your local filesystem.               "
+	echo " "
+	echo " "
+	einfo " Note the following:                                      "
+	einfo "                                                          "
+	einfo "   1.  The shfs kernel module has to be loaded first    "
+	einfo "       before you can start mounting filesystems.         "
+	einfo "       Try: 'modprobe shfs' as root.                        "
+	einfo "                                                          "
+	einfo "   2.  When mounting, you must enter the absolute path of "
+	einfo "       the remote filesystem without any special chars,   "
+	einfo "       such as tilde (~), for example.                    "
+	echo " "
+}