diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-11-01 10:36:37 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-11-01 10:36:37 +0000 |
| commit | 8ac825cf756a728ae4fd31b20a86aec21b6eae62 (patch) | |
| tree | 603d1b001acf368a37cbd7f2a75ded1aae6b459d /net-misc/openssh | |
| parent | Include 5.1 version now, in a new SLOT. (diff) | |
| download | gentoo-2-8ac825cf756a728ae4fd31b20a86aec21b6eae62.tar.gz gentoo-2-8ac825cf756a728ae4fd31b20a86aec21b6eae62.tar.bz2 gentoo-2-8ac825cf756a728ae4fd31b20a86aec21b6eae62.zip | |
Bug #244760, we need to pass --with-ldap, not try to execute it.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-hardened-r4 x86_64)
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.1_p1-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.1_p1.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 94cd483755fa..45bf415a2cd3 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.320 2008/10/30 15:35:19 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.321 2008/11/01 10:36:37 robbat2 Exp $ + + 01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> openssh-5.1_p1.ebuild, + openssh-5.1_p1-r1.ebuild: + Bug #244760, we need to pass --with-ldap, not try to execute it. 30 Oct 2008; Brent Baude <ranger@gentoo.org> openssh-5.1_p1-r1.ebuild: Marking openssh-5.1_p1-r1 ppc for bug 231292 diff --git a/net-misc/openssh/openssh-5.1_p1-r1.ebuild b/net-misc/openssh/openssh-5.1_p1-r1.ebuild index 3604babe3da0..b6bb4a44d837 100644 --- a/net-misc/openssh/openssh-5.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-5.1_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r1.ebuild,v 1.8 2008/10/30 15:35:19 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r1.ebuild,v 1.9 2008/11/01 10:36:37 robbat2 Exp $ inherit eutils flag-o-matic ccc multilib autotools pam @@ -118,7 +118,7 @@ src_compile() { --with-privsep-user=sshd \ --with-md5-passwords \ --with-ssl-engine \ - $(use ldap && $(use_with ldap)) \ + $(use ldap && [ -n "${LDAP_PATCH}" ] && use_with ldap) \ $(use_with libedit) \ $(use_with kerberos kerberos5 /usr) \ $(use_with tcpd tcp-wrappers) \ diff --git a/net-misc/openssh/openssh-5.1_p1.ebuild b/net-misc/openssh/openssh-5.1_p1.ebuild index 768983828e04..323b554503aa 100644 --- a/net-misc/openssh/openssh-5.1_p1.ebuild +++ b/net-misc/openssh/openssh-5.1_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1.ebuild,v 1.3 2008/08/29 08:25:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1.ebuild,v 1.4 2008/11/01 10:36:37 robbat2 Exp $ inherit eutils flag-o-matic ccc multilib autotools pam @@ -116,7 +116,7 @@ src_compile() { --with-privsep-user=sshd \ --with-md5-passwords \ --with-ssl-engine \ - $(use ldap && $(use_with ldap)) \ + $(use ldap && [ -n "${LDAP_PATCH}" ] && use_with ldap) \ $(use_with libedit) \ $(use_with kerberos kerberos5 /usr) \ $(use_with tcpd tcp-wrappers) \ |