From owner-svn-ports-head@freebsd.org Fri May 15 15:30:56 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 888552F84D1; Fri, 15 May 2020 15:30:56 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49NsnD3Skqz40Yw; Fri, 15 May 2020 15:30:56 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 721DF266A3; Fri, 15 May 2020 15:30:56 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04FFUuAj079245; Fri, 15 May 2020 15:30:56 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04FFUtnR079241; Fri, 15 May 2020 15:30:55 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202005151530.04FFUtnR079241@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 15 May 2020 15:30:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535296 - in head/sysutils/vagrant: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/sysutils/vagrant: . files X-SVN-Commit-Revision: 535296 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2020 15:30:56 -0000 Author: mfechner Date: Fri May 15 15:30:55 2020 New Revision: 535296 URL: https://svnweb.freebsd.org/changeset/ports/535296 Log: Upgrade sysutils/vagrant to 2.2.9. Changelog: https://github.com/hashicorp/vagrant/blob/v2.2.9/CHANGELOG.md PR: 246471 Submitted by: cmt@ Approved by: joe (maintainer) Modified: head/sysutils/vagrant/Makefile head/sysutils/vagrant/distinfo head/sysutils/vagrant/files/patch-gemspec head/sysutils/vagrant/pkg-plist Modified: head/sysutils/vagrant/Makefile ============================================================================== --- head/sysutils/vagrant/Makefile Fri May 15 15:19:32 2020 (r535295) +++ head/sysutils/vagrant/Makefile Fri May 15 15:30:55 2020 (r535296) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= vagrant -PORTVERSION= 2.2.7 +PORTVERSION= 2.2.9 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= sysutils rubygems devel MAINTAINER= joe@thrallingpenguin.com @@ -18,24 +17,24 @@ BUILD_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-bu rubygem-main>=1.0:devel/rubygem-main RUN_DEPENDS= rubygem-bcrypt_pbkdf>=1.0.0<1.1:security/rubygem-bcrypt_pbkdf \ rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \ - rubygem-childprocess>=0.6.0:devel/rubygem-childprocess \ + rubygem-childprocess>=3.0.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-hashicorp-checkpoint>=0.1.5<0.2:www/rubygem-hashicorp-checkpoint \ - rubygem-i18n>=1.1,2<2,2:devel/rubygem-i18n \ + rubygem-i18n>=1.8,2<2,2:devel/rubygem-i18n \ rubygem-listen>=3.1.5:devel/rubygem-listen \ rubygem-log4r>=1.1.9<1.1.11:sysutils/rubygem-log4r \ rubygem-net-scp>=1.2.0<1.3:security/rubygem-net-scp \ rubygem-net-sftp>=2.1<3:security/rubygem-net-sftp \ - rubygem-net-ssh>=5.1.0:security/rubygem-net-ssh \ + rubygem-net-ssh>=5.2.0: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-rubyzip>=2.2<3:archivers/rubygem-rubyzip \ rubygem-vagrant_cloud>=2.0.3<2.1:sysutils/rubygem-vagrant_cloud \ rubygem-wdm>=0.1.0<0.2:devel/rubygem-wdm \ - rubygem-winrm>=2.1<3:sysutils/rubygem-winrm \ - rubygem-winrm-elevated>=1.1<2:sysutils/rubygem-winrm-elevated \ - rubygem-winrm-fs>=1.0<2:sysutils/rubygem-winrm-fs \ + 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 Modified: head/sysutils/vagrant/distinfo ============================================================================== --- head/sysutils/vagrant/distinfo Fri May 15 15:19:32 2020 (r535295) +++ head/sysutils/vagrant/distinfo Fri May 15 15:30:55 2020 (r535296) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580205959 -SHA256 (hashicorp-vagrant-v2.2.7_GH0.tar.gz) = a9229f6eba67dd51dfd6125dc578d1d0d724f2620f7d9a68cd46fa886df061fc -SIZE (hashicorp-vagrant-v2.2.7_GH0.tar.gz) = 2173893 +TIMESTAMP = 1588940717 +SHA256 (hashicorp-vagrant-v2.2.9_GH0.tar.gz) = b8e541a00285b0aa8e79aab0832c664f2c53ee4af40e382f1b5c452ae5647139 +SIZE (hashicorp-vagrant-v2.2.9_GH0.tar.gz) = 2215868 Modified: head/sysutils/vagrant/files/patch-gemspec ============================================================================== --- head/sysutils/vagrant/files/patch-gemspec Fri May 15 15:19:32 2020 (r535295) +++ head/sysutils/vagrant/files/patch-gemspec Fri May 15 15:30:55 2020 (r535296) @@ -1,30 +1,25 @@ ---- vagrant.gemspec.orig 2020-01-27 20:29:18 UTC +--- vagrant.gemspec.orig 2020-05-05 16:12:02 UTC +++ vagrant.gemspec -@@ -16,19 +16,19 @@ Gem::Specification.new do |s| - s.required_rubygems_version = ">= 1.3.6" - - s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" -- s.add_dependency "childprocess", "~> 0.6.0" -+ s.add_dependency "childprocess", ">= 0.6.0" +@@ -20,15 +20,15 @@ Gem::Specification.new do |s| s.add_dependency "ed25519", "~> 1.2.4" s.add_dependency "erubis", "~> 2.7.0" - s.add_dependency "i18n", "~> 1.1" + s.add_dependency "i18n", "~> 1.8" - s.add_dependency "listen", "~> 3.1.5" + s.add_dependency "listen", ">= 3.1.5" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" -- s.add_dependency "net-ssh", "~> 5.1.0" -+ s.add_dependency "net-ssh", ">= 5.1.0" +- s.add_dependency "net-ssh", "~> 5.2.0" ++ s.add_dependency "net-ssh", ">= 5.2.0" s.add_dependency "net-sftp", "~> 2.1" - 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 "rubyzip", "~> 1.3" +- s.add_dependency "rubyzip", "~> 2.0" + s.add_dependency "rubyzip", "~> 2.2" s.add_dependency "wdm", "~> 0.1.0" - s.add_dependency "winrm", "~> 2.1" - s.add_dependency "winrm-fs", "~> 1.0" + s.add_dependency "winrm", ">= 2.3.4", "< 3.0" + s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.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 Modified: head/sysutils/vagrant/pkg-plist ============================================================================== --- head/sysutils/vagrant/pkg-plist Fri May 15 15:19:32 2020 (r535295) +++ head/sysutils/vagrant/pkg-plist Fri May 15 15:30:55 2020 (r535296) @@ -27,15 +27,15 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant.rb %%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/after_trigger.rb -%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/before_trigger.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/box_add.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/box_check_outdated.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/box_remove.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/box_update.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/call.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/cleanup_disks.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/config_validate.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/confirm.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/delayed.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/destroy_confirm.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/disk.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/env_set.rb @@ -57,6 +57,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/ssh_run.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/synced_folder_cleanup.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/synced_folders.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/trigger.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/builtin/wait_for_communicator.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/general/package.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/action/general/package_setup_files.rb @@ -144,6 +145,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/keypair.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 %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/network_ip.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/numeric.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/lib/vagrant/util/platform.rb @@ -364,6 +366,9 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/bsd/cap/public_key.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/bsd/guest.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/bsd/plugin.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/centos/cap/flavor.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/centos/guest.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/centos/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/coreos/cap/change_host_name.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/coreos/cap/configure_networks.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/coreos/cap/docker.rb @@ -479,6 +484,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/redhat/cap/network_scripts_dir.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/redhat/cap/nfs_client.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/guests/redhat/cap/rsync.rb +%%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/slackware/cap/change_host_name.rb @@ -781,7 +787,10 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/action/snapshot_save.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/action/suspend.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/cap.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/cap/cleanup_disks.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/cap/configure_disks.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/cap/public_address.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/cap/validate_disk_ext.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/config.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/base.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/meta.rb @@ -799,6 +808,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/provider.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/synced_folder.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/util/compile_forwarded_ports.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/cap/guest/alpine/ansible_install.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/ansible/cap/guest/facts.rb @@ -852,14 +862,19 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/provisioner/chef_client.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/provisioner/chef_solo.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/chef/provisioner/chef_zero.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/container/client.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/container/config.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/container/installer.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/container/plugin.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/container/provisioner.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/centos/docker_install.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/centos/docker_start_service.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/debian/docker_install.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/debian/docker_start_service.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/fedora/docker_install.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/linux/docker_configure_vagrant_user.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/linux/docker_daemon_running.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/linux/docker_installed.rb -%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/redhat/docker_install.rb -%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/redhat/docker_start_service.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/cap/windows/docker_daemon_running.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/client.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/docker/config.rb @@ -869,6 +884,14 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/file/config.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/file/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/file/provisioner.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/cap/centos/podman_install.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/cap/linux/podman_installed.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/cap/redhat/podman_install.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/client.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/config.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/installer.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/plugin.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/podman/provisioner.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/puppet/config/puppet.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/puppet/config/puppet_server.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/provisioners/puppet/plugin.rb