[tor-bugs] #26073 [Applications/Tor Browser]: patch tor-browser-build.git for Firefox 60 ESR

[Tor Bug Tracker & Wiki]

#26073: patch tor-browser-build.git for Firefox 60 ESR
--------------------------------------------+------------------------------
 Reporter:  arthuredelstein                 |          Owner:  tbb-team
     Type:  defect                          |         Status:
                                            |  needs_revision
 Priority:  Very High                       |      Milestone:
Component:  Applications/Tor Browser        |        Version:
 Severity:  Normal                          |     Resolution:
 Keywords:  TorBrowserTeam201805, ff60-esr  |  Actual Points:
Parent ID:                                  |         Points:
 Reviewer:                                  |        Sponsor:
--------------------------------------------+------------------------------

Comment (by gk):

 I looked over the remaining commits and here are my notes.

 69874135a6550419f95ef39d41a4e3cc5aa5fa02 -- not needed with the idea in
 commit 81da10daeaa1c35cb78e22006e63f1f86c68a1a8; however now I see as the
 version string:

 "tbb-nightly --with-distribution-id=org.torproject --enable-update-
 channel=default --enable-bundled-fonts"

 I wonder if that's related to this change or to our tor-browser patches...

 3bbad8b81fc5f04cc331f01d4b1d895e7e77be16 -- merge that with
 d386c2d78132546c26b7e2d3d6e8ce9cacd9b216
 fe6da6bf59edcdede48b931b27b38c9bb0422877 -- okay for now
 4c42450871b9a61e04fb97a5163d0895e71452f9 -- not okay

 You guard the rust inclusion in the build script behind
 {{{
 +[% IF c("var/linux") %]
 +[% END -%]
 }}}
 but not in the config file. I think we should just want to have it enabled
 unconditionally under the assumption that building ESR60 on the other
 platforms is broken anyway until we fix the toolchains.

 And please merge that commit with the next one.

 57045d88b45de321d8c4a9f749ef2c22084b5a0a -- please merge it with the
 previous commit as this is rust related as well

 e41884c0447cc9c39a466cb5b23ea58dfc48c728 -- not okay

 Do we have a lib64 dir for 32bit Linux builds? I somehow doubt that.
 "$rootdir" is not needed (as seen by the tar command we used for cmake
 previously.

 d386c2d78132546c26b7e2d3d6e8ce9cacd9b216 -- merge that with
 3bbad8b81fc5f04cc331f01d4b1d895e7e77be16

 9d9cc661b187a81f07d3d3da512a4cbb6abdda6c looks good to me

 2e0aee0362bfba5c46f2a097aa3383bc468609dd -- not okay

 We switched to the informaction.com URL because 5.1.8.5 is not available
 on AMO anymore, we should switch back to AMO for the WebExtension version.

 6b27579b75dec181399662f9475cddcba6bb4cca -- okay

 51309b419d6b645fda682665ae2b4091373d590a -- not okay

 Please provide a clean commit for dealing with the lang packs, i.e. not a
 commit to fix arthur's commit.

 d2f372825b0cee09f5087976b1ed53edb38a7aef -- not okay
 `tor-browser-60.0.1esr-8.0-1` is a thing now.

 c6fc477bede9707c95e4807be0039befb28a3ccc -- okay

 Let me know if anything of that does not make sense to you.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/26073#comment:28>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online