From 0ced093d53b4415ceff10e77306de7d53dfa6b4f691ff1fbe045c2a339f0c2ad Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Sat, 17 Nov 2018 20:34:14 +0000 Subject: [PATCH] Accepting request 649966 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.2.0, needs additional rubygem vagrant_cloud, see sr#649907 OBS-URL: https://build.opensuse.org/request/show/649966 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=22 --- ...rant-silence-warning-about-installer.patch | 2 +- 0003-Use-a-private-temporary-dir.patch | 2 +- ...on-t-wait-for-shutdown-h-now-to-fini.patch | 2 +- ...plugins-don-t-abuse-require_relative.patch | 2 +- 0023-vbox-fix-package.patch | 2 +- 0024-do-not-depend-on-wdm.patch | 8 ++--- vagrant-2.1.5.tar.gz | 3 -- vagrant-2.2.0.tar.gz | 3 ++ vagrant.changes | 35 +++++++++++++++++++ vagrant.spec | 2 +- 10 files changed, 48 insertions(+), 13 deletions(-) delete mode 100644 vagrant-2.1.5.tar.gz create mode 100644 vagrant-2.2.0.tar.gz diff --git a/0002-bin-vagrant-silence-warning-about-installer.patch b/0002-bin-vagrant-silence-warning-about-installer.patch index cd1d661..50cdfca 100644 --- a/0002-bin-vagrant-silence-warning-about-installer.patch +++ b/0002-bin-vagrant-silence-warning-about-installer.patch @@ -1,4 +1,4 @@ -From d48c50fb28325a7fbd9499b73f27ed85db01c680 Mon Sep 17 00:00:00 2001 +From 46e37dd1c263e62e28336bea5c634a41a3d77c5b Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 Subject: [PATCH] bin/vagrant: silence warning about installer diff --git a/0003-Use-a-private-temporary-dir.patch b/0003-Use-a-private-temporary-dir.patch index e9591f3..40c5903 100644 --- a/0003-Use-a-private-temporary-dir.patch +++ b/0003-Use-a-private-temporary-dir.patch @@ -1,4 +1,4 @@ -From 8a6215a36bcd19312606b231a9392ab90d1d03e3 Mon Sep 17 00:00:00 2001 +From 6781106e4820060910c2203b3b3c895773af2018 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 Subject: [PATCH] Use a private temporary dir 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 ccaa6bf..54bbe3c 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,4 +1,4 @@ -From d6fdea5990cb0a8c3d37299b6d0f4be3bfa7fe94 Mon Sep 17 00:00:00 2001 +From f09ec3d92fd9638e8c7c72eaf522ec1afb42037b Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 3 Feb 2015 10:35:17 -0200 Subject: [PATCH] linux/cap/halt: don't wait for `shutdown -h now` to finish diff --git a/0009-plugins-don-t-abuse-require_relative.patch b/0009-plugins-don-t-abuse-require_relative.patch index 4bae492..c210877 100644 --- a/0009-plugins-don-t-abuse-require_relative.patch +++ b/0009-plugins-don-t-abuse-require_relative.patch @@ -1,4 +1,4 @@ -From 9e55cb6868769a851397bc6f049dad3a1a431af2 Mon Sep 17 00:00:00 2001 +From 5f3bf1a6b74550e83596ed7be18bdf53345f0c60 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 diff --git a/0023-vbox-fix-package.patch b/0023-vbox-fix-package.patch index bf44b7e..49e52d0 100644 --- a/0023-vbox-fix-package.patch +++ b/0023-vbox-fix-package.patch @@ -1,4 +1,4 @@ -From 12fb619f0a0ef2843900a5ecb661385a8b4e3dcc Mon Sep 17 00:00:00 2001 +From fdeaccf4af257c2117e66155e22c501d9310c853 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 Subject: [PATCH] fix vbox package boo#1044087, added by diff --git a/0024-do-not-depend-on-wdm.patch b/0024-do-not-depend-on-wdm.patch index 3905b2a..1000a13 100644 --- a/0024-do-not-depend-on-wdm.patch +++ b/0024-do-not-depend-on-wdm.patch @@ -1,4 +1,4 @@ -From f533a1d46affdf015c4034531d98d91650d74f17 Mon Sep 17 00:00:00 2001 +From 6a01e4089e3c8c3115755c7431cb5d9d493d6671 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 Subject: [PATCH] do not depend on wdm @@ -9,13 +9,13 @@ Signed-off-by: Johannes Kastl 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index d67d1e83c..b12d85c51 100644 +index 11627738e..a45be9eba 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec -@@ -27,7 +27,6 @@ Gem::Specification.new do |s| - s.add_dependency "net-scp", "~> 1.2.0" +@@ -28,7 +28,6 @@ Gem::Specification.new do |s| s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" + s.add_dependency "rubyzip", "~> 1.2.2" - s.add_dependency "wdm", "~> 0.1.0" s.add_dependency "winrm", "~> 2.1" s.add_dependency "winrm-fs", "~> 1.0" diff --git a/vagrant-2.1.5.tar.gz b/vagrant-2.1.5.tar.gz deleted file mode 100644 index 14909e1..0000000 --- a/vagrant-2.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:347179564f5a8a56e2d6dcb82470e04d92a60ed0b3265efc07f9ff37cd5c7f5f -size 1238788 diff --git a/vagrant-2.2.0.tar.gz b/vagrant-2.2.0.tar.gz new file mode 100644 index 0000000..918248d --- /dev/null +++ b/vagrant-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb1476683f0e8479334be20b26c49d516a0e1c739b9f6f35a8c05f68e4a048f1 +size 1277421 diff --git a/vagrant.changes b/vagrant.changes index e472a4e..d9df911 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Fri Nov 16 21:36:50 UTC 2018 - Johannes Kastl + +- update to 2.2.0 + FEATURES: + + - command/cloud: Introduce `vagrant cloud` subcommand to Vagrant [GH-10148] + - command/upload: Add command for uploading files to guest [GH-10263] + - command/winrm: Add command for executing guest commands via WinRM [GH-10263] + - command/winrm-config: Add command for providing WinRM configuration [GH-10263] + + IMPROVEMENTS: + - core: Ensure file paths are identical when checking for cwd [GH-10220] + - core: Add config option `ignore_box_vagrantfile` for ignoring vagrantfile inside box [GH-10242] + - core/triggers: Add abort option to core triggers [GH-10232] + - core/triggers: Introduce `ruby` option for trigger [GH-10267] + - contrib/bash: Add completion for snapshot names for vagrant snapshot restore|delete [GH-9054] + - providers/docker: Build docker from git repo [GH-10221] + - providers/hyperv: Update Hyper-V admin check and allow override via ENV variable [GH-10275] + - providers/virtualbox: Allow base_mac to be optional [GH-10255] + - provisioners/salt: bootstrap-salt.sh: use -s with curl [GH-9432] + - provisioners/salt: remove leading space with bootstrap_options [GH-9431] + + BUG FIXES: + - core/environment: Provide rgloader for local plugin installations [GH-10279] + - contrib/sudoers/osx: Fix missing comma and add remove export alias [GH-10235] + - guest/redhat: Update restart logic in redhat change_host_name cap [GH-10223] + - guest/windows: Allow special characters in SMB password field [GH-10219] + - providers/hyperv: Only use AutomaticCheckpointsEnabled when available [GH-10264] + - providers/hyperv: Only use CheckpointType when available [GH-10265] + - provisioners/ansible: Fix remote directory creation [GH-10259, GH-10258] + - provisioners/puppet: Properly set env variables for puppet provisioner on windows [GH-10218] + - provisioners/salt: Properly set salt pillar variables for windows guests [GH-10215] + - synced_folders/rsync: Ensure unique tmp dirs for ControlPath with rsync [GH-10291] + ------------------------------------------------------------------- Fri Nov 16 21:04:23 UTC 2018 - Johannes Kastl diff --git a/vagrant.spec b/vagrant.spec index da6629b..543e7db 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -25,7 +25,7 @@ %global vim_data_dir %{_datadir}/vim/site/plugin/ Name: vagrant -Version: 2.1.5 +Version: 2.2.0 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT