Close 43383. Fix debug output.

5 files changed, 154 insertions, 6 deletions

diff --git a/net-fs/shfs/ChangeLog b/net-fs/shfs/ChangeLog
index a40a238b3939..45199ca35d89 100644
--- a/net-fs/shfs/ChangeLog
+++ b/net-fs/shfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/shfs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.9 2004/01/05 06:51:07 zhen Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/shfs/ChangeLog,v 1.10 2004/04/17 00:42:08 steel300 Exp $
+
+*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
diff --git a/net-fs/shfs/Manifest b/net-fs/shfs/Manifest
index dae1ee2380a2..d9464a82b333 100644
--- a/net-fs/shfs/Manifest
+++ b/net-fs/shfs/Manifest
@@ -1,14 +1,17 @@
 MD5 0bbe96d5d9602b90ad2ef807320c7c5e shfs-0.32.ebuild 2970
+MD5 807bf40993fcb8a045be8d1d8b97438c shfs-0.32-r1.ebuild 3037
+MD5 6075e6f8e572e5c88478b3a09ec234cb shfs-0.31.ebuild 1761
+MD5 ef07a2ece0bb8516b8c3b1a3920608fd shfs-0.31-r1.ebuild 2660
+MD5 9eb129addeb414bdf727650a894bc22e ChangeLog 1892
+MD5 a7fa145e6dc507227d786a36139b9ba0 metadata.xml 220
 MD5 6c1fade43f037362288f5f508ba5fe47 files/digest-shfs-0.31-r1 62
+MD5 50149869ad714fe5e5b4e9e0a94359ca files/digest-shfs-0.32-r1 60
 MD5 307c4e9fea61efad863724d214fcb916 files/shfs-amd64-makefile.patch 653
 MD5 a47ecfb8f1ab11f208660d0b45c1a3d7 files/shfs-gentoo-0.31-makefile-root.diff 612
+MD5 6313c7875b293c2a942bdad09f3937cc files/shfs-gentoo-0.32-makefile-debug.diff 657
 MD5 d9c3f912bc5642882b84fa7f3edd8db8 files/amd.conf 842
 MD5 97e8d1e483ac538a072e0e82af787eeb files/amd.shfs 152
 MD5 bdf9a4a620ff5bcd7828251c144ec02b files/shfs.mount 1346
 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 6075e6f8e572e5c88478b3a09ec234cb shfs-0.31.ebuild 1761
-MD5 ef07a2ece0bb8516b8c3b1a3920608fd shfs-0.31-r1.ebuild 2660
-MD5 9eb129addeb414bdf727650a894bc22e ChangeLog 1892
-MD5 a7fa145e6dc507227d786a36139b9ba0 metadata.xml 220
diff --git a/net-fs/shfs/files/digest-shfs-0.32-r1 b/net-fs/shfs/files/digest-shfs-0.32-r1
new file mode 100644
index 000000000000..589486862534
--- /dev/null
+++ b/net-fs/shfs/files/digest-shfs-0.32-r1
@@ -0,0 +1 @@
+MD5 477c4236f24c770238075f04de38fd71 shfs-0.32.tar.gz 96346
diff --git a/net-fs/shfs/files/shfs-gentoo-0.32-makefile-debug.diff b/net-fs/shfs/files/shfs-gentoo-0.32-makefile-debug.diff
new file mode 100644
index 000000000000..8da61d2c32b3
--- /dev/null
+++ b/net-fs/shfs/files/shfs-gentoo-0.32-makefile-debug.diff
@@ -0,0 +1,30 @@
+--- shfs-0.32.orig/shfs/Linux-2.6/Makefile	2004-02-28 17:02:27.764129840 +0100
++++ shfs-0.32/shfs/Linux-2.6/Makefile	2004-02-28 17:02:53.151270408 +0100
+@@ -1,3 +1,7 @@
++ifndef DEBUG
++DEBUG=0
++endif
++
+ ifneq ($(KERNELRELEASE),)
+ # call from kernel build system
+ 
+@@ -5,7 +9,7 @@
+ 
+ shfs-objs := dcache.o dir.o fcache.o file.o inode.o proc.o proto.o symlink.o
+ 
+-EXTRA_CFLAGS += -DVERSION=\"0.3\" -DDEBUG_LEVEL=5
++EXTRA_CFLAGS += -DVERSION=\"0.3\" -DDEBUG_LEVEL=${DEBUG}
+ 
+ else
+ # external module build
+@@ -18,10 +22,6 @@
+ KERNEL_SOURCES=${MODULESDIR}/build
+ endif
+ 
+-ifndef DEBUG
+-DEBUG=0
+-endif
+-
+ KERNEL := linux-$(shell uname -r)
+ PWD := $(shell pwd)
+ 
diff --git a/net-fs/shfs/shfs-0.32-r1.ebuild b/net-fs/shfs/shfs-0.32-r1.ebuild
new file mode 100644
index 000000000000..61d66dd6d217
--- /dev/null
+++ b/net-fs/shfs/shfs-0.32-r1.ebuild
@@ -0,0 +1,108 @@
+# 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.32-r1.ebuild,v 1.1 2004/04/17 00:42:08 steel300 Exp $
+
+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
+
+}
+
+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 " "
+}