October 2020 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40117: Export MOZ_BUILD_DATE in android-components
by sysrqb＠torproject.org 02 Oct '20

02 Oct '20

commit b547847cedd3e0ddf5cbd2d50cce459320b73f9a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 2 16:20:54 2020 +0000 Bug 40117: Export MOZ_BUILD_DATE in android-components --- projects/android-components/build | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/projects/android-components/build b/projects/android-components/build index e0d727a..acd920f 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -6,6 +6,10 @@ builddir=/var/tmp/build/[% project %] mkdir $distdir/[% project %] mkdir /var/tmp/build +cat > get-moz-build-date << "EOF" +[% INCLUDE "get-moz-build-date" %] +EOF + [% IF !c("var/fetch_gradle_dependencies") %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] @@ -44,6 +48,13 @@ patch -p1 < $rootdir/40085.patch export LANG=C.UTF-8 patch -p1 < $rootdir/mavenLocal.patch + eval $(perl $rootdir/get-moz-build-date [% pc("fenix", "var/copyright_year") %] [% pc("fenix", "var/torbrowser_version") %]) + if [ -z $MOZ_BUILD_DATE ] + then + echo "MOZ_BUILD_DATE is not set" + exit 1 + fi + gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" gradle $gradle_args assembleGeckoBeta -x lint

1 0

[tor-browser-build/master] Bug 40057: Add localized strings
by sysrqb＠torproject.org 02 Oct '20

02 Oct '20

commit 26908460432eb06e0d812b6c2624f1b78c0dc08a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 2 19:14:37 2020 +0000 Bug 40057: Add localized strings --- projects/fenix/build | 8 ++++++++ projects/fenix/config | 3 +++ projects/tba-translation/config | 2 +- rbm.conf | 30 ++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/projects/fenix/build b/projects/fenix/build index 0613b2f..f1536f1 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -27,6 +27,7 @@ EOF cp -rf $distdir/application-services/maven/org $gradle_repo tar -C $distdir -xf [% c('input_files_by_name/android-components') %] cp -rf $distdir/android-components/maven/org $gradle_repo + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -39,6 +40,13 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ [% IF c("var/fetch_gradle_dependencies") %] $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint [% ELSE %] + # Add our localized strings + [% FOREACH lang = c('var/locales_mobile'); + SET lang = tmpl(lang); %] + # Copy our torbrowser_strings.xml at the right place + cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ + [% END %] + # Prepare Glean dependencies for offline build tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 # We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding diff --git a/projects/fenix/config b/projects/fenix/config index 4d9c936..2ecc2be 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -43,6 +43,9 @@ input_files: - name: python project: python enable: '[% !c("var/fetch_gradle_dependencies") %]' + - name: tba-translation + project: tba-translation + enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 520f570..a7df3d5 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: e93401f698cca39971395625e1f8de54b978ab88 +git_hash: 1305ed3b598574c3fc52caaefc97a845260caa8c version: '[% c("abbrev") %]' diff --git a/rbm.conf b/rbm.conf index b6e049c..8a2c8cd 100644 --- a/rbm.conf +++ b/rbm.conf @@ -98,6 +98,36 @@ var: - vi - zh-CN - zh-TW + locales_mobile: + - ar + - ca + - cs + - da + - de + - el + - es-rAR + - es-rES + - fa + - fr + - ga-rIE + - hu + - is + - it + - ja + - ka + - ko + - lt + - nl + - pl + - pt-rBR + - ro + - ru + - sv-rSE + - th + - tr + - vi + - zh-rCN + - zh-rTW sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]'

1 0

[tor-browser-build/master] Bug 40057: Add iw (he) and in (id) locales, too
by sysrqb＠torproject.org 02 Oct '20

02 Oct '20

commit 97225036594658c2b5aee8c460e2011813c7021b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 2 21:59:07 2020 +0000 Bug 40057: Add iw (he) and in (id) locales, too I missed them on the server-side. --- projects/tba-translation/config | 2 +- rbm.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tba-translation/config b/projects/tba-translation/config index a7df3d5..3ab638c 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: 1305ed3b598574c3fc52caaefc97a845260caa8c +git_hash: 273c5751b135f9d1f6a266b8f66bc43c92976fd9 version: '[% c("abbrev") %]' diff --git a/rbm.conf b/rbm.conf index 8a2c8cd..23de464 100644 --- a/rbm.conf +++ b/rbm.conf @@ -111,8 +111,10 @@ var: - fr - ga-rIE - hu + - in - is - it + - iw - ja - ka - ko

1 0

[Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 3 commits: Bug 40013: Add option do overwrite timestamp in extension version
by Matthew Finkel 02 Oct '20

02 Oct '20

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components Commits: abf37979 by Georg Koppen at 2020-10-02T16:11:34+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 81be6dd2 by Alex Catarineu at 2020-10-02T21:12:32+02:00 Bug 34377: Port padlock states for .onion services - - - - - b9984e10 by Matthew Finkel at 2020-10-02T21:49:53+00:00 Merge remote-tracking branch 'acatgl/34377' into android-components-57.0.6-10.0-2 - - - - - 9 changed files: - build.gradle - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt - + components/ui/icons/src/main/res/drawable/mozac_ic_onion.xml Changes: ===================================== build.gradle ===================================== @@ -126,7 +126,13 @@ subprojects { rename { 'manifest.json' } into extDir - def values = ['version': rootProject.ext.config.componentsVersion + "." + new Date().format('MMddHHmmss')] + def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE') + // MOZ_BUILD_DATE is in the YYYYMMDDHHMMSS format. Thus, we only use a + // substring of it if it is available. + def values = ['version': rootProject.ext.config.componentsVersion + "." + + (systemEnvBuildDate != null ? + systemEnvBuildDate.substring(4) : + new Date().format('MMddHHmmss'))] inputs.properties(values) expand(values) } ===================================== components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt ===================================== @@ -476,6 +476,7 @@ class DisplayToolbar internal constructor( @ColorInt val color = when (siteSecurity) { Toolbar.SiteSecurity.INSECURE -> colors.securityIconInsecure Toolbar.SiteSecurity.SECURE -> colors.securityIconSecure + Toolbar.SiteSecurity.ONION -> colors.securityIconSecure } if (color == Color.TRANSPARENT) { views.securityIndicator.clearColorFilter() ===================================== components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt ===================================== @@ -43,6 +43,11 @@ internal class SiteSecurityIconView @JvmOverloads constructor( View.mergeDrawableStates(drawableState, intArrayOf(R.attr.state_site_secure)) drawableState } + SiteSecurity.ONION -> { + val drawableState = super.onCreateDrawableState(extraSpace + 1) + View.mergeDrawableStates(drawableState, intArrayOf(R.attr.state_site_onion)) + drawableState + } } } } ===================================== components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml ===================================== @@ -3,6 +3,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ac="http://schemas.android.com/apk/res-auto"> + <item + android:drawable="@drawable/mozac_ic_onion" + ac:state_site_onion="true" /> <item android:drawable="@drawable/mozac_ic_lock" ac:state_site_secure="true" /> ===================================== components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml ===================================== @@ -27,6 +27,10 @@ <attr name="state_site_secure" format="boolean"/> </declare-styleable> + <declare-styleable name="BrowserToolbarSiteOnionState"> + <attr name="state_site_onion" format="boolean"/> + </declare-styleable> + <declare-styleable name="ActionContainer"> <attr name="actionContainerItemSize" format="dimension" /> </declare-styleable> ===================================== components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt ===================================== @@ -385,6 +385,7 @@ interface Toolbar { enum class SiteSecurity { INSECURE, SECURE, + ONION, } /** ===================================== components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt ===================================== @@ -16,6 +16,7 @@ import mozilla.components.concept.toolbar.Toolbar import mozilla.components.concept.toolbar.Toolbar.SiteTrackingProtection import mozilla.components.feature.toolbar.internal.URLRenderer import mozilla.components.lib.state.ext.flowScoped +import mozilla.components.support.ktx.kotlin.isOnionUrl import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged /** @@ -64,7 +65,11 @@ class ToolbarPresenter( toolbar.displayProgress(tab.content.progress) toolbar.siteSecure = if (tab.content.securityInfo.secure) { - Toolbar.SiteSecurity.SECURE + if (tab.content.url.isOnionUrl()) { + Toolbar.SiteSecurity.ONION + } else { + Toolbar.SiteSecurity.SECURE + } } else { Toolbar.SiteSecurity.INSECURE } ===================================== components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt ===================================== @@ -115,6 +115,15 @@ fun String.tryGetHostFromUrl(): String = try { this } +/** + * Returns whether the string is an .onion URL. + */ +fun String.isOnionUrl(): Boolean = try { + URL(this).host.endsWith(".onion") +} catch (e: MalformedURLException) { + false +} + /** * Compares 2 URLs and returns true if they have the same origin, * which means: same protocol, same host, same port. ===================================== components/ui/icons/src/main/res/drawable/mozac_ic_onion.xml ===================================== @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="m12.0215,20.5903c0,0 0,-1.2728 0,-1.2728 4.0319,-0.0117 7.2965,-3.283 7.2965,-7.3177 0,-4.0345 -3.2646,-7.3058 -7.2965,-7.3175 0,0 0,-1.2728 0,-1.2728 4.7348,0.0119 8.5691,3.8529 8.5691,8.5903 0,4.7377 -3.8342,8.5789 -8.5691,8.5906 0,0 0,0 0,0m0,-4.4551c2.2741,-0.012 4.1148,-1.8582 4.1148,-4.1355 0,-2.277 -1.8407,-4.1233 -4.1148,-4.1352 0,0 0,-1.2726 0,-1.2726 2.9773,0.0116 5.3877,2.4278 5.3877,5.4078 0,2.9802 -2.4103,5.3964 -5.3877,5.408 0,0 0,-1.2725 0,-1.2725m0,-6.3616c1.2199,0.0116 2.2057,1.0033 2.2057,2.2261 0,1.2231 -0.9858,2.2147 -2.2057,2.2264 0,0 0,-4.4525 0,-4.4525M1.5,11.9997C1.5,17.799 6.2008,22.5 12,22.5 17.799,22.5 22.5,17.799 22.5,11.9997 22.5,6.2008 17.799,1.5 12,1.5 6.2008,1.5 1.5,6.2008 1.5,11.9997c0,0 0,0 0,0" + android:strokeWidth="1.49999" + android:fillColor="@color/mozac_ui_icons_fill"/> +</vector> View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40085: Make classes.dex reproducible
by sysrqb＠torproject.org 02 Oct '20

02 Oct '20

commit 3cddd2eec63aa7cea5e43d121317de66d03c6f82 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 2 08:51:54 2020 +0000 Bug 40085: Make classes.dex reproducible Updating glean_parser to 1.28.6 fixes the remaining part of #40086 as well. --- projects/android-components/40085.patch | 22 ++++++++++++++++++++++ projects/android-components/build | 3 +++ projects/android-components/config | 7 +++++-- .../gradle-dependencies-list.txt | 13 ++++++------- projects/fenix/config | 6 ++++-- projects/fenix/gradle-dependencies-list.txt | 12 ++++++------ 6 files changed, 46 insertions(+), 17 deletions(-) diff --git a/projects/android-components/40085.patch b/projects/android-components/40085.patch new file mode 100644 index 0000000..eb1a29d --- /dev/null +++ b/projects/android-components/40085.patch @@ -0,0 +1,22 @@ +From efa26eaf4fba939c3e43b659e5c77a57b22b270a Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Fri, 2 Oct 2020 08:48:49 +0000 +Subject: [PATCH] Update glean for tor-browser-build#40085 + + +diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt +index f4063f7ad..245d14447 100644 +--- a/buildSrc/src/main/java/Dependencies.kt ++++ b/buildSrc/src/main/java/Dependencies.kt +@@ -29,7 +29,7 @@ object Versions { + + const val mozilla_appservices = "61.0.13" + +- const val mozilla_glean = "32.1.1" ++ const val mozilla_glean = "32.4.1" + + const val material = "1.1.0" + const val nearby = "17.0.0" +-- +2.28.0 + diff --git a/projects/android-components/build b/projects/android-components/build index 43016b0..e0d727a 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -27,6 +27,9 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd $builddir-[% c('version') %] patch -p1 < $rootdir/git.patch +# We need to pick up a newer glean_parser until an updates glean lands in +# android-components. +patch -p1 < $rootdir/40085.patch [% IF c("var/fetch_gradle_dependencies") %] # XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target # results in some missing dependencies for yet unknown reasons. Thus, we use diff --git a/projects/android-components/config b/projects/android-components/config index 1093a07..0424b03 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -12,9 +12,11 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 3 + gradle_dependencies_version: 4 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 + # Overwrite `glean_parser` for now to fix #40085. + glean_parser: 1.28.6 targets: nightly: @@ -42,6 +44,7 @@ input_files: - filename: git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' + - filename: 40085.patch - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 - sha256sum: 69234aa1ae38fd5dda4de71bd5e536795073703c3ed5bb994b9b8485bd7a55dc + sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4 enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index c0db10e..ff3b587 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -434,13 +434,12 @@ e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven 41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… -99c418afb9003150afea443057f0c859868045279d356dd5b808baf136b7dc0e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -8e5b9b3ba3570ecf5d22ea08f762465bef048271dab6fd7a07f5a51f0eeaff33 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -ab514359d7686282b7a7c8463e81237ff98460a23df534a6c9663b463e65423f | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -f724de3fc1c37d8ecb4bbb7957dd67a489d0321da71eebb6b8d605ec4a57755a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -13739196d0331ece885a74189c80feb034d746283b78afa8a8ea2620a7926d7b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/21.3.0/glean-2… -5b078e136164082be6d49afa0d87f849c7b9f65e21125fa57056cd630756279b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-3… -64371d71a4fb11d63d2a5ff60149c94c1d0e0b909de09ffe199f6872663976b2 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-3… +acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +a84340369fdbb4c38ea0ce2e17ceac1c6a596cebb9818885276eec8b611e4d4b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +d0e02f22fbd35b15e50e043ca0462fac6b2b78ac4968b324bd1431c8f85878df | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-3… +79d0b2e02aa86ef38577edb2befa25280ce58fcbae23a1ffd1db80147510aa86 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-3… 8f1fec72b91a71ea39ec39f5f778c4d1124b6b097c6d55b3a50b554a52237b27 | https://plugins.gradle.org/m2/com/google/code/gson/gson-parent/2.8.5/gson-p… 233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar b8308557a7fccc92d9fe7c8cd0599258b361285d2ecde7689eda98843255a092 | https://plugins.gradle.org/m2/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom diff --git a/projects/fenix/config b/projects/fenix/config index a3d0b73..4d9c936 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -14,9 +14,11 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 5 + gradle_dependencies_version: 6 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 + # Overwrite `glean_parser` for now to fix #40085. + glean_parser: 1.28.6 targets: nightly: @@ -46,7 +48,7 @@ input_files: enable: '[% !c("var/fetch_gradle_dependencies") %]' exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2 - sha256sum: 69234aa1ae38fd5dda4de71bd5e536795073703c3ed5bb994b9b8485bd7a55dc + sha256sum: bdbb421fdcc9b66aebe8f41b33e254cab722355c59c0f43f10a8322d7d6da6a4 enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index fa7c80f..1a84cab 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -1074,12 +1074,12 @@ e3307e77325cf8e5bd1a4bbfb6f69b1dba208c0cd840ed41438790d6862008da | https://maven 41d405815f5c5c1df8d8f31d61f6a556d0d6b2bc9e02c0f905f41321da1f7f8a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/82… b3acbeebbfca2cb7e6d5afa5c23672debd76679752c124e3ae8aa4c5673cdd12 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… e6754e5153344bacbbe164b1012743db0378b7253b259a1baaa140564fa2aa32 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/81.0.20200… -99c418afb9003150afea443057f0c859868045279d356dd5b808baf136b7dc0e | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -8e5b9b3ba3570ecf5d22ea08f762465bef048271dab6fd7a07f5a51f0eeaff33 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… -ab514359d7686282b7a7c8463e81237ff98460a23df534a6c9663b463e65423f | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -f724de3fc1c37d8ecb4bbb7957dd67a489d0321da71eebb6b8d605ec4a57755a | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… -5b078e136164082be6d49afa0d87f849c7b9f65e21125fa57056cd630756279b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-3… -64371d71a4fb11d63d2a5ff60149c94c1d0e0b909de09ffe199f6872663976b2 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.1.1/glean-3… +acfb992486c44ecf3727fac3eb7a4ac69e005e8baae2dd4104208265a947bccd | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +71bf43ad7ea24b261bb1e361c0f1d5642bdc4dab5471ca9628d1b7ad754e84a1 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… +93b2f27c919b07b927d764726eb64350cb7d480bac9485b9192881a9d5d10f30 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +a84340369fdbb4c38ea0ce2e17ceac1c6a596cebb9818885276eec8b611e4d4b | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… +d0e02f22fbd35b15e50e043ca0462fac6b2b78ac4968b324bd1431c8f85878df | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-3… +79d0b2e02aa86ef38577edb2befa25280ce58fcbae23a1ffd1db80147510aa86 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean/32.4.1/glean-3… 470564ff0a452da1c96be4ca3a9cdeceaa2912537ee2a8def486f3b383d43f15 | https://plugins.gradle.org/m2/com/jetbrains/python/envs/com.jetbrains.pytho… 6438812f927b505a4c4ef2703b45433a1b99e45334526bfed25e71e1a79abb14 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyt… 317aa4c467a37d5fcab6657c326a4069ea8e8c6dda951ec2091ffb95c596a2a3 | https://plugins.gradle.org/m2/gradle/plugin/com/jetbrains/python/gradle-pyt…

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by sysrqb＠torproject.org 02 Oct '20

02 Oct '20

commit 43e12213f3b4a8a67def1542cfd082668056e953 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 2 17:23:33 2020 +0200 fixup! Bug 23247: Communicating security expectations for .onion Fixes 40172: Security UI not updated for non-https .onion pages --- mobile/android/modules/geckoview/GeckoViewProgress.jsm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.jsm b/mobile/android/modules/geckoview/GeckoViewProgress.jsm index 9cfc7bf09b9c..475b7fc19a44 100644 --- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm +++ b/mobile/android/modules/geckoview/GeckoViewProgress.jsm @@ -144,6 +144,10 @@ var IdentityHandler = { result.host = uri.host; } + if (!aBrowser.securityUI.secInfo) { + return result; + } + const cert = aBrowser.securityUI.secInfo.serverCert; result.certificate = aBrowser.securityUI.secInfo.serverCert.getBase64DERString();

1 0

[tor-browser/tor-browser-81.0b9-10.0-1] Merge remote-tracking branch 'acatgl/40172' into tor-browser-81.0b9-10.0-1
by sysrqb＠torproject.org 02 Oct '20

02 Oct '20

commit 73b876518c20f6404905415827bd96f78bf7cab2 Merge: 572a39faa22c 43e12213f3b4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Oct 2 17:11:33 2020 +0000 Merge remote-tracking branch 'acatgl/40172' into tor-browser-81.0b9-10.0-1 mobile/android/modules/geckoview/GeckoViewProgress.jsm | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-build/master] Bug 40013: Don't create src tarballs for Android-only build
by gk＠torproject.org 02 Oct '20

02 Oct '20

commit 3ae1ae77fdaf63c21a586f65c2487343cba51edc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 1 20:35:12 2020 +0000 Bug 40013: Don't create src tarballs for Android-only build --- projects/release/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/release/config b/projects/release/config index aac9a94..8e0aebe 100644 --- a/projects/release/config +++ b/projects/release/config @@ -31,7 +31,6 @@ targets: - torbrowser-android-x86 - torbrowser-android-x86_64 - torbrowser-android-aarch64 - - torbrowser-src torbrowser-android-armv7: var: torbrowser-android-armv7: 1

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40067: Fix reproducibility issue in classes2.dex
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: f18271e0 by Georg Koppen at 2020-10-01T17:46:09+00:00 Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. - - - - - 9dfb59c8 by Matthew Finkel at 2020-10-01T18:07:25+00:00 Merge remote-tracking branch 'gkgl/bug_40067' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - buildSrc/src/main/java/Config.kt Changes: ===================================== buildSrc/src/main/java/Config.kt ===================================== @@ -38,7 +38,14 @@ object Config { @JvmStatic fun generateBuildDate(): String { - val dateTime = LocalDateTime.now() + val dateTime = if (System.getenv("MOZ_BUILD_DATE") != null) { + // Converting our MOZ_BUILD_DATE to LocalDateTime + val format = SimpleDateFormat("YYYYMMDDHHMMSS", Locale.US) + val date = format.parse(System.getenv("MOZ_BUILD_DATE")) + java.sql.Timestamp(date.getTime()).toLocalDateTime() + } else { + LocalDateTime.now() + } val timeFormatter = DateTimeFormatter.ofPattern("h:mm a") return "${dateTime.dayOfWeek.toString().toLowerCase().capitalize()} ${dateTime.monthValue}/${dateTime.dayOfMonth} @ ${timeFormatter.format(dateTime)}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/ee0aa8024680… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/ee0aa8024680… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Bug 40058: Hide option for disallowing addon in private mode
by Matthew Finkel 01 Oct '20

01 Oct '20

Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix Commits: 7097a8cf by Alex Catarineu at 2020-10-01T18:24:16+02:00 Bug 40058: Hide option for disallowing addon in private mode - - - - - ee0aa802 by Matthew Finkel at 2020-10-01T18:03:05+00:00 Merge remote-tracking branch 'acatgl/40058' into tor-browser-81.1.1-10.0-1 - - - - - 1 changed file: - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt ===================================== @@ -230,7 +230,7 @@ class InstalledAddonDetailsFragment : Fragment() { private fun bindAllowInPrivateBrowsingSwitch(view: View) { val switch = view.allow_in_private_browsing_switch switch.isChecked = addon.isAllowedInPrivateBrowsing() - switch.isVisible = addon.isEnabled() + switch.isVisible = false switch.setOnCheckedChangeListener { v, isChecked -> val addonManager = v.context.components.addonManager switch.isClickable = false View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/f22fa2b557f5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/f22fa2b557f5… You're receiving this email because of your account on gitlab.torproject.org.

1 0