From b9455818eb8e8c439abe615cc30331ad1534eb4f5daeb7c606bdaf714ab21457 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 31 Aug 2017 19:03:29 +0000 Subject: [PATCH] Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3 --- 0001-Disable-Checkpoint.patch | 14 +- ...rant-silence-warning-about-installer.patch | 26 +++- 0003-Use-a-private-temporary-dir.patch | 25 +-- ...on-t-wait-for-shutdown-h-now-to-fini.patch | 10 +- 0005-Support-system-installed-plugins.patch | 92 ----------- 0006-Relax-dependency-resolution.patch | 69 ++------- 0007-Update-command.rb.patch | 33 ---- 0008-Read-data-from-usr-share-vagrant.patch | 11 +- ...plugins-don-t-abuse-require_relative.patch | 48 ++++-- 0020-also-build-with-ruby2.4.patch | 26 ++++ ...ead-of-Fixnum-for-Ruby-2.4-compatibi.patch | 145 ++++++++++++++++++ 0022-Do-not-use-deprecated-API.patch | 26 ++++ 0023-vbox-fix-package.patch | 20 +++ 0024-do-not-depend-on-wdm.patch | 11 ++ vagrant-1.9.1.tar.gz | 3 - vagrant-1.9.7.tar.gz | 3 + vagrant.changes | 54 +++++++ vagrant.spec | 44 +++++- 18 files changed, 430 insertions(+), 230 deletions(-) delete mode 100644 0005-Support-system-installed-plugins.patch delete mode 100644 0007-Update-command.rb.patch create mode 100644 0020-also-build-with-ruby2.4.patch create mode 100644 0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch create mode 100644 0022-Do-not-use-deprecated-API.patch create mode 100644 0023-vbox-fix-package.patch create mode 100644 0024-do-not-depend-on-wdm.patch delete mode 100644 vagrant-1.9.1.tar.gz create mode 100644 vagrant-1.9.7.tar.gz diff --git a/0001-Disable-Checkpoint.patch b/0001-Disable-Checkpoint.patch index 6a752ba..6c65c73 100644 --- a/0001-Disable-Checkpoint.patch +++ b/0001-Disable-Checkpoint.patch @@ -1,15 +1,18 @@ +From f12371988e650c372b44acb3347fc4348476e082 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:48:07 -0300 -Subject: Disable Checkpoint +Subject: [PATCH] Disable Checkpoint We don't want vagrant phoning home all the time + +Signed-off-by: Johannes Kastl --- 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 +index 125070f3d..5d41ff028 100644 --- a/lib/vagrant/environment.rb +++ b/lib/vagrant/environment.rb @@ -4,7 +4,6 @@ require 'pathname' @@ -66,14 +69,14 @@ index 96c9ada..d7ba556 100644 - # @return [Hash] + # Usage of the checkpoint service is disabled in the Debian package. def checkpoint -- @checkpoint_thr.join +- @checkpoint_thr.join(THREAD_MAX_JOIN_TIMEOUT) - return @checkpoint_thr[:result] + nil 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 +index c3c47acfa..654b2516a 100644 --- a/plugins/commands/version/command.rb +++ b/plugins/commands/version/command.rb @@ -21,35 +21,6 @@ module VagrantPlugins @@ -112,3 +115,6 @@ index c3c47ac..654b251 100644 0 end end +-- +2.13.0 + diff --git a/0002-bin-vagrant-silence-warning-about-installer.patch b/0002-bin-vagrant-silence-warning-about-installer.patch index d1873e0..e5765bb 100644 --- a/0002-bin-vagrant-silence-warning-about-installer.patch +++ b/0002-bin-vagrant-silence-warning-about-installer.patch @@ -1,19 +1,32 @@ +From 246fe8ff4bb69cfffa7e44e4e571f2febc5e7719 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: bin/vagrant: silence warning about installer +Subject: [PATCH] bin/vagrant: silence warning about installer +Signed-off-by: Johannes Kastl --- - bin/vagrant | 5 ----- - 1 file changed, 5 deletions(-) + bin/vagrant | 16 ---------------- + 1 file changed, 16 deletions(-) diff --git a/bin/vagrant b/bin/vagrant -index 080b7a7..6667ab1 100755 +index 19df75033..6667ab152 100755 --- a/bin/vagrant +++ b/bin/vagrant -@@ -117,11 +117,6 @@ begin +@@ -117,22 +117,6 @@ begin logger.debug("Creating Vagrant environment") env = Vagrant::Environment.new(opts) +- # If we are running with the Windows Subsystem for Linux do +- # some extra setup to allow access to Vagrant managed machines +- # outside the subsystem +- if Vagrant::Util::Platform.wsl? +- recreate_env = Vagrant::Util::Platform.wsl_init(env, logger) +- if recreate_env +- logger.info("Re-creating Vagrant environment due to WSL modifications.") +- env = Vagrant::Environment.new(opts) +- end +- end +- - if !Vagrant.in_installer? && !Vagrant.very_quiet? - # If we're not in the installer, warn. - env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) @@ -22,3 +35,6 @@ index 080b7a7..6667ab1 100755 begin # Execute the CLI interface, and exit with the proper error code exit_status = env.cli(argv) +-- +2.13.0 + diff --git a/0003-Use-a-private-temporary-dir.patch b/0003-Use-a-private-temporary-dir.patch index e21f506..3e4f382 100644 --- a/0003-Use-a-private-temporary-dir.patch +++ b/0003-Use-a-private-temporary-dir.patch @@ -1,18 +1,21 @@ +From 7ceb61fdbfc9e62e199e4f306474ba5b65f080c9 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: Use a private temporary dir +Subject: [PATCH] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). + +Signed-off-by: Johannes Kastl --- lib/vagrant/box.rb | 3 ++- - lib/vagrant/util.rb | 1 + + lib/vagrant/util.rb | 2 ++ lib/vagrant/util/tempfile.rb | 39 +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 42 insertions(+), 1 deletion(-) + 3 files changed, 43 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 +index cd839ee91..65eee8828 100644 --- a/lib/vagrant/box.rb +++ b/lib/vagrant/box.rb @@ -9,6 +9,7 @@ require "vagrant/util/downloader" @@ -33,20 +36,21 @@ index cd839ee..65eee88 100644 url = @metadata_url diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb -index 07f3b18..a806ba5 100644 +index 313e1bd19..6e6f669f4 100644 --- a/lib/vagrant/util.rb +++ b/lib/vagrant/util.rb -@@ -8,6 +8,7 @@ module Vagrant - autoload :Retryable, 'vagrant/util/retryable' +@@ -13,6 +13,8 @@ module Vagrant autoload :SafeExec, 'vagrant/util/safe_exec' + autoload :SilenceWarnings, 'vagrant/util/silence_warnings' autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner' + autoload :Tempfile, 'vagrant/util/tempfile' - autoload :TemplateRenderer, 'vagrant/util/template_renderer' ++ autoload :TemplateRenderer, 'vagrant/util/template_renderer' autoload :StringBlockEditor, 'vagrant/util/string_block_editor' autoload :Subprocess, 'vagrant/util/subprocess' + autoload :TemplateRenderer, 'vagrant/util/template_renderer' diff --git a/lib/vagrant/util/tempfile.rb b/lib/vagrant/util/tempfile.rb new file mode 100644 -index 0000000..0cbbb53 +index 000000000..0cbbb53ac --- /dev/null +++ b/lib/vagrant/util/tempfile.rb @@ -0,0 +1,39 @@ @@ -89,3 +93,6 @@ index 0000000..0cbbb53 +at_exit do + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end +-- +2.13.0 + diff --git a/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch b/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch index e6a5f21..a48cd38 100644 --- a/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch +++ b/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch @@ -1,16 +1,19 @@ +From 68b48e8ac3316ea157e28a3b02b38f3334a7d985 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 3 Feb 2015 10:35:17 -0200 -Subject: linux/cap/halt: don't wait for `shutdown -h now` to finish +Subject: [PATCH] linux/cap/halt: don't wait for `shutdown -h now` to finish When running a Debian 8 lxc guest (with the vagrant-lxc plugin), which has systemd as init system, `vagrant halt` will hang waiting for `shutdown -h now` to return. + +Signed-off-by: Johannes Kastl --- plugins/guests/linux/cap/halt.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/guests/linux/cap/halt.rb b/plugins/guests/linux/cap/halt.rb -index 60dc5dd..657636e 100644 +index 60dc5dde4..657636eaf 100644 --- a/plugins/guests/linux/cap/halt.rb +++ b/plugins/guests/linux/cap/halt.rb @@ -4,7 +4,7 @@ module VagrantPlugins @@ -22,3 +25,6 @@ index 60dc5dd..657636e 100644 rescue IOError, Vagrant::Errors::SSHDisconnected # Do nothing, because it probably means the machine shut down # and SSH connection was lost. +-- +2.13.0 + diff --git a/0005-Support-system-installed-plugins.patch b/0005-Support-system-installed-plugins.patch deleted file mode 100644 index fa60b65..0000000 --- a/0005-Support-system-installed-plugins.patch +++ /dev/null @@ -1,92 +0,0 @@ -From: Antonio Terceiro -Date: Wed, 27 May 2015 09:36:17 -0300 -Subject: Support system-installed plugins - -Plugins must be installed as regular Ruby libraries, and they must -contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the -following content: - -{ - "${PLUGINNAME}": { - "ruby_version":"$(ruby -e 'puts RUBY_VERSION')", - "vagrant_version":"$(cat /usr/share/vagrant/version.txt)", - "gem_version":"", - "require":"", - "sources":[] - } -} ---- - lib/vagrant/plugin/manager.rb | 4 ++-- - 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 4f875fd..9aecb80 100644 ---- a/lib/vagrant/plugin/manager.rb -+++ b/lib/vagrant/plugin/manager.rb -@@ -18,7 +18,7 @@ module Vagrant - - # Returns the path to the [StateFile] for system plugins. - def self.system_plugins_file -- dir = Vagrant.installer_embedded_dir -+ dir = '/usr/share/vagrant-plugins' - return nil if !dir - Pathname.new(dir).join("plugins.json") - end -@@ -33,7 +33,7 @@ module Vagrant - - system_path = self.class.system_plugins_file - @system_file = nil -- @system_file = StateFile.new(system_path) if system_path && system_path.file? -+ @system_file = StateFile.new(system_path, true) if system_path && system_path.file? - end - - # Installs another plugin into our gem directory. -diff --git a/lib/vagrant/plugin/state_file.rb b/lib/vagrant/plugin/state_file.rb -index 85db50b..9e12591 100644 ---- a/lib/vagrant/plugin/state_file.rb -+++ b/lib/vagrant/plugin/state_file.rb -@@ -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 -- def initialize(path) -+ def initialize(path, system = false) - @path = path -+ @system = system - - @data = {} - if @path.exist? -@@ -24,6 +25,21 @@ module Vagrant - - @data["version"] ||= "1" - @data["installed"] ||= {} -+ load_extra_plugins -+ end -+ -+ def load_extra_plugins -+ extra_plugins = Dir.glob(@path.dirname.join('plugins.d', '*.json')) -+ extra_plugins.each do |filename| -+ json = File.read(filename) -+ begin -+ plugin_data = JSON.parse(json) -+ @data["installed"].merge!(plugin_data) -+ rescue JSON::ParserError => e -+ raise Vagrant::Errors::PluginStateFileParseError, -+ path: filename, message: e.message -+ end -+ end - end - - # Add a plugin that is installed to the state file. -@@ -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 diff --git a/0006-Relax-dependency-resolution.patch b/0006-Relax-dependency-resolution.patch index 289d11c..528fc49 100644 --- a/0006-Relax-dependency-resolution.patch +++ b/0006-Relax-dependency-resolution.patch @@ -1,14 +1,16 @@ +From f1ca337645e6a3b55fba063b1f2972d190c82d6b Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sun, 16 Aug 2015 10:45:47 +0200 -Subject: Relax dependency resolution +Subject: [PATCH] Relax dependency resolution +Signed-off-by: Johannes Kastl --- Gemfile | 6 ------ - vagrant.gemspec | 45 +++++++++++++++------------------------------ - 2 files changed, 15 insertions(+), 36 deletions(-) + vagrant.gemspec | 25 +++++++++++++++---------- + 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile -index 15f2458..b4e2a20 100644 +index 15f245819..b4e2a20bb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,3 @@ @@ -21,59 +23,6 @@ index 15f2458..b4e2a20 100644 -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 -@@ -16,36 +16,21 @@ Gem::Specification.new do |s| - s.required_rubygems_version = ">= 1.3.6" - s.rubyforge_project = "vagrant" - -- 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", "~> 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 "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" -+ s.add_dependency "listen" -+ s.add_dependency "log4r" -+ s.add_dependency "net-ssh" -+ s.add_dependency "net-sftp" -+ s.add_dependency "net-scp" -+ s.add_dependency "rest-client" -+ s.add_dependency "nokogiri" - - # 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 +-- +2.13.0 + diff --git a/0007-Update-command.rb.patch b/0007-Update-command.rb.patch deleted file mode 100644 index 06e2a76..0000000 --- a/0007-Update-command.rb.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: "Raymond P. Burkholder" -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 `' - from /usr/bin/vagrant:22:in `load' - from /usr/bin/vagrant:22:in `
' ---- - 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 diff --git a/0008-Read-data-from-usr-share-vagrant.patch b/0008-Read-data-from-usr-share-vagrant.patch index b343e7b..e0955dd 100644 --- a/0008-Read-data-from-usr-share-vagrant.patch +++ b/0008-Read-data-from-usr-share-vagrant.patch @@ -1,16 +1,18 @@ +From 3597147739d63a6ed9006ab461bcb92afc8f834f Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:55:21 -0300 -Subject: Read data from /usr/share/vagrant +Subject: [PATCH] Read data from /usr/share/vagrant +Signed-off-by: Johannes Kastl --- lib/vagrant/shared_helpers.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb -index fe11401..edf21ea 100644 +index 5522272d3..305d73db1 100644 --- a/lib/vagrant/shared_helpers.rb +++ b/lib/vagrant/shared_helpers.rb -@@ -79,7 +79,17 @@ module Vagrant +@@ -85,7 +85,17 @@ module Vagrant # # @return [Pathname] def self.source_root @@ -29,3 +31,6 @@ index fe11401..edf21ea 100644 end # This returns the path to the ~/.vagrant.d folder where Vagrant's +-- +2.13.0 + diff --git a/0009-plugins-don-t-abuse-require_relative.patch b/0009-plugins-don-t-abuse-require_relative.patch index 561ac13..538036e 100644 --- a/0009-plugins-don-t-abuse-require_relative.patch +++ b/0009-plugins-don-t-abuse-require_relative.patch @@ -1,5 +1,25 @@ +From 9a3b6124412483cd2fa3779fade3387e96917caf Mon Sep 17 00:00:00 2001 +From: Johannes Kastl +Date: Wed, 17 May 2017 09:09:57 +0200 +Subject: [PATCH] plugins-don-t-abuse-require_relative.patch + +Signed-off-by: Johannes Kastl +--- + plugins/guests/arch/cap/configure_networks.rb | 2 +- + plugins/guests/debian/cap/configure_networks.rb | 2 +- + plugins/guests/freebsd/cap/configure_networks.rb | 2 +- + plugins/guests/funtoo/cap/configure_networks.rb | 2 +- + plugins/guests/gentoo/cap/configure_networks.rb | 2 +- + plugins/guests/netbsd/cap/configure_networks.rb | 2 +- + plugins/guests/nixos/cap/configure_networks.rb | 2 +- + plugins/guests/openbsd/cap/configure_networks.rb | 2 +- + plugins/guests/redhat/cap/configure_networks.rb | 2 +- + plugins/guests/slackware/cap/configure_networks.rb | 2 +- + plugins/guests/suse/cap/configure_networks.rb | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + diff --git a/plugins/guests/arch/cap/configure_networks.rb b/plugins/guests/arch/cap/configure_networks.rb -index 0c748b3..57b3496 100644 +index 0ef71d55f..df0bd0f8f 100644 --- a/plugins/guests/arch/cap/configure_networks.rb +++ b/plugins/guests/arch/cap/configure_networks.rb @@ -2,7 +2,7 @@ require "ipaddr" @@ -12,7 +32,7 @@ index 0c748b3..57b3496 100644 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 +index 99d6681de..3b582b159 100644 --- a/plugins/guests/debian/cap/configure_networks.rb +++ b/plugins/guests/debian/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -24,7 +44,7 @@ index 263fe92..9f5e540 100644 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 +index 8e5627b5e..f9e761ee7 100644 --- a/plugins/guests/freebsd/cap/configure_networks.rb +++ b/plugins/guests/freebsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -36,7 +56,7 @@ index 8e5627b..f9e761e 100644 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 +index 6e20dc237..1b41340c1 100644 --- a/plugins/guests/funtoo/cap/configure_networks.rb +++ b/plugins/guests/funtoo/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -48,11 +68,12 @@ index 6e20dc2..1b41340 100644 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 +index f7464432c..002271b71 100644 --- a/plugins/guests/gentoo/cap/configure_networks.rb +++ b/plugins/guests/gentoo/cap/configure_networks.rb -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ require "tempfile" + require "ipaddr" -require_relative "../../../../lib/vagrant/util/template_renderer" +require "vagrant/util/template_renderer" @@ -60,7 +81,7 @@ index 38b1850..5675015 100644 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 +index d53b6c6e4..922edfdab 100644 --- a/plugins/guests/netbsd/cap/configure_networks.rb +++ b/plugins/guests/netbsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -72,7 +93,7 @@ index d53b6c6..922edfd 100644 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 +index 96458622f..ed371765e 100644 --- a/plugins/guests/nixos/cap/configure_networks.rb +++ b/plugins/guests/nixos/cap/configure_networks.rb @@ -1,7 +1,7 @@ @@ -85,7 +106,7 @@ index 9645862..ed37176 100644 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 +index 30c4be060..64989d103 100644 --- a/plugins/guests/openbsd/cap/configure_networks.rb +++ b/plugins/guests/openbsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -97,7 +118,7 @@ index 30c4be0..64989d1 100644 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 +index 44fa5fa67..58ac7a31c 100644 --- a/plugins/guests/redhat/cap/configure_networks.rb +++ b/plugins/guests/redhat/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -109,7 +130,7 @@ index 3964579..64b2052 100644 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 +index b11b93e98..0f180275f 100644 --- a/plugins/guests/slackware/cap/configure_networks.rb +++ b/plugins/guests/slackware/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -121,7 +142,7 @@ index b11b93e..0f18027 100644 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 +index 2dd140230..e6dd96f08 100644 --- a/plugins/guests/suse/cap/configure_networks.rb +++ b/plugins/guests/suse/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -132,3 +153,6 @@ index 2dd1402..e6dd96f 100644 module VagrantPlugins module GuestSUSE +-- +2.13.0 + diff --git a/0020-also-build-with-ruby2.4.patch b/0020-also-build-with-ruby2.4.patch new file mode 100644 index 0000000..a715fe3 --- /dev/null +++ b/0020-also-build-with-ruby2.4.patch @@ -0,0 +1,26 @@ +From 9e12cba5e8be3df9dfe5768913dec6a04341b35c Mon Sep 17 00:00:00 2001 +From: Johannes Kastl +Date: Mon, 24 Jul 2017 21:47:17 +0200 +Subject: [PATCH] also build with ruby2.4 + +Signed-off-by: Johannes Kastl +--- + vagrant.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index c92ca1701..8a839ca41 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -12,7 +12,7 @@ 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" + +-- +2.13.3 + diff --git a/0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch b/0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch new file mode 100644 index 0000000..114bf52 --- /dev/null +++ b/0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch @@ -0,0 +1,145 @@ +From 3cdd1d09f9617e6005fc643000b5486ffbe22577 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Tue, 14 Feb 2017 10:13:29 +0100 +Subject: [PATCH] Use Integer instead of Fixnum for Ruby 2.4+ compatibility. + +Signed-off-by: Johannes Kastl +--- + lib/vagrant/cli.rb | 2 +- + lib/vagrant/plugin/v2/communicator.rb | 2 +- + lib/vagrant/registry.rb | 2 +- + plugins/provisioners/shell/config.rb | 4 ++-- + plugins/pushes/local-exec/config.rb | 4 ++-- + test/unit/plugins/provisioners/shell/config_test.rb | 6 +++--- + test/unit/plugins/pushes/local-exec/config_test.rb | 4 ++-- + 7 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/lib/vagrant/cli.rb b/lib/vagrant/cli.rb +index a6e9655f0..cca8c0184 100644 +--- a/lib/vagrant/cli.rb ++++ b/lib/vagrant/cli.rb +@@ -45,7 +45,7 @@ module Vagrant + result = 1 + end + +- result = 0 if !result.is_a?(Fixnum) ++ result = 0 if !result.is_a?(Integer) + return result + end + +diff --git a/lib/vagrant/plugin/v2/communicator.rb b/lib/vagrant/plugin/v2/communicator.rb +index 511fb6002..41385f486 100644 +--- a/lib/vagrant/plugin/v2/communicator.rb ++++ b/lib/vagrant/plugin/v2/communicator.rb +@@ -50,7 +50,7 @@ module Vagrant + # until then. It will wait up to the given duration or raise an + # exception if something goes wrong. + # +- # @param [Fixnum] duration Timeout in seconds. ++ # @param [Integer] duration Timeout in seconds. + # @return [Boolean] Will return true on successful connection + # or false on timeout. + def wait_for_ready(duration) +diff --git a/lib/vagrant/registry.rb b/lib/vagrant/registry.rb +index d84a745a5..c0c4e1bad 100644 +--- a/lib/vagrant/registry.rb ++++ b/lib/vagrant/registry.rb +@@ -52,7 +52,7 @@ module Vagrant + + # Return the number of elements in this registry. + # +- # @return [Fixnum] ++ # @return [Integer] + def length + @items.keys.length + end +diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb +index 049eb15d0..05da320e3 100644 +--- a/plugins/provisioners/shell/config.rb ++++ b/plugins/provisioners/shell/config.rb +@@ -106,10 +106,10 @@ module VagrantPlugins + def args_valid? + return true if !args + return true if args.is_a?(String) +- return true if args.is_a?(Fixnum) ++ return true if args.is_a?(Integer) + if args.is_a?(Array) + args.each do |a| +- return false if !a.kind_of?(String) && !a.kind_of?(Fixnum) ++ return false if !a.kind_of?(String) && !a.kind_of?(Integer) + end + + return true +diff --git a/plugins/pushes/local-exec/config.rb b/plugins/pushes/local-exec/config.rb +index d62dfa8fa..9ed466088 100644 +--- a/plugins/pushes/local-exec/config.rb ++++ b/plugins/pushes/local-exec/config.rb +@@ -63,10 +63,10 @@ module VagrantPlugins + def args_valid? + return true if !args + return true if args.is_a?(String) +- return true if args.is_a?(Fixnum) ++ return true if args.is_a?(Integer) + if args.is_a?(Array) + args.each do |a| +- return false if !a.kind_of?(String) && !a.kind_of?(Fixnum) ++ return false if !a.kind_of?(String) && !a.kind_of?(Integer) + end + + return true +diff --git a/test/unit/plugins/provisioners/shell/config_test.rb b/test/unit/plugins/provisioners/shell/config_test.rb +index c4d260b90..905a28b03 100644 +--- a/test/unit/plugins/provisioners/shell/config_test.rb ++++ b/test/unit/plugins/provisioners/shell/config_test.rb +@@ -30,7 +30,7 @@ describe "VagrantPlugins::Shell::Config" do + expect(result["shell provisioner"]).to eq([]) + end + +- it "passes with fixnum args" do ++ it "passes with integer args" do + subject.path = file_that_exists + subject.args = 1 + subject.finalize! +@@ -112,7 +112,7 @@ describe "VagrantPlugins::Shell::Config" do + end + + describe 'finalize!' do +- it 'changes fixnum args into strings' do ++ it 'changes integer args into strings' do + subject.path = file_that_exists + subject.args = 1 + subject.finalize! +@@ -120,7 +120,7 @@ describe "VagrantPlugins::Shell::Config" do + expect(subject.args).to eq '1' + end + +- it 'changes fixnum args in arrays into strings' do ++ it 'changes integer args in arrays into strings' do + subject.path = file_that_exists + subject.args = ["string", 1, 2] + subject.finalize! +diff --git a/test/unit/plugins/pushes/local-exec/config_test.rb b/test/unit/plugins/pushes/local-exec/config_test.rb +index 1bde10d98..9442b6420 100644 +--- a/test/unit/plugins/pushes/local-exec/config_test.rb ++++ b/test/unit/plugins/pushes/local-exec/config_test.rb +@@ -70,7 +70,7 @@ describe VagrantPlugins::LocalExecPush::Config do + expect(errors).to be_empty + end + +- it "passes with fixnum args" do ++ it "passes with integer args" do + subject.args = 1 + expect(errors).to be_empty + end +@@ -118,7 +118,7 @@ describe VagrantPlugins::LocalExecPush::Config do + expect(errors).to be_empty + end + +- it "passes with fixnum args" do ++ it "passes with integer args" do + subject.args = 1 + expect(errors).to be_empty + end +-- +2.13.3 + diff --git a/0022-Do-not-use-deprecated-API.patch b/0022-Do-not-use-deprecated-API.patch new file mode 100644 index 0000000..0117f55 --- /dev/null +++ b/0022-Do-not-use-deprecated-API.patch @@ -0,0 +1,26 @@ +From 6d269293e37db86325bec0a17502d68838d28214 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Tue, 14 Feb 2017 10:33:58 +0100 +Subject: [PATCH] Do not use deprecated API. + +Signed-off-by: Johannes Kastl +--- + lib/vagrant/util/keypair.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/vagrant/util/keypair.rb b/lib/vagrant/util/keypair.rb +index 342d3264f..5e3d10ea6 100644 +--- a/lib/vagrant/util/keypair.rb ++++ b/lib/vagrant/util/keypair.rb +@@ -26,7 +26,7 @@ module Vagrant + private_key = rsa_key.to_pem + + if password +- cipher = OpenSSL::Cipher::Cipher.new('des3') ++ cipher = OpenSSL::Cipher.new('des3') + private_key = rsa_key.to_pem(cipher, password) + end + +-- +2.13.3 + diff --git a/0023-vbox-fix-package.patch b/0023-vbox-fix-package.patch new file mode 100644 index 0000000..80dc224 --- /dev/null +++ b/0023-vbox-fix-package.patch @@ -0,0 +1,20 @@ +diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package.rb vagrant-1.9.7/plugins/providers/virtualbox/action/package.rb +--- vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package.rb 2017-08-16 11:52:01.270242802 +0300 ++++ vagrant-1.9.7/plugins/providers/virtualbox/action/package.rb 2017-08-16 11:53:08.929783075 +0300 +@@ -1,4 +1,4 @@ +-require_relative "../../../../lib/vagrant/action/general/package" ++require "vagrant/action/general/package" + + module VagrantPlugins + module ProviderVirtualBox +diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_folders.rb vagrant-1.9.7/plugins/providers/virtualbox/action/package_setup_folders.rb +--- vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_folders.rb 2017-08-16 11:52:01.270242802 +0300 ++++ vagrant-1.9.7/plugins/providers/virtualbox/action/package_setup_folders.rb 2017-08-16 11:52:51.353902487 +0300 +@@ -1,6 +1,6 @@ + require "fileutils" + +-require_relative "../../../../lib/vagrant/action/general/package_setup_folders" ++require "vagrant/action/general/package" + + module VagrantPlugins + module ProviderVirtualBox diff --git a/0024-do-not-depend-on-wdm.patch b/0024-do-not-depend-on-wdm.patch new file mode 100644 index 0000000..6253a61 --- /dev/null +++ b/0024-do-not-depend-on-wdm.patch @@ -0,0 +1,11 @@ +diff -ur vagrant-1.9.7.orig/vagrant.gemspec vagrant-1.9.7/vagrant.gemspec +--- vagrant-1.9.7.orig/vagrant.gemspec 2017-08-16 11:52:01.226243101 +0300 ++++ vagrant-1.9.7/vagrant.gemspec 2017-08-29 15:32:55.920511390 +0300 +@@ -27,7 +27,6 @@ + s.add_dependency "net-scp", "~> 1.2.0" + 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" diff --git a/vagrant-1.9.1.tar.gz b/vagrant-1.9.1.tar.gz deleted file mode 100644 index 39fff6a..0000000 --- a/vagrant-1.9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 -size 1762644 diff --git a/vagrant-1.9.7.tar.gz b/vagrant-1.9.7.tar.gz new file mode 100644 index 0000000..673f09e --- /dev/null +++ b/vagrant-1.9.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b +size 1119024 diff --git a/vagrant.changes b/vagrant.changes index 01e16e9..4b1d74d 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Tue Aug 29 12:33:50 UTC 2017 - robert.munteanu@gmail.com + +- Added 0024-do-not-depend-on-wdm.patch - that rubygem only works + on windows + +------------------------------------------------------------------- +Wed Aug 16 08:59:17 UTC 2017 - robert.munteanu@gmail.com + +- Rebase 0023-vbox-fix-package.patch for Vagrant 1.9.7 +- Fix various 'have choice for ...' errors + +------------------------------------------------------------------- +Sun Aug 13 19:07:06 UTC 2017 - robert.munteanu@gmail.com + +- add 0023-vbox-fix-package.patch ( boo#1044087 ) + +------------------------------------------------------------------- +Tue Jul 25 18:17:14 UTC 2017 - opensuse_buildservice@ojkastl.de + +- renamed patch 0010-also-build-with-ruby2.4.patch to + 0020-also-build-with-ruby2.4.patch +- add patches for ruby2.4 compatibility + * added patch + 0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch + * added patch 0022-Do-not-use-deprecated-API.patch + +------------------------------------------------------------------- +Mon Jul 24 19:51:52 UTC 2017 - opensuse_buildservice@ojkastl.de + +- update to version 1.9.7 +- removed patch 0005-Support-system-installed-plugins.patch that + no longer applies +- added patch 0010-also-build-with-ruby2.4.patch that allows builds + with ruby2.4, even if vagrant states otherwise + (https://github.com/mitchellh/vagrant/blob/master/vagrant.gemspec#L15) + +------------------------------------------------------------------- +Thu Jun 15 07:25:19 UTC 2017 - opensuse_buildservice@ojkastl.de + +- as rubygem-childprocess has been updated to 0.7 in d:l:r:e, which + does not work with vagrant, a BuildRequires for + rubygem-childprocess <= 0.7 has been added + +------------------------------------------------------------------- +Sun May 21 16:08:12 UTC 2017 - opensuse_buildservice@ojkastl.de + +- update to version 1.9.5 +- removed patch 0007-Update-command.rb.patch, that has been + integrated upstream +- rebased patches to allow patching version 1.9.5 instead of 1.9.1 +- added explicit BuildRequires for rubygems needed to get vagrant + to build + ------------------------------------------------------------------- Tue Mar 7 20:08:08 UTC 2017 - robert.munteanu@gmail.com diff --git a/vagrant.spec b/vagrant.spec index 844794e..8a6dae9 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -22,7 +22,7 @@ %{!?vim_data_dir:%global vim_data_dir /usr/share/vim/%(readlink /usr/share/vim/current)} Name: vagrant -Version: 1.9.1 +Version: 1.9.7 Release: 0 Summary: Build and distribute virtualized development environments License: MIT @@ -40,11 +40,17 @@ 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 +# +# +# try building with ruby2.4 +Patch20: 0020-also-build-with-ruby2.4.patch +Patch21: 0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch +Patch22: 0022-Do-not-use-deprecated-API.patch +Patch23: 0023-vbox-fix-package.patch +Patch24: 0024-do-not-depend-on-wdm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # force only one ruby version @@ -53,10 +59,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # BuildRequires: %{ruby >= 2.0.0} BuildRequires: %{rubygem bundler} -BuildRequires: %{rubygem childprocess} +BuildRequires: %{rubygem childprocess <= 0.7 } +BuildRequires: %{rubygem crack } # Prevent have choice for rubygem(ruby:2.2.0:erubis) BuildRequires: %{rubygem erubis >= 2.7} -BuildRequires: %{rubygem i18n} +BuildRequires: %{rubygem fake_ftp} +BuildRequires: %{rubygem hashicorp-checkpoint} +BuildRequires: %{rubygem i18n <= 0.8 } BuildRequires: %{rubygem listen} BuildRequires: %{rubygem log4r} # Prevent have choice for rubygem(ruby:2.2.0:net-scp) @@ -67,10 +76,25 @@ BuildRequires: %{rubygem net-ssh} 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 # inotify should go here #BuildRequires: %{rubygem rb-kqueue} +BuildRequires: %{rubygem rake <= 12.0 } +BuildRequires: %{rubygem rake >= 11.3 } +BuildRequires: %{rubygem rb-kqueue } BuildRequires: %{rubygem rest-client} +BuildRequires: %{rubygem rspec <= 2.15 } +BuildRequires: %{rubygem ruby_dep <= 1.5 } +# Intentionally removed, wdm only works on Windows +# BuildRequires: %{rubygem wdm } +BuildRequires: %{rubygem webmock } +BuildRequires: %{rubygem winrm } +BuildRequires: %{rubygem winrm-elevated } +BuildRequires: %{rubygem winrm-fs } # Requires: %{rubygem childprocess} # Prevent have choice for rubygem(ruby:2.2.0:erubis) @@ -135,11 +159,17 @@ Optional dependency offering bash completion for vagrant %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %patch9 -p1 +# +# +# +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 cp %{SOURCE3} .