pool/vagrant
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 935193 from Virtualization:vagrant

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/935193
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2021-12-06 22:59:22 +00:00 committed by Git OBS Bridge
commit 10fcdf12f3
14 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-bin-vagrant-silence-warning-about-installer.patch
View File

@ -1,7 +1,7 @@
From 0ccff6b537b98ea368eaebb21f3ac739256e1eac Mon Sep 17 00:00:00 2001
From 33ec34c4946a10f38747b827ccd0500cc3685af4 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Sat, 11 Oct 2014 16:54:58 -0300
Subject: [PATCH 01/10] bin/vagrant: silence warning about installer
Subject: [PATCH 1/9] bin/vagrant: silence warning about installer
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---

4
0002-Use-a-private-temporary-dir.patch
View File

@ -1,7 +1,7 @@
From 61b69d39695fe17aad4ac750e7b15fde4d52d24a Mon Sep 17 00:00:00 2001
From df5d75cdb6c3f415e53bd494d3db5e4c809d8230 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Wed, 22 Oct 2014 09:40:14 -0200
Subject: [PATCH 02/10] Use a private temporary dir
Subject: [PATCH 2/9] Use a private temporary dir
Without this vagrant will clutter $TMPDIR with dozens of even hundreds
of temporary files (~4 per vagrant invocation).

4
0003-plugins-don-t-abuse-require_relative.patch.patch
View File

@ -1,7 +1,7 @@
From 188198d9cd7dad997a02e26f06cdb8e1fcf49483 Mon Sep 17 00:00:00 2001
From e8835db89852f1221ed9eeff67816a079ed6762b Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Wed, 17 May 2017 09:09:57 +0200
Subject: [PATCH 03/10] plugins-don-t-abuse-require_relative.patch
Subject: [PATCH 3/9] plugins-don-t-abuse-require_relative.patch
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---

4
0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
View File

@ -1,7 +1,7 @@
From 32c0b41a97016db1c19861a5efa28c3a181de8e7 Mon Sep 17 00:00:00 2001
From d124f36515e112737baecea699a3aa09615702d7 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Fri, 16 Nov 2018 21:12:43 +0100
Subject: [PATCH 04/10] fix vbox package boo#1044087, added by
Subject: [PATCH 4/9] fix vbox package boo#1044087, added by
robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>

6
0005-do-not-depend-on-wdm.patch
View File

@ -1,7 +1,7 @@
From 9d896403984a8673e10f3da47052e4250e9ba98b Mon Sep 17 00:00:00 2001
From 4a7f3ff284ac2a3dd1e6261221f787ac4e7075d7 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Mon, 4 Jun 2018 09:18:23 +0200
Subject: [PATCH 05/10] do not depend on wdm
Subject: [PATCH 5/9] do not depend on wdm
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -9,7 +9,7 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
1 file changed, 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index e8cee0b5e..cfe589cca 100644
index 992b48f2f..2bef1036a 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|

4
0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
View File

@ -1,7 +1,7 @@
From 3c8410ce11d70935e678b11d58f3644d2dff8c52 Mon Sep 17 00:00:00 2001
From 99447e851f41f413d1e525ef51e946b003e1a080 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Fri, 16 Nov 2018 21:14:46 +0100
Subject: [PATCH 06/10] do not abuse relative paths in docker plugin to make
Subject: [PATCH 6/9] do not abuse relative paths in docker plugin to make
docker work, added by tmkn@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>

9
0007-Don-t-abuse-relative-paths-in-plugins.patch
View File

@ -1,7 +1,7 @@
From 84dd04ae65f330dbee401f38eeb9577daeee2f9b Mon Sep 17 00:00:00 2001
From 3dc208ffbe52efb9c77e8541824b2b33a9252eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Fri, 11 Jan 2019 12:32:28 +0100
Subject: [PATCH 07/10] Don't abuse relative paths in plugins
Subject: [PATCH 7/9] Don't abuse relative paths in plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@ -27,11 +27,12 @@ index e9f64a940..9236c1b2b 100644
module VagrantPlugins
module GuestALT
diff --git a/plugins/guests/coreos/cap/configure_networks.rb b/plugins/guests/coreos/cap/configure_networks.rb
index a954b45bd..2e490f5e2 100644
index 5ccd23e80..3d6086c06 100644
--- a/plugins/guests/coreos/cap/configure_networks.rb
+++ b/plugins/guests/coreos/cap/configure_networks.rb
@@ -1,6 +1,6 @@
@@ -1,7 +1,7 @@
require "tempfile"
require "yaml"
-require_relative "../../../../lib/vagrant/util/template_renderer"
+require "vagrant/util/template_renderer"

4
0008-Skip-failing-tests.patch
View File

@ -1,7 +1,7 @@
From c1a1d7395170fc60872658649166de546d396190 Mon Sep 17 00:00:00 2001
From f6b2e0cebf27725b82b29085451df2308989b1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 1 Apr 2019 17:28:31 +0200
Subject: [PATCH 08/10] Skip failing tests
Subject: [PATCH 8/9] Skip failing tests
---
test/unit/bin/vagrant_test.rb | 4 ++--

4
0009-Disable-Subprocess-unit-test.patch
View File

@ -1,7 +1,7 @@
From 745cb8db9f953598df00fb6b362042c61e0909b1 Mon Sep 17 00:00:00 2001
From cc9cc287131b8a0b4419d2a7c2a0f7f3fd7b5b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Wed, 28 Aug 2019 13:39:58 +0200
Subject: [PATCH 09/10] Disable Subprocess unit test
Subject: [PATCH 9/9] Disable Subprocess unit test
This unit test is *very* flaky on OBS' workers and causes random build
failures. These are probably caused by worker being under high load and then

25
0010-Bump-listen-version-to-3.6.patch
View File

@ -1,25 +0,0 @@
From 8678ead4d72de6b79111adabc90aa3877d8777fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 2 Aug 2021 13:44:45 +0200
Subject: [PATCH 10/10] Bump listen version to ~> 3.6
---
vagrant.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index cfe589cca..eede54bf8 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.add_dependency "erubi"
s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
s.add_dependency "i18n", "~> 1.8"
- s.add_dependency "listen", "~> 3.5"
+ s.add_dependency "listen", "~> 3.6"
s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
s.add_dependency "mime-types", "~> 3.3"
s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
--
2.31.1

3
vagrant-2.2.18.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3508b0906b832d7317c8d36220798ec274b721e7ef63d0cf991c68f19d9dae90
size 1620261

3
vagrant-2.2.19.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9
size 1838272

35
vagrant.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Thu Dec 2 10:51:16 UTC 2021 - Dan Čermák <dcermak@suse.com>
- New upstream release 2.2.19
Rebase patches:
* 0001-bin-vagrant-silence-warning-about-installer.patch
* 0002-Use-a-private-temporary-dir.patch
* 0003-plugins-don-t-abuse-require_relative.patch.patch
* 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
* 0005-do-not-depend-on-wdm.patch
* 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
* 0007-Don-t-abuse-relative-paths-in-plugins.patch
* 0008-Skip-failing-tests.patch
* 0009-Disable-Subprocess-unit-test.patch
Removed patches:
* 0010-Bump-listen-version-to-3.6.patch
## 2.2.19 (November 5, 2021)
IMPROVEMENTS:
- guest/suse: Add fallback shutdown for versions without systemd [GH-12489]
- provider/virtualbox: Validate VirtualBox hostonly network range [GH-12564]
BUG FIXES
- guest/atomic: Update detection to prevent matching on non-atomic guests [GH-12575]
- guest/coreos: Fix configure network capability [GH-12575]
- guest/windows: Fix directory creation with rsync [GH-11880]
- host/windows: Properly handle spaces in path to SSH key [GH-12398]
- provisioner/chef: Update install checks [GH-12555]
-------------------------------------------------------------------
Thu Oct 14 08:32:24 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

9
vagrant.spec
View File

@ -26,7 +26,7 @@
Name: vagrant
Version: 2.2.18
Version: 2.2.19
Release: 0
Summary: Tool for building and distributing virtualized development environments
License: MIT
@ -57,7 +57,6 @@ Patch6: 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
Patch7: 0007-Don-t-abuse-relative-paths-in-plugins.patch
Patch8: 0008-Skip-failing-tests.patch
Patch9: 0009-Disable-Subprocess-unit-test.patch
Patch10: 0010-Bump-listen-version-to-3.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# force only one ruby version
@ -244,7 +243,7 @@ This package contains the documentation for vagrant.
%package vim
Summary: Vagrantfile syntax files for the vim editor
Group: Development/Languages/Ruby
Supplements: packageand(vagrant:vim)
Supplements: (vagrant and vim)
BuildRequires: vim
Requires: vagrant = %{version}
Requires: vim
@ -256,7 +255,7 @@ Optional dependency offering vim syntax files for Vagrantfile
%package emacs
Summary: Vagrantfile syntax files for the emacs editor
Group: Development/Languages/Ruby
Supplements: packageand(vagrant:emacs_program)
Supplements: (vagrant and emacs_program)
BuildRequires: emacs-nox
Requires: emacs_program
Requires: vagrant = %{version}
@ -268,7 +267,7 @@ Optional dependency offering emacs syntax files for Vagrantfile
%package bash-completion
Summary: Vagrant bash autocompletion
Group: Development/Languages/Ruby
Supplements: packageand(vagrant:bash)
Supplements: (vagrant and bash)
BuildRequires: bash
BuildRequires: bash-completion
Requires: bash