Accepting request 768994 from Virtualization:vagrant

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

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

@@ -1,7 +1,7 @@
-From e1a0054ceecffce9b3ef389d5b4b9bf85f309351 Mon Sep 17 00:00:00 2001
+From 2aceecad34427d322bb011e5964a3c7d5818c3ae 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/16] bin/vagrant: silence warning about installer
+Subject: [PATCH 01/12] bin/vagrant: silence warning about installer
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---
@@ -36,5 +36,5 @@ index 0e6abdcef..9b9233397 100755
    #
    # Unset  - Disables experimental features
 -- 
-2.24.0
+2.25.0
 

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

@@ -1,7 +1,7 @@
-From 2e3ac8696235e4239977c10e78474de1b1cbccd8 Mon Sep 17 00:00:00 2001
+From 3f9506dee9cfe960b593ba9d28786fe3b5164643 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/16] Use a private temporary dir
+Subject: [PATCH 02/12] Use a private temporary dir
 
 Without this vagrant will clutter $TMPDIR with dozens of even hundreds
 of temporary files (~4 per vagrant invocation).
@@ -94,5 +94,5 @@ index 000000000..0cbbb53ac
 +  FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir)
 +end
 -- 
-2.24.0
+2.25.0
 

0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch

@@ -1,7 +1,7 @@
-From 5323b2746d765bee3fd9aa739bf3d0e120eb1874 Mon Sep 17 00:00:00 2001
+From 86b44992811600404c8d967a6e74910396ff874e Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro@softwarelivre.org>
 Date: Tue, 3 Feb 2015 10:35:17 -0200
-Subject: [PATCH 03/16] linux/cap/halt: don't wait for `shutdown -h now` to
+Subject: [PATCH 03/12] linux/cap/halt: don't wait for `shutdown -h now` to
  finish
 
 When running a Debian 8 lxc guest (with the vagrant-lxc plugin), which
@@ -27,5 +27,5 @@ index 60dc5dde4..657636eaf 100644
              # Do nothing, because it probably means the machine shut down
              # and SSH connection was lost.
 -- 
-2.24.0
+2.25.0
 

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

@@ -1,7 +1,7 @@
-From 399ed85dc12e70156c6fa40a49e35110ad6fcff4 Mon Sep 17 00:00:00 2001
+From e589e6be6b7697717fcae15428e443b9be0fd629 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 04/16] plugins-don-t-abuse-require_relative.patch
+Subject: [PATCH 04/12] plugins-don-t-abuse-require_relative.patch
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---
@@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644
  module VagrantPlugins
    module GuestSUSE
 -- 
-2.24.0
+2.25.0
 

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

@@ -1,7 +1,7 @@
-From ccaab429a383ff048400a866f3aa77409ae4976d Mon Sep 17 00:00:00 2001
+From d6b0b98c0eabc78da7c97839630235fa9ed32075 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 05/16] fix vbox package boo#1044087, added by
+Subject: [PATCH 05/12] 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>
@@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644
  module VagrantPlugins
    module ProviderVirtualBox
 -- 
-2.24.0
+2.25.0
 

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

@@ -1,7 +1,7 @@
-From 98c990b8b57849464a4e1773689635a2328da89e Mon Sep 17 00:00:00 2001
+From 486c955ffe349c52ab5a4cfd831b09df83de88bf 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 06/16] do not depend on wdm
+Subject: [PATCH 06/12] do not depend on wdm
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---
@@ -9,17 +9,17 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
  1 file changed, 1 deletion(-)
 
 diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 2ca4a6972..c7a2d436c 100644
+index baae3f486..fb2925da5 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
-@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
+@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
    s.add_dependency "rb-kqueue", "~> 0.2.0"
    s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
-   s.add_dependency "rubyzip", "~> 1.2.2"
+   s.add_dependency "rubyzip", "~> 1.3"
 -  s.add_dependency "wdm", "~> 0.1.0"
    s.add_dependency "winrm", "~> 2.1"
    s.add_dependency "winrm-fs", "~> 1.0"
    s.add_dependency "winrm-elevated", "~> 1.1"
 -- 
-2.24.0
+2.25.0
 

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

@@ -1,7 +1,7 @@
-From 63325a25be5349141e628f4d8738cd66cf2eff69 Mon Sep 17 00:00:00 2001
+From e4c16b7f40c37f08f431f84ac8f6994e5dfbd771 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 07/16] do not abuse relative paths in docker plugin to make
+Subject: [PATCH 07/12] 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>
@@ -22,5 +22,5 @@ index 07c4e5333..e8142df8b 100644
  module VagrantPlugins
    module DockerProvider
 -- 
-2.24.0
+2.25.0
 

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

@@ -1,7 +1,7 @@
-From 6cabd408fd06b60b0b0c74c93da9fea05e8b0339 Mon Sep 17 00:00:00 2001
+From 977541aad0f8711d080938c491f3567819c02ab2 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 08/16] Don't abuse relative paths in plugins
+Subject: [PATCH 08/12] Don't abuse relative paths in plugins
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -64,5 +64,5 @@ index 7bc8ceca0..e938305e7 100644
  require_relative "../installer"
  
 -- 
-2.24.0
+2.25.0
 

0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch

@@ -1,7 +1,7 @@
-From e1eaa4583e58d802f0c2339c959b5becb6a2c49f Mon Sep 17 00:00:00 2001
+From c388ca93ac0254cb2e635558e90e57a9cd93cb69 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Thu, 14 Mar 2019 00:25:05 +0100
-Subject: [PATCH 09/16] Fix unit tests for GuestLinux::Cap::Halt
+Subject: [PATCH 09/12] Fix unit tests for GuestLinux::Cap::Halt
 
 This test fails since we patch `shutdown -h now` to be `shutdown -h now &`
 instead.
@@ -37,5 +37,5 @@ index 81f682aa1..70d2603b9 100644
          cap.halt(machine)
        }.to_not raise_error
 -- 
-2.24.0
+2.25.0
 

0010-Skip-failing-tests.patch

@@ -1,7 +1,7 @@
-From 85808a200ea1a95f00edc2af816ae3f124dc1962 Mon Sep 17 00:00:00 2001
+From af5720555a656230e30333d592c84de50737a2bc 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 10/16] Skip failing tests
+Subject: [PATCH 10/12] Skip failing tests
 
 ---
  test/unit/bin/vagrant_test.rb | 4 ++--
@@ -30,5 +30,5 @@ index 08edcb20e..a6bef731d 100644
        end
      end
 -- 
-2.24.0
+2.25.0
 

0011-Bump-rspec-its-dependency.patch

@@ -1,25 +0,0 @@
-From 79bdf20d3c293293730548f20e329f3c726f5091 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
-Date: Wed, 17 Jul 2019 10:59:07 +0200
-Subject: [PATCH 11/16] Bump rspec-its dependency
-
----
- vagrant.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index c7a2d436c..04561f9c9 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
-   # from within rspec
-   s.add_development_dependency "rake", "~> 12.0.0"
-   s.add_development_dependency "rspec", "~> 3.5.0"
--  s.add_development_dependency "rspec-its", "~> 1.2.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"
- 
--- 
-2.24.0
-

0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch

@@ -1,7 +1,7 @@
-From 7784ec13f12752f5b73ddec371cb73b6dd97615a Mon Sep 17 00:00:00 2001
+From d8a6e1573ee0b845b851c760ceced71f250e9576 Mon Sep 17 00:00:00 2001
 From: Pavel Valena <pvalena@redhat.com>
 Date: Mon, 1 Jul 2019 17:44:54 +0200
-Subject: [PATCH 12/16] Do not list / load dependencies if `vagrant` spec is
+Subject: [PATCH 11/12] Do not list / load dependencies if `vagrant` spec is
  not loaded
 
 in `vagrant_internal_specs` as this fails, due to `find` returning `nil`.
@@ -26,5 +26,5 @@ index 7ba48435f..c0fabdcea 100644
        list = {}
        directories = [Gem::Specification.default_specifications_dir]
 -- 
-2.24.0
+2.25.0
 

0012-Disable-Subprocess-unit-test.patch

@@ -1,9 +1,9 @@
-From 75b7fca0c98396ee755c329f002c8e2afa18dae0 Mon Sep 17 00:00:00 2001
+From 5625949476713ea00facfc87f8ce4c42e751f216 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 15/16] [ARM only] Disable Subprocess unit test
+Subject: [PATCH 12/12] Disable Subprocess unit test
 
-This unit test is *very* flaky on OBS' ARM workers and causes random build
+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
 scheduling oddly.
 ---
@@ -33,5 +33,5 @@ index 81da0e635..a2a2270a0 100644
          sleep(0.1)
          expect(sp.stop).to be(true)
 -- 
-2.24.0
+2.25.0
 

0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch

@@ -1,47 +0,0 @@
-From bc275fb74fbb6948246427549f04f0a4323a1747 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
-Date: Thu, 24 Oct 2019 12:29:43 +0200
-Subject: [PATCH 13/16] Catch NetworkNoInterfaces error in docker
- prepare_networks_test
-
-The test "generates a network name and configuration" calls at the end
-`process_public_network()`, which can return an empty list if the currently
-executing machine has no usable network interfaces (this is typically the case
-for workers that build rpm packages in OBS or Koji). This results in an
-exception of type Errors::NetworkNoInterfaces to be thrown and causing this test
-to fail.
-
-This commit wraps this call in a rescue block to supress this failure.
----
- .../providers/docker/action/prepare_networks_test.rb     | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/test/unit/plugins/providers/docker/action/prepare_networks_test.rb b/test/unit/plugins/providers/docker/action/prepare_networks_test.rb
-index 524db9533..3461c3e05 100644
---- a/test/unit/plugins/providers/docker/action/prepare_networks_test.rb
-+++ b/test/unit/plugins/providers/docker/action/prepare_networks_test.rb
-@@ -1,5 +1,6 @@
- require_relative "../../../../base"
- require_relative "../../../../../../plugins/providers/docker/action/prepare_networks"
-+require_relative "../../../../../../plugins/providers/docker/errors"
- 
- describe VagrantPlugins::DockerProvider::Action::PrepareNetworks do
-   include_context "unit"
-@@ -343,8 +344,12 @@ describe VagrantPlugins::DockerProvider::Action::PrepareNetworks do
-       allow(driver).to receive(:network_containing_address).
-         with("10.1.10.2").and_return("vagrant_network_public")
- 
--      network_name, network_options = subject.process_public_network(options, {}, env)
--      expect(network_name).to eq("vagrant_network_public")
-+      begin
-+        network_name, network_options = subject.process_public_network(options, {}, env)
-+        expect(network_name).to eq("vagrant_network_public")
-+      rescue VagrantPlugins::DockerProvider::Errors::NetworkNoInterfaces
-+        # we are running inside a VM without valid network interfaces
-+      end
-     end
-   end
- 
--- 
-2.24.0
-

0014-Bump-rubyzip-version-to-fix-CVE-2019-16892.patch

@@ -1,25 +0,0 @@
-From e8c23f99c5097199b7d955268e1c97314d25480b Mon Sep 17 00:00:00 2001
-From: Stefan Sundin <git@stefansundin.com>
-Date: Wed, 6 Nov 2019 20:37:56 -0800
-Subject: [PATCH 14/16] Bump rubyzip version to fix CVE-2019-16892.
-
----
- vagrant.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 04561f9c9..58b4cb7ad 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
-   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"
--  s.add_dependency "rubyzip", "~> 1.2.2"
-+  s.add_dependency "rubyzip", "~> 1.3"
-   s.add_dependency "winrm", "~> 2.1"
-   s.add_dependency "winrm-fs", "~> 1.0"
-   s.add_dependency "winrm-elevated", "~> 1.1"
--- 
-2.24.0
-

0016-Ensure-nfsd-call-is-mocked-up-in-BSD-NFS-test.patch

@@ -1,26 +0,0 @@
-From fc3450130149046e30c618508bf9019a7272b783 Mon Sep 17 00:00:00 2001
-From: Brian Cain <bcain@hashicorp.com>
-Date: Fri, 25 Oct 2019 09:02:30 -0700
-Subject: [PATCH 16/16] Ensure nfsd call is mocked up in BSD NFS test
-
----
- test/unit/plugins/hosts/bsd/cap/nfs_test.rb | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/test/unit/plugins/hosts/bsd/cap/nfs_test.rb b/test/unit/plugins/hosts/bsd/cap/nfs_test.rb
-index 51c125484..d3745c6e6 100644
---- a/test/unit/plugins/hosts/bsd/cap/nfs_test.rb
-+++ b/test/unit/plugins/hosts/bsd/cap/nfs_test.rb
-@@ -21,6 +21,9 @@ describe VagrantPlugins::HostBSD::Cap::NFS do
-       allow(described_class).to receive(:system)
-       allow(File).to receive(:writable?).with("/etc/exports")
-       allow(ui).to receive(:info)
-+
-+      allow(Vagrant::Util::Subprocess).to receive(:execute).with("nfsd", "checkexports").
-+        and_return(Vagrant::Util::Subprocess::Result.new(0, "", ""))
-     end
- 
-     it "should execute successfully when no folders are defined" do
--- 
-2.24.0
-

vagrant-2.2.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bdafbce594cb17b9b4a7d85ba3dc35093d6693b1717280e062ec64ca2c05a5b
-size 1285530

vagrant-2.2.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9229f6eba67dd51dfd6125dc578d1d0d724f2620f7d9a68cd46fa886df061fc
+size 2173893

vagrant.changes

@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Tue Jan 28 10:46:16 UTC 2020 - Dan Čermák <dcermak@suse.com>
+
+- New upstream release 2.2.7
+
+  IMPROVEMENTS:
+
+  - guest/opensuse: Check for basename hostname prior to setting hostname [GH-11170]
+  - host/linux: Check for modinfo in /sbin if it's not on PATH [GH-11178]
+  - core: Show guest name in hostname error message [GH-11175]
+  - provisioners/shell: Linux guests now support `reboot` option [GH-11194]
+  - darwin/nfs: Put each NFS export on its own line [GH-11216]
+  - contrib/bash: Add more completion flags to up command [GH-11223]
+  - provider/virtualbox: Add VirtualBox provider support for version 6.1.x [GH-11250]
+  - box/outdated: Allow to force check for box updates and ignore cached check [GH-11231]
+  - guest/alpine: Update apk cache when installing rsync [GH-11220]
+  - provider/virtualbox: Improve error message when machine folder is inaccessible [GH-11239]
+  - provisioner/ansible_local: Add pip install method for arch guests [GH-11265]
+  - communicators/winssh: Use Windows shell for `vagrant ssh -c` [GH-11258]
+
+  BUG FIXES:
+
+  - command/snapshot/save: Fix regression that prevented snapshot of all guests in environment [GH-11152]
+  - core: Update UI to properly retain newlines when adding prefix [GH-11126]
+  - core: Check if box update is available locally [GH-11188]
+  - core: Ensure Vagrant::Errors are loaded in file_checksum util [GH-11183]
+  - cloud/publish: Improve argument handling for missing arguments to command [GH-11184]
+  - core: Get latest version for current provider during outdated check [GH-11192]
+  - linux/nfs: avoid adding extra newlines to /etc/exports [GH-11201]
+  - guest/darwin: Fix VMware synced folders on APFS [GH-11267]
+  - guest/redhat: Ensure `nfs-server` is restarted when installing nfs client [GH-11212]
+  - core: Do not validate checksums if options are empty string [GH-11211]
+  - provider/docker: Enhance docker build method to match against buildkit output [GH-11205]
+  - provisioner/ansible_local: Don't prompt for input when installing Ansible on Ubuntu and Debian [GH-11191]
+  - provisioner/ansible_local: Ensure all guest caps accept all passed in arguments [GH-11265]
+  - host/windows: Fix regression that prevented port collisions from being detected [GH-11244]
+  - core/provisioner: Set top level provisioner name if set in a provisioner config [GH-11295]
+
+  Rebased patches:
+  * 0001-bin-vagrant-silence-warning-about-installer.patch
+  * 0002-Use-a-private-temporary-dir.patch
+  * 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
+  * 0004-plugins-don-t-abuse-require_relative.patch.patch
+  * 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
+  * 0006-do-not-depend-on-wdm.patch
+  * 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
+  * 0008-Don-t-abuse-relative-paths-in-plugins.patch
+  * 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
+  * 0010-Skip-failing-tests.patch
+
+  Dropped patches:
+  * 0011-Bump-rspec-its-dependency.patch
+    (upstreamed)
+  * 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
+    (rebased as 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch)
+  * 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch
+    (upstreamed)
+  * 0014-Bump-rubyzip-version-to-fix-CVE-2019-16892.patch
+    (upstreamed)
+  * 0015-ARM-only-Disable-Subprocess-unit-test.patch
+    (rebased as 0012-Disable-Subprocess-unit-test.patch)
+  * 0016-Ensure-nfsd-call-is-mocked-up-in-BSD-NFS-test.patch
+    (upstreamed)
+
+  Added patches:
+  * 0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
+  * 0012-Disable-Subprocess-unit-test.patch
+
 -------------------------------------------------------------------
 Thu Dec 19 11:22:33 UTC 2019 - Dan Čermák <dcermak@suse.com>
 

vagrant.spec

@@ -26,7 +26,7 @@
 
 
 Name:           vagrant
-Version:        2.2.6
+Version:        2.2.7
 Release:        0
 Summary:        Tool for building and distributing virtualized development environments
 License:        MIT
@@ -58,18 +58,9 @@ Patch7:         0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
 Patch8:         0008-Don-t-abuse-relative-paths-in-plugins.patch
 Patch9:         0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
 Patch10:        0010-Skip-failing-tests.patch
-# FIXME: merged, drop at next release after v2.2.6
-# https://github.com/hashicorp/vagrant/pull/10991
-Patch11:        0011-Bump-rspec-its-dependency.patch
-# FIXME: merged, drop at next release after v2.2.6
 # https://github.com/hashicorp/vagrant/pull/10945
-Patch12:        0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
+Patch11:        0011-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
-Patch13:        0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch
+Patch12:        0012-Disable-Subprocess-unit-test.patch
-# FIXME: upstream fix, drop at next release after v2.2.6
-Patch14:        0014-Bump-rubyzip-version-to-fix-CVE-2019-16892.patch
-Patch15:        0015-ARM-only-Disable-Subprocess-unit-test.patch
-# FIXME: upstream fix, drop at the next release after v2.2.6
-Patch16:        0016-Ensure-nfsd-call-is-mocked-up-in-BSD-NFS-test.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -104,8 +95,8 @@ BuildRequires:  %{rubygem childprocess:0.6 }
 BuildRequires:  %{rubygem ed25519:1.2 >= 1.2.4 }
 #  s.add_dependency "erubis", "~> 2.7.0"
 BuildRequires:  %{rubygem erubis:2.7 }
-#  s.add_dependency "i18n", "~> 1.1.1"
+#  s.add_dependency "i18n", "~> 1.1"
-BuildRequires:  %{rubygem i18n:1.1 >= 1.1.1 }
+BuildRequires:  %{rubygem i18n:1 >= 1.1 }
 #  s.add_dependency "listen", "~> 3.1.5"
 BuildRequires:  %{rubygem listen:3.1 >= 3.1.5 }
 #  s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
@@ -142,7 +133,6 @@ BuildRequires:  %{rubygem vagrant_cloud:2.0 >= 2.0.3 }
 BuildRequires:  %{rubygem rake:12.0 }
 #  s.add_development_dependency "rspec", "~> 3.5.0"
 BuildRequires:  %{rubygem rspec:3.5 }
-# FIXME: PATCHED
 #  s.add_development_dependency "rspec-its", "~> 1.3.0"
 BuildRequires:  %{rubygem rspec-its:1.3 }
 #  s.add_dependency "ruby_dep", "<= 1.3.1"
@@ -188,8 +178,8 @@ Requires:       %{rubygem childprocess:0.6}
 Requires:       %{rubygem ed25519:1.2 >= 1.2.4}
 #  s.add_dependency "erubis", "~> 2.7.0"
 Requires:       %{rubygem erubis:2.7}
-#  s.add_dependency "i18n", "~> 1.1.1"
+#  s.add_dependency "i18n", "~> 1.1"
-Requires:       %{rubygem i18n:1.1 >= 1.1.1}
+Requires:       %{rubygem i18n:1 >= 1.1}
 #  s.add_dependency "listen", "~> 3.1.5"
 Requires:       %{rubygem listen >= 3.1.5}
 #  s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
@@ -281,26 +271,7 @@ BuildArch:      noarch
 Optional dependency offering bash completion for vagrant
 
 %prep
-%setup -q -n %{mod_full_name}
+%autosetup -p1 -n %{mod_full_name}
-%patch1 -p 1
-%patch2 -p 1
-%patch3 -p 1
-%patch4 -p 1
-%patch5 -p 1
-%patch6 -p 1
-%patch7 -p 1
-%patch8 -p 1
-%patch9 -p 1
-%patch10 -p 1
-%patch11 -p 1
-%patch12 -p 1
-%patch13 -p 1
-%patch14 -p 1
-# disable the subprocess test only on ARM
-%ifarch %{arm} aarch64
-%patch15 -p 1
-%endif
-%patch16 -p 1
 
 cp %{SOURCE98} .