From a21a1d7756e4a591952d0c94efc299515ea8f576 Mon Sep 17 00:00:00 2001
From: Marco d'Itri <md@linux.it>
Date: Mon, 17 Sep 2012 21:41:29 +0200
Subject: [PATCH] Imported Debian version 5.0.19

---
 config.h             |  2 +-
 debian/changelog     | 12 ++++++++++++
 debian/rules         |  2 +-
 servers_charset_list |  2 +-
 tld_serv_list        |  9 ++++++---
 whois.c              |  6 ++++++
 whois.spec           |  2 +-
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/config.h b/config.h
index b1f2e17..fbf67a5 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 /* Program version */
-#define VERSION "5.0.18"
+#define VERSION "5.0.19"
 
 /* Configurable features */
 
diff --git a/debian/changelog b/debian/changelog
index b9ccc1a..c1499f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+whois (5.0.19) unstable; urgency=low
+
+  * Added the .post TLD server.
+  * Updated the .co.za SLD servers. (Closes: #687094)
+  * Added the .alt.za, .net.za and .web.za SLD servers.
+  * whois.ua changed (?) the encoding to utf-8. (Closes: #686715)
+  * Fixed the parsing of 6to4 addresses like whois 2002:xxxx::. (LP#967311)
+  * Modified the package version check in debian/rules to help Ubuntu
+    maintainers. (Closes: #684526)
+
+ -- Marco d'Itri <md@linux.it>  Mon, 17 Sep 2012 21:41:29 +0200
+
 whois (5.0.18) unstable; urgency=low
 
   * Updated the .ae and .xn--mgbaam7a8h (.امارات, United Arabs Emirates)
diff --git a/debian/rules b/debian/rules
index b0b5ad7..0a6b828 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 D := $(CURDIR)/debian/whois
 
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
+VERSION := $(shell dpkg-parsechangelog | sed -n 's/~*ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
 
 build:
 	dh_testdir
diff --git a/servers_charset_list b/servers_charset_list
index 50be772..be813bc 100644
--- a/servers_charset_list
+++ b/servers_charset_list
@@ -48,6 +48,6 @@ whois.thnic.co.th	utf-8
 whois.nic.tr		utf-8
 whois.twnic.net.tw	utf-8
 whois.pp.ua		utf-8
-whois.ua		koi8-u
+whois.ua		utf-8
 whois.nic.org.uy	utf-8
 
diff --git a/tld_serv_list b/tld_serv_list
index 2c0c211..b98a8b6 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -51,6 +51,7 @@
 .mobi	whois.dotmobiregistry.net
 .museum	whois.museum
 .name	whois.nic.name
+.post	whois.dotpostregistry.net
 .pro	whois.registrypro.pro
 .tel	whois.nic.tel
 .travel	whois.nic.travel
@@ -331,11 +332,13 @@
 .ye	NONE		# NIC? www.nominet.org.ye http://www.y.net.ye/services/domain_name.htm
 .yt	whois.nic.fr
 .ac.za	whois.ac.za
-.co.za	whois.coza.net.za
+.alt.za	whois.alt.za
+.co.za	whois.registry.net.za
 .gov.za	whois.gov.za
-#.net.za	whois.net.za
+.net.za	whois.net.za
 .org.za	WEB http://www.org.za/	# rwhois.org.za:4321 is restricted
-.za	NONE		# http://www.internet.org.za/slds.html many more SLD...
+.web.za	whois.web.za
+.za	NONE		# http://www.zadna.org.za/annexure-d.html
 .zm	NONE		# http://www.zamnet.zm/ser-isp/dnr.htm
 .zw	NONE		# http://www.zispa.co.zw/
 
diff --git a/whois.c b/whois.c
index 601fcec..890a83b 100644
--- a/whois.c
+++ b/whois.c
@@ -1060,6 +1060,12 @@ char *convert_6to4(const char *s)
 #else
     unsigned int a, b;
 
+    if (sscanf(s, "2002:%x::", &a) == 1) {
+	new = malloc(sizeof("255.255.255.255"));
+	sprintf(new, "%d.%d.0.0", a >> 8, a & 0xff);
+	return new;
+    }
+
     if (sscanf(s, "2002:%x:%x:", &a, &b) != 2)
 	return strdup("0.0.0.0");
 
diff --git a/whois.spec b/whois.spec
index de75fb5..87a5b27 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 5.0.18
+Version: 5.0.19
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>