[tor-commits] [tor-browser-bundle/master] Preparations for 5.0a2

[gk at torproject.org]

commit 52317483ec963ff628ae35d27778042dbca0591a
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 5 10:17:52 2015 +0000

    Preparations for 5.0a2
---
 Bundle-Data/Docs/ChangeLog.txt    |   19 +++++++++++++++++++
 gitian/versions.alpha             |   14 +++++++-------
 tools/update-responses/config.yml |    9 ++++-----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 14522bc..df35913 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,22 @@
+Tor Browser 5.0a2 -- June 12 2015
+ * All Platforms
+   * Update Tor to 0.2.7.1-alpha
+   * Update HTTPS-Everywhere to 5.0.5
+   * Update NoScript to 2.6.9.26
+   * Update meek to 0.19
+   * Update Torbutton to 1.9.2.7
+     * Bug 15984: Disabling Torbutton breaks the Add-ons Manager
+     * Bug 14429: Make sure the automatic resizing is enabled
+     * Translation updates
+   * Bug 16130: Defend against logjam attack
+   * Bug 15984: Disabling Torbutton breaks the Add-ons Manager
+ * Windows
+   * Bug 16014: Staged update fails if meek is enabled
+   * Bug 16269: repeated add-on compatibility check after update (meek enabled)
+ * Linux
+   * Bug 16026: Fix crash in GStreamer
+   * Bug 16083: Update comment in start-tor-browser
+
 Tor Browser 4.5.2 -- June 12 2015
  * All Platforms
    * Update Tor to 0.2.6.8
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index d2ff1e3..2b2f6cd 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,11 +8,11 @@ FIREFOX_VERSION=31.7.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1
-TOR_TAG=tor-0.2.6.7
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1
+TOR_TAG=tor-0.2.7.1-alpha
 TORLAUNCHER_TAG=0.2.7.5
-TORBUTTON_TAG=1.9.2.5
-HTTPSE_TAG=5.0.3
+TORBUTTON_TAG=1.9.2.7
+HTTPSE_TAG=5.0.5
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
@@ -25,7 +25,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.18
+MEEK_TAG=0.19
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
@@ -57,7 +57,7 @@ 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.6.9.22-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 TOOLCHAIN4_OLD_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
@@ -84,7 +84,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8
+NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 90524bd..fd9bd23 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: 5.0a1
+    alpha: 5.0a2
     release: 4.5.2
 versions:
     4.5.2:
@@ -23,13 +23,12 @@ versions:
         osx32:
             minSupportedOSVersion: 10.8
             detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating
-    5.0a1:
+    5.0a2:
         platformVersion: 31.7.0
         detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-        download_url: https://www.torproject.org/dist/torbrowser/5.0a1
+        download_url: https://www.torproject.org/dist/torbrowser/5.0a2
         incremental_from:
-          - 4.5
-          - 4.5a5
+          - 5.0a1
         migrate_archs:
           osx32: osx64
         osx32: