[tbb-bugs] #33807 [Applications/Tor Browser]: Namecoin eTLD patch conflicted with securedrop.tor.onion

[Tor Bug Tracker & Wiki]

#33807: Namecoin eTLD patch conflicted with securedrop.tor.onion
------------------------------------------+--------------------------------
     Reporter:  sysrqb                    |      Owner:  tbb-team
         Type:  defect                    |     Status:  new
     Priority:  Medium                    |  Milestone:
    Component:  Applications/Tor Browser  |    Version:
     Severity:  Normal                    |   Keywords:
                                          |  TorBrowserTeam202004
Actual Points:                            |  Parent ID:
       Points:                            |   Reviewer:
      Sponsor:                            |
------------------------------------------+--------------------------------
 {{{
 /tmp/tmp.EB97rs4a6X/z /var/tmp/dist/firefox
 /var/tmp/dist/firefox
 Starting build: Fri Apr  3 08:07:15 2020
 /var/tmp/dist/gcc/bin ~
 ~
 patching file mobile/android/app/src/main/assets/publicsuffixlist
 patching file netwerk/dns/effective_tld_names.dat
 Hunk #1 FAILED at 5480.
 1 out of 1 hunk FAILED -- saving rejects to file
 netwerk/dns/effective_tld_names.dat.rej
 }}}

 where the namecoin eTLD patch (`projects/firefox/namecoin-etld.patch`)
 does:
 {{{
 diff --git a/netwerk/dns/effective_tld_names.dat
 b/netwerk/dns/effective_tld_names.dat
 index 9dd962a..3402b20 100644
 --- a/netwerk/dns/effective_tld_names.dat
 +++ b/netwerk/dns/effective_tld_names.dat
 @@ -5480,6 +5480,7 @@ pro.om

  // onion : https://tools.ietf.org/html/rfc7686
  onion
 +bit.onion

  // org : https://en.wikipedia.org/wiki/.org
  org
 }}}

 It's an easy fix.

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