From 7dc964d6011521a704cfeb78d886ab8c0391875b Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:47:07 +0200 Subject: [PATCH 1/6] Eliminate use of obsolete %patchN syntax (#2283636) --- vagrant.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vagrant.spec b/vagrant.spec index 9b7edce..7415350 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -197,7 +197,7 @@ sed -i '/^ require .net\/ssh\/authentication\/ed25519.$/,/^ end$/ s/^/#/' \ %endif # Let's get rid of protobuf related components -%patch2 -p16 +%patch 2 -p16 %gemspec_remove_file -s %{name}.gemspec Dir.glob('lib/vagrant/protobufs/**/*.*') # This file contains monkey patching and compatibility for Protobuf serialization. @@ -205,9 +205,9 @@ sed -i '/^ require .net\/ssh\/authentication\/ed25519.$/,/^ end$/ s/^/#/' \ %gemspec_remove_file -s %{name}.gemspec "plugins/commands/serve/util/direct_conversions.rb" rm -rf plugins/commands/serve/util/direct_conversions.rb # Patch out related requires in code. -%patch5 -p1 +%patch 5 -p1 -%patch3 -p1 +%patch 3 -p1 %build From 5f0fa4cc2bebcc8fc3b5fb9033b67c7efca9195f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:31:17 +0000 Subject: [PATCH 2/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vagrant.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vagrant.spec b/vagrant.spec index 7415350..6f5c5a0 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -7,7 +7,7 @@ Name: vagrant Version: 2.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Build and distribute virtualized development environments License: MIT URL: http://vagrantup.com @@ -488,6 +488,9 @@ end %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb %changelog +* Sat Jul 20 2024 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Feb 07 2024 Vít Ondruch - 2.3.4-5 - Drop superfluous rest-client dependency. From 28f6e257f9df947e327d693daab09c42aefb0249 Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Thu, 16 Jan 2025 14:16:03 +0100 Subject: [PATCH 3/6] Fix default URL used for pulling boxes. The default URL to pull vagrant boxes changed. Fixing it allows the boxes to be pulled again. Resolves: rhbz#2337302 --- ...efault-vagrant-URL-for-pulling-boxes.patch | 22 +++++++++++++++++++ vagrant.spec | 12 +++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch diff --git a/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch b/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch new file mode 100644 index 0000000..c181831 --- /dev/null +++ b/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch @@ -0,0 +1,22 @@ +From 27440fdd8cebf57882e3672376d409b139cc1e86 Mon Sep 17 00:00:00 2001 +From: Jarek Prokop +Date: Thu, 16 Jan 2025 13:36:05 +0100 +Subject: [PATCH] Fix the default vagrant URL for pulling boxes. + +--- + lib/vagrant/shared_helpers.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb +index b07c89a48..3c57cad6d 100644 +--- a/lib/vagrant/shared_helpers.rb ++++ b/lib/vagrant/shared_helpers.rb +@@ -10,7 +10,7 @@ module Vagrant + # of Vagrant that may require remote access. + # + # @return [String] +- DEFAULT_SERVER_URL = "https://vagrantcloud.com".freeze ++ DEFAULT_SERVER_URL = "https://vagrantcloud.com/api/v2/vagrant".freeze + + # Max number of seconds to wait for joining an active thread. + # diff --git a/vagrant.spec b/vagrant.spec index 6f5c5a0..3d8cdea 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -7,7 +7,7 @@ Name: vagrant Version: 2.3.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Build and distribute virtualized development environments License: MIT URL: http://vagrantup.com @@ -40,6 +40,10 @@ Patch4: vagrant-2.3.4-Only-check-for-arguments-matching-test-string.patch # The file is removed as it requires protobuf components not yet # packaged in Fedora. Patch5: vagrant-2.3.4-Disable-loading-of-direct_conversions-file.patch +# Default URL for pulling boxes seems to have changed. +# This fix allows vagrant to pull boxes again. +# See: https://bugzilla.redhat.com/show_bug.cgi?id=2337302 +Patch6: vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch # The load directive is supported since RPM 4.12, i.e. F21+. The build process # fails on older Fedoras. @@ -209,6 +213,8 @@ rm -rf plugins/commands/serve/util/direct_conversions.rb %patch 3 -p1 +%patch 6 -p1 + %build gem build %{name}.gemspec @@ -488,6 +494,10 @@ end %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb %changelog +* Thu Jan 16 2025 Jarek Prokop - 2.3.4-7 +- Fix default URL used for pulling boxes. + Resolves: rhbz#2337302 + * Sat Jul 20 2024 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From aff1f9a2ef298df3eb6d3e767381f94cee1ab5fb Mon Sep 17 00:00:00 2001 From: Jarek Prokop Date: Thu, 16 Jan 2025 14:16:03 +0100 Subject: [PATCH 4/6] Fix default URL used for pulling boxes. The default URL to pull vagrant boxes changed. Fixing it allows the boxes to be pulled again. Resolves: rhbz#2337302 --- ...efault-vagrant-URL-for-pulling-boxes.patch | 22 +++++++++++++++++++ vagrant.spec | 12 +++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch diff --git a/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch b/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch new file mode 100644 index 0000000..c181831 --- /dev/null +++ b/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch @@ -0,0 +1,22 @@ +From 27440fdd8cebf57882e3672376d409b139cc1e86 Mon Sep 17 00:00:00 2001 +From: Jarek Prokop +Date: Thu, 16 Jan 2025 13:36:05 +0100 +Subject: [PATCH] Fix the default vagrant URL for pulling boxes. + +--- + lib/vagrant/shared_helpers.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb +index b07c89a48..3c57cad6d 100644 +--- a/lib/vagrant/shared_helpers.rb ++++ b/lib/vagrant/shared_helpers.rb +@@ -10,7 +10,7 @@ module Vagrant + # of Vagrant that may require remote access. + # + # @return [String] +- DEFAULT_SERVER_URL = "https://vagrantcloud.com".freeze ++ DEFAULT_SERVER_URL = "https://vagrantcloud.com/api/v2/vagrant".freeze + + # Max number of seconds to wait for joining an active thread. + # diff --git a/vagrant.spec b/vagrant.spec index 9b7edce..92c2f27 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -7,7 +7,7 @@ Name: vagrant Version: 2.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Build and distribute virtualized development environments License: MIT URL: http://vagrantup.com @@ -40,6 +40,10 @@ Patch4: vagrant-2.3.4-Only-check-for-arguments-matching-test-string.patch # The file is removed as it requires protobuf components not yet # packaged in Fedora. Patch5: vagrant-2.3.4-Disable-loading-of-direct_conversions-file.patch +# Default URL for pulling boxes seems to have changed. +# This fix allows vagrant to pull boxes again. +# See: https://bugzilla.redhat.com/show_bug.cgi?id=2337302 +Patch6: vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch # The load directive is supported since RPM 4.12, i.e. F21+. The build process # fails on older Fedoras. @@ -209,6 +213,8 @@ rm -rf plugins/commands/serve/util/direct_conversions.rb %patch3 -p1 +%patch6 -p1 + %build gem build %{name}.gemspec @@ -488,6 +494,10 @@ end %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb %changelog +* Thu Jan 16 2025 Jarek Prokop - 2.3.4-6 +- Fix default URL used for pulling boxes. + Resolves: rhbz#2337302 + * Wed Feb 07 2024 Vít Ondruch - 2.3.4-5 - Drop superfluous rest-client dependency. From 098ed181ad80620c814dce95699f05ea107b8096 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:56:03 +0000 Subject: [PATCH 5/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vagrant.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vagrant.spec b/vagrant.spec index 3d8cdea..ef07b0c 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -7,7 +7,7 @@ Name: vagrant Version: 2.3.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Build and distribute virtualized development environments License: MIT URL: http://vagrantup.com @@ -494,6 +494,9 @@ end %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb %changelog +* Fri Jul 25 2025 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Jarek Prokop - 2.3.4-7 - Fix default URL used for pulling boxes. Resolves: rhbz#2337302 From dd512fa319e8f2504180e13d638a7f0f7262e4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 22 Dec 2025 12:51:06 +0100 Subject: [PATCH 6/6] Relax `rubygem(rubyzip)` dependency This is in preparation for getting rubyzip 3.0+ into Fedora. --- vagrant.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vagrant.spec b/vagrant.spec index ef07b0c..224083e 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -7,7 +7,7 @@ Name: vagrant Version: 2.3.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Build and distribute virtualized development environments License: MIT URL: http://vagrantup.com @@ -158,6 +158,8 @@ sed -i -e '/required_ruby_version/ s/, "< 3.2"//' %{name}.gemspec # We have newer version in Fedora %gemspec_remove_dep -s %{name}.gemspec -g listen %gemspec_add_dep -s %{name}.gemspec -g listen '>= 3.5.1' +%gemspec_remove_dep -s %{name}.gemspec -g rubyzip '~> 2.0' +%gemspec_add_dep -s %{name}.gemspec -g rubyzip '>= 2.0.0' # Remove Windows specific dependencies %gemspec_remove_dep -s %{name}.gemspec -g wdm @@ -494,6 +496,9 @@ end %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb %changelog +* Mon Dec 22 2025 Vít Ondruch - 2.3.4-9 +- Relax `rubygem(rubyzip)` dependency + * Fri Jul 25 2025 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild