Imported Debian version 4.7.2v4.7.2

6 files changed, 16 insertions, 7 deletions

diff --git a/data.h b/data.h
index 68b2cde..316582c 100644
--- a/data.h
+++ b/data.h
@@ -16,7 +16,6 @@ const char *ripe_servers[] = {
     "whois.nic.fr",
     "whois.nic.it",
     "whois.telstra.net",
-    "whois.metu.edu.tr",
     "whois.restena.lu",
     "rr.level3.net",		/* 3.0.0a13 */
     "whois.ripn.net",
diff --git a/debian/changelog b/debian/changelog
index cd88607..bf18a0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+whois (4.7.2) unstable; urgency=high
+
+  * whois.metu.edu.tr does not accept anymore RIPE-like queries.
+  * Updated the .bg and .jp TLD servers. (Closes: #301187)
+  * Updated the IPv4 allocations.
+
+ -- Marco d'Itri <md@linux.it>  Thu, 24 Mar 2005 14:33:10 +0100
+
 whois (4.7.1) unstable; urgency=medium
 
   * Added new ASN allocations.
diff --git a/ip_del_list b/ip_del_list
index 1cc7452..66cdbf5 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -151,6 +151,8 @@
 211.176.0.0/12	whois.nic.or.kr
 211.192.0.0/10  whois.nic.or.kr # => 211.255.255.255
 210.0.0.0/7	apnic
+213.154.32.0/19	afrinic
+213.154.64.0/19	afrinic
 212.0.0.0/7	ripe
 214.0.0.0/7	arin	# DoD
 216.0.0.0/8	arin
diff --git a/tld_serv_list b/tld_serv_list
index 49ea309..d30583f 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -59,7 +59,7 @@
 .bd	NONE		# http://www.bttb.net/
 .be	whois.dns.be
 .bf	NONE		# NIC? http://www.onatel.bf/
-.bg	whois.ripe.net
+.bg	whois.register.bg
 #.bh	NONE		# NIC? www.inet.com.bh
 .bi	WEB http://www.nic.bi/Nic_search.asp
 #.bj			# NIC? www.opt.bj
@@ -151,7 +151,7 @@
 .je	whois.channelisles.net
 #.jm			# NIC? uwimona.edu.jm http://nic.jm
 .jo	WEB http://www.nis.jo/dns/	# old: http://amon.nic.gov.jo/dns/
-.jp	whois.nic.ad.jp
+.jp	whois.jprs.jp
 .ke	whois.kenic.or.ke
 .kg	whois.domain.kg
 .kh	NONE		# http://www.mptc.gov.kh/ http://www.nic.net.kh/
diff --git a/whois.1 b/whois.1
index 147d1b7..f05eeb6 100644
--- a/whois.1
+++ b/whois.1
@@ -81,7 +81,8 @@ current system locale and converted to the IDN ASCII Compatible Encoding.
 /etc/whois.conf
 .SH "ENVIRONMENT"
 .IP LANG
-When querying \fIwhois.nic.ad.jp\fP english text is requested unless the
+When querying \fIwhois.nic.ad.jp\fP and \fIwhois.jprs.jp\fP english text
+is requested unless the
 \fILANG\fP environment variable specifies a Japanese locale.
 .IP "WHOIS_SERVER"
 This server will be queried if the program cannot guess where some kind
diff --git a/whois.c b/whois.c
index 54be4db..9bd7cd8 100644
--- a/whois.c
+++ b/whois.c
@@ -379,8 +379,6 @@ const char *whichwhois(const char *s)
 	if (strncasecmp(s, "as", 2) == 0 &&	/* it's an AS */
 		(isasciidigit(s[2]) || s[2] == ' '))
 	    return whereas(atoi(s + 2));
-	else if (strncasecmp(p - 2, "jp", 2) == 0) /* JP NIC handle */
-	    return "whois.nic.ad.jp";
 	if (*s == '!')	/* NSI NIC handle */
 	    return "whois.networksolutions.com";
 	else
@@ -461,7 +459,8 @@ char *queryformat(const char *server, const char *flags, const char *query)
 	    strncasecmp(query, "AS", 2) == 0 && isasciidigit(query[2]))
 	/* FIXME: /e is not applied to .JP ASN */
 	sprintf(buf, "AS %s", query + 2);	/* fix query for DDN */
-    else if (!isripe && strcmp(server, "whois.nic.ad.jp") == 0) {
+    else if (!isripe && (strcmp(server, "whois.nic.ad.jp") == 0 ||
+	    strcmp(server, "whois.jprs.jp") == 0)) {
 	char *lang = getenv("LANG");	/* not a perfect check, but... */
 	if (!lang || (strncmp(lang, "ja", 2) != 0))
 	    sprintf(buf, "%s/e", query);	/* ask for english text */