X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=b04af47874bda5695fc49a632736f3afff52d862;hb=57d4dbd364a71387e4644b61aece0714813f5544;hp=e2a710cd93529915329e37ae5945a83c290bf29b;hpb=1076a9d0430bf681a314de9d1f0572388c9f06af;p=packages%2Fopenssh.git

diff --git a/openssh.spec b/openssh.spec
index e2a710c..b04af47 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -7,7 +7,7 @@
 #
 # default to gtk2-based gnome-askpass
 
-%define		orig_ver	3.7.1p1
+%define		orig_ver	3.7.1p2
 
 %{!?_without_gtk:%define _without_gnome 1}
 Summary:	OpenSSH free Secure Shell (SSH) implementation
@@ -21,13 +21,13 @@ Summary(pt_BR):	Implementa
 Summary(ru):	OpenSSH - Ó×ÏÂÏÄÎÁÑ ÒÅÁÌÉÚÁÃÉÑ ÐÒÏÔÏËÏÌÁ Secure Shell (SSH)
 Summary(uk):	OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:		openssh
-Version:	3.7.1p1
-Release:	3%{?_with_ldap:ldap}
+Version:	3.7.1p2
+Release:	3
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
 Source0:	ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{orig_ver}.tar.gz
-# Source0-md5:	f54e574e606c08ef63ebb1ab2f7689dc
+# Source0-md5:	61cf5b059938718308836d00f6764a94
 Source1:	%{name}d.conf
 Source2:	%{name}.conf
 Source3:	%{name}d.init
@@ -47,14 +47,14 @@ Patch4:		%{name}-sigpipe.patch
 # http://ldappubkey.gcu-squad.org/
 Patch5:		ldappubkey-ossh3.6-v2.patch
 Patch6:		%{name}-heimdal.patch
-Patch7:		%{name}-pam_chauthtok.patch
+Patch7:		%{name}-pam-conv.patch
 URL:		http://www.openssh.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{!?_without_gnome:BuildRequires: gnome-libs-devel}
 %{!?_without_gtk:BuildRequires:	gtk+2-devel}
 BuildRequires:	libwrap-devel
-BuildRequires:	openssl-devel >= 0.9.7b
+BuildRequires:	openssl-devel >= 0.9.7c
 %{?_with_ldap:BuildRequires:	openldap-devel}
 %{?_with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	pam-devel
@@ -62,7 +62,7 @@ BuildRequires:	%{__perl}
 %{!?_without_gtk:BuildRequires:	pkgconfig}
 BuildRequires:	zlib-devel
 PreReq:		FHS >= 2.1-24
-PreReq:		openssl >= 0.9.7
+PreReq:		openssl >= 0.9.7c
 Obsoletes:	ssh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -266,6 +266,7 @@ Requires(post):	grep
 Requires(postun):	/usr/sbin/userdel
 Requires:	/bin/login
 Requires:	util-linux
+Requires:	pam >= 0.77.3
 Provides:	ssh-server
 
 %description server