svn commit: r442577 - in head/sysutils/vagrant: . files

[Guido Falsi]

On 06/04/17 21:42, Christoph Moench-Tegeder wrote:
> Author: cmt
> Date: Sun Jun  4 19:42:25 2017
> New Revision: 442577
> URL: https://svnweb.freebsd.org/changeset/ports/442577
> 
> Log:
>   sysutils/vagrant: update to 1.9.5
>   

I suspect there is a problem with this commit (see below)

> Modified: head/sysutils/vagrant/files/patch-gemspec
> ==============================================================================
> --- head/sysutils/vagrant/files/patch-gemspec	Sun Jun  4 18:51:16 2017	(r442576)
> +++ head/sysutils/vagrant/files/patch-gemspec	Sun Jun  4 19:42:25 2017	(r442577)
> @@ -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

Maybe it's just me, but it looks like removing this part of the patch
causes vagrant to fail to run with the ruby parts installed by the ports
tree.

Could the "+  s.add_dependency "ruby_dep"" be added back to the port? Is
it the right fix or I'm doing something wrong on my system? (I know very
little about ruby)

Thanks in advance!

-- 
Guido Falsi <madpilot at FreeBSD.org>