diff options
| author | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2018-11-23 17:07:13 +0000 |
|---|---|---|
| committer | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2018-11-23 17:07:13 +0000 |
| commit | 47fdc39989f9d82f60826b3fd6c018a094decbe9 (patch) | |
| tree | 1594bb26ca6bbe92d66ad9bcccc7f3ef394dad3e /sysutils/vagrant | |
| parent | 0d97aa0e07ad0276c9baec3692dc2f57c82e67c8 (diff) | |
| download | ports-47fdc39989f9d82f60826b3fd6c018a094decbe9.tar.gz ports-47fdc39989f9d82f60826b3fd6c018a094decbe9.zip | |
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)
Notes
Notes:
svn path=/head/; revision=485690
Diffstat (limited to 'sysutils/vagrant')
| -rw-r--r-- | sysutils/vagrant/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/vagrant/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/vagrant/files/patch-bin_vagrant | 8 | ||||
| -rw-r--r-- | sysutils/vagrant/files/patch-gemspec | 17 | ||||
| -rw-r--r-- | sysutils/vagrant/pkg-plist | 1 |
5 files changed, 21 insertions, 17 deletions
diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile index 156429db64da..ff76dd9007b8 100644 --- a/sysutils/vagrant/Makefile +++ b/sysutils/vagrant/Makefile @@ -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 \ diff --git a/sysutils/vagrant/distinfo b/sysutils/vagrant/distinfo index bf23493a508c..dd4ca6a6af92 100644 --- a/sysutils/vagrant/distinfo +++ b/sysutils/vagrant/distinfo @@ -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 diff --git a/sysutils/vagrant/files/patch-bin_vagrant b/sysutils/vagrant/files/patch-bin_vagrant index 600c7dbb12e5..3a766b14992e 100644 --- a/sysutils/vagrant/files/patch-bin_vagrant +++ b/sysutils/vagrant/files/patch-bin_vagrant @@ -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 diff --git a/sysutils/vagrant/files/patch-gemspec b/sysutils/vagrant/files/patch-gemspec index e6490d20c9a3..ee7294c0838d 100644 --- a/sysutils/vagrant/files/patch-gemspec +++ b/sysutils/vagrant/files/patch-gemspec @@ -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 diff --git a/sysutils/vagrant/pkg-plist b/sysutils/vagrant/pkg-plist index a12b64b4adb8..ea1d388992ef 100644 --- a/sysutils/vagrant/pkg-plist +++ b/sysutils/vagrant/pkg-plist @@ -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 |