[tor-commits] [torbrowser/master] Fix versions files to directly download addons.

[mikeperry at torproject.org]

commit 9428f0d84eb0e9132f1b446a204cb594dd961933
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Apr 23 16:16:15 2013 -0700

    Fix versions files to directly download addons.
    
    Addons aren't versioned and this doesn't play well with our mirror script.
---
 build-scripts/versions-alpha.mk |    5 +++--
 build-scripts/versions.mk       |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index cbe6ecf..21b3c03 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -4,7 +4,7 @@ RELEASE_VER=2.4.12-alpha
 
 ZLIB_VER=1.2.7
 OPENSSL_VER=1.0.0k
-LIBPNG_VER=1.5.14
+LIBPNG_VER=1.5.15
 QT_VER=4.8.1
 VIDALIA_VER=0.2.21
 LIBEVENT_VER=2.0.21-stable
@@ -52,7 +52,8 @@ 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)
+NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE)
+PDFJS_URL=https://addons.mozilla.org/firefox/downloads/latest/352704/$(PDFJS_PACKAGE)
 HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE)
 OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE)
 
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index d3a85a3..0503930 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -4,7 +4,7 @@ RELEASE_VER=2.3.25
 
 ZLIB_VER=1.2.7
 OPENSSL_VER=1.0.0k
-LIBPNG_VER=1.5.14
+LIBPNG_VER=1.5.15
 QT_VER=4.8.1
 VIDALIA_VER=0.2.21
 LIBEVENT_VER=2.0.21-stable
@@ -50,7 +50,7 @@ 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)
+NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE)
 HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE)
 OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE)