From 2ab89878baac856fe8b0ff5fb8bb16efd0a76923 Mon Sep 17 00:00:00 2001 From: Christoph Moench-Tegeder Date: Sun, 4 Jun 2017 19:42:25 +0000 Subject: [PATCH] sysutils/vagrant: update to 1.9.5 PR: 219423 Reviewed by: sunpoet Approved by: maintainer-timeout --- sysutils/vagrant/Makefile | 21 +++++++++---------- sysutils/vagrant/distinfo | 6 +++--- sysutils/vagrant/files/patch-gemspec | 30 +++++++--------------------- sysutils/vagrant/pkg-plist | 21 +++++++++++++++++++ 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile index e54de00ebf03..3f72a7e57c14 100644 --- a/sysutils/vagrant/Makefile +++ b/sysutils/vagrant/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vagrant -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.5 DISTVERSIONPREFIX= v CATEGORIES= sysutils rubygems devel @@ -16,20 +16,21 @@ 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-bundler>=1.12.5:sysutils/rubygem-bundler \ - rubygem-childprocess>=0.5.1:devel/rubygem-childprocess \ + rubygem-childprocess>=0.6.0:devel/rubygem-childprocess \ rubygem-erubis>=2.7.0:www/rubygem-erubis \ - rubygem-hashicorp-checkpoint>=0.1.4:www/rubygem-hashicorp-checkpoint \ - rubygem-i18n>=0.6.9:devel/rubygem-i18n \ + rubygem-hashicorp-checkpoint>=0.1.1:www/rubygem-hashicorp-checkpoint \ + rubygem-i18n>=0.6.0:devel/rubygem-i18n \ rubygem-listen>=3.1.5:devel/rubygem-listen \ - rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \ - rubygem-net-scp>=1.1.0:security/rubygem-net-scp \ + rubygem-log4r>=1.1.9:sysutils/rubygem-log4r \ + rubygem-net-scp>=1.2.0:security/rubygem-net-scp \ rubygem-net-sftp>=2.1:security/rubygem-net-sftp \ - rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \ - rubygem-nokogiri>=1.6.3.1:textproc/rubygem-nokogiri \ - rubygem-rb-kqueue>=0.2.2:devel/rubygem-rb-kqueue \ + rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \ + rubygem-rb-kqueue>=0.2.0:devel/rubygem-rb-kqueue \ rubygem-rest-client>=1.6.0:www/rubygem-rest-client \ rubygem-wdm>=0.1.0:devel/rubygem-wdm \ - rubygem-winrm-elevated>=1.1.0:sysutils/rubygem-winrm-elevated \ + rubygem-winrm>=2.1:sysutils/rubygem-winrm \ + rubygem-winrm-elevated>=1.1:sysutils/rubygem-winrm-elevated \ + rubygem-winrm-fs>=1.0:sysutils/rubygem-winrm-fs \ rubygem-ruby_dep>=0:devel/rubygem-ruby_dep USE_GITHUB= yes diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo index e0e0b036f140..f65d0f9f60b1 100644 --- a/sysutils/vagrant/distinfo +++ b/sysutils/vagrant/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492701666 -SHA256 (mitchellh-vagrant-v1.9.3_GH0.tar.gz) = 4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 -SIZE (mitchellh-vagrant-v1.9.3_GH0.tar.gz) = 1819192 +TIMESTAMP = 1495370416 +SHA256 (mitchellh-vagrant-v1.9.5_GH0.tar.gz) = 69eb8ede3148b6f94389be5fd2d6cb2b6c79ba78cbcacdc354d2c73f12eccc2a +SIZE (mitchellh-vagrant-v1.9.5_GH0.tar.gz) = 1100561 diff --git a/sysutils/vagrant/files/patch-gemspec b/sysutils/vagrant/files/patch-gemspec index 043746275d34..c367d9356959 100644 --- a/sysutils/vagrant/files/patch-gemspec +++ b/sysutils/vagrant/files/patch-gemspec @@ -1,38 +1,22 @@ ---- vagrant.gemspec.orig 2017-02-28 00:34:40 UTC +--- vagrant.gemspec.orig 2017-05-21 14:08:33 UTC +++ vagrant.gemspec @@ -16,15 +16,15 @@ Gem::Specification.new do |s| s.required_rubygems_version = ">= 1.3.6" s.rubyforge_project = "vagrant" -- s.add_dependency "childprocess", "~> 0.5.0" -+ s.add_dependency "childprocess", ">= 0.5.0" +- s.add_dependency "childprocess", "~> 0.6.0" ++ s.add_dependency "childprocess", ">= 0.6.0" s.add_dependency "erubis", "~> 2.7.0" - s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" + s.add_dependency "i18n", ">= 0.6.0" s.add_dependency "listen", "~> 3.1.5" s.add_dependency "hashicorp-checkpoint", "~> 0.1.1" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" -- s.add_dependency "net-ssh", "~> 3.0.1" -+ s.add_dependency "net-ssh", ">= 3.0.1" +- s.add_dependency "net-ssh", "~> 4.1.0" ++ s.add_dependency "net-ssh", ">= 4.1.0" s.add_dependency "net-sftp", "~> 2.1" -- s.add_dependency "net-scp", "~> 1.1.0" -+ s.add_dependency "net-scp", ">= 1.1.0" +- s.add_dependency "net-scp", "~> 1.2.0" ++ s.add_dependency "net-scp", ">= 1.2.0" s.add_dependency "rb-kqueue", "~> 0.2.0" s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" s.add_dependency "wdm", "~> 0.1.0" -@@ -33,13 +33,13 @@ Gem::Specification.new do |s| - s.add_dependency "winrm-elevated", "~> 1.1" - - # We lock this down to avoid compilation issues. -- s.add_dependency "nokogiri", "= 1.6.7.1" -+ s.add_dependency "nokogiri", ">= 1.6.7.1" - - # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions - # 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 d84eb3f3f876..e14c1fad1be7 100644 --- a/sysutils/vagrant/pkg-plist +++ b/sysutils/vagrant/pkg-plist @@ -130,6 +130,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/env.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/guest_inspection.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/hash_with_indifferent_access.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/io.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/is_port_open.rb @@ -252,6 +253,8 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/up/command.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/up/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/up/start_mixins.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/validate/command.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/validate/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/version/command.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/commands/version/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/communicators/ssh/communicator.rb @@ -272,6 +275,9 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/communicators/winrm/helper.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/communicators/winrm/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/communicators/winrm/shell.rb +%%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/amazon/cap/flavor.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/amazon/guest.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/amazon/plugin.rb @@ -317,10 +323,13 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/debian/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/dragonflybsd/guest.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/dragonflybsd/plugin.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/elementary/guest.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/elementary/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/esxi/cap/change_host_name.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/esxi/cap/configure_networks.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/esxi/cap/halt.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/esxi/cap/mount_nfs_folder.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/esxi/cap/public_key.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/esxi/guest.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/esxi/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/fedora/cap/flavor.rb @@ -550,6 +559,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/docker/communicator.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/docker/config.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/docker/driver.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/docker/driver/compose.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/docker/errors.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/docker/executor/local.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/docker/executor/vagrant.rb @@ -607,6 +617,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/resume_vm.ps1 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/set_network_mac.ps1 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/set_network_vlan.ps1 +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/set_vm_integration_services.ps1 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/start_vm.ps1 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/stop_vm.ps1 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/hyperv/scripts/suspend_vm.ps1 @@ -702,6 +713,8 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/cfengine/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/cfengine/provisioner.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/cap/debian/chef_install.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/cap/freebsd/chef_install.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/cap/freebsd/chef_installed.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/cap/linux/chef_installed.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/cap/omnios/chef_install.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/cap/omnios/chef_installed.rb @@ -822,6 +835,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/gentoo/network_dhcp.erb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/gentoo/network_static.erb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/gentoo/network_static6.erb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/gentoo/network_systemd.erb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/netbsd/network_dhcp.erb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/netbsd/network_static.erb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/templates/guests/nixos/hostname.erb @@ -884,12 +898,15 @@ bin/vagrant %%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/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 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/communicators/ssh/communicator_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/communicators/winrm/command_filter_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/communicators/winrm/communicator_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/communicators/winrm/config_test.rb %%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/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 @@ -913,6 +930,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/debian/cap/rsync_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 @@ -921,6 +939,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/insert_public_key_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/mount_nfs_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/mount_smb_shared_folder.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/mount_virtual_box_shared_folder_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/network_interfaces_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/guests/linux/cap/nfs_client_test.rb @@ -978,6 +997,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/docker/action/create_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/docker/command/exec_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/docker/config_test.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/docker/driver_compose_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/docker/driver_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/docker/synced_folder_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/plugins/providers/hyperv/config_test.rb @@ -1051,6 +1071,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/templates/guests/funtoo/network_static_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/templates/guests/gentoo/network_dhcp_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/templates/guests/gentoo/network_static_test.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/templates/guests/gentoo/systemd_network_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/templates/guests/netbsd/network_dhcp_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/templates/guests/netbsd/network_static_test.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/test/unit/templates/guests/redhat/network_dhcp_test.rb