- revert; ssh-copy-id -i idfile hostname still works (mislooked something i suppose)

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 0b37c37df4385d949c0bf49d5e461b7b551137d3..9e12edbfd2417b987061e91831475dfa05a673a2 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,5 +1,3 @@
-# TODO
-# - configure: WARNING: unrecognized options: --with-dns, --disable-suid-ssh
 #
 # Conditional build:
 %bcond_with    gnome           # with gnome-askpass (GNOME 1.x) utility
@@ -30,13 +28,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:       5.5p1
-Release:       6
+Version:       5.7p1
+Release:       4
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 88633408f4cb1eb11ec7e2ec58b519eb
+# Source0-md5: 50231fa257219791fa41b84a16c9df04
 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
@@ -53,7 +51,6 @@ Patch3:               %{name}-sigpipe.patch
 # http://code.google.com/p/openssh-lpk/
 Patch4:                %{name}-lpk.patch
 Patch5:                %{name}-config.patch
-Patch7:                %{name}-selinux.patch
 # High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz
 Patch9:                %{name}-5.2p1-hpn13v6.diff
@@ -515,7 +512,6 @@ openldap-a.
 %patch3 -p1
 %{?with_ldap:%patch4 -p1}
 %patch5 -p1
-%patch7 -p1
 %{?with_hpn:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
@@ -533,14 +529,12 @@ cp /usr/share/automake/config.sub .
 CPPFLAGS="-DCHROOT"
 %configure \
        PERL=%{__perl} \
-       --with-dns \
        --with-pam \
        --with-mantype=man \
        --with-md5-passwords \
        --with-ipaddr-display \
        %{?with_libedit:--with-libedit} \
        --with-4in6 \
-       --disable-suid-ssh \
        --with-tcp-wrappers \
        %{?with_ldap:--with-libs="-lldap -llber"} \
        %{?with_ldap:--with-cppflags="-DWITH_LDAP_PUBKEY"} \
@@ -550,7 +544,7 @@ CPPFLAGS="-DCHROOT"
 %if "%{pld_release}" == "ac"
        --with-xauth=/usr/X11R6/bin/xauth \
 %else
-       --with-xauth=/usr/bin/xauth \
+       --with-xauth=%{_bindir}/xauth \
 %endif
        --enable-utmpx \
        --enable-wtmpx