Imported Debian version 5.0.7v5.0.7

9 files changed, 49 insertions, 23 deletions

diff --git a/config.h b/config.h
index 4313c00..f1d8f13 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "5.0.6"
+#define VERSION "5.0.7"
 
 /* Configurable features */
 
diff --git a/debian/changelog b/debian/changelog
index ee3b1b9..11b87d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+whois (5.0.7) unstable; urgency=medium
+
+  * Added new IPv4 allocations.
+  * Added the .xn--j6w193g (.香港, Hong Kong), .xn--kprw13d (.台湾, Taiwan)
+    and .xn--kpry57d (.台灣, Taiwan) TLD servers.
+  * Updated the .bd, .bo, .cm, .co, .cu, .dz, .gr, .hk, .lb, .ni, .rw, .tw
+    and .tz TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 09 Aug 2010 00:58:21 +0200
+
 whois (5.0.6) unstable; urgency=medium
 
   * Added new IPv4 allocations.
diff --git a/debian/control b/debian/control
index aa57c1d..f938941 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.9.0
+Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 5), gettext, libidn11-dev
 
 Package: whois
diff --git a/ip_del_list b/ip_del_list
index c3918c9..f0b0f4a 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -6,15 +6,23 @@
 #
 # http://www.iana.org/assignments/ipv4-address-space
 #
+0.0.0.0/8	UNKNOWN
 1.0.0.0/8	apnic
 2.0.0.0/8	ripe
+5.0.0.0/8	UNALLOCATED
 14.0.0.0/8	apnic
+23.0.0.0/8	UNALLOCATED
 24.132.0.0/14	ripe
 27.0.0.0/8	apnic
 31.0.0.0/8	ripe
+36.0.0.0/8	UNALLOCATED
+37.0.0.0/8	UNALLOCATED
+39.0.0.0/8	UNALLOCATED
 41.0.0.0/8	afrinic
-43.0.0.0/8	v6nic
+42.0.0.0/8	UNALLOCATED
+43.0.0.0/8	whois.nic.ad.jp
 46.0.0.0/8	ripe
+49.0.0.0/8	apnic
 51.0.0.0/8	ripe
 # whois -r -K -h whois.apnic.net -i admin-c IM76-AP
 59.0.0.0/11	whois.nic.or.kr
@@ -31,6 +39,7 @@
 78.0.0.0/7	ripe
 80.0.0.0/4	ripe			# => 95.255.255.255
 96.0.0.0/6	arin			# => 99.255.255.255
+101.0.0.0/8	apnic
 107.0.0.0/8	arin
 108.0.0.0/8	arin
 109.0.0.0/8	ripe
@@ -109,10 +118,12 @@
 176.0.0.0/8	ripe
 177.0.0.0/8	lacnic
 178.0.0.0/8	ripe
+179.0.0.0/8	UNALLOCATED
 180.0.0.0/8	apnic
 181.0.0.0/8	lacnic
 183.96.0.0/11	whois.nic.or.kr
 182.0.0.0/7	apnic
+185.0.0.0/8	UNALLOCATED
 186.0.0.0/7	lacnic
 188.0.0.0/8	ripe # transferred from ARIN to to RIPE
 189.0.0.0/8	lacnic
diff --git a/make_ip_del.pl b/make_ip_del.pl
index 84e4dcf..ed53351 100755
--- a/make_ip_del.pl
+++ b/make_ip_del.pl
@@ -15,6 +15,8 @@ while (<>) {
 		((~(0xffffffff >> $m)) & 0xffffffff) . 'UL, "';
 	if ($s =~ /\./) {
 		print $s;
+	} elsif ($s eq 'UNKNOWN') {
+		print "\\005";
 	} elsif ($s eq 'UNALLOCATED') {
 		print "\\006";
 	} else {
diff --git a/servers_charset.h b/servers_charset.h
index d695f9b..c434013 100644
--- a/servers_charset.h
+++ b/servers_charset.h
@@ -15,7 +15,7 @@
     { "whois.eu",	"utf-8",	NULL },
     { "whois.ficora.fi",	"iso-8859-1",	NULL },
     { "whois.nic.fr",	"iso-8859-1",	NULL },
-    { "whois.hkdnr.net.hk",	"utf-8",	NULL },
+    { "whois.hkirc.hk",	"utf-8",	NULL },
     { "whois.nic.hu",	"iso-8859-1",	NULL },
     { "whois.isnic.is",	"iso-8859-1",	NULL },
     { "whois.jprs.jp",	"iso-2022-jp",	NULL },
@@ -30,6 +30,6 @@
     { "whois.dns.pt",	"iso-8859-1",	NULL },
     { "whois.nic-se.se",	"utf-8",	NULL },
     { "whois.nic.tr",	"utf-8",	NULL },
-    { "whois.twnic.net",	"utf-8",	NULL },
+    { "whois.twnic.net.tw",	"utf-8",	NULL },
     { "whois.net.ua",	"koi8-u",	NULL },
     { "whois.nic.org.uy",	"utf-8",	NULL },
diff --git a/servers_charset_list b/servers_charset_list
index f4d3b03..68d0600 100644
--- a/servers_charset_list
+++ b/servers_charset_list
@@ -17,7 +17,7 @@ whois.eenet.ee		iso-8859-1
 whois.eu		utf-8
 whois.ficora.fi		iso-8859-1
 whois.nic.fr		iso-8859-1
-whois.hkdnr.net.hk	utf-8
+whois.hkirc.hk		utf-8
 whois.nic.hu		iso-8859-1
 whois.isnic.is		iso-8859-1
 whois.jprs.jp		iso-2022-jp
@@ -32,7 +32,7 @@ whois.nic.nu		utf-8
 whois.dns.pt		iso-8859-1
 whois.nic-se.se		utf-8
 whois.nic.tr		utf-8
-whois.twnic.net		utf-8
+whois.twnic.net.tw	utf-8
 whois.net.ua		koi8-u
 whois.nic.org.uy	utf-8
 
diff --git a/tld_serv_list b/tld_serv_list
index ed0d40a..d3d9ca8 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -75,7 +75,7 @@
 .az	WEB http://www.nic.az/AzCheck.htm
 .ba	WEB http://www.nic.ba/stream/whois/
 .bb	WEB http://www.barbadosdomains.net/search_domain.php
-.bd	WEB http://www.whois.com.bd/ # http://www.btcl.net.bd/faq_dotbd.php www.register.com.bd FIXME APPARENTLY NOT OFFICIAL!
+.bd	WEB http://whois.btcl.net.bd/
 .be	whois.dns.be
 .bf	NONE		# http://www.artel.bf/ http://www.onatel.bf/internet/domaine.htm
 .bg	whois.register.bg
@@ -85,7 +85,7 @@
 #.bl
 .bm	WEB http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO
 .bn	NONE		# www.brunet.bn
-.bo	WEB http://www.nic.bo/
+.bo	whois.nic.bo
 .br	whois.nic.br
 .bs	WEB http://www.nic.bs/cgi-bin/search.pl
 .bt	WEB http://www.nic.bt/
@@ -103,13 +103,13 @@
 .ci	www.nic.ci
 .ck	whois.nic.ck
 .cl	whois.nic.cl
-.cm	WEB http://netcom.cm/whois.php
+.cm	whois.netcom.cm
 .edu.cn	whois.edu.cn
 .cn	whois.cnnic.cn
 .uk.co	whois.uk.co
-.co	WEB https://www.nic.co/
+.co	WEB http://www.whois.co/
 .cr	WEB http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
-.cu	WEB http://www.nic.cu/consult.html
+.cu	WEB http://www.nic.cu/
 .cv	NONE		# www.dns.cv?
 .cx	whois.nic.cx
 .cy	WEB http://www.nic.cy/nslookup/online_database.php
@@ -119,7 +119,7 @@
 .dk	whois.dk-hostmaster.dk
 .dm	whois.nic.dm
 .do	WEB http://www.nic.do/whois-h.php3
-.dz	WEB https://www.nic.dz/
+.dz	whois.nic.dz
 .ec	WEB http://www.nic.ec/whois/eng/whois.asp # whois.nic.ec is restricted
 .ee	whois.eenet.ee
 .eg	NONE		# http://lookup.egregistry.eg/english.aspx
@@ -147,13 +147,13 @@
 .gn	NONE		# http://www.psg.com/dns/gn/
 .gp	whois.nic.gp
 .gq	NONE		# NO NIC http://www.getesa.gq/
-.gr	WEB https://grweb.ics.forth.gr/Whois?lang=en
+.gr	WEB https://grweb.ics.forth.gr/whois_en.jsp
 .gs	whois.nic.gs
 .gt	WEB http://www.gt/whois.html
 .gu	WEB http://gadao.gov.gu/domainsearch.htm
 .gw	NONE		# www.gwregister.com
 .gy	whois.registry.gy
-.hk	whois.hkdnr.net.hk
+.hk	whois.hkirc.hk
 .hm	whois.registry.hm
 .hn	AFILIAS		# www.nic.hn
 .hr	WEB http://www.dns.hr/pretrazivanje.html
@@ -185,7 +185,7 @@
 .ky	WEB http://kynseweb.messagesecure.com/kywebadmin/ # http://www.icta.ky/
 .kz	whois.nic.kz
 .la	whois.nic.la
-.lb	WEB http://www.aub.edu.lb/lbdr/search.html
+.lb	WEB http://www.aub.edu.lb/lbdr/
 .lc	AFILIAS
 .li	whois.nic.li
 .lk	whois.nic.lk
@@ -223,7 +223,7 @@
 .ne	NONE		# NIC? http://www.intnet.ne
 .nf	whois.nic.nf
 .ng	whois.register.net.ng
-.ni	WEB http://www.nic.ni/consulta.htm
+.ni	WEB http://www.nic.ni/
 .nl	whois.domain-registry.nl
 .no	whois.norid.no
 .np	WEB http://register.mos.com.np/userSearchInc.asp
@@ -252,7 +252,7 @@
 .rs	WEB http://www.nic.rs/en/whois
 .edu.ru	whois.informika.ru
 .ru	whois.ripn.net
-.rw	WEB http://www.nic.rw/cgi-bin/whoisrw.pl
+.rw	WEB http://www.nic.rw/cgi-bin/whois.pl
 .sa	whois.nic.net.sa
 .sb	whois.coccaregistry.net
 .sc	AFILIAS		# www.nic.sc
@@ -288,8 +288,8 @@
 .tr	whois.nic.tr
 .tt	WEB http://www.nic.tt/cgi-bin/search.pl
 .tv	VERISIGN whois.nic.tv
-.tw	whois.twnic.net
-.tz	WEB http://whois.tznic.or.tz/
+.tw	whois.twnic.net.tw
+.tz	whois.tznic.or.tz
 .ua	whois.net.ua
 .ug	www.registry.co.ug	# this is a whois server too
 .ac.uk	whois.ja.net
@@ -332,10 +332,13 @@
 
 .xn--fiqs8s		cwhois.cnnic.cn		# China
 .xn--fiqz9s		cwhois.cnnic.cn		# China
+.xn--j6w193g		whois.hkirc.hk		# Hong Kong
+.xn--kprw13d		whois.twnic.net.tw	# Taiwan
+.xn--kpry57d		whois.twnic.net.tw	# Taiwan
 .xn--mgbaam7a8h		whois.aeda.net.ae	# United Arab Emirates
 .xn--mgberp4a5d4ar	whois.nic.net.sa	# Saudi Arabia
-.xn--wgbh1c		whois.dotmasr.eg	# Egypt
 .xn--p1ai		whois.ripn.net		# Russian Federation
+.xn--wgbh1c		whois.dotmasr.eg	# Egypt
 
 -dom	whois.networksolutions.com
 -org	whois.networksolutions.com
@@ -354,7 +357,7 @@
 -is	whois.isnic.is
 -kg	whois.domain.kg
 -ti	whois.telstra.net
--tw	whois.twnic.net
+-tw	whois.twnic.net.tw
 -6bone	whois.6bone.net
 -coop	whois.nic.coop
 -cknic	whois.nic.ck
diff --git a/whois.spec b/whois.spec
index 5cc25f2..c7155f8 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 5.0.6
+Version: 5.0.7
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>