Rebase Fenix patches to 96.3.0
status
-
checkout the torbrowser-* branch from the old version (in this case tor-browser-94.1.1-11.5-1
)[1] -
create a new branch for this rebase: git checkout -b bug_40205 -
rebase on the new mozilla commit: git rebase -i --autosquash v96.2.0
-
check the list of commits to rebase, excluding extra moz commit. [2] -
perform rebase, resolve merge conflicts -
619cdf88 Rename as Tor Browser -
eb540c7a Disable features and functionality -
d300a5ca Modify build system -
ffe02b33 Add Tor integration and UI -
2be3f44e Modify UI/UX -
h 9180554c squash! Modify UI/UX -
5a42ab5e Modify Add-on support -
ffbe0a72 Add Security Level UI -
b0afc737 Bug 40177: Hide Tor icons in settings -
ce12d399 Bug 40185: Use NimbusDisabled
-
-
generate toolchain updates in tb-build with make list-toolchain-updates-fenix
-
generate gradle dependency updates in tb-build by following torbrowser-build/doc/how-to-create-gradle-dependencies-list.txt
-
run build w/ toolchain+gradle updates [3] -
manually test apk -
starts? -
bootstraps? -
can configure bridge & reconnect to tor over bridge? -
are security levels correctly changed? (visit https://people.torproject.org/~sysrqb/test_security_level.html)
-
notes
- [1] this branch can be discovered if it has not yet been created by grepping
git_branch
in torbrowser-build/projects/fenix/config at HEAD of master [sic] - [2] The first commit in the list should be a commit from us (not from mozilla). If the first commits are from mozilla, you should remove them,until the first commit from us (which is Bug 40002: Add GitLab CI).
- [3] will likely need to work off of @pierov's WIP android-component branch with modifications discussed in tor-browser#40784 (closed) for this to work
context
- dependency of http://eweiibe6tdjsdprb4px6rqrzzcsi22m4koia44kc5pcjr7nec2rlxyad.onion/tpo/applications/tor-browser/-/issues/40784
- use #40196 (closed) and #40199 (closed) as a reference!
Edited by aguestuser