git: 12130255a8c6 - 2025Q3 - sysutils/vagrant: update to 2.4.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 24 Jul 2025 13:47:03 UTC
The branch 2025Q3 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=12130255a8c6f6f9251a687a9b54f3a9b19327f6
commit 12130255a8c6f6f9251a687a9b54f3a9b19327f6
Author: John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2025-07-21 05:54:58 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-07-24 13:45:18 +0000
sysutils/vagrant: update to 2.4.1
unbreak build with default ruby 3.3.
Changes: https://github.com/hashicorp/vagrant/blob/v2.4.1/CHANGELOG.md
PR: 288335
(cherry picked from commit a3257029a75010ef60657888bcff20974223e72d)
---
sysutils/vagrant/Makefile | 7 +------
sysutils/vagrant/distinfo | 6 +++---
sysutils/vagrant/files/patch-bin_vagrant | 11 -----------
sysutils/vagrant/files/patch-vagrant.gemspec | 23 ++++++++++-------------
sysutils/vagrant/pkg-plist | 15 +++++++++++++--
5 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
index 184a74d825e8..38521e3812cb 100644
--- a/sysutils/vagrant/Makefile
+++ b/sysutils/vagrant/Makefile
@@ -1,7 +1,6 @@
PORTNAME= vagrant
-PORTVERSION= 2.3.7
+PORTVERSION= 2.4.1
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= sysutils rubygems devel
MAINTAINER= joe@thrallingpenguin.com
@@ -80,10 +79,6 @@ REMOVE_TARGETS_EXT= gem_make.out mkmf.log
.include <bsd.port.pre.mk>
-.if ${RUBY_VER} >= 3.3
-BROKEN= ruby 3.3 and later is not supported
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
${WRKSRC}/bin/vagrant \
diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo
index a04471420252..7b9639b6ca5d 100644
--- a/sysutils/vagrant/distinfo
+++ b/sysutils/vagrant/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693243733
-SHA256 (hashicorp-vagrant-v2.3.7_GH0.tar.gz) = fa8a96319aa7b9ff5f4a991b77cbf37f549549d84737624bcebefa8f2004bf45
-SIZE (hashicorp-vagrant-v2.3.7_GH0.tar.gz) = 3296042
+TIMESTAMP = 1752906954
+SHA256 (hashicorp-vagrant-v2.4.1_GH0.tar.gz) = 19cfa306e3ffae5ddbf30504f61a1a3124aa9a87721b130a14098d4ea1febf89
+SIZE (hashicorp-vagrant-v2.4.1_GH0.tar.gz) = 3342333
diff --git a/sysutils/vagrant/files/patch-bin_vagrant b/sysutils/vagrant/files/patch-bin_vagrant
index 83ac905135c8..7102a3a53c49 100644
--- a/sysutils/vagrant/files/patch-bin_vagrant
+++ b/sysutils/vagrant/files/patch-bin_vagrant
@@ -10,14 +10,3 @@
# Disable exception reporting by default if available
if Thread.respond_to?(:report_on_exception=)
Thread.report_on_exception = false
-@@ -16,7 +19,9 @@
-
- # These will be the options that are passed to initialize the Vagrant
- # environment.
--opts = {}
-+opts = {
-+ :ca_cert => '@PREFIX@/share/certs/ca-root-nss.crt'
-+}
-
- if idx = argv.index("--")
- argv_extra = argv.slice(idx+1, argv.length-2)
diff --git a/sysutils/vagrant/files/patch-vagrant.gemspec b/sysutils/vagrant/files/patch-vagrant.gemspec
index b662791a630b..531ad29f232a 100644
--- a/sysutils/vagrant/files/patch-vagrant.gemspec
+++ b/sysutils/vagrant/files/patch-vagrant.gemspec
@@ -1,20 +1,17 @@
---- vagrant.gemspec.orig 2023-06-15 20:40:35 UTC
+--- vagrant.gemspec.orig 2024-01-19 20:59:12 UTC
+++ vagrant.gemspec
-@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
+@@ -16,11 +16,11 @@ 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 "ed25519", "~> 1.3.0"
++ s.add_dependency "childprocess", ">= 4.1.0"
++ s.add_dependency "ed25519", ">= 1.3.0"
s.add_dependency "erubi"
s.add_dependency 'googleapis-common-protos-types', '~> 1.3'
-@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
- s.add_dependency "rexml", "~> 3.2"
- 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 "vagrant_cloud", "~> 3.1.1"
- 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 "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"
diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist
index f444b811c074..c2600f43d113 100644
--- a/sysutils/vagrant/pkg-plist
+++ b/sysutils/vagrant/pkg-plist
@@ -1,5 +1,6 @@
bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/CHANGELOG.md
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/.copywrite.hcl
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/LICENSE
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/README.md
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/RELEASE.md
@@ -18,9 +19,12 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/contrib/zsh/generate_zsh_completion.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/README.md
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.key.ed25519
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.key.rsa
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.pub
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.pub.ed25519
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.pub.rsa
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant.rb
-%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant_ssl.so
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builder.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/box_add.rb
@@ -174,6 +178,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/uploader.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/which.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/windows_path.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/vagrant_ssl.so
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/vagrantfile.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/version.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/README.md
@@ -1045,6 +1050,9 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/suse/network_dhcp.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/suse/network_static.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/suse/network_static6.erb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/license/license.html.tmpl
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/license/license.rtf.tmpl
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/license/license.tmpl
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/locales/comm_winrm.yml
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/locales/command_ps.yml
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/locales/command_rdp.yml
@@ -1076,8 +1084,11 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/host/remote.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/machine/remote.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/machine_index/remote.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/builder/mkmf.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/fake_ftp.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/log4r.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/net-ssh.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/rubygems.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/remote.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/remote/command.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/remote/communicator.rb
@@ -1217,7 +1228,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alma/plugin.rb
%%GEMS_DIR%%/cache/vagrant-%%PORTVERSION%%.gem
%%GEMS_DIR%%/extensions/%%BUILD_TARGET%%/%%RUBY_VER%%/vagrant-%%PORTVERSION%%/gem.build_complete
-%%GEMS_DIR%%/extensions/%%BUILD_TARGET%%/%%RUBY_VER%%/vagrant-%%PORTVERSION%%/vagrant_ssl.so
+%%GEMS_DIR%%/extensions/%%BUILD_TARGET%%/%%RUBY_VER%%/vagrant-%%PORTVERSION%%/vagrant/vagrant_ssl.so
%%GEMS_DIR%%/specifications/vagrant-%%PORTVERSION%%.gemspec
%%DATADIR%%/embedded/rgloader/loader.rb
@dir %%GEMS_DIR%%/extensions