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 | f4bfc088f146db62f013f4dbfc225121335d0fad (patch) | |
| tree | d4e4b584e649d48b47db3c58bca544eff01eafa4 /net-misc/openssh | |
| parent | Stable on amd64. (diff) | |
| download | historical-f4bfc088f146db62f013f4dbfc225121335d0fad.tar.gz historical-f4bfc088f146db62f013f4dbfc225121335d0fad.tar.bz2 historical-f4bfc088f146db62f013f4dbfc225121335d0fad.zip | |
dont apply ldap if USE=sftplogging #94390
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/Manifest | 6 | ||||
| -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 |
4 files changed, 18 insertions, 10 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index f1b2d82314df..27135b29882e 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,9 +1,9 @@ MD5 c5bf4736f46cb5bb3d8777466ef6b2df ChangeLog 20624 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329 -MD5 05cba3152e1ebfd7188b504216604499 openssh-4.1_p1.ebuild 4957 +MD5 5def73b80a3eaa6198c64d0feeb4842b openssh-4.1_p1.ebuild 5053 MD5 ee9586511d4aaca7efc989e10f468c2d openssh-3.8.1_p1-r1.ebuild 4552 -MD5 410697d6c924d4a2ef0275595b1d27d4 openssh-3.9_p1-r2.ebuild 4805 -MD5 229d8d47e45396e51ad40d9e43fa22d4 openssh-4.0_p1-r1.ebuild 4965 +MD5 f948995dff7e8d3cf8074533e71dc62b openssh-3.9_p1-r2.ebuild 4836 +MD5 fc81c8a0443e0e6440442c2949eaf900 openssh-4.0_p1-r1.ebuild 5061 MD5 a838d5092e4bce1a4e1d1b976cce347e files/digest-openssh-3.8.1_p1-r1 216 MD5 03897042175223579b97e42d6c70c6bd files/digest-openssh-4.0_p1-r1 292 MD5 daf6bd48fcdbe11037342b2ad6d72dcc files/digest-openssh-4.1_p1 292 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 |