From dff50cb13fa93198e584a0fd97692a7854a20a1746287f0bb5f59d19a5241a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Thu, 14 May 2020 19:32:50 +0000
Subject: [PATCH] Accepting request 805578 from
 home:dancermak:branches:Virtualization:vagrant

Also bump the version of net-sftp to ~> 3.0

OBS-URL: https://build.opensuse.org/request/show/805578
OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=43
---
 ...-of-net-ssh-to-6.0-and-net-sftp-to-3.0.patch | 17 ++++++++++-------
 ...ck-out-guest-capabilities-instead-of-r.patch |  2 +-
 vagrant.changes                                 |  2 +-
 vagrant.spec                                    | 12 +++++++-----
 4 files changed, 19 insertions(+), 14 deletions(-)
 rename 0010-Bump-version-of-net-ssh-to-6.0.patch => 0010-Bump-version-of-net-ssh-to-6.0-and-net-sftp-to-3.0.patch (54%)

diff --git a/0010-Bump-version-of-net-ssh-to-6.0.patch b/0010-Bump-version-of-net-ssh-to-6.0-and-net-sftp-to-3.0.patch
similarity index 54%
rename from 0010-Bump-version-of-net-ssh-to-6.0.patch
rename to 0010-Bump-version-of-net-ssh-to-6.0-and-net-sftp-to-3.0.patch
index 5d10bc3..1343912 100644
--- a/0010-Bump-version-of-net-ssh-to-6.0.patch
+++ b/0010-Bump-version-of-net-ssh-to-6.0-and-net-sftp-to-3.0.patch
@@ -1,25 +1,28 @@
-From ad290684e23ccb0cfd232983f72fc01affb77058 Mon Sep 17 00:00:00 2001
+From 51af48f8f2ae39ef682d4310970c87b17bb72780 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Mon, 11 May 2020 11:32:01 +0200
-Subject: [PATCH 10/11] Bump version of net-ssh to ~> 6.0
+Subject: [PATCH 10/11] Bump version of net-ssh to ~> 6.0 and net-sftp to ~>
+ 3.0
 
 ---
- vagrant.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ vagrant.gemspec | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 49fdf2e8e..36709b74b 100644
+index 49fdf2e8e..78bb2b8b5 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
-@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
+@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
    s.add_dependency "listen", "~> 3.1.5"
    s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
    s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
 -  s.add_dependency "net-ssh", "~> 5.2.0"
+-  s.add_dependency "net-sftp", "~> 2.1"
 +  s.add_dependency "net-ssh", "~> 6.0"
-   s.add_dependency "net-sftp", "~> 2.1"
++  s.add_dependency "net-sftp", "~> 3.0"
    s.add_dependency "net-scp", "~> 1.2.0"
    s.add_dependency "rb-kqueue", "~> 0.2.0"
+   s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
 -- 
 2.26.2
 
diff --git a/0011-Fixes-11606-Mock-out-guest-capabilities-instead-of-r.patch b/0011-Fixes-11606-Mock-out-guest-capabilities-instead-of-r.patch
index 5c74b88..d83f4c7 100644
--- a/0011-Fixes-11606-Mock-out-guest-capabilities-instead-of-r.patch
+++ b/0011-Fixes-11606-Mock-out-guest-capabilities-instead-of-r.patch
@@ -1,4 +1,4 @@
-From cb0fbcd3968efe6b46fcf15ca8ec6ef950b55dd0 Mon Sep 17 00:00:00 2001
+From e4b3e72c9a267097e803db8b1b936523ee84ce0b Mon Sep 17 00:00:00 2001
 From: Brian Cain <bcain@hashicorp.com>
 Date: Mon, 11 May 2020 08:01:29 -0700
 Subject: [PATCH 11/11] Fixes #11606: Mock out guest capabilities instead of
diff --git a/vagrant.changes b/vagrant.changes
index 39529c7..7ad7584 100644
--- a/vagrant.changes
+++ b/vagrant.changes
@@ -23,7 +23,7 @@ Mon May 11 17:58:59 UTC 2020 - Dan Čermák <dcermak@suse.com>
   * 0009-Disable-Subprocess-unit-test.patch
 
   Add patch:
-  * 0010-Bump-version-of-net-ssh-to-6.0.patch
+  * 0010-Bump-version-of-net-ssh-to-6.0-and-net-sftp-to-3.0.patch
   * 0011-Fixes-11606-Mock-out-guest-capabilities-instead-of-r.patch
 
   - Fix various issues when building vagrant with a non-default ruby version
diff --git a/vagrant.spec b/vagrant.spec
index d219887..b97f2bc 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -55,7 +55,7 @@ Patch6:         0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
 Patch7:         0007-Don-t-abuse-relative-paths-in-plugins.patch
 Patch8:         0008-Skip-failing-tests.patch
 Patch9:         0009-Disable-Subprocess-unit-test.patch
-Patch10:        0010-Bump-version-of-net-ssh-to-6.0.patch
+Patch10:        0010-Bump-version-of-net-ssh-to-6.0-and-net-sftp-to-3.0.patch
 # Drop this on the next upstream release after 2.2.9
 # upstream fix from https://github.com/hashicorp/vagrant/pull/11607
 Patch11:        0011-Fixes-11606-Mock-out-guest-capabilities-instead-of-r.patch
@@ -114,8 +114,9 @@ BuildConflicts:  %{rubygem log4r:1.1 >= 1.1.11 }
 # PATCHED
 #  s.add_dependency "net-ssh", "~> 6.0"
 BuildRequires:  %{rubygem net-ssh:6 }
-#  s.add_dependency "net-sftp", "~> 2.1"
-BuildRequires:  %{rubygem net-sftp:2 >= 2.1 }
+# PATCHED
+#  s.add_dependency "net-sftp", "~> 3.0"
+BuildRequires:  %{rubygem net-sftp:3 }
 #  s.add_dependency "net-scp", "~> 1.2.0"
 BuildRequires:  %{rubygem net-scp:1.2 }
 #  s.add_dependency "rb-kqueue", "~> 0.2.0"
@@ -201,8 +202,9 @@ Requires:       %{rubygem log4r:1.1 < 1.1.11 }
 # PATCHED
 #  s.add_dependency "net-ssh", "~> 6.0"
 Requires:       %{rubygem net-ssh:6}
-#  s.add_dependency "net-sftp", "~> 2.1"
-Requires:       %{rubygem net-sftp:2 >= 2.1}
+# PATCHED
+#  s.add_dependency "net-sftp", "~> 3.0"
+Requires:       %{rubygem net-sftp:3 }
 #  s.add_dependency "net-scp", "~> 1.2.0"
 Requires:       %{rubygem net-scp:1.2 >= 1.2.0}
 #  s.add_dependency "rb-kqueue", "~> 0.2.0"