Opened 7 months ago

Closed 7 months ago

#33807 closed defect (fixed)

Namecoin eTLD patch conflicted with securedrop.tor.onion

Reported by: sysrqb Owned by: tbb-team
Priority: High Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: TorBrowserTeam202004R
Cc: gk, JeremyRand Actual Points:
Parent ID: Points:
Reviewer: sysrqb Sponsor:

Description

/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.

Child Tickets

Change History (6)

comment:1 Changed 7 months ago by sysrqb

diff --git a/projects/firefox/namecoin-etld.patch b/projects/firefox/namecoin-etld.patch
index 4a97f997..743df581 100644
--- a/projects/firefox/namecoin-etld.patch
+++ b/projects/firefox/namecoin-etld.patch
@@ -16,9 +16,9 @@ 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
+ tor.onion
+ securedrop.tor.onion
 +bit.onion
  
  // org : https://en.wikipedia.org/wiki/.org

For reference. I'll create the patch later.

comment:2 Changed 7 months ago by gk

Cc: gk added
Priority: MediumHigh

comment:3 Changed 7 months ago by boklm

Cc: JeremyRand added
Keywords: TorBrowserTeam202004R added; TorBrowserTeam202004 removed
Status: newneeds_review

comment:5 Changed 7 months ago by pili

Reviewer: sysrqb

comment:6 Changed 7 months ago by sysrqb

Resolution: fixed
Status: needs_reviewclosed

The additional index information for mobile/android/app/src/main/assets/publicsuffixlist is unfortunate

-index 7f834b1..6874b40 100644
+index 7f834b1a89bd..6874b4005ae3 100644

But I merge it with commit 5a2948b7195d1daa2b73b3cef2ed5507a922a76e.

Thanks!

Note: See TracTickets for help on using tickets.