Version bump. Fixed build issue with USE=debug, bug #304301, thank Arttu Valo for this patch.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 91 insertions, 12 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 9926345ad663..951998fe575d 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.26 2010/02/16 16:51:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.27 2010/02/18 18:26:46 pva Exp $
+
+*libssh-0.4.1 (18 Feb 2010)
+
+  18 Feb 2010; Peter Volkov <pva@gentoo.org> +libssh-0.4.1.ebuild,
+  +files/libssh-0.4.1-debug-build.patch:
+  Version bump. Fixed build issue with USE=debug, bug #304301, thank Arttu
+  Valo for this patch.
 
   16 Feb 2010; Joseph Jezak <josejx@gentoo.org> libssh-0.4.0.ebuild:
   Marked ~ppc64 for bug #304365.
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index bbd424dd7144..23d6f6cc7aca 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libssh-0.3.0-automagic-crypt.patch 980 RMD160 2085b57b9569d0a96fb31e45b601fe4694a5da5f SHA1 9478541d582586e60478e9d79d8cddba5bb082cf SHA256 2a55d50d761000277b37189d1f066bc20a334fbedab36d64ec442a8135d0322c
+AUX libssh-0.4.1-debug-build.patch 625 RMD160 6ad7459e9db4d47125a87e8c0c0c5640f6a3b46a SHA1 f773392f0a12e9d4edcd0ac4151d30103cc5653d SHA256 c7ae2d4cbc33a274300729d7a0825751f66f10b7ad69935a3740bb84bb673844
 DIST libssh-0.3.4.tar.gz 224320 RMD160 cbcd4a60180dca7f2ccb4c665f37a5fff4630ddd SHA1 abded99e80706ae8d50f5f25e1a3eed3c909513d SHA256 d22477fa90252bf615fd0755c44006a2f9223d9da6fa04e00fa398e4a2c15761
 DIST libssh-0.4.0.tar.gz 250094 RMD160 35835e2f9fa2ec53e71396d4ac2c54d951c122e1 SHA1 88f2021d2dfdb5c9521d99840b5ed8035a0ee5c3 SHA256 95093117de68c163901ef99441e3e5d7c343fcc60d0651195870df3af4c5a5d5
+DIST libssh-0.4.1.tar.gz 252598 RMD160 0d2434737f33db1b6a14035804ba1ffffb72387d SHA1 7bda197eb17c7179837a18d97cd1f466ffe5bdc6 SHA256 a6d2ae8212182cb366230de3cc3977779b5010c85f9a157ca9850bc6bf8f2238
 EBUILD libssh-0.3.4.ebuild 1328 RMD160 ca309c5d2b3df1a9f55d5d90cbf407827c64296d SHA1 f522d53ae4a0f741f9cc6fab4b57ab3b0f7dd758 SHA256 0748b21a6be049f94d70d999483a25470d4dd3a8bd29ea7b3461aff79b6f92be
 EBUILD libssh-0.4.0.ebuild 1407 RMD160 03de2a397c565d3044709532aed27abf45d848ff SHA1 d56501ecb4c0b1c00be09d4d3eb930354472fbbd SHA256 55986eb93d6f98b79026847e165567f4db56962c3fc8c8a53076644dcc55d729
-MISC ChangeLog 3667 RMD160 a32740a97e42fcddc2e0a0ee88239582e9d52976 SHA1 9483684f9726866d933378458a097a21379b3717 SHA256 a692e5c1f59c423268e038b198b61c6f7859ef851734c4db1082275ca281e574
+EBUILD libssh-0.4.1.ebuild 1449 RMD160 ee37418e329c1bce3866eb3497038a2b668b18aa SHA1 a7523124c890f721fbb03d2caf814e9f21667631 SHA256 cec774c69c60f42a8e2559f059f9c98e83b46e3fad168607c97e9e0e9cc5e10f
+MISC ChangeLog 3900 RMD160 ac77bb7596a44f6404cd7bb05ce5cc13426efa3e SHA1 a7ff6948bacde2cd2334df5681d8b0928a7ace54 SHA256 621dc10a5f68c3dc81a00f04e23ba774b4bdaac3dc406d262699f192338f2dfa
 MISC metadata.xml 559 RMD160 0bc9f16adf17bb774237c98c1af90c237b760ade SHA1 6844c70e29f6748e20c31910baca90fccdf4580b SHA256 a25c0bbdca0f3e47fdfada437058491fce17c4a828b5a96ff7fe73260623eb83
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt6zQsACgkQcsIHjyDViGSESACgpysUOwMyqA/wf57aAHLouuMn
-MbgAnAvlD8LEIbvQyQLEF7KlLhA4g1xu
-=Zrrl
------END PGP SIGNATURE-----
diff --git a/net-libs/libssh/files/libssh-0.4.1-debug-build.patch b/net-libs/libssh/files/libssh-0.4.1-debug-build.patch
new file mode 100644
index 000000000000..6a88fe81aa39
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.4.1-debug-build.patch
@@ -0,0 +1,23 @@
+Author: Arttu Valo
+http://bugs.gentoo.org/show_bug.cgi?id=304301
+
+--- libssh/kex.c	2010-02-10 19:09:22.000000000 +0200
++++ libssh/kex.c	2010-02-10 19:09:39.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include "libssh/wrapper.h"
+ #include "libssh/keys.h"
+ #include "libssh/dh.h"
++#include "libssh/string.h"
+ 
+ #ifdef HAVE_LIBGCRYPT
+ #define BLOWFISH "blowfish-cbc,"
+--- libssh/keys.c	2010-02-10 20:08:30.000000000 +0200
++++ libssh/keys.c	2010-02-10 20:09:04.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include "libssh/keys.h"
+ #include "libssh/dh.h"
+ #include "libssh/messages.h"
++#include "libssh/string.h"
+ 
+ /** \addtogroup ssh_auth
+  * @{
diff --git a/net-libs/libssh/libssh-0.4.1.ebuild b/net-libs/libssh/libssh-0.4.1.ebuild
new file mode 100644
index 000000000000..e90a9f958f19
--- /dev/null
+++ b/net-libs/libssh/libssh-0.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.4.1.ebuild,v 1.1 2010/02/18 18:26:46 pva Exp $
+
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+EAPI="2"
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="http://www.${PN}.org/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="debug gcrypt examples +sftp ssh1 server static-libs zlib"
+
+DEPEND="
+	zlib? ( >=sys-libs/zlib-1.2 )
+	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS README ChangeLog"
+
+src_prepare() {
+	sed -i '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt
+	epatch "${FILESDIR}/${P}-debug-build.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
+		$(cmake-utils_use_with debug DEBUG_CRYPTO)
+		$(cmake-utils_use_with gcrypt)
+		$(cmake-utils_use_with zlib LIBZ)
+		$(cmake-utils_use_with sftp)
+		$(cmake-utils_use_with ssh1)
+		$(cmake-utils_use_with server)
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+}