Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2022-01-29 21:01:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Sat Jan 29 21:01:41 2022 rev:39 rq:943784 version:2.2.19 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2021-12-07 00:00:26.652339052 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.1898/vagrant.changes 2022-01-29 21:02:00.066706693 +0100 @@ -1,0 +2,19 @@ +Tue Jan 4 09:29:06 UTC 2022 - Dan ??erm??k <dcer...@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 + +------------------------------------------------------------------- New: ---- 0010-Add-support-for-Ruby-3.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:00.898701100 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:00.906701046 +0100 @@ -57,15 +57,16 @@ 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 @@ # 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 @@ 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.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" ++++++ 0001-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:00.942700804 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:00.946700777 +0100 @@ -1,7 +1,7 @@ From 33ec34c4946a10f38747b827ccd0500cc3685af4 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <terce...@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 <ka...@b1-systems.de> --- @@ -36,6 +36,6 @@ # # Unset - Disables experimental features -- -2.31.1 +2.33.1 ++++++ 0002-Use-a-private-temporary-dir.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:00.954700723 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:00.958700697 +0100 @@ -1,7 +1,7 @@ From df5d75cdb6c3f415e53bd494d3db5e4c809d8230 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <terce...@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,6 +94,6 @@ + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.31.1 +2.33.1 ++++++ 0003-plugins-don-t-abuse-require_relative.patch.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:00.970700615 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:00.974700589 +0100 @@ -1,7 +1,7 @@ From e8835db89852f1221ed9eeff67816a079ed6762b Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@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 <ka...@b1-systems.de> --- @@ -154,6 +154,6 @@ module VagrantPlugins module GuestSUSE -- -2.31.1 +2.33.1 ++++++ 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:00.986700508 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:00.990700481 +0100 @@ -1,7 +1,7 @@ From d124f36515e112737baecea699a3aa09615702d7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@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.munte...@gmail.com on Sun Aug 13 19:07:06 UTC 2017 Signed-off-by: Johannes Kastl <ka...@b1-systems.de> @@ -33,6 +33,6 @@ module VagrantPlugins module ProviderVirtualBox -- -2.31.1 +2.33.1 ++++++ 0005-do-not-depend-on-wdm.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:01.014700320 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:01.022700266 +0100 @@ -1,7 +1,7 @@ From 4a7f3ff284ac2a3dd1e6261221f787ac4e7075d7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@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 <ka...@b1-systems.de> --- @@ -21,6 +21,6 @@ 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 ++++++ 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:01.058700024 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:01.062699997 +0100 @@ -1,7 +1,7 @@ From 99447e851f41f413d1e525ef51e946b003e1a080 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <ka...@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 t...@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017 Signed-off-by: Johannes Kastl <ka...@b1-systems.de> @@ -22,6 +22,6 @@ module VagrantPlugins module DockerProvider -- -2.31.1 +2.33.1 ++++++ 0007-Don-t-abuse-relative-paths-in-plugins.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:01.082699862 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:01.090699809 +0100 @@ -1,7 +1,7 @@ From 3dc208ffbe52efb9c77e8541824b2b33a9252eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@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,6 +65,6 @@ require_relative "../installer" -- -2.31.1 +2.33.1 ++++++ 0008-Skip-failing-tests.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:01.114699647 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:01.118699621 +0100 @@ -1,7 +1,7 @@ From f6b2e0cebf27725b82b29085451df2308989b1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@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,6 +30,6 @@ end end -- -2.31.1 +2.33.1 ++++++ 0009-Disable-Subprocess-unit-test.patch ++++++ --- /var/tmp/diff_new_pack.P3ecge/_old 2022-01-29 21:02:01.138699486 +0100 +++ /var/tmp/diff_new_pack.P3ecge/_new 2022-01-29 21:02:01.142699459 +0100 @@ -1,7 +1,7 @@ From cc9cc287131b8a0b4419d2a7c2a0f7f3fd7b5b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@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,6 +33,6 @@ thread = Thread.new{ sp.execute } sleep(0.1) -- -2.31.1 +2.33.1 ++++++ 0010-Add-support-for-Ruby-3.1.patch ++++++ >From 214e118384d0456db19faa0fa63bff571d0229c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@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