[tor-browser-bundle/master] Peparing 4.5-alpha-2. - tbb-commits

2 Dec 2014

commit 7af137f526da8495bbaebffc59077f2e9422d71a
Author: Georg Koppen gk@torproject.org
Date:   Tue Dec 2 13:55:13 2014 +0000
Peparing 4.5-alpha-2.
Bump Torbutton, NoScript and HTTPS Everywhere version. Update
    config.yml and ChangeLog.
---
 Bundle-Data/Docs/ChangeLog.txt    |   30 ++++++++++++++++++++++++++++++
 gitian/versions.alpha             |   18 +++++++++---------
 tools/update-responses/config.yml |   19 +++++++++----------
 3 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index f226adc..f1511b0 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,33 @@
+Tor Browser 4.5-alpha-2 -- Dec 5 2014
+ * All Platforms
+   * Update Firefox to 31.3.0esr
+   * Update NoScript to 2.6.9.5
+   * Update HTTPS Everywhere to 5.0development.1
+   * Update Torbutton to 1.8.1.2
+     * Bug 13672: Make circuit display optional
+     * Bug 13671: Make bridges visible on circuit display
+     * Bug 9387: Incorporate user feedback
+     * Bug 13784: Remove third party authentication tokens
+
+Tor Browser 4.0.2 -- Dec 2 2014
+ * All Platforms
+   * Update Firefox to 31.3.0esr
+   * Update NoScript to 2.6.9.5
+   * Update HTTPS Everywhere to 4.0.2
+   * Update Torbutton to 1.7.0.2
+     * Bug 13019: Synchronize locale spoofing pref with our Firefox patch
+     * Bug 13746: Properly link Torbutton UI to thirdparty pref.
+   * Bug 13742: Fix domain isolation for content cache and disk-enabled
+browsing mode
+   * Bug 5926: Prevent JS engine locale leaks (by setting the C library
+locale)
+   * Bug 13504: Remove unreliable/unreachable non-public bridges
+   * Bug 13435: Remove our custom POODLE fix
+ * Windows
+   * Bug 13443: Re-enable DirectShow; fix crash with mingw patch.
+   * Bug 13558: Fix crash on Windows XP during download folder changing
+   * Bug 13594: Fix update failure for Windows XP users
+
 Tor Browser 4.5-alpha-1 -- Nov 14 2014
  * All Platforms
    * Bug 3455: Patch Firefox SOCKS and proxy filters to allow user+pass isolation
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index edb59c2..a25af43 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -1,17 +1,17 @@
-TORBROWSER_VERSION=4.5-alpha-1
+TORBROWSER_VERSION=4.5-alpha-2
 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
 BUILD_PT_BUNDLES=1
VERIFY_TAGS=1
-FIREFOX_VERSION=31.2.0esr
+FIREFOX_VERSION=31.3.0esr
TORBROWSER_UPDATE_CHANNEL=alpha
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build6
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1
 TOR_TAG=tor-0.2.6.1-alpha
 TORLAUNCHER_TAG=0.2.7.0.1
-TORBUTTON_TAG=1.8.1.1
+TORBUTTON_TAG=1.8.1.2
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.2
 ZLIB_TAG=v1.2.8
@@ -36,7 +36,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7
 OPENSSL_VER=1.0.1i
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build1
+FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=4.9.1
 PYTHON_VER=2.7.5
@@ -50,13 +50,13 @@ PY2EXE_VER=0.6.9
 SETUPTOOLS_VER=1.4
 LXML_VER=3.3.5
 PARSLEY_VER=1.2
-HTTPSE_VER=5.0development.0
+HTTPSE_VER=5.0development.1
 GO_VER=1.3.3
## 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.3-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi
 HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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
@@ -86,8 +86,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a
-HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3
+NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701
+HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 557b197..6b0018d 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -6,20 +6,19 @@ build_targets:
     osx32: Darwin_x86-gcc3
     osx64: Darwin_x86_64-gcc3
 channels:
-    release: 4.0
-    alpha: 4.5-alpha-1
+    release: 4.0.2
+    alpha: 4.5-alpha-2
 versions:
-    4.0:
-        platformVersion: 31.2.0
+    4.0.2:
+        platformVersion: 31.3.0
         detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-        download_url: https://www.torproject.org/dist/torbrowser/4.0
-    4.5-alpha-1:
-        platformVersion: 31.2.0
+        download_url: https://www.torproject.org/dist/torbrowser/4.0.2
+    4.5-alpha-2:
+        platformVersion: 31.3.0
         detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-        download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1
+        download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2
         incremental_from:
-            - 4.0
-            - 4.0.1
+          - 4.5-alpha-1
         migrate_archs:
           osx32: osx64
         osx32:

    