- 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

[tor-browser/tor-browser-45.1.1esr-6.0-1] Bug 18884: Add --disable-loop flag
by gk＠torproject.org 31 May '16

31 May '16

commit 61a4d57b1cc573b85baef431b277149cbf740c74 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 17 16:40:33 2016 -0700 Bug 18884: Add --disable-loop flag When a mozconfig file contains ac_add_options --disable-loop then the Loop extension will not be built or bundled with the browser. --- browser/base/content/browser-menubar.inc | 2 ++ browser/base/content/browser.css | 4 ++++ browser/base/content/browser.xul | 2 ++ browser/components/about/AboutRedirector.cpp | 2 ++ browser/components/customizableui/content/panelUI.inc.xul | 2 ++ browser/extensions/moz.build | 4 +++- browser/installer/package-manifest.in | 2 ++ browser/locales/Makefile.in | 4 +++- browser/locales/jar.mn | 2 ++ configure.in | 14 ++++++++++++++ 10 files changed, 36 insertions(+), 2 deletions(-) diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index a987975..2c01c13 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -500,10 +500,12 @@ key="key_openAddons" command="Tools:Addons"/> +#ifdef MOZ_LOOP <menuitem id="menu_openLoop" label="&loopMenuItem.label;" accesskey = "&loopMenuItem.accesskey;" oncommand="LoopUI.togglePanel();"/> +#endif  <menuitem id="sync-setup" diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index c5dd9b4..f93d13f 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -18,6 +18,7 @@ %endif } +%ifdef MOZ_LOOP /* These values are chosen to keep the Loop detached chat window from * getting too small. When it's too small, three bad things happen: * @@ -41,6 +42,7 @@ min-width: 260px; min-height: 315px; } +%endif #main-window[customize-entered] { min-width: -moz-fit-content; @@ -914,6 +916,7 @@ chatbox[customSize] { min-width: 350px; } +%ifdef MOZ_LOOP chatbox[customSize="loopChatEnabled"] { /* 430px as defined per UX */ height: 430px; @@ -938,6 +941,7 @@ chatbox[customSize="loopChatDisabledMessageAppended"] { /* 445px + 30px top bar height. */ min-height: calc(400px + 30px); } +%endif chatbox[minimized="true"] { width: 160px; diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index c63dfed..8749477 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -290,6 +290,7 @@ noautofocus="true" position="topcenter topright"/> +#ifdef MOZ_LOOP <panel id="loop-notification-panel" class="loop-panel social-panel" type="arrow" @@ -301,6 +302,7 @@ type="arrow" orient="horizontal" hidden="true"/> +#endif <menupopup id="toolbar-context-menu" onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));"> diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index ab069e5..2f956b2 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -108,6 +108,7 @@ static RedirEntry kRedirMap[] = { { "debugging", "chrome://devtools/content/aboutdebugging/aboutdebugging.xhtml", nsIAboutModule::ALLOW_SCRIPT }, +#ifdef MOZ_LOOP { "loopconversation", "chrome://loop/content/panels/conversation.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | @@ -120,6 +121,7 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::ENABLE_INDEXED_DB, // Shares an IndexedDB origin with about:loopconversation. "loopconversation" }, +#endif { "reader", "chrome://global/content/reader/aboutReader.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index 99bca07..f8975bf 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -243,7 +243,9 @@ <panelview id="PanelUI-socialapi" flex="1"/> +#ifdef MOZ_LOOP <panelview id="PanelUI-loopapi" flex="1"/> +#endif <panelview id="PanelUI-feeds" flex="1" oncommand="FeedHandler.subscribeToFeed(null, event);"> <label value="&feedsMenu.label;" class="panel-subview-header"/> diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index b4d84e4..ef6a439 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -5,6 +5,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ - 'loop', 'pdfjs', ] + +if CONFIG['MOZ_LOOP']: + DIRS += ['loop'] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c3ce1a5..3d2c507 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -669,7 +669,9 @@ @RESPATH@/browser/chrome/icons/default/default32.png @RESPATH@/browser/chrome/icons/default/default48.png #endif +#ifdef MOZ_LOOP @RESPATH@/browser/features/* +#endif #MOZ_LOOP ; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index be9454e..ae13de4 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -133,7 +133,9 @@ ifdef MOZ_WEBAPP_RUNTIME @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../extensions/loop/chrome/locale AB_CD=$* XPI_NAME=locale-$* +ifdef MOZ_LOOP + @$(MAKE) -C ../extensions/loop/chrome/locale AB_CD=$* XPI_NAME=locale-$* +endif @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 0f18e06..63c19d4 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -30,7 +30,9 @@ locale/browser/browser-pocket.properties (%chrome/browser/browser-pocket.properties) locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) locale/browser/lightweightThemes.properties (%chrome/browser/lightweightThemes.properties) +#ifdef MOZ_LOOP locale/browser/loop/loop.properties (%chrome/browser/loop/loop.properties) +#endif locale/browser/newTab.dtd (%chrome/browser/newTab.dtd) locale/browser/newTab.properties (%chrome/browser/newTab.properties) locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd) diff --git a/configure.in b/configure.in index 885ee84..2b0c949 100644 --- a/configure.in +++ b/configure.in @@ -3737,6 +3737,7 @@ MOZ_URL_CLASSIFIER= MOZ_XUL=1 MOZ_ZIPWRITER=1 NS_PRINTING=1 +MOZ_LOOP=1 if test "$MOZ_IOS"; then NS_PRINTING= fi @@ -8456,6 +8457,19 @@ if test "$NECKO_COOKIES"; then _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES" fi +dnl ======================================================== +dnl disable loop extension +dnl ======================================================== +MOZ_ARG_DISABLE_BOOL(loop, +[ --disable-loop + Disable loop extension], + MOZ_LOOP=, + MOZ_LOOP=1 ) +if test "$MOZ_LOOP"; then + AC_DEFINE(MOZ_LOOP) +fi +AC_SUBST(MOZ_LOOP) + dnl dnl Always build Marionette if not Android or B2G dnl

1 0

[tor-browser/tor-browser-45.1.1esr-6.0-1] Bug 1233963 - Work around recent GNU gold behavior with segments starting before the first section they contain
by gk＠torproject.org 31 May '16

31 May '16

commit 1ad955bf2c0a772599f46d2247f06d89508b6d76 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Tue Jan 19 14:31:04 2016 +0900 Bug 1233963 - Work around recent GNU gold behavior with segments starting before the first section they contain --- build/unix/elfhack/elf.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/unix/elfhack/elf.cpp b/build/unix/elfhack/elf.cpp index 666b535..743afde 100644 --- a/build/unix/elfhack/elf.cpp +++ b/build/unix/elfhack/elf.cpp @@ -258,7 +258,10 @@ Elf::Elf(std::ifstream &file) segment->addSection(sections[j]); // Make sure that our view of segments corresponds to the original // ELF file. - assert(segment->getFileSize() == phdr.p_filesz); + // GNU gold likes to start some segments before the first section + // they contain. https://sourceware.org/bugzilla/show_bug.cgi?id=19392 + unsigned int gold_adjustment = segment->getAddr() - phdr.p_vaddr; + assert(segment->getFileSize() == phdr.p_filesz - gold_adjustment); // gold makes TLS segments end on an aligned virtual address, even // when the underlying section ends before that, while bfd ld // doesn't. It's fine if we don't keep that alignment. @@ -267,7 +270,7 @@ Elf::Elf(std::ifstream &file) unsigned int align = segment->getAlign(); memsize = (memsize + align - 1) & ~(align - 1); } - assert(memsize == phdr.p_memsz); + assert(memsize == phdr.p_memsz - gold_adjustment); segments.push_back(segment); }

1 0

[tor-browser/tor-browser-45.1.1esr-6.0-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 31 May '16

31 May '16

commit 9a9765a3cb73e7341b7c2494c167725b4f688c07 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri May 20 16:20:18 2016 -0700 squash! TB3: Tor Browser's official .mozconfigs. Bug 18884: Disable Loop extension --- .mozconfig | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 4 files changed, 4 insertions(+) diff --git a/.mozconfig b/.mozconfig index eb36301..dc2e63b 100755 --- a/.mozconfig +++ b/.mozconfig @@ -25,3 +25,4 @@ ac_add_options --disable-webrtc # (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes +ac_add_options --disable-loop diff --git a/.mozconfig-asan b/.mozconfig-asan index faa195e..1a723cf 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -32,3 +32,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes ac_add_options --disable-eme +ac_add_options --disable-loop diff --git a/.mozconfig-mac b/.mozconfig-mac index c5ca087..96f036a 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -54,3 +54,4 @@ ac_add_options --disable-tests # (Apart from that there is no Adobe CRM module for OS X right now) ac_add_options --disable-eme # ac_add_options --disable-ctypes +ac_add_options --disable-loop diff --git a/.mozconfig-mingw b/.mozconfig-mingw index c40881c..33ea6d4 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -29,3 +29,4 @@ ac_add_options --disable-webrtc ac_add_options --disable-tests #ac_add_options --disable-ctypes +ac_add_options --disable-loop

1 0

[tor-browser-bundle/master] Fix changelog
by gk＠torproject.org 30 May '16

30 May '16

commit a6a9bb3c2b287bd9885d3022c195ad6459c1de7d Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 30 08:08:49 2016 +0000 Fix changelog --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7f4df5b..26b3e4e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,7 @@ Tor Browser 6.0 -- May 30 * Bug 18904: Mac OS: meek-http-helper profile not updated * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 * Bug 18900: Fix broken updater on Linux + * Bug 19121: The update.xml hash should get checked during update * Bug 18042: Disable SHA1 certificate support * Bug 18821: Disable libmdns support for desktop and mobile * Bug 18848: Disable additional welcome URL shown on first start

1 0

[tor-browser-bundle/hardened-builds] Bug 19176: Zip language packs deterministically
by gk＠torproject.org 26 May '16

26 May '16

commit c07734b821db00b031e5736edc6c8a1ec2ff37f0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 26 07:26:37 2016 +0000 Bug 19176: Zip language packs deterministically --- gitian/descriptors/linux/gitian-bundle.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 2 +- gitian/descriptors/windows/gitian-bundle.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 3e8ae2e..e25d40e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -209,7 +209,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index e046b57..84cb56c 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -218,7 +218,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 5473bf3..ab4f903 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -180,7 +180,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done

1 0