summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-16 08:31:02 +0000
committerMike Frysinger <vapier@gentoo.org>2009-02-16 08:31:02 +0000
commite56d45a57b98960e4049e77357d335c7ce326360 (patch)
treec4c5851f184e7f7b3717bc9662a8a27f1a2432f8 /net-misc
parentStable on alpha, bug 259046 (diff)
downloadgentoo-2-e56d45a57b98960e4049e77357d335c7ce326360.tar.gz
gentoo-2-e56d45a57b98960e4049e77357d335c7ce326360.tar.bz2
gentoo-2-e56d45a57b98960e4049e77357d335c7ce326360.zip
add x509 strsep header patch to current stable too
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/openssh-5.1_p1-r2.ebuild4
2 files changed, 5 insertions, 4 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 02f7398fe71b..5a6c0b4540a6 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,6 @@
# 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.333 2009/02/15 12:38:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.334 2009/02/16 08:31:02 vapier Exp $
15 Feb 2009; Markus Meier <maekke@gentoo.org> openssh-5.1_p1-r2.ebuild:
amd64/x86 stable, bug #258940
@@ -16,7 +16,8 @@
Stable on alpha, bug #258940
14 Feb 2009; Mike Frysinger <vapier@gentoo.org>
- +files/openssh-5.1_p1-x509-headers.patch, openssh-5.1_p1-r3.ebuild:
+ +files/openssh-5.1_p1-x509-headers.patch, openssh-5.1_p1-r2.ebuild,
+ openssh-5.1_p1-r3.ebuild:
Fix implicit strsep() prototype in x509 code #258795 by orlin.
08 Feb 2009; Mike Frysinger <vapier@gentoo.org> openssh-4.4_p1-r6.ebuild,
diff --git a/net-misc/openssh/openssh-5.1_p1-r2.ebuild b/net-misc/openssh/openssh-5.1_p1-r2.ebuild
index 113d2e4714df..be14923b2a66 100644
--- a/net-misc/openssh/openssh-5.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.1_p1-r2.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.1_p1-r2.ebuild,v 1.9 2009/02/15 23:30:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r2.ebuild,v 1.10 2009/02/16 08:31:02 vapier Exp $
inherit eutils flag-o-matic multilib autotools pam
@@ -74,7 +74,7 @@ src_unpack() {
-e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
pathnames.h || die
- use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-5.1_p1-x509-hpn-glue.patch
+ use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-5.1_p1-x509-{headers,hpn-glue}.patch
use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
if ! use X509 ; then
if [[ -n ${LDAP_PATCH} ]] && use ldap ; then