[vagrant] Use system certificates.

Vít Ondruch vondruch at fedoraproject.org
Wed Jan 21 13:36:36 UTC 2015


commit 774acebfd5985ab2677182ad2cbdf1815d13fa71
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Oct 24 15:56:12 2014 +0200

    Use system certificates.

 vagrant-1.6.5-fix-dependencies.patch |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/vagrant-1.6.5-fix-dependencies.patch b/vagrant-1.6.5-fix-dependencies.patch
index f9624b0..13d7b1a 100644
--- a/vagrant-1.6.5-fix-dependencies.patch
+++ b/vagrant-1.6.5-fix-dependencies.patch
@@ -26,6 +26,22 @@ index 05867da..ea8c056 100644
  
          gemfile.puts("group :plugins do")
          plugins.each do |name, plugin|
+diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb
+index 8756fc3..7fb2be8 100644
+--- a/lib/vagrant/util/downloader.rb
++++ b/lib/vagrant/util/downloader.rb
+@@ -215,8 +215,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 c4131b2..48b27fb 100644
 --- a/vagrant.gemspec


More information about the scm-commits mailing list