[packages/vagrant] up to 1.7.1

[glen]

commit 0c1cea983e291f3b0c173a4b8b83a87a7d044fd4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Dec 16 23:51:05 2014 +0200

    up to 1.7.1

 no-gems.patch                     | 16 ++++++++++------
 vagrant.spec                      |  6 +++---
 vagrantfile-shell-provision.patch | 38 +++++++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 26 deletions(-)
---
diff --git a/vagrant.spec b/vagrant.spec
index 58639fe..4c6b33c 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -2,14 +2,14 @@
 # - release notes: https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md
 Summary:	Provisioning and deployment of virtual instances
 Name:		vagrant
-Version:	1.7.0
+Version:	1.7.1
 # NOTE: test that it actually works before doing rel "1"
 Release:	0.1
 License:	MIT
 Group:		Applications/Emulators
 Source0:	https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	b47dcf57149736578116b7d0de25282f
-Source100:	runtime-broken
+# Source0-md5:	6bfb1440145f943e7b683ac99d06adec
+#Source100:	runtime-broken
 Patch0:		source_root.patch
 Patch1:		rubygems.patch
 Patch2:		no-warning.patch
diff --git a/no-gems.patch b/no-gems.patch
index cdaa3db..55321e2 100644
--- a/no-gems.patch
+++ b/no-gems.patch
@@ -1,13 +1,17 @@
---- vagrant-1.7.0/vagrant.gemspec~	2014-12-10 06:38:17.000000000 +0200
-+++ vagrant-1.7.0/vagrant.gemspec	2014-12-14 13:20:27.428207093 +0200
-@@ -25,10 +25,7 @@
+--- vagrant-1.7.1/vagrant.gemspec~	2014-12-16 23:39:18.000000000 +0200
++++ vagrant-1.7.1/vagrant.gemspec	2014-12-16 23:39:29.546304327 +0200
+@@ -25,13 +25,8 @@
    s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
    s.add_dependency "net-sftp", "~> 2.1"
    s.add_dependency "net-scp", "~> 1.1.0"
 -  s.add_dependency "rb-kqueue", "~> 0.2.0"
-   s.add_dependency "rest-client", "~> 1.7"
+   s.add_dependency "rest-client", ">= 1.6.0", "< 2.0"
 -  s.add_dependency "wdm", "~> 0.1.0"
 -  s.add_dependency "winrm", "~> 1.1.3"
+-
+-  # We lock this down to avoid compilation issues.
+-  s.add_dependency "nokogiri", "= 1.6.3.1"
++  s.add_dependency "nokogiri", ">= 1.6.3.1"
  
-   # We lock this down to avoid compilation issues.
-   s.add_dependency "nokogiri", "= 1.6.3.1"
+   s.add_development_dependency "rake"
+   s.add_development_dependency "rspec", "~> 2.14.0"
diff --git a/vagrantfile-shell-provision.patch b/vagrantfile-shell-provision.patch
index ab6bbff..7aec5ee 100644
--- a/vagrantfile-shell-provision.patch
+++ b/vagrantfile-shell-provision.patch
@@ -1,21 +1,25 @@
---- vagrant-1.3.4/templates/commands/init/Vagrantfile.erb~	2013-10-02 18:42:06.000000000 +0300
-+++ vagrant-1.3.4/templates/commands/init/Vagrantfile.erb	2013-11-07 22:01:54.574403429 +0200
-@@ -55,6 +55,18 @@
-   # View the documentation for the provider you're using for more
-   # information on available options.
+--- vagrant-1.7.1/templates/commands/init/Vagrantfile.erb	2014-12-16 23:38:23.939569458 +0200
++++ vagrant-1.7.1/templates/commands/init/Vagrantfile.erb	2014-12-16 23:48:35.584550814 +0200
+@@ -39,6 +39,10 @@
+   # your network.
+   # config.vm.network "public_network"
  
-+  # The shell provisioner allows you to upload and execute a script as the root
-+  # user within the guest machine.
-+  #
-+  # Shell provisioning is ideal for users new to Vagrant who want to get up and
-+  # running quickly and provides a strong alternative for users who aren't
-+  # comfortable with a full configuration management system such as Chef or
-+  # Puppet.
++  # If true, then any SSH connections made will enable agent forwarding.
++  # Default value: false
++  # config.ssh.forward_agent = true
++
+   # Share an additional folder to the guest VM. The first argument is
+   # the path on the host to the actual folder. The second argument is
+   # the path on the guest to mount the folder. And the optional third
+@@ -72,5 +76,9 @@
+   # documentation for more information about their specific syntax and use.
+-  # config.vm.provision "shell", inline <<-SHELL
+-  #   sudo apt-get install apache2
 +  #
 +  # http://docs.vagrantup.com/v2/provisioning/shell.html
 +  #
-+  # config.vm.provision :shell, :inline => "poldek -u chef --noask"
-+
-   # Enable provisioning with Puppet stand alone.  Puppet manifests
-   # are contained in a directory path relative to this Vagrantfile.
-   # You will need to create the manifests directory and a manifest in
++  # config.vm.provision "shell", inline: <<-SHELL
++  #   poldek -u chef --noask
+   # SHELL
++  #
+ end
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/3ab7a71bb76afd7c9f8ab442abe0ed1d7baf8a7b