From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 31 Jan 2014 01:33:37 +0000 (-0500)
Subject: makebuildserver: use https uris whenever available
X-Git-Tag: 0.2~336^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5cdb428a2f47f88840c89bcb7f7ec6562113a25e;p=fdroidserver.git

makebuildserver: use https uris whenever available

* pypi now defaults to https
* dl.google.com works well with https
---

diff --git a/makebuildserver b/makebuildserver
index 165d31a8..d4fde838 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -61,7 +61,7 @@ if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 cachefiles = [
     ('android-sdk_r22.3-linux.tgz',
-     'http://dl.google.com/android/android-sdk_r22.3-linux.tgz',
+     'https://dl.google.com/android/android-sdk_r22.3-linux.tgz',
      '4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'),
     ('gradle-1.4-bin.zip',
      'http://services.gradle.org/distributions/gradle-1.4-bin.zip',
@@ -82,24 +82,24 @@ cachefiles = [
      'http://services.gradle.org/distributions/gradle-1.10-bin.zip',
      '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'),
     ('Kivy-1.7.2.tar.gz',
-     'http://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
+     'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')
     ]
 if config['arch64']:
     cachefiles.extend([
     ('android-ndk-r9b-linux-x86_64.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
      '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
     ('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
      'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
 else:
     cachefiles.extend([
     ('android-ndk-r9b-linux-x86.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
      '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
     ('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
      '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
 wanted = []