sysutils/vagrant: update to 2.2.18

https://github.com/hashicorp/vagrant/blob/v2.2.18/CHANGELOG.md

PR:		259658
Reported by:	Ralf van der Enden
Approved by:	joe at thrallingpenguin dot com (maintainer)

4 files changed, 40 insertions, 59 deletions

diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
index df6d285a14b8..62f7191e6828 100644
--- a/sysutils/vagrant/Makefile
+++ b/sysutils/vagrant/Makefile
@@ -1,9 +1,8 @@
 # Created by: Joseph Benden <joe@thrallingpenguin.com>
 
 PORTNAME=	vagrant
-PORTVERSION=	2.2.14
+PORTVERSION=	2.2.18
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
 CATEGORIES=	sysutils rubygems devel
 
 MAINTAINER=	joe@thrallingpenguin.com
@@ -15,50 +14,52 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \
 		rubygem-main>=1.0:devel/rubygem-main
-RUN_DEPENDS=	rubygem-bcrypt_pbkdf10>=1.0.0<1.1:security/rubygem-bcrypt_pbkdf10 \
+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-childprocess40>=4.0.0<4.1.0:devel/rubygem-childprocess40 \
+		rubygem-childprocess>=4.1.0:devel/rubygem-childprocess \
 		rubygem-ed25519>=1.2.4<1.3:security/rubygem-ed25519 \
 		rubygem-erubis>=2.7.0<2.8:www/rubygem-erubis \
 		rubygem-excon>=0.73<1.0:devel/rubygem-excon \
 		rubygem-hashicorp-checkpoint>=0.1.5<0.2:www/rubygem-hashicorp-checkpoint \
 		rubygem-i18n>=1.8,2<2,2:devel/rubygem-i18n \
-		rubygem-listen>=3.1.5:devel/rubygem-listen \
+		rubygem-listen>=3.5:devel/rubygem-listen \
 		rubygem-log4r>=1.1.9<1.1.11:sysutils/rubygem-log4r \
-		rubygem-net-scp1>=1.2.0<1.3:security/rubygem-net-scp1 \
-		rubygem-net-sftp2>=2.1<3:security/rubygem-net-sftp2 \
-		rubygem-net-ssh>=5.2.0:security/rubygem-net-ssh \
+		rubygem-net-scp>=3.0.0:security/rubygem-net-scp \
+		rubygem-net-sftp>=3.0:security/rubygem-net-sftp \
+		rubygem-net-ssh>=6.1.0,2<6.2,2:security/rubygem-net-ssh \
 		rubygem-rb-kqueue>=0.2.0<0.3:devel/rubygem-rb-kqueue \
 		rubygem-rest-client>=1.6.0<3.0:www/rubygem-rest-client \
+		rubygem-rexml>=3.2:textproc/rubygem-rexml \
+		rubygem-ruby_dep>=0:devel/rubygem-ruby_dep \
 		rubygem-rubyzip>=2.2<3:archivers/rubygem-rubyzip \
 		rubygem-vagrant_cloud>=3.0.2<3.1:sysutils/rubygem-vagrant_cloud \
 		rubygem-wdm>=0.1.0<0.2:devel/rubygem-wdm \
-		rubygem-winrm>=2.3.4<3:sysutils/rubygem-winrm \
 		rubygem-winrm-elevated>=1.2.1<2:sysutils/rubygem-winrm-elevated \
 		rubygem-winrm-fs>=1.3.4<2:sysutils/rubygem-winrm-fs \
-		rubygem-ruby_dep>=0:devel/rubygem-ruby_dep \
-		ca_root_nss>=0:security/ca_root_nss \
-		curl:ftp/curl
+		rubygem-winrm>=2.3.4<3:sysutils/rubygem-winrm
 
+USES=		cpe shebangfix
+CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
+USE_RUBY=	yes
 
-USES=		cpe shebangfix
-CPE_VENDOR=	hashicorp
 SHEBANG_FILES=	plugins/hosts/darwin/scripts/install_virtualbox.sh \
-		scripts/sign.sh \
-		scripts/website_push_www.sh
-USE_RUBY=	yes
+		scripts/sign.sh scripts/website_push_www.sh
 GEMFILES=	vagrant-${PORTVERSION}.gem
 RUBYGEMBIN=	gem${RUBY_SUFFIX}
-PLIST_SUB+=	GEMS_DIR="lib/ruby/gems/${RUBY_VER}/" \
+
+NO_ARCH=	yes
+
+PLIST_SUB+=	DOC_DIR="lib/ruby/gems/${RUBY_VER}/doc" \
 		GEM_BASE_DIR="lib/ruby/gems/${RUBY_VER}/gems" \
-		DOC_DIR="lib/ruby/gems/${RUBY_VER}/doc" \
+		GEMS_DIR="lib/ruby/gems/${RUBY_VER}/" \
 		PORTVERSION="${PORTVERSION}"
-NO_ARCH=	yes
 
-RUBYGEM_ARGS=	-l --no-document --no-update-sources \
-		--install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} \
+RUBYGEM_ARGS=	-l --no-document --no-update-sources --install-dir \
+		${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} \
 		--ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin
 GEM_ENV+=	RB_USER_INSTALL=yes
 
diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo
index b19568424b35..fbdf446e906f 100644
--- a/sysutils/vagrant/distinfo
+++ b/sysutils/vagrant/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1606681791
-SHA256 (hashicorp-vagrant-v2.2.14_GH0.tar.gz) = bec6fb4458d3f65e0de81cf022f54b711b40e27fdcf23936d01e9150c932849b
-SIZE (hashicorp-vagrant-v2.2.14_GH0.tar.gz) = 2522944
+TIMESTAMP = 1635811607
+SHA256 (hashicorp-vagrant-v2.2.18_GH0.tar.gz) = 3508b0906b832d7317c8d36220798ec274b721e7ef63d0cf991c68f19d9dae90
+SIZE (hashicorp-vagrant-v2.2.18_GH0.tar.gz) = 1620261
diff --git a/sysutils/vagrant/files/patch-gemspec b/sysutils/vagrant/files/patch-gemspec
deleted file mode 100644
index 36acc220597e..000000000000
--- a/sysutils/vagrant/files/patch-gemspec
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: vagrant.gemspec
-===================================================================
---- vagrant.gemspec.orig
-+++ vagrant.gemspec
-@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
-   s.add_dependency "erubi"
-   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
-   s.add_dependency "i18n", "~> 1.8"
--  s.add_dependency "listen", "~> 3.1"
-+  s.add_dependency "listen", ">= 3.1.5"
-   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
-   s.add_dependency "mime-types", "~> 3.3"
--  s.add_dependency "net-ssh", ">= 6.2.0.rc1", "< 7"
--  s.add_dependency "net-sftp", "~> 3.0"
--  s.add_dependency "net-scp", "~> 1.2.0"
-+  s.add_dependency "net-ssh", ">= 6.0.2", "< 7"
-+  s.add_dependency "net-sftp", ">= 2.1.2"
-+  s.add_dependency "net-scp", ">= 1.2.1"
-   s.add_dependency "rb-kqueue", "~> 0.2.0"
--  s.add_dependency "rubyzip", "~> 2.0"
-+  s.add_dependency "rubyzip", "~> 2.2"
-   s.add_dependency "vagrant_cloud", "~> 3.0.2"
-   s.add_dependency "wdm", "~> 0.1.0"
-   s.add_dependency "winrm", ">= 2.3.4", "< 3.0"
-@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
-   # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5).
-   # Explicit constraint is defined to provide required dependency to listen without imposing
-   # tighter restrictions on valid ruby versions
--  s.add_dependency "ruby_dep", "<= 1.3.1"
-+  s.add_dependency "ruby_dep"
- 
-   # Constraint rake to properly handle deprecated method usage
-   # from within rspec
diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist
index d5a54bad261a..93d545a8311c 100644
--- a/sysutils/vagrant/pkg-plist
+++ b/sysutils/vagrant/pkg-plist
@@ -1,6 +1,5 @@
 bin/vagrant
 %%GEMS_DIR%%cache/vagrant-%%PORTVERSION%%.gem
-%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/.hashibot.hcl
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/.vimrc
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/.yardopts
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/CHANGELOG.md
@@ -97,6 +96,7 @@ bin/vagrant
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/machine.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/machine_index.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/machine_state.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/patches/net-ssh.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/manager.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/plugin/state_file.rb
@@ -153,6 +153,7 @@ bin/vagrant
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/ipv4_interfaces.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/is_port_open.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/keypair.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/line_buffer.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/line_ending_helpers.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/logging_formatter.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/map_command_options.rb
@@ -483,6 +484,13 @@ bin/vagrant
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openbsd/cap/shell_expand_guest_path.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openbsd/guest.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openbsd/plugin.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openwrt/cap/change_host_name.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openwrt/cap/halt.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openwrt/cap/insert_public_key.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openwrt/cap/remove_public_key.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openwrt/cap/rsync.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openwrt/guest.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/openwrt/plugin.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/photon/cap/change_host_name.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/photon/cap/configure_networks.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/photon/cap/docker.rb
@@ -502,6 +510,9 @@ bin/vagrant
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/redhat/cap/smb.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/redhat/guest.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/redhat/plugin.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/rocky/cap/flavor.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/rocky/guest.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/rocky/plugin.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/slackware/cap/change_host_name.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/slackware/cap/configure_networks.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/slackware/guest.rb
@@ -982,6 +993,8 @@ bin/vagrant
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/synced_folders/smb/plugin.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/synced_folders/smb/synced_folder.rb
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/synced_folders/unix_mount_helpers.rb
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/scripts/install_rvm
+%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/scripts/setup_tests
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/scripts/sign.sh
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/scripts/website_push_www.sh
 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/tasks/acceptance.rake