#30429: Rebase Tor Browser patches for Firefox ESR 68 -------------------------------------------------+------------------------- Reporter: gk | Owner: tbb- | team Type: task | Status: | needs_revision Priority: Very High | Milestone: Component: Applications/Tor Browser | Version: Severity: Normal | Resolution: Keywords: tbb-9.0-must-nightly, | Actual Points: TorBrowserTeam201908R | Parent ID: | Points: Reviewer: | Sponsor: -------------------------------------------------+-------------------------
Comment (by acat): Some comments on the updater patches: 9f9017a63b156e11af23b55fde36223b74d859e4 (Bug 13379: Sign our MAR files.) - - In the original esr60 patch, `AppendToLibPath` is called for Windows, Mac and Linux, while in the new patch it's only used for Mac. Is this not needed anymore for Linux and Windows? In #29818 it says that in Linux now `-rpath=$ORIGIN` is used, but I did not see anything about Windows. 9aa2a90005dde6a7ea2bf58b63241d27912a78eb (Bug 4234: Use the Firefox Update Process for Tor Browser.) - `TOR_BROWSER_VERSION` is now mandatory, if I understand it correctly. But I still see some cases that are checking whether `TOR_BROWSER_VERSION_QUOTED` is defined: {{{ +#ifdef TOR_BROWSER_VERSION_QUOTED + nsAutoCString tbVersion(TOR_BROWSER_VERSION_QUOTED); + rv = parser.GetString("Compatibility", "LastTorBrowserVersion", buf); + if (NS_FAILED(rv) || !tbVersion.Equals(buf)) return false; +#endif }}} {{{ +#ifdef TOR_BROWSER_VERSION_QUOTED + nsAutoCString tbVersion(TOR_BROWSER_VERSION_QUOTED); + static const char kTorBrowserVersionHeader[] = + NS_LINEBREAK "LastTorBrowserVersion="; + PR_Write(fd, kTorBrowserVersionHeader, sizeof(kTorBrowserVersionHeader) - 1); + PR_Write(fd, tbVersion.get(), tbVersion.Length()); +#endif + }}} Can these checks be removed? - `AdjustPathForUpdater` in `toolkit/xre/nsUpdateDriver.cpp` is removed, similar to comment above, is this not needed anymore for Windows? afb98b58e51c64f4a5a8f51ff68cbd4a801dc831 (Bug 19121: reinstate the update.xml hash check) - ok bff9eb4e1fc5244b53533f4fdbbc43a0ffbd43fd (Bug 19121: reinstate the update.xml hash check) - ok 88bc9543973ac089fcb9a3c5c9aae2295086e99b (Bug 13252: Do not store data in the app bundle) - ok, already reviewed 89177dd51ae361d5360abae00387a1d75c15a1be (fixup! TB4: Tor Browser's Firefox preference overrides.) - Since `TOR_BROWSER_VERSION` is now mandatory, can the ifdef check be removed? 55b4bcecc587bb03ce32933096b12fbfb5ceb146 (fixup! Bug 16940: After update, load local change notes.) - Since `TOR_BROWSER_VERSION` is now mandatory, can the ifdef check be removed? -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/30429#comment:33> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online
_______________________________________________ tor-bugs mailing list tor-bugs@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs