Accepting request 1036400 from Virtualization:vagrant

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

0001-bin-vagrant-silence-warning-about-installer.patch

@@ -1,7 +1,7 @@
-From a9484fd519adf67284315f1b7367a0d9215637b5 Mon Sep 17 00:00:00 2001
+From 1983e82b7e6dbdd83fb8825db5f685a5d6fcf364 Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro@debian.org>
 Date: Sat, 11 Oct 2014 16:54:58 -0300
-Subject: [PATCH 01/12] bin/vagrant: silence warning about installer
+Subject: [PATCH 01/10] bin/vagrant: silence warning about installer
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---

0002-Use-a-private-temporary-dir.patch

@@ -1,7 +1,7 @@
-From 2e7fbb949344d7918f2b80ad35c3e95018f07ba0 Mon Sep 17 00:00:00 2001
+From 02893365295d215dc802402ba99299f297534018 Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro@debian.org>
 Date: Wed, 22 Oct 2014 09:40:14 -0200
-Subject: [PATCH 02/12] 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).

0003-plugins-don-t-abuse-require_relative.patch.patch

@@ -1,7 +1,7 @@
-From ff4daa7b6d1912cd51ad78a05655af8def3da3ba Mon Sep 17 00:00:00 2001
+From b1dcd81165eb0a3525c5bbc6b8ba5692ab9b210a Mon Sep 17 00:00:00 2001
 From: Johannes Kastl <kastl@b1-systems.de>
 Date: Wed, 17 May 2017 09:09:57 +0200
-Subject: [PATCH 03/12] plugins-don-t-abuse-require_relative.patch
+Subject: [PATCH 03/10] plugins-don-t-abuse-require_relative.patch
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---

0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch

@@ -1,7 +1,7 @@
-From b182dd0e2ce6e4964437674d148a4db84082369a Mon Sep 17 00:00:00 2001
+From 9bd031027288433fa153188148226eb40bb4f5e8 Mon Sep 17 00:00:00 2001
 From: Johannes Kastl <kastl@b1-systems.de>
 Date: Fri, 16 Nov 2018 21:12:43 +0100
-Subject: [PATCH 04/12] fix vbox package boo#1044087, added by
+Subject: [PATCH 04/10] 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 <kastl@b1-systems.de>

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

@@ -1,7 +1,7 @@
-From c615ae4db1298cdf9e6b8af4280dcb4536cedbe7 Mon Sep 17 00:00:00 2001
+From bccd645c0358f598d8d641b2d85f6163f6837140 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/12] do not depend on wdm
+Subject: [PATCH 05/10] do not depend on wdm
 
 Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
  1 file changed, 1 deletion(-)
 
 diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 68884f35b..410484dc1 100644
+index 8728d8d7e..f51b8d263 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
 @@ -35,7 +35,6 @@ Gem::Specification.new do |s|

0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch

@@ -1,7 +1,7 @@
-From 22209200b5126a357e399ab62529954c7ff8242c Mon Sep 17 00:00:00 2001
+From 3a3c2b8bc98af807819c4f6c503838cf8c3ca2bf Mon Sep 17 00:00:00 2001
 From: Johannes Kastl <kastl@b1-systems.de>
 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/10] 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 <kastl@b1-systems.de>

0007-Don-t-abuse-relative-paths-in-plugins.patch

@@ -1,7 +1,7 @@
-From e68cfa0f5f2653b85f5a92c72544d64a349ac84e Mon Sep 17 00:00:00 2001
+From 5bd209264293cefaabe95aec30914db84fa92a8e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Fri, 11 Jan 2019 12:32:28 +0100
-Subject: [PATCH 07/12] 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

0008-Skip-failing-tests.patch

@@ -1,7 +1,7 @@
-From b60042a2b9d0c94be207ad852d0b58bb2f8f002c Mon Sep 17 00:00:00 2001
+From b687d26ac9d8027e7bac73c9e5258ba632c36ed0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Mon, 1 Apr 2019 17:28:31 +0200
-Subject: [PATCH 08/12] Skip failing tests
+Subject: [PATCH 08/10] Skip failing tests
 
 ---
  test/unit/bin/vagrant_test.rb | 4 ++--

0009-Disable-Subprocess-unit-test.patch

@@ -1,7 +1,7 @@
-From 12e2bb8f59b42b93a09c5e44aa1ce183512f727d Mon Sep 17 00:00:00 2001
+From 0e972e73b2601b2dd68269eb6d006ecfb7fba4e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
 Date: Wed, 28 Aug 2019 13:39:58 +0200
-Subject: [PATCH 09/12] 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

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

@@ -1,7 +1,7 @@
-From 5bdda0d6b8ca0c39e03e9b4df4950d6704b35089 Mon Sep 17 00:00:00 2001
+From ea1a647652e891b7b8cfa725dc954104f76b79c2 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/12] Remove dependency on grpc-tools
+Subject: [PATCH 10/10] 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 410484dc1..c8a25cd0b 100644
+index f51b8d263..6550462ae 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
 @@ -39,9 +39,6 @@ Gem::Specification.new do |s|

0011-Bump-net-ssh-to-7.0.patch

@@ -1,30 +0,0 @@
-From 4cd4f37c6a3bc15af4bdb5906e49f0e9839f6305 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
-Date: Tue, 1 Nov 2022 14:23:32 +0100
-Subject: [PATCH 11/12] Bump net-ssh to ~> 7.0
-
-This also requires a bump of net-scp and net-sftp
----
- vagrant.gemspec | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index c8a25cd0b..8fde90bad 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
-   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"
-+  s.add_dependency "net-ssh", "~> 7.0"
-+  s.add_dependency "net-sftp", "~> 4.0"
-+  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.7"
--- 
-2.38.1
-

0012-Relax-rspec-dependency-to-3.11.patch

@@ -1,27 +0,0 @@
-From 2a230250e61dd40735a338f5264a3c357f5c1156 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
-Date: Tue, 1 Nov 2022 15:53:19 +0100
-Subject: [PATCH 12/12] Relax rspec dependency to ~> 3.11
-
-No need to be so overly strict, this is a test dependency, so failures will
-surface immediately.
----
- vagrant.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 8fde90bad..4f2cb20ab 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -45,7 +45,7 @@ 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 "rspec", "~> 3.11.0"
-+  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"
--- 
-2.38.1
-

vagrant-2.3.2.tar.gz

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

vagrant-2.3.3.tar.gz

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

vagrant.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Nov 16 15:15:03 UTC 2022 - Dan Čermák <dcermak@suse.com>
+
+- New upstream release 2.3.3
+
+  Rebased 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
+
+ Removed patches (merged upstream):
+ * 0011-Bump-net-ssh-to-7.0.patch
+ * 0012-Relax-rspec-dependency-to-3.11.patch
+
+## 2.3.3 (November 15, 2022)
+
+IMPROVEMENTS:
+
+- core: Bump net-ssh dependency to 7.0 and remove patches [GH-12979]
+- synced_folders/rsync: Include ssh `extra_args` value [GH-12973]
+
+BUG FIXES:
+
+- command/serve: Force root level namespace for Google constant [GH-12989]
+- guest/solaris: Fix insecure key authorized keys removal [GH-12740]
+- provider/virtualbox: Fix `:private_network` support for VirtualBox 7 on macOS [GH-12983]
+- provider/virtualbox: Prevent localization of command output [GH-12994]
+- provisioner/ansible: Update setup packages in debian capability [GH-12832]
+
 -------------------------------------------------------------------
 Fri Nov  4 08:13:18 UTC 2022 - Dan Čermák <dcermak@suse.com>
 

vagrant.spec

@@ -26,7 +26,7 @@
 
 
 Name:           vagrant
-Version:        2.3.2
+Version:        2.3.3
 Release:        0
 Summary:        Tool for building and distributing virtualized development environments
 License:        MIT
@@ -58,8 +58,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-net-ssh-to-7.0.patch
-Patch12:        0012-Relax-rspec-dependency-to-3.11.patch
 
 # force only one ruby version
 # CAUTION: if you change this, then you *must* also change the sed calls which
@@ -79,11 +77,11 @@ Patch12:        0012-Relax-rspec-dependency-to-3.11.patch
 # Build dependencies
 #===============================================================================
 
-#  s.required_ruby_version     = ">= 2.5", "< 3.2"
+#  s.required_ruby_version     = ">= 2.7", "< 3.2"
 %if 0%{?suse_version} > 1500
 BuildRequires:  %{ruby} < 3.2
 %else
-BuildRequires:  %{ruby} >= 2.5
+BuildRequires:  %{ruby} >= 2.7
 %endif
 #
 #
@@ -114,13 +112,10 @@ BuildConflicts:  %{rubygem log4r:1.1 >= 1.1.11 }
 BuildRequires:  %{rubygem mime-types:3 >= 3.3 }
 #  s.add_dependency "net-ftp", "~> 0.1"
 BuildRequires:  %{rubygem net-ftp:0 >= 0.1 }
-# PATCHED
 #  s.add_dependency "net-ssh", "~> 7.0"
 BuildRequires:  %{rubygem net-ssh:7 }
-# PATCHED
 #  s.add_dependency "net-sftp", "~> 4.0"
 BuildRequires:  %{rubygem net-sftp:4 }
-# PATCHED
 #  s.add_dependency "net-scp", "~> 4.0"
 BuildRequires:  %{rubygem net-scp:4 }
 #  s.add_dependency "rb-kqueue", "~> 0.2.0"
@@ -149,7 +144,6 @@ BuildRequires:  %{rubygem vagrant_cloud:3.0 >= 3.0.5 }
 # devel dependencies:
 #  s.add_development_dependency "rake", "~> 13.0"
 BuildRequires:  %{rubygem rake:13 }
-# PATCHED
 #  s.add_development_dependency "rspec", "~> 3.11"
 BuildRequires:  %{rubygem rspec:3 >= 3.11 }
 #  s.add_development_dependency "rspec-its", "~> 1.3.0"
@@ -212,13 +206,10 @@ Requires:       %{rubygem log4r:1.1 < 1.1.11 }
 Requires:       %{rubygem mime-types:3 >= 3.3}
 #  s.add_dependency "net-ftp", "~> 0.1"
 BuildRequires:  %{rubygem net-ftp:0 >= 0.1 }
-# PATCHED
 #  s.add_dependency "net-ssh", "~> 7.0"
 Requires:       %{rubygem net-ssh:7 }
-# PATCHED
 #  s.add_dependency "net-sftp", "~> 4.0"
 Requires:       %{rubygem net-sftp:4 }
-# PATCHED
 #  s.add_dependency "net-scp", "~> 4.0"
 Requires:       %{rubygem net-scp:4 }
 #  s.add_dependency "rb-kqueue", "~> 0.2.0"