summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-03-20 00:17:55 +0000
committerMike Frysinger <vapier@gentoo.org>2010-03-20 00:17:55 +0000
commit65885273b28eaf91e96ec7b9714371e546783f77 (patch)
tree318d9fb10fc64f3194bb73f68e8409b429fda065 /net-misc
parentAdd support for the "include" keyword in ld.so.conf #304843 by Nico R. (diff)
downloadgentoo-2-65885273b28eaf91e96ec7b9714371e546783f77.tar.gz
gentoo-2-65885273b28eaf91e96ec7b9714371e546783f77.tar.bz2
gentoo-2-65885273b28eaf91e96ec7b9714371e546783f77.zip
Fix warning with USE="X509 ldap" #310287 by Nico Baggus.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/openssh-5.3_p1-r1.ebuild4
-rw-r--r--net-misc/openssh/openssh-5.4_p1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 8440e20d194c..f9eee28f22f3 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.376 2010/03/19 19:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.377 2010/03/20 00:17:55 vapier Exp $
+
+ 20 Mar 2010; Mike Frysinger <vapier@gentoo.org> openssh-5.3_p1-r1.ebuild,
+ openssh-5.4_p1.ebuild:
+ Fix warning with USE="X509 ldap" #310287 by Nico Baggus.
19 Mar 2010; Raúl Porcel <armin76@gentoo.org> openssh-5.3_p1-r1.ebuild:
sparc stable wrt #308555
diff --git a/net-misc/openssh/openssh-5.3_p1-r1.ebuild b/net-misc/openssh/openssh-5.3_p1-r1.ebuild
index 7774f800cf45..ec59ec872de9 100644
--- a/net-misc/openssh/openssh-5.3_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.3_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.3_p1-r1.ebuild,v 1.9 2010/03/19 19:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.3_p1-r1.ebuild,v 1.10 2010/03/20 00:17:55 vapier Exp $
inherit eutils flag-o-matic multilib autotools pam
@@ -160,7 +160,7 @@ src_compile() {
--with-ssl-engine \
$(static_use_with pam) \
$(static_use_with kerberos kerberos5 /usr) \
- ${LDAP_PATCH:+$(use ldap && use_with ldap)} \
+ ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
$(use_with libedit) \
${PKCS11_PATCH:+$(use pkcs11 && static_use_with pkcs11)} \
$(use_with selinux) \
diff --git a/net-misc/openssh/openssh-5.4_p1.ebuild b/net-misc/openssh/openssh-5.4_p1.ebuild
index 198967fd51f0..615851451ebb 100644
--- a/net-misc/openssh/openssh-5.4_p1.ebuild
+++ b/net-misc/openssh/openssh-5.4_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1.ebuild,v 1.2 2010/03/13 01:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1.ebuild,v 1.3 2010/03/20 00:17:55 vapier Exp $
inherit eutils flag-o-matic multilib autotools pam
@@ -131,7 +131,7 @@ src_compile() {
--with-ssl-engine \
$(static_use_with pam) \
$(static_use_with kerberos kerberos5 /usr) \
- ${LDAP_PATCH:+$(use ldap && use_with ldap)} \
+ ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
$(use_with libedit) \
$(use_with selinux) \
$(use_with skey) \