Init script now interacts fully with start-stop-daemon.

Package-Manager: portage-2.1.2_pre2-r7

3 files changed, 20 insertions, 24 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 81f786433b7a..70123ae12a7f 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.208 2006/10/13 22:41:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.209 2006/10/14 11:04:32 uberlord Exp $
+
+  14 Oct 2006; Roy Marples <uberlord@gentoo.org> files/sshd.rc6:
+  Init script now interacts fully with start-stop-daemon.
 
 *openssh-4.4_p1-r4 (13 Oct 2006)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 5d27cc71d7bc..a215ab4efa53 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openssh-3.9_p1-chroot.patch 3026 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 SHA1 78f85bc81c0034e03d06dd3c7ab91b9210fc18fb SHA256 014158a32c707b2a79ac606aeefb6bc09f24c3f07ce5df353ddad96095518597
 MD5 c4edd6a7aa1418ce5bf74aeb46627dbf files/openssh-3.9_p1-chroot.patch 3026
 RMD160 23b2a1c819580b0f2fcb927c13c63e4f16387333 files/openssh-3.9_p1-chroot.patch 3026
@@ -145,10 +142,10 @@ AUX sshd.pam_include 205 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 SHA1 12
 MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205
 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 files/sshd.pam_include 205
 SHA256 8d59135e96f4eff6b80c143b82cced7beb0bbca19ff91b479f1ba92916243d5e files/sshd.pam_include 205
-AUX sshd.rc6 1895 RMD160 ab773dbbe1b539a3639e321ec5c4d18c6a697912 SHA1 5f8abade6a9945ca433e03d5bb7664488b03615e SHA256 068251ba84e72d06fa96e935ed575ad75b2dc607d73ca48e440884c625883f67
-MD5 ef24fb627241356bac4842d52ae10a55 files/sshd.rc6 1895
-RMD160 ab773dbbe1b539a3639e321ec5c4d18c6a697912 files/sshd.rc6 1895
-SHA256 068251ba84e72d06fa96e935ed575ad75b2dc607d73ca48e440884c625883f67 files/sshd.rc6 1895
+AUX sshd.rc6 2028 RMD160 a626fcde615a03deb4cc10a1b8c649b5f2a94b54 SHA1 24e2d25d4108d13343d2e6c95d89532ce091e4a2 SHA256 6db92d598df11c80cf831d145a22f096155b19d5b10b16e158a3498593a612df
+MD5 77fb0c5962401fe925059b91f16605cd files/sshd.rc6 2028
+RMD160 a626fcde615a03deb4cc10a1b8c649b5f2a94b54 files/sshd.rc6 2028
+SHA256 6db92d598df11c80cf831d145a22f096155b19d5b10b16e158a3498593a612df files/sshd.rc6 2028
 DIST openssh-3.9p1+x509-5.3.diff.gz 126331 RMD160 7b33dc161664f7bc155a19a09c603b1938924b75 SHA1 9ba617a24da8ac9177e96863cbb05b591e37c457 SHA256 4d1a8cc0a40d45a3e8f5ffa3fa70ad8d5b4141adf0e04c1643acf30ff80899df
 DIST openssh-3.9p1-hpn11.diff 13237 RMD160 02e9a3c12e289ef7dea5b7d81ec5b2e06580b7d0 SHA1 a3140a0a206bdbcad91f6379ed3d0c596167b464 SHA256 ce83e3c38fe79c85f371e8e1a47d45085dd08b7e4604f7291264e36d9ebb35fe
 DIST openssh-3.9p1.tar.gz 854027 RMD160 e4abf280a18e3ae046d0dee19dab919bba8e5568 SHA1 80b19d83a9d4717f5c38b2d950501e1471f60afc SHA256 e119eb9b09c13ddd945a0105f19b05983e62de0bac167264f055f93115048090
@@ -224,10 +221,10 @@ EBUILD openssh-4.4_p1-r4.ebuild 5370 RMD160 38084f3c99eed96890bde772aa90bc2901e0
 MD5 f505b49dc0f3b35133698cf42367ece4 openssh-4.4_p1-r4.ebuild 5370
 RMD160 38084f3c99eed96890bde772aa90bc2901e08265 openssh-4.4_p1-r4.ebuild 5370
 SHA256 99b05731e432ee2fd1a7476afd9b7af21a670e7780aa56f51abd6d28dde9ddda openssh-4.4_p1-r4.ebuild 5370
-MISC ChangeLog 33430 RMD160 2b1b4d4b35e9c4d3a2fc8b3aea23b16c4eb74602 SHA1 911ce668e9a54ec089abe964fe30ccfd063e7400 SHA256 eb6413d3181a3169c7aa262eca51a1f242e83e2008945157bf7775dd8b3648ff
-MD5 d5e9aab38f471f5569457721d5e2a411 ChangeLog 33430
-RMD160 2b1b4d4b35e9c4d3a2fc8b3aea23b16c4eb74602 ChangeLog 33430
-SHA256 eb6413d3181a3169c7aa262eca51a1f242e83e2008945157bf7775dd8b3648ff ChangeLog 33430
+MISC ChangeLog 33556 RMD160 01574055a5844c559c2db5048f3ce4c7eb62b867 SHA1 b6a29b7d6120284ded2e3a17e54cf4113ad27f1b SHA256 d6ffaf95dd67f740db0708b01b08b7e225ccfb7ff8b834d3eee7aa64ae5d2ebf
+MD5 667026b50f34d71857c21c3642894b3f ChangeLog 33556
+RMD160 01574055a5844c559c2db5048f3ce4c7eb62b867 ChangeLog 33556
+SHA256 d6ffaf95dd67f740db0708b01b08b7e225ccfb7ff8b834d3eee7aa64ae5d2ebf ChangeLog 33556
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -265,10 +262,3 @@ SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/di
 MD5 056f45fb06ba68f12a5c3d17c358d11a files/digest-openssh-4.4_p1-r4 1054
 RMD160 b9c38e783576498b0a52efdd1d2a2fa1f7f1c5d8 files/digest-openssh-4.4_p1-r4 1054
 SHA256 9473c1a72dfbb64f75d675572c08d199d65c9a89af583d97217947cb09cb4135 files/digest-openssh-4.4_p1-r4 1054
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMBYtamhnQswr0vIRAkqNAJ4pgJ4aMHnUc+0uqojc0VgDExe/gQCfSxtE
-mpXau66X5VJiHKzD3DzJOWw=
-=Ye+b
------END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
index 77cfc5a4f4e1..3adb9cf076c0 100644
--- a/net-misc/openssh/files/sshd.rc6
+++ b/net-misc/openssh/files/sshd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.20 2006/09/20 23:10:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.21 2006/10/14 11:04:32 uberlord Exp $
 
 opts="reload"
 
@@ -55,19 +55,22 @@ start() {
 
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
-	${SSHD_BINARY} ${myopts} ${SSHD_OPTS}
+	start-stop-daemon --start --exec ${SSHD_BINARY} \
+	    --pidfile ${SSHD_PIDFILE} \
+	    -- ${myopts} ${SSHD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile ${SSHD_PIDFILE}
+	start-stop-daemon --stop --quiet \
+	    --exec ${SSHD_BINARY} --pidfile ${SSHD_PIDFILE}
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile ${SSHD_PIDFILE} \
-		--signal HUP
+	start-stop-daemon --stop --signal HUP --oknodo \
+	    --exec ${SSHD_BINARY} --pidfile ${SSHD_PIDFILE}
 	eend $?
 }