Merge 682345b4ea37dbbcab1bc174f462a5abb5717f80 into b64054961d5d4bd16c650471c336df04ba769ab8

config.h

@@ -26,17 +26,12 @@
 /* which versions? */
 # define HAVE_GETOPT_LONG
 # define HAVE_GETADDRINFO
-# define HAVE_READPASSPHRASE
 # define ENABLE_NLS
 # ifndef LOCALEDIR
 #  define LOCALEDIR "/usr/local/share/locale"
 # endif
 #endif
 
-#if defined OpenBSD
-# define HAVE_READPASSPHRASE
-#endif
-
 /* needs unistd.h */
 #if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 200112L
 # define HAVE_GETADDRINFO
@@ -46,7 +41,6 @@
 #if defined __APPLE__ && defined __MACH__
 # define HAVE_GETOPT_LONG
 # define HAVE_GETADDRINFO
-# define HAVE_READPASSPHRASE
 # define HAVE_BSDICRYPT
 #endif
 

debian/changelog

@@ -1,10 +1,3 @@
-whois (5.6.3) unstable; urgency=medium
-
-  * Added the .sr and .мон (.xn--l1acc, Mongolia) TLD servers.
-  * Use readpassphrase(3) on OpenBSD and FreeBSD.
-
- -- Marco d'Itri <md@linux.it>  Thu, 17 Jul 2025 05:15:53 +0200
-
 whois (5.6.2) unstable; urgency=medium
 
   * Updated the .post and .in (and related IDN TLDs) TLD servers.

debian/control

@@ -8,8 +8,8 @@ Build-Depends: debhelper-compat (= 13), gettext, pkgconf,
  bash-completion,
  libcrypt-dev,
  libidn2-dev,
-Vcs-Git: https://salsa.debian.org/md/whois.git
-Vcs-Browser: https://salsa.debian.org/md/whois
+Vcs-Git: https://github.com/rfc1036/whois.git
+Vcs-Browser: https://github.com/rfc1036/whois
 
 Package: whois
 Architecture: any

mkpasswd.c

@@ -47,9 +47,6 @@
 #ifdef HAVE_GETTIMEOFDAY
 #include <sys/time.h>
 #endif
-#ifdef HAVE_READPASSPHRASE
-#include <readpassphrase.h>
-#endif
 
 /* Application-specific */
 #include "version.h"
@@ -390,21 +387,11 @@ int main(int argc, char *argv[])
 	    exit(2);
 	}
     } else {
-#ifdef HAVE_READPASSPHRASE
-	const size_t size = 128;
-
-	password = NOFAIL(malloc(size));
-	if (!readpassphrase(_("Password: "), password, size, 0)) {
-	    perror("readpassphrase");
-	    exit(2);
-	}
-#else
 	password = getpass(_("Password: "));
 	if (!password) {
 	    perror("getpass");
 	    exit(2);
 	}
-#endif
     }
 
     {

tld_serv_list

@@ -120,7 +120,7 @@
 .ci	whois.nic.ci
 .ck	NONE
 .cl	whois.nic.cl
-.cm	whois.nic.cm
+.cm	whois.netcom.cm
 .edu.cn	whois.edu.cn
 .cn	whois.cnnic.cn
 .uk.co	whois.uk.co
@@ -295,7 +295,7 @@
 .sm	whois.nic.sm
 .sn	whois.nic.sn
 .so	whois.nic.so
-.sr	whois.sr	# https://isp.datasur.sr/
+.sr	NONE		# https://isp.datasur.sr/
 .ss	whois.nic.ss
 .st	whois.nic.st
 .msk.su	whois.flexireg.net
@@ -398,7 +398,7 @@
 .xn--j6w193g		whois.hkirc.hk		# Hong Kong
 .xn--kprw13d		whois.twnic.net.tw	# Taiwan, Simplified Chinese
 .xn--kpry57d		whois.twnic.net.tw	# Taiwan, Traditional Chinese
-.xn--l1acc		whois.mn		# Mongolia
+.xn--l1acc		NONE			# Mongolia
 .xn--lgbbat1ad8j	whois.nic.dz		# Algeria
 .xn--mgb9awbf		whois.registry.om	# Oman
 .xn--mgba3a4f16a	whois.nic.ir		# Iran