From dc3eeb8170f5123b3836e15f0388a956f6b3b3c2 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sun, 25 Jan 2015 03:18:19 +0100 Subject: [PATCH 01/20] Fix referrals handling for some verisign-grs.com servers Verisign has changed for no apparent reason the label for the whois server field of the cc, tv and jobs TLDs whois servers. --- whois.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/whois.c b/whois.c index fdb2824..d703996 100644 --- a/whois.c +++ b/whois.c @@ -810,9 +810,10 @@ char *query_crsnic(const int sock, const char *query) is queried */ if (state == 0 && strneq(buf, " Domain Name:", 15)) state = 1; - if (state == 1 && strneq(buf, " Whois Server:", 16)) { - for (p = buf; *p != ':'; p++); /* skip until colon */ - for (p++; *p == ' '; p++); /* skip colon and spaces */ + if (state == 1 && (strneq(buf, " Whois Server:", 16) + || strneq(buf, " WHOIS Server:", 16))) { + for (p = buf; *p != ':'; p++); /* skip until the colon */ + for (p++; *p == ' '; p++); /* skip the spaces */ referral_server = strdup(p); if ((p = strpbrk(referral_server, "\r\n "))) *p = '\0'; From b5228898037146afe6ae55e9dbc3cd0b483d98ef Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sun, 25 Jan 2015 03:40:57 +0100 Subject: [PATCH 02/20] Ignore empty referral strings Some registrars return an empty field for the referral server. --- whois.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/whois.c b/whois.c index d703996..accae8a 100644 --- a/whois.c +++ b/whois.c @@ -361,6 +361,9 @@ int handle_query(const char *hserver, const char *hport, if (!server) return 1; + if (*server == '\0') + return 0; + query_string = queryformat(server, flags, query); if (verb) { printf(_("Using server %s.\n"), server); From 840b0fce7f53af564b789d036d062907302160bc Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sun, 11 Jan 2015 18:48:54 +0100 Subject: [PATCH 03/20] Update TLD servers: si New alias of the same server. --- tld_serv_list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tld_serv_list b/tld_serv_list index 46b7c5a..c07ba85 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -270,7 +270,7 @@ .se whois.iis.se .sg whois.sgnic.sg .sh whois.nic.sh -.si whois.arnes.si +.si whois.register.si .sj NONE # http://www.norid.no/domenenavnbaser/bv-sj.html .sk whois.sk-nic.sk .sl whois.nic.sl From b20539b5372045511e30939fdee5c33e75cdafbd Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sun, 11 Jan 2015 18:49:54 +0100 Subject: [PATCH 04/20] Update the list of new gTLDs --- new_gtlds_list | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/new_gtlds_list b/new_gtlds_list index b9f6d91..5e571f8 100644 --- a/new_gtlds_list +++ b/new_gtlds_list @@ -26,7 +26,10 @@ audio autos axa band +bank bar +barclaycard +barclays bargains bayern beer @@ -104,10 +107,12 @@ crs cruises cuisinella cymru +dabur dad dance dating day +dclk deals degree delivery @@ -115,6 +120,7 @@ democrat dental dentist desi +design dev diamonds diet @@ -155,6 +161,7 @@ financial firmdale fish fishing +fit fitness flights florist @@ -185,6 +192,7 @@ globo gmail gmo gmx +goog google gop graphics @@ -195,10 +203,12 @@ guide guitars guru hamburg +hangout haus healthcare help here +hermes hiphop hiv holdings @@ -210,6 +220,7 @@ hosting house how ibm +ifm immo immobilien industries @@ -221,10 +232,12 @@ international investments irish iwc +jcb jetzt joburg juegos kaufen +kddi kim kitchen kiwi @@ -233,6 +246,7 @@ krd kred lacaixa land +lat latrobe lawyer lds @@ -247,6 +261,7 @@ limo link loans london +lotte lotto ltda luxe @@ -257,6 +272,7 @@ management mango market marketing +marriott media meet melbourne @@ -287,6 +303,7 @@ nra nrw nyc okinawa +one ong onl ooo @@ -361,6 +378,7 @@ sew sexy shiksha shoes +shriram singles sky social @@ -384,6 +402,7 @@ tatar tattoo tax technology +temasek tienda tips tires @@ -445,6 +464,7 @@ xn--6qq986b3xl xn--80adxhks xn--80asehdb xn--80aswg +xn--b4w605ferd xn--c1avg xn--cg4bki xn--czr694b From f5d7521e1ada02041b4eb7b6389ab79c5889afc0 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sun, 25 Jan 2015 04:13:32 +0100 Subject: [PATCH 05/20] Debian changelog for 5.2.4 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ca6678a..c6d1187 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +whois (5.2.4) unstable; urgency=medium + + * Fixed referrals handling for the .cc, .tv a .jobs TLDs. + * Updated the list of new gTLDs. + + -- Marco d'Itri Sun, 25 Jan 2015 04:07:20 +0100 + whois (5.2.3) unstable; urgency=medium * Added the .gw TLD server. From a14392fa2af25267013eb4d63cd6f87de7a4c688 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Tue, 3 Mar 2015 02:41:34 +0100 Subject: [PATCH 06/20] Add new recovered IPv4 allocations --- ip_del_recovered.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ip_del_recovered.h b/ip_del_recovered.h index d10cd0a..04c71d4 100644 --- a/ip_del_recovered.h +++ b/ip_del_recovered.h @@ -2,9 +2,13 @@ { 736886784UL, 737411071UL, "whois.apnic.net" }, { 737476608UL, 738000895UL, "whois.apnic.net" }, { 738066432UL, 738197503UL, "whois.apnic.net" }, +{ 755236864UL, 755499007UL, "whois.lacnic.net" }, +{ 755499008UL, 756023295UL, "whois.ripe.net" }, { 756023296UL, 757071871UL, "whois.arin.net" }, { 757071872UL, 759169023UL, "whois.arin.net" }, { 759169024UL, 759238655UL, "whois.apnic.net" }, +{ 759431168UL, 759693311UL, "whois.lacnic.net" }, +{ 759693312UL, 760217599UL, "whois.arin.net" }, { 760217600UL, 761266175UL, "whois.ripe.net" }, { 761266176UL, 762314751UL, "whois.afrinic.net" }, { 762314752UL, 763363327UL, "whois.apnic.net" }, @@ -12,6 +16,8 @@ { 765460480UL, 767557631UL, "whois.lacnic.net" }, { 767557632UL, 769589247UL, "whois.afrinic.net" }, { 769654784UL, 770703359UL, "whois.lacnic.net" }, +{ 770703360UL, 771227647UL, "whois.afrinic.net" }, +{ 771227648UL, 771751935UL, "whois.apnic.net" }, { 2523594752UL, 2523660287UL, "whois.apnic.net" }, { 2525036544UL, 2525102079UL, "whois.apnic.net" }, { 2532442112UL, 2532507647UL, "whois.apnic.net" }, From 1f4a78570b5a9dd2d6a1a0e458eaca7769430020 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Tue, 3 Mar 2015 02:42:26 +0100 Subject: [PATCH 07/20] Update the list of new gTLDs --- new_gtlds_list | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/new_gtlds_list b/new_gtlds_list index 5e571f8..025b7c9 100644 --- a/new_gtlds_list +++ b/new_gtlds_list @@ -16,6 +16,7 @@ allfinanz alsace amsterdam android +apartments aquarelle archi army @@ -37,6 +38,7 @@ berlin best bid bike +bingo bio black blackfriday @@ -44,6 +46,7 @@ bloomberg blue bmw bnpparibas +boats boo boutique brussels @@ -58,6 +61,7 @@ cal camera camp cancerresearch +canon capetown capital caravan @@ -68,11 +72,14 @@ careers cartier casa cash +casino catering +cbn center ceo cern channel +chat cheap christmas chrome @@ -100,6 +107,7 @@ contractors cooking cool country +courses credit creditcard cricket @@ -153,6 +161,7 @@ exchange expert exposed fail +fans farm fashion feedback @@ -169,6 +178,7 @@ flowers flsmidth fly foo +football forsale foundation frl @@ -180,6 +190,7 @@ gal gallery garden gbiz +gdn gent ggee gift @@ -192,6 +203,7 @@ globo gmail gmo gmx +goldpoint goog google gop @@ -244,6 +256,7 @@ kiwi koeln krd kred +kyoto lacaixa land lat @@ -298,9 +311,11 @@ new nexus ngo nhk +nico ninja nra nrw +ntt nyc okinawa one @@ -366,9 +381,11 @@ saarland sale samsung sarl +saxo sca scb schmidt +school schule schwarz science @@ -389,6 +406,9 @@ solutions soy space spiegel +study +style +sucks supplies supply support @@ -403,6 +423,7 @@ tattoo tax technology temasek +tennis tienda tips tires @@ -411,6 +432,7 @@ today tokyo tools top +toshiba town toys trade @@ -496,6 +518,7 @@ xn--zfr164b xyz yachts yandex +yodobashi yoga yokohama youtube From 6d6ecd82462f4e1a5961fcd7bc35eacb4bc95f67 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Tue, 3 Mar 2015 02:48:31 +0100 Subject: [PATCH 08/20] Update TLD servers: ky --- tld_serv_list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tld_serv_list b/tld_serv_list index c07ba85..2b89032 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -192,7 +192,7 @@ .kp NONE # NIC? http://www.star.co.kp/ .kr whois.kr .kw WEB http://www.kw/ -.ky WEB http://kynseweb.messagesecure.com/kywebadmin/ # http://www.icta.ky/ +.ky whois.kyregistry.ky .kz whois.nic.kz .la whois.nic.la .lb WEB http://www.aub.edu.lb/lbdr/ From e530f29b3a7893c55308f4d09e837a27a23fd2b3 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Tue, 3 Mar 2015 02:49:07 +0100 Subject: [PATCH 09/20] New TLD servers: xn--90ais --- tld_serv_list | 1 + 1 file changed, 1 insertion(+) diff --git a/tld_serv_list b/tld_serv_list index 2b89032..97eabc6 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -353,6 +353,7 @@ .xn--45brj9c whois.inregistry.net # India, Bengali AW .xn--80ao21a whois.nic.kz # Kazakhstan .xn--90a3ac whois.rnids.rs # Serbia +.xn--90ais whois.cctld.by # Belarus .xn--clchc0ea0b2g2a9gcd whois.sgnic.sg # Singapore, Tamil .xn--d1alf whois.marnet.mk # Macedonia .xn--fiqs8s cwhois.cnnic.cn # China, Simplified Chinese From 3f5e307f4c8f0fb803b2c897bfc671405d205a7c Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Tue, 3 Mar 2015 02:49:37 +0100 Subject: [PATCH 10/20] Debian changelog for 5.2.5 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index c6d1187..8cf1eb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +whois (5.2.5) unstable; urgency=medium + + * Added the .xn--90ais (.бел, Belarus) TLD server. + * Updated the .ky TLD server. + * Updated the list of new gTLDs. + * Added new recovered IPv4 allocations. + + -- Marco d'Itri Tue, 03 Mar 2015 02:15:57 +0100 + whois (5.2.4) unstable; urgency=medium * Fixed referrals handling for the .cc, .tv a .jobs TLDs. From a1a72cd370258d2f32e0fecae581cac6ed988baf Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 23 Mar 2015 02:53:36 +0100 Subject: [PATCH 11/20] Remove the .tp TLD --- tld_serv_list | 1 - 1 file changed, 1 deletion(-) diff --git a/tld_serv_list b/tld_serv_list index 97eabc6..53020b1 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -296,7 +296,6 @@ .tm whois.nic.tm .tn whois.ati.tn .to whois.tonic.to -.tp NONE # phase out in progress .tr whois.nic.tr .tt WEB http://www.nic.tt/cgi-bin/search.pl .tv VERISIGN tvwhois.verisign-grs.com From 6778197a2ea906c891f92c0839b975aa79a1cd49 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 23 Mar 2015 04:24:51 +0100 Subject: [PATCH 12/20] Update TLD servers: .edu.ph .gov.py --- tld_serv_list | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tld_serv_list b/tld_serv_list index 53020b1..a67f2b5 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -245,6 +245,8 @@ .pe kero.yachay.pe .pf whois.registry.pf .pg NONE # http://www.unitech.ac.pg/ +.edu.ph WEB http://services.ph.net/dns/query.pl +.gov.ph NONE # http://dns.gov.ph/ .ph WEB http://www.dot.ph/whois .pk WEB http://www.pknic.net.pk/ .co.pl whois.co.pl # "unofficial" SLD From 4d3af1a2b979c8c6817c7d351f57de8a25c8756d Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Fri, 6 Mar 2015 01:24:54 +0100 Subject: [PATCH 13/20] Update the list of new gTLDs --- new_gtlds_list | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/new_gtlds_list b/new_gtlds_list index 025b7c9..af23515 100644 --- a/new_gtlds_list +++ b/new_gtlds_list @@ -4,6 +4,7 @@ # Any exceptions can be handled in tld_serv_list as usual, since it will # be checked first. +abbott abogado academy accountants @@ -33,6 +34,7 @@ barclaycard barclays bargains bayern +bbc beer berlin best @@ -78,9 +80,11 @@ cbn center ceo cern +cfd channel chat cheap +chloe christmas chrome church @@ -119,6 +123,7 @@ dabur dad dance dating +datsun day dclk deals @@ -150,7 +155,9 @@ energy engineer engineering enterprises +epson equipment +erni esq estate eurovision @@ -161,6 +168,7 @@ exchange expert exposed fail +fan fans farm fashion @@ -179,6 +187,7 @@ flsmidth fly foo football +forex forsale foundation frl @@ -204,6 +213,7 @@ gmail gmo gmx goldpoint +goo goog google gop @@ -236,6 +246,7 @@ ifm immo immobilien industries +infiniti ing ink institute @@ -244,6 +255,7 @@ international investments irish iwc +java jcb jetzt joburg @@ -264,6 +276,7 @@ latrobe lawyer lds lease +leclerc legal lgbt lidl @@ -280,11 +293,13 @@ ltda luxe luxury madrid +maif maison management mango market marketing +markets marriott media meet @@ -303,16 +318,19 @@ mortgage moscow motorcycles mov +mtpc nagoya navy network neustar new +news nexus ngo nhk nico ninja +nissan nra nrw ntt @@ -321,11 +339,14 @@ okinawa one ong onl +online ooo +oracle organic osaka otsuka ovh +page paris partners parts @@ -335,7 +356,9 @@ photo photography photos physio +piaget pics +pictet pictures pink pizza @@ -397,6 +420,7 @@ shiksha shoes shriram singles +site sky social software @@ -406,6 +430,7 @@ solutions soy space spiegel +spreadbetting study style sucks @@ -421,6 +446,7 @@ taipei tatar tattoo tax +tech technology temasek tennis @@ -436,6 +462,7 @@ toshiba town toys trade +trading training trust tui @@ -474,6 +501,7 @@ works world wtc wtf +xin xn--1qqw23a xn--3bst00m xn--3ds443g @@ -501,6 +529,7 @@ xn--i1b6b1a6a2e xn--io0a7i xn--kput3i xn--mgbab2bd +xn--mxtq1m xn--ngbc5azd xn--nqv7f xn--nqv7fs00ema @@ -513,6 +542,7 @@ xn--unup4y xn--vermgensberater-ctb xn--vermgensberatung-pwb xn--vhquv +xn--vuq861b xn--xhq521b xn--zfr164b xyz From b26a58fd25254ea322dfefab7f92aad109ead5e4 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 23 Mar 2015 04:17:16 +0100 Subject: [PATCH 14/20] Support hiding multiple disclaimers blocks Correctly detecting the disclaimers of some registrars required splitting the CRSNIC/Verisign detection strings in two parts. This code makes the program start looking again for new blocks to hide after the end of the first one. --- whois.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/whois.c b/whois.c index accae8a..903a89d 100644 --- a/whois.c +++ b/whois.c @@ -711,13 +711,13 @@ int hide_line(int *hiding, const char *const line) } else if (*hiding > HIDE_NOT_STARTED) { /* hiding something */ if (*hide_strings[*hiding + 1] == '\0') { /*look for a blank line?*/ if (*line == '\n' || *line == '\r' || *line == '\0') { - *hiding = HIDE_DISABLED; /* stop hiding */ + *hiding = HIDE_NOT_STARTED; /* stop hiding */ return 0; /* but do not hide the blank line */ } } else { /*look for a matching string*/ if (strneq(line, hide_strings[*hiding + 1], strlen(hide_strings[*hiding + 1]))) { - *hiding = HIDE_DISABLED; /* stop hiding */ + *hiding = HIDE_NOT_STARTED; /* stop hiding */ return 1; /* but hide the last line */ } } From 78d2e38a6416b5e2889eac6868afd7c05c384b57 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 23 Mar 2015 04:23:29 +0100 Subject: [PATCH 15/20] Update the disclaimer detection strings When possible they have been future-proofed by hiding everything until the end of the input. --- data.h | 73 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/data.h b/data.h index 4ec505e..402fce5 100644 --- a/data.h +++ b/data.h @@ -1,8 +1,6 @@ /* * RIPE-like servers. * All of them do not understand -V2.0Md with the exception of RA and RIPN. - * 6bone-derived servers will accept the flag with a warning (the flag must - * match /^V [a-zA-Z]{1,4}\d+[\d\.]{0,5}$/). */ /* servers which accept the new syntax (-V XXn.n) */ @@ -24,31 +22,28 @@ const char *ripe_servers[] = { }; const char *hide_strings[] = { - "NOTICE AND TERMS OF USE: You", "", /* NetSol */ - "NOTICE: The expiration date", "reserves the right", /* crsnic */ - "The data in Register", "", /* Register.Com */ - "The Data in the Tucows", "RECORD DOES NOT", - "The information in this whois database", "", /* DOTSTER */ - "This whois service currently only", "top-level domains.", /* NameSecure */ - "The Data in Gabia", "you agree to abide", - "The data contained in GoDaddy.com", "is not the registrant", - "Disclaimer: The Global Name Registry", "for any commercial", - "Access to America Online", "time. By accessing", /* AOL */ - "# Access and use restricted", "", /* GANDI */ - "% The data in the WHOIS database of 1&1 Internet", "", - "The data in this whois database is", NULL, /* enom, activeregistrar.com */ - "The Data in Moniker's WHOIS database", "of Moniker.", - "The Data in OnlineNIC", " By starting this query", - "Interdomain's WHOIS", "DOES NOT SIGNIFY", - "The Data provided by Stargate Holdings", "(2) enable any", - "; This data is provided by domaindiscount24.com", "", - "%% NOTICE: Access to this information is provided", "%% By submitting", /* bookmyname.com */ - "% NOTICE: Access to the domains information", "% this query", /* CORE */ - "The Data in MarkMonitor.com's", "--", /* MarkMonitor */ + "The data in Networksolutions.com's WHOIS database", NULL, + /* Some registrars like .wang copied the first paragraph of this + * disclaimer, so the detection here needs to be split in two parts. */ + "NOTICE: The expiration date", "", /* crsnic */ + "TERMS OF USE: You are not authorized", "reserves the right", /* crsnic */ + "The data in Register.com's WHOIS database", NULL, + "The Data in the Tucows Registrar WHOIS database", NULL, + "The data in NameSecure.com's WHOIS database", NULL, + "The Data in Gabia's WHOIS database", NULL, + "The data contained in GoDaddy.com", NULL, + "Personal data access and use are governed by French", NULL, /* GANDI */ + "The data in this whois database is provided to you", NULL, /* enom */ + "; Please register your domains at; http://www.", NULL, /* key-systems.net */ + "%% NOTICE: Access to this information is provided", NULL, /* bookmyname.com */ + "% NOTICE: Access to the domains information", NULL, /* CORE */ + "The Data in MarkMonitor.com's", NULL, /* MarkMonitor */ "Corporation Service Company(c) (CSC) The Trusted Partner", "Register your domain name at", /* CSC */ - "The data in Networksolutions.com's", "By submitting this query", /* Networksolutions */ - "% Copyright (c)2003 by Deutsche Telekom AG", "% DOMAIN full", /* Deutsche Telekom */ - "# Welcome to the OVH WHOIS Server", "# soumettant une", /* ovh */ + "The data in Networksolutions.com's", NULL, /* Networksolutions */ + "# Welcome to the OVH WHOIS Server", "", /* ovh */ + "TERMS OF USE OF MELBOURNE IT WHOIS DATABASE", NULL, + "The data contained in this Registrar's Whois", NULL, /* wildwestdomains.com */ + "The data in the FastDomain Inc. WHOIS database", NULL, /* gTLDs */ "Access to .AERO WHOIS information", "", @@ -56,13 +51,13 @@ const char *hide_strings[] = { "The .coop registry WHOIS", "VERIFICATION, NOR DO", "%% puntCAT Whois Server", "%% any time.", "This Registry database contains ONLY .EDU", "type: help", /* edu */ - "Access to AFILIAS WHOIS information is provided", "", /* .info */ + "Access to AFILIAS WHOIS information is provided", NULL, /* .info */ "mTLD WHOIS LEGAL STATEMENT", "integrity of the database.", /* .mobi */ - "Access to .ORG WHOIS information", "", - "Access to RegistryPro's Whois", "All rights", /* .pro */ - "Telnic, Ltd., the Registry Operator", "(b) harass any person;", /* .tel */ - "Tralliance, Inc., the Registry", "", /* .travel */ - "Access to .XXX ICM REGISTRY WHOIS", "", /* .xxx */ + "Access to Public Interest Registry WHOIS information", NULL, /* .org */ + "Access to .PRO REGISTRY WHOIS information", "", + "Telnic, Ltd., the Registry Operator for .TEL", NULL, + "Tralliance, Inc., the Registry Operator for .travel", NULL, + "Access to .XXX ICM REGISTRY WHOIS", NULL, /* .xxx */ /* new gTLDs */ "Terms of Use: Users accessing the Donuts WHOIS", NULL, @@ -72,14 +67,20 @@ const char *hide_strings[] = { "The whois information provided on this site", "", /* mm-registry.com */ "; This data is provided by ", NULL, /* ksregistry.net */ "This whois service is provided by CentralNic Ltd", "", + ".Club Domains, LLC, the Registry Operator", NULL, + "% Except for agreed Internet operational purposes", NULL, /* .berlin */ + "TERMS OF USE: The information in the Whois database", NULL, /* .wang */ + "The WHOIS service offered by Neustar, Inc, on behalf", NULL, + "The WHOIS service offered by the Registry Operator", NULL, /* .science */ + "", NULL, /* ccTLDs */ "Access to CCTLD WHOIS information is provided", "", /* Afilias */ - "Access to ASNIC", "by this policy.", /* as */ - "% The WHOIS service offered by DNS.be", "% protect the privacy", /* be */ + "This WHOIS information is provided", NULL, /* as */ + "% The WHOIS service offered by DNS Belgium", "", /* be */ "% The WHOIS service offered by EURid", "% of the database", /* eu */ - "% WHOIS LEGAL STATEMENT AND TERMS & CONDITIONS", "", /* sx */ - "NeuStar, Inc., the Registry", "OF THE AVAILABILITY", /* us */ + "% WHOIS LEGAL STATEMENT AND TERMS & CONDITIONS", NULL, /* sx */ + "NeuStar, Inc., the Registry Administrator for .US", NULL, NULL, NULL }; From 09d4a0fe88e37fc2afd543863b34ae4554ccf2e6 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Sun, 15 Mar 2015 04:17:43 +0100 Subject: [PATCH 16/20] mkpasswd: exit if crypt_gensalt on Solaris fails --- mkpasswd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkpasswd.c b/mkpasswd.c index ffd887e..ce0c763 100644 --- a/mkpasswd.c +++ b/mkpasswd.c @@ -279,8 +279,10 @@ int main(int argc, char *argv[]) } else { #ifdef HAVE_SOLARIS_CRYPT_GENSALT salt = crypt_gensalt(salt_prefix, NULL); - if (!salt) + if (!salt) { perror("crypt_gensalt"); + exit(2); + } #elif defined HAVE_LINUX_CRYPT_GENSALT void *entropy = get_random_bytes(64); From 0c774a2caa4dfbef12d907798a7808070d1bd5b7 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Fri, 6 Mar 2015 01:25:38 +0100 Subject: [PATCH 17/20] Debian changelog for 5.2.6 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8cf1eb7..9892c8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +whois (5.2.6) unstable; urgency=medium + + * Added the .edu.ph TLD server. + * Removed the .gov.py TLD server. (Closes: #780562) + * Updated the list of new gTLDs. + * Implemented hiding multiple disclaimers blocks to improve detection. + * Updated the disclaimer detection strings. + + -- Marco d'Itri Mon, 23 Mar 2015 04:28:39 +0100 + whois (5.2.5) unstable; urgency=medium * Added the .xn--90ais (.бел, Belarus) TLD server. From c5742eb115b4e1d0b6861171932aa46406d6ab87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 24 Mar 2015 17:13:05 +0100 Subject: [PATCH 18/20] Remove bogus hide_strings[] entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The empty starting string matched always and the final NULL string enabled hiding to the end of the response. As a result any response got hidden. Signed-off-by: Petr Písař --- data.h | 1 - 1 file changed, 1 deletion(-) diff --git a/data.h b/data.h index 402fce5..e5c7b01 100644 --- a/data.h +++ b/data.h @@ -72,7 +72,6 @@ const char *hide_strings[] = { "TERMS OF USE: The information in the Whois database", NULL, /* .wang */ "The WHOIS service offered by Neustar, Inc, on behalf", NULL, "The WHOIS service offered by the Registry Operator", NULL, /* .science */ - "", NULL, /* ccTLDs */ "Access to CCTLD WHOIS information is provided", "", /* Afilias */ From ad360dd10457a7a1648ca78aae12a95339b5dad5 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Wed, 25 Mar 2015 22:55:48 +0100 Subject: [PATCH 19/20] Update the list of new gTLDs --- new_gtlds_list | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/new_gtlds_list b/new_gtlds_list index af23515..6794bee 100644 --- a/new_gtlds_list +++ b/new_gtlds_list @@ -10,6 +10,7 @@ academy accountants active actor +ads adult agency airforce @@ -173,6 +174,7 @@ fans farm fashion feedback +film finance financial firmdale @@ -212,7 +214,9 @@ globo gmail gmo gmx +gold goldpoint +golf goo goog google @@ -221,6 +225,7 @@ graphics gratis green gripe +guge guide guitars guru @@ -364,6 +369,7 @@ pink pizza place plumbing +plus pohl poker porn @@ -459,6 +465,7 @@ tokyo tools top toshiba +tours town toys trade From c9af7b9cb6645f29dfe0d8001db7137f89535226 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Wed, 25 Mar 2015 22:56:48 +0100 Subject: [PATCH 20/20] Debian changelog for 5.2.7 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9892c8d..417a0d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +whois (5.2.7) unstable; urgency=medium + + * Removed a bogus disclaimer detection string. + * Updated the list of new gTLDs + + -- Marco d'Itri Wed, 25 Mar 2015 23:04:44 +0100 + whois (5.2.6) unstable; urgency=medium * Added the .edu.ph TLD server.