Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
-+-
 Reporter:  sysrqb   |  Owner:  acat
 Type:  task | Status:
 |  needs_review
 Priority:  Medium   |  Milestone:
Component:  Applications/Tor Browser |Version:
 Severity:  Normal   | Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,  |  Actual Points:
  TorBrowserTeam202004R  |
Parent ID:  #33656   | Points:  1
 Reviewer:  sysrqb   |Sponsor:
 |  Sponsor58
-+-
Changes (by acat):

 * keywords:  tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202004 =>
 tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202004R
 * status:  assigned => needs_review


Comment:

 I'm using this one to also squash some of the desktop patches, not only
 mobile -> desktop. I used the 33533+4 branch, and the resulting rebased
 patches are in ​https://github.com/acatarineu/tor-browser/commits/31918.

 I squashed some commits with the mozconfigs one which are not strictly
 mozconfigs, but I think they could all belong to the same category,
 something like "build-time options that we set or unset". And if we do
 #23656 then all the changes in this patch would be effective for tor-
 browser-builds.

 Here is the list of changes from 33533+4 to 31918:

 {{{
 Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
   squash! TB4: Tor Browser's Firefox preference overrides.

 Bug 25741 - TBA: Add an AppConstant for TOR_BROWSER_VERSION
   fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.

 Bug 25741 - TBA: Add default configure options in dedicated file
   squash! TB3: Tor Browser's official .mozconfigs.

 Bug 25741 - TBA: Disable features at compile-time
   squash! TB3: Tor Browser's official .mozconfigs.

 Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
   squash! TB3: Tor Browser's official .mozconfigs.

 Bug 31658: Changed the 'SECURITY LEVEL' text color to builtin --panel-
 disabled-color
   fixup! Bug 25658: Replace security slider with security level UI

 Bug 32188: Change useLocalProxy string to tor-launcher's torsettings
 useProxy.checkbox in TorStrings.jsm
   fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings
 in about:preferences#tor

 Bug 31803: Replaced about:debugging logo with flat version
   squash! Bug 2176: Rebrand Firefox to TorBrowser

 Bug 32111: Fixed issue parsing user-provided brige strings
   fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings
 in about:preferences#tor

 Bug 31749: Fix security level panel spawning events
   fixup! Bug 25658: Replace security slider with security level UI

 Bug 31920: Fix Security Level panel when its toolbar button moves to
 overflow
   fixup! Bug 25658: Replace security slider with security level UI

 Bug 31748: Fixed 'Learn More' links in Security Level preferences and
 panel
   fixup! Bug 25658: Replace security slider with security level UI

 Bug 31935: Disable profile downgrade protection.
   squash! TB3: Tor Browser's official .mozconfigs.

 Bug 28196: preparations for using torbutton tor-browser-brand.ftl
   squash! Bug 2176: Rebrand Firefox to TorBrowser

 Bug 24653: merge securityLevel.properties into torbutton.dtd
   fixup! Bug 25658: Replace security slider with security level UI

 Bug 31457: disable per-installation profiles
   squash! TB3: Tor Browser's official .mozconfigs.

 Bug 31251: Security Level button UI polish
   fixup! Bug 25658: Replace security slider with security level UI

 Bug 30631: Blurry Tor Browser icon on macOS app switcher
   squash! Bug 2176: Rebrand Firefox to TorBrowser

 Bug 25702: Update Tor Browser icon to follow design guidelines
   took the aboutTBUpdateLogo.png changes (aboutTBUpdateLogo.png,
   browser/base/jar.mn) and added commit as fixup for
   `Bug 16940: After update, load local change notes.`

   the rest, squash! Bug 2176: Rebrand Firefox to TorBrowser

 Bug 22548: Firefox downgrades VP9 videos to VP8.
   squash! TB4: Tor Browser's Firefox preference overrides.

 Bug 14392: Make about:tor behave like other initial pages.
   squash! Bug 10760: Integrate TorButton to TorBrowser core
 }}}

 Some notes/questions:

 I did not  touch the onboarding patches, as I'm not sure what we are going
 to do with #31660. If we keep the current onboarding, I think it might be
 worth to squash them. I was thinking to keep two patches:

 - "Resurrect Firefox old onboarding"
   - Revert "Bug 1462415 - Delete onboarding system add-on
 r=Standard8,k88hudson
   - squash! Revert "Bug 1498378 - Actually remove the old onboarding add-
 o

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
-+-
 Reporter:  sysrqb   |  Owner:  acat
 Type:  task | Status:
 |  assigned
 Priority:  Medium   |  Milestone:
Component:  Applications/Tor Browser |Version:
 Severity:  Normal   | Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,  |  Actual Points:
  TorBrowserTeam202004   |
Parent ID:  #33656   | Points:  1
 Reviewer:  sysrqb   |Sponsor:
 |  Sponsor58
-+-
Changes (by acat):

 * owner:  sysrqb => acat
 * reviewer:  acat => sysrqb


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
-+-
 Reporter:  sysrqb   |  Owner:  sysrqb
 Type:  task | Status:
 |  assigned
 Priority:  Medium   |  Milestone:
Component:  Applications/Tor Browser |Version:
 Severity:  Normal   | Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,  |  Actual Points:
  TorBrowserTeam202004   |
Parent ID:  #33656   | Points:  1
 Reviewer:  acat |Sponsor:
 |  Sponsor58
-+-
Changes (by pili):

 * parent:   => #33656


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
-+-
 Reporter:  sysrqb   |  Owner:  sysrqb
 Type:  task | Status:
 |  assigned
 Priority:  Medium   |  Milestone:
Component:  Applications/Tor Browser |Version:
 Severity:  Normal   | Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,  |  Actual Points:
  TorBrowserTeam202004   |
Parent ID:   | Points:  1
 Reviewer:  acat |Sponsor:
 |  Sponsor58
-+-
Changes (by pili):

 * reviewer:   => acat


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
-+-
 Reporter:  sysrqb   |  Owner:  sysrqb
 Type:  task | Status:
 |  assigned
 Priority:  Medium   |  Milestone:
Component:  Applications/Tor Browser |Version:
 Severity:  Normal   | Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,  |  Actual Points:
  TorBrowserTeam202003   |
Parent ID:   | Points:  1
 Reviewer:   |Sponsor:
 |  Sponsor58
-+-
Changes (by pili):

 * sponsor:   => Sponsor58


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
-+-
 Reporter:  sysrqb   |  Owner:  sysrqb
 Type:  task | Status:
 |  assigned
 Priority:  Medium   |  Milestone:
Component:  Applications/Tor Browser |Version:
 Severity:  Normal   | Resolution:
 Keywords:  tbb-9.5, TorBrowserTeam202002,   |  Actual Points:
  ReleaseTrainMigration  |
Parent ID:   | Points:  1
 Reviewer:   |Sponsor:
-+-
Changes (by sysrqb):

 * keywords:  tbb-9.5, TorBrowserTeam202002 => tbb-9.5,
 TorBrowserTeam202002, ReleaseTrainMigration


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
---+--
 Reporter:  sysrqb |  Owner:  sysrqb
 Type:  task   | Status:  assigned
 Priority:  Medium |  Milestone:
Component:  Applications/Tor Browser   |Version:
 Severity:  Normal | Resolution:
 Keywords:  TorBrowserTeam201911, tbb-9.5  |  Actual Points:
Parent ID: | Points:  1
 Reviewer: |Sponsor:
---+--
Changes (by sysrqb):

 * cc: tbb-team (added)
 * owner:  tbb-team => sysrqb
 * status:  new => assigned


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
---+--
 Reporter:  sysrqb |  Owner:  tbb-team
 Type:  task   | Status:  new
 Priority:  Medium |  Milestone:
Component:  Applications/Tor Browser   |Version:
 Severity:  Normal | Resolution:
 Keywords:  TorBrowserTeam201911, tbb-9.5  |  Actual Points:
Parent ID: | Points:  1
 Reviewer: |Sponsor:
---+--
Changes (by sysrqb):

 * keywords:  TorBrowserTeam201910, tbb-9.0 => TorBrowserTeam201911, tbb-9.5


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
---+--
 Reporter:  sysrqb |  Owner:  tbb-team
 Type:  task   | Status:  new
 Priority:  Medium |  Milestone:
Component:  Applications/Tor Browser   |Version:
 Severity:  Normal | Resolution:
 Keywords:  TorBrowserTeam201910, tbb-9.0  |  Actual Points:
Parent ID: | Points:  1
 Reviewer: |Sponsor:
---+--

Comment (by gk):

 Another thing I am just dropping here to not forget about it: there are a
 number of securitySettings "fixup" commits we should squash while we are
 at it.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
---+--
 Reporter:  sysrqb |  Owner:  tbb-team
 Type:  task   | Status:  new
 Priority:  Medium |  Milestone:
Component:  Applications/Tor Browser   |Version:
 Severity:  Normal | Resolution:
 Keywords:  TorBrowserTeam201910, tbb-9.0  |  Actual Points:
Parent ID: | Points:  1
 Reviewer: |Sponsor:
---+--

Comment (by gk):

 Something we could do while working on this bug, and making the patches
 less desktop vs. android, is to look for pieces we disabled on desktop but
 not on mobile, yet we would like to have them actually disabled on both.
 E.g. https://bugzilla.mozilla.org/show_bug.cgi?id=1503402 comes to mind
 where we just no build the webcompat extension on desktop but still do so
 on mobile and include it there.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
---+--
 Reporter:  sysrqb |  Owner:  tbb-team
 Type:  task   | Status:  new
 Priority:  Medium |  Milestone:
Component:  Applications/Tor Browser   |Version:
 Severity:  Normal | Resolution:
 Keywords:  TorBrowserTeam201910, tbb-9.0  |  Actual Points:
Parent ID: | Points:  1
 Reviewer: |Sponsor:
---+--

Comment (by gk):

 Okay, `tor-browser-68.1.0esr-9.0-3` is a squashed branch that could be
 used for this ticket. I already started moving commits around, e.g. moving
 the ones needed for actually building code even before our mozconfig
 commit.

 We should think about more changes that would facilitate bisecting and
 readability of the branch. E.g. moving the updater/mar signing patches
 earlier, grouping Mozilla patches that belong together etc.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
---+--
 Reporter:  sysrqb |  Owner:  tbb-team
 Type:  task   | Status:  new
 Priority:  Medium |  Milestone:
Component:  Applications/Tor Browser   |Version:
 Severity:  Normal | Resolution:
 Keywords:  TorBrowserTeam201910, tbb-9.0  |  Actual Points:
Parent ID: | Points:  1
 Reviewer: |Sponsor:
---+--

Comment (by sysrqb):

 During the 68esr rebase, I squashed the [https://gitweb.torproject.org
 /tor-browser.git/commit/?h=tor-
 browser-60.9.0esr-8.5-2-build3&id=27d688d9b1ead99ee76bf7a3e081efe2c8e1efb3
 patch] for configuring `about:tor` as the default homepage into the
 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.1.0esr-9.0-2-build3&id=9d0fc747ae450534dbb33c3731feff1b26141275
 branding] patch.

 Unfortunately, that patch changes Fennec UI behavior. We shouldn't squash
 Gecko modifications with Fennec UI modifications. I opened #31983 for the
 Fennec UI change, so we can break that functionality into a separate patch
 and prevent the current inconsistency on Android.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
---+--
 Reporter:  sysrqb |  Owner:  tbb-team
 Type:  task   | Status:  new
 Priority:  Medium |  Milestone:
Component:  Applications/Tor Browser   |Version:
 Severity:  Normal | Resolution:
 Keywords:  TorBrowserTeam201910, tbb-9.0  |  Actual Points:
Parent ID: | Points:  1
 Reviewer: |Sponsor:
---+--
Changes (by gk):

 * keywords:   => TorBrowserTeam201910, tbb-9.0
 * points:   => 1


--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Re: [tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile/android patches into desktop
--+--
 Reporter:  sysrqb|  Owner:  tbb-team
 Type:  task  | Status:  new
 Priority:  Medium|  Milestone:
Component:  Applications/Tor Browser  |Version:
 Severity:  Normal| Resolution:
 Keywords:|  Actual Points:
Parent ID:| Points:
 Reviewer:|Sponsor:
--+--

Comment (by sysrqb):

 Making a note here:
 `ed7faf1c2b88cd025596151f2ad97892891965a4` contains:
 {{{
 diff --git a/toolkit/modules/AppConstants.jsm
 b/toolkit/modules/AppConstants.jsm
 index 109f1f94e3d3..bc679fb6f9f0 100644
 --- a/toolkit/modules/AppConstants.jsm
 +++ b/toolkit/modules/AppConstants.jsm
 @@ -387,4 +387,11 @@ this.AppConstants = Object.freeze({
  #else
  false,
  #endif
 +
 +  TOR_BROWSER_UPDATE:
 +#ifdef TOR_BROWSER_UPDATE
 +true,
 +#else
 +false,
 +#endif
 }}}

 But `TOR_BROWSER_UPDATE` is used earlier in
 `14df73ecfdd88db89f196cecfb934dab7e552969`. We should move this code block
 into the earlier patch.

--
Ticket URL: 
Tor Bug Tracker & Wiki 
The Tor Project: anonymity online
___
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs