Merge 5401374563848a0ebafde1670bc6be813d6e8bbe into 1024386831c8ee4e0ae24026fa932771bf369fe9

Let's use the same names listed in libxcrypt's crypt(5).

I highly doubt that anybody uses these names, so I am not adding
compatibility aliases.

COPYING

@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
+    with this program; if not, see <https://www.gnu.org/licenses/>.
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -329,8 +328,8 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
+  <signature of Moe Ghoul>, 1 April 1989
-  Ty Coon, President of Vice
+  Moe Ghoul, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may

debian/changelog

@@ -1,3 +1,14 @@
+whois (5.6.6) unstable; urgency=medium
+
+  * Added the .mc TLD server.
+  * Updated the .ps TLD server.
+  * Removed the .info, .mobi, .travel and .فلسطين (.xn--ygbi2ammx,
+    Palestinian Territory) TLD servers.
+  * Removed 3 new gTLDs which are no longer active.
+  * mkpasswd: added support the Chinese SM3-based hashing algorithms.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 16 Feb 2026 02:46:51 +0100
+
 whois (5.6.5) unstable; urgency=medium
 
   * Updated the .co TLD server.

make_version_h.pl

@@ -17,11 +17,8 @@ die "Version number not found in $changelog!\n" if not $ver;
 $ver =~ s/ (
 	  build\d+
 	| ubuntu\d+
-	| ~bpo\d+\+\d+
+	| ~\S+
-	| ~deb\d+.*
+	| \+\S+
-	| \+b\d+
-	| \+dyson\d+
-	| \+salsaci\+.+
 ) $//x;
 
 # The version number must not deviate from this format or the -V option

mkpasswd.c

@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -103,9 +102,6 @@ static const struct crypt_method methods[] = {
     { "md5",		"$1$",	8,	8,	0, NULL },
 #if defined XCRYPT_VERSION_NUM
     { "yescrypt",	"$y$",	0,	0,	1, "Yescrypt" },
-#if XCRYPT_VERSION_NUM >= ((4 << 16) | 4)
-    { "gost-yescrypt",	"$gy$",	0,	0,	1, "GOST Yescrypt" },
-#endif
     { "scrypt",		"$7$",	0,	0,	1, "scrypt" },
 #endif
 #ifdef HAVE_BCRYPT_OBSOLETE
@@ -114,7 +110,7 @@ static const struct crypt_method methods[] = {
 #endif
 #ifdef HAVE_BCRYPT
     { "bcrypt",		"$2b$", 22,	22,	2, "bcrypt" },
-    { "bcrypt-a",	"$2a$", 22,	22,	2, "bcrypt (obsolete $2a$ version)" },
+    { "bcrypt_a",	"$2a$", 22,	22,	2, "bcrypt (obsolete $2a$ version)" },
 #endif
 #if defined HAVE_SHA_CRYPT
     /* http://people.redhat.com/drepper/SHA-crypt.txt */
@@ -141,6 +137,13 @@ static const struct crypt_method methods[] = {
 #endif
     { "descrypt",	"",	2,	2,	0,
 	N_("standard 56 bit DES-based crypt(3)") },
+#if XCRYPT_VERSION_NUM >= ((4 << 16) | 5)
+    { "sm3crypt",	"$sm3$", 0,	0,	1, "ShangMi 3" },
+    { "sm3_yescrypt",	"$sm3y$", 0,	0,	1, "ShangMi 3 Yescrypt" },
+#endif
+#if XCRYPT_VERSION_NUM >= ((4 << 16) | 4)
+    { "gost_yescrypt",	"$gy$",	0,	0,	1, "GOST Yescrypt" },
+#endif
 #if defined FreeBSD || defined XCRYPT_VERSION_NUM
     { "nt",		"$3$",  0,	0,	0, "NT-Hash" },
 #endif

new_gtlds_list

@@ -282,7 +282,6 @@ download
 drive
 dtv
 dubai
-dunlop
 dupont
 durban
 dvag
@@ -399,7 +398,6 @@ godaddy
 gold
 goldpoint
 golf
-goo
 goodyear
 goog
 google
@@ -992,7 +990,6 @@ windows
 wine
 winners
 wme
-wolterskluwer
 woodside
 work
 works

ripe-mail

@@ -1,90 +0,0 @@
-From ripe-dbm@ripe.net  Mon Jan 27 10:09:59 2003
-Return-Path: <ripe-dbm@ripe.net>
-Delivered-To: md@wonderland.linux.it
-Received: from attila.bofh.it (localhost [127.0.0.1])
-	by wonderland.linux.it (Postfix/Md) with ESMTP id 582BA33CD5
-	for <md@wonderland.linux.it>; Mon, 27 Jan 2003 10:09:59 +0100 (CET)
-Received: from picard.linux.it (picard.linux.it [::ffff:62.177.1.107])
-	by attila.bofh.it (Postfix) with ESMTP id 46AE15F966
-	for <md@wonderland.linux.it>; Mon, 27 Jan 2003 09:03:25 +0100 (CET)
-Received: from birch.ripe.net (birch.ripe.net [::ffff:193.0.1.96])
-	by picard.linux.it (Postfix) with ESMTP id 4A76942B2
-	for <md@Linux.IT>; Mon, 27 Jan 2003 09:05:01 +0100 (CET)
-Received: from x24.ripe.net (x24.ripe.net [193.0.1.24])
-	by birch.ripe.net (8.12.5/8.11.6) with ESMTP id h0R83NAq030231;
-	Mon, 27 Jan 2003 09:03:23 +0100
-Received: (from ripe-dbm@localhost)
-	by x24.ripe.net (8.12.4/8.12.6) id h0R83M5k002263;
-	Mon, 27 Jan 2003 09:03:22 +0100
-Message-Id: <200301270803.h0R83M5k002263@x24.ripe.net>
-From: RIPE Database Administration <ripe-dbm@ripe.net>
-Cc: Can Bican <can@ripe.net>
-To: md@Linux.IT
-FCC: cur
-Subject: Re: NCC#2003013332 Re: [db-wg] IPv6 Whois update
-Reply-To: ripe-dbm@ripe.net
-X-Organization: RIPE Network Coordination Centre
-X-Phone: +31 20 535 4444
-X-Fax: +31 20 535 4341
-X-Mailer: BaT/0.67
-Sender: RIPE Database Manager <ripe-dbm@ripe.net>
-Date: Mon, 27 Jan 2003 09:03:21 +0100
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-X-Spam-Status: No, hits=0.6 required=5.0
-	tests=DEAR_SOMEBODY,QUOTED_EMAIL_TEXT,SIGNATURE_SHORT_DENSE,
-	      SPAM_PHRASE_05_08
-	version=2.43
-X-Spam-Level: 
-Status: RO
-Content-Length: 1239
-Lines: 46
-
-
-Dear Marco d'Itri,
-
-For the month October, 2002:
-We had 55 milion queries, 4.3 milion done with your client.
-
-This number is probably not the best indicator as some IPs do a lot of
-queries so here are also the statistics for different IP addresses using
-your client:
-31364 (of 853385) different IP addresses used your client.
-
-If you have any more questions, please contact <ripe-dbm@ripe.net>.
-
-Regards,
-
-Tiago Antao
-____________________________
-RIPE Database Administration.
-
-
-
-Original message follows:
-------------------------
-
-On Thursday 23 January 2003 18:52, Marco d'Itri wrote:
-> On Jan 23, Can Bican <can@ripe.net> wrote:
->  >This is a feature we supported, and we'll keep supporting it. It's a
->  > mistake on our side that we'll change promptly, so please don't change
->  > the behaviour. We'll make the proxy accept -V switches of these types.
->
-> Thank you for your prompt reply.
-> BTW, is any statistics about -V arguments available? I wonder how many
-> queries are made with my client (i.e. the -V argument matches /^Md/).
-
-   I have forwarded your request to ripe-dbm@ripe.net. You can contact that 
-address if you'd like more/less specific requirements about the counts.
-
-   Regards,
-
--- 
-Can Bican
-DB Group
-RIPE NCC
-
-
-
-

simple_recode.c

@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */

tld_serv_list

@@ -59,15 +59,15 @@
 .biz	whois.nic.biz
 .cat	whois.nic.cat
 .coop	whois.nic.coop
-.info	RECURSIVE whois.nic.info	# whois.identitydigital.services
+.info	NONE
 .jobs	NONE
-.mobi	RECURSIVE whois.nic.mobi	# whois.identitydigital.services
+.mobi	NONE
 .museum	whois.nic.museum
 .name	whois.nic.name
 .post	whois.nic.post
 .pro	NONE
 .tel	whois.nic.tel
-.travel	whois.nic.travel
+.travel	NONE
 .xxx	whois.nic.xxx
 
 .ac	whois.nic.ac
@@ -214,7 +214,7 @@
 .lv	whois.nic.lv
 .ly	whois.nic.ly
 .ma	whois.registre.ma
-.mc	NONE	# www.nic.mc
+.mc	whois.nic.mc
 .md	whois.nic.md
 .me	RECURSIVE whois.nic.me	# whois.identitydigital.services
 #.mf
@@ -262,7 +262,7 @@
 .pm	whois.nic.pm
 .pn	WEB https://www.nic.pn/
 .pr	RECURSIVE whois.nic.pr		# whois.identitydigital.services
-.ps	whois.pnina.ps
+.ps	WEB https://www.pnina.ps/
 .pt	whois.dns.pt
 .pw	whois.nic.pw
 .py	WEB https://www.nic.py/consultdompy.php
@@ -325,6 +325,7 @@
 .biz.ua	whois.biz.ua
 .co.ua	whois.co.ua
 .pp.ua	whois.pp.ua
+.v.ua whois.v.ua
 .ua	whois.ua
 .ug	whois.co.ug
 .ac.uk	whois.nic.ac.uk
@@ -426,4 +427,4 @@
 .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
+.xn--ygbi2ammx		NONE			# Palestinian Territory

utils.c

@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */

whois.c

@@ -6,6 +6,14 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
+ *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */