Apply upstream patch to fix tests in dependant packages.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 85 insertions, 1 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/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 )