Imported Debian version 5.0.4

config.h

@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "5.0.3"
+#define VERSION "5.0.4"
 
 /* Configurable features */
 
@@ -58,7 +58,10 @@
 
 /* FIXME: which systems lack this? */
 #define HAVE_GETTIMEOFDAY
+/* FIXME: disabled because it does not parse addresses with a netmask length.
+ * The code using it needs to be either fixed or removed.
 #define HAVE_INET_PTON
+*/
 
 /*
  * Please send patches to correctly ignore old releases which lack a RNG

debian/changelog

@@ -1,3 +1,11 @@
+whois (5.0.4) unstable; urgency=high
+
+  * Added new IPv4 allocations.
+  * Stop using inet_pton to parse IP addresses because it does not work
+    when a netmask length is specified. (Closes: #580633)
+
+ -- Marco d'Itri <md@linux.it>  Tue, 11 May 2010 22:33:37 +0200
+
 whois (5.0.3) unstable; urgency=medium
 
   * Added the .dj, .gl, .xn--mgbaam7a8h (.امارات, United Arabs Emirates),

ip_del_list

@@ -11,6 +11,7 @@
 14.0.0.0/8	apnic
 24.132.0.0/14	ripe
 27.0.0.0/8	apnic
+31.0.0.0/8	ripe
 41.0.0.0/8	afrinic
 43.0.0.0/8	v6nic
 46.0.0.0/8	ripe
@@ -105,6 +106,7 @@
 #171.0.0.0/8	apnic
 175.192.0.0/10	whois.nic.or.kr
 175.0.0.0/8	apnic
+176.0.0.0/8	ripe
 178.0.0.0/8	ripe
 180.0.0.0/8	apnic
 183.96.0.0/11	whois.nic.or.kr

whois.c

@@ -52,6 +52,7 @@
 /* hack */
 #define malloc(s) NOFAIL(malloc(s))
 #define realloc(p, s) NOFAIL(realloc(p, s))
+#define strdup(s) NOFAIL(strdup(s))
 
 /* Global variables */
 int sockfd, verb = 0;

whois.spec

@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 5.0.2
+Version: 5.0.4
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>