[tor-commits] [tor-browser-bundle/master] Fix NoScript and mingw-w64 input urls and hashes.

[mikeperry at torproject.org]

commit de8b076a7694b3154dcf278864d89a4bfbef8159
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Aug 19 15:58:07 2013 -0700

    Fix NoScript and mingw-w64 input urls and hashes.
---
 gitian/fetch-inputs.sh |    7 +++----
 gitian/versions        |    5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 6b85791..2e25a5e 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -139,14 +139,13 @@ done
 cd ..
 
 # Noscript and PDF.JS are magikal and special:
-wget -N https://addons.mozilla.org/firefox/downloads/latest/722/addon-722-latest.xpi
-#wget -N https://addons.mozilla.org/firefox/downloads/latest/352704/addon-352704-latest.xpi
-wget -N https://addons.mozilla.org/firefox/downloads/file/201180/pdf_viewer-0.8.1-sm+fx+an.xpi
+wget -N https://addons.mozilla.org/firefox/downloads/file/224880/${NOSCRIPT_PACKAGE}
+wget -N https://addons.mozilla.org/firefox/downloads/file/201180/${PDFJS_PACKAGE}
 
 # So is mingw:
 if [ ! -f mingw-w64-svn-snapshot.zip ];
 then
-  svn co -r $MINGW_REV https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk mingw-w64-svn || exit 1
+  svn co -r $MINGW_REV https://svn.code.sf.net/p/mingw-w64/code/trunk/ mingw-w64-svn || exit 1
   # XXX: Path
   ZIPOPTS="-x*/.svn/*" faketime -f "2000-01-01 00:00:00" "$WRAPPER_DIR/build-helpers/dzip.sh" mingw-w64-svn-snapshot.zip mingw-w64-svn
 fi
diff --git a/gitian/versions b/gitian/versions
index 64f2891..83564d8 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -20,8 +20,7 @@ FIREFOX_LANG_VER=17.0.8esr
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
-NOSCRIPT_PACKAGE=addon-722-latest.xpi
-#PDFJS_PACKAGE=addon-352704-latest.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.7.1-sm+fn+fx.xpk
 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
@@ -32,7 +31,7 @@ MSVCR100_PACKAGE=msvcr100.dll
 OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=d5f47fbd4c4cf438a94ee866f04971abeb67f1793def8a56d2ead71be674f4bc
+NOSCRIPT_HASH=e9ee8f45b0b025236c5e04e270edeb05de6ed8a73822c74d7122a2ade3d25f33
 PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b
 MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067