diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-29 22:23:24 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-29 22:23:24 +0000 |
| commit | 2012bd10ad8aa7a450908abb89fbdd76f1d2fca2 (patch) | |
| tree | 2875aec9f32158d610ae2b02963978614d510db7 /net-misc/openssh | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-2012bd10ad8aa7a450908abb89fbdd76f1d2fca2.tar.gz gentoo-2-2012bd10ad8aa7a450908abb89fbdd76f1d2fca2.tar.bz2 gentoo-2-2012bd10ad8aa7a450908abb89fbdd76f1d2fca2.zip | |
dont apply ldap if USE=sftplogging #94390
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/openssh-3.9_p1-r2.ebuild | 6 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-4.0_p1-r1.ebuild | 8 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-4.1_p1.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/net-misc/openssh/openssh-3.9_p1-r2.ebuild b/net-misc/openssh/openssh-3.9_p1-r2.ebuild index 24de2bdaa4d5..60086c58a65d 100644 --- a/net-misc/openssh/openssh-3.9_p1-r2.ebuild +++ b/net-misc/openssh/openssh-3.9_p1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r2.ebuild,v 1.6 2005/05/29 10:14:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-3.9_p1-r2.ebuild,v 1.7 2005/05/29 22:23:24 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -61,8 +61,8 @@ src_unpack() { use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2 use smartcard && epatch ${FILESDIR}/${P}-opensc.patch.bz2 if use ldap ; then - if use X509 ; then - ewarn "Sorry, x509 and ldap don't get along" + if use X509 || use sftplogging ; then + ewarn "Sorry, x509/sftplogging and ldap don't get along" else epatch ${DISTDIR}/${LDAP_PATCH} fi diff --git a/net-misc/openssh/openssh-4.0_p1-r1.ebuild b/net-misc/openssh/openssh-4.0_p1-r1.ebuild index 15fca2d77c71..8131fd419a1e 100644 --- a/net-misc/openssh/openssh-4.0_p1-r1.ebuild +++ b/net-misc/openssh/openssh-4.0_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r1.ebuild,v 1.7 2005/05/29 10:47:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r1.ebuild,v 1.8 2005/05/29 22:23:24 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -60,7 +60,11 @@ src_unpack() { if ! use X509 ; then use smartcard && epatch ${DISTDIR}/${SECURID_PATCH} use smartcard && use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch - use ldap && epatch ${DISTDIR}/${LDAP_PATCH} + if use sftplogging ; then + ewarn "Sorry, sftplogging and ldap don't get along" + else + use ldap && epatch ${DISTDIR}/${LDAP_PATCH} + fi elif use smartcard || use ldap ; then ewarn "Sorry, x509 and smartcard/ldap don't get along" fi diff --git a/net-misc/openssh/openssh-4.1_p1.ebuild b/net-misc/openssh/openssh-4.1_p1.ebuild index 2cca345acfd8..7e5a32425108 100644 --- a/net-misc/openssh/openssh-4.1_p1.ebuild +++ b/net-misc/openssh/openssh-4.1_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1.ebuild,v 1.1 2005/05/29 10:48:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1.ebuild,v 1.2 2005/05/29 22:23:24 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -61,7 +61,11 @@ src_unpack() { epatch ${DISTDIR}/${SECURID_PATCH} use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch fi - use ldap && epatch ${DISTDIR}/${LDAP_PATCH} + if use sftplogging ; then + ewarn "Sorry, sftplogging and ldap don't get along" + else + use ldap && epatch ${DISTDIR}/${LDAP_PATCH} + fi elif use smartcard || use ldap ; then ewarn "Sorry, x509 and smartcard/ldap don't get along" fi |