1151729 - New TLD additions for TLDs contracted with ICANN through 04/07/2015

Status: RESOLVED FIXED

(Core Graveyard :: Networking: Domain Lists, defect)

Description

[Jothan Frakes]

Attachment: 2015-04-07-newgtlds.txt

This file contains the newTLD section of the public region of the PSL.  It is a text file that needs to be made into a proper unified diff and then applied as patch to the PSL.

Comment 1

[Gervase Markham [:gerv]]

Attachment: Patch v.1

Comment 2

[Carsten Book [:Tomcat]]

Hi Gerv,

this patch failed to apply:

patching file netwerk/dns/effective_tld_names.dat
Hunk #1 FAILED at 6806
Hunk #3 FAILED at 6913
Hunk #4 FAILED at 6943
Hunk #6 FAILED at 7072
Hunk #7 FAILED at 7099
Hunk #8 FAILED at 7198
Hunk #9 FAILED at 7270
Hunk #10 FAILED at 7291
Hunk #11 FAILED at 7357
Hunk #13 FAILED at 7504
Hunk #15 FAILED at 7597
Hunk #17 FAILED at 7738
Hunk #18 FAILED at 7831
Hunk #20 FAILED at 7936
Hunk #21 FAILED at 8014
Hunk #22 FAILED at 8068
Hunk #24 FAILED at 8140
Hunk #27 FAILED at 8257
Hunk #28 FAILED at 8290
Hunk #29 FAILED at 8335
Hunk #31 FAILED at 8449
Hunk #34 FAILED at 8629
Hunk #35 FAILED at 8731
Hunk #36 FAILED at 8806
Hunk #37 FAILED at 8842
Hunk #39 FAILED at 8914
Hunk #40 FAILED at 8977
Hunk #41 FAILED at 9025
Hunk #42 FAILED at 9061
Hunk #43 FAILED at 9094
Hunk #44 FAILED at 9154
31 out of 45 hunks FAILED -- saving rejects to file netwerk/dns/effective_tld_names.dat.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh 1151729.diff

could you take a look, thanks!

Comment 3

[Gervase Markham [:gerv]]

Weird. I'll have a look. Bet it something to do with line endings. Thanks!

Gerv

Comment 4

[Gervase Markham [:gerv]]

Attachment: Patch v.2

Sorry about that. Try this.

Gerv

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/62342530f301

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/62342530f301