Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2019-03-05 12:18:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Tue Mar 5 12:18:52 2019 rev:12 rq:670890 version:2.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2018-11-27 10:44:08.988089401 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.28833/vagrant.changes 2019-03-05 12:19:06.804955035 +0100 @@ -1,0 +2,60 @@ +Mon Jan 28 13:31:45 UTC 2019 - Dan Čermák <[email protected]> + +- Update Requires and Buildrequires to match vagrant.gemspec + +------------------------------------------------------------------- +Fri Jan 11 15:29:14 UTC 2019 - Dan Čermák <[email protected]> + +- Add 0026-do-not-abuse-relative-paths-in-plugins.patch: + this further removes usage of relative paths in vagrant + +------------------------------------------------------------------- +Fri Jan 4 10:57:14 UTC 2019 - Dan Čermák <[email protected]> + +- update to 2.2.2 + BUG FIXES: + - providers/virtualbox: Update default_nic_type implementation and add warning [GH-10450] + +- update to 2.2.1 + FEATURES: + + - core/plugins: Add reset! method to communicator [GH-10399] + - providers/virtualbox: Add support for VirtualBox 6.0 [GH-10379] + + IMPROVEMENTS: + + - command/validate: Allow validation of config while ignoring provider [GH-10351] + - communicators/ssh: Prevent overly verbose output waiting for connection [GH-10321] + - communicators/ssh: Support ed25519 keys [GH-10365] + - communicators/ssh: Add reset! implementation [GH-10399] + - communicators/winrm: Add reset! implementation [GH-10399] + - core: Limit number of automatic box update checks [GH-10359] + - host/windows: Remove PATH check in WSL detection [GH-10313] + - providers/hyperv: Disable automatic checkpoints before deletion [GH-10406] + - providers/virtualbox: Add `automount` flag if specified with synced_folder [GH-10326] + - providers/virtualbox: Refactor host only network settings [GH-7699] + - providers/virtualbox: Support setting default NIC type for network adapters [GH-10383] + - providers/virtualbox: Update ssh_port helper to handle multiple matches [GH-10409] + - provisioners/shell: Add :reset option to allow communicator reset [GH-10399] + - synced_folders/smb: Allow for 'default' smb_username in prompt if set [GH-10319] + - util/network_ip: Simplify `network_address` helper [GH-7693] + - util/platform: Prevent hard failure during hyper-v enabled check [GH-10332] + + BUG FIXES: + + - command/login: Only show deprecation warning when command is invoked [GH-10374] + - core: Fallback to Vagrantfile defined box information [GH-10368] + - core/bundler: Update source ordering to properly resolve with new RubyGems [GH-10364] + - core/triggers: Only split inline script if host is non-Windows [GH-10405] + - communicator/winrm: Prepend computer name to username when running elevated commands [GH-10387] + - guest/debian: Fix halting issue when setting hostname by restarting networking on guest [GH-10301, GH-10330] + - guest/linux: Fix vagrant user access to docker after install [GH-10399] + - guest/windows: Add reboot capability to fix hostname race condition [GH-10347] + - guest/windows: Allow for reading key paths with spaces [GH-10389] + - host/windows: Fix powershell to properly handle paths with spaces [GH-10390] + - providers/docker: Deterministic host VM synced folder location for Docker VM [GH-10311] + - providers/hyperv: Fix network vlan configuration script [GH-10366] + - providers/hyperv: Properly output error message on failed guest import [GH-10404] + - providers/hyperv: Fix typo in network configuration detection script [GH-10410] + +------------------------------------------------------------------- Old: ---- vagrant-2.2.0.tar.gz New: ---- 0026-do-not-abuse-relative-paths-in-plugins.patch vagrant-2.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.nioBQp/_old 2019-03-05 12:19:07.764954742 +0100 +++ /var/tmp/diff_new_pack.nioBQp/_new 2019-03-05 12:19:07.768954741 +0100 @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,7 +25,7 @@ %global vim_data_dir %{_datadir}/vim/site/plugin/ Name: vagrant -Version: 2.2.0 +Version: 2.2.2 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -49,90 +49,111 @@ Patch23: 0023-vbox-fix-package.patch Patch24: 0024-do-not-depend-on-wdm.patch Patch25: 0025-do-not-abuse-relative-paths-in-docker-plugin.patch +Patch26: 0026-do-not-abuse-relative-paths-in-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # force only one ruby version %define rb_build_versions %rb_default_ruby %define rb_build_abi %rb_default_ruby_abi -# -BuildRequires: %{ruby >= 2.0.0} +# s.required_ruby_version = "~> 2.2", "< 2.6" +BuildRequires: %{ruby >= 2.2.0} +# temporary override, so that we can build with ruby 2.6 +# FIXME: this will be the default with vagrant >= 2.2.3, remove the comment then +BuildRequires: %{ruby < 2.7} # # # BuildRequires: %{rubygem bundler} +# s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" +BuildRequires: %{rubygem bcrypt_pbkdf:1.0.0 } # s.add_dependency "childprocess", "~> 0.6.0" BuildRequires: %{rubygem childprocess:0.6 } -BuildRequires: %{rubygem crack } +# s.add_dependency "ed25519", "~> 1.2.4" +BuildRequires: %{rubygem ed25519:1.2.4 } # s.add_dependency "erubis", "~> 2.7.0" BuildRequires: %{rubygem erubis:2.7 } -# s.add_development_dependency "fake_ftp", "~> 0.1" -BuildRequires: %{rubygem fake_ftp:0.1 } -# s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" -BuildRequires: %{rubygem hashicorp-checkpoint:0.1.5 } -# s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" -BuildRequires: %{rubygem i18n < 0.8 } -BuildRequires: %{rubygem i18n >= 0.6 } +# s.add_dependency "i18n", "~> 1.1.1" +BuildRequires: %{rubygem i18n:1.1.1 } # s.add_dependency "listen", "~> 3.1.5" BuildRequires: %{rubygem listen:3.1.5 } +# s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" +BuildRequires: %{rubygem hashicorp-checkpoint:0.1.5 } # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" BuildRequires: %{rubygem log4r < 1.1.11 } BuildRequires: %{rubygem log4r >= 1.1.9 } -# s.add_dependency "net-scp", "~> 1.2.0" -BuildRequires: %{rubygem net-scp:1.2 } +# s.add_dependency "net-ssh", "~> 5.0.0" +BuildRequires: %{rubygem net-ssh:5.0} # s.add_dependency "net-sftp", "~> 2.1" BuildRequires: %{rubygem net-sftp:2.1 } -# s.add_dependency "net-ssh", "~> 4.2.0" -# patched to 5.0.x by 0027-now-use-rubygem-net-ssh-5.0.x.patch -BuildRequires: %{rubygem net-ssh:5.0} -# Prevent have choice for rubygem(ruby:2.2.0:nokogiri) -BuildRequires: %{rubygem nokogiri >= 1.7} -# Prevent have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16 -BuildRequires: %{rubygem mime-types >= 2} -# Prevent have choice for rubygem(ruby:2.4.0:addressable) >= 2.3.6 -BuildRequires: %{rubygem addressable >= 2.4 } -# Prevent have choice for rubygem(ruby:2.4.0:builder) >= 2.1.2 -BuildRequires: %{rubygem builder >= 3.1 } -BuildRequires: ruby-macros >= 5 -# s.add_development_dependency "rake", "~> 12.0.0" -BuildRequires: %{rubygem rake:12.0 } +# s.add_dependency "net-scp", "~> 1.2.0" +BuildRequires: %{rubygem net-scp:1.2 } # s.add_dependency "rb-kqueue", "~> 0.2.0" BuildRequires: %{rubygem rb-kqueue:0.2 } # s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" BuildRequires: %{rubygem rest-client < 3.0} BuildRequires: %{rubygem rest-client >= 1.6} -# s.add_development_dependency "rspec", "~> 3.5.0" -BuildRequires: %{rubygem rspec:3.5 } -# s.add_development_dependency "rspec-its", "~> 1.2.0" -BuildRequires: %{rubygem rspec-its:1.2 } -BuildRequires: %{rubygem rspec:3.5 } -BuildRequires: %{rubygem ruby_dep <= 1.5 } +# s.add_dependency "rubyzip", "~> 1.2.2" +BuildRequires: %{rubygem rubyzip:1.2.2} # Intentionally removed, wdm only works on Windows # BuildRequires: %{rubygem wdm } -# s.add_development_dependency "webmock", "~> 2.3.1" -BuildRequires: %{rubygem webmock:2.3 } # s.add_dependency "winrm", "~> 2.1" BuildRequires: %{rubygem winrm:2.1 } -# s.add_dependency "winrm-elevated", "~> 1.1" -BuildRequires: %{rubygem winrm-elevated:1.1 } # s.add_dependency "winrm-fs", "~> 1.0" BuildRequires: %{rubygem winrm-fs:1 } +# s.add_dependency "winrm-elevated", "~> 1.1" +BuildRequires: %{rubygem winrm-elevated:1.1 } +# s.add_dependency "vagrant_cloud", "~> 2.0.0" +BuildRequires: %{rubygem vagrant_cloud >= 2.0.0 } +BuildRequires: %{rubygem vagrant_cloud < 2.1.0 } + +# devel dependencies: +# s.add_development_dependency "rake", "~> 12.0.0" +BuildRequires: %{rubygem rake:12.0 } +# s.add_development_dependency "rspec", "~> 3.5.0" +BuildRequires: %{rubygem rspec:3.5 } +# s.add_development_dependency "rspec-its", "~> 1.2.0" +BuildRequires: %{rubygem rspec-its:1.2 } +# s.add_dependency "ruby_dep", "<= 1.3.1" +BuildRequires: %{rubygem ruby_dep <= 1.3.1 } +# s.add_development_dependency "webmock", "~> 2.3.1" +BuildRequires: %{rubygem webmock:2.3 } +# s.add_development_dependency "fake_ftp", "~> 0.1.1" +BuildRequires: %{rubygem fake_ftp:0.1.1 } + +# Prevent have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16 +BuildRequires: %{rubygem mime-types >= 2} +# Prevent have choice for rubygem(ruby:2.4.0:addressable) >= 2.3.6 +BuildRequires: %{rubygem addressable >= 2.4 } +# Prevent have choice for rubygem(ruby:2.4.0:builder) >= 2.1.2 +BuildRequires: %{rubygem builder >= 3.1 } + +BuildRequires: ruby-macros >= 5 + # # -# -Requires: %{rubygem childprocess} +# s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" +Requires: %{rubygem bcrypt_pbkdf:1.0.0 } +# s.add_dependency "childprocess", "~> 0.6.0" +Requires: %{rubygem childprocess:0.6} +# s.add_dependency "ed25519", "~> 1.2.4" +Requires: %{rubygem ed25519} # Prevent have choice for rubygem(ruby:2.2.0:erubis) -Requires: %{rubygem erubis >= 2.7} +# s.add_dependency "erubis", "~> 2.7.0" +Requires: %{rubygem erubis:2.7} Requires: %{rubygem i18n} Requires: %{rubygem listen} +Requires: %{rubygem hashicorp-checkpoint} Requires: %{rubygem log4r} +Requires: %{rubygem net-ssh} +Requires: %{rubygem net-sftp} # Prevent have choice for rubygem(ruby:2.2.0:net-scp) Requires: %{rubygem net-scp >= 1.2} -Requires: %{rubygem net-sftp} -Requires: %{rubygem net-ssh} -# Prevent have choice for rubygem(ruby:2.2.0:nokogiri) -Requires: %{rubygem nokogiri >= 1.7} -#Requires: %{rubygem rb-kqueue0} +Requires: %{rubygem rb-kqueue} Requires: %{rubygem rest-client} +Requires: %{rubygem winrm} +Requires: %{rubygem winrm-fs} +Requires: %{rubygem winrm-elevated} +Requires: %{rubygem vagrant_cloud} # We don't require rubygem mime-types since it's pulled in transitively # Requires: bsdtar @@ -160,8 +181,8 @@ Group: Development/Languages/Ruby Supplements: packageand(vagrant:emacs_program) BuildRequires: emacs-nox -Requires: vagrant = %{version} Requires: emacs_program +Requires: vagrant = %{version} BuildArch: noarch %description emacs @@ -173,9 +194,9 @@ Supplements: packageand(vagrant:bash) BuildRequires: bash BuildRequires: bash-completion -Requires: vagrant = %{version} Requires: bash Requires: bash-completion +Requires: vagrant = %{version} BuildArch: noarch %description bash-completion @@ -193,6 +214,7 @@ %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 cp %{SOURCE98} . @@ -240,7 +262,6 @@ mkdir -p %{buildroot}%{_datadir}/%{name}-plugins/plugins.d echo "{}" > %{buildroot}%{_datadir}/%{name}-plugins/plugins.json - rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/.travis.yml rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/.gitignore rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/test/vagrant-spec/boxes/.keep @@ -248,6 +269,12 @@ rm -f %{buildroot}%{_bindir}/vagrant.orig.%{rb_default_ruby_suffix} rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/lib/vagrant/util.rb.orig +# SLE 12 +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} +rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/lib/vagrant/box.rb.orig +rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/%{name}.gemspec.orig +%endif + # change shebang in /usr/lib64/ruby/gems/*/gems/vagrant-2.1.1/.runner.sh sed -i '1 s/^.*$/#!\/bin\/bash/' %{buildroot}%{gem_base}/gems/%{mod_full_name}/.runner.sh ++++++ 0026-do-not-abuse-relative-paths-in-plugins.patch ++++++ >From f3e8e9f37f4d6408a9e4a689e81e2ced67d21939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Fri, 11 Jan 2019 12:32:28 +0100 Subject: [PATCH] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dan Čermák <[email protected]> --- plugins/guests/alt/cap/configure_networks.rb | 2 +- plugins/guests/coreos/cap/configure_networks.rb | 2 +- plugins/guests/nixos/cap/change_host_name.rb | 2 +- plugins/provisioners/chef/provisioner/base.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/guests/alt/cap/configure_networks.rb b/plugins/guests/alt/cap/configure_networks.rb index 851849700..80071e817 100644 --- a/plugins/guests/alt/cap/configure_networks.rb +++ b/plugins/guests/alt/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestALT diff --git a/plugins/guests/coreos/cap/configure_networks.rb b/plugins/guests/coreos/cap/configure_networks.rb index 827c8f075..e0c68359f 100644 --- a/plugins/guests/coreos/cap/configure_networks.rb +++ b/plugins/guests/coreos/cap/configure_networks.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestCoreOS diff --git a/plugins/guests/nixos/cap/change_host_name.rb b/plugins/guests/nixos/cap/change_host_name.rb index 340eddeab..bacae1f0d 100644 --- a/plugins/guests/nixos/cap/change_host_name.rb +++ b/plugins/guests/nixos/cap/change_host_name.rb @@ -1,6 +1,6 @@ require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestNixos diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb index 607909a4e..d8d006f36 100644 --- a/plugins/provisioners/chef/provisioner/base.rb +++ b/plugins/provisioners/chef/provisioner/base.rb @@ -1,7 +1,7 @@ require "tempfile" require_relative "../../../../lib/vagrant/util/presence" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" require_relative "../installer" -- 2.20.1 ++++++ vagrant-2.2.0.tar.gz -> vagrant-2.2.2.tar.gz ++++++ ++++ 5161 lines of diff (skipped)
