Remove vulnerable version wrt bug #476622.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 14 insertions, 92 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 61e94896b740..ec7f7c7a5ebb 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.82 2013/09/14 10:37:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.83 2013/09/18 05:55:56 johu Exp $
+
+  18 Sep 2013; Johannes Huber <johu@gentoo.org> -libssh-0.5.4.ebuild:
+  Remove vulnerable version wrt bug #476622.
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> libssh-0.5.5.ebuild:
   Stable for ppc64, wrt bug #476622
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 4db210d44ab6..9f34c278259b 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libssh-0.5.0-no-pdf-doc.patch 1195 SHA256 116f436073bb6eed8ec776828efcba399852019483a10da2691b3d350570c793 SHA512 739230d6bde39ffc09d054cfe54d5182aa2ccafaae50d8e9f803321de5c295b9eff653cd51d22b6112db39538f4f02d0231c9fdbab76afe7258d9d4ec4004e34 WHIRLPOOL e540d0e1ecb5f5122572b99982780a19559d69ce147ec41e6d70e78504d2297ff03381eec898a53ae61ba65178da4b93bbfd486cbd486543ec5126da86eb75e5
 AUX libssh-0.5.0-tests.patch 473 SHA256 aa57848a7e67fe4e62bad6ade2dbeb45c616b03f9d38594ac90deba893c649c1 SHA512 28c1675db83cfbb8534c8108ad7c6a535bf2c168907c1e73c84cd04f4912e9101f68543cba301302f4cda8b30d1b71a72275ccbe811da98db4667b0eebe468c3 WHIRLPOOL 5c89e7cd0e2d9cefb1f87f70347b7ddebd381e1967bc20352bc01d607f84d2afcb69af42f80f1f64fa5cf87c73237e62e8b4b129b6ae95158679a5e972cb9070
-DIST libssh-0.5.4.tar.gz 321265 SHA256 5f3825caebf7c47e6c6025aa048cb967e32c2b6cbfdc04109f05a35cbf4dca80 SHA512 1d854ee05e62e9e04ac704bc99a60b6f88237078b728e50e3e0f1142fbc5d1a4b4d04d675f257491c82c8b222b97db7a7f8e243f4a0f723e82788ecef3a7a71d WHIRLPOOL fad488dcb6ec8b4502921595b1735510c5f71a405cae64d369603945e13634f581a65cea693cf98eae179da095694c322da09144c33effbfbbb7a39c1dd489ea
 DIST libssh-0.5.5.tar.gz 321583 SHA256 c0df0f05fc812dbe26fd4118bec0776aa9e892c0719590f3971130489c6b8e9d SHA512 114a8d078b9530fe37f12c769283213ceacdd8cbf0c1c3e64e09c07d38b3886bc8c9a78816562ab1bc44c55c604fcc4ed85cdb2a8203962c9331f9d10977e802 WHIRLPOOL c12f543b5613641cd52a29f57e540a2ed0aa91e538172755966d440f0e0905e48c9c4ff3f263dcdfe8f3e925045856650e2f5ededc232be4bdd731853646764b
-EBUILD libssh-0.5.4.ebuild 1945 SHA256 e110cbf87d6f820a407da2b4e4a47e0b6cf882a11811c82820d90ce556afae00 SHA512 0fa991ed9fa7acd660f1112620deaec5146a15d4794521fd8879d9c7428b86cde1989535fd17914750930da800640e51b64733aad1ff676a5427a59c442538d1 WHIRLPOOL 44a1fdf61cc8af3696cfde7dc1564d93b6515de573b078b66276fda2b6599d86639da09063da45ab29b2f3551d7f73eb1c9547c086a4bd754cec4a7b23d12871
 EBUILD libssh-0.5.5.ebuild 1945 SHA256 4cb8949f0708b88aae393bb19580f435a1a899513685c8880e3a7e5797ecc716 SHA512 48c743222445dbafe86ce14b1998ffa6b6ca2639fd64e61c51be09c4f3fe46bc69861cff56c445de50eaa884bcad8bf02c8d1cc575e75906fb618a927ec40319 WHIRLPOOL 4452e746763b8696f3563e551fa88bb435307fb9fea20119d8e93a792270028099757c5f8fc92b6a52d882a39a253743c38156f8301d93b4a4c590e0e4eaaade
 EBUILD libssh-9999.ebuild 1476 SHA256 f7de35a5de94e8fbf7df009e4a03d361bc8f748cdde9accae8ecad73018943f3 SHA512 a3d0afa59d38dd8046f7b6875c0ec6e9409c735998a1effae5565a7d7ba1f24433f34cd5312afad944eca0314e84543f576c72665d2eb460853e67acc9987751 WHIRLPOOL 1ba2a7fe52340a33d977950fe8caa8505cbd840138486a659d3ade186a873f34f0dc422bbfe88ef259624e9b096ffb005f5e259b4b090bb385e8a10d05d62310
-MISC ChangeLog 10958 SHA256 d41765de05787197d6b4a42468838fff5af127c646c295a84f4dcdd51767b593 SHA512 d8535b12c1166ac6c229769b6b98eaee809acafc7b4e368e0ab36b268988ff8d3e47f80490a584b60eb2f8831349d22f3e9cf1274df3d80fe3c11af41f12145d WHIRLPOOL bc50abfea761b7bc5a2039be842ed3f633f3bf82aeab9aec6040b2a75d5311fe0674f6d2e0f23f2c88a201b7ce9d0af9e2361f9241e313105bffcc70a5f3964b
+MISC ChangeLog 11075 SHA256 342ff3daeb9182a9bc8425fb533839ec3709e8792ef996f01315d02ce61d95b3 SHA512 96fd4c67b8a617dc50664659da900f8133e6ad77be0ad9861679a96bda5e273f421735e34d589a0fd4c0a5e1bdb1314e8cb87dd6ad454eaa455a4eea4c82af4d WHIRLPOOL 9bf56e01892de40241e2204387478871b1b01f57eec326aa85492e1ec69d5e161676b5e8204609d959c0ac406b9ce2f33761d5a3d0c130ca13dabb812cd07363
 MISC metadata.xml 617 SHA256 cad0b9d4d822716fa2a55fde2b79b85456b83a555a07161190d3ad48400cae8c SHA512 8a7c2845fd7e4df29b9d7468068f0deea329e23c03aecd10ab3a4c23674cd18a6eba8ccdf45d183388ba1ebf81223f5b0113a0482db405d07204bc094dff3504 WHIRLPOOL b32090dfe53609491430204c81f8150685442c257b0611a95db11f219cd2fe67695edd5093141ce0668ef3b28628e3c537d3e6c44a17add300ccf2cfa6068e17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSNDxSAAoJELp701BxlEWfQ8MP/0aDLppuEiee0f2Rcd2VN2+z
-DxHMQ2dII4UfHmXEzmosU2euyr38IEjhA5UrLkwFR6dILpgPhVj5ApeJVo0mOkFL
-5QtekqJK/4ECJ6MU7cefMMoP2pYuQK2dD5XMBjcno8J7dsZM4Gqif7ZHN5weA7Gb
-cV8U/zSn77CWniZMF+chTVEwAiXXjNUoLLw0+NNJqRB5JVJXlO+jF3KOJArCOUBD
-zo8ydyl4gjsaFhxaKj4fhXSNw4q0lrSdG3+dPS2oN9snZg6fVk0yFhvC3R7eM+0v
-TP+uY6TbpKaDLX3fK2cp7Akv4jY36XIKKjPyvIVKQnMqBCLLtJMVzFvsWdNEZVvt
-jM0eXnEUEno0eHvEgyhqldiGbkixj9GzOAXgkGgqZ3J+X+x1XfwmYe3WU5AFdKq/
-ksKInL7W7zTYfqQOb4NJQJd6hhBNTXc0h7hAvfu2qW2wEne0t4MGAu3b54oDGs36
-horueTIxxngc63LyaS65Emhm3Oyypa8XEucsIC9ljv4AU2IXaaDwo6RCI13N/7PK
-QiGdzYy2SNFJcLAX9ciBR15Utc8OMG5B6zcV7GzrZV+ttZrqfesOHDJrR+T0Ys02
-aCq7ND5sRjT3wN1lg44sCjwD+4TuNdmacasBdO2Y9GJ7CtN4TsCFVO/aadXnS6QY
-J/TNkptdiwpQ26zErdiK
-=pvLq
+iQEcBAEBCAAGBQJSOVyVAAoJEO+t9ga+3I3ajgsH/3VtjcLRZ7ZpnOEiNCwhK7o8
+oSiEADdBlM5qCyqKWMx2sbVMCLLYzM/Gmt3C2LRVjVWTAEIgYwIC6MBYoeEo9vV7
+s1WSaX53OUDz2OkTK/ZvVwzV+JpsiZiO9RDAqycaYBiz2DR+gcxf6OYPhKcsHwDZ
+AFzs8RJMeBRYIfZK08W9IL46Z8gwh+iadvIgA3HJU4BoSQXjBJhR+qWzvm3NYTEA
+cWdXHdPX7kWNYNNfkUBKKdApWOusSF3a5Ck+ZcG0wAvxLZ5JJANdlky/EhwlKjVQ
+RXDQUAIyK9zLt5jn2y/kwdn3THYpWKiBc8wKJk2cF7IXCGT6B2IbmY3NkgAtOSs=
+=VDBP
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.5.4.ebuild b/net-libs/libssh/libssh-0.5.4.ebuild
deleted file mode 100644
index 9c39d7a7ba2a..000000000000
--- a/net-libs/libssh/libssh-0.5.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.5.4.ebuild,v 1.5 2013/03/09 11:25:49 ago Exp $
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/41/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmockery )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	epatch "${FILESDIR}"/${PN}-0.5.0-no-pdf-doc.patch \
-		"${FILESDIR}"/${PN}-0.5.0-tests.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with pcap)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use_with test STATIC_LIB)
-		$(cmake-utils_use_with test TESTING)
-		$(cmake-utils_use_with zlib LIBZ)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}