defolos/vagrant
SHA256
1
0
Fork 0
forked from pool/vagrant
Code Pull Requests Activity

Accepting request 943782 from home:dancermak:branches:Virtualization:vagrant

Browse Source 
Switch to Ruby 3.1

OBS-URL: https://build.opensuse.org/request/show/943782
OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=63
This commit is contained in:
Dan Čermák 2022-01-04 14:35:26 +00:00 committed by Git OBS Bridge
parent cf2fafebcd
commit 499466f933
12 changed files with 86 additions and 23 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 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 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 b539d3479..77c83d7c0 100755
#
# Unset - Disables experimental features
--
2.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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 992b48f2f..2bef1036a 100644
s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0"
--
2.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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
@ -65,5 +65,5 @@ index 7bc8ceca0..e938305e7 100644
require_relative "../installer"
--
2.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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.31.1
2.33.1

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

@ -1,7 +1,7 @@
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 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.31.1
2.33.1

37
0010-Add-support-for-Ruby-3.1.patch Normal file
View File

@ -0,0 +1,37 @@
From 214e118384d0456db19faa0fa63bff571d0229c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 3 Jan 2022 12:08:09 +0100
Subject: [PATCH 10/10] Add support for Ruby 3.1
The biggest change comming with Ruby 3.1 is that net/ftp is no longer bundled
with Ruby but distributed as a separate gem.
(cherry picked from commit a1a002831e8e9b40f8c2ba42187ace707b0cc91c)
---
vagrant.gemspec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 2bef1036a..ccf76011a 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.6", "< 3.1"
+ s.required_ruby_version = ">= 2.6", "< 3.2"
s.required_rubygems_version = ">= 1.3.6"
s.add_dependency "bcrypt_pbkdf", "~> 1.1"
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
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-ftp", "~> 0.1"
s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
s.add_dependency "net-sftp", "~> 3.0"
s.add_dependency "net-scp", "~> 3.0.0"
--
2.33.1

19
vagrant.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Jan 4 09:29:06 UTC 2022 - Dan Čermák <dcermak@suse.com>
- Switch vagrant to Ruby 3.1
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
Added patch:
* 0010-Add-support-for-Ruby-3.1.patch
-------------------------------------------------------------------
Thu Dec 2 10:51:16 UTC 2021 - Dan Čermák <dcermak@suse.com>

17
vagrant.spec
View File

@ -57,15 +57,16 @@ 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-Add-support-for-Ruby-3.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# force only one ruby version
# CAUTION: if you change this, then you *must* also change the sed calls which
# fix these values in macros.vagrant
%if 0%{?suse_version} > 1500
%global rb_build_versions ruby30
%global rb_build_abi ruby:3.0.0
%global rb_ruby_suffix ruby3.0
%global rb_build_versions ruby31
%global rb_build_abi ruby:3.1.0
%global rb_ruby_suffix ruby3.1
%else
%global rb_build_versions %rb_default_ruby
%global rb_build_abi %rb_default_ruby_abi
@ -83,9 +84,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Build dependencies
#===============================================================================
# s.required_ruby_version = ">= 2.5", "< 3.1"
# s.required_ruby_version = ">= 2.5", "< 3.2"
%if 0%{?suse_version} > 1500
BuildRequires: %{ruby} < 3.1
BuildRequires: %{ruby} < 3.2
%else
BuildRequires: %{ruby} >= 2.5
%endif
@ -113,6 +114,9 @@ BuildRequires: %{rubygem log4r:1.1 >= 1.1.9 }
BuildConflicts: %{rubygem log4r:1.1 >= 1.1.11 }
# s.add_dependency "mime-types", "~> 3.3"
BuildRequires: %{rubygem mime-types:3 >= 3.3 }
# PATCHED
# s.add_dependency "net-ftp", "~> 0.1"
BuildRequires: %{rubygem net-ftp:0 >= 0.1 }
# s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
BuildRequires: %{rubygem net-ssh:6.1 >= 6.1.0 }
# s.add_dependency "net-sftp", "~> 3.0"
@ -200,6 +204,9 @@ Requires: %{rubygem log4r:1.1 >= 1.1.9 }
Requires: %{rubygem log4r:1.1 < 1.1.11 }
# s.add_dependency "mime-types", "~> 3.3"
Requires: %{rubygem mime-types:3 >= 3.3}
# PATCHED
# s.add_dependency "net-ftp", "~> 0.1"
BuildRequires: %{rubygem net-ftp:0 >= 0.1 }
# s.add_dependency "net-ssh", ">= 6.1.0", "< 6.2"
Requires: %{rubygem net-ssh:6.1 >= 6.1.0 }
# s.add_dependency "net-sftp", "~> 3.0"