without_ldap bcond fixed

--with-ldap=no is not enough any more :-(

diff --git a/openssh-disable_ldap.patch b/openssh-disable_ldap.patch
new file mode 100644 (file)
index 0000000..1b0ffae
--- /dev/null
+++ b/openssh-disable_ldap.patch
@@ -0,0 +1,23 @@
+diff -dur -x '*~' openssh-6.1p1.orig/Makefile.in openssh-6.1p1/Makefile.in
+--- openssh-6.1p1.orig/Makefile.in     2012-10-29 11:25:43.000000000 +0100
++++ openssh-6.1p1/Makefile.in  2012-10-29 14:48:34.336371687 +0100
+@@ -62,7 +62,7 @@
+ MANFMT=@MANFMT@
+ INSTALL_SSH_LDAP_HELPER=@INSTALL_SSH_LDAP_HELPER@
+ 
+-TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-ldap-helper$(EXEEXT) ssh-vulnkey$(EXEEXT)
++TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-vulnkey$(EXEEXT)
+ 
+ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
+       canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
+@@ -96,8 +96,8 @@
+       sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
+       sandbox-seccomp-filter.o
+ 
+-MANPAGES      = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out ssh-ldap-helper.8.out sshd_config.5.out ssh_config.5.out ssh-ldap.conf.5.out ssh-vulnkey.1.out
+-MANPAGES_IN   = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 ssh-ldap-helper.8 sshd_config.5 ssh_config.5 ssh-ldap.conf.5 ssh-vulnkey.1
++MANPAGES      = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out ssh-vulnkey.1.out
++MANPAGES_IN   = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 ssh-vulnkey.1
+ MANTYPE               = @MANTYPE@
+ 
+ CONFIGFILES=sshd_config.out ssh_config.out moduli.out

diff --git a/openssh.spec b/openssh.spec
index 1d0449a825c697300df08bf6dce68e9bbc2e0ee5..6e007392b97e812b7e15a8e576c2eb5e22acb223 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -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}
@@ -539,6 +540,7 @@ openldap-a.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
@@ -663,7 +665,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