Imported Debian version 5.0.18v5.0.18

7 files changed, 17 insertions, 6 deletions

diff --git a/config.h b/config.h
index c3a2dd6..b1f2e17 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "5.0.17"
+#define VERSION "5.0.18"
 
 /* Configurable features */
 
diff --git a/debian/changelog b/debian/changelog
index 36fc72d..b9ccc1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+whois (5.0.18) unstable; urgency=low
+
+  * Updated the .ae and .xn--mgbaam7a8h (.امارات, United Arabs Emirates)
+    TLDs.
+  * Updated the server charset table for .fr and .it.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 22 Jul 2012 20:35:18 +0200
+
 whois (5.0.17) unstable; urgency=medium
 
   * Updated the .bi, .fo, .gr and .gt TLD servers.
diff --git a/servers_charset_list b/servers_charset_list
index 77a32ca..50be772 100644
--- a/servers_charset_list
+++ b/servers_charset_list
@@ -3,7 +3,7 @@ whois.corenic.net	utf-8		-C UTF-8
 whois.cat		utf-8		-C UTF-8
 whois.museum		utf-8		-C UTF-8
 
-whois.aeda.ae		utf-8
+whois.aeda.net.ae	utf-8
 whois.nic.br		iso-8859-1
 whois.cira.ca		iso-8859-1
 whois.nic.ch		utf-8
@@ -18,12 +18,13 @@ whois.eenet.ee		iso-8859-1
 whois.eu		utf-8
 whois.ficora.fi		iso-8859-1
 whois.nic.fo		utf-8
-whois.nic.fr		iso-8859-1
+whois.nic.fr		utf-8
 whois.hkirc.hk		utf-8
 whois.nic.hr		utf-8
 whois.nic.hu		iso-8859-1
 whois.nic.ir		utf-8
 whois.isnic.is		iso-8859-1
+whois.nic.it		utf-8
 whois.jprs.jp		iso-2022-jp
 whois.nic.ad.jp		iso-2022-jp
 whois.nic.or.kr		euc-kr
diff --git a/tld_serv_list b/tld_serv_list
index 8c1dfdd..2c0c211 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -58,7 +58,7 @@
 
 .ac	whois.nic.ac
 .ad	NONE		# www.nic.ad
-.ae	whois.aeda.ae
+.ae	whois.aeda.net.ae
 .af	whois.nic.af
 .ag	whois.nic.ag
 .ai	whois.ai
@@ -357,7 +357,7 @@
 .xn--kpry57d		whois.twnic.net.tw	# Taiwan, Traditional Chinese
 .xn--lgbbat1ad8j	whois.nic.dz		# Algeria
 .xn--mgba3a4f16a	whois.nic.ir		# Iran
-.xn--mgbaam7a8h		whois.aeda.ae		# United Arab Emirates
+.xn--mgbaam7a8h		whois.aeda.net.ae	# United Arab Emirates
 .xn--mgbayh7gpa		WEB http://idn.jo/whois_a.aspx	# Jordan
 .xn--mgbbh1a71e		whois.registry.in	# India, Urdu AW
 #.xn--mgbc0a9azcg	whois.iam.net.ma	# Morocco
diff --git a/whois.1 b/whois.1
index ec5f86b..7275441 100644
--- a/whois.1
+++ b/whois.1
@@ -81,6 +81,7 @@ If the \fI/etc/whois.conf\fR config file exists, it will be consulted
 to find a server before applying the normal rules. Each line of the
 file should contain a regular expression to be matched against the query
 text and the whois server to use, separated by white space.
+IDN domains must use the ACE format.
 .P
 The whois protocol does not specify an encoding for characters which
 cannot be represented by ASCII and implementations vary wildly.
diff --git a/whois.conf b/whois.conf
index 8eada18..31b09b0 100644
--- a/whois.conf
+++ b/whois.conf
@@ -4,6 +4,7 @@
 # the compiled in servers are not suitable.  Each entry is a single
 # text line and consists of a regular expression pattern to match and
 # the whois server to be used for it, separated by blank space. 
+# IDN domains must use the ACE format.
 #
 # Eg: 
 # \.nz$ nz.whois-servers.net
diff --git a/whois.spec b/whois.spec
index 4f0a119..de75fb5 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 5.0.17
+Version: 5.0.18
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>