Revbump to address a memleak bug and crashes seen with x2goclient (bug #493738). Removed old (broken) rc versions

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

8 files changed, 188 insertions, 179 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 908d065374fd..8a18587ae63e 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,16 @@
 # 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.94 2014/01/06 06:14:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.95 2014/01/06 13:35:00 polynomial-c Exp $
+
+*libssh-0.6.0_rc3-r1 (06 Jan 2014)
+
+  06 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -libssh-0.6.0_rc1.ebuild,
+  -libssh-0.6.0_rc2.ebuild, -libssh-0.6.0_rc3.ebuild,
+  +libssh-0.6.0_rc3-r1.ebuild, +files/libssh-0.6.0_rc3-memleak_fix.patch,
+  +files/libssh-0.6.0_rc3-x2goclient_crash_fix-1.patch,
+  +files/libssh-0.6.0_rc3-x2goclient_crash_fix-2.patch:
+  Revbump to address a memleak bug and crashes seen with x2goclient (bug
+  #493738). Removed old (broken) rc versions.
 
   06 Jan 2014; Naohiro Aota <naota@gentoo.org> libssh-0.6.0_rc3.ebuild:
   Add ~x86-fbsd. #488696
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 476720ba24f2..82ccfa94d234 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -3,31 +3,30 @@ 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
+AUX libssh-0.6.0_rc3-memleak_fix.patch 588 SHA256 0e9173a09b58eb191291f2ba1827d03c3a46d0a51e394bc9b79ef589079eb5b8 SHA512 377579e5c3a1f80ee0a7e1982534e216c2d301187504d3499a69f87faf691227747d629d7929341a482986a79ad5775fb6230f6910f7d19c5ceb85b471203aaf WHIRLPOOL c70bb3e60b28f9a31f185270b70766baee1b8e1d1a914541db4b1399b38299d72c0b6b2610d8697a84d395df3767a2890b60c89e1f5a68b3d2fee9555e13b5ec
+AUX libssh-0.6.0_rc3-x2goclient_crash_fix-1.patch 1221 SHA256 1834bdccae2af486189c76685758c5fe167625bf32756634016d740a46a93fbb SHA512 139723d5a5277400eec1682c81949249921b59bf01812dd81146b5bd1a1e9ed1d8fb0c41f79c69dd28d94c7ba1cea24fe7af69a8bb801af11a2ebea519792ada WHIRLPOOL e3a5e87f17878b0a6bab47d0cfe72547285859efb9cb9fb775736d118f5dfa14e3868df713bd7ee7fb82803767a6e7257f060c74f663ef16105f4f7caa9b5816
+AUX libssh-0.6.0_rc3-x2goclient_crash_fix-2.patch 3051 SHA256 d5da6985934bc3e242c08093739b6480d80085ed700a4f7a9edc2e4c4ab80af2 SHA512 c21533faa983ffe0b4c795a667ed7a1028e02c7b8b8195b1e2a12551159c40519cd1185bd50e06a494a07452aeda1f744c4efa565c97da488a3bad0a77615725 WHIRLPOOL 88f256f92898e15fb8630e4e9c53269918161278a9ab269458b289763b7887341715aaf0fc90210f7ecfa1b6d906f64c9f98a087fc860fb561945fa127b105ae
 DIST libssh-0.5.5.tar.gz 321583 SHA256 c0df0f05fc812dbe26fd4118bec0776aa9e892c0719590f3971130489c6b8e9d SHA512 114a8d078b9530fe37f12c769283213ceacdd8cbf0c1c3e64e09c07d38b3886bc8c9a78816562ab1bc44c55c604fcc4ed85cdb2a8203962c9331f9d10977e802 WHIRLPOOL c12f543b5613641cd52a29f57e540a2ed0aa91e538172755966d440f0e0905e48c9c4ff3f263dcdfe8f3e925045856650e2f5ededc232be4bdd731853646764b
-DIST libssh-0.6.0_rc1.tar.gz 386384 SHA256 ef28febfb2f0d9140b1009948581eb15ca3868eb6265ea2c8d6cb5f44e7da8a5 SHA512 80ec9d373d959a17c0508d322d7a841863772c02a8cd5d8f7a93e8e1b63f177087d4e1eab94c4d346b790e012dfe37a8edf3783be809ab751979b9eefe97939a WHIRLPOOL cc4ed37a4aac241d5c43dc47bd69b90b41f9071814b261017631b7d2ef8ac0dca532c53d1a89edea07b6609d26f8b0a59429dccbdca66aa579cec9c6b1c2a4bb
-DIST libssh-0.6.0_rc2.tar.gz 392315 SHA256 bd53730278ffb333917b5139221944586dbc9418be36e6764c14da725fb6aeb3 SHA512 809d29c14930048bacedb964937fab6bc8dc2e78edef81fdcd2c851576a9a3bc4daff4cf0ed08dd9e2572fa8fa4460d5161ec221b995b96d97406a3bac8e71b1 WHIRLPOOL 81e8bc9b24d3413df369adeb8e04c63b79ad4d0f41a6fcfaad667395cd588c61c1db06d3d9693f6a36f9e773ccae48c52c4b675da4e0ae0de6797b9b5bb56956
 DIST libssh-0.6.0_rc3.tar.gz 395230 SHA256 1293d9817090d16cd9ecf9e91baa1ca21d1158fbeaa3ab840f7cf44490bb58df SHA512 606d2869963dbfe62fb20a32e14ccb759add3f8f42340521509e2badd650d41c3d47aae6ffd34e7fc3dc67987e60ddc812dedca1121b75db1158ae72668a44d9 WHIRLPOOL c2d8004f30eec08a337a0551879d681677ffad03f2c31e9292ce7bcad2432e7059ab1d9834e941cdce25f73cbb108f60ee8eda13bb6be7275c858b5f32a5c066
 EBUILD libssh-0.5.5.ebuild 1964 SHA256 8569c65bd9318df61e07214610282683d84b5e8008db9b2fddeaecefcf45ebc5 SHA512 b47dc0400d4a4c32c015d33bc74af1537e2de7436c0f874e1bedeb2e32c3e0f38ea382dae6e933bf805ca9a8c48f2ef18a6b13e97ced3c981560549219f92548 WHIRLPOOL 761b931385c04d208b3233070e038ae620e37befee96ef11d2ba7780d3662cfdaf699346cb77c3be784d53ff402452aa05c06c92c3b89f2218e29fe368424549
-EBUILD libssh-0.6.0_rc1.ebuild 1979 SHA256 65604933a699ffe455dd1c60a2ca171bfaa5870e815407efb679fb18f8459476 SHA512 a0cc7c50f0d68e45c92522a62bd04afbcacceb03220a6a414076a0a6a09078d5fa8f0729a9b3632781dc0b8dce5c2877992e33328b829251b1bd96aa7d37c8ea WHIRLPOOL 108485b93fe90e408850b12f989d30b7daaa5aed04480010f7459f811292c2fe27711b3cf35364e8c684963f24b704771b25fedb1737061475c2951df65e4e60
-EBUILD libssh-0.6.0_rc2.ebuild 1977 SHA256 0ae954866fb1f6ac2fdd045bf15f5db8c5d1b3513088ef790c0cb4695fbe4df7 SHA512 d70a0184dbe6d50757cf42508147b1ed831c6fdf9aae57874affef323d9bb5277e5135998b64f9935486d558e9e2146175350e5db95e3467eb84d4ad6392365e WHIRLPOOL 0eb96e1ec4fc361eab8b75c1c9dadc8aae3f0b4bb978b341e2c96830266ccccdb2f302dddf30db4202add032c83704c35242431cc73079bffe45ff2b4f45b886
-EBUILD libssh-0.6.0_rc3.ebuild 1980 SHA256 b8b155bb5b9b39aa00b0bc38a5499e24732f4486b796b1620cb783247ed8d903 SHA512 99b5611efe4a8a9fe4946f269f8842767dcfe5987df84e1f82eeb93478e667c3bb16e503365d5d299e929ef320e707ae1dc7a1f41e86881a642359cad9f01695 WHIRLPOOL 371da383a5d38787f24e3d30ce0b92d79a1782a9b0c668416868da58548db72d2184b64e13f2d15c81581c0ff6a1118903d06589772064df9f91d81cb0687c44
+EBUILD libssh-0.6.0_rc3-r1.ebuild 2117 SHA256 6af48f7b7317b6dc1cadfd73fa9a7019671d1e5c4d71154cd5f5504953d6d298 SHA512 2976eee15eba81d1b79a0618f83aad96c9ff300dd90ea2414a53631d22b1bd99e4da0d0619f8b9e7739fbd2ced314252b9e2bab0fcf8a2be0742e73ffe2b3cb2 WHIRLPOOL 9e3de4d921d5c9da7c21854cf6dcd0a9eefecc7ba10a3f3249a3ed9cbdd94e128bafa2469f62beae51189733d2841a1cc52de850986c053a3f315bd9b88265be
 EBUILD libssh-9999.ebuild 1408 SHA256 0c6951113be348bd94871f9946a2a924efab3d2a921168b443f5064cce2a2181 SHA512 3881a094ae36af978d5eba1555b510cf0b528ade1fbd09f804629a256aa1dcc0fbc05f8deb3b3b82f9666b2355c710f1dae343b521b06bd37e25fec956483adf WHIRLPOOL 54ea3f9ad28272feb953536ac42648ffba471fde3d3a00f8f4dd5ed87665b644f72cfb3f6b677ccf934a28b48f2de85a31d229b0e8ef6163dc06ee60043735af
-MISC ChangeLog 12685 SHA256 486da9479051dc74b64d7ec92208f9a5d699e0f3b22f4c6e2ff8203fd5aa97f9 SHA512 83e3a4eef2dea434f5da0226b1fe4a9a69a37a54c8941398703004a40803b4fb48ef079589044ffea278c0a70a4b27f9a4ef8d8bbd125bc5c5a9a2189f550090 WHIRLPOOL 5f19aed88aadb4a4f4ce1d3d6089c5023e348805fec0c2bc43055252289db727ea30de79c7283affad868565af15e5668461a8f89786230ffaf7712c417be79e
+MISC ChangeLog 13168 SHA256 207db67f8c26e95e7ab65c7868d65dd1a05415c725bb71124abc2ab00c1cc508 SHA512 02a29bc4adb121d738deb531992020f917c08d8624263858ab1585aa8e6e43ea9f2d72d6279c470c628eba58fe4d375babdf0b97fff4ae4563a79e00a4d089de WHIRLPOOL d6c6e10d2883ac305e5addeb0b79598695bb478fe7acdb91b7a139d67b643a343f2eeb3fdac2c72291b86ec53941793308035881fd875f17e55b657d98f84168
 MISC metadata.xml 501 SHA256 f8d91b2c3830a72ff30a8dbd6f2e6911cf049c80015b5e315cb9f999e945c3c1 SHA512 1110ec6fb2ea256b38f182cd14de9a5b518d1af9d27f16782ac25154d6aff24e5c1c57217f8922db1dcdfaa336e586d56aa0c5cd06e7f485197d9e9eacd7f787 WHIRLPOOL 4b01a6f4014597e495953f0c95703cb56c23c1a1d546245aea640ddaa1e3013b88fbee348502ef86c8ac729bf12064230c4dd5786362007262bd35cceaf97312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSyknbAAoJEDYO1FT4VRUUybAP/3I60t96K1msYCHh0lu5pY4r
-dC04P8r71cN6LS/vIHSZqfNslx17OZfN7XayBa+lTHJ9zVl8UE4kVsq5XotLLbZT
-XPCR3w9VCaCgCmsTizKxcknGh2eaU+QYMHBVTMk8sEMs/luGVXIdPyhOylTI18hJ
-bsYXxEukBKl1sLK54HH34Vjl1hJhVpJaqCp82sVY54xq30cgkDw0yI3QO9NNZ8Ns
-1TCslpzXBHcsIE8inZNj73eudCUN6jd+PiyfBNZ8/7qw9U6LSStxxrn99YcTbgvM
-ioS0rBEHqj0KOi3ruNhvD0BuEfhG+ZFdxU0uDvg8cpxtOhvOb06X2yVQ5IDMw9wb
-UKY+JLW9mBp4Nbqj022tvFcdvwvrQP0J7RvHHvZS4eTT3bZFEY7FAJfrT9y6isiI
-cmM2rFsREPpRO0SoXo/wlvVhdiMtj8pbDnAzz9Ama8sXjwlE4kCtozUjkQEBXXot
-ssAk9RymFoXXcpzdFksQYj3LeHkh+B+is51gU7t/w0mgTgMbCJ6KlgopB8XIOM5R
-OW0FxdzZigxxOvwXpmu5wFlTyeFMqdgcXpqEffzMsjTP+4jgXDQalEKytf6nsVRB
-b8V0kKhk7wtJMHfBxYH0+nPUrcYXSR7NbDJiOJ9woWApTj6h4dDdWH0vUXQU9tyP
-gWPds4c3ewUBFSX2lKXJ
-=RzZX
+iQIcBAEBCAAGBQJSyrEFAAoJEPiazRVxLXTFG6IQAIhWu4PCghOpAgchK1xnv4Z7
+akGFBwc3AGJxZc/47R+VkGfjwEAc0SBLaFdNbDdTyUwhdbVHwAG4aveXirTdlVQq
+zV4RhwLfCbpMhftAdl3XWT8LSqwfAJf0hYkmHMF2XwUx/Pv0jxnMxwL3bItsnr9E
+z5h6BUth3XKkx7ERnVVgWQ0101nFBF4265O9CLmkKXjZ9sibJnk4XZm29DJ6mwez
+HmSNx1RNkrSTPqHmslwoKh65jOQJJPnn01+nAsWuSP96/fS1GhnwEm7jueugZrL2
+hg+QfY8iv8vkFcAUUAT7oA9g5+28dUxapybPXJBhLi26LrrmmpCxsqFXwRcv24kp
+s7HUsNipsevL6p1N2aZsZjOARHyE2nipkTqUcREEYI/VGtFVASdnInF1D7BmyVGe
+z1bXESJxVyxUGU75OPuvNyZLM+yKYgtgX5VJIBgh6aNWujD86n4PGto/Dqfgvdos
+HhQH4CEn1MmYNoGe0LncdUAMr3Cu1ZWa38WHYDZMUcXPXePEupneEUUkIAFS1PNT
+GsdRCvym38KeI6W3UdfJo6umE2Dguup2KTgOsyqljTgNcUO/0WajutQmSDOrtPug
+7q5dgKaCLA0Yl8Y2itOISxchWjpqASWfzfihYT7JaxQVUvb4ncFjFyK4oaI+2bvI
+8y+oLvWb+ABtDFcEqfkp
+=e/Bd
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/files/libssh-0.6.0_rc3-memleak_fix.patch b/net-libs/libssh/files/libssh-0.6.0_rc3-memleak_fix.patch
new file mode 100644
index 000000000000..46ce6925134d
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.6.0_rc3-memleak_fix.patch
@@ -0,0 +1,20 @@
+From f3e37000632cb380516bdb9d26fba4dc4e41d6f7 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Sun, 05 Jan 2014 22:05:13 +0000
+Subject: session: Fix a possible memory leak.
+
+---
+diff --git a/src/session.c b/src/session.c
+index 171779c..3a607d0 100644
+--- a/src/session.c
++++ b/src/session.c
+@@ -255,6 +255,7 @@ void ssh_free(ssh_session session) {
+       ssh_list_free(session->opts.identity);
+   }
+ 
++  SAFE_FREE(session->auth_auto_state);
+   SAFE_FREE(session->serverbanner);
+   SAFE_FREE(session->clientbanner);
+   SAFE_FREE(session->banner);
+--
+cgit v0.9.1
diff --git a/net-libs/libssh/files/libssh-0.6.0_rc3-x2goclient_crash_fix-1.patch b/net-libs/libssh/files/libssh-0.6.0_rc3-x2goclient_crash_fix-1.patch
new file mode 100644
index 000000000000..8b4c7aeab589
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.6.0_rc3-x2goclient_crash_fix-1.patch
@@ -0,0 +1,37 @@
+From 8f162e3b13aa85aaa1257b775e1dc5d103f45570 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Sun, 22 Dec 2013 21:08:45 +0000
+Subject: poll: Correctly free ssh_event_fd_wrapper.
+
+This is allocated by ssh_event_add_fd.
+---
+(limited to 'src/poll.c')
+
+diff --git a/src/poll.c b/src/poll.c
+index 2fce52a..4d92e3f 100644
+--- a/src/poll.c
++++ b/src/poll.c
+@@ -852,12 +852,18 @@ int ssh_event_remove_fd(ssh_event event, socket_t fd) {
+     for (i = 0; i < used; i++) {
+         if(fd == event->ctx->pollfds[i].fd) {
+             ssh_poll_handle p = event->ctx->pollptrs[i];
+-            struct ssh_event_fd_wrapper *pw = p->cb_data;
++            if (p->cb == ssh_event_fd_wrapper_callback) {
++                struct ssh_event_fd_wrapper *pw = p->cb_data;
++                SAFE_FREE(pw);
++            }
+ 
+-            ssh_poll_ctx_remove(event->ctx, p);
+-            free(pw);
++            /*
++             * The free function calls ssh_poll_ctx_remove() and decrements
++             * event->ctx->polls_used.
++             */
+             ssh_poll_free(p);
+             rc = SSH_OK;
++
+             /* restart the loop */
+             used = event->ctx->polls_used;
+             i = 0;
+--
+cgit v0.9.1
diff --git a/net-libs/libssh/files/libssh-0.6.0_rc3-x2goclient_crash_fix-2.patch b/net-libs/libssh/files/libssh-0.6.0_rc3-x2goclient_crash_fix-2.patch
new file mode 100644
index 000000000000..b38955eff7d5
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.6.0_rc3-x2goclient_crash_fix-2.patch
@@ -0,0 +1,94 @@
+From 41fe03e0d61b14bc41ad658cf2d582802237323a Mon Sep 17 00:00:00 2001
+From: Aris Adamantiadis <aris@0xbadc0de.be>
+Date: Sun, 05 Jan 2014 21:33:45 +0000
+Subject: poll: fix poll_handles ownerships
+
+---
+diff --git a/src/poll.c b/src/poll.c
+index 4d92e3f..f79e165 100644
+--- a/src/poll.c
++++ b/src/poll.c
+@@ -64,6 +64,7 @@
+ 
+ struct ssh_poll_handle_struct {
+   ssh_poll_ctx ctx;
++  ssh_session session;
+   union {
+     socket_t fd;
+     size_t idx;
+@@ -790,6 +791,10 @@ int ssh_event_add_session(ssh_event event, ssh_session session) {
+         p = session->default_poll_ctx->pollptrs[i];
+         ssh_poll_ctx_remove(session->default_poll_ctx, p);
+         ssh_poll_ctx_add(event->ctx, p);
++        /* associate the pollhandler with a session so we can put it back
++         * at ssh_event_free()
++         */
++        p->session = session;
+     }
+ #ifdef WITH_SERVER
+     iterator = ssh_list_get_iterator(event->sessions);
+@@ -852,6 +857,10 @@ int ssh_event_remove_fd(ssh_event event, socket_t fd) {
+     for (i = 0; i < used; i++) {
+         if(fd == event->ctx->pollfds[i].fd) {
+             ssh_poll_handle p = event->ctx->pollptrs[i];
++            if (p->session != NULL){
++            	/* we cannot free that handle, it's owned by its session */
++            	continue;
++            }
+             if (p->cb == ssh_event_fd_wrapper_callback) {
+                 struct ssh_event_fd_wrapper *pw = p->cb_data;
+                 SAFE_FREE(pw);
+@@ -886,7 +895,6 @@ int ssh_event_remove_session(ssh_event event, ssh_session session) {
+     ssh_poll_handle p;
+     register size_t i, used;
+     int rc = SSH_ERROR;
+-    socket_t session_fd;
+ #ifdef WITH_SERVER
+     struct ssh_iterator *iterator;
+ #endif
+@@ -895,14 +903,15 @@ int ssh_event_remove_session(ssh_event event, ssh_session session) {
+         return SSH_ERROR;
+     }
+ 
+-    session_fd = ssh_get_fd(session);
+     used = event->ctx->polls_used;
+     for(i = 0; i < used; i++) {
+-        if(session_fd == event->ctx->pollfds[i].fd) {
+-            p = event->ctx->pollptrs[i];
++    	p = event->ctx->pollptrs[i];
++    	if(p->session == session){
+             ssh_poll_ctx_remove(event->ctx, p);
++            p->session = NULL;
+             ssh_poll_ctx_add(session->default_poll_ctx, p);
+             rc = SSH_OK;
++            used = 0;
+         }
+     }
+ #ifdef WITH_SERVER
+@@ -929,10 +938,23 @@ int ssh_event_remove_session(ssh_event event, ssh_session session) {
+  *
+  */
+ void ssh_event_free(ssh_event event) {
+-    if(event == NULL) {
++	int used, i;
++	ssh_poll_handle p;
++	if(event == NULL) {
+         return;
+     }
+     if(event->ctx != NULL) {
++        used = event->ctx->polls_used;
++        for(i = 0; i < used; i++) {
++        	p = event->ctx->pollptrs[i];
++        	if(p->session != NULL){
++                ssh_poll_ctx_remove(event->ctx, p);
++                ssh_poll_ctx_add(p->session->default_poll_ctx, p);
++                p->session = NULL;
++                used = 0;
++            }
++        }
++
+         ssh_poll_ctx_free(event->ctx);
+     }
+ #ifdef WITH_SERVER
+--
+cgit v0.9.1
diff --git a/net-libs/libssh/libssh-0.6.0_rc1.ebuild b/net-libs/libssh/libssh-0.6.0_rc1.ebuild
deleted file mode 100644
index 4b9248abb18e..000000000000
--- a/net-libs/libssh/libssh-0.6.0_rc1.ebuild
+++ /dev/null
@@ -1,78 +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.6.0_rc1.ebuild,v 1.6 2013/12/20 14:33:33 polynomial-c Exp $
-
-EAPI=5
-
-MY_P=${PN}-${PV/_rc1/rc1}
-inherit eutils cmake-utils 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/52/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	>=dev-libs/openssl-0.9.8
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmocka )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.0-tests.patch" )
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(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)
-		-DWITH_GCRYPT=OFF
-	)
-
-	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/*
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.6.0_rc2.ebuild b/net-libs/libssh/libssh-0.6.0_rc2.ebuild
deleted file mode 100644
index cd1290034912..000000000000
--- a/net-libs/libssh/libssh-0.6.0_rc2.ebuild
+++ /dev/null
@@ -1,78 +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.6.0_rc2.ebuild,v 1.2 2013/12/20 14:33:33 polynomial-c Exp $
-
-EAPI=5
-
-MY_P=${PN}-${PV/_rc/rc}
-inherit eutils cmake-utils 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/65/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2 )
-	>=dev-libs/openssl-0.9.8
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmocka )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.0-tests.patch" )
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(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)
-		-DWITH_GCRYPT=OFF
-	)
-
-	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/*
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.6.0_rc3.ebuild b/net-libs/libssh/libssh-0.6.0_rc3-r1.ebuild
index e69f600e0ff0..a7a300a171bc 100644
--- a/net-libs/libssh/libssh-0.6.0_rc3.ebuild
+++ b/net-libs/libssh/libssh-0.6.0_rc3-r1.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.0_rc3.ebuild,v 1.3 2014/01/06 06:14:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0_rc3-r1.ebuild,v 1.1 2014/01/06 13:35:00 polynomial-c Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.libssh.org/"
 SRC_URI="https://red.libssh.org/attachments/download/68/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
@@ -30,7 +30,12 @@ DOCS=( AUTHORS README ChangeLog )
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}/${PN}-0.5.0-tests.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.0-tests.patch"
+	"${FILESDIR}/${P}-x2goclient_crash_fix-1.patch"
+	"${FILESDIR}/${P}-x2goclient_crash_fix-2.patch"
+	"${FILESDIR}/${P}-memleak_fix.patch"
+)
 
 src_prepare() {
 	# just install the examples do not compile them