Accepting request 1198961 from Virtualization:vagrant

- Changed dependency.patch for rexml 3.3 support.
- Combined dependency patches into a common dependency.patch:
  * 0005-do-not-depend-on-wdm.patch
  * 0010-Remove-dependency-on-grpc-tools.patch
  * 0011-Remove-vagrant-ssl-extension.patch
  * 0012-Bump-rgl-dependency-to-0.6.6.patch
  * 0013-Bump-webrick-dependency-to-1.8.0.patch
  * 0014-Bump-vagrant_cloud_dependency.patch
  * childprocess-5.0.patch

OBS-URL: https://build.opensuse.org/request/show/1198961
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=59

0005-do-not-depend-on-wdm.patch

@@ -1,25 +0,0 @@
-From c0a7db63b7cde09913c395737fabf02e6619d8e2 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/13] do not depend on wdm
-
-Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
----
- vagrant.gemspec | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 2a740089a..7d417b019 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -35,7 +35,6 @@ Gem::Specification.new do |s|
-   s.add_dependency "rgl", "~> 0.5.10"
-   s.add_dependency "rubyzip", "~> 2.3.2"
-   s.add_dependency "vagrant_cloud", "~> 3.0.5"
--  s.add_dependency "wdm", "~> 0.1.1"
-   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
-

0010-Remove-dependency-on-grpc-tools.patch

@@ -1,28 +0,0 @@
-From 5a8e538a994d8850333de713dc13f9c9f2416caa 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/13] Remove dependency on grpc-tools
-
-This package is only needed to build the go plugins, which we do not use at the
-moment.
----
- vagrant.gemspec | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 7d417b019..809500649 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -39,9 +39,6 @@ Gem::Specification.new do |s|
-   s.add_dependency "winrm-elevated", ">= 1.2.3", "< 2.0"
-   s.add_dependency "winrm-fs", ">= 1.3.5", "< 2.0"
- 
--  # Needed for go generate to use grpc_tools_ruby_protoc
--  s.add_development_dependency "grpc-tools", "~> 1.41"
--
-   # required to include https://github.com/ruby/ipaddr/issues/35
-   s.add_dependency "ipaddr", ">= 1.2.4"
- 
--- 
-2.41.0
-

0011-Remove-vagrant-ssl-extension.patch

@@ -1,53 +0,0 @@
-From 2b2a008af38fcd713c7e6b6a3ba6f3c2ad1fccc8 Mon Sep 17 00:00:00 2001
-From: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
-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'
--require "rake/extensiontask"
- 
- # Immediately sync all stdout so that tools like buildbot can
- # immediately load in the output.
- $stdout.sync = true
- $stderr.sync = true
- 
--Rake::ExtensionTask.new "vagrant_ssl" do |ext|
--  ext.lib_dir = "lib/vagrant"
--end
--
- # 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 --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"
--  s.add_development_dependency "rake-compiler"
-   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"
-@@ -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
-

0012-Bump-rgl-dependency-to-0.6.6.patch

@@ -1,25 +0,0 @@
-From d4963623e8580d99f1c9db79005f89b629d616f2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
-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
-

0013-Bump-webrick-dependency-to-1.8.0.patch

@@ -1,25 +0,0 @@
-From 316df3ff8e3aac46ada7fa878a90b544b829c5b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
-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
-

0014-Bump-vagrant_cloud_dependency.patch

@@ -1,26 +0,0 @@
-From 430bd45e3df6a42c2b8a45bf43036e17a210f74d Mon Sep 17 00:00:00 2001
-From: Johannes Kastl <git@johannes-kastl.de>
-Date: Mon, 12 Feb 2024 06:40:48 +0100
-Subject: [PATCH] vagrant.gemspec: vagrant_cloud ~> 3.0
-
-Signed-off-by: Johannes Kastl <git@johannes-kastl.de>
----
- vagrant.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index ef388b699..82280c1fe 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
-   s.add_dependency "rexml", "~> 3.2"
-   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 "vagrant_cloud", "~> 3.0"
-   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.43.0
-

childprocess-5.0.patch

@@ -1,12 +0,0 @@
-diff -Pdpru vagrant-2.3.7.orig/vagrant.gemspec vagrant-2.3.7/vagrant.gemspec
---- vagrant-2.3.7.orig/vagrant.gemspec	2023-06-15 23:40:35.000000000 +0300
-+++ vagrant-2.3.7/vagrant.gemspec	2024-02-27 22:06:34.169040881 +0300
-@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
-   s.required_rubygems_version = ">= 1.3.6"
- 
-   s.add_dependency "bcrypt_pbkdf", "~> 1.1"
--  s.add_dependency "childprocess", "~> 4.1.0"
-+  s.add_dependency "childprocess", "~> 5.0.0"
-   s.add_dependency "ed25519", "~> 1.3.0"
-   s.add_dependency "erubi"
-   s.add_dependency 'googleapis-common-protos-types', '~> 1.3'