tbb-commits

tbb-commits@lists.torproject.org

November 2017

2 participants
72 discussions

[tor-browser-bundle/maint-7.0] Apply follow-up patch for bug 24052
by boklm＠torproject.org 03 Nov '17

03 Nov '17

commit a5388a804d47d7d4fb157beb351ebef9897e8a2b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 1 20:35:18 2017 +0000 Apply follow-up patch for bug 24052 --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ gitian/descriptors/mac/gitian-firefox.yml | 2 ++ gitian/patches/24052_2.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 766bf99..967a981 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -37,6 +37,7 @@ files: - "dzip.sh" - "versions" - "24052.patch" +- "24052_2.patch" script: | source versions INSTDIR="$HOME/install" @@ -90,6 +91,7 @@ script: | cd tor-browser patch -p1 < ../24052.patch + patch -p1 < ../24052_2.patch # run get-moz-build-date before removing .git, which is used to get the year chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index f47afc8..a38fc0b 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -25,6 +25,7 @@ files: - "fix-info-plist.py" - "versions" - "24052.patch" +- "24052_2.patch" script: | INSTDIR="$HOME/install/" source versions @@ -38,6 +39,7 @@ script: | cd tor-browser patch -p1 < ../24052.patch + patch -p1 < ../24052_2.patch # Extracting all the necessary tools tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz diff --git a/gitian/patches/24052_2.patch b/gitian/patches/24052_2.patch new file mode 100644 index 0000000..0060428 --- /dev/null +++ b/gitian/patches/24052_2.patch @@ -0,0 +1,29 @@ +From e2c1240ad25f4edcc7d3828b29f6aeb953a24a2e Mon Sep 17 00:00:00 2001 +From: Arthur Edelstein <arthuredelstein(a)gmail.com> +Date: Wed, 1 Nov 2017 02:33:18 -0700 +Subject: [PATCH] Bug 24052: Handle redirects by blocking them early + +This is the second part of the workaround for +https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. + +diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp +index 0e570e8cb57d..b38be48bf0c9 100644 +--- a/netwerk/protocol/http/nsHttpChannel.cpp ++++ b/netwerk/protocol/http/nsHttpChannel.cpp +@@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t redirectType) + return NS_ERROR_CORRUPTED_CONTENT; + } + ++ bool isRedirectToFile = false; ++ rv = mRedirectURI->SchemeIs("file", &isRedirectToFile); ++ if (!NS_FAILED(rv) && isRedirectToFile) { ++ LOG(("Attempted to redirect from a remote page to a file:// URI.")); ++ return NS_ERROR_FAILURE; ++ } ++ + if (mApplicationCache) { + // if we are redirected to a different origin check if there is a fallback + // cache entry to fall back to. we don't care about file strict +-- +2.14.2 +

1 0

[tor-browser-bundle/maint-7.0] Prepare 7.0.9 release for Linux and OS X
by boklm＠torproject.org 03 Nov '17

03 Nov '17

commit 8c793c6e481079e21c8d73b4cbb95e6453c359e0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 30 08:55:00 2017 +0000 Prepare 7.0.9 release for Linux and OS X Changelog and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ tools/update-responses/config.yml | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 835426f..40e382b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 7.0.9 -- October 31 2017 + * OS X + * Bug 24052: Streamline handling of file:// resources + * Linux + * Bug 24052: Streamline handling of file:// resources + Tor Browser 7.0.8 -- October 25 2017 * All Platforms * Update Torbutton to 1.9.7.9 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 82fa8f0..cf3cd4d 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,14 +20,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.8 + release: 7.0.9 versions: - 7.0.8: + 7.0.9: platformVersion: 52.4.1 - detailsURL: https://blog.torproject.org/tor-browser-708-released + detailsURL: https://blog.torproject.org/tor-browser-709-released incremental_from: - - 7.0.6 - 7.0.7 + - 7.0.8 migrate_archs: osx32: osx64 migrate_langs:

1 0