diff --git a/binstub b/binstub old mode 100755 new mode 100744 diff --git a/vagrant-1.6.5-fix-dependencies.patch b/vagrant-1.6.5-fix-dependencies.patch deleted file mode 100644 index 191ebb1..0000000 --- a/vagrant-1.6.5-fix-dependencies.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/bin/vagrant b/bin/vagrant -index 21630e1..ac28e04 100755 ---- a/bin/vagrant -+++ b/bin/vagrant -@@ -15,7 +15,9 @@ end - - # Fast path the version of Vagrant - if argv.include?("-v") || argv.include?("--version") -- require "vagrant/version" -+ # Fixes non-gemified Vagrant to display the version. -+ # https://github.com/mitchellh/vagrant/pull/4703 -+ require_relative "../lib/vagrant/version" - puts "Vagrant #{Vagrant::VERSION}" - exit 0 - end -diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb -index 05867da..ea8c056 100644 ---- a/lib/vagrant/bundler.rb -+++ b/lib/vagrant/bundler.rb -@@ -188,7 +188,7 @@ module Vagrant - gemfile.puts(%Q[source "#{source}"]) - end - -- gemfile.puts(%Q[gem "vagrant", "= #{VERSION}"]) -+ gemfile.puts(%Q[gemspec :path => "#{File.expand_path '../../..', __FILE__}"]) - - gemfile.puts("group :plugins do") - plugins.each do |name, plugin| -diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb -index 8756fc3..7fb2be8 100644 ---- a/lib/vagrant/util/downloader.rb -+++ b/lib/vagrant/util/downloader.rb -@@ -215,8 +215,9 @@ module Vagrant - # If we're in Vagrant, then we use the packaged CA bundle - if Vagrant.in_installer? - subprocess_options[:env] ||= {} -- subprocess_options[:env]["CURL_CA_BUNDLE"] = -- File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]) -+ # Use system certificates. -+ # subprocess_options[:env]["CURL_CA_BUNDLE"] = -+ # File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]) - end - - return [options, subprocess_options] -diff --git a/test/unit/base.rb b/test/unit/base.rb -index 3020c7b..c7b11b9 100644 ---- a/test/unit/base.rb -+++ b/test/unit/base.rb -@@ -28,7 +28,6 @@ $stderr.sync = true - - # Configure RSpec - RSpec.configure do |c| -- c.expect_with :rspec, :stdlib - c.treat_symbols_as_metadata_keys_with_true_values = true - - if Vagrant::Util::Platform.windows? -diff --git a/vagrant.gemspec b/vagrant.gemspec -index c4131b2..638aeb4 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -15,27 +15,38 @@ Gem::Specification.new do |s| - s.required_rubygems_version = ">= 1.3.6" - s.rubyforge_project = "vagrant" - -- s.add_dependency "bundler", ">= 1.5.2", "< 1.7.0" -+ # https://github.com/mitchellh/vagrant/issues/4500 -+ s.add_dependency "bundler", ">= 1.5.2", "!= 1.7.0" - s.add_dependency "childprocess", "~> 0.5.0" - s.add_dependency "erubis", "~> 2.7.0" -- s.add_dependency "i18n", "~> 0.6.0" -+ s.add_dependency "i18n", ">= 0.6.0" -+ # https://github.com/mitchellh/vagrant/pull/4770 -+ s.add_dependency "json" - s.add_dependency "listen", "~> 2.7.1" - 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-scp", "~> 1.1.0" -- s.add_dependency "rb-kqueue", "~> 0.2.0" -- s.add_dependency "wdm", "~> 0.1.0" -- s.add_dependency "winrm", "~> 1.1.3" -+ s.add_dependency "net-scp", ">= 1.1.0" -+ #s.add_dependency "rb-kqueue", "~> 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" - -- s.add_development_dependency "rake" -- s.add_development_dependency "contest", ">= 0.1.2" -- s.add_development_dependency "minitest", "~> 2.5.1" -- s.add_development_dependency "mocha" -- s.add_development_dependency "rspec", "~> 2.14.0" -+ # This dependency is typically provided by listen, but was removed in Fedora. -+ s.add_dependency "rb-inotify" -+ -+ # Minitest, contest and Mocha are not required. -+ # https://github.com/mitchellh/vagrant/pull/4777 -+ #s.add_development_dependency "contest", ">= 0.1.2" -+ #s.add_development_dependency "minitest" -+ #s.add_development_dependency "mocha" -+ -+ # Development dependencies have to be disabled for runtime, otherwise Bundler -+ # tries to consider them when resolving dependencies. -+ # https://github.com/bundler/bundler/issues/3231 -+ # s.add_development_dependency "rake" -+ # s.add_development_dependency "rspec", "~> 2.14.0" - - # The following block of code determines the files that should be included - # in the gem. It does this by reading all the files in the directory where -@@ -46,10 +57,10 @@ Gem::Specification.new do |s| - all_files = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") } - all_files.reject! { |file| [".", ".."].include?(File.basename(file)) } - all_files.reject! { |file| file.start_with?("website/") } -- gitignore_path = File.join(root_path, ".gitignore") -- gitignore = File.readlines(gitignore_path) -- gitignore.map! { |line| line.chomp.strip } -- gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ } -+ #gitignore_path = File.join(root_path, ".gitignore") -+ #gitignore = File.readlines(gitignore_path) -+ #gitignore.map! { |line| line.chomp.strip } -+ #gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ } - - unignored_files = all_files.reject do |file| - # Ignore any directories, the gemspec only cares about files -@@ -63,10 +74,10 @@ Gem::Specification.new do |s| - # like '.DS_Store' will match sub-directories too (same behavior - # as git). - # -- gitignore.any? do |ignore| -- File.fnmatch(ignore, file, File::FNM_PATHNAME) || -- File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME) -- end -+ #gitignore.any? do |ignore| -+ # File.fnmatch(ignore, file, File::FNM_PATHNAME) || -+ # File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME) -+ #end - end - - s.files = unignored_files diff --git a/vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch b/vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch new file mode 100644 index 0000000..c241b8e --- /dev/null +++ b/vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch @@ -0,0 +1,23 @@ +From 95e1c19f225ef8fc14c958f7f2bdf6c29691817a Mon Sep 17 00:00:00 2001 +From: Mitchell Hashimoto +Date: Tue, 6 Jan 2015 22:49:53 -0800 +Subject: [PATCH] provisioners/puppet: fix exception with module paths + [GH-5123] + +--- + plugins/provisioners/puppet/provisioner/puppet.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb +index 4953404..c1e01c9 100644 +--- a/plugins/provisioners/puppet/provisioner/puppet.rb ++++ b/plugins/provisioners/puppet/provisioner/puppet.rb +@@ -25,7 +25,7 @@ def configure(root_config) + # Setup the module paths + @module_paths = [] + @expanded_module_paths.each_with_index do |path, _| +- key = Digest::MD5.hexdigest(path) ++ key = Digest::MD5.hexdigest(path.to_s) + @module_paths << [path, File.join(config.temp_dir, "modules-#{key}")] + end + diff --git a/vagrant.spec b/vagrant.spec index a3e780c..86608e4 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -4,7 +4,7 @@ Name: vagrant Version: 1.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Build and distribute virtualized development environments Group: Development/Languages License: MIT @@ -26,6 +26,10 @@ Source4: macros.vagrant Patch0: vagrant-1.7.2-fix-dependencies.patch +# Fix Puppet provisioning error. +# https://github.com/mitchellh/vagrant/issues/5123 +Patch1: vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch + Requires: ruby(release) Requires: ruby(rubygems) >= 1.3.6 # Explicitly specify MRI, since Vagrant does not work with JRuby ATM. @@ -88,6 +92,7 @@ Documentation for %{name}. %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -214,6 +219,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant %changelog +* Fri Feb 20 2015 Vít Ondruch - 1.7.2-3 +- Fix Puppet provisioning error available in 1.7.2 re-release. + * Fri Feb 20 2015 Michael Adam - 1.7.2-2 - Add missing dependencies.