[tor-commits] [tor-browser-bundle/master] Release preparations for 6.0a5

[gk at torproject.org]

commit 6ff2f177e34a32fa554949ebb542fc52772b12ce
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Apr 22 12:13:37 2016 +0000

    Release preparations for 6.0a5
    
    Version bumps; config.yml update
---
 gitian/versions.alpha             | 27 +++++++++++++++++----------
 tools/update-responses/config.yml | 13 ++++++-------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 75b3089..7e1dd98 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -10,19 +10,22 @@ DATA_OUTSIDE_APP_DIR=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=38.7.1esr
+FIREFOX_VERSION=45.1.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
-TOR_TAG=tor-0.2.8.1-alpha
-TORLAUNCHER_TAG=0.2.9
-TORBUTTON_TAG=1.9.5.2
-HTTPSE_TAG=5.1.4
+TOR_TAG=tor-0.2.8.2-alpha
+TORLAUNCHER_TAG=0.2.9.1
+TORBUTTON_TAG=1.9.5.3
+HTTPSE_TAG=5.1.6
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
-MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131
+CMAKE_TAG=v2.8.12.2
+LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74  # r247539
+CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539
+MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8
 PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix
@@ -30,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
-MEEK_TAG=0.20
+MEEK_TAG=0.22-18371-2
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
@@ -39,7 +42,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
 OBFS4_TAG=obfs4proxy-0.0.5
 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
-GITIAN_TAG=tor-browser-builder-3.x-9
+GITIAN_TAG=tor-browser-builder-4-1
 
 OPENSSL_VER=1.0.1s
 GMP_VER=5.1.3
@@ -47,6 +50,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
+CLANG_VER=r247539
 PYTHON_VER=2.7.5
 PYCRYPTO_VER=2.6.1
 ARGPARSE_VER=1.2.1
@@ -61,8 +65,9 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi
 TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
+CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
 OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
 MSVCR100_PACKAGE=msvcr100.dll
@@ -91,7 +96,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5
+NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390
+CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
@@ -114,6 +120,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa
 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
 GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
 TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE}
+CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_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}
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 69e9a2c..a747fd6 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -9,7 +9,7 @@ build_targets:
     osx32: Darwin_x86-gcc3
     osx64: Darwin_x86_64-gcc3
 channels:
-    alpha: 6.0a4
+    alpha: 6.0a5
     release: 5.5
 versions:
     5.5:
@@ -23,13 +23,12 @@ versions:
         osx32:
             minSupportedOSVersion: 10.8
             detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating
-    6.0a4:
-        platformVersion: 38.7.1
-        detailsURL: https://blog.torproject.org/blog/tor-browser-60a4-released
-        download_url: https://www.torproject.org/dist/torbrowser/6.0a4
+    6.0a5:
+        platformVersion: 45.1.0
+        detailsURL: https://blog.torproject.org/blog/tor-browser-60a5-released
+        download_url: https://www.torproject.org/dist/torbrowser/6.0a5
         incremental_from:
-          - 6.0a2
-          - 6.0a3
+          - 6.0a4
         migrate_archs:
           osx32: osx64
         osx32: