[tor-bugs] #25543 [Applications/Tor Browser]: Rebase Tor Browser patches for ESR60

[Tor Bug Tracker & Wiki]

#25543: Rebase Tor Browser patches for ESR60
--------------------------------------------+------------------------------
 Reporter:  gk                              |          Owner:
                                            |  arthuredelstein
     Type:  task                            |         Status:
                                            |  needs_revision
 Priority:  Very High                       |      Milestone:
Component:  Applications/Tor Browser        |        Version:
 Severity:  Normal                          |     Resolution:
 Keywords:  TorBrowserTeam201805, ff60-esr  |  Actual Points:
Parent ID:  #25741                          |         Points:
 Reviewer:                                  |        Sponsor:
--------------------------------------------+------------------------------

Comment (by mcs):

 Replying to [comment:25 gk]:
 > Some more comments:
 >
 > abdefb33d518b0cab3aef6006a3b4f7e7bd37b37 -- not okay (4564a5f744df)
 > {{{
 > +    LOG(("ApplyUpdate -- appDir->Get(Native)Path() failed (0x%x)\n",
 rv2));
 > }}}
 > should not have "(" and ")" around "Native"

 OK. We will add platform-specific log messages (within the #ifdef's).

 > f31404d51d41f2ae65cbc9655630e0bf296bc206 -- not okay (46acba80bdf4)
 >
 > fixed by 2b3836d255481928c9096b72f74cef22fd5086d7,
 b438971ea1567332a3133cf45c92922beaf54e7c,
 9d3a1949117d2e238fadf649188298d0b042bb31, and
 d0d9bcd78e3740d98d2f60115e35a64df923d9e9
 >
 > However, 9d3a1949117d2e238fadf649188298d0b042bb31 should actually be a
 fixup for the patch for bug 4234 and not this one.

 Yes. That got switched around because of the order of the patches, but
 Kathy and I are fixing it.

 > dd2e54105436100a82f59f8042122e91ce4c8775 -- not okay (dc4fdd28c696)
 >
 > I think the Tor additions in `old-configure.in` be at the same place as
 those in #4234? Right now they are spread out while they weren't before.

 Good catch. Kathy and I messed that up and will fix it.

 > What's the reason for replacing `extern NS_METHOD`, `class nsIFile;`
 with `extern nsresult`?
 Mozilla has eliminated `NS_METHOD`. See
 https://bugzilla.mozilla.org/show_bug.cgi?id=1295053
 As for `class nsIFile`, we found that is not needed because it is defined
 in nsIFile.h (maybe that was always the case, or maybe things changes
 since we originally wrote that code).

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