Imported Debian version 4.5.29v4.5.29

9 files changed, 54 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index 87f09ff..6ef8a30 100644
--- a/Makefile
+++ b/Makefile
@@ -8,16 +8,20 @@ OPTS=-O2
 # linux (old libc)
 #LDFLAGS=-lintl
 
+# FreeBSD
+#LDFLAGS=-L/usr/local/lib -lgnugetopt -lintl
+#CFLAGS=-I/usr/local/include
+
 # 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
-	$(CC) $(OPTS) whois.c -o whois $(LDFLAGS)
+	$(CC) $(CFLAGS) $(OPTS) whois.c -o whois $(LDFLAGS)
 
 mkpasswd: mkpasswd.c
-	$(CC) $(OPTS) mkpasswd.c -o mkpasswd -lcrypt
+	$(CC) $(CFLAGS) $(OPTS) mkpasswd.c -o mkpasswd -lcrypt
 
 as_del.h: as_del_list make_as_del.pl
 	perl make_as_del.pl < as_del_list > as_del.h
diff --git a/TODO b/TODO
index 668b2a1..4aa5981 100644
--- a/TODO
+++ b/TODO
@@ -8,3 +8,5 @@ Will anybody contribute it?
 Add Exodus rwhois server (e.g. 216.35.0.0/16).
 Add rwhois.verio.net:4321 (e.g. 192.204.0.0/16).
 
+Support queries for "AS8627:fltr-TRANSIT-OUT".
+
diff --git a/config.h b/config.h
index 3615667..5bb0345 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.5.26"
+#define VERSION "4.5.29"
 
 /* Configurable features */
 
@@ -23,6 +23,14 @@
 # define ENABLE_NLS
 #endif
 
+#ifdef __FreeBSD__
+/* which versions? */
+# define HAVE_GETOPT_LONG
+# define HAVE_GETADDRINFO
+# define ENABLE_NLS
+# define LOCALEDIR "/usr/local/share/locale"
+#endif
+
 /* needs unistd.h */
 #ifdef _ISO_CPP_14882_1998
 /* Solaris 8 and better. What else? */
@@ -31,7 +39,7 @@
 
 #if defined __GLIBC__
 # define HAVE_GETOPT_LONG
-# if defined __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
 #  define HAVE_GETADDRINFO
 # endif
 #endif
diff --git a/data.h b/data.h
index 29e7119..8472bd3 100644
--- a/data.h
+++ b/data.h
@@ -52,6 +52,7 @@ const char *rwhois_servers[] = {
 const char *hide_strings[] = {
     "The Data in the VeriSign", "terms at any time.",
     "The data in Register", "By submitting",
+    "The Data in the Tucows", "RECORD DOES NOT",
     " The data contained in Dotster", "Please limit your",
     "This whois service currently only", "top-level domains.",
     "Signature Domains' Whois Service", "agree to abide by the above",
diff --git a/debian/changelog b/debian/changelog
index 11ee6df..5ea8a48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+whois (4.5.29) unstable; urgency=medium
+
+  * Fixed mkpasswd -H (Closes: #149071).
+  * Updated .dk and .pk TLD servers (Closes: #155897).
+  * Updated LANIC and telstra IP allocations.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 22 Jun 2002 13:02:43 +0200
+
 whois (4.5.28) unstable; urgency=medium
 
   * Updated .tt TLD server (Closes: #148771).
diff --git a/ip_del_list b/ip_del_list
index 0463917..f79b148 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -9,7 +9,7 @@
 # 63.208.0.0/13	rr.level3.net
 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
+## The B classes space is a mess :-( - something could still be missing
 ## 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
@@ -50,7 +50,7 @@
 169.208.0.0/12	apnic
 171.16.0.0/12	ripe
 171.32.0.0/15	ripe
-## The C class space is cleanly delegated and the data here should be complete
+## The C classes space is cleanly delegated and the data here should be complete
 192.71.0.0/16	ripe
 192.72.0.0/16	whois.seed.net.tw	# NETBLK-SEED-NETS
 192.106.0.0/16	ripe
@@ -68,7 +68,8 @@
 200.18.0.0/15	whois.nic.br
 200.20.0.0/16	whois.nic.br
 200.128.0.0/9	whois.nic.br
-200.0.0.0/7	arin
+200.0.0.0/8	lacnic
+#201.0.0.0/8	reserved
 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
@@ -82,19 +83,19 @@
 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
-203.40.0.0/13	telstra
-203.48.0.0/14	telstra
-203.52.0.0/15	telstra
-203.54.0.0/16	telstra
-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.27.128.0/18	telstra
+#203.35.0.0/16	telstra
+#203.36.0.0/14	telstra
+#203.40.0.0/13	telstra
+#203.48.0.0/14	telstra
+#203.52.0.0/15	telstra
+#203.54.0.0/16	telstra
+#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
 203.66.0.0/16	twnic
 203.69.0.0/16	twnic
@@ -152,9 +153,7 @@
 214.0.0.0/7	arin	# DoD
 216.0.0.0/8	arin
 217.0.0.0/8	ripe
-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
+220.0.0.0/7	apnic
diff --git a/mkpasswd.c b/mkpasswd.c
index 978725d..e66d828 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -33,14 +33,12 @@
 static struct option longopts[] = {
     {"hash",		optional_argument,	NULL, 'H'},
     {"help",		no_argument,		NULL, 'h'},
-    {"stdin",		no_argument,		NULL, 's'},
     {"password-fd",	required_argument,	NULL, 'P'},
+    {"stdin",		no_argument,		NULL, 's'},
     {"salt",		required_argument,	NULL, 'S'},
     {"version",		no_argument,		NULL, 'V'},
     {NULL,		0,			NULL, 0  }
 };
-#else
-#error xXXX
 #endif
 
 static char valid_salts[] = "abcdefghijklmnopqrstuvwxyz"
@@ -81,10 +79,10 @@ int main(int argc, char *argv[])
     textdomain(NLS_CAT_NAME);
 #endif
 
-    while ((ch = GETOPT_LONGISH(argc, argv, "hHP:sS:V", longopts, 0)) > 0) {
+    while ((ch = GETOPT_LONGISH(argc, argv, "hH:P:sS:V", longopts, 0)) > 0) {
 	switch (ch) {
 	case 'H':
-	    if (!optarg) {
+	    if (!optarg || strcasecmp("help", optarg) == 0) {
 		display_algorithms();
 		exit(0);
 	    }
diff --git a/tld_serv_list b/tld_serv_list
index 9c1d2ce..f00f3a8 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -96,15 +96,15 @@
 .cz	whois.nic.cz
 .de	whois.denic.de
 .dj	NONE		# www.nic.dj (NOT YET)
-.dk	WEB http://www.dk-hostmaster.dk/dkwhois.php?lang=eng
+.dk	whois.dk-hostmaster.dk
 .dm	NONE		# www.domains.dm ?
 .do	WEB http://www.nic.do
 .dz	NONE
 .ec	WEB http://www.nic.ec
 .ee	WEB http://www.eenet.ee/info/
-#.eg	NONE		# NIC? http://www.frcu.eun.eg
+.eg	NONE		# http://www.ise.org.eg/domain.htm
 #.eh
-#.er	NONE		# NIC? www.noc.net.er (recently connected!)
+.er	NONE		# NO NIC http://www.afridns.org/er/
 .es	WEB http://www.nic.es/whois/
 #.et	NONE		# NIC? www.telecom.net.et
 .fi	WEB http://cgi.ficora.fi/wwwbin/domains.pl?language=eng
@@ -214,7 +214,7 @@
 #.pf			# NIC? mana.pf
 .pg	NONE	# http://www.unitech.ac.pg/Unitech_General/ITS/ITS_Dns.htm
 .ph	WEB http://www.names.ph/search.html
-#.pk	whois.pknic.net.pk	# the host does not exist anymore
+.pk	WEB www.pknic.net.pk
 .pl	whois.dns.pl
 .pm	whois.nic.fr
 .pn	NONE		# 2day.com www.nic.pn
@@ -302,6 +302,7 @@
 -arin	whois.arin.net
 -ripe	whois.ripe.net
 -mnt	whois.ripe.net
+-lacnic	whois.lacnic.net
 -gandi	whois.gandi.net
 -ap	whois.apnic.net
 -au	whois.aunic.net
diff --git a/whois.spec b/whois.spec
index 5fd48e0..7d68ea1 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.5.24
+Version: 4.5.29
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>