Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2017-03-12 20:03:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Sun Mar 12 20:03:16 2017 rev:2 rq:477690 version:1.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/vagrant.changes 2017-03-12 20:03:17.519767999 +0100 @@ -1,0 +2,63 @@ +Tue Mar 7 20:08:08 UTC 2017 - [email protected] + +- Fix build in factory - failed due to + "have choice for rubygem(ruby:2.2.0:nokogiri)" + +------------------------------------------------------------------- +Mon Mar 6 22:20:42 UTC 2017 - [email protected] + +- Add 0009-plugins-don-t-abuse-require_relative.patch + to fix 'vagrant fails configuring VM network' (bsc#1026449) + +------------------------------------------------------------------- +Thu Feb 16 15:17:03 UTC 2017 - [email protected] + +- Fix build on openSUSE Leap 42.2 + +------------------------------------------------------------------- +Thu Feb 16 13:47:16 UTC 2017 - [email protected] + +- Prevent 'have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16' + for Leap 42.{1,2} + +------------------------------------------------------------------- +Mon Feb 13 13:21:38 UTC 2017 - [email protected] + +- Re-add 0008-Read-data-from-usr-share-vagrant.patch as vagrant + fails at runtime otherwise. Debian dropped it due to installing + the package using rubygems layout, but we don't do that + +------------------------------------------------------------------- +Mon Feb 13 11:54:30 UTC 2017 - [email protected] + +- sync with 1.9.1 + https://packages.debian.org/sid/main/vagrant +- Patch changelog + + Added + * 0001-Disable-Checkpoint.patch + * 0002-bin-vagrant-silence-warning-about-installer.patch + * 0003-Use-a-private-temporary-dir.patch + * 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + * 0005-Support-system-installed-plugins.patch + * 0006-Relax-dependency-resolution.patch + * 0007-Update-command.rb.patch + + Deleted + * 0002-Disable-Checkpoint.patch + * 0003-VERSION-fallback-to-usr-share-vagrant-version.txt.patch + * 0004-bin-vagrant-silence-warning-about-installer.patch + * 0005-Read-data-from-usr-share-vagrant.patch + * 0006-Look-up-vagrant-pre-rubygems.rb-from-the-installed-p.patch + * 0007-Make-Bundler-also-lookup-into-rubygems-integration-p.patch + * 0008-Use-a-private-temporary-dir.patch + * 0009-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch + * 0011-Relax-dependency-resolution.patch + * 0011-Support-system-installed-plugins.patch + * 0012-require-vagrant-version-from-system.patch + +------------------------------------------------------------------- +Tue Sep 6 09:23:03 UTC 2016 - [email protected] + +- sync with 1.8.5 + https://packages.debian.org/sid/main/vagrant + +------------------------------------------------------------------- Old: ---- 0002-Disable-Checkpoint.patch 0003-VERSION-fallback-to-usr-share-vagrant-version.txt.patch 0004-bin-vagrant-silence-warning-about-installer.patch 0005-Read-data-from-usr-share-vagrant.patch 0006-Look-up-vagrant-pre-rubygems.rb-from-the-installed-p.patch 0007-Make-Bundler-also-lookup-into-rubygems-integration-p.patch 0008-Use-a-private-temporary-dir.patch 0009-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 0011-Relax-dependency-resolution.patch 0011-Support-system-installed-plugins.patch 0012-require-vagrant-version-from-system.patch vagrant-1.8.1.tar.gz New: ---- 0001-Disable-Checkpoint.patch 0002-bin-vagrant-silence-warning-about-installer.patch 0003-Use-a-private-temporary-dir.patch 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 0005-Support-system-installed-plugins.patch 0006-Relax-dependency-resolution.patch 0007-Update-command.rb.patch 0008-Read-data-from-usr-share-vagrant.patch 0009-plugins-don-t-abuse-require_relative.patch vagrant-1.9.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.OSuFhp/_old 2017-03-12 20:03:18.319654815 +0100 +++ /var/tmp/diff_new_pack.OSuFhp/_new 2017-03-12 20:03:18.327653683 +0100 @@ -1,7 +1,7 @@ # # spec file for package vagrant # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Laurent Bigonville <[email protected]>, License GPL-2.0+ # # All modifications and additions to the file contributed by third parties @@ -22,7 +22,7 @@ %{!?vim_data_dir:%global vim_data_dir /usr/share/vim/%(readlink /usr/share/vim/current)} Name: vagrant -Version: 1.8.1 +Version: 1.9.1 Release: 0 Summary: Build and distribute virtualized development environments License: MIT @@ -36,17 +36,15 @@ Obsoletes: rubygem-vagrant < %{version} Recommends: vagrant-libvirt # -Patch2: 0002-Disable-Checkpoint.patch -Patch3: 0003-VERSION-fallback-to-usr-share-vagrant-version.txt.patch -Patch4: 0004-bin-vagrant-silence-warning-about-installer.patch -Patch5: 0005-Read-data-from-usr-share-vagrant.patch -Patch6: 0006-Look-up-vagrant-pre-rubygems.rb-from-the-installed-p.patch -Patch7: 0007-Make-Bundler-also-lookup-into-rubygems-integration-p.patch -Patch8: 0008-Use-a-private-temporary-dir.patch -Patch9: 0009-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch -Patch11: 0011-Support-system-installed-plugins.patch -Patch12: 0012-require-vagrant-version-from-system.patch -Patch13: 0011-Relax-dependency-resolution.patch +Patch1: 0001-Disable-Checkpoint.patch +Patch2: 0002-bin-vagrant-silence-warning-about-installer.patch +Patch3: 0003-Use-a-private-temporary-dir.patch +Patch4: 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch +Patch5: 0005-Support-system-installed-plugins.patch +Patch6: 0006-Relax-dependency-resolution.patch +Patch7: 0007-Update-command.rb.patch +Patch8: 0008-Read-data-from-usr-share-vagrant.patch +Patch9: 0009-plugins-don-t-abuse-require_relative.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # force only one ruby version @@ -55,35 +53,41 @@ # BuildRequires: %{ruby >= 2.0.0} BuildRequires: %{rubygem bundler} -BuildRequires: %{rubygem childprocess >= 0.3.7} -BuildRequires: %{rubygem erubis >= 2.7.0} -BuildRequires: %{rubygem i18n >= 0.6.0} +BuildRequires: %{rubygem childprocess} +# Prevent have choice for rubygem(ruby:2.2.0:erubis) +BuildRequires: %{rubygem erubis >= 2.7} +BuildRequires: %{rubygem i18n} BuildRequires: %{rubygem listen} -BuildRequires: %{rubygem log4r >= 1.1.9} -BuildRequires: %{rubygem mime-types:1} -BuildRequires: %{rubygem net-scp:1.1 >= 1.1.0} -BuildRequires: %{rubygem net-sftp >= 1.1.0} -BuildRequires: %{rubygem net-ssh >= 2.6.6} -BuildRequires: %{rubygem nokogiri} +BuildRequires: %{rubygem log4r} +# Prevent have choice for rubygem(ruby:2.2.0:net-scp) +BuildRequires: %{rubygem net-scp >= 1.2} +BuildRequires: %{rubygem net-sftp} +BuildRequires: %{rubygem net-ssh} +# 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} BuildRequires: ruby-macros >= 5 # inotify should go here -# BuildRequires: % {rubygem rb-kqueue:0.2 >= 0.2.0} +#BuildRequires: %{rubygem rb-kqueue} BuildRequires: %{rubygem rest-client} # -Requires: %{rubygem bundler} -Requires: %{rubygem childprocess >= 0.3.7} -Requires: %{rubygem erubis >= 2.7.0} -Requires: %{rubygem i18n >= 0.6.0} +Requires: %{rubygem childprocess} +# Prevent have choice for rubygem(ruby:2.2.0:erubis) +Requires: %{rubygem erubis >= 2.7} +Requires: %{rubygem i18n} Requires: %{rubygem listen} -Requires: %{rubygem log4r >= 1.1.9} -Requires: %{rubygem mime-types:1} -Requires: %{rubygem net-scp:1.1 >= 1.1.0} -Requires: %{rubygem net-sftp >= 1.1.0} -Requires: %{rubygem net-ssh >= 2.6.6} -Requires: %{rubygem nokogiri} +Requires: %{rubygem log4r} +# 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} # inotify should go here -# Requires: % {rubygem rb-kqueue:0.2 >= 0.2.0} +#Requires: %{rubygem rb-kqueue0} Requires: %{rubygem rest-client} +# We don't require rubygem mime-types since it's pulled in transitively # Requires: bsdtar Requires: curl @@ -127,6 +131,7 @@ %prep %setup -q -n %{mod_full_name} +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -135,9 +140,6 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 cp %{SOURCE3} . @@ -148,7 +150,8 @@ bundle exec bin/vagrant --version %install -%if %suse_version > 1315 +# Tumbleweed OR Leap 42.2+ +%if %suse_version >= 1320 || 0%{?sle_version} >= 120200 %gem_install -f --no-symlink-binaries %else %gem_install -f @@ -166,7 +169,8 @@ mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/vim/vagrantfile.vim %{buildroot}%{vim_data_dir}/plugin/%{mod_name}.vim mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/emacs/vagrant.el %{buildroot}%{_datadir}/emacs/site-lisp/%{mod_name}.el -%if %suse_version > 1315 +# Tumbleweed OR Leap 42.2+ +%if %suse_version >= 1320 || 0%{?sle_version} >= 120200 mv -v %{buildroot}%{_bindir}/vagrant.%{rb_default_ruby_suffix} %{buildroot}%{_bindir}/vagrant %endif ++++++ 0002-Disable-Checkpoint.patch -> 0001-Disable-Checkpoint.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0002-Disable-Checkpoint.patch 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/0001-Disable-Checkpoint.patch 2017-03-12 20:03:17.247806483 +0100 @@ -4,9 +4,12 @@ We don't want vagrant phoning home all the time --- - lib/vagrant/environment.rb | 38 ++------------------------------------ - 1 file changed, 2 insertions(+), 36 deletions(-) + lib/vagrant/environment.rb | 38 ++----------------------------------- + plugins/commands/version/command.rb | 29 ---------------------------- + 2 files changed, 2 insertions(+), 65 deletions(-) +diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb +index 96c9ada..d7ba556 100644 --- a/lib/vagrant/environment.rb +++ b/lib/vagrant/environment.rb @@ -4,7 +4,6 @@ require 'pathname' @@ -50,9 +53,9 @@ - end - # Setup the local data directory. If a configuration path is given, - # then it is expanded relative to the working directory. Otherwise, - # we use the default which is expanded relative to the root path. -@@ -283,14 +254,9 @@ module Vagrant + # it is expanded relative to the root path. Otherwise, we use the + # default (which is also expanded relative to the root path). +@@ -289,14 +260,9 @@ module Vagrant end end @@ -69,3 +72,43 @@ end # Makes a call to the CLI with the given arguments as if they +diff --git a/plugins/commands/version/command.rb b/plugins/commands/version/command.rb +index c3c47ac..654b251 100644 +--- a/plugins/commands/version/command.rb ++++ b/plugins/commands/version/command.rb +@@ -21,35 +21,6 @@ module VagrantPlugins + "vagrant.version_current", version: Vagrant::VERSION)) + @env.ui.machine("version-installed", Vagrant::VERSION) + +- # Load the latest information +- cp = @env.checkpoint +- if !cp +- @env.ui.output("\n"+I18n.t( +- "vagrant.version_no_checkpoint")) +- return 0 +- end +- +- latest = cp["current_version"] +- +- # Output latest version +- @env.ui.output(I18n.t( +- "vagrant.version_latest", version: latest)) +- @env.ui.machine("version-latest", latest) +- +- # Determine if its a new version, and if so, output some more +- # information. +- current = Gem::Version.new(Vagrant::VERSION) +- latest = Gem::Version.new(latest) +- if current >= latest +- @env.ui.success(" \n" + I18n.t( +- "vagrant.version_latest_installed")) +- return 0 +- end +- +- # Out of date! Let the user know how to upgrade. +- @env.ui.output(" \n" + I18n.t( +- "vagrant.version_upgrade_howto", version: latest.to_s)) +- + 0 + end + end ++++++ 0004-bin-vagrant-silence-warning-about-installer.patch -> 0002-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0004-bin-vagrant-silence-warning-about-installer.patch 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/0002-bin-vagrant-silence-warning-about-installer.patch 2017-03-12 20:03:17.263804219 +0100 @@ -7,10 +7,10 @@ 1 file changed, 5 deletions(-) diff --git a/bin/vagrant b/bin/vagrant -index fce68c8..452ace8 100755 +index 080b7a7..6667ab1 100755 --- a/bin/vagrant +++ b/bin/vagrant -@@ -164,11 +164,6 @@ begin +@@ -117,11 +117,6 @@ begin logger.debug("Creating Vagrant environment") env = Vagrant::Environment.new(opts) ++++++ 0008-Use-a-private-temporary-dir.patch -> 0003-Use-a-private-temporary-dir.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0008-Use-a-private-temporary-dir.patch 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/0003-Use-a-private-temporary-dir.patch 2017-03-12 20:03:17.279801955 +0100 @@ -6,12 +6,13 @@ of temporary files (~4 per vagrant invocation). --- lib/vagrant/box.rb | 3 ++- - lib/vagrant/bundler.rb | 9 ++++++--- lib/vagrant/util.rb | 1 + - lib/vagrant/util/tempfile.rb | 15 +++++++++++++++ - 4 files changed, 24 insertions(+), 4 deletions(-) + lib/vagrant/util/tempfile.rb | 39 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 lib/vagrant/util/tempfile.rb +diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb +index cd839ee..65eee88 100644 --- a/lib/vagrant/box.rb +++ b/lib/vagrant/box.rb @@ -9,6 +9,7 @@ require "vagrant/util/downloader" @@ -26,57 +27,13 @@ # @param [Hash] download_options Options to pass to the downloader. # @return [BoxMetadata] def load_metadata(**download_options) -- tf = Tempfile.new("vagrant") -+ tf = Util::Tempfile.new("box") +- tf = Tempfile.new("vagrant-load-metadata") ++ tf = Util::Tempfile.new("vagrant-load-metadata") tf.close url = @metadata_url ---- a/lib/vagrant/bundler.rb -+++ b/lib/vagrant/bundler.rb -@@ -9,6 +9,8 @@ require_relative "shared_helpers" - require_relative "version" - require_relative "util/safe_env" - -+require 'vagrant/util/tempfile' -+ - module Vagrant - # This class manages Vagrant's interaction with Bundler. Vagrant uses - # Bundler as a way to properly resolve all dependencies of Vagrant and -@@ -55,13 +57,13 @@ module Vagrant - - # Setup the "local" Bundler configuration. We need to set BUNDLE_PATH - # because the existence of this actually suppresses `sudo`. -- @appconfigpath = Dir.mktmpdir -+ @appconfigpath = Util::Tempfile.private_tmpdir - File.open(File.join(@appconfigpath, "config"), "w+") do |f| - f.write("BUNDLE_PATH: \"#{bundle_path}\"") - end - - # Setup the Bundler configuration -- @configfile = File.open(Tempfile.new("vagrant").path + "1", "w+") -+ @configfile = File.open(Util::Tempfile.new("vagrant").path + "1", "w+") - @configfile.close - - # Build up the Gemfile for our Bundler context. We make sure to -@@ -184,7 +186,8 @@ module Vagrant - def build_gemfile(plugins) - sources = plugins.values.map { |p| p["sources"] }.flatten.compact.uniq - -- f = File.open(Tempfile.new("vagrant").path + "2", "w+") -+ -+ f = File.open(Util::Tempfile.new("vagrant").path, "w+") - f.tap do |gemfile| - sources.each do |source| - next if source == "" -@@ -257,7 +260,7 @@ module Vagrant - # native extensions because it causes all sorts of problems. - old_rubyopt = ENV["RUBYOPT"] - old_gemfile = ENV["BUNDLE_GEMFILE"] -- ENV["BUNDLE_GEMFILE"] = Tempfile.new("vagrant-gemfile").path -+ ENV["BUNDLE_GEMFILE"] = Util::Tempfile.new("vagrant-gemfile").path - ENV["RUBYOPT"] = (ENV["RUBYOPT"] || "").gsub(/-rbundler\/setup\s*/, "") - - # Set the GEM_HOME so gems are installed only to our local gem dir +diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb +index 07f3b18..a806ba5 100644 --- a/lib/vagrant/util.rb +++ b/lib/vagrant/util.rb @@ -8,6 +8,7 @@ module Vagrant @@ -85,12 +42,16 @@ autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner' + autoload :Tempfile, 'vagrant/util/tempfile' autoload :TemplateRenderer, 'vagrant/util/template_renderer' + autoload :StringBlockEditor, 'vagrant/util/string_block_editor' autoload :Subprocess, 'vagrant/util/subprocess' - end +diff --git a/lib/vagrant/util/tempfile.rb b/lib/vagrant/util/tempfile.rb +new file mode 100644 +index 0000000..0cbbb53 --- /dev/null +++ b/lib/vagrant/util/tempfile.rb -@@ -0,0 +1,33 @@ +@@ -0,0 +1,39 @@ +require 'fileutils' ++require 'tmpdir' + +module Vagrant + module Util @@ -116,6 +77,11 @@ + end + end + ++ def self.mktmpdir(prefix_suffix) ++ Dir.mktmpdir(prefix_suffix, private_tmpdir) ++ end ++ ++ + end + end +end ++++++ 0009-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch -> 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0009-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch 2017-03-12 20:03:17.291800258 +0100 @@ -10,7 +10,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/guests/linux/cap/halt.rb b/plugins/guests/linux/cap/halt.rb -index 6125a20..8baa0d2 100644 +index 60dc5dd..657636e 100644 --- a/plugins/guests/linux/cap/halt.rb +++ b/plugins/guests/linux/cap/halt.rb @@ -4,7 +4,7 @@ module VagrantPlugins @@ -19,6 +19,6 @@ begin - machine.communicate.sudo("shutdown -h now") + machine.communicate.sudo("shutdown -h now &") - rescue IOError + rescue IOError, Vagrant::Errors::SSHDisconnected # Do nothing, because it probably means the machine shut down # and SSH connection was lost. ++++++ 0011-Support-system-installed-plugins.patch -> 0005-Support-system-installed-plugins.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0011-Support-system-installed-plugins.patch 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/0005-Support-system-installed-plugins.patch 2017-03-12 20:03:17.303798560 +0100 @@ -17,11 +17,11 @@ } --- lib/vagrant/plugin/manager.rb | 4 ++-- - lib/vagrant/plugin/state_file.rb | 28 +++++++++++++++++++++++++--- - 2 files changed, 27 insertions(+), 5 deletions(-) + lib/vagrant/plugin/state_file.rb | 22 +++++++++++++++++++++- + 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb -index dfaab2e..35122e0 100644 +index 4f875fd..9aecb80 100644 --- a/lib/vagrant/plugin/manager.rb +++ b/lib/vagrant/plugin/manager.rb @@ -18,7 +18,7 @@ module Vagrant @@ -43,10 +43,10 @@ # Installs another plugin into our gem directory. diff --git a/lib/vagrant/plugin/state_file.rb b/lib/vagrant/plugin/state_file.rb -index f41da1b..717b353 100644 +index 85db50b..9e12591 100644 --- a/lib/vagrant/plugin/state_file.rb +++ b/lib/vagrant/plugin/state_file.rb -@@ -5,8 +5,9 @@ module Vagrant +@@ -7,8 +7,9 @@ module Vagrant # This is a helper to deal with the plugin state file that Vagrant # uses to track what plugins are installed and activated and such. class StateFile @@ -57,7 +57,7 @@ @data = {} if @path.exist? -@@ -22,6 +23,21 @@ module Vagrant +@@ -24,6 +25,21 @@ module Vagrant @data["version"] ||= "1" @data["installed"] ||= {} @@ -79,20 +79,14 @@ end # Add a plugin that is installed to the state file. -@@ -91,8 +107,14 @@ module Vagrant - - # This saves the state back into the state file. - def save! -- @path.open("w+") do |f| -- f.write(JSON.dump(@data)) -+ begin -+ @path.open("w+") do |f| -+ f.write(JSON.dump(@data)) -+ end -+ rescue Errno::EACCES -+ # Ignore permission denied against system-installed plugins; regular -+ # users are not supposed to write there. -+ raise unless @system +@@ -102,6 +118,10 @@ module Vagrant + f.close + FileUtils.mv(f.path, @path) end ++ rescue Errno::EACCES ++ # Ignore permission denied against system-installed plugins; regular ++ # users are not supposed to write there. ++ raise unless @system end + protected ++++++ 0011-Relax-dependency-resolution.patch -> 0006-Relax-dependency-resolution.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0011-Relax-dependency-resolution.patch 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/0006-Relax-dependency-resolution.patch 2017-03-12 20:03:17.315796862 +0100 @@ -4,9 +4,11 @@ --- Gemfile | 6 ------ - vagrant.gemspec | 34 +++++++++++----------------------- - 2 files changed, 11 insertions(+), 29 deletions(-) + vagrant.gemspec | 45 +++++++++++++++------------------------------ + 2 files changed, 15 insertions(+), 36 deletions(-) +diff --git a/Gemfile b/Gemfile +index 15f2458..b4e2a20 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,3 @@ @@ -19,24 +21,49 @@ -else - gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"; -end +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 3c74eb1..f7da9f6 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec -@@ -15,29 +15,17 @@ Gem::Specification.new do |s| +@@ -16,36 +16,21 @@ 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.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" -- s.add_dependency "listen", "~> 3.0.2" +- 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-sftp", "~> 2.1" - s.add_dependency "net-scp", "~> 1.1.0" - s.add_dependency "rb-kqueue", "~> 0.2.0" -+ s.add_dependency "bundler" +- 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" +- +- # We lock this down to avoid compilation issues. +- s.add_dependency "nokogiri", "= 1.6.7.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" +- +- # Constraint rake to properly handle deprecated method usage +- # from within rspec +- s.add_development_dependency "rake", "~> 11.3.0" +- s.add_development_dependency "rspec", "~> 2.14.0" +- s.add_development_dependency "webmock", "~> 1.20" +- s.add_development_dependency "fake_ftp", "~> 0.1" ++ ######################################################################## ++ # On Debian, it not viable to lock down much of the dependencies because they ++ # are shared across applications in the entire archive. So here we are being ++ # optimistic and replacing `=` with `~>`. ++ ######################################################################## + s.add_dependency "childprocess" + s.add_dependency "erubis" + s.add_dependency "i18n" @@ -45,18 +72,7 @@ + s.add_dependency "net-ssh" + s.add_dependency "net-sftp" + s.add_dependency "net-scp" - 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 "rest-client" + s.add_dependency "nokogiri" # The following block of code determines the files that should be included ++++++ 0007-Update-command.rb.patch ++++++ From: "Raymond P. Burkholder" <[email protected]> Date: Wed, 28 Dec 2016 19:02:13 -0400 Subject: Update command.rb Issue #8159 while using: $ vagrant package --base ${VIRTUALBOXNAME} this error occurs: /usr/share/rubygems-integration/all/gems/vagrant-1.9.0/plugins/commands/package/command.rb:59:in `package_base': uninitialized constant VagrantPlugins::CommandPackage::Command::SecureRandom (NameError) Did you mean? SecureRandom from /usr/share/rubygems-integration/all/gems/vagrant-1.9.0/plugins/commands/package/command.rb:42:in `execute' from /usr/share/rubygems-integration/all/gems/vagrant-1.9.0/lib/vagrant/cli.rb:42:in `execute' from /usr/share/rubygems-integration/all/gems/vagrant-1.9.0/lib/vagrant/environment.rb:274:in `cli' from /usr/share/rubygems-integration/all/gems/vagrant-1.9.0/bin/vagrant:118:in `<top (required)>' from /usr/bin/vagrant:22:in `load' from /usr/bin/vagrant:22:in `<main>' --- plugins/commands/package/command.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/commands/package/command.rb b/plugins/commands/package/command.rb index bae90b8..303867c 100644 --- a/plugins/commands/package/command.rb +++ b/plugins/commands/package/command.rb @@ -1,4 +1,5 @@ require 'optparse' +require 'securerandom' module VagrantPlugins module CommandPackage ++++++ 0005-Read-data-from-usr-share-vagrant.patch -> 0008-Read-data-from-usr-share-vagrant.patch ++++++ --- /work/SRC/openSUSE:Factory/vagrant/0005-Read-data-from-usr-share-vagrant.patch 2016-04-12 19:31:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new/0008-Read-data-from-usr-share-vagrant.patch 2017-03-12 20:03:17.343792900 +0100 @@ -10,7 +10,7 @@ index fe11401..edf21ea 100644 --- a/lib/vagrant/shared_helpers.rb +++ b/lib/vagrant/shared_helpers.rb -@@ -72,7 +72,17 @@ module Vagrant +@@ -79,7 +79,17 @@ module Vagrant # # @return [Pathname] def self.source_root ++++++ 0009-plugins-don-t-abuse-require_relative.patch ++++++ diff --git a/plugins/guests/arch/cap/configure_networks.rb b/plugins/guests/arch/cap/configure_networks.rb index 0c748b3..57b3496 100644 --- a/plugins/guests/arch/cap/configure_networks.rb +++ b/plugins/guests/arch/cap/configure_networks.rb @@ -2,7 +2,7 @@ require "ipaddr" require "socket" require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestArch diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb index 263fe92..9f5e540 100644 --- a/plugins/guests/debian/cap/configure_networks.rb +++ b/plugins/guests/debian/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 GuestDebian diff --git a/plugins/guests/freebsd/cap/configure_networks.rb b/plugins/guests/freebsd/cap/configure_networks.rb index 8e5627b..f9e761e 100644 --- a/plugins/guests/freebsd/cap/configure_networks.rb +++ b/plugins/guests/freebsd/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 GuestFreeBSD diff --git a/plugins/guests/funtoo/cap/configure_networks.rb b/plugins/guests/funtoo/cap/configure_networks.rb index 6e20dc2..1b41340 100644 --- a/plugins/guests/funtoo/cap/configure_networks.rb +++ b/plugins/guests/funtoo/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 GuestFuntoo diff --git a/plugins/guests/gentoo/cap/configure_networks.rb b/plugins/guests/gentoo/cap/configure_networks.rb index 38b1850..5675015 100644 --- a/plugins/guests/gentoo/cap/configure_networks.rb +++ b/plugins/guests/gentoo/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 GuestGentoo diff --git a/plugins/guests/netbsd/cap/configure_networks.rb b/plugins/guests/netbsd/cap/configure_networks.rb index d53b6c6..922edfd 100644 --- a/plugins/guests/netbsd/cap/configure_networks.rb +++ b/plugins/guests/netbsd/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 GuestNetBSD diff --git a/plugins/guests/nixos/cap/configure_networks.rb b/plugins/guests/nixos/cap/configure_networks.rb index 9645862..ed37176 100644 --- a/plugins/guests/nixos/cap/configure_networks.rb +++ b/plugins/guests/nixos/cap/configure_networks.rb @@ -1,7 +1,7 @@ require "ipaddr" require "tempfile" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" module VagrantPlugins module GuestNixos diff --git a/plugins/guests/openbsd/cap/configure_networks.rb b/plugins/guests/openbsd/cap/configure_networks.rb index 30c4be0..64989d1 100644 --- a/plugins/guests/openbsd/cap/configure_networks.rb +++ b/plugins/guests/openbsd/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 GuestOpenBSD diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb index 3964579..64b2052 100644 --- a/plugins/guests/redhat/cap/configure_networks.rb +++ b/plugins/guests/redhat/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 GuestRedHat diff --git a/plugins/guests/slackware/cap/configure_networks.rb b/plugins/guests/slackware/cap/configure_networks.rb index b11b93e..0f18027 100644 --- a/plugins/guests/slackware/cap/configure_networks.rb +++ b/plugins/guests/slackware/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 GuestSlackware diff --git a/plugins/guests/suse/cap/configure_networks.rb b/plugins/guests/suse/cap/configure_networks.rb index 2dd1402..e6dd96f 100644 --- a/plugins/guests/suse/cap/configure_networks.rb +++ b/plugins/guests/suse/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 GuestSUSE ++++++ vagrant-1.8.1.tar.gz -> vagrant-1.9.1.tar.gz ++++++ ++++ 80636 lines of diff (skipped)
