summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-24 19:11:25 +0000
committerMike Frysinger <vapier@gentoo.org>2009-02-24 19:11:25 +0000
commited95cb5addb4e6cae16f7afbba1c59b7d28c96dd (patch)
treeedf458cd39a095e3ddcb32567a8c279fd743d3e1 /net-misc/openssh
parentEAPI=2; fix building with newer glibc (patch submitted by Michał Górny via ... (diff)
downloadgentoo-2-ed95cb5addb4e6cae16f7afbba1c59b7d28c96dd.tar.gz
gentoo-2-ed95cb5addb4e6cae16f7afbba1c59b7d28c96dd.tar.bz2
gentoo-2-ed95cb5addb4e6cae16f7afbba1c59b7d28c96dd.zip
Fix X509 patching #260163 by Daniel J.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/openssh-5.2_p1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 524d5fa91615..89f147823968 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.337 2009/02/24 17:03:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.338 2009/02/24 19:11:25 vapier Exp $
+
+ 24 Feb 2009; Mike Frysinger <vapier@gentoo.org> openssh-5.2_p1.ebuild:
+ Fix X509 patching #260163 by Daniel J.
*openssh-5.2_p1 (24 Feb 2009)
diff --git a/net-misc/openssh/openssh-5.2_p1.ebuild b/net-misc/openssh/openssh-5.2_p1.ebuild
index 33b7cb733573..0bb831aaa2f2 100644
--- a/net-misc/openssh/openssh-5.2_p1.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1.ebuild,v 1.1 2009/02/24 17:03:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1.ebuild,v 1.2 2009/02/24 19:11:25 vapier Exp $
inherit eutils flag-o-matic multilib autotools pam
@@ -84,7 +84,7 @@ src_unpack() {
EPATCH_OPTS="-p1" epatch "${WORKDIR}"/*pkcs11*/{1,2,4}*
use X509 && EPATCH_OPTS="-R" epatch "${WORKDIR}"/*pkcs11*/1000_all_log.patch
fi
- use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-5.1_p1-x509-hpn-glue.patch
+ use X509 && epatch "${DISTDIR}"/${X509_PATCH}
use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
if ! use X509 ; then
if [[ -n ${LDAP_PATCH} ]] && use ldap ; then