Opened 6 months ago

Closed 6 months ago

#33845 closed defect (fixed)

namecoin-torbutton.patch needs to be rebased

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

Description

Latest nightly build failed while applying namecoin-torbutton.patch:

Starting build: Wed Apr  8 03:33:01 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 succeeded at 5499 (offset 2 lines).
/var/tmp/build/firefox-e09b2deb2169/toolkit/torproject/torbutton /var/tmp/build/firefox-e09b2deb2169
patching file chrome/content/tor-circuit-display.js
Hunk #1 succeeded at 48 (offset -1 lines).
Hunk #2 succeeded at 136 (offset 6 lines).
Hunk #3 succeeded at 171 (offset 6 lines).
Hunk #4 FAILED at 341.
Hunk #5 succeeded at 485 (offset 32 lines).
Hunk #6 succeeded at 498 (offset 32 lines).
Hunk #7 succeeded at 514 (offset 31 lines).
1 out of 7 hunks FAILED -- saving rejects to file chrome/content/tor-circuit-display.js.rej

Child Tickets

Change History (8)

comment:1 Changed 6 months ago by boklm

Cc: acat added

It seems the namecoin patch is conflicting with the changes from #28005.

As we didn't get a working linux nightly build in the last 6 days, nightly users are missing important security fixes, so I think we should temporarily disable namecoin in nightly, unless we can rebase the namecoin patch today.

comment:2 Changed 6 months ago by boklm

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

comment:3 Changed 6 months ago by gk

Status: needs_reviewmerge_ready

Looks good.

comment:4 Changed 6 months ago by boklm

Status: merge_readyneeds_revision

I merged the patch disabling namecoin to master as commit 4b9ad6d76f322fc83b9e8fb5751b95662a0b85ce. We should revert it when namecoin-torbutton.patch has been rebased.

comment:5 Changed 6 months ago by boklm

Keywords: TorBrowserTeam202004 added; TorBrowserTeam202004R removed

comment:6 Changed 6 months ago by acat

Keywords: TorBrowserTeam202004R added; TorBrowserTeam202004 removed
Status: needs_revisionneeds_review

Here is a rebased patch: https://github.com/acatarineu/tor-browser-build/commit/33845_fix_patch.

However, I could not test it because namecoin in nightly does not work for me. Actually, when running Tor Browser with TOR_ENABLE_NAMECOIN=1 no website loads for me (connection times out). I tried with tbb-nightly.2020.04.02.

comment:7 Changed 6 months ago by JeremyRand

However, I could not test it because namecoin in nightly does not work for me. Actually, when running Tor Browser with TOR_ENABLE_NAMECOIN=1 no website loads for me (connection times out). I tried with tbb-nightly.2020.04.02.

That's likely to be #33749.

comment:8 in reply to:  6 Changed 6 months ago by boklm

Resolution: fixed
Status: needs_reviewclosed

Replying to acat:

Here is a rebased patch: https://github.com/acatarineu/tor-browser-build/commit/33845_fix_patch.

Thanks, the rebased patch looks good to me. I merged it to master with commit ba31ac419a33126882c45c94923614a555e80284 and revert the patch disabling namecoin with commit 44a18de3b88d80f6841e21903896a5f957ca8e63.

Note: See TracTickets for help on using tickets.