Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package whois. This release fixes a parser bug to allow looking up domains with a trailing dot (which is a surprisingly often requested feature that I broke some time ago) and contains the usual servers updates. No further code changes are expected before wheezy is released, so allowing this bug fix in would prevent me from having to manage a wheezy branch of the package. unblock whois/5.2.2 -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: i386 (x86_64) Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores) Locale: LANG=it_IT.utf8, LC_CTYPE=it_IT.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- ciao, Marco
diff -Nru whois-5.2.1/debian/changelog whois-5.2.2/debian/changelog
--- whois-5.2.1/debian/changelog 2014-10-16 02:02:40.000000000 +0200
+++ whois-5.2.2/debian/changelog 2014-11-12 03:35:56.000000000 +0100
@@ -1,3 +1,12 @@
+whois (5.2.2) unstable; urgency=medium
+
+ * Fixed the code that removes trailing dots. (Closes: #763834)
+ * Added the .xn--d1alf (.мкд, Macedonia) and .xn--node (.გე, Georgia)
+ TLD servers.
+ * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <m...@linux.it> Thu, 06 Nov 2014 03:47:43 +0100
+
whois (5.2.1) unstable; urgency=medium
* Added the .aw and .zm TLD servers.
diff -Nru whois-5.2.1/new_gtlds_list whois-5.2.2/new_gtlds_list
--- whois-5.2.1/new_gtlds_list 2014-10-16 01:57:19.000000000 +0200
+++ whois-5.2.2/new_gtlds_list 2014-11-12 03:35:56.000000000 +0100
@@ -33,6 +33,7 @@
bio
black
blackfriday
+bloomberg
blue
bmw
bnpparibas
@@ -103,6 +104,7 @@
day
deals
degree
+delivery
democrat
dental
dentist
@@ -120,6 +122,8 @@
eat
education
email
+emerck
+energy
engineer
engineering
enterprises
@@ -340,7 +344,9 @@
surf
surgery
suzuki
+sydney
systems
+taipei
tatar
tattoo
tax
diff -Nru whois-5.2.1/servers_charset_list whois-5.2.2/servers_charset_list
--- whois-5.2.1/servers_charset_list 2014-10-16 01:57:19.000000000 +0200
+++ whois-5.2.2/servers_charset_list 2014-11-12 03:35:56.000000000 +0100
@@ -41,6 +41,7 @@
whois.nic.li utf-8
whois.domreg.lt utf-8
whois.dns.lu iso-8859-1
+whois.marnet.mk utf-8
whois.nic.mu utf-8
whois.norid.no iso-8859-1
whois.iis.nu utf-8
diff -Nru whois-5.2.1/tld_serv_list whois-5.2.2/tld_serv_list
--- whois-5.2.1/tld_serv_list 2014-10-16 01:57:19.000000000 +0200
+++ whois-5.2.2/tld_serv_list 2014-11-12 03:35:56.000000000 +0100
@@ -354,6 +354,7 @@
.xn--80ao21a whois.nic.kz # Kazakhstan
.xn--90a3ac whois.rnids.rs # Serbia
.xn--clchc0ea0b2g2a9gcd whois.sgnic.sg # Singapore, Tamil
+.xn--d1alf whois.marnet.mk # Macedonia
.xn--fiqs8s cwhois.cnnic.cn # China, Simplified Chinese
.xn--fiqz9s cwhois.cnnic.cn # China, Traditional Chinese
.xn--fpcrj9c3d whois.inregistry.net # India, Telugu AW
@@ -374,6 +375,7 @@
.xn--mgbc0a9azcg NONE # Morocco
.xn--mgberp4a5d4ar whois.nic.net.sa # Saudi Arabia
.xn--mgbx4cd0ab whois.mynic.my # Malaysia AW
+.xn--node whois.itdc.ge # Georgia
.xn--o3cw4h whois.thnic.co.th # Thailand
.xn--ogbpf8fl whois.tld.sy # Syria
.xn--p1ai whois.tcinet.ru # Russian Federation
diff -Nru whois-5.2.1/whois.c whois-5.2.2/whois.c
--- whois-5.2.1/whois.c 2014-10-16 01:57:19.000000000 +0200
+++ whois-5.2.2/whois.c 2014-11-12 03:35:56.000000000 +0100
@@ -1110,7 +1110,7 @@
/*
* Attempt to normalize a query by removing trailing dots and whitespace,
* then convert the domain to punycode.
- * The function assumes that the domain is the last token of they query.
+ * The function assumes that the domain is the last token of the query.
* Returns a malloc'ed string which needs to be freed by the caller.
*/
char *normalize_domain(const char *dom)
@@ -1121,10 +1121,15 @@
#endif
ret = strdup(dom);
- /* eat trailing dots and blanks */
- p = ret + strlen(ret);
- for (; *p == '.' || *p == ' ' || *p == '\t' || p == ret; p--)
+ /* start from the last character */
+ p = ret + strlen(ret) - 1;
+ /* and then eat trailing dots and blanks */
+ while (p > ret) {
+ if (!(*p == '.' || *p == ' ' || *p == '\t'))
+ break;
*p = '\0';
+ p--;
+ }
#ifdef HAVE_LIBIDN
/* find the start of the last word if there are spaces in the query */
pgpFfSArHBijt.pgp
Description: PGP signature
