- tbb-commits - lists.torproject.org

[tor-browser-build/maint-9.0] Bug 33805: Remove escape-openssldir.patch
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 4e197c35adee024955e0c64283b67f9ae306ddf8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 3 14:40:03 2020 +0200 Bug 33805: Remove escape-openssldir.patch The issue fixed by escape-openssldir.patch has been solved upstream in a different way: https://github.com/openssl/openssl/pull/11434 --- projects/openssl/build | 1 - projects/openssl/config | 2 -- projects/openssl/escape-openssldir.patch | 28 ---------------------------- 3 files changed, 31 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 5851ff8..1f70957 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -14,7 +14,6 @@ export CC='gcc -m32' export CC="cc [% c("var/FLAGS") %]" [% END -%] [% IF c("var/windows") -%] - patch -p1 < $rootdir/escape-openssldir.patch patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' diff --git a/projects/openssl/config b/projects/openssl/config index e63aa57..8ee3b69 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -29,7 +29,5 @@ input_files: project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 - - filename: escape-openssldir.patch - enable: '[% c("var/windows") %]' - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' diff --git a/projects/openssl/escape-openssldir.patch b/projects/openssl/escape-openssldir.patch deleted file mode 100644 index 684a179..0000000 --- a/projects/openssl/escape-openssldir.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index 7db7578a4b..e5ba20b589 100644 ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -215,6 +215,7 @@ INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet - $prefix_dev -} - INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir); - $x =~ s|\\|/|g; -+ $x =~ s/([ ])/\\$1/g; - $x -} - OPENSSLDIR_dev={- # - # The logic here is that if no --openssldir was given, -@@ -239,6 +240,7 @@ OPENSSLDIR_dev={- # - $openssldir_dev -} - OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir); - $x =~ s|\\|/|g; -+ $x =~ s/([ ])/\\$1/g; - $x -} - LIBDIR={- our $libdir = $config{libdir} || "lib"; - File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -} -@@ -253,6 +255,7 @@ ENGINESDIR_dev={- use File::Spec::Win32; - $enginesdir_dev -} - ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir); - $x =~ s|\\|/|g; -+ $x =~ s/([ ])/\\$1/g; - $x -} - # In a Windows environment, $(DESTDIR) is harder to contatenate with other - # directory variables, because both may contain devices. What we do here is

1 0

[tor-browser-build/master] Bug 33805: Remove escape-openssldir.patch
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 31c29ff872a9f827f0446c7d8af02788089dd244 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 3 14:40:03 2020 +0200 Bug 33805: Remove escape-openssldir.patch The issue fixed by escape-openssldir.patch has been solved upstream in a different way: https://github.com/openssl/openssl/pull/11434 --- projects/openssl/build | 1 - projects/openssl/config | 2 -- projects/openssl/escape-openssldir.patch | 28 ---------------------------- 3 files changed, 31 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 984d14a..8ceb952 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -14,7 +14,6 @@ export CC='gcc -m32' export CC="cc [% c("var/FLAGS") %]" [% END -%] [% IF c("var/windows") -%] - patch -p1 < $rootdir/escape-openssldir.patch patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch [% END -%] # OpenSSL expects the NDK home to include the pre-assembled architecture directory diff --git a/projects/openssl/config b/projects/openssl/config index 662de63..179c2d5 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -32,7 +32,5 @@ input_files: project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 - - filename: escape-openssldir.patch - enable: '[% c("var/windows") %]' - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' diff --git a/projects/openssl/escape-openssldir.patch b/projects/openssl/escape-openssldir.patch deleted file mode 100644 index 684a179..0000000 --- a/projects/openssl/escape-openssldir.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index 7db7578a4b..e5ba20b589 100644 ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -215,6 +215,7 @@ INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet - $prefix_dev -} - INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir); - $x =~ s|\\|/|g; -+ $x =~ s/([ ])/\\$1/g; - $x -} - OPENSSLDIR_dev={- # - # The logic here is that if no --openssldir was given, -@@ -239,6 +240,7 @@ OPENSSLDIR_dev={- # - $openssldir_dev -} - OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir); - $x =~ s|\\|/|g; -+ $x =~ s/([ ])/\\$1/g; - $x -} - LIBDIR={- our $libdir = $config{libdir} || "lib"; - File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -} -@@ -253,6 +255,7 @@ ENGINESDIR_dev={- use File::Spec::Win32; - $enginesdir_dev -} - ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir); - $x =~ s|\\|/|g; -+ $x =~ s/([ ])/\\$1/g; - $x -} - # In a Windows environment, $(DESTDIR) is harder to contatenate with other - # directory variables, because both may contain devices. What we do here is

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmtpo/bug_33805_v2'
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 5291659104516bbcf71ed7b733154cba7fcdb3af Merge: 3636417 31c29ff Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 15:05:44 2020 +0000 Merge remote-tracking branch 'boklmtpo/bug_33805_v2' projects/openssl/build | 1 - projects/openssl/config | 2 -- projects/openssl/escape-openssldir.patch | 28 ---------------------------- 3 files changed, 31 deletions(-)

1 0

[tor-browser-build/master] Bug 33630: Pick up tor-android-service patch
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 3636417054f1e739a3a26bbacadbcd252c5a14c2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 14:59:28 2020 +0000 Bug 33630: Pick up tor-android-service patch --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..9754ebe 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 +git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/maint-9.0] Bug 33630: Pick up tor-android-service patch
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit b585bdb7440cdac5059e25eaa0553d2e53a29e80 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 14:59:28 2020 +0000 Bug 33630: Pick up tor-android-service patch --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index b0dc4b0..0e9036d 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 +git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-android-service/master] Bug 33630: Remove noisebridge01 default bridge.
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Mar 16 16:43:01 2020 -0700 Bug 33630: Remove noisebridge01 default bridge. This bridge has been unmaintained for quite a while, so it's time to remove it. This fixes <https://bugs.torproject.org/33630>. --- service/src/main/assets/common/bridges.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 7c1ebcf..9ab9098 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -4,7 +4,6 @@ obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWOD obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0 -obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0 obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0 obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0 obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0

1 0

[tor-browser-build/maint-9.0.8] Clarify Mozilla bugs in ChangeLog
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 24b8ebc7c303968f74ca2fd756532f01ac9e76d3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 14:10:30 2020 +0000 Clarify Mozilla bugs in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4362b97..d67073b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,7 @@ Tor Browser 9.0.8 -- April 5 2020 * All Platforms - * Bug 1620818 - Release nsDocShell::mContentViewer properly - * Bug 1626728 - Normalize shutdown + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown Tor Browser 9.0.7 -- March 20 2020 * All Platforms

1 0

[tor-browser-build/maint-9.0.8] Add the changelog
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 5c7ef2fdad5dc6fe47d9e27c5093152ab4f53099 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Apr 3 14:06:57 2020 +0000 Add the changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9f6a50e..4362b97 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 9.0.8 -- April 5 2020 + * All Platforms + * Bug 1620818 - Release nsDocShell::mContentViewer properly + * Bug 1626728 - Normalize shutdown + Tor Browser 9.0.7 -- March 20 2020 * All Platforms * Bump NoScript to 11.0.19 diff --git a/rbm.conf b/rbm.conf index f765e08..817b211 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.8' - torbrowser_build: 'build4' + torbrowser_build: 'build5' torbrowser_incremental_from: - 9.0.7 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.6.0esr-9.0-1] Bug 1620818 - Release nsDocShell::mContentViewer properly. r=nika, peterv a=dveditz
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 7e258d9875480b8c42e3af16ec9f927eee3f06ab Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Thu Apr 2 14:43:50 2020 +0000 Bug 1620818 - Release nsDocShell::mContentViewer properly. r=nika,peterv a=dveditz Differential Revision: https://phabricator.services.mozilla.com/D69383 --HG-- branch : FIREFOX_ESR_68_6_X_RELBRANCH extra : source : 8755eccf58cd6bd4fc1f00e6bcf45681d41da314 extra : intermediate-source : 2f3e381a0fedaf4d16a6bc1fd1a35751f6af99ba --- docshell/base/nsDocShell.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 3cf2086206a4..4abdd088d4ff 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -433,6 +433,12 @@ nsDocShell::~nsDocShell() { mSessionHistory->LegacySHistory()->ClearRootDocShell(); } + if (mContentViewer) { + mContentViewer->Close(nullptr); + mContentViewer->Destroy(); + mContentViewer = nullptr; + } + if (--gDocShellCount == 0) { NS_IF_RELEASE(sURIFixup); }

1 0

[tor-browser/tor-browser-68.6.0esr-9.0-1] Bug 1626728 - Normalize shutdown. r=perry, jstutte, a=RyanVM
by sysrqb＠torproject.org 03 Apr '20

03 Apr '20

commit 0e0085c0d8aa0ba4141d53bcecf525f443ef3a59 Author: Andrew Sutherland <asutherland(a)asutherland.org> Date: Fri Apr 3 06:35:19 2020 +0000 Bug 1626728 - Normalize shutdown. r=perry,jstutte, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D69463 --HG-- branch : FIREFOX_ESR_68_6_X_RELBRANCH extra : source : 63afe468c6a580c6c01623fd60c8393fc2c2a4e0 --- dom/cache/StreamList.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dom/cache/StreamList.cpp b/dom/cache/StreamList.cpp index 9f817457ffb5..894fb8bdd575 100644 --- a/dom/cache/StreamList.cpp +++ b/dom/cache/StreamList.cpp @@ -133,7 +133,15 @@ void StreamList::Close(const nsID& aId) { void StreamList::CloseAll() { NS_ASSERT_OWNINGTHREAD(StreamList); if (mStreamControl) { - mStreamControl->CloseAll(); + auto streamControl = mStreamControl; + mStreamControl = nullptr; + + streamControl->CloseAll(); + + mStreamControl = streamControl; + streamControl = nullptr; + + mStreamControl->Shutdown(); } }

1 0