X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=d7661d0cd32e64848891ea32f1c8e2472534c1cc;hb=141a04d1fdecda5efd3d0588eff5dd8b65ba3856;hp=46709cb7cf1bcdafa747892cd13eb34a77735c5e;hpb=3a0759914703b7e78b0d230fdffdb9f65ed93dea;p=packages%2Fopenssh.git

diff --git a/openssh.spec b/openssh.spec
index 46709cb..d7661d0 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -35,7 +35,7 @@ Summary(ru.UTF-8):	OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	6.1p1
-Release:	1
+Release:	2
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -74,6 +74,7 @@ Patch11:	%{name}-chroot.patch
 Patch12:	%{name}-blacklist.diff
 Patch13:	%{name}-kuserok.patch
 Patch14:	%{name}-bind.patch
+Patch15:	%{name}-disable_ldap.patch
 URL:		http://www.openssh.com/portable.html
 BuildRequires:	%{__perl}
 %{?with_tests:BuildRequires:	%{name}-server}
@@ -93,7 +94,8 @@ BuildRequires:	pam-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.627
 BuildRequires:	sed >= 4.0
-BuildRequires:	zlib-devel
+BuildRequires:	zlib-devel >= 1.2.3
+Requires:	zlib >= 1.2.3
 %if "%{pld_release}" == "ac"
 Requires:	filesystem >= 2.0-1
 Requires:	pam >= 0.79.0
@@ -348,12 +350,13 @@ Requires(pre):	/usr/sbin/useradd
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 # remove in 6.0, kept for flawless upgrade
-Requires:	%{name}-server-ldap = %{epoch}:%{version}-%{release}
+%{?with_ldap:Requires:	%{name}-server-ldap = %{epoch}:%{version}-%{release}}
 Requires:	pam >= %{pam_ver}
 Requires:	rc-scripts >= 0.4.3.0
 Requires:	systemd-units >= 38
 Requires:	util-linux
 Suggests:	/bin/login
+Suggests:	xorg-app-xauth
 Provides:	ssh-server
 Provides:	user(sshd)
 
@@ -538,6 +541,7 @@ openldap-a.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%{!?with_ldap:%patch15 -p1}
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
@@ -662,7 +666,7 @@ cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS
 EOF
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.openssh-non-english-man-pages
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf
+%{?with_ldap:%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -685,10 +689,6 @@ rm -rf $RPM_BUILD_ROOT
 %post server
 /sbin/chkconfig --add sshd
 %service sshd reload "OpenSSH Daemon"
-if ! grep -qs ssh /etc/security/passwd.conf ; then
-	umask 022
-	echo "ssh" >> /etc/security/passwd.conf
-fi
 NORESTART=1
 %systemd_post sshd.service