diff --git a/.gitignore b/.gitignore index 467a6e4..a32c98a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /vagrant-1.7.2.tar.gz /vagrant-1.7.4.tar.gz /vagrant-spec-f1a18fd3e5387328ca83e016e48373aadb67112a.tar.gz +/vagrant-1.8.1.tar.gz +/vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz diff --git a/macros.vagrant b/macros.vagrant index 00b09e9..029e507 100644 --- a/macros.vagrant +++ b/macros.vagrant @@ -25,6 +25,7 @@ gem install \\\ --local \\\ --install-dir %{-d*}%{!?-d:.%{vagrant_plugin_dir}} \\\ --bindir .%{_bindir} \\\ + --ignore-dependencies \\\ --force \\\ --document=ri,rdoc \\\ --backtrace \\\ diff --git a/sources b/sources index 590bc7d..38c396c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -556b5e5594a327d46b63c4d8024db187 vagrant-1.7.4.tar.gz -f7962499f4d23df171397292d614ecf7 vagrant-spec-f1a18fd3e5387328ca83e016e48373aadb67112a.tar.gz +5278b6828629d040dab549f61e8c8435 vagrant-1.8.1.tar.gz +556b3f66ce845aa18557c609639f3349 vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz diff --git a/vagrant-1.7.4-Support-Bundler-1.10.6.patch b/vagrant-1.7.4-Support-Bundler-1.10.6.patch new file mode 100644 index 0000000..b194ccd --- /dev/null +++ b/vagrant-1.7.4-Support-Bundler-1.10.6.patch @@ -0,0 +1,22 @@ +From 3b3de6e2e510227e47a0b1bf46cba10c553a2152 Mon Sep 17 00:00:00 2001 +From: Mitchell Hashimoto +Date: Tue, 6 Oct 2015 14:24:43 -0400 +Subject: [PATCH] support Bundler 1.10.6 + +--- + vagrant.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 3e0aea4..b0f0638 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -15,7 +15,7 @@ Gem::Specification.new do |s| + s.required_rubygems_version = ">= 1.3.6" + s.rubyforge_project = "vagrant" + +- s.add_dependency "bundler", ">= 1.5.2", "<= 1.10.5" ++ s.add_dependency "bundler", ">= 1.5.2", "<= 1.10.6" + s.add_dependency "childprocess", "~> 0.5.0" + s.add_dependency "erubis", "~> 2.7.0" + s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" diff --git a/vagrant-1.8.1-disable-winrm-tests.patch b/vagrant-1.8.1-disable-winrm-tests.patch new file mode 100644 index 0000000..3b39554 --- /dev/null +++ b/vagrant-1.8.1-disable-winrm-tests.patch @@ -0,0 +1,63 @@ +diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb +index 31354a7..f2dfd0f 100644 +--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb ++++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb +@@ -445,55 +445,6 @@ VF + end + end + +- context "with winrm communicator" do +- +- let(:iso_winrm_env) do +- env = isolated_environment +- env.vagrantfile <<-VF +-Vagrant.configure("2") do |config| +- config.winrm.username = 'winner' +- config.winrm.password = 'winword' +- config.winrm.transport = :ssl +- +- config.vm.define :machine1 do |machine| +- machine.vm.box = "winbox" +- machine.vm.communicator = :winrm +- end +-end +-VF +- env.create_vagrant_env +- end +- +- let(:machine) { iso_winrm_env.machine(iso_winrm_env.machine_names[0], :dummy) } +- +- it_should_set_arguments_and_environment_variables +- +- it "generates an inventory with winrm connection settings" do +- +- expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args| +- expect(config.inventory_path).to be_nil +- expect(File.exists?(generated_inventory_file)).to be_true +- inventory_content = File.read(generated_inventory_file) +- +- expect(inventory_content).to include("machine1 ansible_connection=winrm ansible_ssh_host=127.0.0.1 ansible_ssh_port=55986 ansible_ssh_user='winner' ansible_ssh_pass='winword'\n") +- } +- end +- +- describe "with force_remote_user option disabled" do +- before do +- config.force_remote_user = false +- end +- +- it "doesn't set the ansible remote user in inventory and use '--user' argument with the vagrant ssh username" do +- expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args| +- inventory_content = File.read(generated_inventory_file) +- +- expect(inventory_content).to include("machine1 ansible_connection=winrm ansible_ssh_host=127.0.0.1 ansible_ssh_port=55986 ansible_ssh_pass='winword'\n") +- expect(args).to include("--user=testuser") +- } +- end +- end +- end + + describe "with inventory_path option" do + before do +-- +2.5.0 + diff --git a/vagrant-1.8.1-fix-dependencies.patch b/vagrant-1.8.1-fix-dependencies.patch new file mode 100755 index 0000000..cefcbc1 --- /dev/null +++ b/vagrant-1.8.1-fix-dependencies.patch @@ -0,0 +1,114 @@ +From 8d5d208fbc4a9b87c6f1f9991dbbf65d5cb5bfbb Mon Sep 17 00:00:00 2001 +From: Tomas Hrcka +Date: Wed, 27 Jan 2016 10:20:34 +0100 +Subject: [PATCH] fix dependencies + +--- + lib/vagrant/bundler.rb | 2 +- + lib/vagrant/util/downloader.rb | 5 +++-- + vagrant.gemspec | 41 ++++++++++++++++++++--------------------- + 3 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb +index ff60b32..7e02ae9 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 03e6238..9a02a85 100644 +--- a/lib/vagrant/util/downloader.rb ++++ b/lib/vagrant/util/downloader.rb +@@ -244,8 +244,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/vagrant.gemspec b/vagrant.gemspec +index 078add3..d1dd7bd 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -20,24 +20,23 @@ Gem::Specification.new do |s| + 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 "json" + s.add_dependency "hashicorp-checkpoint", "~> 0.1.1" + s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" +- s.add_dependency "net-ssh", "~> 3.0.1" +- 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 "net-ssh" ++ s.add_dependency "net-sftp", ">= 2.1" ++ s.add_dependency "net-scp", ">= 1.1.0" + s.add_dependency "rest-client", ">= 1.6.0", "< 2.0" +- s.add_dependency "wdm", "~> 0.1.0" +- s.add_dependency "winrm", "~> 1.3" +- s.add_dependency "winrm-fs", "~> 0.2.2" + + # 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" +- s.add_development_dependency "webmock", "~> 1.20" +- s.add_development_dependency "fake_ftp", "~> 0.1" ++ s.add_dependency "nokogiri" ++ ++ # This dependency is typically provided by listen, but was removed in Fedora. ++ s.add_dependency "rb-inotify" ++ #s.add_development_dependency "rake" ++ #s.add_development_dependency "rspec", "~> 2.14.0" ++ #s.add_development_dependency "webmock", "~> 1.20" ++ #s.add_development_dependency "fake_ftp", "~> 0.1" + + # 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 +@@ -48,10 +47,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 +@@ -65,10 +64,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 +-- +2.5.0 + diff --git a/vagrant.spec b/vagrant.spec index 633fd2d..1e15da5 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -1,10 +1,10 @@ %global bashcompletion_dir %(pkg-config --variable=completionsdir bash-completion 2> /dev/null || :) -%global vagrant_spec_commit f1a18fd3e5387328ca83e016e48373aadb67112a +%global vagrant_spec_commit 9bba7e1228379c0a249a06ce76ba8ea7d276afbe Name: vagrant -Version: 1.7.4 -Release: 2%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Build and distribute virtualized development environments Group: Development/Languages License: MIT @@ -26,14 +26,13 @@ Source4: macros.vagrant # fails on older Fedoras. %{?load:%{SOURCE4}} -Patch0: vagrant-1.7.4-fix-dependencies.patch +Patch0: vagrant-1.8.1-fix-dependencies.patch -# Install plugins in isolation -# https://github.com/mitchellh/vagrant/pull/5877 -Patch1: vagrant-1.7.4-install-plugins-in-isolation.patch +# Disable ansible winrm tests +Patch1: vagrant-1.8.1-disable-winrm-tests.patch # Don't use biosdevname if missing in Fedora guest -Patch2: vagrant-1.7.4-dont-require-biosdevname-fedora.patch +Patch3: vagrant-1.7.4-dont-require-biosdevname-fedora.patch Requires: ruby(release) Requires: ruby(rubygems) >= 1.3.6 @@ -43,7 +42,7 @@ Requires: ruby # in Fedora's package. Requires: rubygem(rb-inotify) Requires: rubygem(bundler) >= 1.5.2 -Requires: rubygem(bundler) < 1.10.5 +Requires: rubygem(bundler) <= 1.10.6 Requires: rubygem(hashicorp-checkpoint) >= 0.1.1 Requires: rubygem(hashicorp-checkpoint) < 0.2 Requires: rubygem(childprocess) >= 0.5.0 @@ -65,6 +64,8 @@ Requires: rubygem(rest-client) < 2.0 Requires: bsdtar Requires: curl +#Recommends: vagrant(vagrant-libvirt) + Requires(pre): shadow-utils BuildRequires: bsdtar @@ -83,6 +84,7 @@ BuildRequires: rubygem(rspec) < 3 BuildRequires: rubygem(bundler) BuildRequires: rubygem(net-sftp) BuildRequires: rubygem(rest-client) +BuildRequires: rubygem(thor) BuildRequires: rubygem(webmock) BuildRequires: rubygem(fake_ftp) BuildRequires: pkgconfig(bash-completion) @@ -106,7 +108,6 @@ Documentation for %{name}. %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build @@ -233,9 +234,26 @@ getent group vagrant >/dev/null || groupadd -r vagrant %changelog -* Wed Oct 14 2015 Josef Stribny - 1.7.4-2 +* Tue Feb 09 2016 Tomas Hrcka - 1.8.1-1 +- New upstream release +- Disable tests using winrm + +* Fri Feb 05 2016 Fedora Release Engineering - 1.7.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Feb 01 2016 Vít Ondruch - 1.7.4-5 +- Use another way how to make the documentation to generate. + +* Mon Feb 01 2016 Vít Ondruch - 1.7.4-4 +- Update the macros to keep them in sync with rubygems package. + +* Wed Oct 14 2015 Josef Stribny - 1.7.4-3 - Fix: Don't use biosdevname if missing in Fedora guest +* Tue Oct 13 2015 Vít Ondruch - 1.7.4-2 +- Fix Bundler 1.10.6 compatibility. +- Recommends vagrant-libvirt installation by default. + * Thu Aug 20 2015 Josef Stribny - 1.7.4-1 - Update to 1.7.4 - Patch: install plugins in isolation