Update init script to not regenerate the RSA1 host key (for SSH Protocol 1) unless Protocol 1 is enabled. Modern OpenSSH versions disable Protocol 1 in the daemon by default.

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

4 files changed, 98 insertions, 9 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index c5befd16d099..4c7c7ddc6df1 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.392 2010/09/30 02:48:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.393 2010/10/11 22:50:07 flameeyes Exp $
+
+  11 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  openssh-5.6_p1-r2.ebuild, +files/sshd.rc6.1:
+  Update init script to not regenerate the RSA1 host key (for SSH Protocol
+  1) unless Protocol 1 is enabled. Modern OpenSSH versions disable Protocol
+  1 in the daemon by default.
 
 *openssh-5.6_p1-r2 (30 Sep 2010)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4ee4fd37e370..712f51fefab9 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
@@ -18,6 +18,7 @@ AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0
 AUX sshd.pam 294 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d SHA1 4cd17fb40793fa9ca77ac93698129f2c8cafd7b8 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f
 AUX sshd.pam_include.2 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
 AUX sshd.rc6 2159 RMD160 961c7222fe809d81dc04c1f62e14c8292c0e3452 SHA1 d9853a50ff89d4359cc813a0f5ec936659941646 SHA256 83b94fed859ab3a00861969f97c166bd3b2fdd217f26468153e17005dfd55828
+AUX sshd.rc6.1 2244 RMD160 112f62244a4654d706fa3892da514df8130dabf3 SHA1 4a561034f7376bf10dc4601f2b847f247b83bf53 SHA256 09b7f29890fd0c28e364637236518c7ee4fea018af94dd72b8682a548678cd73
 DIST openssh-5.2p1+x509-6.2.1.diff.gz 153887 RMD160 3642946adfc122f28fb80518719040dddacf84ea SHA1 e48447e4335c543f4b702b3e3d0e41d6d9f7f6aa SHA256 9a745634eaf450fb2c0f9dcc31f3021dcd70d6bbdba0ae5b6952f2dfcb21ee55
 DIST openssh-5.2p1-gsskex-all-20090726.patch 90959 RMD160 45763e73aa65181d56aafed9ab7dd217150769f2 SHA1 64058c69fb866a8ab0233d454f3bb8e94a0b9db7 SHA256 6eb297d6fa74be3323c5e4f53df5b6e1f4edf6bf394e3e707c075846886e18e7
 DIST openssh-5.2p1-hpn13v6.diff.gz 33540 RMD160 d647d3b0547e4d698c616f5ed6643b3ddbcced95 SHA1 9683d5feb3f7e302ef836901af5366df6c425815 SHA256 90a395037a826a8ebcff68be8e46ddce1f89fd776c312c0e10e73cb703ed21bd
@@ -46,13 +47,13 @@ EBUILD openssh-5.3_p1-r1.ebuild 8321 RMD160 c632f38bae4c60e4836c96ca7e35dd103b59
 EBUILD openssh-5.4_p1-r3.ebuild 8268 RMD160 0116016c792b5f56411dddf5a5f037dc4126361e SHA1 55e4e4e09ad214d3bb82304d1a1848ae45101099 SHA256 cbe163e47210ca42bf24545375aec9f9757af200eab68b9d539c7b2c39926f03
 EBUILD openssh-5.5_p1-r2.ebuild 8180 RMD160 e2bcad59293157b59d2b92fbb841fd8c4e2e6c40 SHA1 962947647c14a4a473921842375b9a7bf4bd308c SHA256 3f26e1d3d6cd6fdfef8107bbcb217899857ed12f9d7b805d93333d08ee58a90f
 EBUILD openssh-5.6_p1-r1.ebuild 7889 RMD160 5136804037e2b8dc2202014aec6ed877583234e6 SHA1 3abb985a3b875d3f9554e111ed676edc6879297f SHA256 d5549c197592a412130803c7e25bf94b55e607f0a239f6570b269e9713df68a6
-EBUILD openssh-5.6_p1-r2.ebuild 7935 RMD160 b81b324966a0e384cc095b27c686062852146efc SHA1 64d56dadba8be86557365bbc5f5fd71cd2b85948 SHA256 2c9aa106073b9f90395a6bdb9500ace425e384db0fb8ab16a432b93a72a1ca3d
-MISC ChangeLog 61456 RMD160 2118efbfc2a79c6235e78476f20cc5a08d2fe78f SHA1 7b7024e1d14f2abe5705772165727e141857ec62 SHA256 903c0eb19b5a2f65401a9fde51a35951f31e9f7721ff0da7522fd05791e60090
+EBUILD openssh-5.6_p1-r2.ebuild 7940 RMD160 9809044e03287091dfc77a81103c2684b5df6aae SHA1 14a9ea6d208d89d831857833909af0f9d83bfbe8 SHA256 9fbe2a8df96ee7f3dec98a36aa215917a262cbf82b8aff58a96d3675e50d76e8
+MISC ChangeLog 61744 RMD160 8686aa2e58558963facf167f9a4b1da5de560e64 SHA1 7469af90916293530a606dde6e10ce68a5c68e46 SHA256 157e88154f1f707660c02af0acba0ee5a65ffc057f09f064f84566f3cd3706f6
 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyj+nQACgkQTwhj9JtAlp7vXQEAiKqN+Cxviba2CNtzvyE+2T4a
-Sv1jX7DE+dr3YBLidHUBAJQUlI+m47CnCYkv61onoNw1QVbbmnFyO+pgoA2lKeuM
-=2e4c
+iEYEARECAAYFAkyzlH8ACgkQAiZjviIA2XjYsgCg7XwcJTo1ZkWnwMp5rF4e/ikk
+xusAoLxNu5FqWQH7HuZa/8fZaO/dnYHB
+=gpZo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/sshd.rc6.1 b/net-misc/openssh/files/sshd.rc6.1
new file mode 100644
index 000000000000..0afb9480ed14
--- /dev/null
+++ b/net-misc/openssh/files/sshd.rc6.1
@@ -0,0 +1,82 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.1,v 1.1 2010/10/11 22:50:07 flameeyes Exp $
+
+opts="${opts} reload checkconfig gen_keys"
+
+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_BINARY}" -t ${myopts} || return 1
+}
+
+gen_keys() {
+	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_key ] && \
+	   egrep -q '^[ \t]*Protocol[ \t]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then
+		einfo "Generating RSA1-Hostkey..."
+		/usr/bin/ssh-keygen -t rsa1 -f "${SSHD_CONFDIR}"/ssh_host_key -N '' || return 1
+	fi
+	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_dsa_key ] ; then
+		einfo "Generating DSA-Hostkey..."
+		/usr/bin/ssh-keygen -d -f "${SSHD_CONFDIR}"/ssh_host_dsa_key -N '' || return 1
+	fi
+	if [ ! -e "${SSHD_CONFDIR}"/ssh_host_rsa_key ] ; then
+		einfo "Generating RSA-Hostkey..."
+		/usr/bin/ssh-keygen -t rsa -f "${SSHD_CONFDIR}"/ssh_host_rsa_key -N '' || return 1
+	fi
+	return 0
+}
+
+start() {
+	local myopts=""
+	[ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
+		&& myopts="${myopts} -o PidFile=${SSHD_PIDFILE}"
+	[ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
+		&& myopts="${myopts} -f ${SSHD_CONFDIR}/sshd_config"
+
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec "${SSHD_BINARY}" \
+	    --pidfile "${SSHD_PIDFILE}" \
+	    -- ${myopts} ${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 --stop --signal HUP --oknodo \
+	    --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
+	eend $?
+}
diff --git a/net-misc/openssh/openssh-5.6_p1-r2.ebuild b/net-misc/openssh/openssh-5.6_p1-r2.ebuild
index bc39868f31d8..d5658189ff2c 100644
--- a/net-misc/openssh/openssh-5.6_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.6_p1-r2.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/net-misc/openssh/openssh-5.6_p1-r2.ebuild,v 1.1 2010/09/30 02:48:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.6_p1-r2.ebuild,v 1.2 2010/10/11 22:50:07 flameeyes Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib autotools pam
@@ -183,7 +183,7 @@ src_install() {
 	emake install-nokeys DESTDIR="${D}" || die
 	fperms 600 /etc/ssh/sshd_config
 	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6 sshd
+	newinitd "${FILESDIR}"/sshd.rc6.1 sshd
 	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty