- disable ecdsa on ac (openssl lacks OPENSSL_HAS_ECC)

Changed files:
    openssh.spec -> 1.361
    opensshd.init -> 1.48

diff --git a/openssh.spec b/openssh.spec
index 0a9ec9647b5a4fa3f294542369590347149fc45b..c8993a08d2fec47c3c9fdbe3eaa6f06f36e0b4a1 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -29,7 +29,7 @@ Summary(ru.UTF-8):    OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       5.8p1
-Release:       5
+Release:       6
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -520,12 +520,16 @@ openldap-a.
 %patch13 -p1
 
 cp -p %{SOURCE3} sshd.pam
+install -p %{SOURCE2} sshd.init
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
 %{__sed} -i -e '/pkg-config/s/ x11//' contrib/Makefile
 # not present in ac, no point searching it
 %{__sed} -i -e '/pam_keyinit.so/d' sshd.pam
+
+# openssl on ac does not have OPENSSL_HAS_ECC
+%{__sed} -i -e '/ecdsa/d' sshd.init
 %endif
 
 %build
@@ -580,7 +584,7 @@ install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
+install -p sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
 cp -p sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/sshd
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/profile.d

diff --git a/opensshd.init b/opensshd.init
index 02dbb085d6b5de40290b69f31cf668aa6204137a..77d9d6a2c9f78d399e4103a35900b6fedf4b213c 100644 (file)
--- a/opensshd.init
+++ b/opensshd.init
@@ -65,7 +65,7 @@ ssh_gen_keys() {
                /usr/bin/ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' >&2
                chmod 600 /etc/ssh/ssh_host_ecdsa_key
                [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key
-       fi
+       fi # ecdsa
 }
 
 start() {