From 4d4b06a89348fda1ec47763f60ba40f5320d1e50611f42861cc88647c356a750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 16 Nov 2023 16:06:38 +0000 Subject: [PATCH] relax webrick and rgl dependencies OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=79 --- ...rant-silence-warning-about-installer.patch | 6 ++-- 0002-Use-a-private-temporary-dir.patch | 10 +++---- ...s-don-t-abuse-require_relative.patch.patch | 6 ++-- ...-boo-1044087-added-by-robert.muntean.patch | 6 ++-- 0005-do-not-depend-on-wdm.patch | 9 ++++-- ...ative-paths-in-docker-plugin-to-make.patch | 6 ++-- ...on-t-abuse-relative-paths-in-plugins.patch | 6 ++-- 0008-Skip-failing-tests.patch | 6 ++-- 0009-Disable-Subprocess-unit-test.patch | 6 ++-- 0010-Remove-dependency-on-grpc-tools.patch | 9 ++++-- ...=> 0011-Remove-vagrant-ssl-extension.patch | 30 ++++++++++++++----- 0012-Bump-rgl-dependency-to-0.6.6.patch | 25 ++++++++++++++++ 0013-Bump-webrick-dependency-to-1.8.0.patch | 25 ++++++++++++++++ vagrant.changes | 23 ++++++++++++++ vagrant.spec | 19 +++++++----- 15 files changed, 146 insertions(+), 46 deletions(-) rename 0011-remove-ssl-extension.patch => 0011-Remove-vagrant-ssl-extension.patch (62%) create mode 100644 0012-Bump-rgl-dependency-to-0.6.6.patch create mode 100644 0013-Bump-webrick-dependency-to-1.8.0.patch diff --git a/0001-bin-vagrant-silence-warning-about-installer.patch b/0001-bin-vagrant-silence-warning-about-installer.patch index 68a6bd7..43daeae 100644 --- a/0001-bin-vagrant-silence-warning-about-installer.patch +++ b/0001-bin-vagrant-silence-warning-about-installer.patch @@ -1,7 +1,7 @@ -From 4e68a53d0053b1b8b6d18c0a7d86776d8cb800f7 Mon Sep 17 00:00:00 2001 +From 17dca9eb3e51d8f98c80ce100ad52ac8ea6c3c5b Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/12] bin/vagrant: silence warning about installer +Subject: [PATCH 01/13] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl --- @@ -25,5 +25,5 @@ index 7ca30b391..d3f4ea61a 100755 # # Unset - Disables experimental features -- -2.39.0 +2.41.0 diff --git a/0002-Use-a-private-temporary-dir.patch b/0002-Use-a-private-temporary-dir.patch index b363364..78714d5 100644 --- a/0002-Use-a-private-temporary-dir.patch +++ b/0002-Use-a-private-temporary-dir.patch @@ -1,7 +1,7 @@ -From 2840391e027becd1be47e174e9848d23fa4199fb Mon Sep 17 00:00:00 2001 +From 1f229c3d60e0b4c31fbbbbc5dc0906719f2e53a0 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/12] Use a private temporary dir +Subject: [PATCH 02/13] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). @@ -36,10 +36,10 @@ index 90dc69d38..4ee79b988 100644 url = @metadata_url diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb -index 4b3e0ff09..cacead1bc 100644 +index 8e3cbd2af..84df146f0 100644 --- a/lib/vagrant/util.rb +++ b/lib/vagrant/util.rb -@@ -53,6 +53,8 @@ module Vagrant +@@ -54,6 +54,8 @@ module Vagrant autoload :SilenceWarnings, 'vagrant/util/silence_warnings' autoload :SSH, 'vagrant/util/ssh' autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner' @@ -94,5 +94,5 @@ index 000000000..0cbbb53ac + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.39.0 +2.41.0 diff --git a/0003-plugins-don-t-abuse-require_relative.patch.patch b/0003-plugins-don-t-abuse-require_relative.patch.patch index e47bcb0..e178818 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 8a9eccce115d46e0dbcab3a71c6ced612e7606cd Mon Sep 17 00:00:00 2001 +From 38cfae4a7ab162d04732a7bec576413c83e8d9b2 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/12] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 03/13] 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.39.0 +2.41.0 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 4583086..9b0d8fc 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 8ecfa63a112f0b83dc29c226dc0b2ad91953d602 Mon Sep 17 00:00:00 2001 +From ea9f1609c470b03c39d3a83d31dbc780360898c9 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/12] fix vbox package boo#1044087, added by +Subject: [PATCH 04/13] 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.39.0 +2.41.0 diff --git a/0005-do-not-depend-on-wdm.patch b/0005-do-not-depend-on-wdm.patch index 778cb39..8dd4ce9 100644 --- a/0005-do-not-depend-on-wdm.patch +++ b/0005-do-not-depend-on-wdm.patch @@ -1,7 +1,7 @@ -From 591ec0a8f1f65a836cc893f403afa3c971ed05dd Mon Sep 17 00:00:00 2001 +From c0a7db63b7cde09913c395737fabf02e6619d8e2 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/12] do not depend on wdm +Subject: [PATCH 05/13] do not depend on wdm Signed-off-by: Johannes Kastl --- @@ -9,7 +9,7 @@ Signed-off-by: Johannes Kastl 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index 8728d8d7e..f51b8d263 100644 +index 2a740089a..7d417b019 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -35,7 +35,6 @@ Gem::Specification.new do |s| @@ -20,3 +20,6 @@ index 8728d8d7e..f51b8d263 100644 s.add_dependency "winrm", ">= 2.3.6", "< 3.0" s.add_dependency "winrm-elevated", ">= 1.2.3", "< 2.0" s.add_dependency "winrm-fs", ">= 1.3.5", "< 2.0" +-- +2.41.0 + 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 9990c7f..3077dd5 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 5b273a2b85a188c161eb2ed991eba3dd1f4a6520 Mon Sep 17 00:00:00 2001 +From 61d71451dbc739889c488ac4281d696cbce756e4 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/12] do not abuse relative paths in docker plugin to make +Subject: [PATCH 06/13] 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.39.0 +2.41.0 diff --git a/0007-Don-t-abuse-relative-paths-in-plugins.patch b/0007-Don-t-abuse-relative-paths-in-plugins.patch index 0c1aae0..82f8535 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 e8b073c8216a63bbbbdd9ce316e86e58b393d3c4 Mon Sep 17 00:00:00 2001 +From 2412e4fca92e78afe840ed442498bbe17289d636 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/12] Don't abuse relative paths in plugins +Subject: [PATCH 07/13] 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.39.0 +2.41.0 diff --git a/0008-Skip-failing-tests.patch b/0008-Skip-failing-tests.patch index 8f71f38..021f43c 100644 --- a/0008-Skip-failing-tests.patch +++ b/0008-Skip-failing-tests.patch @@ -1,7 +1,7 @@ -From 24f24303433d8fd4ccc374244c7bef576501d24a Mon Sep 17 00:00:00 2001 +From d8bccbad4e211a6612995225712151e5dea2bcc0 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/12] Skip failing tests +Subject: [PATCH 08/13] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- @@ -30,5 +30,5 @@ index dbbd52112..4481e4c09 100644 end end -- -2.39.0 +2.41.0 diff --git a/0009-Disable-Subprocess-unit-test.patch b/0009-Disable-Subprocess-unit-test.patch index e60097b..be0495d 100644 --- a/0009-Disable-Subprocess-unit-test.patch +++ b/0009-Disable-Subprocess-unit-test.patch @@ -1,7 +1,7 @@ -From ccf376b72ddc48130bba3d6dfeb732dc7f9f2f67 Mon Sep 17 00:00:00 2001 +From d43fe3d5c06949412ca1d798723a173bc14b9ce2 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/12] Disable Subprocess unit test +Subject: [PATCH 09/13] 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.39.0 +2.41.0 diff --git a/0010-Remove-dependency-on-grpc-tools.patch b/0010-Remove-dependency-on-grpc-tools.patch index 378d621..93439e9 100644 --- a/0010-Remove-dependency-on-grpc-tools.patch +++ b/0010-Remove-dependency-on-grpc-tools.patch @@ -1,7 +1,7 @@ -From fa0e7bc761285ce8a929e55b7038fecaf8491a2e Mon Sep 17 00:00:00 2001 +From 5a8e538a994d8850333de713dc13f9c9f2416caa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 23 Aug 2022 16:19:11 +0200 -Subject: [PATCH 10/12] Remove dependency on grpc-tools +Subject: [PATCH 10/13] Remove dependency on grpc-tools This package is only needed to build the go plugins, which we do not use at the moment. @@ -10,7 +10,7 @@ moment. 1 file changed, 3 deletions(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index f51b8d263..6550462ae 100644 +index 7d417b019..809500649 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -39,9 +39,6 @@ Gem::Specification.new do |s| @@ -23,3 +23,6 @@ index f51b8d263..6550462ae 100644 # required to include https://github.com/ruby/ipaddr/issues/35 s.add_dependency "ipaddr", ">= 1.2.4" +-- +2.41.0 + diff --git a/0011-remove-ssl-extension.patch b/0011-Remove-vagrant-ssl-extension.patch similarity index 62% rename from 0011-remove-ssl-extension.patch rename to 0011-Remove-vagrant-ssl-extension.patch index 42ea285..e9e611b 100644 --- a/0011-remove-ssl-extension.patch +++ b/0011-Remove-vagrant-ssl-extension.patch @@ -1,5 +1,17 @@ ---- a/Rakefile 2023-06-15 22:40:35.000000000 +0200 -+++ b/Rakefile 2023-06-18 13:28:25.379062875 +0200 +From 2b2a008af38fcd713c7e6b6a3ba6f3c2ad1fccc8 Mon Sep 17 00:00:00 2001 +From: Georg Pfuetzenreuter +Date: Thu, 16 Nov 2023 13:50:07 +0100 +Subject: [PATCH 11/13] Remove vagrant ssl extension + +--- + Rakefile | 5 ----- + vagrant.gemspec | 2 -- + 2 files changed, 7 deletions(-) + +diff --git a/Rakefile b/Rakefile +index 34ce6386e..2af398a1e 100644 +--- a/Rakefile ++++ b/Rakefile @@ -1,16 +1,11 @@ require 'rubygems' require 'bundler/setup' @@ -17,10 +29,11 @@ # Load all the rake tasks from the "tasks" folder. This folder # allows us to nicely separate rake tasks into individual files # based on their role, which makes development and debugging easier -diff '--color=auto' -ru a/vagrant.gemspec b/vagrant.gemspec ---- a/vagrant.gemspec 2023-06-15 22:40:35.000000000 +0200 -+++ b/vagrant.gemspec 2023-06-18 13:18:26.678462256 +0200 -@@ -49,7 +49,6 @@ +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 809500649..64bc2ceb4 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -45,7 +45,6 @@ Gem::Specification.new do |s| # Constraint rake to properly handle deprecated method usage # from within rspec s.add_development_dependency "rake", "~> 13.0" @@ -28,10 +41,13 @@ diff '--color=auto' -ru a/vagrant.gemspec b/vagrant.gemspec s.add_development_dependency "rspec", "~> 3.11" s.add_development_dependency "rspec-its", "~> 1.3.0" s.add_development_dependency "fake_ftp", "~> 0.3.0" -@@ -105,6 +104,5 @@ +@@ -101,6 +100,5 @@ Gem::Specification.new do |s| s.files = unignored_files s.executables = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact - s.extensions = ["ext/vagrant_ssl/extconf.rb"] s.require_path = 'lib' end +-- +2.41.0 + diff --git a/0012-Bump-rgl-dependency-to-0.6.6.patch b/0012-Bump-rgl-dependency-to-0.6.6.patch new file mode 100644 index 0000000..c46928e --- /dev/null +++ b/0012-Bump-rgl-dependency-to-0.6.6.patch @@ -0,0 +1,25 @@ +From d4963623e8580d99f1c9db79005f89b629d616f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Thu, 16 Nov 2023 13:50:52 +0100 +Subject: [PATCH 12/13] Bump rgl dependency to ~> 0.6.6 + +--- + vagrant.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 64bc2ceb4..980ae4743 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -32,7 +32,7 @@ Gem::Specification.new do |s| + s.add_dependency "net-scp", "~> 4.0" + s.add_dependency "rb-kqueue", "~> 0.2.0" + s.add_dependency "rexml", "~> 3.2" +- s.add_dependency "rgl", "~> 0.5.10" ++ s.add_dependency "rgl", "~> 0.6.6" + s.add_dependency "rubyzip", "~> 2.3.2" + s.add_dependency "vagrant_cloud", "~> 3.0.5" + s.add_dependency "winrm", ">= 2.3.6", "< 3.0" +-- +2.41.0 + diff --git a/0013-Bump-webrick-dependency-to-1.8.0.patch b/0013-Bump-webrick-dependency-to-1.8.0.patch new file mode 100644 index 0000000..7a162cb --- /dev/null +++ b/0013-Bump-webrick-dependency-to-1.8.0.patch @@ -0,0 +1,25 @@ +From 316df3ff8e3aac46ada7fa878a90b544b829c5b4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= +Date: Thu, 16 Nov 2023 14:34:36 +0100 +Subject: [PATCH 13/13] Bump webrick dependency to ~> 1.8.0 + +--- + vagrant.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vagrant.gemspec b/vagrant.gemspec +index 980ae4743..ef388b699 100644 +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -48,7 +48,7 @@ Gem::Specification.new do |s| + s.add_development_dependency "rspec", "~> 3.11" + s.add_development_dependency "rspec-its", "~> 1.3.0" + s.add_development_dependency "fake_ftp", "~> 0.3.0" +- s.add_development_dependency "webrick", "~> 1.7.0" ++ s.add_development_dependency "webrick", "~> 1.8.0" + + # The following block of code determines the files that should be included + # in the gem. It does this by reading all the files in the directory where +-- +2.41.0 + diff --git a/vagrant.changes b/vagrant.changes index e4275e6..987aede 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Nov 16 15:50:55 UTC 2023 - Dan Čermák + +- relax webrick and rgl dependencies + + Add patches: + * 0012-Bump-rgl-dependency-to-0.6.6.patch + * 0013-Bump-webrick-dependency-to-1.8.0.patch + + 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 + * 0011-Remove-vagrant-ssl-extension.patch as 0011-remove-ssl-extension.patch + ------------------------------------------------------------------- Sun Jun 18 10:48:43 UTC 2023 - Georg Pfuetzenreuter diff --git a/vagrant.spec b/vagrant.spec index 1aa50a1..73008e2 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -57,7 +57,9 @@ 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-remove-ssl-extension.patch +Patch11: 0011-Remove-vagrant-ssl-extension.patch +Patch12: 0012-Bump-rgl-dependency-to-0.6.6.patch +Patch13: 0013-Bump-webrick-dependency-to-1.8.0.patch # force only one ruby version # CAUTION: if you change this, then you *must* also change the sed calls which @@ -122,8 +124,9 @@ BuildRequires: %{rubygem net-scp:4 } BuildRequires: %{rubygem rb-kqueue:0.2 } # s.add_dependency "rexml", "~> 3.2" BuildRequires: %{rubygem rexml:3 >= 3.2 } -# s.add_dependency "rgl", "~> 0.5.10" -BuildRequires: %{rubygem rgl:0.5 >= 0.5.10} +# PATCHED +# s.add_dependency "rgl", "~> 0.6.6" +BuildRequires: %{rubygem rgl:0.6 >= 0.6.6} # s.add_dependency "rubyzip", "~> 2.0" BuildRequires: %{rubygem rubyzip:2} # Intentionally removed, wdm only works on Windows @@ -150,8 +153,9 @@ BuildRequires: %{rubygem rspec:3 >= 3.11 } BuildRequires: %{rubygem rspec-its:1.3 } # s.add_development_dependency "fake_ftp", "~> 0.3.0" BuildRequires: %{rubygem fake_ftp:0.3 >= 0.3.0 } -# s.add_development_dependency "webrick", "~> 1.7.0" -BuildRequires: %{rubygem webrick:1.7 } +# PATCHED +# s.add_development_dependency "webrick", "~> 1.8.0" +BuildRequires: %{rubygem webrick:1.8 } # Prevent have choice for rubygem(ruby:2.6.0:mime-types) >= 2 BuildRequires: %{rubygem mime-types:3 } @@ -216,8 +220,9 @@ Requires: %{rubygem net-scp:4 } Requires: %{rubygem rb-kqueue:0.2} # s.add_dependency "rexml", "~> 3.2" Requires: %{rubygem rexml:3 >= 3.2 } -# s.add_dependency "rgl", "~> 0.5.10" -Requires: %{rubygem rgl:0.5 >= 0.5.10} +# PATCHED +# s.add_dependency "rgl", "~> 0.6.6" +Requires: %{rubygem rgl:0.6 >= 0.6.6} # s.add_dependency "rubyzip", "~> 2.0" Requires: %{rubygem rubyzip:2} # s.add_dependency "wdm", "~> 0.1.0"