Apply upstream patch to fix tests in dependant packages.

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

4 files changed, 91 insertions, 5 deletions

diff --git a/dev-ruby/net-ssh/ChangeLog b/dev-ruby/net-ssh/ChangeLog
index 5dbda159bb67..a651e6bcce9b 100644
--- a/dev-ruby/net-ssh/ChangeLog
+++ b/dev-ruby/net-ssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/net-ssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/ChangeLog,v 1.61 2010/01/09 07:33:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/ChangeLog,v 1.62 2010/01/14 07:15:14 graaff Exp $
+
+*net-ssh-2.0.17-r1 (14 Jan 2010)
+
+  14 Jan 2010; Hans de Graaff <graaff@gentoo.org> +net-ssh-2.0.17-r1.ebuild,
+  +files/net-ssh-2.0.17-readpartial.patch:
+  Apply upstream patch to fix tests in dependant packages.
 
 *net-ssh-2.0.17 (09 Jan 2010)
 
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index a0c47e5cabfd..79a4a721b03e 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX net-ssh-2.0.17-readpartial.patch 1790 RMD160 bb8f9e7311f5d075f5888f7e75f17ee5a2fa7c1b SHA1 52680150a0e9ef040452eb134110315879d09c7a SHA256 bcd171a5f36c5686e6d209c7ccd108533856b7f9d4d180cfc43632eca6961b1a
 DIST net-ssh-1.1.3.gem 136704 RMD160 92e6e9efa674372c89cc8f750f82cb6d21195ef1 SHA1 cf86eeed5b61343e99930c1baf5b6aa0f64ce06a SHA256 29d8b72212f1305726ee3cb97127beaed039f3269b9576d65c70599d85ddb545
 DIST net-ssh-2.0.15.gem 124416 RMD160 2f4ac4b55ce31ef70ee6a2ef2b71c086e451cc7a SHA1 295c3920f1f0626431f96cce7eb55c57ec2e6609 SHA256 b91f66dc3d4134b1f5768d2966e75eb355e7c3467ff82bbe21d694f29a896580
 DIST net-ssh-2.0.16.gem 126464 RMD160 96b714c1eb036eac6bf0e101922c17d10715680d SHA1 a7437ae98b5aa95be65c45ed19b6a72f21cea23f SHA256 b6d71e5ae997953380f08be46af1942f7c8d5dbd3a0f303453dcbe6d2b242f7e
@@ -9,13 +10,14 @@ EBUILD net-ssh-1.1.3.ebuild 498 RMD160 69e9e806c4f43fa45163ab172241c98870a3a2bd
 EBUILD net-ssh-2.0.15.ebuild 422 RMD160 09f3083faa99b2a0bea406f3204de0cb27c535ac SHA1 3c901073cea0511c448c18967ee91c8116e9498d SHA256 08cdbe2815c8fc6c8f678118a885f1304bad67de4e30ebbf0baa34dbba9fd3a1
 EBUILD net-ssh-2.0.16-r1.ebuild 760 RMD160 c12b0183c297c9926ddb505ca3fff0647b53e32e SHA1 789fde14960519ef4761c4056cddb16f4851c2bd SHA256 3647d94a57b214282bad6159f9ea2196e8e161285f42145fc7e219a58cadb6ce
 EBUILD net-ssh-2.0.16.ebuild 498 RMD160 609aedfd38d95aff6b565e5635bc470c92770a3b SHA1 2c3d4e65e249b42004e0ec95b870d5f302a827ea SHA256 cd3597721c4d6da64a3d0ab734449d15b75da78a60fd84a004dbd55d95496ada
+EBUILD net-ssh-2.0.17-r1.ebuild 811 RMD160 8287fd8e9049c3a5758cb7574bb798adb59b638a SHA1 8ddf1943e7a70af422d9f092008e86e41524a387 SHA256 0aedb0fb07a27d0c3efcfcc2ddf0310f38cd53a6bd4cfc031d58e2e0b5a5cac1
 EBUILD net-ssh-2.0.17.ebuild 757 RMD160 71e181324bbe3a3903abe8a371b9a4f432396c2e SHA1 c4a1c8d95719b6d0a35d8930bc092b2bee1e8e66 SHA256 61a3d00a68c1dbdce56c53f35fc5373b4da8cab96ef1bde498fb9c9970fc14e8
-MISC ChangeLog 7813 RMD160 ee6c0f68f4c8c5eb281a0ba51b22132e7b144dd5 SHA1 92ec1ecd0aa2715a2be48b0c775253f0b573e8dc SHA256 b4430f5227f11c86bc3a3482dccd6c60839848fbbb2bc891f2d5c15c5a9b9036
+MISC ChangeLog 8027 RMD160 cd6f672567421b5ad2efa3d6a97a923e3734ef1c SHA1 85fe74acd9eeba39d69faadb5c50145fce5071ec SHA256 387a96402989b5d959b7251aac1c3e94f1e71f7ceb3fc7a5487191ab9062375b
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAktIMWsACgkQeM7EJeUH71MQxQCgis8FN6X02sY5HaxGrHnvADZE
-QsQAnicGOlQenyCnRIeDo6Czi8Wvvzdb
-=KVuW
+iEYEARECAAYFAktOxI4ACgkQeM7EJeUH71Nv6gCghW0iL5KOSNpWrrlXpkp2A0FH
+GywAn0PBZTi1xBC4yvgHnazb98AOGDsy
+=i6L9
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/net-ssh/files/net-ssh-2.0.17-readpartial.patch b/dev-ruby/net-ssh/files/net-ssh-2.0.17-readpartial.patch
new file mode 100644
index 000000000000..43e89c7082da
--- /dev/null
+++ b/dev-ruby/net-ssh/files/net-ssh-2.0.17-readpartial.patch
@@ -0,0 +1,54 @@
+commit 5d63f9bbff00993d7834f38cab59e7252776b1c6
+Author: delano <delano@solutious.com>
+Date:   Wed Jan 13 18:20:41 2010 -0500
+
+    Fix related to #recv(1) to #readpartial change in 2.0.16
+
+diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
+index 38a3608..c0c525e 100644
+--- a/CHANGELOG.rdoc
++++ b/CHANGELOG.rdoc
+@@ -1,3 +1,6 @@
++=== Unreleased
++
++* Fix related to #recv(1) to #readpartial change in 2.0.16 [Hans de Graaff, Delano Mandelbaum]
+ 
+ === 2.0.17 / 14 Dec 2009
+ 
+@@ -8,7 +11,7 @@
+ 
+ * Fix for "multiple hosts are separated by whitespace" [Akinori MUSHA]
+ * Add support for the ProxyCommand directive [Akinori MUSHA]
+-* Switched from #recv(1) to #readchar in lib/net/ssh/transport/server_version.rb, so that closed sockets are recognized [Alex Peuchert]
++* Switched from #recv(1) to #readpartial in lib/net/ssh/transport/server_version.rb, so that closed sockets are recognized [Alex Peuchert]
+ 
+ 
+ === 2.0.15 / 03 Sep 2009
+diff --git a/lib/net/ssh/test/socket.rb b/lib/net/ssh/test/socket.rb
+index 4741255..21a20f2 100644
+--- a/lib/net/ssh/test/socket.rb
++++ b/lib/net/ssh/test/socket.rb
+@@ -54,6 +54,11 @@ module Net; module SSH; module Test
+     def recv(n)
+       read(n) || ""
+     end
++
++    def readpartial(n)
++      recv(n)
++    end
++    
+   end
+ 
+ end; end; end
+diff --git a/lib/net/ssh/transport/server_version.rb b/lib/net/ssh/transport/server_version.rb
+index 3a2d7d2..9cdd36c 100644
+--- a/lib/net/ssh/transport/server_version.rb
++++ b/lib/net/ssh/transport/server_version.rb
+@@ -43,7 +43,6 @@ module Net; module SSH; module Transport
+         loop do
+           @version = ""
+           loop do
+-#            b = socket.recv(1)
+             begin
+               b = socket.readpartial(1)
+               raise Net::SSH::Disconnect, "connection closed by remote host" if b.nil?
diff --git a/dev-ruby/net-ssh/net-ssh-2.0.17-r1.ebuild b/dev-ruby/net-ssh/net-ssh-2.0.17-r1.ebuild
new file mode 100644
index 000000000000..14c587e2f385
--- /dev/null
+++ b/dev-ruby/net-ssh/net-ssh-2.0.17-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.0.17-r1.ebuild,v 1.1 2010/01/14 07:15:14 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""  # Uses hanna which we don't have yet.
+RUBY_FAKEGEM_TASK_TEST="" # Tests depend on test-unit-2.x which is masked.
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc THANKS.rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="support"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-interactive SSH processing in pure Ruby"
+HOMEPAGE="http://net-ssh.rubyforge.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( net-ssh-2.0.17-readpartial.patch )