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

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40476' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 8157aa761f342864c3c8b6109b24758ae7ead1ea Merge: 9c9884c27d5a 0f2ac709c048 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 22 14:58:49 2021 +0000 Merge remote-tracking branch 'richardgl/40476' into tor-browser-78.11.0esr-10.5-1 netwerk/protocol/http/nsCORSListenerProxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40311'
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit b3629abd0fcd0a1b96c13e180031d3fe3f772260 Merge: 80e97dc dac2b35 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:53:26 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40311' projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40313'
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 2d69c715c1fdaa4099cf0d4bc37ba36c58d68f83 Merge: b3629ab 8ec1d47 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:57:18 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40313' rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 8ec1d476c8a3b3e8a67a33964bb4e67f494efbf2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 15:14:52 2021 +0200 Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6d2a774..9a9339f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -351,7 +351,7 @@ targets: wget $OPENJDK_URL/openjdk-8-jre-headless_$JDK_VERSION.deb echo 92b4f8fb77d793a86e0b03b3b0750592b40a26a5d75956d10dd984a7b3aad4c9 openjdk-8-jdk-headless_$JDK_VERSION.deb | sha256sum -c echo 84bf52b6cce20ead08b0d5b9fd9b81b4aa3da385ca951b313fe11d5cb1aa4d17 openjdk-8-jre-headless_$JDK_VERSION.deb | sha256sum -c - dpkg -i ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb + apt-get install -y -q ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4)
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit dac2b35d64153c183165d0955b0e42f502798794 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 12:14:26 2021 +0200 Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4) --- projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0d8d88c..bf3b8a4 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,8 +58,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/android-components.git - #git_hash: v75.0.22 + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: v90.0.7 #tag_gpg_id: 0 var: container: diff --git a/projects/application-services/config b/projects/application-services/config index efbe321..93f8f5c 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -94,7 +94,7 @@ input_files: steps: list_toolchain_updates: - #git_hash: 'v74.0.1' + git_hash: 'v77.0.2' input_files: [] var: container: diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks index 69c232c..b028d10 100644 --- a/projects/application-services/list_toolchain_updates_checks +++ b/projects/application-services/list_toolchain_updates_checks @@ -74,7 +74,7 @@ check_update_needed sqlcipher "$needed" "$current" # android-gradle-plugin read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_gradle_plugin_version\\s=\\s'([^']*)'/) { print $1; exit; } @@ -86,7 +86,7 @@ check_update_needed android-gradle-plugin "$needed" "$current" # android-components read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { print $1; exit; } diff --git a/projects/fenix/config b/projects/fenix/config index a25aaa0..296ab7c 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -56,8 +56,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/fenix.git - #git_hash: v89.1.1 + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: v90.0.0-beta.4 tag_gpg_id: 0 input_files: [] var: diff --git a/projects/geckoview/config b/projects/geckoview/config index 0695277..c46901e 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - #git_url: https://github.com/mozilla/gecko-dev.git - # 89.0b10 - #git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + git_url: https://github.com/mozilla/gecko-dev.git + # 90.0b9 + git_hash: 92485800ccb404788bfd215e59c3850b314d3905 tag_gpg_id: 0 input_files: [] var:

1 0

[torbutton/master] Bug 40039: added min-height rule to Tor Circuit heading so onion icon is not cropped
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 0e79e26f682c87fbe26a42c021d9a4f72e2ae8aa Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 17 15:47:07 2021 +0200 Bug 40039: added min-height rule to Tor Circuit heading so onion icon is not cropped --- chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index 35c786ec..6f132db8 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -15,6 +15,7 @@ and lines drawn between them to represent Tor network inter-relay connections. background-repeat: no-repeat; background-position: 0 50%; background-size: 16px auto; + min-height: 16px; -moz-context-properties: fill, fill-opacity; fill: currentColor; /* icon indent + 16px icon width + 6px description margin

1 0

[torbutton/master] Merge remote-tracking branch 'richardgl/40039_rev'
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit d841a699f7048607230f7b15036f9a8c6a055527 Merge: cc73f75d 0e79e26f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 17 15:54:36 2021 +0000 Merge remote-tracking branch 'richardgl/40039_rev' chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Update/refresh torbrowser keyring
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 80e97dcd720810b66b2ce21d61c111e96541ffbc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:40:39 2021 +0000 Update/refresh torbrowser keyring --- keyring/torbrowser.gpg | Bin 12262 -> 14048 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index b23cae3..31c3596 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ

1 0

[tor-browser-build/master] Update/refresh torbutton keyring
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit f10b12c344a646b76238fd228f6799f249245b2b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:38:48 2021 +0000 Update/refresh torbutton keyring --- keyring/torbutton.gpg | Bin 140731 -> 144154 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index a925b14..32e6d4c 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Bug 40475: Include clearing CORS preflight cache
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 9c9884c27d5a1ee93dde9d78eda6df5707e816f8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Jun 6 20:32:23 2021 +0000 Bug 40475: Include clearing CORS preflight cache --- netwerk/protocol/http/nsCORSListenerProxy.cpp | 5 +++++ netwerk/protocol/http/nsCORSListenerProxy.h | 1 + netwerk/protocol/http/nsHttpHandler.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index 76870e6cea3f..d9b658af881b 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -346,6 +346,11 @@ void nsCORSListenerProxy::Shutdown() { sPreflightCache = nullptr; } +/* static */ +void nsCORSListenerProxy::Clear() { + sPreflightCache->Clear(); +} + nsCORSListenerProxy::nsCORSListenerProxy(nsIStreamListener* aOuter, nsIPrincipal* aRequestingPrincipal, bool aWithCredentials) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.h b/netwerk/protocol/http/nsCORSListenerProxy.h index 8c0df2e0ff28..3f76be33f209 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.h +++ b/netwerk/protocol/http/nsCORSListenerProxy.h @@ -54,6 +54,7 @@ class nsCORSListenerProxy final : public nsIStreamListener, NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER static void Shutdown(); + static void Clear(); [[nodiscard]] nsresult Init(nsIChannel* aChannel, DataURIHandling aAllowDataURI); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index d5e2c61dbec9..c6cb95ca7fcc 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -10,6 +10,7 @@ #include "prsystem.h" #include "AltServiceChild.h" +#include "nsCORSListenerProxy.h" #include "nsError.h" #include "nsHttp.h" #include "nsHttpHandler.h" @@ -2290,6 +2291,7 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, mAltSvcCache->ClearAltServiceMappings(); } } + nsCORSListenerProxy::Clear(); } else if (!strcmp(topic, NS_NETWORK_LINK_TOPIC)) { nsAutoCString converted = NS_ConvertUTF16toUTF8(data); if (!strcmp(converted.get(), NS_NETWORK_LINK_DATA_CHANGED)) {

1 0