commit a630981cb3feaf685e1f55e63a80de5f3b6c5136 Author: Mike Perry <mikeperry-git@fscked.org> Date: Tue Apr 23 16:30:09 2013 -0700 Add tor-alpha to source mirroring. Also remove NoScript, because it is already HTTTPS and is not versioned (which messes with our verification ability). --- watch-scripts/fetch-thirdparty.sh | 13 +++++++++---- watch-scripts/verify-mirror.sh | 4 ++-- watch-scripts/versions.sh | 5 ++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/watch-scripts/fetch-thirdparty.sh b/watch-scripts/fetch-thirdparty.sh index 3244671..d9e2c19 100755 --- a/watch-scripts/fetch-thirdparty.sh +++ b/watch-scripts/fetch-thirdparty.sh @@ -25,14 +25,19 @@ QT_URL=ftp://ftp.qt.nokia.com/qt/source/${QT_PACKAGE} VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/${VIDALIA_PACKAGE} LIBEVENT_URL=https://github.com/downloads/libevent/libevent/${LIBEVENT_PACKAGE} TOR_URL=https://archive.torproject.org/tor-package-archive/${TOR_PACKAGE} +TOR_ALPHA_URL=https://archive.torproject.org/tor-package-archive/${TOR_ALPHA_PACKAGE} 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} -NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/${NOSCRIPT_PACKAGE} HTTPSEVERYWHERE_URL=https://www.eff.org/files/${HTTPSEVERYWHERE_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 +# from mozilla during build.. +#NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/${NOSCRIPT_PACKAGE} +#PDFJS_URL=https://addons.mozilla.org/firefox/downloads/latest/352704/${PDFJS_PACKAGE} + if [ ! -d sources ]; then mkdir sources fi @@ -40,7 +45,7 @@ fi cd sources # Get package files -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do URL=${i}"_URL" PACKAGE=${i}"_PACKAGE" @@ -54,7 +59,7 @@ done # Get+verify sigs that exist # XXX: This doesn't cover everything. See #8525 -for i in TORBUTTON FIREFOX LIBEVENT TOR VIDALIA OBFSPROXY OPENSSL +for i in TORBUTTON FIREFOX LIBEVENT TOR TOR_ALPHA VIDALIA OBFSPROXY OPENSSL do URL=${i}"_URL" PACKAGE=${i}"_PACKAGE" @@ -76,7 +81,7 @@ done # Record sha256sums rm -f sha256sums.txt -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do PACKAGE=${i}"_PACKAGE" sha256sum ${!PACKAGE} >> sha256sums.txt diff --git a/watch-scripts/verify-mirror.sh b/watch-scripts/verify-mirror.sh index 3627ab7..71d77a2 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 FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do PACKAGE=${i}"_PACKAGE" URL=${MIRROR_URL}${!PACKAGE} @@ -45,7 +45,7 @@ done # Get+verify sigs that exist # XXX: This doesn't cover everything. See #8525 -for i in TORBUTTON FIREFOX LIBEVENT TOR VIDALIA OBFSPROXY OPENSSL +for i in TORBUTTON FIREFOX LIBEVENT TOR TOR_ALPHA VIDALIA OBFSPROXY OPENSSL do PACKAGE=${i}"_PACKAGE" URL=${MIRROR_URL}${!PACKAGE} diff --git a/watch-scripts/versions.sh b/watch-scripts/versions.sh index 3559c96..ba0ef36 100755 --- a/watch-scripts/versions.sh +++ b/watch-scripts/versions.sh @@ -5,11 +5,12 @@ QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 +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 -NOSCRIPT_VER=2.6.5.9 +NOSCRIPT_VER=2.6.5.9 # XXX: Unused :( HTTPSEVERYWHERE_VER=3.1.4 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 @@ -22,11 +23,13 @@ QT_PACKAGE=qt-everywhere-opensource-src-${QT_VER}.tar.gz VIDALIA_PACKAGE=vidalia-${VIDALIA_VER}.tar.gz LIBEVENT_PACKAGE=libevent-${LIBEVENT_VER}.tar.gz TOR_PACKAGE=tor-${TOR_VER}.tar.gz +TOR_ALPHA_PACKAGE=tor-${TOR_ALPHA_VER}.tar.gz PIDGIN_PACKAGE=pidgin-${PIDGIN_VER}.tar.bz2 FIREFOX_PACKAGE=firefox-${FIREFOX_VER}.source.tar.bz2 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 OBFSPROXY_PACKAGE=obfsproxy-${OBFSPROXY_VER}.tar.gz