Initial import (#1020456).

4 files changed, 6 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index e69de29..130c1eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/vagrant-1.6.5.tar.gz
+/vagrant-spec-c0dafc996165bf1628b672dd533f1858ff66fe4a.tar.gz
diff --git a/patches.rb b/patches.rb
index 7fd8972..ddf817a 100644
--- a/patches.rb
+++ b/patches.rb
@@ -1,39 +1,5 @@
 # Monkey-patching for RubyGems and Bundler to play nicely with Vagrant
 
-# Don't touch the binary when not needed.
-# https://github.com/rubygems/rubygems/pull/1057
-class Gem::Installer
-  def generate_bin # :nodoc:
-    return if spec.executables.nil? or spec.executables.empty?
-
-    Dir.mkdir @bin_dir unless File.exist? @bin_dir
-    raise Gem::FilePermissionError.new(@bin_dir) unless File.writable? @bin_dir
-
-    spec.executables.each do |filename|
-      filename.untaint
-      bin_path = File.join gem_dir, spec.bindir, filename
-
-      unless File.exist? bin_path then
-        # TODO change this to a more useful warning
-        warn "#{bin_path} maybe `gem pristine #{spec.name}` will fix it?"
-        next
-      end
-
-      mode = File.stat(bin_path).mode
-      FileUtils.chmod mode | 0111, bin_path unless (mode | 0111) == mode
-
-      check_executable_overwrite filename
-
-      if @wrappers then
-        generate_bin_script filename, @bin_dir
-      else
-        generate_bin_symlink filename, @bin_dir
-      end
-
-    end
-  end
-end
-
 # Fix rubygems 2.2 compatibility
 # https://github.com/bundler/bundler/pull/3237
 module Bundler
diff --git a/sources b/sources
index e69de29..785e79b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+0c7aa7c0262a1822a1c0e0f349984a97  vagrant-1.6.5.tar.gz
+98ac8bf95f729d8fd6cb61480c112fae  vagrant-spec-c0dafc996165bf1628b672dd533f1858ff66fe4a.tar.gz
diff --git a/vagrant-1.6.5-fix-dependencies.patch b/vagrant-1.6.5-fix-dependencies.patch
index 6ab8b3f..191ebb1 100644
--- a/vagrant-1.6.5-fix-dependencies.patch
+++ b/vagrant-1.6.5-fix-dependencies.patch
@@ -67,7 +67,8 @@ index c4131b2..638aeb4 100644
 +  s.add_dependency "bundler", ">= 1.5.2", "!= 1.7.0"
    s.add_dependency "childprocess", "~> 0.5.0"
    s.add_dependency "erubis", "~> 2.7.0"
-   s.add_dependency "i18n", "~> 0.6.0"
+-  s.add_dependency "i18n", "~> 0.6.0"
++  s.add_dependency "i18n", ">= 0.6.0"
 +  # https://github.com/mitchellh/vagrant/pull/4770
 +  s.add_dependency "json"
    s.add_dependency "listen", "~> 2.7.1"