From 3a4457942fe44a24e8678dae6b08a8a5e89f9e84 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Feb 06 2018 23:27:05 +0000 Subject: Update to Vagrant 2.0.2. Update to latest vagrant-spec commit. --- diff --git a/.gitignore b/.gitignore index fec04bd..ce3853d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,2 @@ -/vagrant-1.6.5.tar.gz -/vagrant-spec-c0dafc996165bf1628b672dd533f1858ff66fe4a.tar.gz -/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 -/vagrant-1.8.5.tar.gz -/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 +/vagrant-*.tar.gz +/vagrant-spec-*.tar.gz diff --git a/sources b/sources index 558b7ff..2cba5c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (vagrant-2.0.1.tar.gz) = 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd -SHA512 (vagrant-spec-7ac8b4191de578e345b29acaf62ecc72c8e73be1.tar.gz) = 49482df5a17f0a01b6e1645b2f9fbc1bac2c7e04d7c41f00284b52336513ef1876845e09ba21af3de196b196faa29809ac00655fe61d4ab4d800b8d83df8c6cc +SHA512 (vagrant-2.0.2.tar.gz) = 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a +SHA512 (vagrant-spec-f3daedaac493ebc0ba1a96c915423a329e09e84a.tar.gz) = 78dd57932b3a19c410abbac45992251ec5b8a5fa6ba5431fb74187c17a7fe7079d757b1654d674c02d25afb1dbe40d16fb4dd7553517c531a737d7a7998b6f70 diff --git a/vagrant-2.0.1-fix-dependencies.patch b/vagrant-2.0.1-fix-dependencies.patch deleted file mode 100644 index ff7614f..0000000 --- a/vagrant-2.0.1-fix-dependencies.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7486aa2ce950f55a4be9049d514c412d7e45ddef Mon Sep 17 00:00:00 2001 -From: Pavel Valena -Date: Thu, 20 Jul 2017 15:01:06 +0200 -Subject: [PATCH] Fix dependencies for Vagrant 2.0.1. - ---- - vagrant.gemspec | 25 ++++++++++++++----------- - 1 file changed, 14 insertions(+), 11 deletions(-) - -diff --git a/vagrant.gemspec b/vagrant.gemspec -index c92ca17..aeee52f 100644 ---- a/vagrant.gemspec -+++ b/vagrant.gemspec -@@ -12,35 +12,38 @@ 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.5" -+ 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 -- s.add_development_dependency "rake", "~> 12.0.0" -+ s.add_development_dependency "rake", "~> 12.2.0" - s.add_development_dependency "rspec", "~> 3.5.0" - s.add_development_dependency "rspec-its", "~> 1.2.0" - s.add_development_dependency "webmock", "~> 2.3.1" --- -2.13.6 diff --git a/vagrant-2.0.2-fix-dependencies.patch b/vagrant-2.0.2-fix-dependencies.patch new file mode 100644 index 0000000..34f0c30 --- /dev/null +++ b/vagrant-2.0.2-fix-dependencies.patch @@ -0,0 +1,64 @@ +From 7486aa2ce950f55a4be9049d514c412d7e45ddef Mon Sep 17 00:00:00 2001 +From: Pavel Valena +Date: Thu, 20 Jul 2017 15:01:06 +0200 +Subject: [PATCH] Fix dependencies for Vagrant 2.0.1. + +--- + vagrant.gemspec | 25 ++++++++++++++----------- + 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,35 +12,38 @@ 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.6" ++ 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.5" + s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" + s.add_dependency "net-ssh", "~> 4.2.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 +- s.add_development_dependency "rake", "~> 12.0.0" ++ s.add_development_dependency "rake", "~> 12.2.0" + s.add_development_dependency "rspec", "~> 3.5.0" + s.add_development_dependency "rspec-its", "~> 1.2.0" + s.add_development_dependency "webmock", "~> 2.3.1" +-- +2.13.6 diff --git a/vagrant-2.0.2-use-numerical-instead-localhost.patch b/vagrant-2.0.2-use-numerical-instead-localhost.patch new file mode 100644 index 0000000..7b7ab2b --- /dev/null +++ b/vagrant-2.0.2-use-numerical-instead-localhost.patch @@ -0,0 +1,32 @@ +From a102bc064f2b0d97cc6e67bb4f5e4a1bd951e311 Mon Sep 17 00:00:00 2001 +From: Pavel Valena +Date: Wed, 31 Jan 2018 19:08:35 +0100 +Subject: [PATCH] Use 127.0.0.1 instead of localhost + +in test is_port_open_test.rb +--- + test/unit/vagrant/util/is_port_open_test.rb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/unit/vagrant/util/is_port_open_test.rb b/test/unit/vagrant/util/is_port_open_test.rb +index 71ee1db3b7..ea70425755 100644 +--- a/test/unit/vagrant/util/is_port_open_test.rb ++++ b/test/unit/vagrant/util/is_port_open_test.rb +@@ -36,7 +36,7 @@ + end + + # Verify that we report the port is open +- expect(klass.is_port_open?("localhost", open_port)).to be ++ expect(klass.is_port_open?("127.0.0.1", open_port)).to be + + # Kill the thread + thr[:die] = true +@@ -47,7 +47,7 @@ + # This CAN fail, since port 52811 might actually be in use, but I'm + # not sure what to do except choose some random port and hope for the + # best, really. +- expect(klass.is_port_open?("localhost", closed_port)).not_to be ++ expect(klass.is_port_open?("127.0.0.1", closed_port)).not_to be + end + end + diff --git a/vagrant.spec b/vagrant.spec index 62fb9e6..cf9af7a 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 7ac8b4191de578e345b29acaf62ecc72c8e73be1 +%global vagrant_spec_commit f3daedaac493ebc0ba1a96c915423a329e09e84a Name: vagrant -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Build and distribute virtualized development environments Group: Development/Languages License: MIT @@ -14,7 +14,7 @@ Source0: https://github.com/mitchellh/%{name}/archive/v%{version}/%{name}-%{vers 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/7ac8b4191de578e345b29acaf62ecc72c8e73be1/vagrant-spec-7ac8b4191de578e345b29acaf62ecc72c8e73be1.tar.gz +# wget https://github.com/mitchellh/vagrant-spec/archive/f3daedaac493ebc0ba1a96c915423a329e09e84a/vagrant-spec-f3daedaac493ebc0ba1a96c915423a329e09e84a.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,20 +24,24 @@ Source4: macros.vagrant # fails on older Fedoras. %{?load:%{SOURCE4}} -Patch0: vagrant-2.0.1-fix-dependencies.patch +Patch0: vagrant-2.0.2-fix-dependencies.patch + +# Use 127.0.0.1 instead of localhost in tests +# https://github.com/hashicorp/vagrant/pull/9422 +Patch1: vagrant-2.0.2-use-numerical-instead-localhost.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.1.5 Requires: rubygem(childprocess) >= 0.5.0 Requires: rubygem(erubis) >= 2.7.0 Requires: rubygem(i18n) >= 0.6.0 Requires: rubygem(json) Requires: rubygem(listen) >= 3.1.5 Requires: rubygem(log4r) >= 1.1.9 -Requires: rubygem(net-ssh) >= 4.1.0 +Requires: rubygem(net-ssh) >= 4.2.0 Requires: rubygem(net-scp) >= 1.2.0 Requires: rubygem(net-sftp) >= 2.1 Requires: rubygem(rest-client) >= 1.6.0 @@ -158,6 +162,8 @@ EOF %check +cat %{PATCH1} | patch -p1 + # Adjust the vagrant-spec directory name. rm -rf ../vagrant-spec mv ../vagrant-spec{-%{vagrant_spec_commit},} @@ -306,6 +312,9 @@ end %changelog +* Wed Jan 31 2018 Pavel Valena - 2.0.2-1 +- Update to Vagrant 2.0.2. + * Mon Jan 08 2018 Vít Ondruch - 2.0.1-2 - Fix Ruby 2.5 compatibilty.