- up to 2.1.2

diff --git a/checkpoint.patch b/checkpoint.patch
deleted file mode 100644 (file)
index 4a2afe5..0000000
--- a/checkpoint.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-enable checkpoint only if VAGRANT_CHECKPOINT_ENABLE=1 is set
-
---- vagrant-1.7.1/lib/vagrant/environment.rb~  2015-02-01 20:31:59.000000000 +0200
-+++ vagrant-1.7.1/lib/vagrant/environment.rb   2015-02-01 20:37:14.419051054 +0200
-@@ -5,7 +5,6 @@
- require 'set'
- require 'thread'
- 
--require "checkpoint"
- require 'log4r'
- 
- require 'vagrant/util/file_mode'
-@@ -134,12 +133,20 @@
-       @checkpoint_thr = Thread.new do
-         Thread.current[:result] = nil
- 
-+        # Must enable by env var
-+        if ENV["VAGRANT_CHECKPOINT_ENABLE"].to_s != ""
-+          @logger.info("checkpoint: not enabled from env var")
-+          next
-+        end
-+
-         # If we disabled checkpoint via env var, don't run this
-         if ENV["VAGRANT_CHECKPOINT_DISABLE"].to_s != ""
-           @logger.info("checkpoint: disabled from env var")
-           next
-         end
- 
-+              require "checkpoint"
-+
-         # If we disabled state and knowing what alerts we've seen, then
-         # disable the signature file.
-         signature_file = @data_dir.join("checkpoint_signature")
---- vagrant-1.7.3/vagrant.gemspec~     2015-08-19 15:49:31.000000000 +0300
-+++ vagrant-1.7.3/vagrant.gemspec      2015-08-19 15:49:47.733344521 +0300
-@@ -20,7 +20,6 @@
-   s.add_dependency "erubis", "~> 2.7.0"
-   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
-   s.add_dependency "listen", "~> 3.0.2"
--  s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
-   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
-   s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
-   s.add_dependency "net-sftp", "~> 2.1"

diff --git a/insert-key.patch b/insert-key.patch
index ad9f3831efd2a0480572b327b2e6ecb67a71fddc..1eb85108bf0d04878021e93a5e7dd84bd7807221 100644 (file)
--- a/insert-key.patch
+++ b/insert-key.patch
@@ -21,6 +21,6 @@ https://github.com/mitchellh/vagrant/pull/4707#issuecomment-132910396
          @password         = nil if @password == UNSET_VALUE
 -        @insert_key       = true if @insert_key == UNSET_VALUE
 +        @insert_key       = false if @insert_key == UNSET_VALUE
- 
-         if @private_key_path && !@private_key_path.is_a?(Array)
-           @private_key_path = [@private_key_path]
+         @keys_only        = true if @keys_only == UNSET_VALUE
+         @paranoid         = false if @paranoid == UNSET_VALUE
+         @verify_host_key  = false if @verify_host_key == UNSET_VALUE

diff --git a/listen.patch b/listen.patch
index 71eb7c574f7522119cdaef7b458d3166df58e2d8..f9374ef21109818909234722d462373df230b36e 100644 (file)
--- a/listen.patch
+++ b/listen.patch
@@ -9,11 +9,11 @@ https://github.com/guard/listen/releases/tag/v2.8.1
 --- vagrant-1.7.3/vagrant.gemspec~     2015-08-19 15:50:06.000000000 +0300
 +++ vagrant-1.7.3/vagrant.gemspec      2015-08-19 15:50:29.068750880 +0300
 @@ -19,7 +19,7 @@
-   s.add_dependency "childprocess", "~> 0.5.0"
+   s.add_dependency "childprocess", "~> 0.6.0"
    s.add_dependency "erubis", "~> 2.7.0"
    s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
--  s.add_dependency "listen", "~> 3.0.2"
+-  s.add_dependency "listen", "~> 3.1.5"
 +  s.add_dependency "listen", "~> 2.7.11"
+   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
    s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
-   s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
-   s.add_dependency "net-sftp", "~> 2.1"
+   s.add_dependency "net-ssh", "~> 4.2.0"

diff --git a/no-gems.patch b/no-gems.patch
index 66937415f37751c884e42cfbf8e5980ea9338f61..7c8bd20de6b83d4daae07991ffd8bd520e64b036 100644 (file)
--- a/no-gems.patch
+++ b/no-gems.patch
@@ -1,17 +1,15 @@
 --- vagrant-1.7.3/vagrant.gemspec      2015-08-19 15:49:13.811643302 +0300
 +++ vagrant-1.7.4/vagrant.gemspec      2015-08-19 16:56:50.654693192 +0300
-@@ -25,13 +25,8 @@
+@@ -25,12 +25,7 @@
+   s.add_dependency "net-ssh", "~> 4.2.0"
    s.add_dependency "net-sftp", "~> 2.1"
-   s.add_dependency "net-scp", "~> 1.1.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", "< 2.0"
+   s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
 -  s.add_dependency "wdm", "~> 0.1.0"
--  s.add_dependency "winrm", "~> 1.3"
--  s.add_dependency "winrm-fs", "~> 0.2.0"
+-  s.add_dependency "winrm", "~> 2.1"
+-  s.add_dependency "winrm-fs", "~> 1.0"
+-  s.add_dependency "winrm-elevated", "~> 1.1"
  
--  # We lock this down to avoid compilation issues.
--  s.add_dependency "nokogiri", "= 1.6.3.1"
-+  s.add_dependency "nokogiri", ">= 1.6.3.1"
- 
- 
-   s.add_development_dependency "rake"
+   # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions
+   # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5).

diff --git a/pld-chef-installed.patch b/pld-chef-installed.patch
index 2d65ce4c37b389143265f805bc1e1680885db484..d42e615faa7538e35fe372621c10ea6793b73878 100644 (file)
--- a/pld-chef-installed.patch
+++ b/pld-chef-installed.patch
@@ -4,7 +4,7 @@ https://github.com/mitchellh/vagrant/pull/6173
 
 --- vagrant-1.7.4/plugins/provisioners/chef/plugin.rb  2015-08-19 17:03:47.474659244 +0300
 +++ vagrant-1.7.4/plugins/provisioners/chef/plugin.rb  2015-08-19 17:28:22.723434523 +0300
-@@ -73,11 +73,21 @@
+@@ -73,6 +73,16 @@
          Cap::Redhat::ChefInstall
        end
  
@@ -13,19 +13,14 @@ https://github.com/mitchellh/vagrant/pull/6173
 +        Cap::PLD::ChefInstall
 +      end
 +
-       guest_capability(:omnios, :chef_installed) do
-         require_relative "cap/omnios/chef_installed"
-         Cap::OmniOS::ChefInstalled
-       end
- 
 +      guest_capability(:pld, :chef_installed) do
 +        require_relative "cap/pld/chef_installed"
 +        Cap::PLD::ChefInstalled
 +      end
 +
-       guest_capability(:omnios, :chef_install) do
-         require_relative "cap/omnios/chef_install"
-         Cap::OmniOS::ChefInstall
+       guest_capability(:suse, :chef_install) do
+         require_relative "cap/suse/chef_install"
+         Cap::Suse::ChefInstall
 --- /dev/null  2015-05-25 21:49:42.000000000 +0300
 +++ vagrant-1.7.4/plugins/provisioners/chef/cap/pld/chef_installed.rb  2015-08-19 17:02:22.571070868 +0300
 @@ -0,0 +1,22 @@

diff --git a/pld-networking.patch b/pld-networking.patch
deleted file mode 100644 (file)
index 7092aad..0000000
--- a/pld-networking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- /dev/null  2015-05-25 21:49:42.000000000 +0300
-+++ vagrant-1.7.4/plugins/guests/pld/cap/flavor.rb     2015-08-21 12:37:06.511699482 +0300
-@@ -0,0 +1,11 @@
-+module VagrantPlugins
-+  module GuestPld
-+    module Cap
-+      class Flavor
-+        def self.flavor(machine)
-+          return :pld
-+        end
-+      end
-+    end
-+  end
-+end
---- vagrant-1.7.4/plugins/guests/pld/plugin.rb~        2015-07-17 22:38:51.000000000 +0300
-+++ vagrant-1.7.4/plugins/guests/pld/plugin.rb 2015-08-21 12:39:33.651261462 +0300
-@@ -20,6 +20,11 @@
-         require_relative "cap/network_scripts_dir"
-         Cap::NetworkScriptsDir
-       end
-+
-+      guest_capability("pld", "flavor") do
-+        require_relative "cap/flavor"
-+        Cap::Flavor
-+      end
-     end
-   end
- end

diff --git a/vagrant.spec b/vagrant.spec
index 3fd5f40ca7d5d20d2e7461b501847ddc74228a3e..91d3c0f1b159b5c1277a88d099a88c06758b0119 100644 (file)
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -2,23 +2,21 @@
 # - release notes: https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md
 Summary:       Provisioning and deployment of virtual instances
 Name:          vagrant
-Version:       1.7.4
-Release:       6
+Version:       2.1.2
+Release:       1
 License:       MIT
 Group:         Applications/Emulators
 Source0:       https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 556b5e5594a327d46b63c4d8024db187
+# Source0-md5: 20b7a4a7b3e1bb4a57c8cac65a547ce7
 Source1:       %{name}.sh
 Patch1:                rubygems.patch
 Patch2:                no-warning.patch
 Patch3:                Vagrantfile.patch
 Patch4:                version.patch
 Patch5:                no-gems.patch
-Patch6:                checkpoint.patch
 Patch7:                insert-key.patch
 Patch8:                listen.patch
 Patch9:                pld-chef-installed.patch
-Patch10:       pld-networking.patch
 URL:           http://www.vagrantup.com/
 BuildRequires: bash
 BuildRequires: rpm-rubyprov
@@ -113,11 +111,9 @@ Ruby documentation for %{gem_name}
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 VERSION=$(cat version.txt)
 sed -i -e "s/__VERSION__/$VERSION/" lib/vagrant/version.rb