PR#1: Rebase to 1.9.8. - rpms/vagrant

		`@@ -9,3 +9,7 @@`
		`/vagrant-1.8.6.tar.gz`
		`/vagrant-1.8.7.tar.gz`
		`/vagrant-1.9.1.tar.gz`
		`+ /vagrant-1.9.7.tar.gz`
		`+ /vagrant-spec-2f0fb10862b2d19861c584be9d728080ba1f5d33.tar.gz`
		`+ /vagrant-1.9.8.tar.gz`
		`+ /vagrant-spec-e623a5694912c539ac2657e38a372d5e8c93441d.tar.gz`

binstub

file modified

+15 -11

		`@@ -1,11 +1,16 @@`
		`- #!/usr/bin/env bash`
		`+ #!/usr/bin/bash`
		`#`
		`# This is a wrapper to properly execute Vagrant within the embedded`
		`- # Vagrant installation directory. This sets up proper environmental variables`
		`+ # Vagrant installation directory. This sets up proper environment variables`
		`# so that everything loads and compiles to proper directories.`

		`+ # Load defaults, especially VAGRANT_PREFERRED_PROVIDERS`
		`+ if [ -r /etc/default/vagrant ]; then`
		`+ source /etc/default/vagrant`
		`+ fi`
		`+`
		`# Export gem paths so that we use the isolated gems.`
		`- # TODO: Should be repalced from .spec file.`
		`+ # TODO: Should be replaced from .spec file.`
		`# ruby -e "print Gem.path.join(':')"`
		`export GEM_PATH="/usr/share/gems:/usr/share/vagrant/gems"`

		`@@ -13,16 +18,14 @@`
		`#`
		`# This needs to be set because Bundler includes gem paths`
		`# from RubyGems' Gem.paths.`
		`- if [ -z $VAGRANT_HOME ]; then`
		`- VAGRANT_HOME=$(eval echo "~/.vagrant.d")`
		`- fi`
		`+ VAGRANT_HOME=${VAGRANT_HOME:-~/.vagrant.d}`
		`export GEM_HOME="$VAGRANT_HOME/gems"`


		`# SSL certs`
		`export SSL_CERT_FILE="${SSL_CERT_FILE:-/etc/pki/tls/cert.pem}"`

		`- # Export an enviromental variable to say we're in a Vagrant`
		`+ # Export an enviroment variable to say we're in a Vagrant`
		`# installer created environment.`
		`export VAGRANT_INSTALLER_ENV=1`
		`# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file`
		`@@ -35,17 +38,18 @@`
		`# because uname dependencies can conflict on some platforms.`
		`OS=$(uname -s 2>/dev/null)`

		`- # Export the OS as an environmental variable that Vagrant can access`
		`+ # Export the OS as an environment variable that Vagrant can access`
		`# so that it can behave better.`
		`export VAGRANT_DETECTED_OS="${OS}"`

		`# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit`
		`export VAGRANT_EXECUTABLE="${VAGRANT_INSTALLER_EMBEDDED_DIR}/gems/bin/vagrant"`

		`- # libvirt provider as a default`
		`- if [ -z $VAGRANT_DEFAULT_PROVIDER ]; then`
		`- export VAGRANT_DEFAULT_PROVIDER=libvirt`
		`+ # Set providers' preferred order(priority) if not already set`
		`+ if [ -z ${VAGRANT_PREFERRED_PROVIDERS+empty} ]; then`
		`+ VAGRANT_PREFERRED_PROVIDERS=libvirt,docker`
		`fi`
		`+ export VAGRANT_PREFERRED_PROVIDERS`

		`# Call the actual Vagrant bin with our arguments`
		`exec ruby "${VAGRANT_EXECUTABLE}" "$@"`

sources

file modified

+2 -2

		`@@ -1,2 +1,2 @@`
		`- SHA512 (vagrant-1.9.1.tar.gz) = 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452`
		`- SHA512 (vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz) = eda90b5e05c04c7c690bf4579931a0aa2a418ca6f3f1f9b0c18770e4d09fcea2f081f817604ed73c84cb33c437674e315b0ecbdfa7dc24ca94713bb179cb3544`
		`+ SHA512 (vagrant-1.9.8.tar.gz) = d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b`
		`+ SHA512 (vagrant-spec-e623a5694912c539ac2657e38a372d5e8c93441d.tar.gz) = dd480f06b3be740f368354a3d15bf4bba2982d72c6368c10b72596e8263c2c2fb5179c07f8aea8d9e77e9e2b7792e6f8562a9abb3c2e8861969effb5825a908c`

vagrant-1.8.1-disable-winrm-tests.patch

file modified

+6 -6

		`@@ -2,7 +2,7 @@`
		`index 31354a7..f2dfd0f 100644`
		`--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb`
		`+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb`
		`- @@ -498,55 +498,6 @@ VF`
		`+ @@ -497,55 +497,6 @@ VF`
		`end`
		`end`

		`@@ -31,13 +31,13 @@`
		`-`
		`- it "generates an inventory with winrm connection settings" do`
		`-`
		`- - expect(Vagrant::Util::Subprocess).to receive(:execute).with { \|*args\|`
		`+ - expect(Vagrant::Util::Subprocess).to receive(:execute).with(any_args) { \|*args\|`
		`- expect(config.inventory_path).to be_nil`
		`- - expect(File.exists?(generated_inventory_file)).to be_true`
		`+ - 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")`
		`- - }`
		`+ - }.and_return(default_execute_result)`
		`- end`
		`-`
		`- describe "with force_remote_user option disabled" do`
		`@@ -46,12 +46,12 @@`
		`- 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\|`
		`+ - expect(Vagrant::Util::Subprocess).to receive(:execute).with(any_args) { \|*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")`
		`- - }`
		`+ - }.and_return(default_execute_result)`
		`- end`
		`- end`
		`- end`

vagrant-1.9.1-fix-dependencies.patch

file removed

-70

		`@@ -1,70 +0,0 @@`
		`- From 8d5d208fbc4a9b87c6f1f9991dbbf65d5cb5bfbb Mon Sep 17 00:00:00 2001`
		`- From: Tomas Hrcka <thrcka@redhat.com>`
		`- 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/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`
		`- @@ -297,8 +297,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`
		`- @@ -22,23 +22,27 @@ Gem::Specification.new do \|s\|`
		`- s.add_dependency "listen", "~> 3.1.5"`
		`- 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-ssh", ">= 3.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 "net-scp", ">= 1.1.0"`
		`- + # Remove BSD specific dependency.`
		`- + # s.add_dependency "rb-kqueue", "~> 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.6"`
		`- - s.add_dependency "winrm-fs", "~> 0.3.0"`
		`- + # Remove Windows specific dependency.`
		`- + # s.add_dependency "wdm", "~> 0.1.0"`
		`- + # s.add_dependency "winrm", "~> 1.6"`
		`- + # s.add_dependency "winrm-fs", "~> 0.3.0"`
		`-`
		`- # We lock this down to avoid compilation issues.`
		`- - s.add_dependency "nokogiri", "= 1.6.7.1"`
		`- + s.add_dependency "nokogiri"`
		`-`
		`- # 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).`
		`- # Explicit constraint is defined to provide required dependency to listen without imposing`
		`- # tighter restrictions on valid ruby versions`
		`- - s.add_dependency "ruby_dep", "<= 1.3.1"`
		`- + #`
		`- + # Do not impose any Ruby version restrictions on Fedora.`
		`- + # s.add_dependency "ruby_dep", "<= 1.3.1"`
		`-`
		`- # Constraint rake to properly handle deprecated method usage`
		`- # from within rspec`
		`- --`
		`- 2.5.0`
		`-`

vagrant-1.9.8-fix-dependencies.patch

file added

+61

		`@@ -0,0 +1,61 @@`
		`+ From 7486aa2ce950f55a4be9049d514c412d7e45ddef Mon Sep 17 00:00:00 2001`
		`+ From: Pavel Valena <pvalena@redhat.com>`
		`+ Date: Thu, 20 Jul 2017 15:01:06 +0200`
		`+ Subject: [PATCH] Fix dependencies for Vagrant 1.9.7.`
		`+`
		`+ ---`
		`+ vagrant.gemspec \| 23 +++++++++++++----------`
		`+ 1 file changed, 13 insertions(+), 10 deletions(-)`
		`+`
		`+ diff --git a/vagrant.gemspec b/vagrant.gemspec`
		`+ index c92ca17..aeee52f 100644`
		`+ --- a/vagrant.gemspec`
		`+ +++ b/vagrant.gemspec`
		`+ @@ -12,31 +12,34 @@ Gem::Specification.new do \|s\|`
		`+ s.summary = "Build and distribute virtualized development environments."`
		`+ s.description = "Vagrant is a tool for building and distributing virtualized development environments."`
		`+`
		`+ - s.required_ruby_version = "~> 2.2", "< 2.4"`
		`+ + s.required_ruby_version = "~> 2.2"`
		`+ s.required_rubygems_version = ">= 1.3.6"`
		`+ s.rubyforge_project = "vagrant"`
		`+`
		`+ - s.add_dependency "childprocess", "~> 0.6.0"`
		`+ + s.add_dependency "childprocess", "~> 0.5.0"`
		`+ s.add_dependency "erubis", "~> 2.7.0"`
		`+ s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"`
		`+ s.add_dependency "listen", "~> 3.1.5"`
		`+ s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"`
		`+ s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"`
		`+ - s.add_dependency "net-ssh", "~> 4.1.0"`
		`+ + s.add_dependency "net-ssh", ">= 4.1.0"`
		`+ s.add_dependency "net-sftp", "~> 2.1"`
		`+ - s.add_dependency "net-scp", "~> 1.2.0"`
		`+ - s.add_dependency "rb-kqueue", "~> 0.2.0"`
		`+ + s.add_dependency "net-scp", ">= 1.2.0"`
		`+ + # Remove Windows specific dependency.`
		`+ + # s.add_dependency "rb-kqueue", "~> 0.2.0"`
		`+ s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"`
		`+ - 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"`
		`+ + # 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"`
		`+`
		`+ # 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).`
		`+ # Explicit constraint is defined to provide required dependency to listen without imposing`
		`+ # tighter restrictions on valid ruby versions`
		`+ - s.add_dependency "ruby_dep", "<= 1.3.1"`
		`+ + #`
		`+ + # Do not impose any Ruby version restrictions on Fedora.`
		`+ + # s.add_dependency "ruby_dep", "<= 1.3.1"`
		`+`
		`+ # Constraint rake to properly handle deprecated method usage`
		`+ # from within rspec`
		`+ --`
		`+ 2.7.5`
		`+`

vagrant-1.9.8-use-system-certificates.patch

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ From 7486aa2ce950f55a4be9049d514c412d7e45ddef Mon Sep 17 00:00:00 2001`
		`+ From: Pavel Valena <pvalena@redhat.com>`
		`+ Date: Thu, 20 Jul 2017 15:01:06 +0200`
		`+ Subject: [PATCH] Use system certificates`
		`+`
		`+ ---`
		`+ lib/vagrant/util/downloader.rb \| 5 +++--`
		`+ 1 files changed, 3 insertions(+), 2 deletions(-)`
		`+`
		`+ 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`
		`+ @@ -297,8 +297,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]`
		`+ --`
		`+ 2.5.0`

vagrant.spec

file modified

+20 -18

		`@@ -1,10 +1,10 @@`
		`%global bashcompletion_dir %(pkg-config --variable=completionsdir bash-completion 2> /dev/null \|\| :)`

		`- %global vagrant_spec_commit 9bba7e1228379c0a249a06ce76ba8ea7d276afbe`
		`+ %global vagrant_spec_commit e623a5694912c539ac2657e38a372d5e8c93441d`

		`Name: vagrant`
		`- Version: 1.9.1`
		`- Release: 3%{?dist}`
		`+ Version: 1.9.8`
		`+ Release: 1%{?dist}`
		`Summary: Build and distribute virtualized development environments`
		`Group: Development/Languages`
		`License: MIT`
		`@@ -14,7 +14,7 @@`
		`Source1: binstub`
		`# The library has no official release yet. But since it is just test`
		`# dependency, it should be fine to include the source right here.`
		`- # wget https://github.com/mitchellh/vagrant-spec/archive/9bba7e1228379c0a249a06ce76ba8ea7d276afbe/vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz`
		`+ # wget https://github.com/mitchellh/vagrant-spec/archive/2f0fb10862b2d19861c584be9d728080ba1f5d33/vagrant-spec-2f0fb10862b2d19861c584be9d728080ba1f5d33.tar.gz`
		`Source2: https://github.com/mitchellh/%{name}-spec/archive/%{vagrant_spec_commit}/%{name}-spec-%{vagrant_spec_commit}.tar.gz`
		`# Monkey-patching needed for Vagrant to work until the respective patches`
		`# for RubyGems and Bundler are in place`
		`@@ -24,7 +24,7 @@`
		`# fails on older Fedoras.`
		`%{?load:%{SOURCE4}}`

		`- Patch0: vagrant-1.9.1-fix-dependencies.patch`
		`+ Patch0: vagrant-1.9.8-fix-dependencies.patch`

		`# Disable ansible winrm tests`
		`Patch1: vagrant-1.8.1-disable-winrm-tests.patch`
		`@@ -33,29 +33,24 @@`
		`# https://github.com/mitchellh/vagrant/pull/8284`
		`Patch2: vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch`

		`+ # Use system certificates(split to standalone patch)`
		`+ Patch3: vagrant-1.9.8-use-system-certificates.patch`
		`+`
		`Requires: ruby(release)`
		`Requires: ruby(rubygems) >= 1.3.6`
		`# Explicitly specify MRI, since Vagrant does not work with JRuby ATM.`
		`Requires: ruby`
		`Requires: rubygem(hashicorp-checkpoint) >= 0.1.1`
		`- Requires: rubygem(hashicorp-checkpoint) < 0.2`
		`Requires: rubygem(childprocess) >= 0.5.0`
		`- Requires: rubygem(childprocess) < 0.6`
		`Requires: rubygem(erubis) >= 2.7.0`
		`- Requires: rubygem(erubis) < 2.8`
		`Requires: rubygem(i18n) >= 0.6.0`
		`- Requires: rubygem(i18n) <= 0.8.0`
		`Requires: rubygem(json)`
		`Requires: rubygem(listen) >= 3.1.5`
		`- Requires: rubygem(listen) < 3.2`
		`Requires: rubygem(log4r) >= 1.1.9`
		`- Requires: rubygem(log4r) < 1.1.11`
		`- Requires: rubygem(net-ssh) >= 3.0`
		`- Requires: rubygem(net-scp) >= 1.1.0`
		`- Requires: rubygem(nokogiri) >= 1.6`
		`+ Requires: rubygem(net-ssh) >= 4.1.0`
		`+ Requires: rubygem(net-scp) >= 1.2.0`
		`Requires: rubygem(net-sftp) >= 2.1`
		`- Requires: rubygem(net-sftp) < 3`
		`- Requires: rubygem(rest-client) < 3.0`
		`+ Requires: rubygem(rest-client) >= 1.6.0`
		`Requires: bsdtar`
		`Requires: curl`

		`@@ -71,11 +66,11 @@`
		`BuildRequires: rubygem(log4r)`
		`BuildRequires: rubygem(net-ssh)`
		`BuildRequires: rubygem(net-scp)`
		`- BuildRequires: rubygem(nokogiri)`
		`BuildRequires: rubygem(i18n)`
		`BuildRequires: rubygem(json)`
		`BuildRequires: rubygem(erubis)`
		`- BuildRequires: rubygem(rspec) < 3`
		`+ BuildRequires: rubygem(rspec)`
		`+ BuildRequires: rubygem(rspec-its)`
		`BuildRequires: rubygem(net-sftp)`
		`BuildRequires: rubygem(rest-client)`
		`BuildRequires: rubygem(thor)`
		`@@ -113,6 +108,7 @@`
		`%patch0 -p1`
		`%patch1 -p1`
		`%patch2 -p1`
		`+ %patch3 -p1`

		`%build`
		`gem build %{name}.gemspec`
		`@@ -308,6 +304,12 @@`


		`%changelog`
		`+ * Thu Aug 24 2017 Pavel Valena <pvalena@redhat.com> - 1.9.8-1`
		`+ - Update to Vagrant 1.9.8 (rhbz#1427505).`
		`+ - Remove Nokogiri dependency.`
		`+ - Use VAGRANT_PREFERRED_PROVIDERS in binstub instead of VAGRANT_DEFAULT_PROVIDER.`
		`+ - Use only bottom contstraint for Requires.`
		`+`
		`* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org>`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild`

pvalena commented 6 years ago

Enhance binstub
Re-introduce use system certificates patch
Use VAGRANT_PREFFERED_PROVIDERS
Use bottom dependency constraint and update the versions

rebased onto 42da19c

6 years ago

pvalena commented 6 years ago

https://koji.fedoraproject.org/koji/taskinfo?taskID=21685754

jstribny commented 6 years ago

What's missing for merge? Can you merge it yourself or not? (I see this page for the first time :D)

vondruch commented 6 years ago

@jstribny well, I discussed with @pvalena some issue with the patches, e.g. the first remove the CA certificates patching while the later reintroduces this. This is not a showstopper, but it would be nice to update the patch. Also, there was some suggestion in the BZ for some small update. Otherwise there are no major issues. Waiting for update from @pvalena and dropping the [WIP] by him.

pvalena commented 6 years ago

@vondruch all should be now fixed. Only issue is that 'vagrant-spec' from SOURCE2 is no longer used (I suspect that happend when build dependency bundler was dropped). However, as 2.0.0 was released, I'm deffering that to next update.

6 new commits added