- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'phw/bug_40212'
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 421a91f0e9d278162028a4b42c53691cdc8d4be8 Merge: 73e5824 497972c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 10:13:59 2020 +0000 Merge remote-tracking branch 'phw/bug_40212' projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Add new default obfs4 bridge.
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 497972c69e87897d7b83c15d78e359794f9bad4f Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Nov 4 10:18:29 2020 -0800 Add new default obfs4 bridge. Louis-Philippe Véronneau generously set up this bridge for us. David Goulet mentions that this bridge runs in the same autonomous system (and data centre) as his default bridge. This patch partially fixes tpo/applications/tor-browser#40212 --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index f3202c0..c414212 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,6 +16,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 209.148.46.65:443 pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser/tor-browser-83.0b1-10.5-1] Bug 1673237 - Always allow SVGs on about: pages r=acat, tjr, emilio
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit c1280b7bf276f867f8cb0725d62dbe2f63704966 Author: sanketh <me(a)snkth.com> Date: Tue Nov 3 17:34:20 2020 +0000 Bug 1673237 - Always allow SVGs on about: pages r=acat,tjr,emilio - Updated layout/svg/tests/test_disabled.html to ensure that this doesn't allow rendering SVGs on about:blank and about:srcdoc. Differential Revision: https://phabricator.services.mozilla.com/D95139 --- dom/base/nsNodeInfoManager.cpp | 18 ++++++++++------- layout/svg/tests/file_disabled_iframe.html | 31 +++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dom/base/nsNodeInfoManager.cpp b/dom/base/nsNodeInfoManager.cpp index b0534b661a23..8bc6b0ba2bd6 100644 --- a/dom/base/nsNodeInfoManager.cpp +++ b/dom/base/nsNodeInfoManager.cpp @@ -352,9 +352,12 @@ void nsNodeInfoManager::RemoveNodeInfo(NodeInfo* aNodeInfo) { MOZ_ASSERT(ret, "Can't find mozilla::dom::NodeInfo to remove!!!"); } -static bool IsSystemOrAddonPrincipal(nsIPrincipal* aPrincipal) { +static bool IsSystemOrAddonOrAboutPrincipal(nsIPrincipal* aPrincipal) { return aPrincipal->IsSystemPrincipal() || - BasePrincipal::Cast(aPrincipal)->AddonPolicy(); + BasePrincipal::Cast(aPrincipal)->AddonPolicy() || + // NOTE: about:blank and about:srcdoc inherit the principal of their + // parent, so aPrincipal->SchemeIs("about") returns false for them. + aPrincipal->SchemeIs("about"); } bool nsNodeInfoManager::InternalSVGEnabled() { @@ -375,17 +378,18 @@ bool nsNodeInfoManager::InternalSVGEnabled() { } // We allow SVG (regardless of the pref) if this is a system or add-on - // principal, or if this load was requested for a system or add-on principal - // (e.g. a remote image being served as part of system or add-on UI) + // principal or about: page, or if this load was requested for a system or + // add-on principal or about: page (e.g. a remote image being served as part + // of system or add-on UI or about: page) bool conclusion = - (SVGEnabled || IsSystemOrAddonPrincipal(mPrincipal) || + (SVGEnabled || IsSystemOrAddonOrAboutPrincipal(mPrincipal) || (loadInfo && (loadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_IMAGE || loadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_OTHER) && - (IsSystemOrAddonPrincipal(loadInfo->GetLoadingPrincipal()) || - IsSystemOrAddonPrincipal(loadInfo->TriggeringPrincipal())))); + (IsSystemOrAddonOrAboutPrincipal(loadInfo->GetLoadingPrincipal()) || + IsSystemOrAddonOrAboutPrincipal(loadInfo->TriggeringPrincipal())))); mSVGEnabled = Some(conclusion); return conclusion; } diff --git a/layout/svg/tests/file_disabled_iframe.html b/layout/svg/tests/file_disabled_iframe.html index 6feae3024730..55eda75fdefb 100644 --- a/layout/svg/tests/file_disabled_iframe.html +++ b/layout/svg/tests/file_disabled_iframe.html @@ -48,5 +48,34 @@ t.firstChild.firstChild.textContent = "1&2<3>4\xA0"; is(t.innerHTML, '<svg><style>1&2<3>4 \u003C/style></svg>'); - SimpleTest.finish(); + // + // Tests for Bug 1673237 + // + + // This test fails if about:blank renders SVGs + t.innerHTML = null; + var iframe = document.createElement("iframe"); + iframe.setAttribute("src", "about:blank") + t.appendChild(iframe); + iframe.appendChild(document.createElementNS("http://www.w3.org/2000/svg", "svg:svg")); + iframe.firstChild.textContent = "<foo>"; + is(iframe.innerHTML, "<svg:svg><foo></svg:svg>"); + + // This test fails if about:blank renders SVGs + var win = window.open("about:blank"); + win.document.body.appendChild(document.createElementNS("http://www.w3.org/2000/svg", "svg:svg")) + win.document.body.firstChild.textContent = "<foo>"; + is(win.document.body.innerHTML, "<svg:svg><foo></svg:svg>"); + win.close(); + + // This test fails if about:srcdoc renders SVGs + t.innerHTML = null; + iframe = document.createElement("iframe"); + iframe.srcdoc = "<svg:svg></svg:svg>"; + iframe.onload = function() { + iframe.contentDocument.body.firstChild.textContent = "<foo>"; + is(iframe.contentDocument.body.innerHTML, "<svg:svg><foo></svg:svg>"); + SimpleTest.finish(); + } + t.appendChild(iframe); </script>

1 0

[tor-browser-build/master] Mobile translations update
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 73e5824dd6286db77d20ff9d28218b65d37a6521 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 08:57:32 2020 +0000 Mobile translations update --- projects/tba-translation/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 3ab638c..b2def42 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 273c5751b135f9d1f6a266b8f66bc43c92976fd9 +git_hash: 96c5386d045d7413c4e208337aed7465fb0a666d version: '[% c("abbrev") %]'

1 0

[tor-browser-build/maint-10.5a3] Mobile translations update
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit e42770e2c1a0cd62a29c5a80e189387ee824822f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 08:57:32 2020 +0000 Mobile translations update --- projects/tba-translation/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 3ab638c..b2def42 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 273c5751b135f9d1f6a266b8f66bc43c92976fd9 +git_hash: 96c5386d045d7413c4e208337aed7465fb0a666d version: '[% c("abbrev") %]'

1 0

[tor-browser-build/maint-10.5a3] Revert "Bug 40127: Add additional libraries the --debug build misses"
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 37166570d0683d1621438132e752c575f5423c07 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 08:42:31 2020 +0000 Revert "Bug 40127: Add additional libraries the --debug build misses" This reverts commit 127992a0c5d2981f63ebaf1eb488caa3ae3b3403. --- projects/android-components/gradle-dependencies-list.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index a9ce927..133806d 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -630,7 +630,6 @@ c219d697fa9c8f243d8f6e347499b6d4e8af1d0cac4bbc7b3907d338a2024c13 | https://repo. 24d81621f82ac29fcdd9a74116031f5907a2343158e616f4573bbfa2434ae0d5 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.5.0/jn… 10569e3622e974d3e66255ba85923c125d84fa257ef2543d8ac1c658d9ebcd10 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.5.0/jn… c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.2.0/jna-5.2.0.a… -0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.2.0/jna-5.2.0.j… aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.2.0/jna-5.2.0.p… 12ef4a3c2ea685c9c816caa6a77ae8f17bb7727d8460f249925409acda270101 | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.5.0/jna-5.5.0.a… b308faebfe4ed409de8410e0a632d164b2126b035f6eacff968d3908cafb4d9e | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.5.0/jna-5.5.0.j… @@ -836,7 +835,6 @@ db9a950ba9a190d04611e69b1732221ba7035c2796b7d8b6afa69840711cd0ee | https://repo. 64c6d2b53e52eb65e26c6b828d848d8ceab30473c3511bbd1c116cf9799bc127 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… ad426ec76f52b1dcdf200f55495aea9a2d2796811884e8c4b514645061cf59f3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 9e82078f4dafe1cc2e28f308a317912a45c6a88fc83c51db6ba8cb0ea0829ef1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 51be6791ac5aed9718a58b297c8c9081c9b704dfd72a849c4754a40da55ee236 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… f02d46222e4591a9e16b6bacce5dc6606c33b38912d916daa41d428ef6703020 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 5ae9e4dd4e81c0bfc92b0d760651815792793be9ec4f8a2d308b4aea6adbb23a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin…

1 0

[tor-browser-build/maint-10.5a3] Revert "Bug 40127: Add additional libraries the dependency fetching misses"
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 37de319ee0b35f691fcbb9048683e91117e57a46 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 08:41:58 2020 +0000 Revert "Bug 40127: Add additional libraries the dependency fetching misses" This reverts commit 098ca6fa8fcce19bafeb02f4d3ac97707b9a5de5. --- projects/fenix/gradle-dependencies-list.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 8013616..07adc7f 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -538,7 +538,6 @@ ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcent 24d81621f82ac29fcdd9a74116031f5907a2343158e616f4573bbfa2434ae0d5 | https://jcenter.bintray.com/net/java/dev/jna/jna-platform/5.5.0/jna-platfor… 10569e3622e974d3e66255ba85923c125d84fa257ef2543d8ac1c658d9ebcd10 | https://jcenter.bintray.com/net/java/dev/jna/jna-platform/5.5.0/jna-platfor… c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar -0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.2.0/jna-5.2.0.j… aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom 12ef4a3c2ea685c9c816caa6a77ae8f17bb7727d8460f249925409acda270101 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.5.0/jna-5.5.0.aar b308faebfe4ed409de8410e0a632d164b2126b035f6eacff968d3908cafb4d9e | https://jcenter.bintray.com/net/java/dev/jna/jna/5.5.0/jna-5.5.0.jar @@ -774,7 +773,6 @@ db9a950ba9a190d04611e69b1732221ba7035c2796b7d8b6afa69840711cd0ee | https://jcent 6f7523ea8a56d7f12d11a004cfe5a4577bfba3ed6c84cc5ac48b72d54975552c | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… ad426ec76f52b1dcdf200f55495aea9a2d2796811884e8c4b514645061cf59f3 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… 9e82078f4dafe1cc2e28f308a317912a45c6a88fc83c51db6ba8cb0ea0829ef1 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… -6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 51be6791ac5aed9718a58b297c8c9081c9b704dfd72a849c4754a40da55ee236 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-core/1… f02d46222e4591a9e16b6bacce5dc6606c33b38912d916daa41d428ef6703020 | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-debug/… 5ae9e4dd4e81c0bfc92b0d760651815792793be9ec4f8a2d308b4aea6adbb23a | https://jcenter.bintray.com/org/jetbrains/kotlinx/kotlinx-coroutines-debug/…

1 0

[tor-browser-build/maint-10.5a3] Revert "Bug 40127: Update GeckoView 83 dependencies"
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 96a01086567a40703c0c18552dd6f5055e84c811 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 08:43:40 2020 +0000 Revert "Bug 40127: Update GeckoView 83 dependencies" This reverts commit 30d17c8b8b8fab2dcdc3e0ae78335f9045683281. --- projects/geckoview/config | 6 +++--- projects/geckoview/gradle-dependencies-list.txt | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index e1608ed..9b33603 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,8 +8,8 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 83.0b1 - torbrowser_branch: 10.5 + geckoview_version: 82.0 + torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential @@ -25,7 +25,7 @@ var: container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 4 + gradle_dependencies_version: 3 steps: merge_aars: diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index 805b1aa..96d2e45 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -330,10 +330,6 @@ e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8 | https://maven a000041f5a1f79283c5175e1bb60cf3683780f401c6a9d34fbe9751253fa6ff9 | https://maven.google.com/androidx/localbroadcastmanager/localbroadcastmanag… b23b527b2bac870c4a7451e6982d7132e413e88d7f27dbeb1fc7640a720cd9ee | https://maven.google.com/androidx/media/media/1.0.0/media-1.0.0.aar 9cdfe5f7849069ad84dc4fb0407b3677fb8c22d3d66fd2b8fdb8dec8c5dc7411 | https://maven.google.com/androidx/media/media/1.0.0/media-1.0.0.pom -fb8115694b1731c23c1bbb628f5baaee37a8f3b50d69a7733b55278e101e1488 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/m… -5056524d08992ebe1b3654c5b0db125497b930f177fa385952450e3b74d49bf2 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/m… -c01700091072e0ff5d8ec2d00eac6b8f96ea18646080425e9ce3c6a7b5f66e33 | https://maven.google.com/androidx/multidex/multidex/2.0.0/multidex-2.0.0.aar -4298222d2a10cf6e82f32650b5a716a8714899f3ef7d05d58ddaafc32ae2d614 | https://maven.google.com/androidx/multidex/multidex/2.0.0/multidex-2.0.0.pom 6054ee0184ba0ffd66dc825e060e8c9bf2f6c2ea54336cf3bef15c575037a743 | https://maven.google.com/androidx/palette/palette/1.0.0/palette-1.0.0.aar 85c5599135a789cfd5f99656f9e8240c9a727f72b2caaab60943aa32bb842771 | https://maven.google.com/androidx/palette/palette/1.0.0/palette-1.0.0.pom ea9fde25606eb456210ffe9f7e51048abd776b55a34c0cc6608282b5699122d1 | https://maven.google.com/androidx/preference/preference/1.0.0/preference-1.… @@ -483,14 +479,6 @@ c7786e12c89c77e4daea2ebb991491821f90364cd5e06a02b56371a42084b3c0 | https://maven 7031d2d09683996ac126074be3de6df9b3de80f7e0f10b80a6e8754f69c80028 | https://maven.google.com/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom ebec9d8e0a140b376aade276b08572cb1f8cf954249b469bee6dce6fd5a45cd4 | https://maven.google.com/com/android/tools/sdklib/26.4.2/sdklib-26.4.2.jar 768b365f2486e344d012d5b4b9b195fde8bfb442c23dca89d258a7766cdba5c8 | https://maven.google.com/com/android/tools/sdklib/26.4.2/sdklib-26.4.2.pom -dd0980edf729e0d346e2b58e70801dc237c1aed0c7ab274fa3f1c8c8efc64cc7 | https://maven.google.com/com/google/android/gms/play-services-base/17.0.0/p… -c30489d38be5d41e19272f6aa47d6c43de85034500bcb1864b79381c9634d924 | https://maven.google.com/com/google/android/gms/play-services-base/17.0.0/p… -d324a1785bbc48bfe3639fc847cfd3cf43d49e967b5caf2794240a854557a39c | https://maven.google.com/com/google/android/gms/play-services-basement/17.0… -ffe9295d9eb2ec2d784bb4c3634f6a10175224d2111332fa2735320b52a24b66 | https://maven.google.com/com/google/android/gms/play-services-basement/17.0… -85ca0babd7fa3aa3454203105a32836615ac44c59c59e2452bb548c873c4ca44 | https://maven.google.com/com/google/android/gms/play-services-fido/18.1.0/p… -feb4ebb1ddb76dc18ee9e6028205ac226a70d40247fcccaca092303c68f8b59d | https://maven.google.com/com/google/android/gms/play-services-fido/18.1.0/p… -2e6d1738b73647f3fe7a038b9780b97717b3746eae258009197e36e7bf3112a5 | https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/… -fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/… 7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc | https://maven.google.com/com/google/android/material/material/1.0.0/materia… c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | https://maven.google.com/com/google/android/material/material/1.0.0/materia… ece749bdea04522b04a7b0cfd391026f88808c4d0103b3bede8b42baf0b7d677 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.1/apilint-0.3…

1 0

[tor-browser-build/maint-10.5a3] Revert "Bug 40126: Update toolchains for Fenix 83"
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 800e4e2d925938a7481e04d253f84fe2c98e79be Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 08:44:23 2020 +0000 Revert "Bug 40126: Update toolchains for Fenix 83" This reverts commit 240fa7828559df3c03c9edd806cafd904706bcf3. --- projects/android-toolchain/config | 6 +++--- projects/cbindgen/config | 6 +++--- projects/llvm-project/config | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5268319..b8ef898 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 29.0.2 +version: 29.0.3 version_old: 28.0.3 var: container: @@ -34,7 +34,7 @@ input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' name: build_tools - sha256sum: 1e9393cbfd4a4b82e30e7f55ab38db4a5a3259db93d5821c63597bc74522fa08 + sha256sum: 5652d8cd5eaaade0b853bfe0ae6cbfa0706a6f70a0ebb25ca24a6f484ec3d855 - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip' name: build_tools_old sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a @@ -46,7 +46,7 @@ input_files: # SDK version/build-tools version. - URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip' name: platform_tools - sha256sum: 633b6dfa245f5dc58d15da9ead655bcd14de5784196ec0f0dc7e37a5acb61be4 + sha256sum: 49e676ec90bff1f7d7dfe4fb7d0ab78e14fa8fb06a8dccca2ef57a1bc29497a0 - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip' name: android_sdk_tools sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 420ce5d..1258b4f 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -14,9 +14,9 @@ var: targets: android: var: - cbindgen_version: 0.15.0 - cbindgen_hash: 83b3be9f884697a51f8717af8b5498866a81e62e - cbindgen_vendor_hash: e5b843e9f51d93bc7dafdc11492fe4f5645b7a2c2aba02c473c0a81da28b961c + cbindgen_version: 0.14.3 + cbindgen_hash: cc2876f709808a52d132a5f84e53ca1964eb92db + cbindgen_vendor_hash: cc47db55a1c937e7bcd1cbd8664964656a4922bc35175d95c4015d452f2dcb2b input_files: - project: container-image diff --git a/projects/llvm-project/config b/projects/llvm-project/config index cf81743..1574177 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 11.0.0 -git_hash: 176249bd6732a8044d457092ed932768724a6f06 +version: 11.0.0-rc3 +git_hash: 8aca41f39c207b6f9efe2e448986d109892072ad git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

1 0

[tor-browser-build/maint-10.5a3] Revert "Bug 40126: Bump Node to 10.22.1 for mozilla83"
by gk＠torproject.org 10 Nov '20

10 Nov '20

commit 78030f34ddfa43c286e3b484bd87460655b3756e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 10 08:43:55 2020 +0000 Revert "Bug 40126: Bump Node to 10.22.1 for mozilla83" This reverts commit 1810b4bbf66b8a8516fa4c27364adc830c341616. --- projects/node/build | 2 +- projects/node/config | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/projects/node/build b/projects/node/build index 4a437be..8cc8ea5 100644 --- a/projects/node/build +++ b/projects/node/build @@ -11,7 +11,7 @@ [% END -%] distdir=/var/tmp/dist/[% project %] tar -xf [% c('input_files_by_name/node') %] -cd node-v[% c('version') %] +cd node-[% c('version') %] ./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] diff --git a/projects/node/config b/projects/node/config index 55f8965..b3534f4 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,18 +1,10 @@ # vim: filetype=yaml sw=2 -version: '[% c("var/node_version") %]' +version: v10.21.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: - node_version: 10.21.0 - node_hash: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b container: use_container: 1 -targets: - android: - var: - node_version: 10.22.1 - node_hash: f47f4725dcae137b26f8e2a7d0ab2c2c7f1f47e4f96834e6a9242f157132255f - input_files: - project: container-image - project: binutils @@ -21,6 +13,6 @@ input_files: - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' - - URL: 'https://nodejs.org/dist/v[% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz' - sha256sum: '[% c("var/node_hash") %]' + - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz' + sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b name: node

1 0