summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-12-30 07:00:20 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-12-30 07:00:20 +0000
commit6d30556ca8b495f4d747b734d9bf4a5df9a2f1d0 (patch)
tree61a42984770b15742d8d98d1f8cc025064b222fb /net-libs/libssh
parentVersion bump approved by ssuominen (diff)
downloadhistorical-6d30556ca8b495f4d747b734d9bf4a5df9a2f1d0.tar.gz
historical-6d30556ca8b495f4d747b734d9bf4a5df9a2f1d0.tar.bz2
historical-6d30556ca8b495f4d747b734d9bf4a5df9a2f1d0.zip
Fixed compilation with libgcrypt (bug #533424)
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'net-libs/libssh')
-rw-r--r--net-libs/libssh/ChangeLog5
-rw-r--r--net-libs/libssh/Manifest21
-rw-r--r--net-libs/libssh/libssh-0.6.4.ebuild6
3 files changed, 24 insertions, 8 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/Manifest b/net-libs/libssh/Manifest
index 4a53826b630a..3775602e1c97 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -3,17 +3,28 @@ Hash: SHA256
AUX libssh-0.5.0-tests.patch 446 SHA256 d23cf31e1fe6c0e1b1ee31f88a74b1a02386d75ab72063a39fea8c467dfc3383 SHA512 e751ac1c3749ecbd8ee2f960ad09e861763cbdb9bccc7c95ae27ca4768e8c9ae5ab55342151a2799f8f937e63a8729bff6f04cec166bb9830b99f8f690da4825 WHIRLPOOL 55031d07f02fe43f32391ae20e78b5a689df342e96d0feb2a03f674251b743ae502955e9d1e93539ca4f25f2eb151d8d02fb594e509978356c4bae90fcdca695
DIST libssh-0.6.3.tar.xz 279492 SHA256 2bb5d7c595059f990a8915c190169257328ffa828ced0c05b09bbe186092cacb SHA512 8a9afd0add4f7e4b8ca237badaa9e248153cb3d069eeb3a5e752703545eda44a2556f93a4c60d3eadb3e950bc0848caa114fc54572e6372d740cbf8a63ab3b93 WHIRLPOOL cfa84307291196409367167ab223b2312db1760da53cec8a4279cd6db7867f173dc900e1159e00ef7ce91a571c5d8ac04f58816ca5cf44176885c82c10118bbc
+DIST libssh-0.6.4-libgcrypt_build_fix.patch 1660 SHA256 729e6c4aeacb0c066906b320c426b624b3f437b456969e1830d367800016c304 SHA512 90d4d371463ef6a0669fe363c2750fa1320586b14e1dcaf1d7e6789d2e2732fc8dcbe70c11b4a81675c443c30465e6a7b056a40192ff6245f59308bab760b216 WHIRLPOOL 6ee0dce20b262a758b921483151f12fc483c8370c4eeb2c99c6fd94a44a55a54af997a3ab4dfad99ab714a6d6602392843e0bdb5383180d2d84a947a457a88eb
DIST libssh-0.6.4.tar.gz 381835 SHA256 7e3205e2e95bf35b23b83a6485a7d59abe7c7546d01b728f691cf0c374216b52 SHA512 02c1879d7afed9cc8404366c343ea770e97fcdcc7cc467f15b762b2c5724399de3efe69fdf6ee86a607c0f4d2337586f34150b9e0dcc8ccd8e86de79f574cba5 WHIRLPOOL e086afbe604905bdc024a1ce7503644285fdb394a168b6049e44751c64cdf51ba9e036a32f568d749252ad537fe9f874eadb8aea92de580f9c93a9d91a6ef457
EBUILD libssh-0.6.3-r1.ebuild 2368 SHA256 1c268618f2d7c84e8af8977726452b9a950ab20af172b198212081b0f9ccedcd SHA512 a99f10224c61e1b499f3d5126efeefe8df221d8751675183867785e10b38eb05708891cc53f596ea00f61b4364a0a44460d742c20cc27354846c3d6bc8bcebc7 WHIRLPOOL a90e885676b2dedb30dee4d1cc01fd95db75d214b3e7f31b49746037a5fc3216000ec39efb3899a55eb92afc22eb9ef71d3ccff3724046788305a462fdef90ac
EBUILD libssh-0.6.3.ebuild 2125 SHA256 d96dca528493f0b6c81263adfc7ba9fc7764bf9afd82356b19401ba1e2b9ccce SHA512 693ee0fb04c8a81b199a4e4cb11c63980f230a83399a0683c89ef76f6feacffce3157feb27a9b5aa76cbecb0758943181c6d1ac3d57fe773f2a924bb55d71430 WHIRLPOOL f6ec7de8457809f2a6ff970b0807b918ca4a843979bfc67a8cd8f28f4857db189ed004f88011f6f31e58ba90b0aa54e68dac8b8ab4b30ff877234d5677744598
-EBUILD libssh-0.6.4.ebuild 2370 SHA256 6fc1aa91384abbb66d8da137cfb36533634350133a0a163fb8d6c34592b3d55c SHA512 210bbf2561ba959b2b1e38719ee3589d3587fbc30778595e682c9f815259e9c2631a4acc012ca85dc66d36d6cf3175aa6fef20a954154c43a156ed5dcc0444b0 WHIRLPOOL ea55e1dfec16d14c41301e532e732dab8df4358f676d2f352662db2be76d7733bb9957c2c5753d6a08efff95c809bff4819de2adf33104c4afd12dd969da7f7b
+EBUILD libssh-0.6.4.ebuild 2559 SHA256 89aaaef2582860437b6497fe987ff24eee3f3c20a535ac006ba2ce3ddad18d7d SHA512 cb1b6c86654266b1f3773e871ba84e4ff52d99cbf5d3e56472b2c4d9e2ff6f4d2d086d3ce9fbd87b8bddaed4b58be7f73e8c3c7fbc39860d276884922316b1c9 WHIRLPOOL c086354ddfeaaa875f9a748946efc6ab56b12bcac5820c07c7bb19766d5f362ed8a3070b21d4d8d01df47f69cc182298b3bf080bcac0c87315c98c13088889d2
EBUILD libssh-9999.ebuild 2165 SHA256 19217cf4a65823f37239ed541e83e6ec8ded43668fe7bb6bdb0fe3900de22009 SHA512 92222628c3851d025bc645ced70092687af28c1f264621d3ac230e87d4b2269f8e09838f1cafd53191457fbab4b8e683914f25213c46dd673e012d2c36d23665 WHIRLPOOL c2dd2212aaef30e06abec149f8e4cc661998feb89c4eeafad6b67ea37ccce597e907fd1bcd02a9d27dca8febf0eeaf9c5c4edaa81f6566c2603131f52e13edbf
-MISC ChangeLog 16341 SHA256 3217eb46453de809d128d8aaa0b4618d8b62300abda74b8029cd48cdbd69ecc3 SHA512 d1ca88aa3cd11f0d98bba49fe0650b6f782d44b6b9e1dd657f2357d825ff073f03baf71b31aa16bbcfd1083f014baf5d2ec220f3605a22e6f37bac63d1c26691 WHIRLPOOL 2fc3ee99cc09391167f0493ac3ef3c6c09a18f63e79145b1f8a9ac638dd251fc2e57ad7780ebdec80daa5b2c6a2289bb415f6ae001e365ca1fdc27da853c2ad8
+MISC ChangeLog 16476 SHA256 2bc9811bd2a2a0d3145ffdcda97513231549fcd30c8f658c30dcb6450e934da1 SHA512 c6d395a3980c9b972baa09f2f0ec9ec40030ee300a0c50c70c633019764c276de49b2f0561e8dbe01640c98db00e4f4cc0a8403f61a5651034b9dacd25bb07c5 WHIRLPOOL 54e6519e907c8064c39700dfbf9bb6e4b517f58c5ca6364b80254f94fcfcad092a45d5921263e18d4883979b5489188ba0ab01e508572006b122bda56fe16565
MISC metadata.xml 577 SHA256 fe4b1a79301454baa0772dd181ad10ea5f835a904d1eb71c94890bd276891116 SHA512 dcd1badfa0be8068167dd095631366e968046fba7e5f62851f2f7c463ba8c8af427ec487abff41c236f269fdfd376f5716e4ffa4a5042f2ab82bc5bdb85b21e6 WHIRLPOOL e9731fd1b62a2d0d5836420585f8a31f11bb6f5e3ff12d9853ccb66321dd63642bddb1f128e117ebd1f7f58209f17a98f14c8b7e9c1e1b091c6ab668595ac524
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlSZKVIACgkQVWmRsqeSphMCIACfbr043p93t4g4bE9dLcHE2EwA
-TTgAn0Vs4pp9Tlaw0O4C1ICno5Bt/oT4
-=Mqhd
+iQIcBAEBCAAGBQJUok2EAAoJEPiazRVxLXTFHWgQALl3PGlX4U9ppL8AF1HsSLNt
+43MSJWCrsb2ErKCzLKhvp76sp0rfkOOf5kQHfa3wKZ146oCJfnGFS5+K9qR3NqB0
+Bd6JQLJmKRSPWZqeNfGyXLO3GOw7ZcyLxRmRbCIkzH4WNTm6bzfcV+FE8t4sY/s3
+a6bynuVXRSuxESjRUJ7P5qtqRQ6Y6q++vkNKPc6VyNJqyPQaPdSzhs8V2klKhbN6
+gfsZ7wVH7l5ili13HBt/qoxmABKBBCGQny9Z3ujx/2vZaezHA9lVCyDuKdJkvDNT
+QT0m99zCvToJlheH7dQT1x4hHpHOrJjWSgJRrSVjyReS9Kr/H+3fvZqzMmDJpnfS
+sUJgYDPdHxChYIvpACp+G3x848vQDQJp3feYB9nVK7AwIivZO8HC7Bz+H4S/mgC0
+GADRSnN3B40Qu2b+3ZhI08SnGWRpsirxLmfcaeo6WlJgjwOzGrXhbYRiURKUrg/S
+mKijbVkk1MznQIQBEqoJxFNkRRunatWn7ZCHqhstACf02Mt+GwVGHVmK+9KuSl2I
+O4CSOjX+fSG6svkpc/c96xC687hdVI6/FH0e9tvH3/A0+eKMGlE0cxSHIqm220mj
+m7iCkPWOCLlw1jWUXLP9ANSHL/vZdEYFvjCVdfU2qHkRBGJxRUYnJcoYeXQa4WZE
+MO8ndDZd0hqOGlMt+wkq
+=mP7N
-----END PGP SIGNATURE-----
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() {