From: Roy Marples <uberlord@gentoo.org>
Date: Fri, 23 Feb 2007 11:33:59 +0000 (+0000)
Subject: Use start-stop-daemon correctly.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a90a0a486dc64c2c351b7ac5d67ffd988609251;p=gentoo.git

Use start-stop-daemon correctly.
Package-Manager: portage-2.1.2-r10
---

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index f8cb77a5c43b..babda00f66e4 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/rsync
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.113 2007/02/03 21:35:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.114 2007/02/23 11:33:59 uberlord Exp $
+
+  23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/rsyncd.init.d:
+  Use start-stop-daemon correctly.
 
 *rsync-2.6.9-r2 (03 Feb 2007)
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 5b19bf18612f..fb59e5d3022b 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rsync-2.6.9-delete-acls-xattr.patch 1162 RMD160 f145ea48908cce70f6f364b3ed27d969373befd1 SHA1 dae03baed7062bf7486655ef2988a2d21b3eb5a7 SHA256 a9eefe91908c3e7d842e40f69fdf658edb3250cb9458649d22bc4337398a9783
 MD5 10e516dab4d1712204129674d4f01820 files/rsync-2.6.9-delete-acls-xattr.patch 1162
 RMD160 f145ea48908cce70f6f364b3ed27d969373befd1 files/rsync-2.6.9-delete-acls-xattr.patch 1162
@@ -17,10 +14,10 @@ AUX rsyncd.conf.d 149 RMD160 0c2d0e34d1467fc0ec460760b49d621231c8e562 SHA1 fda56
 MD5 e5e62e8cef29e09c22e8ba8152ec1751 files/rsyncd.conf.d 149
 RMD160 0c2d0e34d1467fc0ec460760b49d621231c8e562 files/rsyncd.conf.d 149
 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5 files/rsyncd.conf.d 149
-AUX rsyncd.init.d 438 RMD160 e107a899fb3000ebec3529392a4d5553864ba385 SHA1 edcbd84599e27b9245df8d6025f52deef3e5a581 SHA256 66219d742395539eb51cf1d0f0c50432ff1e2c9bdb3948f6410923f31cf3751d
-MD5 85d62854c15e2e275184c9af7e5d6d18 files/rsyncd.init.d 438
-RMD160 e107a899fb3000ebec3529392a4d5553864ba385 files/rsyncd.init.d 438
-SHA256 66219d742395539eb51cf1d0f0c50432ff1e2c9bdb3948f6410923f31cf3751d files/rsyncd.init.d 438
+AUX rsyncd.init.d 558 RMD160 856e8d1d54fed649df029f4c12a735e4628d7bcc SHA1 4d217a584f872070062d17d18a5e3d5571e92e0b SHA256 08e620bac216e0acdb56d94198caebd7fd14b0a42e8465b2eb98b7420d369ab6
+MD5 492d13dbba49a9e7c77c89d01b4f617a files/rsyncd.init.d 558
+RMD160 856e8d1d54fed649df029f4c12a735e4628d7bcc files/rsyncd.init.d 558
+SHA256 08e620bac216e0acdb56d94198caebd7fd14b0a42e8465b2eb98b7420d369ab6 files/rsyncd.init.d 558
 AUX rsyncd.xinetd 170 RMD160 2ce2addea3cfff08f86a168b0d2d83446514a60f SHA1 a2c04b2f3615a474c72f92362337baa366910b20 SHA256 e19e99dc3daa12d5729dd972b637ed064a2b004a1c7fe75c9f2ebb5ab5997aa8
 MD5 9fe188afd112764c6fcf1d07b80ca8d1 files/rsyncd.xinetd 170
 RMD160 2ce2addea3cfff08f86a168b0d2d83446514a60f files/rsyncd.xinetd 170
@@ -34,10 +31,10 @@ EBUILD rsync-2.6.9-r2.ebuild 2174 RMD160 5e306251b2fba675747a546a55e39fea7a3812c
 MD5 1c159609cc9de4ff08f55941715c2628 rsync-2.6.9-r2.ebuild 2174
 RMD160 5e306251b2fba675747a546a55e39fea7a3812ca rsync-2.6.9-r2.ebuild 2174
 SHA256 efa18937fceb4e782927159c843db601833feb49623693e0146c82e9dcb8eb55 rsync-2.6.9-r2.ebuild 2174
-MISC ChangeLog 14760 RMD160 e7b079f225cd9272ac49371b5d3f852c29b4c2fe SHA1 3d53fc0cdfa1fe046102dea3dd71fd485d6b4372 SHA256 f2258af873f2427e8ed201476ac91c6a944c6878358fc6974f45dcf0722c68c3
-MD5 96c59c9fedba9ad2a61035875f68da8e ChangeLog 14760
-RMD160 e7b079f225cd9272ac49371b5d3f852c29b4c2fe ChangeLog 14760
-SHA256 f2258af873f2427e8ed201476ac91c6a944c6878358fc6974f45dcf0722c68c3 ChangeLog 14760
+MISC ChangeLog 14868 RMD160 d7d56d7eac546db6a8bd59e5480d718cc970f046 SHA1 9da83f72b392df3781d2a2181c365f9022f6016b SHA256 a53a213880a167f2abdfa8738e689c3976968daeda00a2b33c831ed28da842cc
+MD5 448e3356bf4cb4b13352c8436f757d7c ChangeLog 14868
+RMD160 d7d56d7eac546db6a8bd59e5480d718cc970f046 ChangeLog 14868
+SHA256 a53a213880a167f2abdfa8738e689c3976968daeda00a2b33c831ed28da842cc ChangeLog 14868
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -48,10 +45,3 @@ SHA256 3b24d2cc4f4676a8760a13ad08252df7317ca597118a290a51f624d099b00044 files/di
 MD5 b7c43d63ebd1fc4f11b181745ce98f96 files/digest-rsync-2.6.9-r2 235
 RMD160 38e28736f704de5bceb9edf25034693e0192118d files/digest-rsync-2.6.9-r2 235
 SHA256 3b24d2cc4f4676a8760a13ad08252df7317ca597118a290a51f624d099b00044 files/digest-rsync-2.6.9-r2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxQAp8bi6rjpTunYRAvKUAKC85oEjDovs06jS9rMv9bx+wWCU7QCfcdc9
-WsVf/vX/EAIoOra+TNm5Hz0=
-=Hxof
------END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/rsyncd.init.d b/net-misc/rsync/files/rsyncd.init.d
index 7455dae11ef5..1b20282296a5 100644
--- a/net-misc/rsync/files/rsyncd.init.d
+++ b/net-misc/rsync/files/rsyncd.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.init.d,v 1.4 2004/10/21 01:10:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.init.d,v 1.5 2007/02/23 11:33:59 uberlord Exp $
 
 depend() {
 	use net
@@ -9,12 +9,15 @@ depend() {
 
 start() {
 	ebegin "Starting rsyncd"
-	rsync --daemon ${RSYNC_OPTS}
+	start-stop-daemon --start --exec /usr/bin/rsync \
+	    --pidfile /var/run/rsyncd.pid \
+	    -- --daemon ${RSYNC_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping rsyncd"
-	start-stop-daemon --stop --pidfile /var/run/rsyncd.pid
+	start-stop-daemon --stop --exec /usr/bin/rsync \
+	    --pidfile /var/run/rsyncd.pid
 	eend $?
 }