- Source9 and Source10 moved to SOURCES

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index f3eb70334e10c4b0bd3a5b16720db051bc290465..33801db6c25b9f5b5f765aedaf88a0e3a75cc0eb 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,12 +1,13 @@
 #
 # Conditional build:
-%bcond_with    gnome           # without gnome-askpass utility
+%bcond_without chroot          # without chrooted user environment support
+%bcond_with    gnome           # with gnome-askpass (GNOME 1.x) utility
 %bcond_without gtk             # without GTK+ (2.x)
 %bcond_with    ldap            # with ldap support
+%bcond_without libedit         # without libedit (editline/history support in sftp client)
 %bcond_without kerberos5       # without kerberos5 support
-%bcond_without chroot          # without chrooted user environment support
-%bcond_with    sshagentsh      # with system-wide script for starting ssh-agent
 %bcond_without selinux         # build without SELinux support
+%bcond_with    sshagentsh      # with system-wide script for starting ssh-agent
 #
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
@@ -22,7 +23,7 @@ Summary(ru):  OpenSSH - 
 Summary(uk):   OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:          openssh
 Version:       4.0p1
-Release:       0.1
+Release:       2
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -36,18 +37,18 @@ Source5:    %{name}.sysconfig
 Source6:       passwd.pamd
 Source7:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/openssh-non-english-man-pages.tar.bz2
 # Source7-md5: 66943d481cc422512b537bcc2c7400d1
-Source9:       http://www.imasy.or.jp/~gotoh/ssh/connect.c
-# NoSource9-md5:       c78de727e1208799072be78c05d64398
-Source10:      http://www.imasy.or.jp/~gotoh/ssh/connect.html
-# NoSource10-md5:      f14cb61fafd067a3f5ce4eaa9643bf05
+Source9:       http://www.taiyo.co.jp/~gotoh/ssh/connect.c
+# NoSource9-md5:       e1c3cbed88f08ea778d90813d48cd428
+Source10:      http://www.taiyo.co.jp/~gotoh/ssh/connect.html
+# NoSource10-md5:      ec74f3e3b2ea3a7dc84c7988235b6fcf
 Source11:      ssh-agent.sh
 Source12:      ssh-agent.conf
 Patch0:                %{name}-no_libnsl.patch
 Patch2:                %{name}-linux-ipv6.patch
 Patch3:                %{name}-pam_misc.patch
 Patch4:                %{name}-sigpipe.patch
-# http://ldappubkey.gcu-squad.org/
-Patch5:                ldappubkey-ossh3.6-v2.patch
+# http://www.opendarwin.org/projects/openssh-lpk/
+Patch5:                %{name}-lpk-4.0p1-0.3.patch
 Patch6:                %{name}-heimdal.patch
 Patch7:                %{name}-pam-conv.patch
 # http://chrootssh.sourceforge.net/download/osshChroot-3.7.1p2.diff
@@ -60,6 +61,7 @@ BuildRequires:        automake
 %{?with_gnome:BuildRequires:   gnome-libs-devel}
 %{?with_gtk:BuildRequires:     gtk+2-devel}
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
+%{?with_libedit:BuildRequires: libedit-devel}
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libwrap-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
@@ -426,6 +428,7 @@ cp %{_datadir}/automake/config.sub .
        --with-mantype=man \
        --with-md5-passwords \
        --with-ipaddr-display \
+       %{?with_libedit:--with-libedit} \
        --with-4in6 \
        --disable-suid-ssh \
        --with-tcp-wrappers \