From be9604c61fe8a849355b11a0f31995c4437e7e91 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 14 Feb 2009 07:46:38 +0000 Subject: Fix implicit strsep() prototype in x509 code #258795 by orlin. (Portage version: 2.2_rc23/cvs/Linux x86_64) --- net-misc/openssh/ChangeLog | 6 +++++- net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch | 14 ++++++++++++++ net-misc/openssh/openssh-5.1_p1-r3.ebuild | 4 ++-- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch (limited to 'net-misc/openssh') diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 5ea647536270..422b3dbf0969 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # 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.328 2009/02/08 17:14:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.329 2009/02/14 07:46:38 vapier Exp $ + + 14 Feb 2009; Mike Frysinger + +files/openssh-5.1_p1-x509-headers.patch, openssh-5.1_p1-r3.ebuild: + Fix implicit strsep() prototype in x509 code #258795 by orlin. 08 Feb 2009; Mike Frysinger openssh-4.4_p1-r6.ebuild, openssh-4.5_p1-r2.ebuild, openssh-4.6_p1-r4.ebuild, diff --git a/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch b/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch new file mode 100644 index 000000000000..b572c2a46e13 --- /dev/null +++ b/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch @@ -0,0 +1,14 @@ +need strsep() prototype for 64bit systems + +http://bugs.gentoo.org/258795 + +--- a/auth2-pubkey.c ++++ b/auth2-pubkey.c +@@ -54,6 +54,7 @@ + #endif + #include "monitor_wrap.h" + #include "ssh-x509.h" ++#include + #include "misc.h" + + /* import */ diff --git a/net-misc/openssh/openssh-5.1_p1-r3.ebuild b/net-misc/openssh/openssh-5.1_p1-r3.ebuild index 5245aaddb139..5e365b5171ce 100644 --- a/net-misc/openssh/openssh-5.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-5.1_p1-r3.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-r3.ebuild,v 1.3 2009/02/08 17:14:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r3.ebuild,v 1.4 2009/02/14 07:46:38 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 -- cgit v1.2.3-65-gdbad