Merge 5b9f2923ba90e76adf3b64a9ba425ab282597cdb into be9c4cfa09daa3db426a302ac5e1d705a7313ce8

Closes: #1106977

debian/changelog

@@ -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.

debian/control

@@ -6,7 +6,8 @@ Standards-Version: 4.7.2.0
 Rules-Requires-Root: no
 Build-Depends: debhelper-compat (= 13), gettext, pkgconf,
  bash-completion,
- libidn2-dev (>= 2.0.3),
+ libcrypt-dev,
+ libidn2-dev,
 Vcs-Git: https://github.com/rfc1036/whois.git
 Vcs-Browser: https://github.com/rfc1036/whois
 

make_tld_serv.pl

@@ -18,7 +18,7 @@ while (<>) {
 	$b = "\\x03" if $b eq 'NONE';
 	$b =~ s/^RECURSIVE\s+/\\x08" "/;
 	$b = "\\x08$b" if $b eq 'whois.flexireg.net';
-	$b = "\\x08$b" if $b eq 'whois.registry.in';
+	$b = "\\x08$b" if $b eq 'whois.nixiregistry.in';
 	$b = "\\x0C" if $b eq 'ARPA';
 	$b = "\\x0D" if $b eq 'IP6';
 	print qq|    "$a",\t"$b",\n|;

servers_charset_list

@@ -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.online.rs.corenic.net	utf-8	-C UTF-8
 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.cira.ca		utf-8
 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

tld_serv_list

@@ -64,7 +64,7 @@
 .mobi	RECURSIVE whois.nic.mobi	# whois.identitydigital.services
 .museum	whois.nic.museum
 .name	whois.nic.name
-.post	whois.dotpostregistry.net
+.post	whois.nic.post
 .pro	whois.nic.pro
 .tel	whois.nic.tel
 .travel	whois.nic.travel
@@ -181,7 +181,7 @@
 .ie	whois.weare.ie
 .il	whois.isoc.org.il
 .im	whois.nic.im
-.in	whois.registry.in
+.in	whois.nixiregistry.in
 .io	whois.nic.io
 .iq	whois.cmc.iq		# http://www.cmc.iq/en/iq.html
 .ir	whois.nic.ir
@@ -372,11 +372,11 @@
 
 # AW means that I had to guess the whois server name, but I was not able
 # to find any registered subdomains to verify it.
-.xn--2scrj9c		whois.registry.in	# India
+.xn--2scrj9c		whois.nixiregistry.in	# India
 .xn--3e0b707e		whois.kr		# Korea, Republic of
-.xn--3hcrj9c		whois.registry.in	# India
-.xn--45br5cyl		whois.registry.in	# India
-.xn--45brj9c		whois.registry.in	# India, Bengali
+.xn--3hcrj9c		whois.nixiregistry.in	# India
+.xn--45br5cyl		whois.nixiregistry.in	# India
+.xn--45brj9c		whois.nixiregistry.in	# India, Bengali
 .xn--4dbrk0ce		whois.isoc.org.il	# Israel
 .xn--54b7fta0cc		WEB https://bdia.btcl.com.bd/ # Bangladesh
 .xn--80ao21a		whois.nic.kz		# Kazakhstan
@@ -388,12 +388,12 @@
 .xn--e1a4c		whois.eu		# European Union, Cyrillic
 .xn--fiqs8s		whois.cnnic.cn		# China, Simplified Chinese
 .xn--fiqz9s		whois.cnnic.cn		# China, Traditional Chinese
-.xn--fpcrj9c3d		whois.registry.in	# India, Telugu
+.xn--fpcrj9c3d		whois.nixiregistry.in	# India, Telugu
 .xn--fzc2c9e2c		whois.nic.lk		# Sri Lanka, Sinhala
-.xn--gecrj9c		whois.registry.in	# India, Gujarati
-.xn--h2breg3eve		whois.registry.in	# India
-.xn--h2brj9c8c		whois.registry.in	# India
-.xn--h2brj9c		whois.registry.in	# India, Hindi
+.xn--gecrj9c		whois.nixiregistry.in	# India, Gujarati
+.xn--h2breg3eve		whois.nixiregistry.in	# India
+.xn--h2brj9c8c		whois.nixiregistry.in	# India
+.xn--h2brj9c		whois.nixiregistry.in	# India, Hindi
 .xn--j1amh		whois.dotukr.com	# Ukraine
 .xn--j6w193g		whois.hkirc.hk		# Hong Kong
 .xn--kprw13d		whois.twnic.net.tw	# Taiwan, Simplified Chinese
@@ -406,12 +406,12 @@
 .xn--mgbah1a3hjkrd	whois.nic.mr		# Mauritania
 .xn--mgbai9azgqp6j	NONE			# Pakistan
 .xn--mgbayh7gpa		WEB https://www.domain.jo/FirstPageen.aspx # Jordan
-.xn--mgbbh1a71e		whois.registry.in	# India, Urdu
-.xn--mgbbh1a		whois.registry.in	# India
+.xn--mgbbh1a71e		whois.nixiregistry.in	# India, Urdu
+.xn--mgbbh1a		whois.nixiregistry.in	# India
 .xn--mgbc0a9azcg	NONE			# Morocco
 .xn--mgbcpq6gpa1a	NONE			# Bahrain
 .xn--mgberp4a5d4ar	whois.nic.net.sa	# Saudi Arabia
-.xn--mgbgu82a		whois.registry.in	# India
+.xn--mgbgu82a		whois.nixiregistry.in	# India
 .xn--mgbpl2fh		NONE			# Sudan
 .xn--mgbtx2b		whois.cmc.iq		# Iraq
 .xn--mgbx4cd0ab		whois.mynic.my		# Malaysia AW
@@ -424,12 +424,12 @@
 .xn--q7ce6a		whois.nic.la		# Lao
 .xn--qxa6a		whois.eu		# European Union, Greek
 .xn--qxam		WEB https://grweb.ics.forth.gr/public/whois?lang=en # Greece
-.xn--rvc1e0am3e		whois.registry.in	# India
-.xn--s9brj9c		whois.registry.in	# India, Punjabi
+.xn--rvc1e0am3e		whois.nixiregistry.in	# India
+.xn--s9brj9c		whois.nixiregistry.in	# India, Punjabi
 .xn--wgbh1c		whois.dotmasr.eg	# Egypt
 .xn--wgbl6a		whois.registry.qa	# Qatar
 .xn--xkc2al3hye2a	whois.nic.lk		# Sri Lanka, Tamil
-.xn--xkc2dl3a5ee0h	whois.registry.in	# India, Tamil
+.xn--xkc2dl3a5ee0h	whois.nixiregistry.in	# India, Tamil
 .xn--y9a3aq		whois.amnic.net		# Armenia
 .xn--yfro4i67o		whois.zh.sgnic.sg	# Singapore, Chinese
 .xn--ygbi2ammx		whois.pnina.ps		# Palestinian Territory