diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-29 10:47:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-29 10:47:35 +0000 |
| commit | 8a086a9f8a5874cdbcf2ca52c602e30e9298d48d (patch) | |
| tree | 35ff7113c6e3e69323eaa50e3869f240dd001f3e /net-misc/openssh | |
| parent | Mark stable (diff) | |
| download | gentoo-2-8a086a9f8a5874cdbcf2ca52c602e30e9298d48d.tar.gz gentoo-2-8a086a9f8a5874cdbcf2ca52c602e30e9298d48d.tar.bz2 gentoo-2-8a086a9f8a5874cdbcf2ca52c602e30e9298d48d.zip | |
add a warning about conflicting patches
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/openssh-4.0_p1-r1.ebuild | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net-misc/openssh/openssh-4.0_p1-r1.ebuild b/net-misc/openssh/openssh-4.0_p1-r1.ebuild index a25dce37d3ac..15fca2d77c71 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.6 2005/05/29 10:14:00 vapier Exp $ +# $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 $ inherit eutils flag-o-matic ccc pam @@ -61,6 +61,8 @@ src_unpack() { 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} + elif use smartcard || use ldap ; then + ewarn "Sorry, x509 and smartcard/ldap don't get along" fi sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid" |