Skip to content

Bug 42745: Remove our changes to tools/update-packaging/common.sh.

Pier Angelo Vendrame requested to merge pierov/tor-browser:bug_42745 into tor-browser-128.2.0esr-14.0-1

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Localization: typos and other localization changes that should be also in the release branch
  • Other: please explain

Merging

  • Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : dan, ma1, pierov, richard
    • security : jwilde, ma1
    • signing : boklm, richard
    • updater : pierov
    • windows : jwilde, richard
    • misc/other : pierov, richard

Change Description

During the rebase, I noticed that we include a patch that doesn't make too much sens, because it applies to extension directories, which we don't use.

So, I undid that patch (git show 3f6199c24a54fdc12422ded96f7c66912dfe56c6 -- tools/update-packaging/common.sh | git apply -R).

How Tested

Here's the fun!

If I understand correctly, that patch apply to the generation of the update manifest, which is included in .mar files.

So, I extracted the mar tools, generated the mar, patched the mar tools, generated another mar, compared the results and noticed they haven't changed.

I did that with 13.5.3, the patch applies with a small offset that patch detects automatically.
I hoped to get the same mar as the one I generated yesterday, but it didn't work.
Anyway, the patched and unpatched mars I generated today are the same.

7z x ~/Tor/tor-browser-build/torbrowser/release/unsigned/13.5.3/mar-tools-linux-x86_64-13.5.3.zip
mkdir mar
cd mar
../mar-tools/mar -x ~/Tor/tor-browser-build/torbrowser/release/unsigned/13.5.3/tor-browser-linux-x86_64-13.5.3_ALL.mar
cd ..
MAR=$PWD/mar-tools/mar MOZ_PRODUCT_VERSION=13.5.3 MAR_CHANNEL_ID=torbrowser-torproject-release mar-tools/make_full_update.sh 13.5.3-unpatched.mar mar
cd ../mar-tools/
patch -p3 < ...../bug_42745.diff
cd ..
MAR=$PWD/mar-tools/mar MOZ_PRODUCT_VERSION=13.5.3 MAR_CHANNEL_ID=torbrowser-torproject-release mar-tools/make_full_update.sh 13.5.3.mar mar
cmp 13.5.3-unpatched.mar 13.5.3.mar

Merge request reports