Run as "root" instead of "daemon" wrt #242390 by Stefan G. Weichinger.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 15 insertions, 196 deletions

diff --git a/sys-fs/zfs-fuse/ChangeLog b/sys-fs/zfs-fuse/ChangeLog
index 81bb3f3b4abf..e73717b81266 100644
--- a/sys-fs/zfs-fuse/ChangeLog
+++ b/sys-fs/zfs-fuse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/zfs-fuse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.11 2010/06/05 23:46:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.12 2010/06/22 20:13:43 ssuominen Exp $
+
+*zfs-fuse-0.6.9-r1 (22 Jun 2010)
+
+  22 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +zfs-fuse-0.6.9-r1.ebuild, +files/zfs-fuse:
+  Run as "root" instead of "daemon" wrt #242390 by Stefan G. Weichinger.
 
 *zfs-fuse-0.6.9 (05 Jun 2010)
 
diff --git a/sys-fs/zfs-fuse/Manifest b/sys-fs/zfs-fuse/Manifest
index b3bd5744c7ac..23213b43a1e7 100644
--- a/sys-fs/zfs-fuse/Manifest
+++ b/sys-fs/zfs-fuse/Manifest
@@ -1,11 +1,5 @@
-AUX 0.5.0/fix_zdb_path.patch 483 RMD160 e212d2a3b69e75a3fe7ee8085763d681b9058270 SHA1 1e78f4f8b4286626642d8393d3f75d0689f47f50 SHA256 d4cef9ffd277c699360a7f8a1b25503a89d661ecc8285f80ca1e8cc30172ee84
-AUX 0.5.0/fix_zfs-fuse_path.patch 378 RMD160 9f1f1692e5fbbc6ea29c7a5d7284bc75593bc3a4 SHA1 f49abfca781065a21259cae422bcf7149e169040 SHA256 42df1294e8801330f848261024d29b2e8f51b860527629a010b00b1ea89f7dd4
-AUX 0.5.0/fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8
-AUX 0.5.0/zfs-fuse.rc 915 RMD160 6d8f05590e6e4fd9bdb11ac4ca2937729816f2c2 SHA1 42fa42f93acd3c713a0098e0d9bce04cec966e88 SHA256 a5ce5642ba7da82245ed9d9c388d11833fa1d4d27b8b0cf1e529c0a3cbb78107
-AUX zfs-fuse.rc 927 RMD160 607417c2ab2df54ffba78f2c9aace382a7655251 SHA1 24f24be57d071978e0afc1d34506ff2e5c465c55 SHA256 35120742c553d9d90ecfca69f2dec1e8dc8d8361f7407c023d923a5b050e8abb
-DIST zfs-fuse-0.5.0.tar.bz2 875791 RMD160 9990c5800a7deff487381d01f90fb58619ea0b19 SHA1 28d7e58f53b1424b9279b7068f3cee9fda0a13f6 SHA256 d4e082f05005b8bd9167e7f61a6753bf219666dd6dcac581b6dadb01db7594f1
+AUX zfs-fuse 922 RMD160 3c4d4e073fc6de9b8543f557d8289135fc46a6ab SHA1 2df273b8e9c8b518f1a69362c8b6caf4e67717a7 SHA256 493b89af322c2f6dd081ead393e13d04ec7bdbb9d83faa0cfc24399190da6690
 DIST zfs-fuse-0.6.9.tar.bz2 1383989 RMD160 3c2eaabd2b487478e4e9934150ee0f5f6d8610da SHA1 b7fe465f6165a777894bb9988ee02ea5c74ccdd3 SHA256 07a0fa52446552b12796e43c442768a2aaa72b25fbeba2dedc2bcfcdb8a1e8fe
-EBUILD zfs-fuse-0.5.0.ebuild 2775 RMD160 c1ce55aa277e2c922c7f5f4a0f00cdd67e556761 SHA1 864c0e5a81844371eadc0a1d8db35d90ba3274f6 SHA256 422ad0a06761600d1c74bf1988575ac44156081869eb3fa915fdcb59761fec59
-EBUILD zfs-fuse-0.6.9.ebuild 1201 RMD160 476e8c5c6b34e1ec567665027e90ef6b50788284 SHA1 9eba44489ba7017ec371e8f4d00fc8a2d4ff6a09 SHA256 833ef880ab64435033c96faa4d2c947cb964b64b39457fbb5698ce8aa45fa62a
-MISC ChangeLog 2059 RMD160 c2dd86885d7abe8f6f5cfb07897715a9f19eebca SHA1 25bb6d82082315be30f56336172da32158275ba6 SHA256 44df43514b78f151290a7dea9c683e4ea1edabc39439c3605d43b8d6d7606233
+EBUILD zfs-fuse-0.6.9-r1.ebuild 1192 RMD160 0456d2c1aeee2ee842f15abffd22be9d2c7be05f SHA1 13b6a1d7aa663efd7684d14ad2554d5eb8de7d93 SHA256 951d8b835ed97100d16150df6f4fb03ff98a9628aa8090976f42b70bf9b43a71
+MISC ChangeLog 2267 RMD160 5d3750790773de0f3fb79590f649e125d04a6fe1 SHA1 bf17b87eac839ba9e2fd569b50c14fccc4673766 SHA256 f24857800058cb38ea7e2ee09d4197719563cc3c26cc1542f4693bcd2706db90
 MISC metadata.xml 220 RMD160 ba793b36fde5acec86d8150ceddf4f3cfb5c2ae9 SHA1 6eb5af4c500c3736062744a87af40484a47e6951 SHA256 9375701257b18e240ba4baf120f7ee473798d867728c9c3fdc50b3b305df7ded
diff --git a/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch b/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch
deleted file mode 100644
index 770c1ae9dcf3..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/cmd/ztest/ztest.c	2008-06-24 13:52:22.000000000 -0400
-+++ b/src/cmd/ztest/ztest.c	2008-06-24 14:59:06.000000000 -0400
-@@ -2844,7 +2844,7 @@
- 	/* zfs-fuse: ztest is never installed, so zdb should be in ../zdb/ */
- 	/* LINTED */
- 	(void) sprintf(zdb,
--	    "../zdb/zdb -bc%s%s -U /tmp/zpool.cache -O %s %s",
-+	    "/usr/sbin/zdb -bc%s%s -U -O %s %s",
- 	    zopt_verbose >= 3 ? "s" : "",
- 	    zopt_verbose >= 4 ? "v" : "",
- 	    ztest_random(2) == 0 ? "pre" : "post", pool);
diff --git a/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch b/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch
deleted file mode 100644
index 3b5d656f5744..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/zfs-fuse/run.sh	2007-01-09 11:07:35.000000000 +0000
-+++ b/src/zfs-fuse/run.sh	2007-01-09 11:45:05.000000000 +0000
-@@ -1,5 +1,7 @@
- #!/bin/sh
--
-+echo ""
-+echo "On Gentoo ZFS-FUSE runs in debugging mode by default."
-+echo "To run ZFS-FUSE without debugging please run /usr/bin/run-zfs-fuse"
- ulimit -c unlimited
--
--./zfs-fuse --no-daemon
-+echo ""
-+/usr/bin/run-zfs-fuse
diff --git a/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch b/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch
deleted file mode 100644
index d87979d4391c..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/cmd/ztest/runtest.sh	2007-01-09 11:07:35.000000000 +0000
-+++ b/src/cmd/ztest/runtest.sh	2007-01-09 11:08:51.000000000 +0000
-@@ -3,5 +3,5 @@ ulimit -c unlimited
- echo "Start date: `date`"
- #ZFS_DEBUG=on /usr/bin/time -v nice -n 20 ./ztest -V -T 86400 &> log.txt
- #/usr/bin/time -v nice -n 20 ./ztest -V -T 86400
--nice -n 20 ./ztest -V $* && echo Test successful
-+nice -n 20 /usr/sbin/run-ztest -V $* && echo Test successful
- echo "End date: `date`"
diff --git a/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc b/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc
deleted file mode 100644
index 94648c91fa49..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc,v 1.1 2008/09/25 17:03:20 trapni Exp $
-
-depend() {
-	need localmount
-	before net
-}
-
-PIDFILE="/var/run/zfs/zfs-fuse.pid"
-EXEFILE="/usr/sbin/zfs-fuse"
-
-checksystem() {
-	return 0 # TODO
-}
-
-start() {
-	ebegin "Starting ZFS-FUSE"
-	checksystem || return 1
-	start-stop-daemon --start --exec ${EXEFILE} \
-        	--user daemon --group disk -- --pidfile ${PIDFILE}
-	rv=$?
-	eend $rv
-
-	if [[ $rv -eq 0 ]]; then
-		ebegin "Mounting ZFS filesystems"
-		zfs mount -a
-		eend $?
-	fi
-}
-
-stop() {
-	ebegin "Unmounting ZFS filesystems"
-	zfs umount -f -a
-	eend $?
-
-	ebegin "Stopping ZFS-FUSE"
-	checksystem || return 2
-	start-stop-daemon --stop --pidfile ${PIDFILE} \
-		--exec ${EXEFILE} --retry TERM/1/TERM/2/TERM/4/TERM/8/KILL
-	eend $?
-}
diff --git a/sys-fs/zfs-fuse/files/zfs-fuse.rc b/sys-fs/zfs-fuse/files/zfs-fuse
index 415ea99fc429..b16c885182a0 100644
--- a/sys-fs/zfs-fuse/files/zfs-fuse.rc
+++ b/sys-fs/zfs-fuse/files/zfs-fuse
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/zfs-fuse.rc,v 1.3 2010/06/05 23:46:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/zfs-fuse,v 1.1 2010/06/22 20:13:43 ssuominen Exp $
 
 depend() {
 	before net
@@ -19,7 +19,7 @@ start() {
 	ebegin "Starting ZFS-FUSE"
 	checksystem || return 1
 	start-stop-daemon --start --exec ${EXEFILE} \
-        	--user daemon --group disk -- --pidfile ${PIDFILE}
+        	--user root --group disk -- --pidfile ${PIDFILE}
 	rv=$?
 	eend $rv
 
diff --git a/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild b/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild
deleted file mode 100644
index 094c3ceb2758..000000000000
--- a/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-0.5.0.ebuild,v 1.4 2010/06/05 23:46:32 ssuominen Exp $
-
-IUSE="doc debug"
-
-inherit eutils
-
-DESCRIPTION="An implementation of the ZFS filesystem for FUSE/Linux"
-HOMEPAGE="http://www.wizy.org/wiki/ZFS_on_FUSE"
-#SRC_URI="http://download.berlios.de/zfs-fuse/zfs-fuse-${PV}.tar.bz2"
-SRC_URI="mirror://berlios/zfs-fuse/zfs-fuse-${PV}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=sys-libs/glibc-2.3.3
-		>=dev-util/scons-0.96.1
-		>=dev-libs/libaio-0.3
-		>=sys-fs/fuse-2.6.1"
-
-RDEPEND=">=sys-fs/fuse-2.6.1"
-
-S="${WORKDIR}/${P}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}/fix_zdb_path.patch"
-	epatch "${FILESDIR}/${PV}/fix_zfs-fuse_path.patch"
-	epatch "${FILESDIR}/${PV}/fix_ztest_path.patch"
-
-	sed -i -e 's:-Werror::' SConstruct || die
-}
-
-src_compile() {
-	scons || die "Make failed"
-}
-
-src_install() {
-	if useq debug; then
-		mv cmd/ztest/ztest cmd/ztest/run-ztest || die
-		mv cmd/ztest/runtest.sh cmd/ztest/ztest || die
-		dosbin cmd/ztest/run-ztest || die
-	fi
-	dosbin cmd/ztest/ztest || die
-
-	if useq debug; then
-		mv zfs-fuse/zfs-fuse zfs-fuse/run-zfs-fuse || die
-		mv zfs-fuse/run.sh zfs-fuse/zfs-fuse || die
-		dobin zfs-fuse/run-zfs-fuse || die
-	fi
-	dosbin "zfs-fuse/zfs-fuse" || die
-
-	dosbin "cmd/zfs/zfs" || die
-	dosbin "cmd/zpool/zpool" || die
-	dosbin "cmd/zdb/zdb" || die
-
-	newinitd "${FILESDIR}/${PV}/${PN}.rc" "zfs-fuse" || die
-
-	keepdir /var/lock/zfs || die
-	fowners daemon.disk /var/lock/zfs || die
-
-	keepdir /var/run/zfs || die
-	fowners daemon.disk /var/run/zfs || die
-
-	cd "${WORKDIR}/${P}" || die
-
-	dodoc CHANGES || die
-
-	if use doc; then
-		dodoc {INSTALL,TODO,STATUS,TESTING,HACKING,BUGS} || die
-	fi
-
-	dodir /etc/zfs
-}
-
-pkg_postinst() {
-	echo
-	einfo "To debug and play with ZFS-FUSE make sure you have a recent 2.6.xx"
-	einfo "series kernel with the FUSE module compiled in OR built as a"
-	einfo "kernel module."
-	einfo
-	einfo "You can start the ZFS-FUSE daemon by running"
-	einfo
-	einfo "     /etc/init.d/zfs-fuse start"
-	einfo
-	einfo "as root from the command line. "
-	einfo
-	einfo "And don't forget to add it permanently, if you want to:"
-	einfo
-	einfo "    rc-update add zfs-fuse boot"
-	einfo
-	einfo "For additional ZFS related commands I recommend the ZFS admin"
-	einfo "guide. http://opensolaris.org/os/community/zfs/docs/zfsadmin.pdf"
-	einfo
-	einfo "Don't forget this is an beta-quality release. Testing has been"
-	einfo "very limited so please make sure you backup any important data."
-	einfo
-	einfo "If you have any problems with zfs-fuse please visit the ZFS-FUSE."
-	einfo "website at http://developer.berlios.de/projects/zfs-fuse/"
-	echo
-}
diff --git a/sys-fs/zfs-fuse/zfs-fuse-0.6.9.ebuild b/sys-fs/zfs-fuse/zfs-fuse-0.6.9-r1.ebuild
index b28f73671f22..3bc148d4ae68 100644
--- a/sys-fs/zfs-fuse/zfs-fuse-0.6.9.ebuild
+++ b/sys-fs/zfs-fuse/zfs-fuse-0.6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-0.6.9.ebuild,v 1.1 2010/06/05 23:46:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-0.6.9-r1.ebuild,v 1.1 2010/06/22 20:13:43 ssuominen Exp $
 
 EAPI=2
 
@@ -49,8 +49,8 @@ src_install() {
 
 	dodir /etc/zfs
 	keepdir /var/{lock,run}/zfs
-	fowners daemon.disk /var/{lock,run}/zfs
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	fowners root.disk /var/{lock,run}/zfs
+	doinitd "${FILESDIR}"/${PN}
 
 	dodoc ../{BUGS,CHANGES,HACKING,README*,STATUS,TESTING,TODO}
 }