rpms/openssh/F-12 openssh.spec,1.170,1.171 sshd.init,1.4,1.5
Jan F. Chadima
jfch2222 at fedoraproject.org
Thu Oct 29 12:19:37 UTC 2009
- Previous message (by thread): rpms/audacious-plugins/F-12 audacious-plugins-2.1-sndfile-playfix.patch, NONE, 1.1 audacious-plugins.spec, 1.56, 1.57
- Next message (by thread): rpms/yaboot/devel yaboot-1.3.14-better_netboot2.patch, NONE, 1.1 yaboot-1.3.14-move_kernel.patch, NONE, 1.1 yaboot.spec, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jfch2222
Update of /cvs/pkgs/rpms/openssh/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5784
Modified Files:
openssh.spec sshd.init
Log Message:
Modify the init script to prevent it to hang during generating the keys
Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/openssh.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- openssh.spec 27 Oct 2009 15:59:35 -0000 1.170
+++ openssh.spec 29 Oct 2009 12:19:37 -0000 1.171
@@ -63,7 +63,7 @@
Summary: An open source implementation of SSH protocol versions 1 and 2
Name: openssh
Version: 5.2p1
-Release: 29%{?dist}%{?rescue_rel}
+Release: 30%{?dist}%{?rescue_rel}
URL: http://www.openssh.com/portable.html
#Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
#Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@@ -466,6 +466,9 @@ fi
%endif
%changelog
+* Thu Oct 29 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-30
+- Modify the init script to prevent it to hang during generating the keys (#515145)
+
* Tue Oct 27 2009 Jan F. Chadima <jchadima at redhat.com> - 5.2p1-29
- Resolve locking in ssh-add (#491312)
Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-12/sshd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sshd.init 24 Sep 2009 16:05:27 -0000 1.4
+++ sshd.init 29 Oct 2009 12:19:37 -0000 1.5
@@ -49,7 +49,8 @@ runlevel=$(set -- $(runlevel); eval "ech
do_rsa1_keygen() {
if [ ! -s $RSA1_KEY ]; then
echo -n $"Generating SSH1 RSA host key: "
- if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
+ rm -f $RSA1_KEY
+ if test ! -f $RSA1_KEY && $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
chmod 600 $RSA1_KEY
chmod 644 $RSA1_KEY.pub
if [ -x /sbin/restorecon ]; then
@@ -68,7 +69,8 @@ do_rsa1_keygen() {
do_rsa_keygen() {
if [ ! -s $RSA_KEY ]; then
echo -n $"Generating SSH2 RSA host key: "
- if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
+ rm -f $RSA_KEY
+ if test ! -f $RSA_KEY && $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
chmod 600 $RSA_KEY
chmod 644 $RSA_KEY.pub
if [ -x /sbin/restorecon ]; then
@@ -87,7 +89,8 @@ do_rsa_keygen() {
do_dsa_keygen() {
if [ ! -s $DSA_KEY ]; then
echo -n $"Generating SSH2 DSA host key: "
- if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
+ rm -f $DSA_KEY
+ if test ! -f $DSA_KEY && $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
chmod 600 $DSA_KEY
chmod 644 $DSA_KEY.pub
if [ -x /sbin/restorecon ]; then
- Previous message (by thread): rpms/audacious-plugins/F-12 audacious-plugins-2.1-sndfile-playfix.patch, NONE, 1.1 audacious-plugins.spec, 1.56, 1.57
- Next message (by thread): rpms/yaboot/devel yaboot-1.3.14-better_netboot2.patch, NONE, 1.1 yaboot-1.3.14-move_kernel.patch, NONE, 1.1 yaboot.spec, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list