[DRE-commits] [ruby-net-sftp] 01/02: d/p/add_net-ssh_4.0_compatibility.patch: Add an upstream commit to fix compatibility with net-ssh 4.x.

[Unit 193]

This is an automated email from the git hooks/post-receive script.

unit193-guest pushed a commit to branch master
in repository ruby-net-sftp.

commit cf6db01175775f58af04c1347af79f7d43a01b44
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Jul 24 02:23:58 2017 -0400

    d/p/add_net-ssh_4.0_compatibility.patch: Add an upstream commit to fix compatibility with net-ssh 4.x.
---
 debian/changelog                                   |  7 ++++
 debian/patches/add_net-ssh_4.0_compatibility.patch | 42 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 41237f4..a28e542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-net-sftp (1:2.1.2-4) UNRELEASED; urgency=medium
+
+  * d/p/add_net-ssh_4.0_compatibility.patch: (Closes: #869174)
+    - Add an upstream commit to fix compatibility with net-ssh 4.x.
+
+ -- Unit 193 <unit193 at ubuntu.com>  Mon, 24 Jul 2017 02:14:23 -0400
+
 ruby-net-sftp (1:2.1.2-3) unstable; urgency=medium
 
   * Upload to unstable now that jessie is released.
diff --git a/debian/patches/add_net-ssh_4.0_compatibility.patch b/debian/patches/add_net-ssh_4.0_compatibility.patch
new file mode 100644
index 0000000..d71b285
--- /dev/null
+++ b/debian/patches/add_net-ssh_4.0_compatibility.patch
@@ -0,0 +1,42 @@
+Description: Fix compatiblity with net-ssh 4.0+
+Origin: Upstream, https://github.com/net-ssh/net-sftp/commit/9870b32d31bbe5cddceead54c64f71e4fd91779e
+Author: Vít Ondruch <vondruch at redhat.com>
+Bug-Debian: https://bugs.debian.org/869174
+
+---
+ test/test_download.rb | 4 +++-
+ test/test_session.rb  | 6 ++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_download.rb b/test/test_download.rb
+index d4a5f0b..d9582b6 100644
+--- a/test/test_download.rb
++++ b/test/test_download.rb
+@@ -139,7 +139,9 @@ def test_download_file_should_transfer_remote_to_local_buffer
+ 
+   def test_download_directory_to_buffer_should_fail
+     expect_sftp_session :server_version => 3
+-    assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
++    Net::SSH::Test::Extensions::IO.with_test_extension do
++      assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
++    end
+   end
+ 
+   private
+diff --git a/test/test_session.rb b/test/test_session.rb
+index a59058a..c398436 100644
+--- a/test/test_session.rb
++++ b/test/test_session.rb
+@@ -660,8 +660,10 @@ def test_unblock_bang_should_block_and_return_response
+ 
+     def assert_not_implemented(server_version, command, *args)
+       expect_sftp_session :server_version => 1
+-      sftp.connect!
+-      assert_raises(NotImplementedError) { sftp.send(command, *args) }
++      Net::SSH::Test::Extensions::IO.with_test_extension do
++        sftp.connect!
++        assert_raises(NotImplementedError) { sftp.send(command, *args) }
++      end
+     end
+ 
+     def assert_command_with_callback(command, *args)
diff --git a/debian/patches/series b/debian/patches/series
index a4838fc..6bc8f56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-gem-in-tests.patch
 disable_test_triggering_mocha_bug_690562.patch
+add_net-ssh_4.0_compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-net-sftp.git