Accepting request 904482 from Virtualization:vagrant

OBS-URL: https://build.opensuse.org/request/show/904482
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=35

0001-bin-vagrant-silence-warning-about-installer.patch

@@ -1,7 +1,7 @@
 From 6c2fcc93f7016ca2d816467327a33eb347cc1498 Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro@debian.org>
 Date: Sat, 11 Oct 2014 16:54:58 -0300
-Subject: [PATCH 01/12] bin/vagrant: silence warning about installer
+Subject: [PATCH 01/15] bin/vagrant: silence warning about installer
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---

0002-Use-a-private-temporary-dir.patch

@@ -1,7 +1,7 @@
 From 14c959018fc2e7d9fe6d5d396971a115efbdc71e Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro@debian.org>
 Date: Wed, 22 Oct 2014 09:40:14 -0200
-Subject: [PATCH 02/12] Use a private temporary dir
+Subject: [PATCH 02/15] Use a private temporary dir
 
 Without this vagrant will clutter $TMPDIR with dozens of even hundreds
 of temporary files (~4 per vagrant invocation).

0003-plugins-don-t-abuse-require_relative.patch.patch

@@ -1,7 +1,7 @@
 From 5d0d5df6dcb54c5b423cbfa60c7e5eaccce380c9 Mon Sep 17 00:00:00 2001
 From: Johannes Kastl <kastl@b1-systems.de>
 Date: Wed, 17 May 2017 09:09:57 +0200
-Subject: [PATCH 03/12] plugins-don-t-abuse-require_relative.patch
+Subject: [PATCH 03/15] plugins-don-t-abuse-require_relative.patch
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---

0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch

@@ -1,7 +1,7 @@
 From 47cf5abe6ea46220b2d260e3e0fd07b42efa42ae Mon Sep 17 00:00:00 2001
 From: Johannes Kastl <kastl@b1-systems.de>
 Date: Fri, 16 Nov 2018 21:12:43 +0100
-Subject: [PATCH 04/12] fix vbox package boo#1044087, added by
+Subject: [PATCH 04/15] fix vbox package boo#1044087, added by
  robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>

0005-do-not-depend-on-wdm.patch

@@ -1,7 +1,7 @@
 From c596dcd5e7bb3ab6bbdcbc9d21b640d828aa0925 Mon Sep 17 00:00:00 2001
 From: Johannes Kastl <kastl@b1-systems.de>
 Date: Mon, 4 Jun 2018 09:18:23 +0200
-Subject: [PATCH 05/12] do not depend on wdm
+Subject: [PATCH 05/15] do not depend on wdm
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---

0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch

@@ -1,7 +1,7 @@
 From 9e4f4f017e58d7488de879037ee1564087c34008 Mon Sep 17 00:00:00 2001
 From: Johannes Kastl <kastl@b1-systems.de>
 Date: Fri, 16 Nov 2018 21:14:46 +0100
-Subject: [PATCH 06/12] do not abuse relative paths in docker plugin to make
+Subject: [PATCH 06/15] do not abuse relative paths in docker plugin to make
  docker work, added by tmkn@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>

0007-Don-t-abuse-relative-paths-in-plugins.patch

@@ -1,7 +1,7 @@
 From 79214e9936e35d2de125fe8d7c6fbbc424b4c054 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Fri, 11 Jan 2019 12:32:28 +0100
-Subject: [PATCH 07/12] Don't abuse relative paths in plugins
+Subject: [PATCH 07/15] Don't abuse relative paths in plugins
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

0008-Skip-failing-tests.patch

@@ -1,7 +1,7 @@
 From 39c3d177a8392eaed94be7a694f2f0c5df1e4ca0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Mon, 1 Apr 2019 17:28:31 +0200
-Subject: [PATCH 08/12] Skip failing tests
+Subject: [PATCH 08/15] Skip failing tests
 
 ---
  test/unit/bin/vagrant_test.rb | 4 ++--

0009-Disable-Subprocess-unit-test.patch

@@ -1,7 +1,7 @@
 From b9aba06ec4fb6c88f5109d1f79ed8820058c6077 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Wed, 28 Aug 2019 13:39:58 +0200
-Subject: [PATCH 09/12] Disable Subprocess unit test
+Subject: [PATCH 09/15] Disable Subprocess unit test
 
 This unit test is *very* flaky on OBS' workers and causes random build
 failures. These are probably caused by worker being under high load and then

0010-Bump-listen-version-to-3.5.patch

@@ -1,7 +1,7 @@
 From 8fb45fd30524c9286a027c44e12351ddaefecade Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Tue, 27 Apr 2021 10:27:11 +0200
-Subject: [PATCH 10/12] Bump listen version to ~> 3.5
+Subject: [PATCH 10/15] Bump listen version to ~> 3.5
 
 (cherry picked from commit 016911965d5f995a5d0a168069de7ded7b380ecb)
 ---

0011-Mock-the-PowerShell.executable-method-in-more-tests.patch

@@ -1,7 +1,7 @@
 From 2e76a77511d8c4f4ee1ea8cd2ee8ee5612316a07 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Fri, 30 Apr 2021 09:37:20 +0200
-Subject: [PATCH 11/12] Mock the PowerShell.executable method in more tests
+Subject: [PATCH 11/15] Mock the PowerShell.executable method in more tests
 
 On *nix systems we might not have powershell installed and then finding
 powershell.exe or pwsh.exe fails in some tests. If we instead mock

0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch

@@ -1,7 +1,7 @@
 From 60f35e059f92cb47a65a03066d34c2492160835e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Thu, 1 Jul 2021 09:31:50 +0200
-Subject: [PATCH 12/12] Use systemctl poweroff in the background instead of
+Subject: [PATCH 12/15] Use systemctl poweroff in the background instead of
  shutdown
 
 We have started seeing occasional shutdown failures on openSUSE Tumbleweed with

0013-Include-rexml-dependency.patch

@@ -0,0 +1,25 @@
+From fafa4d61f3581cdbdc7879cfd70f7dbbdc75f668 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <croberts@hashicorp.com>
+Date: Fri, 2 Jul 2021 14:38:25 -0700
+Subject: [PATCH 13/15] Include rexml dependency
+
+(cherry picked from commit cd7226c7bbf52fca6d57b7c7424f084bb2db29c7)
+---
+ vagrant.gemspec | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/vagrant.gemspec b/vagrant.gemspec
+index 8fef4319c..f35fc6d1d 100644
+--- a/vagrant.gemspec
++++ b/vagrant.gemspec
+@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
+   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 "rexml", "~> 3.2"
+   s.add_dependency "rubyzip", "~> 2.0"
+   s.add_dependency "vagrant_cloud", "~> 3.0.4"
+   s.add_dependency "winrm", ">= 2.3.4", "< 3.0"
+-- 
+2.31.1
+

0014-Bump-constraints-on-childprocess-and-net-scp.patch

@@ -0,0 +1,35 @@
+From e1c907b800488d192cbcf4cbe88ca396c2b4a5ae Mon Sep 17 00:00:00 2001
+From: Chris Roberts <croberts@hashicorp.com>
+Date: Fri, 2 Jul 2021 14:45:32 -0700
+Subject: [PATCH 14/15] Bump constraints on childprocess and net-scp
+
+(cherry picked from commit 24a00ee3b3472946d4c9235ff55f1d9416ab4577)
+---
+ vagrant.gemspec | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vagrant.gemspec b/vagrant.gemspec
+index f35fc6d1d..84572ce7c 100644
+--- a/vagrant.gemspec
++++ b/vagrant.gemspec
+@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
+   s.required_rubygems_version = ">= 1.3.6"
+ 
+   s.add_dependency "bcrypt_pbkdf", "~> 1.1"
+-  s.add_dependency "childprocess", "~> 4.0.0"
++  s.add_dependency "childprocess", "~> 4.1.0"
+   s.add_dependency "ed25519", "~> 1.2.4"
+   s.add_dependency "erubi"
+   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
+@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
+   s.add_dependency "mime-types", "~> 3.3"
+   s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
+   s.add_dependency "net-sftp", "~> 3.0"
+-  s.add_dependency "net-scp", "~> 1.2.0"
++  s.add_dependency "net-scp", "~> 3.0.0"
+   s.add_dependency "rb-kqueue", "~> 0.2.0"
+   s.add_dependency "rexml", "~> 3.2"
+   s.add_dependency "rubyzip", "~> 2.0"
+-- 
+2.31.1
+

0015-Remove-no-longer-required-gem-webmock.patch

@@ -0,0 +1,41 @@
+From ab9ea6f40c5de266009adfe9a580b5cf5e27e9f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
+Date: Tue, 6 Jul 2021 16:22:24 +0200
+Subject: [PATCH 15/15] Remove no longer required gem webmock
+
+This gem was added a long time ago and probably used to test the functionality
+that is now provided by the vagrant_cloud gem
+
+(cherry picked from commit db3859912408868a6a4597fd33c02a661a9e36a9)
+---
+ test/unit/base.rb | 1 -
+ vagrant.gemspec   | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/test/unit/base.rb b/test/unit/base.rb
+index 513ecdc6f..cd53144fb 100644
+--- a/test/unit/base.rb
++++ b/test/unit/base.rb
+@@ -3,7 +3,6 @@ require "rubygems"
+ 
+ # Gems
+ require "checkpoint"
+-require "webmock/rspec"
+ require "rspec/its"
+ 
+ # Require Vagrant itself so we can reference the proper
+diff --git a/vagrant.gemspec b/vagrant.gemspec
+index 84572ce7c..090e5d71b 100644
+--- a/vagrant.gemspec
++++ b/vagrant.gemspec
+@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
+   s.add_development_dependency "rake", "~> 13.0"
+   s.add_development_dependency "rspec", "~> 3.5.0"
+   s.add_development_dependency "rspec-its", "~> 1.3.0"
+-  s.add_development_dependency "webmock", "~> 2.3.1"
+   s.add_development_dependency "fake_ftp", "~> 0.1.1"
+ 
+   # The following block of code determines the files that should be included
+-- 
+2.31.1
+

vagrant.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Tue Jul  6 14:40:32 UTC 2021 - Dan Čermák <dcermak@suse.com>
+
+- Remove no longer required gem webmock
+
+  Rebase patches:
+  * 0001-bin-vagrant-silence-warning-about-installer.patch
+  * 0002-Use-a-private-temporary-dir.patch
+  * 0003-plugins-don-t-abuse-require_relative.patch.patch
+  * 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
+  * 0005-do-not-depend-on-wdm.patch
+  * 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
+  * 0007-Don-t-abuse-relative-paths-in-plugins.patch
+  * 0008-Skip-failing-tests.patch
+  * 0009-Disable-Subprocess-unit-test.patch
+  * 0010-Bump-listen-version-to-3.5.patch
+  * 0011-Mock-the-PowerShell.executable-method-in-more-tests.patch
+  * 0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch
+  * 0013-Include-rexml-dependency.patch
+  * 0014-Bump-constraints-on-childprocess-and-net-scp.patch
+
+  Added patch:
+  * 0015-Remove-no-longer-required-gem-webmock.patch
+
+-------------------------------------------------------------------
+Tue Jul  6 07:55:49 UTC 2021 - Dan Čermák <dcermak@suse.com>
+
+- Bump childprocess version
+
+  Rebase patches:
+  * 0001-bin-vagrant-silence-warning-about-installer.patch
+  * 0002-Use-a-private-temporary-dir.patch
+  * 0003-plugins-don-t-abuse-require_relative.patch.patch
+  * 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
+  * 0005-do-not-depend-on-wdm.patch
+  * 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
+  * 0007-Don-t-abuse-relative-paths-in-plugins.patch
+  * 0008-Skip-failing-tests.patch
+  * 0009-Disable-Subprocess-unit-test.patch
+  * 0010-Bump-listen-version-to-3.5.patch
+  * 0011-Mock-the-PowerShell.executable-method-in-more-tests.patch
+  * 0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch
+
+  Added patches:
+  * 0013-Include-rexml-dependency.patch
+  * 0014-Bump-constraints-on-childprocess-and-net-scp.patch
+
 -------------------------------------------------------------------
 Thu Jul  1 07:50:10 UTC 2021 - Dan Čermák <dcermak@suse.com>
 

vagrant.spec

@@ -64,8 +64,16 @@ Patch10:        0010-Bump-listen-version-to-3.5.patch
 # merged -> drop on next upstream release
 Patch11:        0011-Mock-the-PowerShell.executable-method-in-more-tests.patch
 # https://github.com/hashicorp/vagrant/pull/12439
+# merged -> drop on next upstream release
 Patch12:        0012-Use-systemctl-poweroff-in-the-background-instead-of-.patch
-
+# adds an explicit require of rubygem(rexml)
+# already in main, drop on next upstream release
+Patch13:        0013-Include-rexml-dependency.patch
+# bumps the versions of childprocess & net-scp
+# already in main, drop on next upstream release
+Patch14:        0014-Bump-constraints-on-childprocess-and-net-scp.patch
+# https://github.com/hashicorp/vagrant/pull/12442
+Patch15:        0015-Remove-no-longer-required-gem-webmock.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 # force only one ruby version
@@ -95,8 +103,9 @@ BuildRequires:  %{ruby:2 >= 2.5}
 BuildRequires:  %{rubygem bundler}
 #  s.add_dependency "bcrypt_pbkdf", "~> 1.1"
 BuildRequires:  %{rubygem bcrypt_pbkdf:1 >= 1.1 }
-#  s.add_dependency "childprocess", "~> 4.0.0"
+# PATCHED
-BuildRequires:  %{rubygem childprocess:4.0 }
+#  s.add_dependency "childprocess", "~> 4.1.0"
+BuildRequires:  %{rubygem childprocess:4.1 }
 #  s.add_dependency "ed25519", "~> 1.2.4"
 BuildRequires:  %{rubygem ed25519:1.2 >= 1.2.4 }
 #  s.add_dependency "erubi"
@@ -117,10 +126,13 @@ BuildRequires:  %{rubygem mime-types:3 >= 3.3 }
 BuildRequires:  %{rubygem net-ssh:6.1 >= 6.1.0 }
 #  s.add_dependency "net-sftp", "~> 3.0"
 BuildRequires:  %{rubygem net-sftp:3 }
-#  s.add_dependency "net-scp", "~> 1.2.0"
+# PATCHED
-BuildRequires:  %{rubygem net-scp:1.2 }
+#  s.add_dependency "net-scp", "~> 3.0.0"
+BuildRequires:  %{rubygem net-scp:3.0 }
 #  s.add_dependency "rb-kqueue", "~> 0.2.0"
 BuildRequires:  %{rubygem rb-kqueue:0.2 }
+#  s.add_dependency "rexml", "~> 3.2"
+BuildRequires:  %{rubygem rexml:3 >= 3.2 }
 #  s.add_dependency "rubyzip", "~> 2.0"
 BuildRequires:  %{rubygem rubyzip:2}
 # Intentionally removed, wdm only works on Windows
@@ -141,8 +153,6 @@ BuildRequires:  %{rubygem rake:13 }
 BuildRequires:  %{rubygem rspec:3.5 }
 #  s.add_development_dependency "rspec-its", "~> 1.3.0"
 BuildRequires:  %{rubygem rspec-its:1.3 }
-#  s.add_development_dependency "webmock", "~> 2.3.1"
-BuildRequires:  %{rubygem webmock:2.3 >= 2.3.1 }
 #  s.add_development_dependency "fake_ftp", "~> 0.1.1"
 BuildRequires:  %{rubygem fake_ftp:0.1 >= 0.1.1 }
 
@@ -182,8 +192,9 @@ BuildRequires:  fdupes
 
 #  s.add_dependency "bcrypt_pbkdf", "~> 1.1"
 Requires:       %{rubygem bcrypt_pbkdf:1 >= 1.1 }
-#    s.add_dependency "childprocess", "~> 4.0.0"
+# PATCHED
-Requires:       %{rubygem childprocess:4.0}
+#    s.add_dependency "childprocess", "~> 4.1.0"
+Requires:       %{rubygem childprocess:4.1}
 #   s.add_dependency "ed25519", "~> 1.2.4"
 Requires:       %{rubygem ed25519:1.2 >= 1.2.4}
 #  s.add_dependency "erubi"
@@ -204,10 +215,13 @@ Requires:       %{rubygem mime-types:3 >= 3.3}
 Requires:       %{rubygem net-ssh:6.1 >= 6.1.0 }
 #  s.add_dependency "net-sftp", "~> 3.0"
 Requires:       %{rubygem net-sftp:3 }
-#  s.add_dependency "net-scp", "~> 1.2.0"
+# PATCHED
-Requires:       %{rubygem net-scp:1.2 >= 1.2.0}
+#  s.add_dependency "net-scp", "~> 3.0.0"
+Requires:       %{rubygem net-scp:3.0 }
 #  s.add_dependency "rb-kqueue", "~> 0.2.0"
 Requires:       %{rubygem rb-kqueue:0.2}
+#  s.add_dependency "rexml", "~> 3.2"
+Requires:       %{rubygem rexml:3 >= 3.2 }
 #  s.add_dependency "rubyzip", "~> 2.0"
 Requires:       %{rubygem rubyzip:2}
 #   s.add_dependency "wdm", "~> 0.1.0"