Merge git://github.com/rfc1036/whoisHEADmaster

7 files changed, 355 insertions, 55 deletions

diff --git a/debian/changelog b/debian/changelog
index 47cdcba..912a899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,347 @@
+whois (5.5.3) unstable; urgency=medium
+
+  * Added the new 2630:0000::/12 IPv6 assignment to ARIN.
+  * Updated the .xxx TLD server.
+  * Updated the list of new gTLDs.
+  * Converted the Debian packaging to dh.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 17 Nov 2019 21:33:50 +0100
+
+whois (5.5.2) unstable; urgency=medium
+
+  * Added the .xn--qxa6a (.ευ, European Union, Greek) TLD server.
+  * Updated the .td TLD server.
+  * Updated one or more translations.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 02 Oct 2019 23:44:49 +0200
+
+whois (5.5.1) unstable; urgency=medium
+
+  * Updated the .ge TLD server.
+  * Updated one or more translations.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 18 Aug 2019 19:47:55 +0200
+
+whois (5.5.0) unstable; urgency=medium
+
+  * Implemented the -I option to query whois.iana.org and use its referrals.
+    (Closes: #774603)
+  * Updated one or more translations. (Closes: #931336, #931244)
+  * Automatically generate the version string sent to servers because I
+    kept forgetting to update it with new releases.
+  * Updated the .zm TLD server.
+  * Added new recovered IPv4 allocations.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 19 Jul 2019 11:31:42 +0200
+
+whois (5.4.3) unstable; urgency=medium
+
+  * Added the new 2a10:0000::/12 IPv6 assignment to RIPE.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 12 Jun 2019 15:03:56 +0200
+
+whois (5.4.2) unstable; urgency=medium
+
+  * Added the .ss and .xn--mgbah1a3hjkrd (موريتانيا, Mauritania) TLD
+    servers.
+  * Updated the .in TLD and related IDN TLDs servers.
+  * Updated the .fm TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Thu, 28 Mar 2019 00:48:28 +0100
+
+whois (5.4.1) unstable; urgency=medium
+
+  * Added the .mw TLD server.
+  * Updated one or more translations.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 27 Jan 2019 04:48:53 +0100
+
+whois (5.4.0) unstable; urgency=medium
+
+  * Added support for the new libxcrypt 4.x.
+    This allows mkpasswd to support many modern password hash methods.
+  * Renamed the hash types (i.e. the arguments to -H) to use the naming 
+    convention established by John the Ripper.
+  * Made mkpasswd use entropy gathered by crypt_gensalt(3), when available.
+  * Fixed many portability bugs in mkpasswd.
+  * Added the .gp TLD server.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 26 Oct 2018 18:32:49 +0200
+
+whois (5.3.2) unstable; urgency=medium
+
+  * Added the .ge TLD server.
+  * Updated the charset for whois.nic.cl. (Closes: #900047)
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 15 Jul 2018 12:38:42 +0200
+
+whois (5.3.1) unstable; urgency=medium
+
+  * mkpasswd: support passwords of arbitrary length. (Closes: #899254)
+  * Added the .ls TLD server. (Closes: #896452)
+  * Added support for -bzh and -uanic NIC handles.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 22 May 2018 15:32:28 +0200
+
+whois (5.3.0) unstable; urgency=medium
+
+  * Implemented querying for ip6.arpa domains.
+  * Updated the .pr TLD servers.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 21 Jan 2018 01:23:45 +0100
+
+whois (5.2.20) unstable; urgency=medium
+
+  * Added the .mr TLD server.
+  * Removed the .bs TLD server.
+  * Updated the .ai, .gh, .gr, .kw, .ls, .ph, .sb, .com.uy and .vn TLD
+    servers.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 27 Dec 2017 03:15:27 +0100
+
+whois (5.2.19) unstable; urgency=medium
+
+  * Switched do libidn2.
+  * Adopted getentropy(2) for mkpasswd on recent Linux.
+  * Updated the .id and .museum TLD servers.
+  * Removed the .dj TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 10 Dec 2017 17:16:58 +0100
+
+whois (5.2.18) unstable; urgency=medium
+
+  * Fixed an unitialised variable which used to break querying the
+    Verisign registry servers with parameters.
+  * Do not request domains only when querying the Verisign registry
+    servers for a hostname.
+  * Fixed the program return code for queries like
+    "nameserver name.example.com".
+
+ -- Marco d'Itri <md@linux.it>  Tue, 22 Aug 2017 16:45:02 +0200
+
+whois (5.2.17) unstable; urgency=high
+
+  * Fixed whois referrals for .com, .net, .jobs, .bz, .cc and .tv, broken
+    by an ICANN-mandated output change:
+    https://www.icann.org/resources/pages/rdds-labeling-policy-2017-02-01-en
+  * Added the .xn--2scrj9c (ಭಾರತ, India), .xn--3hcrj9c (ଭାରତ, India),
+    .xn--45br5cyl (ভাৰত, India), .xn--h2breg3eve (भारतम्, India),
+    .xn--h2brj9c8c (भारोत, India), .xn--mgbbh1a (ﺏﺍﺮﺗ, India),
+    .xn--mgbgu82a (ڀﺍﺮﺗ, India) and .xn--rvc1e0am3e (ഭാരതം, India)
+    TLD servers.
+  * Updated the list of new gTLDs.
+  * whois.1: fixed a typo. (Closes: #866742)
+
+ -- Marco d'Itri <md@linux.it>  Thu, 27 Jul 2017 17:08:47 +0200
+
+whois (5.2.16) unstable; urgency=medium
+
+  * Fixed parsing of 6to4 addresses broken in 5.2.15.
+  * Updated the .do TLD server.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 13 Mar 2017 01:40:38 +0100
+
+whois (5.2.15) unstable; urgency=medium
+
+  * Updated the .gf and .mq TLD servers.
+  * Updated the list of new gTLDs.
+  * Updated the charset for whois.nic.kz.
+  * Fixed multiple portability issues on non-Linux platforms.
+  * Fixed a lot of minor compiler warnings with no practical effects.
+  * Added support for libidn2, not enabled yet.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 27 Feb 2017 00:37:41 +0100
+
+whois (5.2.14) unstable; urgency=medium
+
+  * Updated the .ar, .bm and .fm TLD servers.
+  * Updated the Afilias hiding string to fix hiding for the new .bm server.
+
+ -- Marco d'Itri <md@linux.it>  Thu, 29 Dec 2016 23:12:19 +0100
+
+whois (5.2.13) unstable; urgency=medium
+
+  * Use "domain" instead of "=" for default verisign-grs queries,
+    to ignore the name server names spam.
+  * Fixed make_ip_del_recovered.pl, which generated non-functioning data.
+  * Added the .xn--90ae (бг, Bulgaria) TLD server.
+  * Updated the .bd, .jobs and .mobi TLD servers.
+  * Added new ASN allocations.
+  * Added new recovered IPv4 allocations.
+  * Updated the crsnic.net hiding string to fix hiding for .bi.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 30 Oct 2016 17:08:07 +0100
+
+whois (5.2.12) unstable; urgency=medium
+
+  * Implemented support for fuzzing with the awesome american fuzzy lop.
+  * Added the .xn--e1a4c (ею, European Union) and .xn--mix891f (澳門,
+    Macao) TLD servers.
+  * Updated the .jobs, .kn and .pro TLD servers.
+  * Updated the .gi, .lc, .sc and .vc TLD servers, because the precedent
+    data caused the program to return an error status.
+  * Updated the list of new gTLDs.
+  * Fixed the code which queries whois.iana.org for TLDs to recognize IDN
+    TLDs too.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 29 Mar 2016 05:33:10 +0200
+
+whois (5.2.11) unstable; urgency=medium
+
+  * Fixed the --select-types and --sources long options.
+  * Updated the list of new gTLDs.
+  * Removed the .an TLD.
+  * Removed the .xn--l1acc (.МОН, Mongolia) TLD server.
+  * Added the .xn--mgbtx2b (عراق, Iraq) and .xn--qxam (.ΕΛ, Greece) TLD
+    servers.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 08 Dec 2015 07:43:48 +0100
+
+whois (5.2.10) unstable; urgency=medium
+
+  * Updated the list of new gTLDs.
+  * Updated the .ki and .vg TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Thu, 30 Jul 2015 03:26:56 +0200
+
+whois (5.2.9) unstable; urgency=medium
+
+  * Updated the list of new gTLDs.
+  * Updated the .bn and .cr TLD servers.
+  * Updated IDSTRING to 5.2.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 08 Jun 2015 02:18:47 +0200
+
+whois (5.2.8) unstable; urgency=medium
+
+  * Updated the list of new gTLDs.
+  * Added new ASN allocations.
+  * Added the .xn--y9a3aq (.հայ, Armenia) TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 18 May 2015 00:37:32 +0200
+
+whois (5.2.7) unstable; urgency=medium
+
+  * Removed a bogus disclaimer detection string.
+  * Updated the list of new gTLDs
+
+ -- Marco d'Itri <md@linux.it>  Wed, 25 Mar 2015 23:04:44 +0100
+
+whois (5.2.6) unstable; urgency=medium
+
+  * Added the .edu.ph TLD server.
+  * Removed the .gov.py TLD server. (Closes: #780562)
+  * Updated the list of new gTLDs.
+  * Implemented hiding multiple disclaimers blocks to improve detection.
+  * Updated the disclaimer detection strings.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 23 Mar 2015 04:28:39 +0100
+
+whois (5.2.5) unstable; urgency=medium
+
+  * Added the .xn--90ais (.бел, Belarus) TLD server.
+  * Updated the .ky TLD server.
+  * Updated the list of new gTLDs.
+  * Added new recovered IPv4 allocations.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 03 Mar 2015 02:15:57 +0100
+
+whois (5.2.4) unstable; urgency=medium
+
+  * Fixed referrals handling for the .cc, .tv a .jobs TLDs.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 25 Jan 2015 04:07:20 +0100
+
+whois (5.2.3) unstable; urgency=medium
+
+  * Added the .gw TLD server.
+  * Updated the .bm, .gr, .gt, .md, .np, .py, .tc, .tg, .vi, .net.za,
+    .org.za and .web.za TLD servers. (Closes: #773489)
+  * Removed the .cg TLD server.
+  * Updated the list of new gTLDs.
+  * mkpasswd: use arc4random_buf(3) where available.
+  * mkpasswd: support OpenBSD's new hash 2b.
+  * Updated some IPv4 allocations.
+  * Remove the new_gtlds.h generated file from the Debian source package.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 26 Dec 2014 20:12:24 +0100
+
+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 <md@linux.it>  Thu, 06 Nov 2014 03:47:43 +0100
+
+whois (5.2.1) unstable; urgency=medium
+
+  * Added the .aw and .zm TLD servers.
+  * Added the charset for whois.domain.kg.
+  * Updated the list of new gTLDs.
+  * Queries for bare TLDs will be directed to whois.iana.org.
+    (Closes: #763833)
+
+ -- Marco d'Itri <md@linux.it>  Thu, 16 Oct 2014 02:01:20 +0200
+
+whois (5.2.0) unstable; urgency=medium
+
+  * Implemented support for the long RIPE flags.
+  * "Fixed" some harmless bugs discovered with a Coverity scan.
+  * Default to whois.ripe.net when using long flags.
+  * Updated the list of new gTLDs.
+  * Added a new ASN allocation.
+  * Added new recovered IPv4 allocations.
+  * Updated make_version_h.pl to support Debian binNMUs. (Closes: #761318)
+
+ -- Marco d'Itri <md@linux.it>  Sat, 13 Sep 2014 05:05:16 +0200
+
+whois (5.1.5) unstable; urgency=medium
+
+  * Updated the list of new gTLDs.
+  * Added some disclaimer suppression strings for the new gTLDs' servers.
+  * Updated one or more translations. (Closes: #756231)
+
+ -- Marco d'Itri <md@linux.it>  Sat, 02 Aug 2014 03:41:44 +0200
+
+whois (5.1.4) unstable; urgency=medium
+
+  * Added the charset for whois.lacnic.net.
+  * Updated the list of new gTLDs.
+  * Updated one or more translations.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 30 Jun 2014 04:22:21 +0200
+
+whois (5.1.3) unstable; urgency=medium
+
+  * Use the IANA recovered address space list.
+  * Updated the list of new gTLDs.
+  * Support hiding disclaimers until the end of the output.
+  * Fix a disclaimer hiding string. (Closes: #748363)
+
+ -- Marco d'Itri <md@linux.it>  Mon, 26 May 2014 04:19:41 +0200
+
+whois (5.1.2) unstable; urgency=medium
+
+  * Always query whois.nic.$TLD for the "new" gTLDs, because the ICANN
+    contract requires that it works.
+  * Added the .aw and .zm TLD servers.
+  * Updated the .mk, .tc and .vu TLD servers.
+  * Added more ASN entries for Japan and Korea.
+  * Fixed some invalid ASN and networks entries which would never be
+    matched, reported by Henry Stern.
+  * mkpasswd ported to Solaris/Dyson, patch courtesy of Igor Pashev.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 02 May 2014 04:15:08 +0200
+
 whois (5.1.1+dyson1) unstable; urgency=medium
 
   * Package for Dyson
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+10
diff --git a/debian/control b/debian/control
index 9006ad9..3c99754 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: whois
 Section: net
 Priority: standard
 Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 5), gettext, libidn11-dev
+Standards-Version: 4.3.0.1
+Rules-Requires-Root: no
+Build-Depends: debhelper (>= 10), gettext, libidn2-dev (>= 2.0.3)
 Vcs-Git: git://github.com/rfc1036/whois.git
 Vcs-Browser: https://github.com/rfc1036/whois
 
diff --git a/debian/rules b/debian/rules
index b975132..1f4c033 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,55 +1,8 @@
 #!/usr/bin/make -f
-SHELL+= -e
 
-DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh $@
 
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-  export CC := $(DEB_HOST_GNU_TYPE)-gcc
-endif
+override_dh_auto_build:
+	$(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_ICONV=1
 
-DPKG_EXPORT_BUILDFLAGS = 1
--include /usr/share/dpkg/buildflags.mk
-
-D := $(CURDIR)/debian/whois
-
-build:
-	dh_testdir
-	$(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_LIBIDN=1 HAVE_ICONV=1
-	touch $@
-
-clean:
-	dh_testdir
-	-rm -f build
-	$(MAKE) distclean
-	dh_clean
-
-binary-arch: checkroot build
-	dh_testdir
-	dh_clean
-
-	dh_installdirs usr/bin
-	$(MAKE) install BASEDIR=$D
-	dh_installman whois.1 mkpasswd.1
-	dh_installdocs README
-	dh_installchangelogs 
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -- -Zxz
-
-binary: binary-arch
-
-binary-indep:
-
-build-arch: build
-build-indep: build
-
-checkroot:
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep build build-arch build-indep clean checkroot
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 161b7e0..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-compression=xz
diff --git a/debian/whois.docs b/debian/whois.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/whois.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/whois.manpages b/debian/whois.manpages
new file mode 100644
index 0000000..c9f6daf
--- /dev/null
+++ b/debian/whois.manpages
@@ -0,0 +1,2 @@
+mkpasswd.1
+whois.1