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

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

Browse Source 
Add patch to support building with Ruby 3.2

OBS-URL: https://build.opensuse.org/request/show/1057586
OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=73
This commit is contained in:
Dan Čermák 2023-01-10 09:27:06 +00:00 committed by Git OBS Bridge
parent 6ccf905ba6
commit 3877cf5467
13 changed files with 149 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From 1983e82b7e6dbdd83fb8825db5f685a5d6fcf364 Mon Sep 17 00:00:00 2001
From 4e68a53d0053b1b8b6d18c0a7d86776d8cb800f7 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 01/11] bin/vagrant: silence warning about installer
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -25,5 +25,5 @@ index 7ca30b391..d3f4ea61a 100755
#
# Unset - Disables experimental features
--
2.38.1
2.39.0

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

@ -1,7 +1,7 @@
From 02893365295d215dc802402ba99299f297534018 Mon Sep 17 00:00:00 2001
From 2840391e027becd1be47e174e9848d23fa4199fb 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 02/11] 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.38.1
2.39.0

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

@ -1,7 +1,7 @@
From b1dcd81165eb0a3525c5bbc6b8ba5692ab9b210a Mon Sep 17 00:00:00 2001
From 8a9eccce115d46e0dbcab3a71c6ced612e7606cd 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 03/11] 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.38.1
2.39.0

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

@ -1,7 +1,7 @@
From 9bd031027288433fa153188148226eb40bb4f5e8 Mon Sep 17 00:00:00 2001
From 8ecfa63a112f0b83dc29c226dc0b2ad91953d602 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 04/11] 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.38.1
2.39.0

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

@ -1,7 +1,7 @@
From bccd645c0358f598d8d641b2d85f6163f6837140 Mon Sep 17 00:00:00 2001
From 591ec0a8f1f65a836cc893f403afa3c971ed05dd 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 05/11] do not depend on wdm
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
@ -21,5 +21,5 @@ index 8728d8d7e..f51b8d263 100644
s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0"
--
2.38.1
2.39.0

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

@ -1,7 +1,7 @@
From 3a3c2b8bc98af807819c4f6c503838cf8c3ca2bf Mon Sep 17 00:00:00 2001
From 5b273a2b85a188c161eb2ed991eba3dd1f4a6520 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 06/11] 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.38.1
2.39.0

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

@ -1,7 +1,7 @@
From 5bd209264293cefaabe95aec30914db84fa92a8e Mon Sep 17 00:00:00 2001
From e8b073c8216a63bbbbdd9ce316e86e58b393d3c4 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 07/11] 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.38.1
2.39.0

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

@ -1,7 +1,7 @@
From b687d26ac9d8027e7bac73c9e5258ba632c36ed0 Mon Sep 17 00:00:00 2001
From 24f24303433d8fd4ccc374244c7bef576501d24a 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 08/11] Skip failing tests
---
test/unit/bin/vagrant_test.rb | 4 ++--
@ -30,5 +30,5 @@ index dbbd52112..4481e4c09 100644
end
end
--
2.38.1
2.39.0

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

@ -1,7 +1,7 @@
From 0e972e73b2601b2dd68269eb6d006ecfb7fba4e2 Mon Sep 17 00:00:00 2001
From ccf376b72ddc48130bba3d6dfeb732dc7f9f2f67 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 09/11] 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.38.1
2.39.0

6
0010-Remove-dependency-on-grpc-tools.patch
View File

@ -1,7 +1,7 @@
From ea1a647652e891b7b8cfa725dc954104f76b79c2 Mon Sep 17 00:00:00 2001
From fa0e7bc761285ce8a929e55b7038fecaf8491a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Tue, 23 Aug 2022 16:19:11 +0200
Subject: [PATCH 10/10] Remove dependency on grpc-tools
Subject: [PATCH 10/11] Remove dependency on grpc-tools
This package is only needed to build the go plugins, which we do not use at the
moment.
@ -24,5 +24,5 @@ index f51b8d263..6550462ae 100644
s.add_dependency "ipaddr", ">= 1.2.4"
--
2.38.1
2.39.0

96
0011-Bump-Ruby-version-to-3.x.patch Normal file
View File

@ -0,0 +1,96 @@
From 9aea52ee59c4d75375c380cada552c441e0c7008 Mon Sep 17 00:00:00 2001
From: sophia <scastellarin95@gmail.com>
Date: Tue, 3 Jan 2023 10:41:54 -0800
Subject: [PATCH 11/11] Bump Ruby version to 3.x
(cherry picked from commit d69287f8500dd69a7318c608cd63adc9d7922653)
---
.github/workflows/build.yml | 2 +-
.github/workflows/go-spectest.yml | 2 +-
.github/workflows/go-testing.yml | 2 +-
.github/workflows/release.yml | 2 +-
.github/workflows/testing.yml | 2 +-
vagrant.gemspec | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d1b952739..3f808f538 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
- ruby-version: '2.7'
+ ruby-version: '3.1'
- name: Setup Go
uses: actions/setup-go@v3
with:
diff --git a/.github/workflows/go-spectest.yml b/.github/workflows/go-spectest.yml
index 14e2e89ab..e2188643b 100644
--- a/.github/workflows/go-spectest.yml
+++ b/.github/workflows/go-spectest.yml
@@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
go: ['^1.16']
- ruby: ['2.7']
+ ruby: ['3.1']
name: Vagrant acceptance tests
steps:
- name: Code Checkout
diff --git a/.github/workflows/go-testing.yml b/.github/workflows/go-testing.yml
index f1f1ea160..5e4b167ac 100644
--- a/.github/workflows/go-testing.yml
+++ b/.github/workflows/go-testing.yml
@@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
go: ['^1.16']
- ruby: ['2.7', '3.0']
+ ruby: ['3.0', '3.1']
name: Vagrant unit tests on Go
steps:
- name: Code Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index adec8556b..9fa1f4dba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
- ruby-version: '2.7'
+ ruby-version: '3.1'
- name: Setup Go
uses: actions/setup-go@v3
with:
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 5cea5043c..a987d9a2e 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -31,7 +31,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
- ruby: [ '2.7', '3.0', '3.1' ]
+ ruby: [ '3.0', '3.1', '3.2' ]
name: Vagrant unit tests on Ruby ${{ matrix.ruby }}
steps:
- name: Code Checkout
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 6550462ae..4bcadf949 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.7", "< 3.2"
+ s.required_ruby_version = ">= 3.0", "< 3.3"
s.required_rubygems_version = ">= 1.3.6"
s.add_dependency "bcrypt_pbkdf", "~> 1.1"
--
2.39.0

20
vagrant.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Tue Jan 10 09:23:16 UTC 2023 - Dan Čermák <dcermak@suse.com>
- Add patch to support building with Ruby 3.2
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
* 0010-Remove-dependency-on-grpc-tools.patch
Added patch:
* 0011-Bump-Ruby-version-to-3.x.patch
-------------------------------------------------------------------
Mon Dec 12 09:01:56 UTC 2022 - Dan Čermák <dcermak@suse.com>

5
vagrant.spec
View File

@ -58,6 +58,7 @@ 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-Remove-dependency-on-grpc-tools.patch
Patch11: 0011-Bump-Ruby-version-to-3.x.patch
# force only one ruby version
# CAUTION: if you change this, then you *must* also change the sed calls which
@ -77,9 +78,9 @@ Patch10: 0010-Remove-dependency-on-grpc-tools.patch
# Build dependencies
#===============================================================================
# s.required_ruby_version = ">= 2.7", "< 3.2"
# s.required_ruby_version = ">= 2.7", "< 3.3"
%if 0%{?suse_version} > 1500
BuildRequires: %{ruby} < 3.2
BuildRequires: %{ruby} < 3.3
%else
BuildRequires: %{ruby} >= 2.7
%endif