From bad34243ef838a693caeb377fb85e1e1165b7c6c Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 2 May 2016 19:18:20 -0700
Subject: [PATCH 1/3] *: convert assorted download references to https

---
 contrib/create-coreos-vdi    | 8 ++++----
 oem/generic/check_etag.sh    | 2 +-
 oem/openstack/glance_load.sh | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/create-coreos-vdi b/contrib/create-coreos-vdi
index 3cd58daded..4788720ced 100755
--- a/contrib/create-coreos-vdi
+++ b/contrib/create-coreos-vdi
@@ -57,10 +57,10 @@ IMAGE_NAME="${RAW_IMAGE_NAME}.bz2"
 DIGESTS_NAME="${IMAGE_NAME}.DIGESTS.asc"
 
 case ${VERSION_ID}  in
-    stable) BASE_URL="http://stable.release.core-os.net/amd64-usr/current" ;;
-    alpha) BASE_URL="http://alpha.release.core-os.net/amd64-usr/current" ;;
-    beta) BASE_URL="http://beta.release.core-os.net/amd64-usr/current" ;;
-    *) BASE_URL="http://storage.core-os.net/coreos/amd64-usr/${VERSION_ID}" ;;
+    stable) BASE_URL="https://stable.release.core-os.net/amd64-usr/current" ;;
+    alpha) BASE_URL="https://alpha.release.core-os.net/amd64-usr/current" ;;
+    beta) BASE_URL="https://beta.release.core-os.net/amd64-usr/current" ;;
+    *) BASE_URL="https://alpha.release.core-os.net/amd64-usr/${VERSION_ID}" ;;
 esac
 
 IMAGE_URL="${BASE_URL}/${IMAGE_NAME}"
diff --git a/oem/generic/check_etag.sh b/oem/generic/check_etag.sh
index dbfb5d9913..295831b8eb 100755
--- a/oem/generic/check_etag.sh
+++ b/oem/generic/check_etag.sh
@@ -15,7 +15,7 @@ release=${1:-"alpha"}
 
 # If the argument is in the form http* allow for watching an arbitrary location
 if [[ $1 != http* ]]; then
-  url="http://storage.core-os.net/coreos/amd64-usr/$release/version.txt"
+  url="https://${release}.release.core-os.net/amd64-usr/current/version.txt"
 else
   url=$1
   release=$(echo ${url} | sed -e 's/http:\/\///1' -e 's/\//-/g' )
diff --git a/oem/openstack/glance_load.sh b/oem/openstack/glance_load.sh
index 435182f4b2..2f5cdecf42 100755
--- a/oem/openstack/glance_load.sh
+++ b/oem/openstack/glance_load.sh
@@ -14,13 +14,13 @@ set -e -o pipefail
 
 release=${1:-"alpha"}
 if [[ "$1" != http* ]]; then
-  baseurl="http://${release}.release.core-os.net/amd64-usr/current"
+  baseurl="https://${release}.release.core-os.net/amd64-usr/current"
 else
   # for this convoluded trick, we take an arbitrary URL, chop it up, and try
   # to turn it into usable input for the rest of the script.
 
   # this is based on urls of the form:
-  # http://storage.core-os.net/coreos/amd64-usr/master/version.txt 
+  # https://storage.core-os.net/coreos/amd64-usr/master/version.txt
   # where the following sed expression extracts the "master" portion
   baseurl="${1%/*}"
   release="${baseurl##*/}"

From 582361b30cff73df6549150cc1cebaf83e07a6bc Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 2 May 2016 20:12:27 -0700
Subject: [PATCH 2/3] catalyst: allow GENTOO_MIRRORS to be passed in through
 the environment

---
 build_library/catalyst.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh
index 861f1b7da1..3e0ea854a4 100644
--- a/build_library/catalyst.sh
+++ b/build_library/catalyst.sh
@@ -77,6 +77,7 @@ export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
 export EMERGE_DEFAULT_OPTS="\$MAKEOPTS"
 export PORTAGE_USERNAME=portage
 export PORTAGE_GRPNAME=portage
+export GENTOO_MIRRORS='$(portageq envvar GENTOO_MIRRORS)'
 EOF
 }
 

From 3ff92f4bc3e0091fcc2be1b0c258ddc46e8d64c7 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Mon, 2 May 2016 20:13:26 -0700
Subject: [PATCH 3/3] bootstrap_sdk: use http instead of https

Using https gives us a bit of a dep issue, cannot download the sources
required to build ssl support when ssl hasn't been built yet!
---
 bootstrap_sdk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bootstrap_sdk b/bootstrap_sdk
index 2035aeb0a0..3683fad94a 100755
--- a/bootstrap_sdk
+++ b/bootstrap_sdk
@@ -54,6 +54,11 @@ EOF
 catalyst_stage_default
 }
 
+# Switch to HTTP because early boostrap stages do not have SSL support.
+GENTOO_MIRRORS=$(portageq envvar GENTOO_MIRRORS)
+GENTOO_MIRRORS="${GENTOO_MIRRORS//https:\/\//http://}"
+export GENTOO_MIRRORS
+
 catalyst_init "$@"
 check_gsutil_opts