Cleanup of sshd init.d in preparation for bug #410541. local keyword is not POSIX sh.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

3 files changed, 92 insertions, 22 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 617ddb0c9cec..a250219dfbaf 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.459 2012/11/19 20:43:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.460 2012/11/28 00:32:24 robbat2 Exp $
+
+  28 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +files/sshd.rc6.4:
+  Cleanup of sshd init.d in preparation for bug #410541. local keyword is not
+  POSIX sh.
 
   19 Nov 2012; Mike Frysinger <vapier@gentoo.org> openssh-6.1_p1.ebuild:
   Only show ecdsa key message when upgrading from older versions, and drop
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 39000a6e7cd3..df1d3619e3f9 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7 SHA512 4d00a9ed79f66b92502c3e5ee580523f63d7b3643fe1bd330ff97994acce527d4d285d38199cef66eddc0ef68afabf7b268abc60cba871bac5d2e99045d4ac11 WHIRLPOOL 2f118fd2f016c529dbc31e8f2b6b418931e6770ab02c28b7feeaba93e84e7fcd1c742f4420a43a9fec0bdfaa4d4bc7cf14fb860c0a56c68a30e7b136fb60bcdb
 AUX openssh-5.2_p1-autoconf.patch 386 SHA256 42bb5f23f02241186abd6158ac15cd1fba0fadb4bd79e6b051fbd05605419ebb SHA512 80a2244e243492d3933646a32fa673078efd72d0e87939b326c2210f23d72675839cfefa2f31617279d51834cc34daf2c3c189c9d92b08875b6b4f68fa7f3844 WHIRLPOOL d4ca3dd8554863d074054489a2dbe5aca3d07fcc5858e908caa5d76dcf8beb661cc3ca6d22a02ab2ca9f504160a6a1acc7f45a4fa775d879b02ee1ae3d113926
 AUX openssh-5.2_p1-gsskex-fix.patch 408 SHA256 8190db31ed2e8dc6ce79030e5c648d04610b06dd8366df5948ef6e990314ee96 SHA512 2022cd25b3e07430752569e07165db313e49a0902ef251df3e50ca96197849be6efbdee360a3a435cae0b5d2dda55acc8676b232d3584f87e204c2fc04b92801 WHIRLPOOL 65da9f3450493ca9a25741e66b2ecf97d7a5576c15485ff3a7c08fc57b06a17b3b6e73b14d2962bf958d9326a6d54c2940f56eb42de4bd5011324bba84c67cca
@@ -29,6 +26,7 @@ AUX sshd.rc6 2189 SHA256 627125378ccfdd81289531f527346980da249d35499cb71518f88f1
 AUX sshd.rc6.1 2270 SHA256 153119116208d328c496d29b7cb9f85991df93020cc50c83b05ed498b10a2126 SHA512 80f0e460ad7ffd9a6fb279ce2d307cbda1f7352745ffaca381867f636ae64df336a03de0da15aca39619acdbebf41e2ccbd2bb233433f93625754965aaaab780 WHIRLPOOL 6b7a4519282fe99fc36cd0f89f6163ad9c8c9d998b15e84d3758af607627db48cf58ffee1bc4291ac0e7f75455f8f8873cd5d996f3c75f1ea3bef0b249abdffe
 AUX sshd.rc6.2 2069 SHA256 94b1fc0d608464fd4a6c7ed23f0b9c44aada3404982d8fd25b8bfe202baffaa6 SHA512 f75f95e6cf912b8c45f7ccf81e764805a56057368b18425abe699b29c3c66d32ea5b2d1c9f6fadf97487430e703e01dc2d965e41b8511f31a3e06d3bcbbc1006 WHIRLPOOL b9082ba3854e1842e057717b9a1571ba5ac6bf69c5facb391b7a3d890b13f879d7ae1484eafbbffc17746c3a8184f23e4c3fa831f678eabdea7d23e2c0d1bf63
 AUX sshd.rc6.3 2057 SHA256 43d95b495440ed6b3c1eb82b81712d7f6e58246527605c11d733cb5eb5523254 SHA512 3ddcdeae6c7f4755df1f8fe77d9d1af8c728f8cc18da0feaeccc4b8147f86b4db1ab1bf4ad362c31fac986270b21fe2c80e0414d64f70bfdac2370e22c2c9db2 WHIRLPOOL 57a18d85ab77abe64eddf852975481d974bd68b0b058d854a31158aed14b1706743ad563aa013c770aa124533fb5344bc64d0c06b564e1b53e28e1b0ebe463e8
+AUX sshd.rc6.4 2051 SHA256 ac60eea19ce8a8070460291df001485f06fdc2821d95735dc992069ff959e0ca SHA512 164febd1569e5ade001daa0d0d001a7bf77e17cd26cadf279a053f47169ef89a279fefce0ba2556b826eb57ed4130fe36fb40e406d93c5b4516615348f2a21fd WHIRLPOOL 0ec47827a527d98c34a094ec09adbc42aa92a9939fbe339d5e3b845c93226d5f8346f0a407f4a189c2b7b713a41d9d704506e5fa541a5b34f51b20fa13027d85
 AUX sshd.service 206 SHA256 093d4f526e740cbec46ad6a69207407daf01e74da44599d75b979f294c9b0a7b SHA512 67d96a63a6bc874bacc2f43b51c003f2209a4d2283f8435ba3495266e4823d73962fd995f46eab0e8b260107b9a8c416709b2f19e8e94ecea30ddd8280444cfe WHIRLPOOL b48005444104583bd230e68f870a1d0c4a8709f5e8f7fafa45becf259df64052b1938853e8e232b32aae882dbad83d5c78d7796eafb6c02bd0196f7a6a44075f
 AUX sshd.socket 136 SHA256 c055abcd10c5d372119cbc3708661ddffccdee7a1de1282559c54d03e2f109d9 SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 WHIRLPOOL 102d87b708c31e5994e8005437c78b1aa756c6def4ee9ae2fa9be1438f328fc28c9152a4ff2528941be18f1311594490ecd98b66716ec74e970aa3725a98e2e5
 AUX sshd_at.service 176 SHA256 332f5ffc30456fe2494095c2aabd1e6e02075ce224e2d49708ac7ccf6d341998 SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a WHIRLPOOL aeb32351380dd674ef7a2e7b537f43116c189f7fddb8bdb8b2c109e9f62b0a73cc0f29f2d46270e658ab6409b8d3671ce9e0d0ba7c0d3674c2f85291a73e6df1
@@ -49,22 +47,5 @@ EBUILD openssh-5.9_p1-r4.ebuild 9204 SHA256 0785521134a633b8aad46bd6f3521d56502e
 EBUILD openssh-6.0_p1-r1.ebuild 9482 SHA256 53809a8d7a008c1814b6d44b8bc7abbf8ebc364c6586d5fd09a7aac211dc2190 SHA512 5a299231e7d8152b83056dc72a75245fb46588a02475408ef708405817840a7bfdec692679a3aad86bd5a9a65b57607749742f2c44afc8abac3341bfcf1bfcb6 WHIRLPOOL a1cb93673f0c60c2626d9467f1fc825b196ab27ebbacaf5c3b45237b748b07d2535a15bd056ca5e4ef51094f163ab6c4d8038cb167e96be709ebdfb28bda11cd
 EBUILD openssh-6.0_p1.ebuild 9479 SHA256 35e0b382b8147782bfd0e3d28c3035e32a67526bc270beb0e3fdf02239b5a254 SHA512 d4a9f01f733384821172e96a6a09dcfc31128d394ad5d03db813fbc65bc77402ea2acbc46e3a233dfced4de1e42db1bee6016cbc6c7b47aaa96363215d913e24 WHIRLPOOL f639c5b573d481913f7ad8117b245cb7ad5c522d81337de6dc67a44c8449bcc56d3a3b52176e6ab7e2a084b66189e82b13483ad11bb70ed40014aeef5657fe97
 EBUILD openssh-6.1_p1.ebuild 9575 SHA256 e21e74e825940ece9064ed0b327549ba335ffcd9c463e21931a833be03563166 SHA512 be21b0e90112fea1cee076259831e00b2c1ba8a8130432dc8e2eed1a81bec900f504bf8e4ed7200e3d4bf60eb4c204fdfef3f07f0430c3b899672f3ec8cc9b95 WHIRLPOOL 8b379212f7be8c36c508755f0cf6bf3b5895ddea395304ba097f0c3b8c10909cc964f66e8de8eda238ce037ed34197a4635173907cc89e905869f7e519f6c58c
-MISC ChangeLog 74396 SHA256 533918f9cea4bde4ed5593144e6915f90e2440b0abd6e482fba271c28725d0d6 SHA512 7985fc70243d912bab873c967d81393b327922d2640da97722f6e2dc7aa0029c2ed655b6583b169b9ce080529cf8ca141e6f3c5a1410a7a27395b2dc3c51c8b0 WHIRLPOOL d09f7340d479667b8f24bf3197e07b04c45f40f7386f0f9d2b50069e6a55fe64e8e498b4f6a692e530fbd6fea11d930bcd9d01afce1bce538f11b82509bc2c36
+MISC ChangeLog 74560 SHA256 7c82253300e8189aa03fb795ee9ccdd4fbe2795310a15d630589271d1ce4bc96 SHA512 a0ce4b5d72d72fd27b718b5d65fe389c8ee4e1bfd61de753a4239220e9b2cc2f881649ebd0304383434984420f71de559c2ea1ebca116d9cbf90fce7d04a892b WHIRLPOOL 31232fe125c96bba230fbaec90d3daafcf1de099f891d1c32b1dcffd3ce08c0050c8c321ee41a3f67edb965bdc6278a9635598671bdc6e7c1fa111a73cba1869
 MISC metadata.xml 1599 SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86 SHA512 62ff3ab2fc84f7612799080285cba1f26c0b299d4159b15812a4b4349bfa450ac5f4e038b187201a8cba4c169c47dc4c5d9c4dfe881ef15cef82deadb8d63852 WHIRLPOOL f0b8153f49fb357cc8f90dbcb7397b6be3b31987e9bdde375c172ef2f2464a91080bef04f0e050b97852cad0a26ac9b2f634188f7b910e7dfbf738dd06a80223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQqpn4AAoJELEHsLL7fEFW+1kQAKOkg8zMT3QUW5xJv7Ttb8KB
-POMYBGXfNMkeZiV1Rpx6Xcu+jCTmt2KcVVCPiHhzuwQcL+pzfZQyxDZXvs6vg/wx
-wjVwVsniSrhTSEOpMCNSIvxQr63hQBnPPu7PeKVZl7R9/H0zW7RTOAv2Ng3W3tfC
-O4xibK+ntQiBSTI3CbfGXKZG1pV9quZeMaLQ3DjWjHSOBYmgCVld2VTNoK6lgTdx
-lNieo8qSFUHK/n3YlKuuYcq6B3wRU5ArhFYP56IvJ4WQgo53s2jx1225J30Eg7Px
-OgSyPgeHQkwAanNzfc4uFaSxb9D8qYP/b/ePMSBNKAwusn6b6m0t4FVfAbhV8Alp
-nalusoEA7Vp9wmtMHmy49jO3Wmlt5glFtF4mpKBlGF78o4SCqojKWhVvOElTobAy
-kClDkjXMVhWBD/whQNFFnbtK66mubhGo2BvDjAuus+Zo952yWrUsX16PdzU4iDtA
-S3FgK+28iAd8uRSTbHEbH1duCyKn/14CySziNNfLgRbtkz6f3Ty+WQpTSZFGID87
-jhpywev0qy346mhi0ujoZOjvZ8NkwQB5kGdgUIOtVoS9toPSupQhz2uyF7QeF5Mo
-DpLSP+QEX1AFH+j64Xxp3hatKZzHtKKj0OXU2LpcISCobx4RkfRNYqWFEttdh2QJ
-W4YetL+Qux1+rX9nKKn1
-=mEAJ
------END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/sshd.rc6.4 b/net-misc/openssh/files/sshd.rc6.4
new file mode 100755
index 000000000000..d636327f2287
--- /dev/null
+++ b/net-misc/openssh/files/sshd.rc6.4
@@ -0,0 +1,85 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.1 2012/11/28 00:32:24 robbat2 Exp $
+
+extra_commands="checkconfig gen_keys"
+extra_started_commands="reload"
+
+depend() {
+	use logger dns
+	need net
+}
+
+SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
+SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
+SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
+
+checkconfig() {
+	if [ ! -d /var/empty ] ; then
+		mkdir -p /var/empty || return 1
+	fi
+
+	if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then
+		eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd"
+		eerror "There is a sample file in /usr/share/doc/openssh"
+		return 1
+	fi
+
+	gen_keys || return 1
+
+	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
+		&& SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
+	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
+		&& SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFDIR}/sshd_config"
+
+	"${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
+}
+
+gen_key() {
+	keytype=$1
+	[ $# -eq 1 ] && ks="${keytype}_"
+	key="${SSHD_CONFDIR}/ssh_host_${ks}key"
+	if [ ! -e "${key}" ] ; then
+		ebegin "Generating ${keytype} host key"
+		ssh-keygen -t ${keytype} -f "${key}" -N ''
+		eend $? || return $?
+	fi
+}
+
+gen_keys() {
+	if egrep -q '^[[:space:]]*Protocol[[:space:]]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then
+		gen_key rsa1 "" || return 1
+	fi
+	gen_key dsa && gen_key rsa && gen_key ecdsa
+	return $?
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec "${SSHD_BINARY}" \
+	    --pidfile "${SSHD_PIDFILE}" \
+	    -- ${SSHD_OPTS}
+	eend $?
+}
+
+stop() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec "${SSHD_BINARY}" \
+	    --pidfile "${SSHD_PIDFILE}" --quiet
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP \
+	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
+	eend $?
+}