SPECS (AC-branch): openssh.spec - AC-branched

[glen]

Author: glen                         Date: Fri Oct 19 18:58:33 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- AC-branched

---- Files affected:
SPECS:
   openssh.spec (1.286 -> 1.286.2.1) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.286 SPECS/openssh.spec:1.286.2.1
--- SPECS/openssh.spec:1.286	Fri Oct 19 20:55:23 2007
+++ SPECS/openssh.spec	Fri Oct 19 20:58:27 2007
@@ -45,7 +45,7 @@
 Source5:	ssh-agent.sh
 Source6:	ssh-agent.conf
 Patch0:		%{name}-no_libnsl.patch
-Patch1:		%{name}-sshv1-openssl.patch
+Patch1:		%{name}-heimdal.patch
 Patch2:		%{name}-linux-ipv6.patch
 Patch3:		%{name}-pam_misc.patch
 Patch4:		%{name}-sigpipe.patch
@@ -70,7 +70,7 @@
 BuildRequires:	automake
 %{?with_gnome:BuildRequires:	gnome-libs-devel}
 %{?with_gtk:BuildRequires:	gtk+2-devel}
-%{?with_kerberos5:BuildRequires:	krb5-devel}
+%{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
 %{?with_libedit:BuildRequires:	libedit-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libwrap-devel
@@ -80,8 +80,8 @@
 %{?with_gtk:BuildRequires:	pkgconfig}
 BuildRequires:	rpmbuild(macros) >= 1.318
 BuildRequires:	zlib-devel
-Requires:	filesystem >= 3.0-11
-Requires:	pam >= 0.99.7.1
+Requires:	filesystem >= 2.0-1
+Requires:	pam >= 0.79.0
 Obsoletes:	ssh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -343,7 +343,7 @@
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	/bin/login
-Requires:	pam >= 0.99.7.1
+Requires:	pam >= 0.77.3
 Requires:	rc-scripts >= 0.4.0.18
 Requires:	util-linux
 
@@ -472,7 +472,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%{?with_kerberos5:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -503,10 +503,10 @@
 	--with-tcp-wrappers \
 	%{?with_ldap:--with-libs="-lldap -llber"} \
 	%{?with_ldap:--with-cppflags="-DWITH_LDAP_PUBKEY"} \
-	%{?with_kerberos5:--with-kerberos5=/usr} \
+	%{?with_kerberos5:--with-kerberos5} \
 	--with-privsep-path=%{_privsepdir} \
 	--with-pid-dir=%{_localstatedir}/run \
-	--with-xauth=/usr/bin/xauth \
+	--with-xauth=/usr/X11R6/bin/xauth \
 	--enable-utmpx \
 	--enable-wtmpx
 
@@ -685,6 +685,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.286.2.1  2007/10/19 18:58:27  glen
+- AC-branched
+
 Revision 1.286  2007/10/19 18:55:23  glen
 - adapter; check-files cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssh.spec?r1=1.286&r2=1.286.2.1&f=u