sysutils/vagrant: update to 2.0.0

https://github.com/hashicorp/vagrant/releases
Also adds a one-line patch to vagrant's ssh_communicator to avoid a
flood of warnings from net-ssh (net-ssh changed a parameter's name).

PR:		222390
Approved by:	joe(at)thrallingpenguin.com (maintainer)
This commit is contained in:
Christoph Moench-Tegeder 2017-09-18 09:01:22 +00:00
parent 6f41015441
commit b955038841
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=450033
4 changed files with 56 additions and 4 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= vagrant
PORTVERSION= 1.9.5
PORTVERSION= 2.0.0
DISTVERSIONPREFIX= v
CATEGORIES= sysutils rubygems devel

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1495370416
SHA256 (mitchellh-vagrant-v1.9.5_GH0.tar.gz) = 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a
SIZE (mitchellh-vagrant-v1.9.5_GH0.tar.gz) = 1100561
TIMESTAMP = 1505571389
SHA256 (mitchellh-vagrant-v2.0.0_GH0.tar.gz) = c25d3a5f18abdf349047f4d80bb74e6cb526959536e4bef5aa771de9d39cb260
SIZE (mitchellh-vagrant-v2.0.0_GH0.tar.gz) = 1142850

View file

@ -0,0 +1,11 @@
--- plugins/communicators/ssh/communicator.rb.orig 2017-09-16 14:58:44 UTC
+++ plugins/communicators/ssh/communicator.rb
@@ -363,7 +363,7 @@
forward_agent: ssh_info[:forward_agent],
send_env: ssh_info[:forward_env],
keys_only: ssh_info[:keys_only],
- paranoid: ssh_info[:paranoid],
+ verify_host_key: ssh_info[:paranoid],
password: ssh_info[:password],
port: ssh_info[:port],
timeout: 15,

View file

@ -278,6 +278,13 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/communicators/winssh/communicator.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/communicators/winssh/config.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/communicators/winssh/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alt/cap/change_host_name.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alt/cap/configure_networks.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alt/cap/flavor.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alt/cap/network_scripts_dir.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alt/cap/rsync.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alt/guest.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/alt/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/amazon/cap/flavor.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/amazon/guest.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/amazon/plugin.rb
@ -348,6 +355,8 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/gentoo/cap/configure_networks.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/gentoo/guest.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/gentoo/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/kali/guest.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/kali/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/linux/cap/choose_addressable_ip_addr.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/linux/cap/halt.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/linux/cap/mount_smb_shared_folder.rb
@ -411,7 +420,9 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/cap/change_host_name.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/cap/configure_networks.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/cap/halt.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/cap/insert_public_key.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/cap/mount_nfs.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/cap/remove_public_key.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/cap/rsync.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/config.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/smartos/guest.rb
@ -460,6 +471,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/cap/configure_networks.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/cap/halt.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/cap/mount_shared_folder.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/cap/public_key.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/cap/reboot.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/cap/rsync.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/config.rb
@ -471,6 +483,9 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/scripts/reboot_detect.ps1
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/scripts/set_work_network.ps1
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/windows/scripts/winrs_v3_get_adapters.ps1
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/hosts/alt/cap/nfs.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/hosts/alt/host.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/hosts/alt/plugin.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/hosts/arch/cap/nfs.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/hosts/arch/host.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/hosts/arch/plugin.rb
@ -698,6 +713,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/config/base.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/config/guest.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/config/host.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/constants.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/errors.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/helpers.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/plugin.rb
@ -819,6 +835,10 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/commands/ssh_config/config.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/config/messages.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/config/validation_failed.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/alt/network_dhcp.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/alt/network_ipv4address.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/alt/network_ipv4route.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/alt/network_static.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/arch/network_dhcp.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/arch/network_static.erb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/arch/network_static6.erb
@ -895,8 +915,12 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/port/command_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/provider/command_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/push/command_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/snapshot/command/delete_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/snapshot/command/list_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/snapshot/command/pop_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/snapshot/command/push_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/snapshot/command/restore_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/snapshot/command/save_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/ssh_config/command_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/up/command_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/commands/validate/command_test.rb
@ -907,6 +931,11 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/communicators/winrm/helper_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/communicators/winrm/shell_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/communicators/winssh/communicator_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/alt/cap/change_host_name_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/alt/cap/configure_networks_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/alt/cap/flavor_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/alt/cap/network_scripts_dir_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/alt/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/amazon/cap/flavor_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/arch/cap/change_host_name_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/arch/cap/configure_networks_test.rb
@ -928,12 +957,14 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/debian/cap/configure_networks_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/debian/cap/nfs_client_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/debian/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/darwin/cap/shell_expand_guest_path_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/debian/cap/smb_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/esxi/cap/halt_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/esxi/cap/public_key_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/freebsd/cap/change_host_name_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/freebsd/cap/configure_networks_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/freebsd/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/freebsd/cap/shell_expand_guest_path_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/choose_addressable_ip_addr_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/halt_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/insert_public_key_test.rb
@ -946,11 +977,14 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/port_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/remove_public_key_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/shell_expand_guest_path_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/omnios/cap/change_host_name_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/omnios/cap/mount_nfs_folder_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/omnios/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/netbsd/cap/shell_expand_guest_path_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/openbsd/cap/halt_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/openbsd/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/openbsd/cap/shell_expand_guest_path_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/photon/cap/change_host_name_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/photon/cap/configure_networks_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/photon/cap/docker_test.rb
@ -968,7 +1002,9 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/change_host_name_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/configure_networks_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/halt_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/insert_public_key_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/mount_nfs_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/remove_public_key_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/smartos/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/solaris/cap/halt_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/solaris11/cap/halt_test.rb
@ -982,7 +1018,9 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/tinycore/cap/halt_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/cap/change_host_name_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/cap/halt_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/cap/insert_public_key_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/cap/mount_shared_folder_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/cap/remove_public_key_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/cap/reboot_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/cap/rsync_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/windows/config_test.rb
@ -1030,8 +1068,10 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/chef/omnibus_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/chef/provisioner/base_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/docker/config_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/docker/provisioner_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/file/config_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/file/provisioner_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/puppet/provisioner/puppet_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/salt/config_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/salt/provisioner_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/provisioners/shell/config_test.rb
@ -1096,6 +1136,7 @@ bin/vagrant
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/action/builtin/provision_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/action/builtin/ssh_exec_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/action/builtin/ssh_run_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/action/builtin/synced_folder_cleanup_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/action/builtin/synced_folders_test.rb
%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/vagrant/action/hook_test.rb