June 2016 - tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 18845: generate reproducible archives without relying on libfaketime
by gk＠torproject.org 03 Jun '16

03 Jun '16

commit 0a88a5c3919bb10e0567ddd0e6a7a4b192d3cf18 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 16 19:26:26 2016 +0200 Bug 18845: generate reproducible archives without relying on libfaketime --- gitian/build-helpers/ddmg.sh | 3 +++ gitian/build-helpers/dtar.sh | 3 +++ gitian/build-helpers/dzip.sh | 3 +++ gitian/build-helpers/re-dzip.sh | 2 ++ 4 files changed, 11 insertions(+) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index cb513e8..e36fca9 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -11,6 +11,9 @@ shift find $@ -executable -exec chmod 750 {} \; find $@ ! -executable -exec chmod 640 {} \; +[ -n "$REFERENCE_DATETIME" ] && \ + find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; + cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt diff --git a/gitian/build-helpers/dtar.sh b/gitian/build-helpers/dtar.sh index e8ec340..3aa6f0c 100755 --- a/gitian/build-helpers/dtar.sh +++ b/gitian/build-helpers/dtar.sh @@ -5,6 +5,9 @@ export LC_ALL=C TARFILE=$1 shift +[ -n "$REFERENCE_DATETIME" ] && \ + find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; + # No need to execute chmod on (possibly) dangling symlinks. find $@ ! -type l -executable -exec chmod 700 {} \; find $@ ! -type l ! -executable -exec chmod 600 {} \; diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 2f7dc54..5772c8b 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -5,6 +5,9 @@ export LC_ALL=C ZIPFILE=$1 shift +[ -n "$REFERENCE_DATETIME" ] && \ + find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; + find $@ -executable -exec chmod 700 {} \; find $@ ! -executable -exec chmod 600 {} \; diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 656e225..27828e9 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -7,6 +7,8 @@ ZIPFILE=`basename $1` mkdir tmp_dzip cd tmp_dzip unzip ../$1 +[ -n "$REFERENCE_DATETIME" ] && \ + find . -exec touch --date="$REFERENCE_DATETIME" {} \; find . -executable -exec chmod 700 {} \; find . ! -executable -exec chmod 600 {} \; find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE

1 0

[tor-browser-bundle/master] Use build2 despite being just build1 tagged
by gk＠torproject.org 03 Jun '16

03 Jun '16

commit e785c29ede9539d71ebd2bf8f893437c516f444e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 3 08:07:31 2016 +0000 Use build2 despite being just build1 tagged --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 6d2d0f6..8bbfeb3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539

1 0

[tor-browser-bundle/master] Release preparations for 6.0.1
by gk＠torproject.org 03 Jun '16

03 Jun '16

commit a3c24c9d0824b5a7adc96efb4b1a9bfa7c188b89 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 3 07:42:01 2016 +0000 Release preparations for 6.0.1 Changelog update, version bump, config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ gitian/versions | 2 +- tools/update-responses/config.yml | 11 ++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 26b3e4e..3fb411e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 6.0.1 -- June 7 + * All Platforms + * Update Firefox to 45.2.0esr + * Bug 18884: Don't build the loop extension + * Bug 19187: Backport fix for crash related to popup menus + * Bug 19212: Fix crash related to network panel in developer tools + * Linux + * Bug 19189: Backport for working around a linker (gold) bug + Tor Browser 6.0 -- May 30 * All Platforms * Update Firefox to 45.1.1esr diff --git a/gitian/versions b/gitian/versions index a3b3a1f..6d2d0f6 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.1.1esr +FIREFOX_VERSION=45.2.0esr TORBROWSER_UPDATE_CHANNEL=release diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 55a767f..615150b 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,14 +10,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.0a5 - release: 6.0 + release: 6.0.1 versions: - 6.0: - platformVersion: 45.1.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-60-released - download_url: https://www.torproject.org/dist/torbrowser/6.0 + 6.0.1: + platformVersion: 45.2.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-601-released + download_url: https://www.torproject.org/dist/torbrowser/6.0.1 incremental_from: - 5.5.5 + - 6.0 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-45.1.1esr-6.0-1] Bug 19212: SIGSEGV with developer tools open
by gk＠torproject.org 03 Jun '16

03 Jun '16

commit d7f98ce46b9cc43bb4ec8482938cb04f6ca99e21 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jun 2 15:45:36 2016 -0400 Bug 19212: SIGSEGV with developer tools open Avoid a crash when monitoring network events. The crash occurred because the JS context's compartment was NULL when a JS stack was requested, but the root cause remains a mystery. --- js/src/jsapi.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index adbee56..46418ba 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -6223,7 +6223,9 @@ JS_PUBLIC_API(bool) JS::CaptureCurrentStack(JSContext* cx, JS::MutableHandleObject stackp, unsigned maxFrameCount) { JSCompartment* compartment = cx->compartment(); - MOZ_ASSERT(compartment); + if (!compartment) + return false; + Rooted<SavedFrame*> frame(cx); if (!compartment->savedStacks().saveCurrentStack(cx, &frame, maxFrameCount)) return false;

1 0

[tor-browser/tor-browser-45.1.1esr-6.0-1] Bug 1266963, stop propagation before other steps, r=masayuki
by gk＠torproject.org 03 Jun '16

03 Jun '16

commit e38872520658a519cca3c69e635cd5cb6d825d21 Author: Neil Deakin <neil(a)mozilla.com> Date: Wed May 4 10:07:45 2016 -0400 Bug 1266963, stop propagation before other steps, r=masayuki This is a backport of https://hg.mozilla.org/mozilla-central/rev/1d23af51e886. Note we don't call `AsEvent()` as the original patch is doing as that change got introduced by bug 1230216 which landed in mozilla46. --- layout/xul/nsXULPopupManager.cpp | 16 +++++++++------- toolkit/content/tests/widgets/window_menubar.xul | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp index a31dbdb..4176727 100644 --- a/layout/xul/nsXULPopupManager.cpp +++ b/layout/xul/nsXULPopupManager.cpp @@ -2514,6 +2514,12 @@ nsXULPopupManager::KeyDown(nsIDOMKeyEvent* aKeyEvent) if (!mActiveMenuBar && (!item || item->PopupType() != ePopupTypeMenu)) return NS_OK; + // Since a menu was open, stop propagation of the event to keep other event + // listeners from becoming confused. + if (!item || item->IgnoreKeys() != eIgnoreKeys_Handled) { + aKeyEvent->StopPropagation(); + } + int32_t menuAccessKey = -1; // If the key just pressed is the access key (usually Alt), @@ -2544,19 +2550,15 @@ nsXULPopupManager::KeyDown(nsIDOMKeyEvent* aKeyEvent) Rollup(0, false, nullptr, nullptr); else if (mActiveMenuBar) mActiveMenuBar->MenuClosed(); + + // Clear the item to avoid bugs as it may have been deleted during rollup. + item = nullptr; } aKeyEvent->StopPropagation(); aKeyEvent->PreventDefault(); } } - // Since a menu was open, stop propagation of the event to keep other event - // listeners from becoming confused. - - if (!item || item->IgnoreKeys() != eIgnoreKeys_Handled) { - aKeyEvent->StopPropagation(); - } - aKeyEvent->StopCrossProcessForwarding(); return NS_OK; } diff --git a/toolkit/content/tests/widgets/window_menubar.xul b/toolkit/content/tests/widgets/window_menubar.xul index 41b74f3..b7669e0 100644 --- a/toolkit/content/tests/widgets/window_menubar.xul +++ b/toolkit/content/tests/widgets/window_menubar.xul @@ -706,6 +706,30 @@ var popupTests = [ } }, +{ + testname: "Open menu and press alt key by itself - open menu", + events: [ "DOMMenuBarActive menubar", + "popupshowing filepopup", "DOMMenuItemActive filemenu", + "DOMMenuItemActive item1", "popupshown filepopup" ], + test: function() { synthesizeKey("F", { altKey: true }); }, + result: function (testname) { + checkOpen("filemenu", testname); + } +}, +{ + testname: "Open menu and press alt key by itself - close menu", + events: [ "popuphiding filepopup", "popuphidden filepopup", + "DOMMenuItemInactive item1", "DOMMenuInactive filepopup", + "DOMMenuBarInactive menubar", "DOMMenuItemInactive filemenu", + "DOMMenuItemInactive filemenu" ], + test: function() { + synthesizeKey("VK_ALT", { }); + }, + result: function (testname) { + checkClosed("filemenu", testname); + } +}, + // Fllowing 4 tests are a test of bug 616797, don't insert any new tests // between them. {

1 0