Imported Debian version 4.7.6v4.7.6

9 files changed, 27 insertions, 15 deletions

diff --git a/as_del_list b/as_del_list
index 4378615..fb018a8 100644
--- a/as_del_list
+++ b/as_del_list
@@ -53,6 +53,7 @@
 34515	34519	afrinic
 33792	35839	ripe
 36864	37887	afrinic
+37888	38911	apnic
 
 # catch all: everything else comes from ARIN
 1	37887	arin
diff --git a/config.h b/config.h
index d29a28f..b10ea54 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.7.5"
+#define VERSION "4.7.6"
 
 /* Configurable features */
 
diff --git a/data.h b/data.h
index 655809b..01e6380 100644
--- a/data.h
+++ b/data.h
@@ -30,12 +30,12 @@ const char *ripe_servers[] = {
 
 const char *hide_strings[] = {
     "NOTICE AND TERMS OF USE: You", "Network Solutions reserves",/* Verisign */
-    "NOTICE: The expiration date", "Registrars.",		/* crsnic */
+    "NOTICE: The expiration date", "reserves the right to",	/* crsnic */
     "NOTICE: Access to .ORG WHOIS", "time. By submitting",	/* org */
     "NOTICE: Access to .INFO WHOIS", "time. By submitting",	/* info */
     "This Registry database contains ONLY .EDU", "type: help",	/* edu */
     "The data in Register", "By submitting",		    /* REGISTER.COM */
-    "The Data in the Tucows", "RECORD DOES NOT",		/* OPENSRS */
+    "The Data in the Tucows", "RECORD DOES NOT",		/* tucows */
     " The data contained in the WHOIS", "Please limit your",	/* DOTSTER */
     "This whois service currently only", "top-level domains.",
     "Signature Domains' Whois Service", "agree to abide by the above",
@@ -46,10 +46,7 @@ const char *hide_strings[] = {
     "Access to America Online", "time. By accessing",		/* AOL */
     "% Access and use restricted", "% http://www.icann",	/* GANDI */
     "NeuStar, Inc., the Registry", "rules.  For details",	/* us */
-#if 0
-    // This must be disabled because whois.bizcn.com uses a similar text
-    "The data in this whois", "using our Whois information",	/* enom */
-#endif
+    "The data in this whois database is", "Version 6.",		/* enom */
     "By submitting a WHOIS query, you agree you will", "LACK OF A DOMAIN",		/* directNIC */
     "The Data in Moniker.com", "this query, you agree",
     "The Data in OnlineNIC", "    By starting this query",	/* OnlineNIC */
@@ -64,7 +61,8 @@ const char *hide_strings[] = {
 const char *nic_handles[] = {
     "net-",	"whois.arin.net",
     "netblk-",	"whois.arin.net",
-    "lim-",	"whois.ripe.net",
+    "poem-",	"whois.ripe.net",
+    "form-",	"whois.ripe.net",
 #if 0
     // commented until somebody will explain the query format for these
     "coco-",	"whois.corenic.net",
diff --git a/debian/changelog b/debian/changelog
index d69f757..035e29a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+whois (4.7.6) unstable; urgency=medium
+
+  * Added new ASN and IP allocations.
+  * Updated the .tv TLD server.
+  * Added support for poem- and form- RIPE objects.
+
+ -- Marco d'Itri <md@linux.it>  Fri,  1 Jul 2005 18:42:03 +0200
+
 whois (4.7.5) unstable; urgency=high
 
   * Updated the .in TLD server. (Closes: #308609)
diff --git a/ip6_del_list b/ip6_del_list
index 1fdd144..dedc0e6 100644
--- a/ip6_del_list
+++ b/ip6_del_list
@@ -1,4 +1,4 @@
-# http://www.iana.org./assignments/ipv6-tla-assignments
+# http://www.iana.org/assignments/ipv6-unicast-address-assignments
 # The parser is very simple-minded and wants the two first components of
 # addresses. It does not deal with networks == 0 or > 24 bit.
 
@@ -34,6 +34,8 @@
 
 2003:0000::/18	ripe
 
+2400:0000::/18	apnic
+
 2600:0000::/12	arin
 #2600:0000::/22	arin
 #2604:0000::/22	arin
@@ -41,6 +43,7 @@
 #260C:0000::/22	arin
 
 2A00:0000::/21	ripe
+2A01:0000::/23	ripe
 
 3FFE:0000::/16	6bone
 
diff --git a/ip_del_list b/ip_del_list
index 8adf1e5..1856891 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -17,7 +17,7 @@
 60.0.0.0/7	apnic
 62.0.0.0/8	ripe
 80.0.0.0/5	ripe			# => 87.255.255.255
-88.0.0.0/8	ripe
+88.0.0.0/6	ripe			# => 91.255.255.254
 124.0.0.0/7	apnic
 126.0.0.0/8	apnic
 96.0.0.0/3	UNALLOCATED		# => 127.215.255.255
@@ -72,8 +72,10 @@
 169.208.0.0/12	apnic
 171.16.0.0/12	ripe
 171.32.0.0/15	ripe
-# 173 -> 190 reserved
+# 173 -> 187 reserved
 188.0.0.0/8	ripe # transferred from ARIN to to RIPE
+189.0.0.0/8	lacnic
+190.0.0.0/8	lacnic
 ## All other B class addresses are supposed to be allocated by ARIN
 ## We know that many of them are not, but they can't all be listed here
 128.0.0.0/2	arin
diff --git a/mkpasswd.c b/mkpasswd.c
index bf549c1..130b377 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
 		exit(2);
 	    }
 
-	    p = password;
+	    p = (unsigned char *)password;
 	    while (*p) {
 		if (*p == '\n') {
 		    *p = '\0';
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
     }
 
     {
-	unsigned char *pw;
+	char *pw;
 	pw = malloc(strlen(salt_prefix) + strlen(salt) + 1);
 	*pw = '\0';
 	strcat(pw, salt_prefix);
diff --git a/tld_serv_list b/tld_serv_list
index 83a42f2..d6c286b 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -262,7 +262,7 @@
 .tp	whois.nic.tp
 .tr	whois.metu.edu.tr
 .tt	WEB http://www.nic.tt/cgi-bin/search.pl
-.tv	whois.tv
+.tv	whois.nic.tv
 .tw	whois.twnic.net
 .tz	NONE		# http://www.psg.com/dns/tz/
 .ua	whois.net.ua
diff --git a/whois.spec b/whois.spec
index b9d359a..053e5e3 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.7.5
+Version: 4.7.6
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>