diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-05-16 00:52:24 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-05-16 00:52:24 +0000 |
| commit | 55b0051c7135dde905a36d53293c7e7e976a6fa5 (patch) | |
| tree | 43bb7d517d29316e0cc27d227d7325479452786b /net-misc/openssh | |
| parent | Use system libffi (diff) | |
| download | gentoo-2-55b0051c7135dde905a36d53293c7e7e976a6fa5.tar.gz gentoo-2-55b0051c7135dde905a36d53293c7e7e976a6fa5.tar.bz2 gentoo-2-55b0051c7135dde905a36d53293c7e7e976a6fa5.zip | |
Bug #366643: rediff the LPK patch for LDAP usage. Also merge the Mozilla uid customization LPK change.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-5.8_p2.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index c8ab7149272c..bee34a458cc9 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.418 2011/05/09 17:02:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.419 2011/05/16 00:52:24 robbat2 Exp $ + + 16 May 2011; Robin H. Johnson <robbat2@gentoo.org> openssh-5.8_p2.ebuild: + Bug #366643: rediff the LPK patch for LDAP usage. Also merge the Mozilla uid + customization LPK change. *openssh-5.8_p2 (09 May 2011) diff --git a/net-misc/openssh/openssh-5.8_p2.ebuild b/net-misc/openssh/openssh-5.8_p2.ebuild index b08fd447f566..5eb71992cba1 100644 --- a/net-misc/openssh/openssh-5.8_p2.ebuild +++ b/net-misc/openssh/openssh-5.8_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p2.ebuild,v 1.1 2011/05/09 17:02:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.8_p2.ebuild,v 1.2 2011/05/16 00:52:24 robbat2 Exp $ EAPI="2" inherit eutils flag-o-matic multilib autotools pam @@ -10,7 +10,7 @@ inherit eutils flag-o-matic multilib autotools pam PARCH=${P/_/} HPN_PATCH="${PARCH/p2/p1}-hpn13v11.diff.gz" -LDAP_PATCH="${PARCH/-5.8p2/-lpk-5.7p1}-0.3.13.patch.gz" +LDAP_PATCH="${PARCH/-/-lpk-}-0.3.14.patch.gz" X509_VER="6.2.4" X509_PATCH="${PARCH/p2/p1}+x509-${X509_VER}.diff.gz" DESCRIPTION="Port of OpenBSD's free SSH release" @@ -80,7 +80,7 @@ src_prepare() { if ! use X509 ; then if [[ -n ${LDAP_PATCH} ]] && use ldap ; then epatch "${WORKDIR}"/${LDAP_PATCH%.*} - epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654 + #epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654 - merged # version.h patch conflict avoidence mv version.h version.h.lpk cp -f version.h.pristine version.h |