[tor-commits] [torbrowser/maint-2.4] Update mirror watch script versions.

[mikeperry at torproject.org]

commit 2f53ff591b7f5c028d8599b1e6ccc863be2612dd
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Thu Apr 25 19:01:25 2013 -0700

    Update mirror watch script versions.
---
 watch-scripts/fetch-thirdparty.sh |    7 ++++---
 watch-scripts/verify-mirror.sh    |    2 +-
 watch-scripts/versions.sh         |    8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/watch-scripts/fetch-thirdparty.sh b/watch-scripts/fetch-thirdparty.sh
index d9e2c19..b12cfaa 100755
--- a/watch-scripts/fetch-thirdparty.sh
+++ b/watch-scripts/fetch-thirdparty.sh
@@ -30,7 +30,8 @@ PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/${PIDGIN_PACKAGE}
 FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FIREFOX_VER}/source/${FIREFOX_PACKAGE}
 MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/${MOZBUILD_PACKAGE}
 TORBUTTON_URL=https://people.torproject.org/~mikeperry/${TORBUTTON_PACKAGE}
-HTTPSEVERYWHERE_URL=https://www.eff.org/files/${HTTPSEVERYWHERE_PACKAGE}
+HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE}
+HTTPSE_DEV_URL=https://www.eff.org/files/${HTTPSE_DEV_PACKAGE}
 OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/${OBFSPROXY_PACKAGE}
 
 # XXX: Because these filenames aren't versioned, we just fetch them directly
@@ -45,7 +46,7 @@ fi
 cd sources
 
 # Get package files
-for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY
+for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSE HTTPSE_DEV OBFSPROXY
 do
   URL=${i}"_URL"
   PACKAGE=${i}"_PACKAGE"
@@ -81,7 +82,7 @@ done
 
 # Record sha256sums
 rm -f sha256sums.txt
-for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY
+for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSE HTTPSE_DEV OBFSPROXY
 do
   PACKAGE=${i}"_PACKAGE"
   sha256sum ${!PACKAGE} >> sha256sums.txt
diff --git a/watch-scripts/verify-mirror.sh b/watch-scripts/verify-mirror.sh
index 71d77a2..959aabd 100755
--- a/watch-scripts/verify-mirror.sh
+++ b/watch-scripts/verify-mirror.sh
@@ -31,7 +31,7 @@ mkdir verify-sources
 cd verify-sources
 
 # Get package files from mirror
-for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY
+for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSE HTTPSE_DEV OBFSPROXY
 do
   PACKAGE=${i}"_PACKAGE"
   URL=${MIRROR_URL}${!PACKAGE}
diff --git a/watch-scripts/versions.sh b/watch-scripts/versions.sh
index ba0ef36..778cbaa 100755
--- a/watch-scripts/versions.sh
+++ b/watch-scripts/versions.sh
@@ -9,9 +9,10 @@ TOR_ALPHA_VER=0.2.4.12-alpha
 PIDGIN_VER=2.6.4
 FIREFOX_VER=17.0.5esr
 MOZBUILD_VER=1.5.1
-TORBUTTON_VER=1.5.1
+TORBUTTON_VER=1.5.2
 NOSCRIPT_VER=2.6.5.9 # XXX: Unused :(
-HTTPSEVERYWHERE_VER=3.1.4
+HTTPSE_VER=3.1.4
+HTTPSE_DEV_VER=4.0development.6
 OTR_VER=3.2.0
 OBFSPROXY_VER=0.1.4
 
@@ -30,7 +31,8 @@ MOZBUILD_PACKAGE=MozillaBuildSetup-${MOZBUILD_VER}.exe
 TORBUTTON_PACKAGE=torbutton-${TORBUTTON_VER}.xpi
 NOSCRIPT_PACKAGE=addon-722-latest.xpi
 PDFJS_PACKAGE=addon-352704-latest.xpi
-HTTPSEVERYWHERE_PACKAGE=https-everywhere-${HTTPSEVERYWHERE_VER}.xpi
+HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi
+HTTPSE_DEV_PACKAGE=https-everywhere-${HTTPSE_DEV_VER}.xpi
 OBFSPROXY_PACKAGE=obfsproxy-${OBFSPROXY_VER}.tar.gz