From d0c6233e8c3ec77fb8d228e6837269e0f596e88d Mon Sep 17 00:00:00 2001
From: Matthias Fechner <mfechner@FreeBSD.org>
Date: Tue, 5 Aug 2025 08:47:34 +0200
Subject: sysutils/vagrant-gitlab: update to 2.4.7

Changes:	https://github.com/hashicorp/vagrant/blob/main/CHANGELOG.md
---
 sysutils/vagrant-gitlab/files/patch-bin_vagrant    |  6 +++---
 sysutils/vagrant-gitlab/files/patch-gemspec        | 25 ++++++++++++----------
 ...-plugins_providers_virtualbox_action_network.rb |  6 +++---
 .../files/patch-templates_locales_en.yml           |  4 ++--
 4 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'sysutils/vagrant-gitlab/files')

diff --git a/sysutils/vagrant-gitlab/files/patch-bin_vagrant b/sysutils/vagrant-gitlab/files/patch-bin_vagrant
index 7102a3a53c49..624fed1b8dad 100644
--- a/sysutils/vagrant-gitlab/files/patch-bin_vagrant
+++ b/sysutils/vagrant-gitlab/files/patch-bin_vagrant
@@ -1,6 +1,6 @@
---- bin/vagrant.orig	2019-02-27 15:35:56.000000000 +0000
-+++ bin/vagrant	2019-03-11 03:50:43.415883000 +0000
-@@ -5,6 +5,9 @@
+--- bin/vagrant.orig	2025-06-17 15:13:05 UTC
++++ bin/vagrant
+@@ -5,6 +5,9 @@ Signal.trap("INT") { abort }
  # initializing which have historically resulted in stack traces.
  Signal.trap("INT") { abort }
  
diff --git a/sysutils/vagrant-gitlab/files/patch-gemspec b/sysutils/vagrant-gitlab/files/patch-gemspec
index 531ad29f232a..69da9ee266e4 100644
--- a/sysutils/vagrant-gitlab/files/patch-gemspec
+++ b/sysutils/vagrant-gitlab/files/patch-gemspec
@@ -1,17 +1,20 @@
---- vagrant.gemspec.orig	2024-01-19 20:59:12 UTC
+--- vagrant.gemspec.orig	2025-06-17 15:13:05 UTC
 +++ vagrant.gemspec
-@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
-   s.required_rubygems_version = ">= 1.3.6"
- 
+@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
    s.add_dependency "bcrypt_pbkdf", "~> 1.1"
--  s.add_dependency "childprocess", "~> 4.1.0"
+   s.add_dependency "childprocess", "~> 5.1"
+   s.add_dependency "csv", "~> 3.3"
 -  s.add_dependency "ed25519", "~> 1.3.0"
-+  s.add_dependency "childprocess", ">= 4.1.0"
-+  s.add_dependency "ed25519", ">= 1.3.0"
++  s.add_dependency "ed25519", "~> 1.3"
    s.add_dependency "erubi"
-   s.add_dependency 'googleapis-common-protos-types', '~> 1.3'
--  s.add_dependency "grpc", "~> 1.56.0"
-+  s.add_dependency "grpc", ">= 1.56.0"
    s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
    s.add_dependency "i18n", "~> 1.12"
-   s.add_dependency "listen", "~> 3.7"
+@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
+   s.add_dependency "ostruct", "~> 0.6.0"
+   s.add_dependency "rb-kqueue", "~> 0.2.0"
+   s.add_dependency "rexml", "~> 3.2"
+-  s.add_dependency "rubyzip", "~> 2.3.2"
++  s.add_dependency "rubyzip", "~> 2.3"
+   s.add_dependency "vagrant_cloud", "~> 3.1.2"
+   s.add_dependency "wdm", "~> 0.2.0"
+   s.add_dependency "winrm", ">= 2.3.9", "< 3.0"
diff --git a/sysutils/vagrant-gitlab/files/patch-plugins_providers_virtualbox_action_network.rb b/sysutils/vagrant-gitlab/files/patch-plugins_providers_virtualbox_action_network.rb
index b56e62d6909c..2cd457c7edb9 100644
--- a/sysutils/vagrant-gitlab/files/patch-plugins_providers_virtualbox_action_network.rb
+++ b/sysutils/vagrant-gitlab/files/patch-plugins_providers_virtualbox_action_network.rb
@@ -1,6 +1,6 @@
---- plugins/providers/virtualbox/action/network.rb.orig	2021-11-05 21:15:44 UTC
+--- plugins/providers/virtualbox/action/network.rb.orig	2025-06-17 15:13:05 UTC
 +++ plugins/providers/virtualbox/action/network.rb
-@@ -18,7 +18,7 @@ module VagrantPlugins
+@@ -21,7 +21,7 @@ module VagrantPlugins
        class Network
  
          # Location of the VirtualBox networks configuration file
@@ -8,4 +8,4 @@
 +        VBOX_NET_CONF = "@PREFIX@/etc/vbox/networks.conf".freeze
          # Version of VirtualBox that introduced hostonly network range restrictions
          HOSTONLY_VALIDATE_VERSION = Gem::Version.new("6.1.28")
-         # Default valid range for hostonly networks
+         # Version of VirtualBox on darwin platform that ignores restrictions
diff --git a/sysutils/vagrant-gitlab/files/patch-templates_locales_en.yml b/sysutils/vagrant-gitlab/files/patch-templates_locales_en.yml
index 01d2cceffd37..2a1889c61aee 100644
--- a/sysutils/vagrant-gitlab/files/patch-templates_locales_en.yml
+++ b/sysutils/vagrant-gitlab/files/patch-templates_locales_en.yml
@@ -1,6 +1,6 @@
---- templates/locales/en.yml.orig	2021-11-05 21:15:44 UTC
+--- templates/locales/en.yml.orig	2025-06-17 15:13:05 UTC
 +++ templates/locales/en.yml
-@@ -1863,7 +1863,7 @@ en:
+@@ -1989,7 +1989,7 @@ en:
            Address: %{address}
            Ranges: %{ranges}
  
-- 
cgit v1.2.3