From 32a9ce3d352425b8ae802146ae339879d7f30c344b6687f028b779a9179bdce0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 1 Feb 2022 12:21:49 +0000 Subject: [PATCH] Accepting request 950395 from home:dancermak:branches:Virtualization:vagrant Bump ed25519 version to ~> 1.3.0 && switch to default ruby OBS-URL: https://build.opensuse.org/request/show/950395 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=64 --- ...rant-silence-warning-about-installer.patch | 4 +-- 0002-Use-a-private-temporary-dir.patch | 4 +-- ...s-don-t-abuse-require_relative.patch.patch | 4 +-- ...-boo-1044087-added-by-robert.muntean.patch | 4 +-- 0005-do-not-depend-on-wdm.patch | 4 +-- ...ative-paths-in-docker-plugin-to-make.patch | 4 +-- ...on-t-abuse-relative-paths-in-plugins.patch | 4 +-- 0008-Skip-failing-tests.patch | 4 +-- 0009-Disable-Subprocess-unit-test.patch | 4 +-- 0010-Add-support-for-Ruby-3.1.patch | 4 +-- 0011-Bump-version-of-ed25519-to-1.3.0.patch | 26 +++++++++++++++++++ vagrant.changes | 21 +++++++++++++++ vagrant.spec | 19 ++++++-------- 13 files changed, 75 insertions(+), 31 deletions(-) create mode 100644 0011-Bump-version-of-ed25519-to-1.3.0.patch diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 4266307..c4630e5 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,7 +1,7 @@ From 33ec34c4946a10f38747b827ccd0500cc3685af4 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro 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 --- @@ -36,5 +36,5 @@ index b539d3479..77c83d7c0 100755 # # Unset - Disables experimental features -- -2.33.1 +2.34.1 diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index a1d2f3a..97979a0 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ From df5d75cdb6c3f415e53bd494d3db5e4c809d8230 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro 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.33.1 +2.34.1 diff --git a/0003-plugins-don-t-abuse-require_relative.patch.patch b/0003-plugins-don-t-abuse-require_relative.patch.patch index 4dc6685..d639c10 100644 --- a/0003-plugins-don-t-abuse-require_relative.patch.patch +++ b/0003-plugins-don-t-abuse-require_relative.patch.patch @@ -1,7 +1,7 @@ From e8835db89852f1221ed9eeff67816a079ed6762b Mon Sep 17 00:00:00 2001 From: Johannes Kastl 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 --- @@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644 module VagrantPlugins module GuestSUSE -- -2.33.1 +2.34.1 diff --git a/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch b/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch index e6ec6cc..67d08cc 100644 --- a/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch +++ b/0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch @@ -1,7 +1,7 @@ From d124f36515e112737baecea699a3aa09615702d7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl 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 @@ -33,5 +33,5 @@ index a0baf516f..867fe2bf8 100644 module VagrantPlugins module ProviderVirtualBox -- -2.33.1 +2.34.1 diff --git a/0005-do-not-depend-on-wdm.patch b/0005-do-not-depend-on-wdm.patch index 55aa7c6..5d080c1 100644 --- a/0005-do-not-depend-on-wdm.patch +++ b/0005-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ From 4a7f3ff284ac2a3dd1e6261221f787ac4e7075d7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl 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 --- @@ -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.33.1 +2.34.1 diff --git a/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch b/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch index f4f66c3..bf03a49 100644 --- a/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch +++ b/0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch @@ -1,7 +1,7 @@ From 99447e851f41f413d1e525ef51e946b003e1a080 Mon Sep 17 00:00:00 2001 From: Johannes Kastl 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 @@ -22,5 +22,5 @@ index 07c4e5333..e8142df8b 100644 module VagrantPlugins module DockerProvider -- -2.33.1 +2.34.1 diff --git a/0007-Don-t-abuse-relative-paths-in-plugins.patch b/0007-Don-t-abuse-relative-paths-in-plugins.patch index 8e77780..7db06a5 100644 --- a/0007-Don-t-abuse-relative-paths-in-plugins.patch +++ b/0007-Don-t-abuse-relative-paths-in-plugins.patch @@ -1,7 +1,7 @@ From 3dc208ffbe52efb9c77e8541824b2b33a9252eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= 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.33.1 +2.34.1 diff --git a/0008-Skip-failing-tests.patch b/0008-Skip-failing-tests.patch index fd48e7a..69c8a07 100644 --- a/0008-Skip-failing-tests.patch +++ b/0008-Skip-failing-tests.patch @@ -1,7 +1,7 @@ From f6b2e0cebf27725b82b29085451df2308989b1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= 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.33.1 +2.34.1 diff --git a/0009-Disable-Subprocess-unit-test.patch b/0009-Disable-Subprocess-unit-test.patch index c51f9f9..e216f78 100644 --- a/0009-Disable-Subprocess-unit-test.patch +++ b/0009-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ From cc9cc287131b8a0b4419d2a7c2a0f7f3fd7b5b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= 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.33.1 +2.34.1 diff --git a/0010-Add-support-for-Ruby-3.1.patch b/0010-Add-support-for-Ruby-3.1.patch index 15e7f96..bf40c70 100644 --- a/0010-Add-support-for-Ruby-3.1.patch +++ b/0010-Add-support-for-Ruby-3.1.patch @@ -1,7 +1,7 @@ From 214e118384d0456db19faa0fa63bff571d0229c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 3 Jan 2022 12:08:09 +0100 -Subject: [PATCH 10/10] Add support for Ruby 3.1 +Subject: [PATCH 10/11] 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. @@ -33,5 +33,5 @@ index 2bef1036a..ccf76011a 100644 s.add_dependency "net-sftp", "~> 3.0" s.add_dependency "net-scp", "~> 3.0.0" -- -2.33.1 +2.34.1 diff --git a/0011-Bump-version-of-ed25519-to-1.3.0.patch b/0011-Bump-version-of-ed25519-to-1.3.0.patch new file mode 100644 index 0000000..e52b482 --- /dev/null +++ b/0011-Bump-version-of-ed25519-to-1.3.0.patch @@ -0,0 +1,26 @@ +From 32b8ea83078edc4a86cbba573142dc95b16ebd40 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Tue, 1 Feb 2022 11:31:44 +0100 +Subject: [PATCH 11/11] Bump version of ed25519 to ~> 1.3.0 + +(cherry picked from commit 2a974101f42dbc525450e240f02db2a3edc62ac1) +--- + vagrant.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index ccf76011a..ea38685bf 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -17,7 +17,7 @@ Gem::Specification.new do |s| + + s.add_dependency "bcrypt_pbkdf", "~> 1.1" + s.add_dependency "childprocess", "~> 4.1.0" +- s.add_dependency "ed25519", "~> 1.2.4" ++ s.add_dependency "ed25519", "~> 1.3.0" + s.add_dependency "erubi" + s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" + s.add_dependency "i18n", "~> 1.8" +-- +2.34.1 + diff --git a/vagrant.changes b/vagrant.changes index 810e70d..ce8fac0 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Feb 1 10:55:47 UTC 2022 - Dan Čermák + +- Switch to default Ruby on TW +- Bump ed25519 version to ~> 1.3.0 + + 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-Add-support-for-Ruby-3.1.patch + + Added patch: + * 0011-Bump-version-of-ed25519-to-1.3.0.patch + ------------------------------------------------------------------- Tue Jan 4 09:29:06 UTC 2022 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index 9c764cb..03913a9 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -1,7 +1,7 @@ # # spec file for package vagrant # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Laurent Bigonville , License GPL-2.0+ # @@ -58,20 +58,15 @@ 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 +Patch11: 0011-Bump-version-of-ed25519-to-1.3.0.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 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 %global rb_ruby_suffix %rb_default_ruby_suffix -%endif # we use the rpm macros in this spec # need to load them *after* defining the rb_* macros @@ -98,8 +93,9 @@ BuildRequires: %{rubygem bundler} BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.1.0" BuildRequires: %{rubygem childprocess:4.1 } -# s.add_dependency "ed25519", "~> 1.2.4" -BuildRequires: %{rubygem ed25519:1.2 >= 1.2.4 } +# PATCHED +# s.add_dependency "ed25519", "~> 1.3.0" +BuildRequires: %{rubygem ed25519:1.3 >= 1.3.0 } # s.add_dependency "erubi" BuildRequires: %{rubygem erubi } # s.add_dependency "i18n", "~> 1.8" @@ -188,8 +184,9 @@ BuildRequires: fdupes Requires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } # s.add_dependency "childprocess", "~> 4.1.0" Requires: %{rubygem childprocess:4.1} -# s.add_dependency "ed25519", "~> 1.2.4" -Requires: %{rubygem ed25519:1.2 >= 1.2.4} +# PATCHED +# s.add_dependency "ed25519", "~> 1.3.0" +Requires: %{rubygem ed25519:1.3 >= 1.3.0} # s.add_dependency "erubi" Requires: %{rubygem erubi} # s.add_dependency "i18n", "~> 1.8"