Imported Debian version 4.5.21v4.5.21

9 files changed, 116 insertions, 51 deletions

diff --git a/Makefile b/Makefile
index 0b4e5b2..87f09ff 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,9 @@ OPTS=-O2
 # linux (old libc)
 #LDFLAGS=-lintl
 
+# OS/2 EMX
+#LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp
+
 all: whois #pos
 
 whois: whois.c whois.h config.h data.h as_del.h ip_del.h tld_serv.h
diff --git a/config.h b/config.h
index 24ec650..ac2a591 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.5.11"
+#define VERSION "4.5.21"
 
 /* Configurable features */
 
diff --git a/data.h b/data.h
index 336394c..704e0d0 100644
--- a/data.h
+++ b/data.h
@@ -59,6 +59,7 @@ const char *hide_strings[] = {
     "The Data in Gabia", "you agree to abide",
     "NeuLevel, Inc., the Registry Operator", "whatsoever, you agree",
     "NOTICE: Access to .INFO WHOIS", "time. By submitting",
+    "Disclaimer: The Global Name Registry", "for any commercial",
     NULL, NULL
 };
 
diff --git a/debian/changelog b/debian/changelog
index 96961c0..1825458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+whois (4.5.21) unstable; urgency=medium
+
+  * Fixed stupid bug. (Closes: #132067).
+  * Added .re and .pm TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Sun,  3 Feb 2002 17:28:02 +0100
+
+whois (4.5.20) unstable; urgency=medium
+
+  * Updated .dk TLD server (Closes: #130795).
+  * Added .ci, .mu and .sr TLD servers
+  * Fixed parsing of some IPv6 addresses.
+
+ -- Marco d'Itri <md@linux.it>  Sat,  2 Feb 2002 00:56:56 +0100
+
+whois (4.5.19) unstable; urgency=medium
+
+  * Added .aero, .coop, .name and .pro TLD servers.
+  * Added more APNIC and JPNIC netblocks.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 15 Jan 2002 21:55:45 +0100
+
+whois (4.5.18) unstable; urgency=medium
+
+  * Added more KRNIC netblocks.
+
+ -- Marco d'Itri <md@linux.it>  Tue,  8 Jan 2002 19:29:12 +0100
+
+whois (4.5.17) unstable; urgency=medium
+
+  * Updated .dk and .edu TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Wed,  2 Jan 2002 05:27:23 +0100
+
+whois (4.5.16) unstable; urgency=low
+
+  * Added 220.0.0.0/8.
+
+ -- Marco d'Itri <md@linux.it>  Fri,  7 Dec 2001 03:43:18 +0100
+
+whois (4.5.15) unstable; urgency=medium
+
+  * Added .museum TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 18 Nov 2001 15:12:52 +0100
+
 whois (4.5.14) unstable; urgency=medium
 
   * Added 219.0.0.0/8.
@@ -9,7 +55,7 @@ whois (4.5.14) unstable; urgency=medium
 whois (4.5.13) unstable; urgency=medium
 
   * Fixed "Password: " prompt printing when using mkpasswd --stdin.
-  * Update .hm TLD server (Closes: #115719).
+  * Updated .hm TLD server (Closes: #115719).
 
  -- Marco d'Itri <md@linux.it>  Fri,  5 Oct 2001 00:57:26 +0200
 
diff --git a/debian/control b/debian/control
index 1e53b8f..b617c3c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: whois
 Section: net
 Priority: standard
 Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.1.0.0
+Standards-Version: 3.5.6.0
 Build-Depends: debhelper, gettext
 
 Package: whois
diff --git a/ip_del_list b/ip_del_list
index dfba548..b960558 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -1,6 +1,8 @@
 24.192.0.0/14	apnic
 24.132.0.0/14	ripe
 61.112.0.0/12	whois.nic.ad.jp
+61.192.0.0/12	whois.nic.ad.jp		# => 61.207
+61.208.0.0/13	whois.nic.ad.jp		# => 61.215
 61.0.0.0/8	apnic
 62.0.0.0/8	ripe
 # broken?
@@ -8,7 +10,8 @@
 80.0.0.0/7	ripe
 0.0.0.0/2	arin	# all other A classes are managed by ARIN
 ## The B class space is a mess :-( - something could still be missing
-## I add here only netblocks split among customers in the RIPE DB.
+## I add here only netblocks allocated to multiple LIRs by the RIRs.
+133.0.0.0/8	whois.nic.ad.jp
 139.20.0.0/14	ripe
 139.24.0.0/14	ripe
 139.28.0.0/15	ripe
@@ -63,9 +66,19 @@
 200.20.0.0/16	whois.nic.br
 200.128.0.0/9	whois.nic.br
 200.0.0.0/7	arin
-# 203.0.0.0/10 has been moved from aunic to apnic, but the records in
-# the telstra database appears to be more detailed.
-# See http://www.apnic.net/db/aunic/ for details.
+202.11.0.0/16	whois.nic.ad.jp
+202.13.0.0/16	whois.nic.ad.jp
+202.15.0.0/16	whois.nic.ad.jp
+202.16.0.0/14	whois.nic.ad.jp
+202.23.0.0/16	whois.nic.ad.jp
+202.24.0.0/15	whois.nic.ad.jp
+202.26.0.0/16	whois.nic.ad.jp
+202.30.0.0/15	whois.nic.or.kr
+202.32.0.0/14	whois.nic.ad.jp
+202.48.0.0/16	whois.nic.ad.jp
+202.39.128.0/17	twnic
+202.208.0.0/12	whois.nic.ad.jp
+202.224.0.0/11	whois.nic.ad.jp		# => 202.255
 203.27.128.0/18	telstra
 203.35.0.0/16	telstra
 203.36.0.0/14	telstra
@@ -76,23 +89,10 @@
 203.58.128.0/17	telstra
 203.58.32.0/19	telstra
 203.58.64.0/19	telstra
+# 203.0.0.0/10 has been moved from aunic to apnic, but the records in
+# the telstra database appears to be more detailed.
+# See http://www.apnic.net/db/aunic/ for details.
 203.0.0.0/10	apnic
-202.11.0.0/16	whois.nic.ad.jp
-202.13.0.0/16	whois.nic.ad.jp
-202.15.0.0/16	whois.nic.ad.jp
-202.16.0.0/14	whois.nic.ad.jp
-202.23.0.0/16	whois.nic.ad.jp
-202.24.0.0/15	whois.nic.ad.jp
-202.26.0.0/16	whois.nic.ad.jp
-202.32.0.0/14	whois.nic.ad.jp
-202.48.0.0/16	whois.nic.ad.jp
-202.30.0.0/15	whois.nic.or.kr
-202.39.128.0/17	twnic
-202.208.0.0/14	whois.nic.ad.jp
-202.224.0.0/15	whois.nic.ad.jp
-202.230.0.0/15	whois.nic.ad.jp
-202.232.0.0/13	whois.nic.ad.jp
-202.240.0.0/12	whois.nic.ad.jp
 203.66.0.0/16	twnic
 203.69.0.0/16	twnic
 203.74.0.0/15	twnic
@@ -117,18 +117,18 @@
 210.120.0.0/14	whois.nic.or.kr	# => 210.123.255.255	
 210.128.0.0/11	whois.nic.ad.jp
 210.160.0.0/12	whois.nic.ad.jp
-210.224.0.0/15	whois.nic.ad.jp
-210.226.0.0/15	whois.nic.ad.jp
-210.228.0.0/14	whois.nic.ad.jp
-210.232.0.0/13	whois.nic.ad.jp
 210.178.0.0/15	whois.nic.or.kr
 210.180.0.0/14	whois.nic.or.kr
 210.188.0.0/14	whois.nic.ad.jp
 210.196.0.0/14	whois.nic.ad.jp
 210.204.0.0/14	whois.nic.or.kr
 210.216.0.0/13	whois.nic.or.kr	# => 210.223.255.255
+210.224.0.0/12	whois.nic.ad.jp	# => 210.239.255.255
+# some more TWNIC blocks are scattered here
+210.240.0.0/16	twnic
+210.241.0.0/15	twnic
 210.241.224.0/19 twnic
-210.242.0.0/16	twnic
+210.242.0.0/15	twnic
 210.248.0.0/13	whois.nic.ad.jp
 211.0.0.0/12	whois.nic.ad.jp
 211.16.0.0/14	whois.nic.ad.jp
@@ -137,17 +137,21 @@
 211.32.0.0/11	whois.nic.or.kr	# => 211.63.255.255
 211.75.0.0/16	twnic
 211.72.0.0/16	twnic
-211.120.0.0/13	whois.nic.ad.jp
-211.128.0.0/13	whois.nic.ad.jp
 211.104.0.0/13	whois.nic.or.kr
 211.112.0.0/13	whois.nic.or.kr	# => 211.119.255.255
+211.120.0.0/13	whois.nic.ad.jp
+211.128.0.0/13	whois.nic.ad.jp
 211.168.0.0/13	whois.nic.or.kr
 211.176.0.0/12	whois.nic.or.kr
-211.192.0.0/13	whois.nic.or.kr	# => 211.199.255.255	
-210.248.0.0/13	whois.nic.ad.jp
+211.192.0.0/10  whois.nic.or.kr # => 211.255.255.255
 210.0.0.0/7	apnic
 212.0.0.0/7	ripe
 214.0.0.0/7	arin	# DoD
 216.0.0.0/8	arin
 217.0.0.0/8	ripe
-219.0.0.0/8	apnic
+218.216.0.0/13	apnic
+218.224.0.0/13	apnic
+218.40.0.0/13	whois.nic.ad.jp
+218.47.0.0/13	whois.nic.or.kr
+218.0.0.0/7	apnic
+220.0.0.0/8	apnic
diff --git a/tld_serv_list b/tld_serv_list
index 39baf17..7ea2d12 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -22,12 +22,19 @@
 .com	CRSNIC
 .net	CRSNIC
 .org	CRSNIC
-.edu	CRSNIC
+.edu	whois.educause.net
 .gov	whois.nic.gov
 .int	whois.icann.org
 .mil	whois.nic.mil
-.info	whois.afilias.info
+# whois server not yet available, see also http://www.nic.aero/whoswho.php
+.aero	whois.nic.aero
 .biz	whois.nic.biz
+.coop	whois.nic.coop
+.info	whois.afilias.info
+.museum	whois.museum
+.name	whois.nic.name
+# not yet delegated, I hope they will not screw up the hostname
+.pro	whois.nic.pro
 .ac	whois.nic.ac
 .ad	NONE		# www.nic.ad
 .ae	WEB http://cc.emirates.net.ae/Customer_care/cc_card/check_domains.choose_domains/
@@ -72,7 +79,7 @@
 .cf	WEB http://www.nic.cf/whois.php3
 .cg	WEB http://www.nic.cg/cgi-bin/whoiscg.pl
 .ch	whois.nic.ch
-.ci	NONE		# www.nic.ci
+.ci	www.nic.ci
 .ck	whois.nic.ck
 .cl	whois.nic.cl
 .cm	NONE		# http://info.intelcam.cm
@@ -89,7 +96,7 @@
 .cz	whois.nic.cz
 .de	whois.denic.de
 .dj	NONE		# www.nic.dj (NOT YET)
-.dk	whois.dk-hostmaster.dk
+.dk	WEB http://www.dk-hostmaster.dk/dkwhois.php?lang=eng
 .dm	NONE		# www.domains.dm ?
 .do	WEB http://www.nic.do
 .dz	NONE
@@ -116,7 +123,7 @@
 .gh	NONE		# http://www.ghana.com/domreg.html
 .gi	NONE		# http://www.gibnet.gi/nic/
 .gl	whois.ripe.net
-.gm	whois.ripe.net
+.gm	whois.ripe.net	# www.nic.gm
 .gn	NONE		# http://www.psg.com/dns/gn/
 #.gp			# www.nic.gp - broken like mq
 #.gq			# NO NIC http://www.intnet.gq
@@ -168,7 +175,7 @@
 .lu	whois.restena.lu
 .lv	whois.ripe.net
 .ly	WEB http://www.lydomains.com/whois.asp
-#.ma			# NIC?
+#.ma			# NIC? http://www.anrt.net.ma/
 .mc	whois.ripe.net
 .md	WEB http://www.nic.md/search.html
 .mg	NONE		# www.nic.mg
@@ -183,7 +190,7 @@
 .mr	NONE		# http://www.univ-nkc.mr/nic_mr.html
 .ms	whois.adamsnames.tc
 .mt	WEB http://www.um.edu.mt/nic/dir/
-.mu	NONE		# http://www.posix.co.za/mu/
+.mu	WEB http://www.nic.mu/cgi-bin/mu_whois.cgi
 #.mv			# NIC? dhiraagu.com.mv
 .mw	WEB http://www.tarsus.net/whois/
 .mx	whois.nic.mx
@@ -209,7 +216,7 @@
 .ph	WEB http://www.names.ph/search.html
 #.pk	whois.pknic.net.pk	# the host does not exist anymore
 .pl	whois.dns.pl
-#.pm			# NIC-FR! http://www.nic.pm
+.pm	whois.nic.fr
 .pn	NONE		# www.nic.pn
 .pr	NONE		# http://www.uprr.pr/main.html
 .ps	WEB http://www.nic.ps/whois/
@@ -217,7 +224,7 @@
 .pw	whois.nic.pw
 .py	WEB http://www.nic.py/consultas/
 .qa	NONE		# http://www.qatar.net.qa/services/virtual.htm
-#.re			# NIC-FR!
+.re	whois.nic.fr
 .ro	whois.rotld.ro
 .ru	whois.ripn.net
 .rw	WEB http://www.nic.rw/cgi-bin/whoisrw.pl
@@ -235,7 +242,7 @@
 .sm	whois.ripe.net
 .sn	NONE		# www.nic.sn
 .so	NONE		# www.nic.so - no country, no NIC
-.sr	NONE		# www.nic.sr - opens september 2001
+.sr	whois.register.sr
 .st	whois.nic.st
 .su	whois.ripn.net
 .sv	WEB http://www.uca.edu.sv/dns/	# http://www.svnet.org.sv/
@@ -317,3 +324,4 @@
 -nicat	whois.nic.at
 -il	whois.isoc.org.il
 -lrms	whois.afilias.net
+-tw	whois.twnic.net
diff --git a/whois.c b/whois.c
index 70cbc23..c14a2b8 100644
--- a/whois.c
+++ b/whois.c
@@ -151,10 +151,10 @@ int main(int argc, char *argv[])
 #endif
 
     if (!server) {
-	char *p;
-	p = normalize_domain(qstring);
-	server = whichwhois(p);
-	free(p);
+	char *tmp;
+	tmp = normalize_domain(qstring);
+	server = whichwhois(tmp);
+	free(tmp);
 	switch (server[0]) {
 	    case 0:
 		if (!(server = getenv("WHOIS_SERVER")))
@@ -282,11 +282,14 @@ const char *whichwhois(const char *s)
 
     /* IPv6 address */
     if (strchr(s, ':')) {
-	if (strncasecmp(s, "2001:2", 6) == 0)	/* XXX ugly hack! */
+	if (strncasecmp(s, "2001:2", 6) == 0 ||	/* XXX ugly hack! */
+	    strncasecmp(s, "2001:02", 6) == 0)
 	    return "whois.apnic.net";
-	if (strncasecmp(s, "2001:4", 6) == 0)
+	if (strncasecmp(s, "2001:4", 6) == 0 ||
+	    strncasecmp(s, "2001:04", 6) == 0)
 	    return "whois.arin.net";
-	if (strncasecmp(s, "2001:6", 6) == 0)
+	if (strncasecmp(s, "2001:6", 6) == 0 ||
+	    strncasecmp(s, "2001:06", 6) == 0)
 	    return "whois.ripe.net";
 	/* if (strncasecmp(s, "3ffe", 4) == 0) */
 	    return "whois.6bone.net";
diff --git a/whois.spec b/whois.spec
index 6aed1d9..12fb09e 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.5.8
+Version: 4.5.19
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>