[tor-commits] [torbrowser/master] move all of the extension download locations to one file, and update noscript's url

[erinn at torproject.org]

commit b44210d6f9c79aa5c7e3b9fc0caf8558f6def7c5
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Sep 30 17:29:57 2011 +0100

    move all of the extension download locations to one file, and update noscript's url
---
 build-scripts/linux.mk    |    5 -----
 build-scripts/osx.mk      |    5 -----
 build-scripts/versions.mk |    6 ++++++
 build-scripts/windows.mk  |    5 -----
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index bd16d4d..090ee8e 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -183,11 +183,6 @@ endif
 ## Extensions to install by default
 DEFAULT_EXTENSIONS=torbutton.xpi noscript.xpi httpseverywhere.xpi
 
-## Where to download Torbutton from
-TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi
-NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
-BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
-HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi
 ## Where to download Mozilla language packs
 MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/linux-i686/xpi
 
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index d2de9dc..5d5dbc1 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -172,11 +172,6 @@ endif
 ## Extensions to install by default
 DEFAULT_EXTENSIONS=torbutton.xpi
 
-## Where to download Torbutton from
-TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi
-NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
-BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
-HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi
 ## Where to download Mozilla language packs
 MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest/mac/xpi
 
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 8856a87..f36759c 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -19,6 +19,12 @@ ZLIB_VER=1.2.5
 ## Extension IDs
 FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
+## Extensions
+TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi
+NOSCRIPT=https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi
+BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
+HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi
+
 ## File names for the source packages
 ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz
 OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index b3e199c..8bfa747 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -161,11 +161,6 @@ endif
 ## Extensions to install by default
 DEFAULT_EXTENSIONS=torbutton.xpi
 
-## Where to download Torbutton from
-TORBUTTON=https://www.torproject.org/dist/torbutton/torbutton-$(TORBUTTON_VER).xpi
-NOSCRIPT=https://secure.informaction.com/download/releases/noscript-$(NOSCRIPT_VER).xpi
-BETTERPRIVACY=https://addons.mozilla.org/en-US/firefox/downloads/latest/6623/addon-6623-latest.xpi
-HTTPSEVERYWHERE=https://eff.org/files/https-everywhere-$(HTTPSEVERY_VER).xpi
 ## Where to download Mozilla language packs
 MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(FIREFOX_VER)/win32/xpi