[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#782115: marked as done (unblock: whois/5.2.7)

Your message dated Wed, 08 Apr 2015 21:00:44 +0100
with message-id <1428523244.7798.13.camel@adam-barratt.org.uk>
and subject line Re: Bug#782115: unblock: whois/5.2.7
has caused the Debian Bug report #782115,
regarding unblock: whois/5.2.7
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
782115: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782115
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package whois.

Some data updates which significantly improve detection of disclaimer 
strings and a little tweak to the state machine to support them.
The mkpasswd.c bug fix is not relevant on Linux.

Full history at https://github.com/rfc1036/whois/commits .

diff -Nru whois-5.2.5/data.h whois-5.2.7/data.h
--- whois-5.2.5/data.h	2015-01-09 03:49:00.000000000 +0100
+++ whois-5.2.7/data.h	2015-03-25 23:04:07.000000000 +0100
@@ -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 *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 @@
     "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,19 @@
     "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 */
 
     /* 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
 };
diff -Nru whois-5.2.5/debian/changelog whois-5.2.7/debian/changelog
--- whois-5.2.5/debian/changelog	2015-03-03 02:49:57.000000000 +0100
+++ whois-5.2.7/debian/changelog	2015-03-25 23:04:46.000000000 +0100
@@ -1,3 +1,20 @@
+whois (5.2.7) unstable; urgency=medium
+
+  * Removed a bogus disclaimer detection string.
+  * Updated the list of new gTLDs
+
+ -- Marco d'Itri <md@linux.it>  Wed, 25 Mar 2015 23:04:44 +0100
+
+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 <md@linux.it>  Mon, 23 Mar 2015 04:28:39 +0100
+
 whois (5.2.5) unstable; urgency=medium
 
   * Added the .xn--90ais (.бел, Belarus) TLD server.
diff -Nru whois-5.2.5/mkpasswd.c whois-5.2.7/mkpasswd.c
--- whois-5.2.5/mkpasswd.c	2015-01-09 03:49:00.000000000 +0100
+++ whois-5.2.7/mkpasswd.c	2015-03-23 04:32:55.000000000 +0100
@@ -279,8 +279,10 @@
     } 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);
 
diff -Nru whois-5.2.5/new_gtlds_list whois-5.2.7/new_gtlds_list
--- whois-5.2.5/new_gtlds_list	2015-03-03 02:49:57.000000000 +0100
+++ whois-5.2.7/new_gtlds_list	2015-03-25 23:04:07.000000000 +0100
@@ -4,11 +4,13 @@
 # Any exceptions can be handled in tld_serv_list as usual, since it will
 # be checked first.
 
+abbott
 abogado
 academy
 accountants
 active
 actor
+ads
 adult
 agency
 airforce
@@ -33,6 +35,7 @@
 barclays
 bargains
 bayern
+bbc
 beer
 berlin
 best
@@ -78,9 +81,11 @@
 center
 ceo
 cern
+cfd
 channel
 chat
 cheap
+chloe
 christmas
 chrome
 church
@@ -119,6 +124,7 @@
 dad
 dance
 dating
+datsun
 day
 dclk
 deals
@@ -150,7 +156,9 @@
 engineer
 engineering
 enterprises
+epson
 equipment
+erni
 esq
 estate
 eurovision
@@ -161,10 +169,12 @@
 expert
 exposed
 fail
+fan
 fans
 farm
 fashion
 feedback
+film
 finance
 financial
 firmdale
@@ -179,6 +189,7 @@
 fly
 foo
 football
+forex
 forsale
 foundation
 frl
@@ -203,7 +214,10 @@
 gmail
 gmo
 gmx
+gold
 goldpoint
+golf
+goo
 goog
 google
 gop
@@ -211,6 +225,7 @@
 gratis
 green
 gripe
+guge
 guide
 guitars
 guru
@@ -236,6 +251,7 @@
 immo
 immobilien
 industries
+infiniti
 ing
 ink
 institute
@@ -244,6 +260,7 @@
 investments
 irish
 iwc
+java
 jcb
 jetzt
 joburg
@@ -264,6 +281,7 @@
 lawyer
 lds
 lease
+leclerc
 legal
 lgbt
 lidl
@@ -280,11 +298,13 @@
 luxe
 luxury
 madrid
+maif
 maison
 management
 mango
 market
 marketing
+markets
 marriott
 media
 meet
@@ -303,16 +323,19 @@
 moscow
 motorcycles
 mov
+mtpc
 nagoya
 navy
 network
 neustar
 new
+news
 nexus
 ngo
 nhk
 nico
 ninja
+nissan
 nra
 nrw
 ntt
@@ -321,11 +344,14 @@
 one
 ong
 onl
+online
 ooo
+oracle
 organic
 osaka
 otsuka
 ovh
+page
 paris
 partners
 parts
@@ -335,12 +361,15 @@
 photography
 photos
 physio
+piaget
 pics
+pictet
 pictures
 pink
 pizza
 place
 plumbing
+plus
 pohl
 poker
 porn
@@ -397,6 +426,7 @@
 shoes
 shriram
 singles
+site
 sky
 social
 software
@@ -406,6 +436,7 @@
 soy
 space
 spiegel
+spreadbetting
 study
 style
 sucks
@@ -421,6 +452,7 @@
 tatar
 tattoo
 tax
+tech
 technology
 temasek
 tennis
@@ -433,9 +465,11 @@
 tools
 top
 toshiba
+tours
 town
 toys
 trade
+trading
 training
 trust
 tui
@@ -474,6 +508,7 @@
 world
 wtc
 wtf
+xin
 xn--1qqw23a
 xn--3bst00m
 xn--3ds443g
@@ -501,6 +536,7 @@
 xn--io0a7i
 xn--kput3i
 xn--mgbab2bd
+xn--mxtq1m
 xn--ngbc5azd
 xn--nqv7f
 xn--nqv7fs00ema
@@ -513,6 +549,7 @@
 xn--vermgensberater-ctb
 xn--vermgensberatung-pwb
 xn--vhquv
+xn--vuq861b
 xn--xhq521b
 xn--zfr164b
 xyz
diff -Nru whois-5.2.5/tld_serv_list whois-5.2.7/tld_serv_list
--- whois-5.2.5/tld_serv_list	2015-03-03 02:49:57.000000000 +0100
+++ whois-5.2.7/tld_serv_list	2015-03-23 04:32:55.000000000 +0100
@@ -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
@@ -296,7 +298,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
diff -Nru whois-5.2.5/version.h whois-5.2.7/version.h
--- whois-5.2.5/version.h	2015-01-25 04:39:21.000000000 +0100
+++ whois-5.2.7/version.h	2015-03-25 22:57:06.000000000 +0100
@@ -1 +1 @@
-#define VERSION "5.2.4"
+#define VERSION "5.2.7"
diff -Nru whois-5.2.5/whois.c whois-5.2.7/whois.c
--- whois-5.2.5/whois.c	2015-02-19 14:25:13.000000000 +0100
+++ whois-5.2.7/whois.c	2015-03-23 04:32:55.000000000 +0100
@@ -711,13 +711,13 @@
     } 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 */
 	    }
 	}

unblock whois/5.2.7

-- 
ciao,
Marco

Attachment: pgpjEa5tNWZIX.pgp
Description: PGP signature


--- End Message ---
--- Begin Message --- 
On Wed, 2015-04-08 at 02:43 +0200, Marco d'Itri wrote:
> Please unblock package whois.
> 
> Some data updates which significantly improve detection of disclaimer 
> strings and a little tweak to the state machine to support them.

Unblocked.

Regards,

Adam

--- End Message ---
Reply to: