Package: release.debian.org Severity: normal X-Debbugs-Cc: whois@packages.debian.org Control: affects -1 + src:whois User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package whois Some database updates, one bugfix and one fix for a possible future bug. Debdiff attached. unblock whois/5.6.1 -- ciao, Marco
diff -Nru whois-5.6.0/debian/changelog whois-5.6.1/debian/changelog
--- whois-5.6.0/debian/changelog 2025-05-05 02:57:37.000000000 +0200
+++ whois-5.6.1/debian/changelog 2025-05-17 01:30:06.000000000 +0200
@@ -1,3 +1,18 @@
+whois (5.6.1) unstable; urgency=medium
+
+ * Added the .pg TLD server.
+ * Updated the .gov, .mu, .中国 (.xn--fiqs8s) and .中國 (.xn--fiqz9s)
+ TLD servers.
+ * Removed the .jobs TLD server.
+ * Added the encodings for whois.afrinic.net and whois.apnic.net.
+ * Enabled the UTF-8 encoding for whois.ripe.net.
+ * Use the last ReferralServer returned by the ARIN server instead of
+ the first, because we want to follow the referral for the most
+ specific record returned.
+ * Make sure to avoid trivial referral loops.
+
+ -- Marco d'Itri <md@linux.it> Sat, 17 May 2025 01:30:06 +0200
+
whois (5.6.0) unstable; urgency=medium
* Fixed the mangling of RADB queries with commands.
diff -Nru whois-5.6.0/servers_charset_list whois-5.6.1/servers_charset_list
--- whois-5.6.0/servers_charset_list 2023-10-08 22:59:07.000000000 +0200
+++ whois-5.6.1/servers_charset_list 2025-05-17 01:28:31.000000000 +0200
@@ -1,4 +1,6 @@
-# server name charset optional parameters
+# server name encoding optional parameters
+whois.afrinic.net utf-8
+whois.apnic.net iso-8859-1
whois.cat utf-8 -C UTF-8
whois.conac.cn utf-8
whois.corenic.net utf-8 -C UTF-8
@@ -6,7 +8,7 @@
whois.site.rs.corenic.net utf-8 -C UTF-8
whois.lacnic.net utf-8
whois.museum utf-8 -C UTF-8
-whois.ripe.net iso-8859-1
+whois.ripe.net utf-8 --charset UTF-8
whois.nic.llyw.cymru utf-8
whois.nic.gov.scot utf-8
@@ -20,7 +22,6 @@
whois.nic.ch utf-8
whois.nic.cl utf-8
whois.cnnic.cn utf-8
-cwhois.cnnic.cn utf-8
whois.nic.cz utf-8
whois.denic.de utf-8
whois.enum.denic.de utf-8
diff -Nru whois-5.6.0/tld_serv_list whois-5.6.1/tld_serv_list
--- whois-5.6.0/tld_serv_list 2025-05-04 00:41:16.000000000 +0200
+++ whois-5.6.1/tld_serv_list 2025-05-06 01:22:12.000000000 +0200
@@ -45,7 +45,7 @@
.gov.wales whois.nic.gov.wales
.edu whois.educause.edu
-.gov whois.dotgov.gov
+.gov whois.nic.gov
.int whois.iana.org
.mil NONE
@@ -60,7 +60,7 @@
.cat whois.nic.cat
.coop whois.nic.coop
.info RECURSIVE whois.nic.info # whois.identitydigital.services
-.jobs whois.nic.jobs
+.jobs NONE
.mobi RECURSIVE whois.nic.mobi # whois.identitydigital.services
.museum whois.nic.museum
.name whois.nic.name
@@ -230,7 +230,7 @@
.mr whois.nic.mr
.ms whois.nic.ms
.mt whois.nic.org.mt
-.mu whois.nic.mu
+.mu whois.tld.mu
.mv NONE # NIC? www.dhiraagu.com.mv
.mw whois.nic.mw
.mx whois.mx
@@ -252,7 +252,7 @@
.pa WEB http://www.nic.pa/en
.pe kero.yachay.pe
.pf whois.registry.pf
-.pg NONE # http://www.unitech.ac.pg/
+.pg whois.nic.pg # https://www.unitech.ac.pg/icts-dns/
.edu.ph WEB https://services.ph.net/dnshosting/dnshostingquery.pl
.gov.ph NONE # http://dns.gov.ph/
.ph WEB https://whois.dot.ph/
@@ -385,8 +385,8 @@
.xn--clchc0ea0b2g2a9gcd whois.ta.sgnic.sg # Singapore, Tamil
.xn--d1alf whois.marnet.mk # Macedonia
.xn--e1a4c whois.eu # European Union, Cyrillic
-.xn--fiqs8s cwhois.cnnic.cn # China, Simplified Chinese
-.xn--fiqz9s cwhois.cnnic.cn # China, Traditional Chinese
+.xn--fiqs8s whois.cnnic.cn # China, Simplified Chinese
+.xn--fiqz9s whois.cnnic.cn # China, Traditional Chinese
.xn--fpcrj9c3d whois.registry.in # India, Telugu
.xn--fzc2c9e2c whois.nic.lk # Sri Lanka, Sinhala
.xn--gecrj9c whois.registry.in # India, Gujarati
diff -Nru whois-5.6.0/whois.c whois-5.6.1/whois.c
--- whois-5.6.0/whois.c 2025-05-05 02:38:03.000000000 +0200
+++ whois-5.6.1/whois.c 2025-05-06 00:37:14.000000000 +0200
@@ -892,9 +892,6 @@
{
char *p;
- if (*referral_server)
- return;
-
/* ARIN referrals:
* ReferralServer: rwhois://rwhois.fuse.net:4321/
* ReferralServer: whois://whois.ripe.net
@@ -903,6 +900,16 @@
if (!strneq(buf, "ReferralServer:", 15))
return;
+ /* When whois.arin.net returns multiple NetRange records, they will
+ * appear from the less specific one to the most specific one.
+ * Since the range we care about is the most specific one then we
+ * need to use the last ReferralServer field found.
+ */
+ if (*referral_server) {
+ free(*referral_server);
+ *referral_server = NULL;
+ }
+
if ((p = strstr(buf, "rwhois://")))
*referral_server = strdup(p + 9);
else if ((p = strstr(buf, "whois://")))
@@ -1033,6 +1040,12 @@
err_quit(_("Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"));
+ /* defensive programming: make sure to avoid trivial referral loops */
+ if (referral_server && streq(server, referral_server)) {
+ free(referral_server);
+ referral_server = NULL;
+ }
+
return referral_server;
}
Attachment:
signature.asc
Description: PGP signature