Imported Debian version 4.7.22v4.7.22

9 files changed, 98 insertions, 46 deletions

diff --git a/as_del_list b/as_del_list
index 91d5db9..ebc6467 100644
--- a/as_del_list
+++ b/as_del_list
@@ -58,7 +58,7 @@
 36864	37887	afrinic
 37888	38911	apnic
 38912	39935	ripe
-40960	41983	ripe
+40960	44031	ripe
 
 # catch all: everything else comes from ARIN
 1	40959	arin
diff --git a/config.h b/config.h
index eee8946..952dda7 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.7.21"
+#define VERSION "4.7.22"
 
 /* Configurable features */
 
diff --git a/debian/changelog b/debian/changelog
index bdde4ef..353d5dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+whois (4.7.22) unstable; urgency=medium
+
+  * Added new IPv4 allocations.
+  * Added new ASN allocations.
+  * Updated the Polish translation.
+  * Updated the .jobs, .ai and .tn TLD and za.net servers.
+  * Added the za.net server. (Closes: #423549)
+  * Stop misparsing <as-set>:<hierarchical-name> as an IPv6 address.
+  * Stop mangling IDN queries with in-query flags. (Closes: #422895)
+
+ -- Marco d'Itri <md@linux.it>  Sat, 28 Jul 2007 23:53:00 +0200
+
 whois (4.7.21) unstable; urgency=medium
 
   * Improved myinet_aton to not parse addresses with trailing junk
diff --git a/ip6_del_list b/ip6_del_list
index f949075..e84623e 100644
--- a/ip6_del_list
+++ b/ip6_del_list
@@ -34,7 +34,7 @@
 
 2003:0000::/18	ripe
 
-2400:0000::/20	kornet
+2400:0000::/20	whois.nic.or.kr
 2400:0000::/12	apnic
 2600:0000::/12	arin
 2610:0000::/23	arin
diff --git a/ip_del_list b/ip_del_list
index 50e6a7f..3a8c3f8 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -22,18 +22,16 @@
 62.0.0.0/8	ripe
 77.0.0.0/8	ripe
 78.0.0.0/7	ripe
-80.0.0.0/5	ripe			# => 87.255.255.255
-88.0.0.0/6	ripe			# => 91.255.255.254
-92.0.0.0/7	ripe
+80.0.0.0/4	ripe			# => 95.255.255.255
+96.0.0.0/6	arin
 116.0.0.0/6	apnic
 121.128.0.0/10	whois.nic.or.kr
 125.128.0.0/11	whois.nic.or.kr
 120.0.0.0/6	apnic
 124.0.0.0/7	apnic
 126.0.0.0/8	apnic
-96.0.0.0/6	arin
 96.0.0.0/3	UNALLOCATED		# => 127.215.255.255
-0.0.0.0/1	arin	# all other A classes are managed by ARIN
+0.0.0.0/1	arin	# all other A class addresses are managed by ARIN
 133.0.0.0/8	whois.nic.ad.jp
 139.20.0.0/14	ripe
 139.24.0.0/14	ripe
diff --git a/po/pl.po b/po/pl.po
index df1de8c..6629400 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,21 +1,21 @@
 # Polish translation for whois.
 # Michał 'CeFeK' Nazarewicz <cefek@career.pl>, 1999
 # Przemysław Knycz <djrzulf@pld.org.pl>, 2003
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2004
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 4.6.24\n"
+"Project-Id-Version: whois 4.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
-"PO-Revision-Date: 2004-11-28 15:09+0100\n"
+"POT-Creation-Date: 2007-04-07 14:31+0200\n"
+"PO-Revision-Date: 2007-04-07 14:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -26,42 +26,42 @@ msgstr ""
 "\n"
 "Błędy proszę zgłaszać na adres %s.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:266
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Użycie serwera %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Ta główna domena nie ma serwera whois, ale można użyć bazy danych whois pod"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "Ta główna domena nie ma serwera whois."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr "Dla tego rodzaju obiektu nie jest znany żaden serwer whois."
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Nieznany numer AS lub sieć IP. Proszę uaktualnić ten program."
 
-#: ../whois.c:224
+#: ../whois.c:227
 msgid "Connecting to whois.crsnic.net."
 msgstr "Łączenie z whois.crsnic.net."
 
-#: ../whois.c:230
+#: ../whois.c:233
 msgid "Connecting to whois.publicinterestregistry.net."
 msgstr "Łączenie z whois.publicinterestregistry.net."
 
-#: ../whois.c:236
+#: ../whois.c:239
 msgid "Connecting to whois.nic.cc."
 msgstr "Łączenie z whois.nic.cc."
 
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:246
 #, c-format
 msgid ""
 "\n"
@@ -72,7 +72,18 @@ msgstr ""
 "Pytanie o zakończenie IPv4 %s adresu IPv6 typu 6to4.\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:253
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Pytanie o zakończenie IPv4 %s adresu IPv6 Teredo.\n"
+"\n"
+
+#: ../whois.c:267
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -81,7 +92,7 @@ msgstr ""
 "Zapytanie: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:277
 #, c-format
 msgid ""
 "\n"
@@ -94,16 +105,16 @@ msgstr ""
 "Znaleziono odniesienie do %s.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:320 ../whois.c:323
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Nie można przeanalizować tej linii: %s"
 
-#: ../whois.c:451
+#: ../whois.c:460
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Uwaga: użyto flag RIPE ze starszym serwerem."
 
-#: ../whois.c:586
+#: ../whois.c:598
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -111,26 +122,26 @@ msgstr ""
 "Katastrofa! Tekst oświadczenia został zmieniony.\n"
 "Proszę uaktualnić ten program.\n"
 
-#: ../whois.c:713
+#: ../whois.c:725
 #, c-format
 msgid "Host %s not found."
 msgstr "Serwer %s nie został znaleziony."
 
-#: ../whois.c:723
+#: ../whois.c:735
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: usługa nieznana"
 
-#: ../whois.c:742
+#: ../whois.c:754
 msgid "Timeout."
 msgstr "Upłynął limit czasu."
 
-#: ../whois.c:748
+#: ../whois.c:760
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Przerwano sygnałem %d..."
 
-#: ../whois.c:860
+#: ../whois.c:888
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
diff --git a/tld_serv_list b/tld_serv_list
index d3c762d..5616e93 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -18,6 +18,7 @@
 .uk.net	whois.centralnic.net
 .us.com	whois.centralnic.net
 .uy.com	whois.centralnic.net
+.za.net	whois.centralnic.net
 .za.com	whois.centralnic.net
 .jpn.com whois.centralnic.net
 .web.com whois.centralnic.net
@@ -36,7 +37,7 @@ e164.arpa whois.ripe.net
 .cat	whois.cat
 .coop	whois.nic.coop
 .info	whois.afilias.info
-.jobs	whois.jobs
+.jobs	jobswhois.verisign-grs.com
 .mobi	whois.dotmobiregistry.net
 .museum	whois.museum
 .name	whois.nic.name
@@ -47,7 +48,7 @@ e164.arpa whois.ripe.net
 .ae	whois.uaenic.ae
 .af	whois.nic.af
 .ag	whois.nic.ag
-.ai	WEB http://whois.offshore.ai/
+.ai	whois.ai
 .al	NONE		# http://www.inima.al/Domains.html
 .am	whois.nic.am
 .an	NONE		# http://www.una.net/an_domreg/
diff --git a/whois.c b/whois.c
index a8be51b..9da2932 100644
--- a/whois.c
+++ b/whois.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2003 by Marco d'Itri <md@linux.it>.
+/* Copyright 1999-2007 by Marco d'Itri <md@linux.it>.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -363,9 +363,13 @@ const char *whichwhois(const char *s)
     if ((colon = strchr(s, ':'))) {
 	unsigned long v6prefix, v6net;
 
-	/* RPSL hierarchical objects like AS8627:fltr-TRANSIT-OUT */
-	if (strncasecmp(s, "as", 2) == 0 && isasciidigit(s[2]))
-	    return whereas(atoi(s + 2));
+	/* RPSL hierarchical objects */
+	if (strncasecmp(s, "as", 2) == 0) {
+	    if (isasciidigit(s[2]))
+		return whereas(atoi(s + 2));
+	    else
+		return "";
+	}
 
 	v6prefix = strtol(s, NULL, 16);
 
@@ -778,23 +782,49 @@ int domcmp(const char *dom, const char *tld)
 char *normalize_domain(const char *dom)
 {
     char *p, *ret;
+    char *domain_start = NULL;
 
     ret = strdup(dom);
     for (p = ret; *p; p++); p--;	/* move to the last char */
-    for (; *p == '.' || p == ret; p--)	/* eat trailing dots */
+    /* eat trailing dots and blanks */
+    for (; *p == '.' || *p == ' ' || *p == '\t' || p == ret; p--)
 	*p = '\0';
 
 #ifdef HAVE_LIBIDN
-    if (idna_to_ascii_lz(ret, &p, 0) != IDNA_SUCCESS) {
+    /* find the start of the last word if there are spaces in the query */
+    for (p = ret; *p; p++)
+	if (*p == ' ')
+	    domain_start = p + 1;
+
+    if (domain_start) {
+	char *q, *r;
+	int prefix_len;
+
+	if (idna_to_ascii_lz(domain_start, &q, 0) != IDNA_SUCCESS)
+	    return ret;
+
+	/* reassemble the original query in a new buffer */
+	prefix_len = domain_start - ret;
+	r = malloc(prefix_len + strlen(q) + 1);
+	strncpy(r, ret, prefix_len);
+	r[prefix_len] = '\0';
+	strcat(r, q);
+
+	free(q);
 	free(ret);
-	return ret;
-    }
+	return r;
+    } else {
+	char *q;
 
-    free(ret);
-    ret = p;
-#endif
+	if (idna_to_ascii_lz(ret, &q, 0) != IDNA_SUCCESS)
+	    return ret;
 
+	free(ret);
+	return q;
+    }
+#else
     return ret;
+#endif
 }
 
 /* server and port have to be freed by the caller */
diff --git a/whois.spec b/whois.spec
index 1ee6093..a2f1713 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.7.21
+Version: 4.7.22
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>