summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-12-30 07:00:18 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-12-30 07:00:18 +0000
commit322aab4b810bc571832fbf9c96be5e0e172e1035 (patch)
tree86f7807a84ca01cfab5fc44a5639f0b4cb9e8801 /net-libs
parentVersion bump approved by ssuominen (diff)
downloadgentoo-2-322aab4b810bc571832fbf9c96be5e0e172e1035.tar.gz
gentoo-2-322aab4b810bc571832fbf9c96be5e0e172e1035.tar.bz2
gentoo-2-322aab4b810bc571832fbf9c96be5e0e172e1035.zip
Fixed compilation with libgcrypt (bug #533424)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libssh/ChangeLog5
-rw-r--r--net-libs/libssh/libssh-0.6.4.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index e17fbc0296e9..0d239b17222e 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/libssh
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.117 2014/12/23 08:35:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.118 2014/12/30 07:00:18 polynomial-c Exp $
+
+ 30 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> libssh-0.6.4.ebuild:
+ Fixed compilation with libgcrypt (bug #533424).
*libssh-0.6.4 (23 Dec 2014)
diff --git a/net-libs/libssh/libssh-0.6.4.ebuild b/net-libs/libssh/libssh-0.6.4.ebuild
index e6e1521f5ac2..3e046068d4e6 100644
--- a/net-libs/libssh/libssh-0.6.4.ebuild
+++ b/net-libs/libssh/libssh-0.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.4.ebuild,v 1.1 2014/12/23 08:35:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.4.ebuild,v 1.2 2014/12/30 07:00:18 polynomial-c Exp $
EAPI=5
@@ -9,7 +9,8 @@ inherit eutils cmake-multilib multilib
DESCRIPTION="Access a working SSH implementation by means of a library"
HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/107/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://red.libssh.org/attachments/download/107/${MY_P}.tar.gz -> ${P}.tar.gz
+ http://git.libssh.org/projects/libssh.git/patch/?id=3880a8ed80a4b1e2c052bd62f328bba2f869d5ae -> ${PN}-0.6.4-libgcrypt_build_fix.patch"
LICENSE="LGPL-2.1"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
@@ -34,6 +35,7 @@ S=${WORKDIR}/${MY_P}
PATCHES=(
"${FILESDIR}"/${PN}-0.5.0-tests.patch
+ "${DISTDIR}"/${P}-libgcrypt_build_fix.patch
)
src_prepare() {