- tbb-commits - lists.torproject.org

[tor-browser-build/master] Revert "Bug 28546: Rebrand Tor Browser's Window's Installer"
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit b25cd533f1ae26c2ee65bc5bef57a33d98f83363 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 28 09:32:00 2019 +0000 Revert "Bug 28546: Rebrand Tor Browser's Window's Installer" This reverts commit 031ecd732636c627ea3b6343869d96ccbf3d2df0. We need to back this out for now because it is causing reproducibility issues, see #29185. --- projects/tbb-windows-installer/config | 2 +- projects/tor-browser/build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index 0ec7b0a..a990229 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.6 +version: 0.5 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index bc663c2..4661f7a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -303,7 +303,7 @@ cd $distdir [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("var/touch") %] {} \; pushd "$PKG_DIR" - makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi + makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py @@ -392,7 +392,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% ELSIF c("var/windows") %] find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" - makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi + makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py

1 0

[tor-browser-build/master] Fix 8.5a7 release year
by gk＠torproject.org 27 Jan '19

27 Jan '19

commit 2ffa418535f8a9baf7ba4894610e91633d876670 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 27 15:53:56 2019 +0000 Fix 8.5a7 release year 2018 is gone. Get over it. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 46ba50f..c0e2a38 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 8.5a7 -- January 29 2018 +Tor Browser 8.5a7 -- January 29 2019 * All Platforms * Update Firefox to 60.5.0esr * Update Torbutton to 2.1.4

1 0

[tor-browser-build/master] Picking up fix for Android build bustage
by gk＠torproject.org 26 Jan '19

26 Jan '19

commit 71b5a3b40429a4286b4aafbb3f9cb5b168aeff99 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 26 09:19:08 2019 +0000 Picking up fix for Android build bustage --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 2556313..59ec1ee 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 2636d31..74d922b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.5.0esr-8.5-1] Bug 29182: Fix Android build bustage
by gk＠torproject.org 26 Jan '19

26 Jan '19

commit 4d0f9fa5fdd5831fbc2e28cb6c7b1056bd4deeab Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 26 08:10:39 2019 +0000 Bug 29182: Fix Android build bustage Updating the expat library (bug 1374012) resulted in broken compilation of Android builds as `arc4random_buf` is not defined compiling with our current toolchain. The upstream bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1516642. Patch by a cypherpunk (mac198442). --- parser/expat/lib/xmlparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c index 209f20e094dc..95ff14f8e154 100644 --- a/parser/expat/lib/xmlparse.c +++ b/parser/expat/lib/xmlparse.c @@ -839,7 +839,7 @@ generate_hash_secret_salt(XML_Parser parser) { unsigned long entropy; (void)parser; -#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__) +#if !defined(__ANDROID__) && (defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)) (void)gather_time_entropy; arc4random_buf(&entropy, sizeof(entropy)); return ENTROPY_DEBUG("arc4random_buf", entropy);

1 0

[tor-browser-build/master] Use build2 for locales for mobile as well
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit cac6014790f79e8819191ff9af9a69b10f2b52d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 16:21:20 2019 +0000 Use build2 for locales for mobile as well --- projects/firefox-locale-bundle/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/rbm.conf b/rbm.conf index e929728..2636d31 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0

[tor-browser-build/master] Release preparations for 8.5a7
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit bcb6cc1a83246ff1018df5f937dfe36687d513d7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 16:09:14 2019 +0000 Release preparations for 8.5a7 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 53 ++++++++++++++++++++++ projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 +- 6 files changed, 59 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b001354..2556313 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.4.0 + firefox_platform_version: 60.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 3b45143..59eb463 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.10.31 +version: 2019.1.7 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bd59467..46ba50f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,56 @@ +Tor Browser 8.5a7 -- January 29 2018 + * All Platforms + * Update Firefox to 60.5.0esr + * Update Torbutton to 2.1.4 + * Bug 25702: Update Tor Browser icon to follow design guidelines + * Bug 21805: Add click-to-play button for WebGL + * Bug 28836: Links on about:tor are not clickable + * Bug 29035: Clean up our donation campaign and add newsletter sign-up link + * Translations update + * Code clean-up + * Update HTTPS Everywhere to 2019.1.7 + * Update NoScript to 10.2.1 + * Bug 28873: Cascading of permissions is broken + * Bug 28720: Some videos are blocked outright on higher security levels + * Bug 29082: Backport patches for bug 1469916 + * Bug 28711: Backport patches for bug 1474659 + * Bug 27828: "Check for Tor Browser update" doesn't seem to do anything + * Bug 29028: Auto-decline most canvas warning prompts again + * Bug 27597: Fix our debug builds + * Windows + * Update Tor to 0.4.0.1-alpha + * Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines + * Bug 28111: Use Tor Browser icon in identity box + * Bug 22654: Firefox icon is shown for Tor Browser on Windows 10 start menu + * Bug 27503: Compile with accessibility support + * Bug 28874: Bump mingw-w64 commit to fix WebGL crash + * Bug 28546: Rebrand Tor Browser's Window's Installer + * Bug 12885: Windows Jump Lists fail for Tor Browser + * Bug 28618: Set MOZILLA_OFFICIAL for Windows build + * OS X + * Update Tor to 0.4.0.1-alpha + * Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines + * Bug 28111: Use Tor Browser icon in identity box + * Linux + * Update Tor to 0.4.0.1-alpha + * Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines + * Bug 28111: Use Tor Browser icon in identity box + * Bug 27531: Fix crashing print dialog + * Android + * Bug 28705: Fix download crash on newer Android devices + * Bug 28814: Backport 1480079 to allow installing downloaded apps + * Build System + * All Platforms + * Bug 29158: Install updated apt packages (CVE-2019-3462) + * Bug 29097: Don't try to install python3.6-lxml for HTTPS Everywhere + * Windows + * Bug 26148: Update binutils to 2.31.1 + * Bug 29081: Harden libwinpthread + * Linux + * Bug 26148: Update binutils to 2.31.1 + * Android + * Bug 28752: Don't download tor-android-binary resources during build + Tor Browser 8.5a6 -- December 11 2018 * All Platforms * Update Firefox to 60.4.0esr diff --git a/projects/tor/config b/projects/tor/config index fe3bec9..e6e923b 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.5.5-alpha +version: 0.4.0.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index 0fff877..5d42fc5 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.3 +version: 2.1.4 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index a397752..e929728 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a6' + torbrowser_version: '8.5a7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a4 - - 8.5a5 + - 8.5a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.5.0esr-8.5-1] fixup! Bug 1487263 - set requesting principal for macOS drags, r=mstange
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit b6487d517d9982332f3bfad1f14b6e5ed9f77c53 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 10:56:09 2019 +0000 fixup! Bug 1487263 - set requesting principal for macOS drags, r=mstange --- widget/cocoa/nsDragService.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/widget/cocoa/nsDragService.mm b/widget/cocoa/nsDragService.mm index 47eacb5792a2..e712616b5b95 100644 --- a/widget/cocoa/nsDragService.mm +++ b/widget/cocoa/nsDragService.mm @@ -327,7 +327,8 @@ nsDragService::InvokeDragSessionImpl(nsIArray* aTransferableArray, } // Assign a principal: - currentTransferable->SetRequestingPrincipal(mSourceNode->NodePrincipal()); + nsCOMPtr<nsINode> node = do_QueryInterface(mSourceNode); + currentTransferable->SetRequestingPrincipal(node->NodePrincipal()); // Transform the transferable to an NSDictionary NSDictionary* pasteboardOutputDict =

1 0

[tor-browser/tor-browser-60.5.0esr-8.5-1] fixup! Bug 1469916, r=ckerschb, jkt
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 6dde994c6580634bd3cb9809c2eb0e02499e65b7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 15:23:49 2019 +0000 fixup! Bug 1469916, r=ckerschb,jkt --- browser/components/shell/nsMacShellService.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/shell/nsMacShellService.cpp b/browser/components/shell/nsMacShellService.cpp index 3484a41530a7..a24814c0087b 100644 --- a/browser/components/shell/nsMacShellService.cpp +++ b/browser/components/shell/nsMacShellService.cpp @@ -156,8 +156,8 @@ nsMacShellService::SetDesktopBackground(nsIDOMElement* aElement, loadContext = do_QueryInterface(docShell); } - return wbp->SaveURI(imageURI, aElement->NodePrincipal(), nullptr, docURI, - aElement->OwnerDoc()->GetReferrerPolicy(), nullptr, + return wbp->SaveURI(imageURI, content->NodePrincipal(), nullptr, docURI, + content->OwnerDoc()->GetReferrerPolicy(), nullptr, nullptr, mBackgroundFile, loadContext); }

1 0

[tor-browser-build/master] Bug 27503: Adapt mozconfig files to enable accessibility on Windows
by boklm＠torproject.org 25 Jan '19

25 Jan '19

commit a0735614173b4d284bb70791d9c15d4d3f018599 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 22 10:58:41 2019 +0000 Bug 27503: Adapt mozconfig files to enable accessibility on Windows When bumping mingw-w64 for the crash fix in #28874 we forgot to adapt our Windows mozconfig files to take into account that we don't need to define CXXFLAGS anymore. The changes landed in commit a91a7e405752bbdbe39101f7aaeb1e1d932199db in the mingw-w64 repo. --- projects/firefox/mozconfig-windows-i686 | 3 --- projects/firefox/mozconfig-windows-x86_64 | 3 --- 2 files changed, 6 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a5e15f1..daeaed4 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -1,8 +1,5 @@ CROSS_COMPILE=1 -# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 -export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" - ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --with-toolchain-prefix=i686-w64-mingw32- diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index e7f857d..568d88d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -1,8 +1,5 @@ CROSS_COMPILE=1 -# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 -export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" - ac_add_options --enable-application=browser ac_add_options --target=x86_64-w64-mingw32 ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_27503_v3'
by boklm＠torproject.org 25 Jan '19

25 Jan '19

commit 97effd6d7380f76dd53e666b034113c84692f51a Merge: 15e8c53 0baa425 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jan 25 16:39:41 2019 +0100 Merge remote-tracking branch 'gk/bug_27503_v3'

1 0