| 1 |
vapier 08/03/29 15:23:12 |
| 2 |
|
| 3 |
Modified: openssh-4.7_p1-r5.ebuild |
| 4 |
Log: |
| 5 |
only apply gsskex when -X509 |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-misc/openssh/openssh-4.7_p1-r5.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r5.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r5.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r5.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: openssh-4.7_p1-r5.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r5.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- openssh-4.7_p1-r5.ebuild 29 Mar 2008 03:07:24 -0000 1.1 |
| 22 |
+++ openssh-4.7_p1-r5.ebuild 29 Mar 2008 15:23:11 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r5.ebuild,v 1.1 2008/03/29 03:07:24 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.7_p1-r5.ebuild,v 1.2 2008/03/29 15:23:11 vapier Exp $ |
| 28 |
|
| 29 |
inherit eutils flag-o-matic ccc multilib autotools pam |
| 30 |
|
| 31 |
@@ -79,12 +79,12 @@ |
| 32 |
epatch "${DISTDIR}"/${LDAP_PATCH} "${FILESDIR}"/${PN}-4.4_p1-ldap-hpn-glue.patch |
| 33 |
epatch "${FILESDIR}"/${P}-lpk-64bit.patch #210110 |
| 34 |
fi |
| 35 |
- elif use ldap ; then |
| 36 |
- ewarn "Sorry, X509 and ldap don't get along, disabling ldap" |
| 37 |
+ epatch "${DISTDIR}"/openssh-4.7p1-gsskex-20070927.patch #115553 |
| 38 |
+ else |
| 39 |
+ use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap" |
| 40 |
+ epatch "${FILESDIR}"/${P}-GSSAPI-dns.patch #165444 integrated into gsskex |
| 41 |
fi |
| 42 |
[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH} |
| 43 |
- #epatch "${FILESDIR}"/${P}-GSSAPI-dns.patch #165444 integrated into gsskex |
| 44 |
- epatch "${DISTDIR}"/openssh-4.7p1-gsskex-20070927.patch #115553 |
| 45 |
epatch "${FILESDIR}"/${P}-CVE-2008-1483.patch #214985 |
| 46 |
epatch "${FILESDIR}"/${P}-packet-size.patch #212433 |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
-- |
| 52 |
gentoo-commits@l.g.o mailing list |
Archives