Accepting request 888713 from Virtualization:vagrant
OBS-URL: https://build.opensuse.org/request/show/888713 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
9f8c1112ed
@ -1,7 +1,7 @@
|
||||
From 152901e1ae1a475a48e3ecb43d54c629cc8abf05 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Terceiro <terceiro@debian.org>
|
||||
Date: Sat, 11 Oct 2014 16:54:58 -0300
|
||||
Subject: [PATCH 1/9] bin/vagrant: silence warning about installer
|
||||
Subject: [PATCH 01/10] bin/vagrant: silence warning about installer
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
@ -36,5 +36,5 @@ index c019f30ff..6d2d21523 100755
|
||||
#
|
||||
# Unset - Disables experimental features
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ff54f5982a2b7365871d4ed1516de1ab7be4ff11 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Terceiro <terceiro@debian.org>
|
||||
Date: Wed, 22 Oct 2014 09:40:14 -0200
|
||||
Subject: [PATCH 2/9] Use a private temporary dir
|
||||
Subject: [PATCH 02/10] Use a private temporary dir
|
||||
|
||||
Without this vagrant will clutter $TMPDIR with dozens of even hundreds
|
||||
of temporary files (~4 per vagrant invocation).
|
||||
@ -94,5 +94,5 @@ index 000000000..0cbbb53ac
|
||||
+ FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir)
|
||||
+end
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d04bc870f70ca3a25c33992588b52d692caf270d 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 3/9] plugins-don-t-abuse-require_relative.patch
|
||||
Subject: [PATCH 03/10] plugins-don-t-abuse-require_relative.patch
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644
|
||||
module VagrantPlugins
|
||||
module GuestSUSE
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 2c1eadfcf5df4f2f886cce3b3031ed6aa8315caa 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 4/9] fix vbox package boo#1044087, added by
|
||||
Subject: [PATCH 04/10] 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>
|
||||
@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644
|
||||
module VagrantPlugins
|
||||
module ProviderVirtualBox
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 86f1ba8702737f24b357bb7114e8d97e36b86283 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 5/9] do not depend on wdm
|
||||
Subject: [PATCH 05/10] do not depend on wdm
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
@ -21,5 +21,5 @@ index 1643681b4..9d71cdc52 100644
|
||||
s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
|
||||
s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0"
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d8359d5055d692e703abcb5a5bf8a55ca16a00bb 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 6/9] do not abuse relative paths in docker plugin to make
|
||||
Subject: [PATCH 06/10] 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>
|
||||
@ -22,5 +22,5 @@ index 07c4e5333..e8142df8b 100644
|
||||
module VagrantPlugins
|
||||
module DockerProvider
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1ffd8eaeeac0148698d857a1d029a04ab37c44ac 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 7/9] Don't abuse relative paths in plugins
|
||||
Subject: [PATCH 07/10] Don't abuse relative paths in plugins
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@ -64,5 +64,5 @@ index 7bc8ceca0..e938305e7 100644
|
||||
require_relative "../installer"
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 24b285416ab3d3f4c2e1d6524e39c75e6b1661d3 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 8/9] Skip failing tests
|
||||
Subject: [PATCH 08/10] Skip failing tests
|
||||
|
||||
---
|
||||
test/unit/bin/vagrant_test.rb | 4 ++--
|
||||
@ -30,5 +30,5 @@ index dbbd52112..4481e4c09 100644
|
||||
end
|
||||
end
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1030ddd86e1cda92484a6a17fa46295c8e508bbb 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 9/9] Disable Subprocess unit test
|
||||
Subject: [PATCH 09/10] 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
|
||||
@ -33,5 +33,5 @@ index 0ff5835c8..757d8ef8a 100644
|
||||
thread = Thread.new{ sp.execute }
|
||||
sleep(0.1)
|
||||
--
|
||||
2.30.2
|
||||
2.31.1
|
||||
|
||||
|
||||
26
0010-Bump-listen-version-to-3.5.patch
Normal file
26
0010-Bump-listen-version-to-3.5.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 50ea02c2ab56693ed291589a302e85866b33ecde Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Tue, 27 Apr 2021 10:27:11 +0200
|
||||
Subject: [PATCH 10/10] Bump listen version to ~> 3.5
|
||||
|
||||
(cherry picked from commit 016911965d5f995a5d0a168069de7ded7b380ecb)
|
||||
---
|
||||
vagrant.gemspec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vagrant.gemspec b/vagrant.gemspec
|
||||
index 9d71cdc52..5322d5dd5 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.4"
|
||||
+ s.add_dependency "listen", "~> 3.5"
|
||||
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", "< 7"
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 27 08:36:12 UTC 2021 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
- Bump rubygem-listen version to 3.5
|
||||
|
||||
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
|
||||
|
||||
Add patch:
|
||||
* 0010-Bump-listen-version-to-3.5.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 1 08:32:38 UTC 2021 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
|
||||
14
vagrant.spec
14
vagrant.spec
@ -57,6 +57,8 @@ 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
|
||||
# https://github.com/hashicorp/vagrant/pull/12329
|
||||
Patch10: 0010-Bump-listen-version-to-3.5.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -95,8 +97,9 @@ BuildRequires: %{rubygem ed25519:1.2 >= 1.2.4 }
|
||||
BuildRequires: %{rubygem erubi }
|
||||
# s.add_dependency "i18n", "~> 1.8"
|
||||
BuildRequires: %{rubygem i18n:1 >= 1.8 }
|
||||
# s.add_dependency "listen", "~> 3.4"
|
||||
BuildRequires: %{rubygem listen:3 >= 3.4 }
|
||||
# PATCHED
|
||||
# s.add_dependency "listen", "~> 3.5"
|
||||
BuildRequires: %{rubygem listen:3 >= 3.5 }
|
||||
# s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
|
||||
BuildRequires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5 }
|
||||
# s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
|
||||
@ -138,7 +141,7 @@ BuildRequires: %{rubygem webmock:2.3 >= 2.3.1 }
|
||||
BuildRequires: %{rubygem fake_ftp:0.1 >= 0.1.1 }
|
||||
|
||||
# Prevent have choice for rubygem(ruby:2.7.0:listen:3) >= 3.1
|
||||
BuildRequires: %{rubygem listen:3.4}
|
||||
BuildRequires: %{rubygem listen:3.5}
|
||||
# Prevent have choice for rubygem(ruby:2.6.0:mime-types) >= 2
|
||||
BuildRequires: %{rubygem mime-types:3 }
|
||||
# Prevent have choice for rubygem(ruby:2.6.0:builder) >= 2.1.2
|
||||
@ -181,8 +184,9 @@ Requires: %{rubygem ed25519:1.2 >= 1.2.4}
|
||||
Requires: %{rubygem erubi}
|
||||
# s.add_dependency "i18n", "~> 1.8"
|
||||
Requires: %{rubygem i18n:1 >= 1.8}
|
||||
# s.add_dependency "listen", "~> 3.4"
|
||||
Requires: %{rubygem listen:3 >= 3.4}
|
||||
# PATCHED
|
||||
# s.add_dependency "listen", "~> 3.5"
|
||||
Requires: %{rubygem listen:3 >= 3.5}
|
||||
# s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
|
||||
Requires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5}
|
||||
# s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user