[tor-commits] [tor-browser-bundle/master] Bump versions and URLs for TBB 3.0beta1.

[mikeperry at torproject.org]

commit 019c4c308d612f680fe98ba11ec452b788dd5e10
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Oct 11 17:28:11 2013 -0700

    Bump versions and URLs for TBB 3.0beta1.
---
 gitian/fetch-inputs.sh |    4 ++--
 gitian/versions        |   16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index cce3331..2d345ce 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -156,8 +156,8 @@ do
 done
 cd ..
 
-# Noscript and PDF.JS are magikal and special:
-wget -N https://addons.mozilla.org/firefox/downloads/file/224880/${NOSCRIPT_PACKAGE}
+# NoScript and PDF.JS are magikal and special:
+wget -N ${NOSCRIPT_URL}
 wget -N https://addons.mozilla.org/firefox/downloads/file/201180/${PDFJS_PACKAGE}
 
 # So is mingw:
diff --git a/gitian/versions b/gitian/versions
index 8f3585e..731fb7c 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -1,13 +1,13 @@
-TORBROWSER_VERSION=3.0-alpha-4
+TORBROWSER_VERSION=3.0-beta-1
 BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
 
 VERIFY_TAGS=1
 
-TORBROWSER_TAG=tor-browser-17.0.9esr-3.0alpha4-build2
+TORBROWSER_TAG=tor-browser-17.0.9esr-3.0beta1-build1
 TOR_TAG=tor-0.2.4.17-rc
 TORLAUNCHER_TAG=0.2.3-alpha
-TORBUTTON_TAG=1.6.2.1
-HTTPSE_TAG=3.3.1
+TORBUTTON_TAG=1.6.3
+HTTPSE_TAG=3.4.2
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
@@ -22,7 +22,7 @@ GCC_VER=4.6.3
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.7.1-sm+fn+fx.xpk
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi
 PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi
 TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
@@ -31,17 +31,19 @@ MSVCR100_PACKAGE=msvcr100.dll
 BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2
 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2
 
-# Hashes for things with weak sigs or no sigs
+# Hashes for packages with weak sigs or no sigs
 OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=e9ee8f45b0b025236c5e04e270edeb05de6ed8a73822c74d7122a2ade3d25f33
+NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f
 PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b
 MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 
+## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
 TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACKAGE}
 OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE}
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
 GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}
+NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}