- added sshv1-openssl patch (fixes SSHv1 compat when using openssl 0.9.8e)

- pass --with-kerberos=/usr to detect krb5-config script and avoid linking
  with libgssapi when libkrb5_gssapi must be used
- release 4

Changed files:
    openssh.spec -> 1.282

diff --git a/openssh.spec b/openssh.spec
index d6c1837de47ae8ea89ca10ec941c0dd877082608..9be439838b235792568f5993259627a424c6ff28 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -27,7 +27,7 @@ Summary(ru.UTF-8):    OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       4.6p1
-Release:       3%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
+Release:       4%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -44,6 +44,7 @@ Source7:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Source11:      ssh-agent.sh
 Source12:      ssh-agent.conf
 Patch0:                %{name}-no_libnsl.patch
+Patch1:                %{name}-sshv1-openssl.patch
 Patch2:                %{name}-linux-ipv6.patch
 Patch3:                %{name}-pam_misc.patch
 Patch4:                %{name}-sigpipe.patch
@@ -469,6 +470,7 @@ GNOME.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -498,7 +500,7 @@ cp /usr/share/automake/config.sub .
        --with-tcp-wrappers \
        %{?with_ldap:--with-libs="-lldap -llber"} \
        %{?with_ldap:--with-cppflags="-DWITH_LDAP_PUBKEY"} \
-       %{?with_kerberos5:--with-kerberos5} \
+       %{?with_kerberos5:--with-kerberos5=/usr} \
        --with-privsep-path=%{_privsepdir} \
        --with-pid-dir=%{_localstatedir}/run \
        --with-xauth=/usr/bin/xauth \