git: 334c78087fd3 - main - sysutils/vagrant: update to 2.3.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Sep 2023 06:33:32 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=334c78087fd3eba8fe93f4ed4407c97804ed70c7
commit 334c78087fd3eba8fe93f4ed4407c97804ed70c7
Author: Ralf van der Enden <tremere@cainites.net>
AuthorDate: 2023-08-30 08:58:53 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-09-04 06:33:18 +0000
sysutils/vagrant: update to 2.3.7
ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.3.7/CHANGELOG.md
2.3.7 (June 15, 2023)
IMPROVEMENTS:
* command/ssh: Enable deprecated key types and algorithms
* core: Update user error message on failed extension installs
* core: Support loading legacy providers in OpenSSL 3
* provisioner/salt: Verify bootstrap-salt download
BUG FIXES:
* communicator/ssh: Remove keyboard-interactive auth method
* provisioner/salt: Fix usage on Windows guests
VAGRANT-GO:
* Update data layer implementation
* Update dependencies
2.3.6 (May 19, 2023)
BUG FIXES:
* 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
2.3.5 (May 15, 2023)
BUG FIXES:
* 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
PR: 273419
Reported by: tremere@cainites.net
Approved by: joe@thrallingpenguin.com (maintainer)
---
sysutils/vagrant/Makefile | 39 ++++++++++++++++++++++-----------------
sysutils/vagrant/distinfo | 6 +++---
sysutils/vagrant/pkg-plist | 11 ++++++++---
3 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
index bbd22f285e88..f4d82cb1e437 100644
--- a/sysutils/vagrant/Makefile
+++ b/sysutils/vagrant/Makefile
@@ -1,5 +1,5 @@
PORTNAME= vagrant
-PORTVERSION= 2.3.4
+PORTVERSION= 2.3.7
DISTVERSIONPREFIX= v
CATEGORIES= sysutils rubygems devel
@@ -16,32 +16,30 @@ BUILD_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \
RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
curl:ftp/curl \
rubygem-bcrypt_pbkdf>=1.1:security/rubygem-bcrypt_pbkdf \
- rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \
rubygem-childprocess>=4.1.0:devel/rubygem-childprocess \
rubygem-ed25519>=1.3.0:security/rubygem-ed25519 \
rubygem-erubi>=0:www/rubygem-erubi \
rubygem-googleapis-common-protos-types>=1.3.0:devel/rubygem-googleapis-common-protos-types \
rubygem-grpc>=1.48.0:net/rubygem-grpc \
rubygem-hashicorp-checkpoint>=0.1.5<0.2:www/rubygem-hashicorp-checkpoint \
- rubygem-i18n>=1.8,2<2,2:devel/rubygem-i18n \
+ rubygem-i18n>=1.12,2:devel/rubygem-i18n \
rubygem-ipaddr>=1.2.4:net/rubygem-ipaddr \
- rubygem-listen>=3.6:devel/rubygem-listen \
+ rubygem-listen>=3.7:devel/rubygem-listen \
rubygem-log4r>=1.1.9<1.1.11:sysutils/rubygem-log4r \
rubygem-mime-types>=3.3:misc/rubygem-mime-types \
- rubygem-net-ftp>=0.1:ftp/rubygem-net-ftp \
+ rubygem-net-ftp>=0.2:ftp/rubygem-net-ftp \
rubygem-net-scp>=4.0.0:security/rubygem-net-scp \
rubygem-net-sftp>=4.0:security/rubygem-net-sftp \
rubygem-net-ssh>=7.0.0:security/rubygem-net-ssh \
- rubygem-rb-kqueue>=0.2.0<0.3:devel/rubygem-rb-kqueue \
+ rubygem-rb-kqueue>=0.2.0:devel/rubygem-rb-kqueue \
rubygem-rexml>=3.2:textproc/rubygem-rexml \
- rubygem-rgl>=0.5.7:devel/rubygem-rgl \
- rubygem-ruby_dep>=0:devel/rubygem-ruby_dep \
- rubygem-rubyzip>=2.2<3:archivers/rubygem-rubyzip \
- rubygem-vagrant_cloud>=3.0.5<3.1:sysutils/rubygem-vagrant_cloud \
- rubygem-wdm>=0.1.0<0.2:devel/rubygem-wdm \
- rubygem-winrm-elevated>=1.2.1<2:sysutils/rubygem-winrm-elevated \
- rubygem-winrm-fs>=1.3.4<2:sysutils/rubygem-winrm-fs \
- rubygem-winrm>=2.3.4<3:sysutils/rubygem-winrm
+ rubygem-rgl>=0.5.10:devel/rubygem-rgl \
+ rubygem-rubyzip>=2.3.2:archivers/rubygem-rubyzip \
+ rubygem-vagrant_cloud>=3.0.5:sysutils/rubygem-vagrant_cloud \
+ rubygem-wdm>=0.1.1:devel/rubygem-wdm \
+ rubygem-winrm-elevated>=1.2.3<2:sysutils/rubygem-winrm-elevated \
+ rubygem-winrm-fs>=1.3.5<2:sysutils/rubygem-winrm-fs \
+ rubygem-winrm>=2.3.6<3:sysutils/rubygem-winrm
USES= cpe ruby shebangfix
CPE_VENDOR= hashicorp
@@ -54,9 +52,10 @@ SHEBANG_FILES= plugins/hosts/darwin/scripts/install_virtualbox.sh \
GEMFILES= vagrant-${PORTVERSION}.gem
RUBYGEMBIN= gem
-NO_ARCH= yes
+BUILD_TARGET= ${ARCH}-${OPSYS:tl}-${OSREL:R}
-PLIST_SUB+= DOC_DIR="lib/ruby/gems/${RUBY_VER}/doc" \
+PLIST_SUB+= BUILD_TARGET="${BUILD_TARGET}" \
+ DOC_DIR="lib/ruby/gems/${RUBY_VER}/doc" \
GEM_BASE_DIR="lib/ruby/gems/${RUBY_VER}/gems" \
GEMS_DIR="lib/ruby/gems/${RUBY_VER}" \
PORTVERSION="${PORTVERSION}"
@@ -74,7 +73,9 @@ ZSH_PLIST_FILES= share/share/zsh/site-functions/_vagrant
REMOVE_TARGETS= .envrc .runner.sh .vimrc .yardopts flake.lock flake.nix Gemfile \
gen.go go.mod go.sum Makefile Rakefile shell.nix \
vagrant-config.hcl vagrant-spec.config.example.rb \
- vagrant.gemspec
+ vagrant.gemspec vagrant_ssl.so
+
+REMOVE_TARGETS_EXT= gem_make.out mkmf.log
post-patch:
@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
@@ -96,10 +97,14 @@ do-build:
post-install:
${RMDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/doc
+ ${RM} -r ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/ext
${RM} -r ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/nix
.for FILE in ${REMOVE_TARGETS}
${RM} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/gems/${PORTNAME}-${PORTVERSION}/${FILE}
.endfor
+.for FILE in ${REMOVE_TARGETS_EXT}
+ ${RM} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/extensions/${BUILD_TARGET}/${RUBY_VER}/${PORTNAME}-${PORTVERSION}/${FILE}
+.endfor
post-install-BASH-on:
${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo
index d92365a2f92b..a04471420252 100644
--- a/sysutils/vagrant/distinfo
+++ b/sysutils/vagrant/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672569880
-SHA256 (hashicorp-vagrant-v2.3.4_GH0.tar.gz) = 43eb1461c6dcfd23a0c386570e6c2a876e06d2388bbc0f1f0c9c99e393aa2f0f
-SIZE (hashicorp-vagrant-v2.3.4_GH0.tar.gz) = 3255262
+TIMESTAMP = 1693243733
+SHA256 (hashicorp-vagrant-v2.3.7_GH0.tar.gz) = fa8a96319aa7b9ff5f4a991b77cbf37f549549d84737624bcebefa8f2004bf45
+SIZE (hashicorp-vagrant-v2.3.7_GH0.tar.gz) = 3296042
diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist
index 21db9a923af2..f444b811c074 100644
--- a/sysutils/vagrant/pkg-plist
+++ b/sysutils/vagrant/pkg-plist
@@ -1,5 +1,4 @@
bin/vagrant
-%%GEMS_DIR%%/cache/vagrant-%%PORTVERSION%%.gem
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/CHANGELOG.md
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/LICENSE
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/README.md
@@ -21,6 +20,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/keys/vagrant.pub
%%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
@@ -139,6 +139,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/experimental.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/file_checksum.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/file_mode.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/file_mutex.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/guest_hosts.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/guest_inspection.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/hash_with_indifferent_access.rb
@@ -284,6 +285,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/reload/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/resume/command.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/resume/plugin.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/serve/constants.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/snapshot/command/delete.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/snapshot/command/list.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/snapshot/command/pop.rb
@@ -939,8 +941,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/puppet/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/puppet/provisioner/puppet.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/puppet/provisioner/puppet_server.rb
-%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/salt/bootstrap-salt.ps1
-%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/salt/bootstrap-salt.sh
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/salt/bootstrap_downloader.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/salt/config.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/salt/errors.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/salt/plugin.rb
@@ -1060,6 +1061,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/provisioners/chef_solo/solo.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/provisioners/chef_zero/zero.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/rgloader.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/tools.go
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/version.txt
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/Dockerfile
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/binstubs/vagrant
@@ -1213,6 +1215,9 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alma/cap/flavor.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alma/guest.rb
%%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%%/specifications/vagrant-%%PORTVERSION%%.gemspec
%%DATADIR%%/embedded/rgloader/loader.rb
@dir %%GEMS_DIR%%/extensions