Opened 3 months ago

Closed 3 months ago

#29082 closed defect (fixed)

Backport patches for bug 1469916

Reported by: gk Owned by: tbb-team
Priority: High Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: TorBrowserTeam201901, GeorgKoppen201901
Cc: pospeselr Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

I got notified that we want to backport the patches that fixed Mozilla's 1469916. We should do it and test the result in an alpha release.

Child Tickets

Change History (5)

comment:1 Changed 3 months ago by gk

Cc: pospeselr added
Keywords: TorBrowserTeam201901R added; TorBrowserTeam201901 removed
Status: newneeds_review

bug_29082 () contains the six backported patches and the backout of our patch for #22343. The latter is not necessary anymore if we backport the patches related to bug 1469916 according to https://bugzilla.mozilla.org/show_bug.cgi?id=1508355#c1.

So, the patches needed are related to

bug 1469916: https://hg.mozilla.org/mozilla-central/rev/9a2b02fe351b (commit 23c6e68b1208d20ea342d3d4693f1ea7c1050661)

bug 1473509: https://hg.mozilla.org/mozilla-central/rev/d8e6b69bc535 (commit 846b2530517793843a0006c41b15ff41b47a6f79)

bug 1473507: https://hg.mozilla.org/mozilla-central/rev/ddb29b481834 (commit 11aef302f781e229446fc73251e42efd70c19b38)

bug 1487263: https://hg.mozilla.org/mozilla-central/rev/57204974417c (commit 5cc364bf650ec604043b6394c6d2525789e61f3a)

and bug 1504159: https://hg.mozilla.org/releases/mozilla-beta/rev/a9a646d4a158 + https://hg.mozilla.org/releases/mozilla-beta/rev/1c5b308487dc (commits 23d8a9b2966155118ab88ff001771082694fcc40 and 77b26b69926f7bb93181320084ca8cb9958b3a95).

I've tested a 64bit Linux build and double-checked that the FPI of the various "Save As..." items still applies.

comment:2 Changed 3 months ago by rev

Phew, that was hard to review... forced cookies... no comments...
Why not add https://hg.mozilla.org/mozilla-central/rev/7e613710a9e1 also?

comment:3 in reply to:  2 Changed 3 months ago by gk

Replying to rev:

Phew, that was hard to review... forced cookies... no comments...
Why not add https://hg.mozilla.org/mozilla-central/rev/7e613710a9e1 also?

Because "Like bug 1504159, but less wallpapery and more complicated." and we have bug 1504159 covered.

comment:4 Changed 3 months ago by pospeselr

Keywords: TorBrowserTeam201901 added; TorBrowserTeam201901R removed
Status: needs_reviewmerge_ready

Yeah 23c6e68b1208d20ea342d3d4693f1ea7c1050661 took awhile to get through, but these all look good to me.

comment:5 Changed 3 months ago by gk

Resolution: fixed
Status: merge_readyclosed

Thanks. Applied to tor-browser-60.4.0esr-8.5-1(commits
9c9809f628c810e53f428ec565aa8d515908a2b7 (the revert of our fix for #22343)
23c6e68b1208d20ea342d3d4693f1ea7c1050661
846b2530517793843a0006c41b15ff41b47a6f79
11aef302f781e229446fc73251e42efd70c19b38
5cc364bf650ec604043b6394c6d2525789e61f3a
23d8a9b2966155118ab88ff001771082694fcc40
77b26b69926f7bb93181320084ca8cb9958b3a95).

Note: See TracTickets for help on using tickets.