Attachment 178665 Details for Bug 215905 – unrestrict ruby_dep version, fix patch-bin_vagrant

[patch] unrestrict ruby_dep version, fix patch-bin_vagrant

vagrant.patch (text/plain), 5.50 KB, created by Matthew Seaman on 2017-01-09 12:06:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2017-01-09 12:06:05 UTC

Size: 5.50 KB

patch

obsolete

>Index: sysutils/vagrant/Makefile
>===================================================================
>--- sysutils/vagrant/Makefile	(revision 430942)
>+++ sysutils/vagrant/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	vagrant
> PORTVERSION=	1.8.7
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	sysutils rubygems devel
> 
>Index: sysutils/vagrant/files/patch-bin_vagrant
>===================================================================
>--- sysutils/vagrant/files/patch-bin_vagrant	(revision 430942)
>+++ sysutils/vagrant/files/patch-bin_vagrant	(working copy)
>@@ -1,4 +1,4 @@
>---- bin/vagrant.orig	2015-12-24 21:26:53 UTC
>+--- bin/vagrant.orig	2016-11-04 21:32:25 UTC
> +++ bin/vagrant
> @@ -5,6 +5,9 @@
>  # initializing which have historically resulted in stack traces.
>@@ -5,7 +5,7 @@
>  Signal.trap("INT") { abort }
>  
> +ENV["VAGRANT_INSTALLER_ENV"] = 'true'
>-+ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"] = '/usr/local/share/vagrant/embedded'
>++ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"] = '@PREFIX@/share/vagrant/embedded'
> +
>  # Split arguments by "--" if its there, we'll recombine them later
>  argv = ARGV.dup
>Index: sysutils/vagrant/files/patch-gemspec
>===================================================================
>--- sysutils/vagrant/files/patch-gemspec	(revision 430942)
>+++ sysutils/vagrant/files/patch-gemspec	(nonexistent)
>@@ -1,31 +0,0 @@
>---- vagrant.gemspec.orig	2016-07-19 03:39:08 UTC
>-+++ vagrant.gemspec
>-@@ -20,16 +20,16 @@ Gem::Specification.new do |s|
>-   # APIs, so even point releases can introduce breaking changes. These changes
>-   # are *untestable* until after a release is made because there is no way for
>-   # Bundler to exec into itself. Please do not update the Bundler constraint.
>--  s.add_dependency "bundler", "= 1.12.5"
>-+  s.add_dependency "bundler", ">= 1.12.5"
>-   s.add_dependency "childprocess", "~> 0.5.0"
>-   s.add_dependency "erubis", "~> 2.7.0"
>-   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.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-sftp", "~> 2.1"
>--  s.add_dependency "net-scp", "~> 1.1.0"
>-+  s.add_dependency "net-scp", ">= 1.1.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"
>-@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
>-   s.add_dependency "winrm-fs", "~> 0.3.0"
>- 
>-   # We lock this down to avoid compilation issues.
>--  s.add_dependency "nokogiri", "= 1.6.7.1"
>-+  s.add_dependency "nokogiri", ">= 1.6.7.1"
>- 
>-   s.add_development_dependency "rake"
>-   s.add_development_dependency "rspec", "~> 2.14.0"
>
>Property changes on: sysutils/vagrant/files/patch-gemspec
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/vagrant/files/patch-vagrant.gemspec
>===================================================================
>--- sysutils/vagrant/files/patch-vagrant.gemspec	(nonexistent)
>+++ sysutils/vagrant/files/patch-vagrant.gemspec	(working copy)
>@@ -0,0 +1,38 @@
>+--- vagrant.gemspec.orig	2016-11-04 21:32:25 UTC
>++++ vagrant.gemspec
>+@@ -20,16 +20,16 @@ Gem::Specification.new do |s|
>+   # APIs, so even point releases can introduce breaking changes. These changes
>+   # are *untestable* until after a release is made because there is no way for
>+   # Bundler to exec into itself. Please do not update the Bundler constraint.
>+-  s.add_dependency "bundler", "= 1.12.5"
>++  s.add_dependency "bundler", ">= 1.12.5"
>+   s.add_dependency "childprocess", "~> 0.5.0"
>+   s.add_dependency "erubis", "~> 2.7.0"
>+   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.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-sftp", "~> 2.1"
>+-  s.add_dependency "net-scp", "~> 1.1.0"
>++  s.add_dependency "net-scp", ">= 1.1.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"
>+@@ -37,13 +37,13 @@ Gem::Specification.new do |s|
>+   s.add_dependency "winrm-fs", "~> 0.3.0"
>+ 
>+   # 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"
>+ 
>+   s.add_development_dependency "rake"
>+   s.add_development_dependency "rspec", "~> 2.14.0"
>
>Property changes on: sysutils/vagrant/files/patch-vagrant.gemspec
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 215905: 178665 | 179024