Pass sshd_config to sshd when starting to better help running multiple instances of ssh #121530 by ph.

Package-Manager: portage-2.1_pre4-r1

9 files changed, 70 insertions, 42 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index a2e3c694f9c3..b1a18ec224ee 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.152 2006/02/03 21:33:11 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.153 2006/02/04 17:49:29 vapier Exp $
+
+  04 Feb 2006; Mike Frysinger <vapier@gentoo.org> +files/sshd.confd,
+  files/sshd.rc6, openssh-3.9_p1-r3.ebuild, openssh-4.0_p1-r2.ebuild,
+  openssh-4.1_p1-r1.ebuild, openssh-4.2_p1.ebuild, openssh-4.2_p1-r1.ebuild:
+  Pass sshd_config to sshd when starting to better help running multiple
+  instances of ssh #121530 by ph.
 
   03 Feb 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   openssh-4.2_p1-r1.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index fe6983032db0..6bfe2573058a 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 db513696cdb36508967e6c2483cd5c7f ChangeLog 24849
-RMD160 468e3368e9981c229b5d35846ea317d40beded3d ChangeLog 24849
-SHA256 bd29fcf7d097f1d4f310f87d9d0ef9fea05e587026291252762fd320874101c3 ChangeLog 24849
+MD5 b8166608123ed53764d83a45d82bc2cd ChangeLog 25169
+RMD160 450ad1aca3ca4d8cdb51002c08b533cddcfbf158 ChangeLog 25169
+SHA256 4425b4a20fb2c7837a76493684b4b7c2bd32b096d2c0d4812cb81f990edac42e ChangeLog 25169
 MD5 239a562c31f4486b3665948b60831839 files/digest-openssh-3.9_p1-r3 835
 RMD160 4caa67826d1847f62d6899f70be04ccb1234a260 files/digest-openssh-3.9_p1-r3 835
 SHA256 cff18a611c7cacebde002a7b0fea2f2e7e267566bcf456d4ed24da6693003848 files/digest-openssh-3.9_p1-r3 835
@@ -79,37 +79,40 @@ SHA256 0be50a8ee5e7d2faf4961cc7eae96b22557e1b8e6b39f9da7d74b6c2c13fbc3b files/op
 MD5 eca7ba0b23754a710b42a79c1fb5e248 files/openssh-securid-1.3.1-updates.patch 445
 RMD160 b1db3dfa75f7e03d0dff41e85e285f8b749f27f0 files/openssh-securid-1.3.1-updates.patch 445
 SHA256 11c95cc508d20c8eb1e8faa0d2b5e68346cbb93db8fb560cfa8b4d2c0d1104b3 files/openssh-securid-1.3.1-updates.patch 445
+MD5 f63b0b7359fba745965a6d302a33762c files/sshd.confd 223
+RMD160 8705077fa2f09d42db286008cda2a65becc1a307 files/sshd.confd 223
+SHA256 b855256383de617696445f39f39cb96a579a3311d93acbf9d37437dc0bf14efb files/sshd.confd 223
 MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d files/sshd.pam 294
 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f files/sshd.pam 294
 MD5 2b66f75047edfac5d5e6cdbffa35383e files/sshd.pam_include 205
 RMD160 6b20ea83c69ef613d75daf43515aaec88d4cd815 files/sshd.pam_include 205
 SHA256 8d59135e96f4eff6b80c143b82cced7beb0bbca19ff91b479f1ba92916243d5e files/sshd.pam_include 205
-MD5 a0e3088a437e10b3fc27c60744a1be52 files/sshd.rc6 1468
-RMD160 8402f55ceda980a3b3fabaafb1813ea01a8f9fe0 files/sshd.rc6 1468
-SHA256 98805f1ef952dde16fb468fa80f2cf1b153a57732991aa86ab567c03c6ecac76 files/sshd.rc6 1468
+MD5 e4de5cb1ae1be3390ff28a983ba725db files/sshd.rc6 1643
+RMD160 fb651a08755086c3a97b7cbd71b513a64aac2084 files/sshd.rc6 1643
+SHA256 b7d1198d155bc4289aa6619f2addea702264c28788078c2aac1066d91ffbfe9e files/sshd.rc6 1643
 MD5 02a1e50ab3fa841edec86694bd71c8d1 metadata.xml 1251
 RMD160 6cc73434a9ddba10013961600493ede02841b514 metadata.xml 1251
 SHA256 bc756cbd9737146f4aef4b1cf329f9c6fb2dc580fe4230b866c1101d9637c63b metadata.xml 1251
-MD5 a1a8e51121d94ec786a309099bab51dd openssh-3.9_p1-r3.ebuild 4944
-RMD160 a9329b65823347469f0584b50978a62989815999 openssh-3.9_p1-r3.ebuild 4944
-SHA256 2fba52f2a9da538df656a6d950ead3729c6e5c326aadebe0b59672b4567c0441 openssh-3.9_p1-r3.ebuild 4944
-MD5 959cf8a532f182fe7cce94f2445e285c openssh-4.0_p1-r2.ebuild 5380
-RMD160 c35a4d7374aa0203b6c56978acb5118ae6ae90ed openssh-4.0_p1-r2.ebuild 5380
-SHA256 49dd2052b3e27ef0a6716185a8834254b0ab5aaa4f5aa11f35723126010bd69e openssh-4.0_p1-r2.ebuild 5380
-MD5 10b4143adc4f06d6856305ee2bc7e4da openssh-4.1_p1-r1.ebuild 5341
-RMD160 ea482d14be44f901ae0c9da152c04d4c444ccdf4 openssh-4.1_p1-r1.ebuild 5341
-SHA256 dfa4faca63ab67c2f684a490165167631f0f151e33b169d21bc6d12362cd59a2 openssh-4.1_p1-r1.ebuild 5341
-MD5 04543be0e1a1611e2623be5028893480 openssh-4.2_p1-r1.ebuild 5378
-RMD160 9cf45faf563cc9f3e316233d13cc3256855fa2ec openssh-4.2_p1-r1.ebuild 5378
-SHA256 a812374b88f750af11f8694cae207052b86713712022f0173b7ef43b63d0c287 openssh-4.2_p1-r1.ebuild 5378
-MD5 651c9aa863676617988e6ecaa69ac7d7 openssh-4.2_p1.ebuild 5309
-RMD160 73d7ec5b12a66d2f829547548c4f75ba75deed61 openssh-4.2_p1.ebuild 5309
-SHA256 1ac2741f4a2c42ed5b5314a5abfd121c352cb68f957b322dc3e159949f746865 openssh-4.2_p1.ebuild 5309
+MD5 4bf2ed1ba4e71ff7a799b27f958b8214 openssh-3.9_p1-r3.ebuild 4984
+RMD160 fc6e960460f5ed80f38de0ad62844786906a40dc openssh-3.9_p1-r3.ebuild 4984
+SHA256 243071563d56d49415ecdd850291e0ba005db6dd6c3a90f3b33b727de3990686 openssh-3.9_p1-r3.ebuild 4984
+MD5 f348bd329ca422946f501cc5ed1cbfb8 openssh-4.0_p1-r2.ebuild 5420
+RMD160 016f5a9ba4af8afdec47f42c3a90f71ffe5da765 openssh-4.0_p1-r2.ebuild 5420
+SHA256 c9257e969c7bdffa69134c198fd5c7d77118daba6bc687c73f0bed463ab24d8e openssh-4.0_p1-r2.ebuild 5420
+MD5 2c888cf3a4cf4a20bf8b399f0e41dd0b openssh-4.1_p1-r1.ebuild 5381
+RMD160 fe412d4d8fc9640b59446a80291fce64e5dd5d95 openssh-4.1_p1-r1.ebuild 5381
+SHA256 b2d45cf55c08e2030ef74b28f8439d3e4e5aae749e1a12e862a4c86e90f46315 openssh-4.1_p1-r1.ebuild 5381
+MD5 9d06ab044c1c12f24f1fc7becf11aec2 openssh-4.2_p1-r1.ebuild 5418
+RMD160 daa3188a67111609c4bd59e7a440120fdfc34b5d openssh-4.2_p1-r1.ebuild 5418
+SHA256 400800234ab5e72f426f21a7f10045da99efbaf268ad3808f0aac45fac3b0057 openssh-4.2_p1-r1.ebuild 5418
+MD5 0123e9e036a3a2a83d279f4edb18f2bd openssh-4.2_p1.ebuild 5349
+RMD160 845d8635b7065e51097b7b8ca2d3170ab33d3cf0 openssh-4.2_p1.ebuild 5349
+SHA256 27defefc8b7f32748b4cb44b346eeca9497f5c226d95401a2febba663eb0b9b2 openssh-4.2_p1.ebuild 5349
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD4/ch2+ySkm8kpY0RAv7SAJ4q7ErC7JNRQpX/7kyxcS5mibkSTgCcC/SJ
-1E0P4PT5M28D05A7eol86m8=
-=YzzM
+iD8DBQFD5Ok32+ySkm8kpY0RAn6YAKCNifYFNx8RVz2yMxdGiykPmJs04gCdHeG5
+qi4yX2h1qltTeTzxQm/Nn2k=
+=t4BP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/sshd.confd b/net-misc/openssh/files/sshd.confd
new file mode 100644
index 000000000000..8e75908369be
--- /dev/null
+++ b/net-misc/openssh/files/sshd.confd
@@ -0,0 +1,10 @@
+# /etc/conf.d/sshd: config file for /etc/init.d/sshd
+
+# Where is your sshd_config file stored?
+
+SSHD_CONFDIR="/etc/ssh"
+
+# Any random options you want to pass to sshd.
+# See the sshd(8) manpage for more info.
+
+SSHD_OPTS=""
diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
index c70c187823b1..58f5bed5283f 100644
--- a/net-misc/openssh/files/sshd.rc6
+++ b/net-misc/openssh/files/sshd.rc6
@@ -1,51 +1,55 @@
 #!/sbin/runscript
 # Copyright 1999-2005 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.17 2005/12/10 02:41:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.18 2006/02/04 17:49:30 vapier Exp $
 
 depend() {
 	use logger dns
 	need net
 }
 
-[[ -z ${SSH_CONFDIR} ]] && SSH_CONFDIR="/etc/ssh"
+SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
 
 checkconfig() {
 	if [[ ! -d /var/empty ]] ; then
 		mkdir -p /var/empty || return 1
 	fi
 
-	if [[ ! -e ${SSH_CONFDIR}/sshd_config ]] ; then
-		eerror "You need an ${SSH_CONFDIR}/sshd_config file to run sshd"
+	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
 
-	/usr/sbin/sshd -t || return 1
+	/usr/sbin/sshd -t ${myopts} || return 1
 }
 
 gen_keys() {
-	if [[ ! -e ${SSH_CONFDIR}/ssh_host_key ]] ; then
+	if [[ ! -e ${SSHD_CONFDIR}/ssh_host_key ]] ; then
 		einfo "Generating Hostkey..."
-		/usr/bin/ssh-keygen -t rsa1 -b 1024 -f ${SSH_CONFDIR}/ssh_host_key -N '' || return 1
+		/usr/bin/ssh-keygen -t rsa1 -b 1024 -f ${SSHD_CONFDIR}/ssh_host_key -N '' || return 1
 	fi
-	if [[ ! -e ${SSH_CONFDIR}/ssh_host_dsa_key ]] ; then
+	if [[ ! -e ${SSHD_CONFDIR}/ssh_host_dsa_key ]] ; then
 		einfo "Generating DSA-Hostkey..."
-		/usr/bin/ssh-keygen -d -f ${SSH_CONFDIR}/ssh_host_dsa_key -N '' || return 1
+		/usr/bin/ssh-keygen -d -f ${SSHD_CONFDIR}/ssh_host_dsa_key -N '' || return 1
 	fi
-	if [[ ! -e ${SSH_CONFDIR}/ssh_host_rsa_key ]] ; then
+	if [[ ! -e ${SSHD_CONFDIR}/ssh_host_rsa_key ]] ; then
 		einfo "Generating RSA-Hostkey..."
-		/usr/bin/ssh-keygen -t rsa -f ${SSH_CONFDIR}/ssh_host_rsa_key -N '' || return 1
+		/usr/bin/ssh-keygen -t rsa -f ${SSHD_CONFDIR}/ssh_host_rsa_key -N '' || return 1
 	fi
 	return 0
 }
 
 start() {
+	local myopts=""
+	[[ ${SVCNAME} != "sshd" ]] && myopts="${myopts} -o PidFile=/var/run/${SVCNAME}.pid"
+	[[ ${SSHD_CONFDIR} != "/etc/ssh" ]] && myopts="${myopts} -f ${SSHD_CONFDIR}/sshd_config"
+
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
-	/usr/sbin/sshd -o PidFile=/var/run/${SVCNAME}.pid ${SSHD_OPTS}
+	/usr/sbin/sshd ${myopts} ${SSHD_OPTS}
 	eend $?
 }
 
diff --git a/net-misc/openssh/openssh-3.9_p1-r3.ebuild b/net-misc/openssh/openssh-3.9_p1-r3.ebuild
index b5c4f8d3d31f..e86a6b36301e 100644
--- a/net-misc/openssh/openssh-3.9_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-3.9_p1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r3.ebuild,v 1.12 2006/02/03 01:55:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r3.ebuild,v 1.13 2006/02/04 17:49:30 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -123,6 +123,7 @@ src_install() {
 	fperms 600 /etc/ssh/sshd_config
 	dobin contrib/ssh-copy-id
 	newinitd "${FILESDIR}"/sshd.rc6 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty
 
 	newpamd "${FILESDIR}"/sshd.pam sshd
diff --git a/net-misc/openssh/openssh-4.0_p1-r2.ebuild b/net-misc/openssh/openssh-4.0_p1-r2.ebuild
index ec174620475a..8c2c26e1f4ca 100644
--- a/net-misc/openssh/openssh-4.0_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-4.0_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.11 2006/02/04 00:35:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.12 2006/02/04 17:49:30 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -130,6 +130,7 @@ src_install() {
 	fperms 600 /etc/ssh/sshd_config
 	dobin contrib/ssh-copy-id
 	newinitd "${FILESDIR}"/sshd.rc6 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty
 
 	newpamd "${FILESDIR}"/sshd.pam_include sshd
diff --git a/net-misc/openssh/openssh-4.1_p1-r1.ebuild b/net-misc/openssh/openssh-4.1_p1-r1.ebuild
index 599bc8a22c57..56bacf95e51d 100644
--- a/net-misc/openssh/openssh-4.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-4.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.12 2006/02/04 00:35:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.13 2006/02/04 17:49:30 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -131,6 +131,7 @@ src_install() {
 	fperms 600 /etc/ssh/sshd_config
 	dobin contrib/ssh-copy-id
 	newinitd "${FILESDIR}"/sshd.rc6 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty
 
 	newpamd "${FILESDIR}"/sshd.pam_include sshd
diff --git a/net-misc/openssh/openssh-4.2_p1-r1.ebuild b/net-misc/openssh/openssh-4.2_p1-r1.ebuild
index e3a38dc5a122..694a70122ef4 100644
--- a/net-misc/openssh/openssh-4.2_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-4.2_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1-r1.ebuild,v 1.11 2006/02/04 00:35:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1-r1.ebuild,v 1.12 2006/02/04 17:49:30 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -129,6 +129,7 @@ src_install() {
 	fperms 600 /etc/ssh/sshd_config
 	dobin contrib/ssh-copy-id
 	newinitd "${FILESDIR}"/sshd.rc6 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty
 
 	newpamd "${FILESDIR}"/sshd.pam_include sshd
diff --git a/net-misc/openssh/openssh-4.2_p1.ebuild b/net-misc/openssh/openssh-4.2_p1.ebuild
index 2ddad987fec6..7bb3f32cdb70 100644
--- a/net-misc/openssh/openssh-4.2_p1.ebuild
+++ b/net-misc/openssh/openssh-4.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.19 2006/02/04 00:35:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.20 2006/02/04 17:49:30 vapier Exp $
 
 inherit eutils flag-o-matic ccc pam
 
@@ -128,6 +128,7 @@ src_install() {
 	fperms 600 /etc/ssh/sshd_config
 	dobin contrib/ssh-copy-id
 	newinitd "${FILESDIR}"/sshd.rc6 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
 	keepdir /var/empty
 
 	newpamd "${FILESDIR}"/sshd.pam_include sshd