From 8d5d208fbc4a9b87c6f1f9991dbbf65d5cb5bfbb Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Wed, 27 Jan 2016 10:20:34 +0100
Subject: [PATCH] fix dependencies
---
lib/vagrant/bundler.rb | 2 +-
lib/vagrant/util/downloader.rb | 5 +++--
vagrant.gemspec | 41 ++++++++++++++++++++---------------------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb
index 03e6238..9a02a85 100644
--- a/lib/vagrant/util/downloader.rb
+++ b/lib/vagrant/util/downloader.rb
@@ -297,8 +297,9 @@ module Vagrant
# If we're in Vagrant, then we use the packaged CA bundle
if Vagrant.in_installer?
subprocess_options[:env] ||= {}
- subprocess_options[:env]["CURL_CA_BUNDLE"] =
- File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
+ #Use system certificates.
+ #subprocess_options[:env]["CURL_CA_BUNDLE"] =
+ # File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
end
return [options, subprocess_options]
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 078add3..d1dd7bd 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -22,23 +22,27 @@ Gem::Specification.new do |s|
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"
s.add_dependency "net-sftp", "~> 2.1"
- s.add_dependency "net-scp", "~> 1.1.0"
- s.add_dependency "rb-kqueue", "~> 0.2.0"
+ s.add_dependency "net-scp", ">= 1.1.0"
+ # Remove BSD specific dependency.
+ # 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"
- s.add_dependency "winrm", "~> 1.6"
- s.add_dependency "winrm-fs", "~> 0.3.0"
+ # Remove Windows specific dependency.
+ # s.add_dependency "wdm", "~> 0.1.0"
+ # s.add_dependency "winrm", "~> 1.6"
+ # 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"
# 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"
+ #
+ # Do not impose any Ruby version restrictions on Fedora.
+ # s.add_dependency "ruby_dep", "<= 1.3.1"
# Constraint rake to properly handle deprecated method usage
# from within rspec
--
2.5.0