diff options
author | Tomas Mozes <hydrapolic@gmail.com> | 2018-04-20 09:49:49 +0200 |
---|---|---|
committer | Amy Liffey <amynka@gentoo.org> | 2018-04-20 10:59:42 +0200 |
commit | b73eaf0a93e7b94adebdda786d6a933614f3eaf4 (patch) | |
tree | 132f22e2c8651b62aef95798e6717da05dc0fe56 /app-emulation/vagrant/files | |
parent | app-emulation/vagrant: bump to 2.0.3 (diff) | |
download | gentoo-b73eaf0a93e7b94adebdda786d6a933614f3eaf4.tar.gz gentoo-b73eaf0a93e7b94adebdda786d6a933614f3eaf4.tar.bz2 gentoo-b73eaf0a93e7b94adebdda786d6a933614f3eaf4.zip |
app-emulation/vagrant: drop old
Closes: https://github.com/gentoo/gentoo/pull/8079
Package-Manager: Portage-2.3.31, Repoman-2.3.9
Diffstat (limited to 'app-emulation/vagrant/files')
-rw-r--r-- | app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch | 17 | ||||
-rw-r--r-- | app-emulation/vagrant/files/vagrant.in | 44 |
2 files changed, 0 insertions, 61 deletions
diff --git a/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch b/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch deleted file mode 100644 index afcb6f707f5f..000000000000 --- a/app-emulation/vagrant/files/vagrant-1.8.1-disable-embedded-cacert.patch +++ /dev/null @@ -1,17 +0,0 @@ -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/app-emulation/vagrant/files/vagrant.in b/app-emulation/vagrant/files/vagrant.in deleted file mode 100644 index 761753208a77..000000000000 --- a/app-emulation/vagrant/files/vagrant.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash -# -# This is a wrapper to properly execute Vagrant within the embedded -# Vagrant installation directory. This sets up proper environmental variables -# so that everything loads and compiles to proper directories. - -VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )" - -# Export GEM_HOME based on VAGRANT_HOME -# -# This needs to be set because Bundler includes gem paths -# from RubyGems' Gem.paths. -if [ -z ${VAGRANT_HOME} ]; then - VAGRANT_HOME="~/.vagrant.d" -fi -export GEM_HOME="${VAGRANT_HOME}/gems" - -# SSL certs -export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" - -# Export an environmental variable to say we're in a Vagrant -# installer created environment. -export VAGRANT_INSTALLER_ENV=1 - -# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file -# to locate plugins configuration file. -export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant" -export VAGRANT_INSTALLER_VERSION=2 - -# Export the OS as an environmental variable that Vagrant can access -# so that it can behave better. -export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)" - -# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit -export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant" - -# Allow to install plugins even with deps in different slots (Bug #628648) -export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 - -# Make it work with rvm (Bugs #474476 #628648) -unset GEM_HOME GEM_PATH - -# Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_EXECUTABLE}" "$@" |