From owner-svn-ports-all@freebsd.org Fri Nov 23 17:07:15 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A055B114C68B; Fri, 23 Nov 2018 17:07:15 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 44D096C98A; Fri, 23 Nov 2018 17:07:15 +0000 (UTC) (envelope-from cmt@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 22B1821817; Fri, 23 Nov 2018 17:07:15 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wANH7Exm046464; Fri, 23 Nov 2018 17:07:14 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wANH7DBa046459; Fri, 23 Nov 2018 17:07:13 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201811231707.wANH7DBa046459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Fri, 23 Nov 2018 17:07:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485690 - in head/sysutils/vagrant: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: in head/sysutils/vagrant: . files X-SVN-Commit-Revision: 485690 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 44D096C98A X-Spamd-Result: default: False [1.05 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.10)[-0.099,0]; NEURAL_SPAM_LONG(0.42)[0.420,0]; NEURAL_SPAM_MEDIUM(0.73)[0.730,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 17:07:15 -0000 Author: cmt Date: Fri Nov 23 17:07:13 2018 New Revision: 485690 URL: https://svnweb.freebsd.org/changeset/ports/485690 Log: sysutils/vagrant: update to 2.2.1 Changelog: https://github.com/hashicorp/vagrant/blob/v2.2.1/CHANGELOG.md PR: 233273 Approved by: joe at thrallingpenguin dot com (maintainer) Modified: head/sysutils/vagrant/Makefile head/sysutils/vagrant/distinfo head/sysutils/vagrant/files/patch-bin_vagrant head/sysutils/vagrant/files/patch-gemspec head/sysutils/vagrant/pkg-plist Modified: head/sysutils/vagrant/Makefile ============================================================================== --- head/sysutils/vagrant/Makefile Fri Nov 23 17:04:42 2018 (r485689) +++ head/sysutils/vagrant/Makefile Fri Nov 23 17:07:13 2018 (r485690) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vagrant -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils rubygems devel @@ -15,8 +15,10 @@ 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-bundler>=1.12.5:sysutils/rubygem-bundler \ +RUN_DEPENDS= rubygem-bcrypt_pbkdf>=1.0.0:security/rubygem-bcrypt_pbkdf \ + rubygem-bundler>=1.12.5:sysutils/rubygem-bundler \ rubygem-childprocess>=0.6.0:devel/rubygem-childprocess \ + rubygem-ed25519>=1.2.4:security/rubygem-ed25519 \ rubygem-erubis>=2.7.0:www/rubygem-erubis \ rubygem-hashicorp-checkpoint>=0.1.5:www/rubygem-hashicorp-checkpoint \ rubygem-i18n>=0.6.0:devel/rubygem-i18n \ Modified: head/sysutils/vagrant/distinfo ============================================================================== --- head/sysutils/vagrant/distinfo Fri Nov 23 17:04:42 2018 (r485689) +++ head/sysutils/vagrant/distinfo Fri Nov 23 17:07:13 2018 (r485690) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540144506 -SHA256 (hashicorp-vagrant-v2.2.0_GH0.tar.gz) = cb1476683f0e8479334be20b26c49d516a0e1c739b9f6f35a8c05f68e4a048f1 -SIZE (hashicorp-vagrant-v2.2.0_GH0.tar.gz) = 1277421 +TIMESTAMP = 1542392676 +SHA256 (hashicorp-vagrant-v2.2.1_GH0.tar.gz) = 50ecee4e9362fa99115bdbc66d15e80f2440d6479204ac7abf7fb8e77c0fbc03 +SIZE (hashicorp-vagrant-v2.2.1_GH0.tar.gz) = 1222292 Modified: head/sysutils/vagrant/files/patch-bin_vagrant ============================================================================== --- head/sysutils/vagrant/files/patch-bin_vagrant Fri Nov 23 17:04:42 2018 (r485689) +++ head/sysutils/vagrant/files/patch-bin_vagrant Fri Nov 23 17:07:13 2018 (r485690) @@ -1,4 +1,4 @@ ---- bin/vagrant.orig 2016-11-04 21:32:25 UTC +--- bin/vagrant.orig 2018-11-16 19:25:33 UTC +++ bin/vagrant @@ -5,6 +5,9 @@ # initializing which have historically resulted in stack traces. @@ -7,6 +7,6 @@ +ENV["VAGRANT_INSTALLER_ENV"] = 'true' +ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"] = '@PREFIX@/share/vagrant/embedded' + - # Split arguments by "--" if its there, we'll recombine them later - argv = ARGV.dup - argv_extra = [] + # Disable exception reporting by default if available + if Thread.respond_to?(:report_on_exception=) + Thread.report_on_exception = false Modified: head/sysutils/vagrant/files/patch-gemspec ============================================================================== --- head/sysutils/vagrant/files/patch-gemspec Fri Nov 23 17:04:42 2018 (r485689) +++ head/sysutils/vagrant/files/patch-gemspec Fri Nov 23 17:07:13 2018 (r485690) @@ -1,14 +1,15 @@ ---- vagrant.gemspec.orig 2018-02-17 15:20:47.999806000 +0100 -+++ vagrant.gemspec 2018-02-17 15:29:06.780385000 +0100 -@@ -16,15 +16,15 @@ - s.required_rubygems_version = ">= 1.3.6" +--- vagrant.gemspec.orig 2018-11-16 19:28:06 UTC ++++ vagrant.gemspec +@@ -17,16 +17,16 @@ Gem::Specification.new do |s| s.rubyforge_project = "vagrant" + s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" - s.add_dependency "childprocess", "~> 0.6.0" + s.add_dependency "childprocess", ">= 0.6.0" + s.add_dependency "ed25519", "~> 1.2.4" 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 "i18n", "~> 1.1.1" ++ s.add_dependency "i18n", ">= 1.1.1" 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" @@ -18,8 +19,8 @@ + 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" -@@ -36,7 +36,7 @@ + s.add_dependency "rubyzip", "~> 1.2.2" +@@ -40,7 +40,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 Modified: head/sysutils/vagrant/pkg-plist ============================================================================== --- head/sysutils/vagrant/pkg-plist Fri Nov 23 17:04:42 2018 (r485689) +++ head/sysutils/vagrant/pkg-plist Fri Nov 23 17:07:13 2018 (r485690) @@ -767,6 +767,7 @@ bin/vagrant %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_5_0.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_5_1.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_5_2.rb +%%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/driver/version_6_0.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/model/forwarded_port.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/plugin.rb %%GEM_BASE_DIR%%/vagrant-%%PORTVERSION%%/plugins/providers/virtualbox/provider.rb