summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce A. Locke <blocke@gentoo.org>2002-03-16 03:45:47 +0000
committerBruce A. Locke <blocke@gentoo.org>2002-03-16 03:45:47 +0000
commit0138f552a6582b4133f76444e5e4bf7d5b189f85 (patch)
tree77da4014521e627814caaec991f5573987b39d37 /net-misc/openssh
parentInitial revision of the package. (diff)
downloadhistorical-0138f552a6582b4133f76444e5e4bf7d5b189f85.tar.gz
historical-0138f552a6582b4133f76444e5e4bf7d5b189f85.tar.bz2
historical-0138f552a6582b4133f76444e5e4bf7d5b189f85.zip
ssh initscript fix
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog10
-rw-r--r--net-misc/openssh/files/sshd.rc52
-rw-r--r--net-misc/openssh/files/sshd.rc64
3 files changed, 10 insertions, 6 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index dbd2da0a21f2..973e0d844c84 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,13 +1,17 @@
# ChangeLog for net-misc/openssh
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.3 2002/03/13 20:07:37 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.4 2002/03/16 03:45:47 blocke Exp $
+
+*openssh-3.1_p1 (7 Mar 2002)
+
+ 15 Mar 2002; Bruce A. Locke <blocke@shivan.org> files/sshd.rc6 files/sshd.rc5 :
+
+ ssh1 keygen requires a new option in the initscripts
13 Mar 2002; M.Schlemmer <azarah@gentoo.org> openssh-3.1_p1-r1.ebuild :
Update rc-script not to fail on restart if there is open sessions.
-*openssh-3.1_p1 (7 Mar 2002)
-
7 Mar 2002; F.Meyndert <m0rpheus@gentoo.org> openssh-3.1_p1.ebuild :
Updated openssh to version 3.1 that fixes a nasty off by one bug in all
diff --git a/net-misc/openssh/files/sshd.rc5 b/net-misc/openssh/files/sshd.rc5
index a4b7ae13c872..ed828829cf75 100644
--- a/net-misc/openssh/files/sshd.rc5
+++ b/net-misc/openssh/files/sshd.rc5
@@ -13,7 +13,7 @@ gen_keys() {
if [ ! -e /etc/ssh/ssh_host_key ]
then
einfo "Generating Hostkey..."
- /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N ''
+ /usr/bin/ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N ''
fi
if [ ! -e /etc/ssh/ssh_host_dsa_key ]
then
diff --git a/net-misc/openssh/files/sshd.rc6 b/net-misc/openssh/files/sshd.rc6
index 4a48081c6233..01441ba7bb9a 100644
--- a/net-misc/openssh/files/sshd.rc6
+++ b/net-misc/openssh/files/sshd.rc6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.7 2002/03/13 19:53:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6,v 1.8 2002/03/16 03:45:47 blocke Exp $
depend() {
@@ -21,7 +21,7 @@ checkconfig() {
gen_keys() {
if [ ! -e /etc/ssh/ssh_host_key ] ; then
einfo "Generating Hostkey..."
- /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N ''
+ /usr/bin/ssh-keygen -t rsa1 -b 1024 -f /etc/ssh/ssh_host_key -N ''
fi
if [ ! -e /etc/ssh/ssh_host_dsa_key ] ; then
einfo "Generating DSA-Hostkey..."