- updated to 7.1p2, small PLD merge

diff --git a/openssh.spec b/openssh.spec
index 79bc1c8d193a49505ee53bd6168039e0f38c2cb5..e31114a09f7914a1e1a83faf90acd80aa9c11b3e 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -41,13 +41,13 @@ Summary(pt_BR.UTF-8):       Implementação livre do SSH
 Summary(ru.UTF-8):     OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
-Version:       7.1p1
-Release:       2
+Version:       7.1p2
+Release:       1
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 8709736bc8a8c253bc4eeb4829888ca5
+# Source0-md5: 4d8547670e2a220d5ef805ad9e47acf2
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 66943d481cc422512b537bcc2c7400d1
 Source2:       %{name}d.init
@@ -539,7 +539,7 @@ openldap-a.
 %patch17 -p1
 
 # hack since arc4random from openbsd-compat needs symbols from libssh and vice versa
-sed -i -e 's#-lssh -lopenbsd-compat#-lssh -lopenbsd-compat -lssh#g' Makefile*
+sed -i -e 's#-lssh -lopenbsd-compat#-lssh -lopenbsd-compat -lssh -lopenbsd-compat#g' Makefile*
 
 grep -rl /usr/libexec/openssh/ssh-ldap-helper . | xargs \
 %{__sed} -i -e 's,/usr/libexec/openssh/ssh-ldap-helper,%{_libexecdir}/ssh-ldap-helper,'

diff --git a/opensshd.init b/opensshd.init
index 8075d3ddd1648cca2b8b9a0e8f790637acbbd788..fe09962804e874f80f8c4aa76b3eb5772e065cf2 100755 (executable)
--- a/opensshd.init
+++ b/opensshd.init
@@ -56,7 +56,7 @@ start() {
 
        checkconfig
 
-       if [ ! -s /etc/ssh/ssh_host_rsa_key ]; then
+       if [ "$(echo /etc/ssh/ssh_host*key)" = "/etc/ssh/ssh_host*key" ]; then
                msg_not_running "OpenSSH"
                nls "No SSH host key found! You must run \"%s init\" first." "$0"
                exit 1

diff --git a/sshd-keygen b/sshd-keygen
index da3534b4ad5062502116dfe6da92e4957d3bd085..b31c06bc00dbae9f4861a46b4ce578af344b9790 100644 (file)
--- a/sshd-keygen
+++ b/sshd-keygen
@@ -15,7 +15,7 @@ ssh_gen_key() {
 }
 
 # generate new keys with empty passwords if they do not exist
+ssh_gen_key ed25519 /etc/ssh/ssh_host_ed25519_key
+ssh_gen_key ecdsa /etc/ssh/ssh_host_ecdsa_key
 ssh_gen_key rsa /etc/ssh/ssh_host_rsa_key
 ssh_gen_key dsa /etc/ssh/ssh_host_dsa_key
-ssh_gen_key ecdsa /etc/ssh/ssh_host_ecdsa_key
-ssh_gen_key ed25519 /etc/ssh/ssh_host_ed25519_key