Accepting request 1092074 from Virtualization:vagrant

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

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

@@ -13,13 +13,10 @@ index 8728d8d7e..f51b8d263 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
 @@ -35,7 +35,6 @@ Gem::Specification.new do |s|
-   s.add_dependency "rgl", "~> 0.5.7"
+   s.add_dependency "rgl", "~> 0.5.10"
-   s.add_dependency "rubyzip", "~> 2.0"
+   s.add_dependency "rubyzip", "~> 2.3.2"
    s.add_dependency "vagrant_cloud", "~> 3.0.5"
--  s.add_dependency "wdm", "~> 0.1.0"
+-  s.add_dependency "wdm", "~> 0.1.1"
-   s.add_dependency "winrm", ">= 2.3.4", "< 3.0"
+   s.add_dependency "winrm", ">= 2.3.6", "< 3.0"
-   s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
+   s.add_dependency "winrm-elevated", ">= 1.2.3", "< 2.0"
-   s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0"
+   s.add_dependency "winrm-fs", ">= 1.3.5", "< 2.0"
--- 
-2.39.0
-

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

@@ -14,8 +14,8 @@ index f51b8d263..6550462ae 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
 @@ -39,9 +39,6 @@ Gem::Specification.new do |s|
-   s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
+   s.add_dependency "winrm-elevated", ">= 1.2.3", "< 2.0"
-   s.add_dependency "winrm-fs", ">= 1.3.4", "< 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"
@@ -23,6 +23,3 @@ index f51b8d263..6550462ae 100644
    # required to include https://github.com/ruby/ipaddr/issues/35
    s.add_dependency "ipaddr", ">= 1.2.4"
  
--- 
-2.39.0
-

0011-Bump-Ruby-version-to-3.x.patch

@@ -1,96 +0,0 @@
-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/12] 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
-

0012-Only-check-for-arguments-matching-test-string-if-the.patch

@@ -1,43 +0,0 @@
-From 1d3054c09b44c25608c073c225f63808b104f2b0 Mon Sep 17 00:00:00 2001
-From: sophia <scastellarin95@gmail.com>
-Date: Tue, 3 Jan 2023 13:20:14 -0800
-Subject: [PATCH 12/12] Only check for arguments matching test string if the
- argument is a string
-
-This issue surfaced in the tests after updating to Ruby 3.2.0 where
-the =~ operator has been removed.
-
-ref: https://github.com/ruby/ruby/blob/cca54c8b1b71072bb07850c9d3f20b261d3b312c/NEWS.md?plain=1#L498
-(cherry picked from commit 9743c857481556838ee417a0033efdee3fb0c7fc)
----
- test/unit/plugins/provisioners/ansible/provisioner_test.rb | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
-index f5828f143..fdf9aa67e 100644
---- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
-+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
-@@ -91,7 +91,7 @@ VF
-         expect(args[1]).to eq("--connection=ssh")
-         expect(args[2]).to eq("--timeout=30")
- 
--        inventory_count = args.count { |x| x =~ /^--inventory-file=.+$/ }
-+        inventory_count = args.count { |x| x.match(/^--inventory-file=.+$/) if x.is_a?(String) }
-         expect(inventory_count).to be > 0
- 
-         expect(args[args.length-2]).to eq("playbook.yml")
-@@ -100,9 +100,9 @@ VF
- 
-     it "sets --limit argument" do
-       expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
--        all_limits = args.select { |x| x =~ /^(--limit=|-l)/ }
-+        all_limits = args.select { |x| x.match(/^(--limit=|-l)/) if x.is_a?(String) }
-         if config.raw_arguments
--          raw_limits = config.raw_arguments.select { |x| x =~ /^(--limit=|-l)/ }
-+          raw_limits = config.raw_arguments.select { |x| x.match(/^(--limit=|-l)/) if x.is_a?(String) }
-           expect(all_limits.length - raw_limits.length).to eq(1)
-           expect(all_limits.last).to eq(raw_limits.last)
-         else
--- 
-2.39.0
-

vagrant-2.3.4.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43eb1461c6dcfd23a0c386570e6c2a876e06d2388bbc0f1f0c9c99e393aa2f0f
-size 3255262

vagrant-2.3.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f9780b32d979e7cf4565a56fa6dc40b3c9b1b73e4cae9931b1d4a706d0d4d9e
+size 3292039

vagrant.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue May 30 07:53:25 UTC 2023 - Илья Индиго <ilya@ilya.cf>
+
+- Updated to 2.3.6
+  * https://github.com/hashicorp/vagrant/blob/main/CHANGELOG.md#236-may-19-2023
+  * command/serve: Isolate proto constants to file for auto-loading
+  * core/util: Unlock file prior to deletion
+  * provider/docker: Attempt using docker command for bridge ip
+  * provider/virtualbox: Update preferred locale values for driver
+- Updated to 2.3.5
+  * Changed file 0005-do-not-depend-on-wdm.patch.
+  * Changed file 0010-Remove-dependency-on-grpc-tools.patch.
+  * Removed file 0011-Bump-Ruby-version-to-3.x.patch.
+  * Removed file 0012-Only-check-for-arguments-matching-test-string-if-the.patch.
+  * https://github.com/hashicorp/vagrant/blob/main/CHANGELOG.md#235-may-15-2023
+  * communicator/ssh: Use netssh builtin keep alive functionality
+  * communicator/ssh: Update connection settings when using a password to connect ssh
+  * core: Add a file mutex when downloading box files
+  * guest/arch: Support differentiating between Artix and Arch Linux
+  * host/windows: Get state of Windows feature "Microsoft-Hyper-V-Hypervisor"
+  * provider/docker: Ignore inactive docker containers when assigning ports
+  * provider/docker: Sync folders before preparing nfs settings
+  * provider/virtualbox: De-duplicate machine port forward info
+  * provider/virtualbox: Remove check for hyperv being enabled when verifying virtualbox is usable on windows
+  * provider/virtualbox: Validate LANG value when possible
+  * provider/hyperv: Check for hyper-v feature "EnhancedSessionTransportType"
+  * provisioner/ansible: Fix installing Ansible provisioner with version and pip
+  * synced_folders/rsync: allow rsync-auto to also ignore relative paths
+
 -------------------------------------------------------------------
 Wed Feb 22 15:57:11 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
@@ -2084,4 +2113,3 @@ Tue Sep  1 16:57:52 UTC 2015 - mrueckert@suse.de
 Tue Sep  1 15:27:22 UTC 2015 - mrueckert@suse.de
 
 - 1.7.4
-

vagrant.spec

@@ -1,8 +1,7 @@
 #
 # spec file for package vagrant
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Laurent Bigonville <bigon@debian.org>, License GPL-2.0+
 #
 # All modifications and additions to the file contributed by third parties
@@ -26,7 +25,7 @@
 
 
 Name:           vagrant
-Version:        2.3.4
+Version:        2.3.6
 Release:        0
 Summary:        Tool for building and distributing virtualized development environments
 License:        MIT
@@ -58,8 +57,6 @@ 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
-Patch12:        0012-Only-check-for-arguments-matching-test-string-if-the.patch
 
 # force only one ruby version
 # CAUTION: if you change this, then you *must* also change the sed calls which
@@ -79,11 +76,11 @@ Patch12:        0012-Only-check-for-arguments-matching-test-string-if-the.patch
 # Build dependencies
 #===============================================================================
 
-#  s.required_ruby_version     = ">= 2.7", "< 3.3"
+#  s.required_ruby_version     = ">= 3.0", "< 3.3"
 %if 0%{?suse_version} > 1500
 BuildRequires:  %{ruby} < 3.3
 %else
-BuildRequires:  %{ruby} >= 2.7
+BuildRequires:  %{ruby} >= 3.0
 %endif
 #
 #
@@ -124,8 +121,8 @@ 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.7"
+#  s.add_dependency "rgl", "~> 0.5.10"
-BuildRequires:  %{rubygem rgl:0.5 >= 0.5.7}
+BuildRequires:  %{rubygem rgl:0.5 >= 0.5.10}
 #  s.add_dependency "rubyzip", "~> 2.0"
 BuildRequires:  %{rubygem rubyzip:2}
 # Intentionally removed, wdm only works on Windows
@@ -218,8 +215,8 @@ 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.7"
+#  s.add_dependency "rgl", "~> 0.5.10"
-Requires:       %{rubygem rgl:0.5 >= 0.5.7}
+Requires:       %{rubygem rgl:0.5 >= 0.5.10}
 #  s.add_dependency "rubyzip", "~> 2.0"
 Requires:       %{rubygem rubyzip:2}
 #   s.add_dependency "wdm", "~> 0.1.0"
@@ -239,6 +236,7 @@ Requires:       curl
 Requires:       openssh
 # for groupadd
 Requires(pre):  shadow
+BuildArch:      noarch
 
 %description
 Vagrant is a tool for building and distributing virtualized development
@@ -462,6 +460,7 @@ getent group vagrant >/dev/null || groupadd -r vagrant
 %{vagrant_dir}/lib/*
 %{vagrant_dir}/plugins/*
 %{vagrant_dir}/templates/*
+%{vagrant_dir}/tools.go
 
 # these are scripts for Hashicorp
 %exclude %{vagrant_dir}/scripts/*