May 2022 - tor-commits - lists.torproject.org

[tor] branch release-0.4.7 updated (5345b43fb8 -> 5f2b75aafd)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch release-0.4.7 in repository tor. from 5345b43fb8 version: Bump to 0.4.7.7-dev new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 new 5f2b75aafd Merge branch 'maint-0.4.6' into maint-0.4.7 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch release-0.4.6 updated (18cc67f161 -> 5568961cbf)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch release-0.4.6 in repository tor. from 18cc67f161 Merge branch 'maint-0.4.6' into release-0.4.6 new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 new 5568961cbf Merge branch 'maint-0.4.6' into release-0.4.6 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch release-0.4.5 updated (0d91cb8099 -> 621c922134)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch release-0.4.5 in repository tor. from 0d91cb8099 Merge branch 'maint-0.4.5' into release-0.4.5 new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 621c922134 Merge branch 'maint-0.4.5' into release-0.4.5 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (5345b43fb8 -> 5f2b75aafd)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch maint-0.4.7 in repository tor. from 5345b43fb8 version: Bump to 0.4.7.7-dev new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 new 5f2b75aafd Merge branch 'maint-0.4.6' into maint-0.4.7 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.6 updated (32356a6076 -> 4ba89c0ccc)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch maint-0.4.6 in repository tor. from 32356a6076 Merge branch 'maint-0.4.5' into maint-0.4.6 new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.5 updated (dc90226cc3 -> c213c1b0d1)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch maint-0.4.5 in repository tor. from dc90226cc3 Merge branch 'tor-gitlab/mr/491' into maint-0.4.5 new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (853270a871 -> 20112c13ac)
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. ahf pushed a change to branch main in repository tor. from 853270a871 Merge remote-tracking branch 'tor-gitlab/mr/574' new d422a66f87 sandbox: Permit rseq syscall as well new c213c1b0d1 Add changes entry to tor!575. new 4ba89c0ccc Merge branch 'maint-0.4.5' into maint-0.4.6 new 5f2b75aafd Merge branch 'maint-0.4.6' into maint-0.4.7 new 20112c13ac Merge branch 'maint-0.4.7' The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: changes/ticket40601 | 4 ++++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 changes/ticket40601 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 5

[builders/tor-browser-build] branch master updated: Bug 40485: Resolve Android reproducibility issues
by gitolite role 09 May '22

09 May '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new aa756d0 Bug 40485: Resolve Android reproducibility issues aa756d0 is described below commit aa756d032f812a7770fedfb60f1383bd47f60522 Author: Matthew Finkel <sysrqb(a)torproject.org> AuthorDate: Fri May 6 16:35:08 2022 +0000 Bug 40485: Resolve Android reproducibility issues --- projects/application-services/bug40485.patch | 54 ++++++++++++++++++++++++++++ projects/application-services/build | 1 + projects/application-services/config | 2 ++ projects/fenix/build | 3 ++ 4 files changed, 60 insertions(+) diff --git a/projects/application-services/bug40485.patch b/projects/application-services/bug40485.patch new file mode 100644 index 0000000..fb97a22 --- /dev/null +++ b/projects/application-services/bug40485.patch @@ -0,0 +1,54 @@ +diff --git a/components/support/nimbus-fml/src/parser.rs b/components/support/nimbus-fml/src/parser.rs +index 1de9a301..19d29373 100644 +--- a/components/support/nimbus-fml/src/parser.rs ++++ b/components/support/nimbus-fml/src/parser.rs +@@ -2,7 +2,7 @@ + * 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/. */ + +-use std::{collections::HashMap, path::Path}; ++use std::{collections::BTreeMap, collections::HashMap, path::Path}; + + use serde::{Deserialize, Serialize}; + use serde_json::json; +@@ -22,7 +22,7 @@ pub(crate) struct EnumVariantBody { + #[derive(Debug, Deserialize, Serialize, Clone)] + pub(crate) struct EnumBody { + description: String, +- variants: HashMap<String, EnumVariantBody>, ++ variants: BTreeMap<String, EnumVariantBody>, + } + + #[derive(Debug, Deserialize, Serialize, Clone)] +@@ -39,26 +39,26 @@ pub(crate) struct FieldBody { + pub(crate) struct ObjectBody { + description: String, + failable: Option<bool>, +- fields: HashMap<String, FieldBody>, ++ fields: BTreeMap<String, FieldBody>, + } + + #[derive(Debug, Deserialize, Serialize, Clone, Default)] + pub(crate) struct Types { +- enums: HashMap<String, EnumBody>, +- objects: HashMap<String, ObjectBody>, ++ enums: BTreeMap<String, EnumBody>, ++ objects: BTreeMap<String, ObjectBody>, + } + + #[derive(Debug, Deserialize, Serialize, Clone)] + pub(crate) struct FeatureBody { + description: String, +- variables: HashMap<String, FieldBody>, ++ variables: BTreeMap<String, FieldBody>, + #[serde(alias = "defaults")] + default: Option<serde_json::Value>, + } + #[derive(Debug, Deserialize, Serialize, Clone, Default)] + pub(crate) struct ManifestFrontEnd { + types: Types, +- features: HashMap<String, FeatureBody>, ++ features: BTreeMap<String, FeatureBody>, + channels: Vec<String>, + } + diff --git a/projects/application-services/build b/projects/application-services/build index f526973..121dc12 100755 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -76,6 +76,7 @@ do done patch -p1 < $rootdir/no-git.patch +patch -p1 < $rootdir/bug40485.patch export RUST_ANDROID_GRADLE_PYTHON_COMMAND=python3 [% IF c('var/fetch_gradle_dependencies') %] # XXX: `assemble` is still not enough to see all fetched dependencies via diff --git a/projects/application-services/config b/projects/application-services/config index 29a6084..d65014f 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -97,6 +97,8 @@ input_files: enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' + # Delete when this patch is included upstream + - filename: bug40485.patch steps: list_toolchain_updates: diff --git a/projects/fenix/build b/projects/fenix/build index 1c1890f..3306e3d 100755 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -77,6 +77,9 @@ v=[% c("variant") %] exit 1 fi + # Bug 40485: Inject deterministic build date into Glean. + echo "ext.gleanBuildDate = \"0\"" >> app/build.gradle + # We put the tor-browser version last to avoid int-parsing errors when consumers of project.versionName # assume it starts with a major version number, as it does for all Mozilla version names. version_name='[% c("var/fenix_version") %]-[% c("variant") %] ([% c("var/torbrowser_version") %])' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.0 updated: Bug 40490: Add Pier as a valid signer
by gitolite role 06 May '22

06 May '22

This is an automated email from the git hooks/post-receive script. sysrqb pushed a commit to branch maint-11.0 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.0 by this push: new 506bd3e Bug 40490: Add Pier as a valid signer 506bd3e is described below commit 506bd3e13f3c8aacea5cb5e33faabc9c9627b4b4 Author: Matthew Finkel <sysrqb(a)torproject.org> AuthorDate: Fri May 6 17:12:40 2022 +0000 Bug 40490: Add Pier as a valid signer --- keyring/torbutton.gpg | Bin 233555 -> 234748 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 939143b..9fed395 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40490: Add Pier as a valid signer
by gitolite role 06 May '22

06 May '22

This is an automated email from the git hooks/post-receive script. sysrqb pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 43033ab Bug 40490: Add Pier as a valid signer 43033ab is described below commit 43033abc8a89da9012c385dbb415ce1c971d6959 Author: Matthew Finkel <sysrqb(a)torproject.org> AuthorDate: Fri May 6 17:12:40 2022 +0000 Bug 40490: Add Pier as a valid signer --- keyring/torbutton.gpg | Bin 233555 -> 234748 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 939143b..9fed395 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0