[torbrowser/master] Bug 8286: Fetch our source deps from an https mirror - tor-commits

11 Apr 2013

commit 1307692dcd6129321b21f3e261346a94486b9642
Author: Mike Perry mikeperry-git@fscked.org
Date:   Thu Apr 4 19:31:27 2013 -0700
Bug 8286: Fetch our source deps from an https mirror
Also check the certificate on downloads...
---
 build-scripts/versions-alpha.mk |   62 +++++++++++++++++++-------------------
 build-scripts/versions.mk       |   60 +++++++++++++++++++-------------------
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index c4ed4e0..aaa3057 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -39,22 +39,22 @@ HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi
 PDFJS_PACKAGE=addon-352704-latest.xpi
 OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz
-## Location of files for download
-ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE)
-OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE)
-LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng15/$(LIBPNG_PACKAGE)
-QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE)
-VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE)
-LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACKAGE)
-TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE)
-PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE)
-FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/sour...)
-MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_P...)
-#TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PAC...)
-TORBUTTON_URL=https://people.torproject.org/~mikeperry/$(TORBUTTON_PACKAGE)
-NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE)
-HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE)
-OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PAC...)
+## Location of files for download over HTTPS
+TBB_THIRD_PARTY_MIRROR=https://people.torproject.org/~mikeperry/mirrors/sources/
+ZLIB_URL=$(TBB_THIRD_PARTY_MIRROR)$(ZLIB_PACKAGE)
+OPENSSL_URL=$(TBB_THIRD_PARTY_MIRROR)$(OPENSSL_PACKAGE)
+LIBPNG_URL=$(TBB_THIRD_PARTY_MIRROR)$(LIBPNG_PACKAGE)
+QT_URL=$(TBB_THIRD_PARTY_MIRROR)$(QT_PACKAGE)
+VIDALIA_URL=$(TBB_THIRD_PARTY_MIRROR)$(VIDALIA_PACKAGE)
+LIBEVENT_URL=$(TBB_THIRD_PARTY_MIRROR)$(LIBEVENT_PACKAGE)
+TOR_URL=$(TBB_THIRD_PARTY_MIRROR)$(TOR_PACKAGE)
+PIDGIN_URL=$(TBB_THIRD_PARTY_MIRROR)$(PIDGIN_PACKAGE)
+FIREFOX_URL=$(TBB_THIRD_PARTY_MIRROR)$(FIREFOX_PACKAGE)
+MOZBUILD_URL=$(TBB_THIRD_PARTY_MIRROR)$(MOZBUILD_PACKAGE)
+TORBUTTON_URL=$(TBB_THIRD_PARTY_MIRROR)$(TORBUTTON_PACKAGE)
+NOSCRIPT_URL=$(TBB_THIRD_PARTY_MIRROR)$(NOSCRIPT_PACKAGE)
+HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE)
+OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE)
# Provide some mappings between lower and upper case, which means we don't need
 # to rely on shell shenanigans when we need the upper case version. This is
@@ -111,54 +111,54 @@ $(BUILD_DIR):
 # at least for those packages that support it.
$(FETCH_DIR)/$(ZLIB_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(ZLIB_URL)
$(FETCH_DIR)/$(LIBPNG_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL)
$(FETCH_DIR)/$(QT_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(QT_URL)
$(FETCH_DIR)/$(OPENSSL_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)
$(FETCH_DIR)/$(VIDALIA_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL)
$(FETCH_DIR)/$(LIBEVENT_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL)
$(FETCH_DIR)/$(TOR_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(TOR_URL)
$(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL)
$(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL)
torbutton.xpi:
-	$(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL)
+	$(WGET) -O $@ $(TORBUTTON_URL)
noscript.xpi:
-	$(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL)
+	$(WGET) -O $@ $(NOSCRIPT_URL)
httpseverywhere.xpi:
-	$(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL)
+	$(WGET) -O $@ $(HTTPSEVERYWHERE_URL)
pdfjs.xpi:
-	$(WGET) --no-check-certificate -O $@ $(PDFJS_URL)
+	$(WGET) -O $@ $(PDFJS_URL)
## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE
 langpack_%.xpi:
-	$(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
+	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
## English comes as default, so nothing to do here for the language packe
 langpack_en-US.xpi:
    touch $@
$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL)
unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR)
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index d226473..d3a85a3 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -37,22 +37,22 @@ NOSCRIPT_PACKAGE=addon-722-latest.xpi
 HTTPSEVERYWHERE_PACKAGE=https-everywhere-$(HTTPSEVERYWHERE_VER).xpi
 OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz
-## Location of files for download
-ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE)
-OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE)
-LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng15/$(LIBPNG_PACKAGE)
-QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE)
-VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/$(VIDALIA_PACKAGE)
-LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACKAGE)
-TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE)
-PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PACKAGE)
-FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/sour...)
-MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/$(MOZBUILD_P...)
-#TORBUTTON_URL=https://archive.torproject.org/tor-package-archive/torbutton/$(TORBUTTON_PAC...)
-TORBUTTON_URL=https://people.torproject.org/~mikeperry/$(TORBUTTON_PACKAGE)
-NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE)
-HTTPSEVERYWHERE_URL=https://eff.org/files/$(HTTPSEVERYWHERE_PACKAGE)
-OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/$(OBFSPROXY_PAC...)
+## Location of files for download over HTTPS
+TBB_THIRD_PARTY_MIRROR=https://people.torproject.org/~mikeperry/mirrors/sources/
+ZLIB_URL=$(TBB_THIRD_PARTY_MIRROR)$(ZLIB_PACKAGE)
+OPENSSL_URL=$(TBB_THIRD_PARTY_MIRROR)$(OPENSSL_PACKAGE)
+LIBPNG_URL=$(TBB_THIRD_PARTY_MIRROR)$(LIBPNG_PACKAGE)
+QT_URL=$(TBB_THIRD_PARTY_MIRROR)$(QT_PACKAGE)
+VIDALIA_URL=$(TBB_THIRD_PARTY_MIRROR)$(VIDALIA_PACKAGE)
+LIBEVENT_URL=$(TBB_THIRD_PARTY_MIRROR)$(LIBEVENT_PACKAGE)
+TOR_URL=$(TBB_THIRD_PARTY_MIRROR)$(TOR_PACKAGE)
+PIDGIN_URL=$(TBB_THIRD_PARTY_MIRROR)$(PIDGIN_PACKAGE)
+FIREFOX_URL=$(TBB_THIRD_PARTY_MIRROR)$(FIREFOX_PACKAGE)
+MOZBUILD_URL=$(TBB_THIRD_PARTY_MIRROR)$(MOZBUILD_PACKAGE)
+TORBUTTON_URL=$(TBB_THIRD_PARTY_MIRROR)$(TORBUTTON_PACKAGE)
+NOSCRIPT_URL=$(TBB_THIRD_PARTY_MIRROR)$(NOSCRIPT_PACKAGE)
+HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE)
+OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE)
# Provide some mappings between lower and upper case, which means we don't need
 # to rely on shell shenanigans when we need the upper case version. This is
@@ -109,51 +109,51 @@ $(BUILD_DIR):
 # at least for those packages that support it.
$(FETCH_DIR)/$(ZLIB_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(ZLIB_URL)
$(FETCH_DIR)/$(LIBPNG_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL)
$(FETCH_DIR)/$(QT_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(QT_URL)
$(FETCH_DIR)/$(OPENSSL_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(OPENSSL_URL)
$(FETCH_DIR)/$(VIDALIA_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(VIDALIA_URL)
$(FETCH_DIR)/$(LIBEVENT_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(LIBEVENT_URL)
$(FETCH_DIR)/$(TOR_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(TOR_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(TOR_URL)
$(FETCH_DIR)/$(FIREFOX_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL)
$(FETCH_DIR)/$(MOZBUILD_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(MOZBUILD_URL)
torbutton.xpi:
-	$(WGET) --no-check-certificate -O $@ $(TORBUTTON_URL)
+	$(WGET) -O $@ $(TORBUTTON_URL)
noscript.xpi:
-	$(WGET) --no-check-certificate -O $@ $(NOSCRIPT_URL)
+	$(WGET) -O $@ $(NOSCRIPT_URL)
httpseverywhere.xpi:
-	$(WGET) --no-check-certificate -O $@ $(HTTPSEVERYWHERE_URL)
+	$(WGET) -O $@ $(HTTPSEVERYWHERE_URL)
## Generic language pack rule, needs OS-specific MOZILLA_LANGUAGE
 langpack_%.xpi:
-	$(WGET) --no-check-certificate -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
+	$(WGET) -O $@ $(MOZILLA_LANGUAGE)/$*.xpi
## English comes as default, so nothing to do here for the language packe
 langpack_en-US.xpi:
    touch $@
$(FETCH_DIR)/$(OBFSPROXY_PACKAGE): | $(FETCH_DIR)
-	$(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL)
+	$(WGET) --directory-prefix=$(FETCH_DIR) $(OBFSPROXY_URL)
unpack-source: $(ZLIB_DIR) $(OPENSSL_DIR) $(LIBPNG_DIR) $(QT_DIR) $(VIDALIA_DIR) $(LIBEVENT_DIR) $(TOR_DIR) $(FIREFOX_DIR) $(OBFSPROXY_DIR)

    