From MAILER-DAEMON Sat Apr 04 17:12:59 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1jKq67-0000Tv-2T
	for mharc-commit-inetutils@gnu.org; Sat, 04 Apr 2020 17:12:59 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:59777)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <ams@gnu.org>) id 1jKq64-0000Tf-AW
 for commit-inetutils@gnu.org; Sat, 04 Apr 2020 17:12:57 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:38948)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
 id 1jKq64-0007J8-5h
 for commit-inetutils@gnu.org; Sat, 04 Apr 2020 17:12:56 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66085)
 id 169E020BC2; Sat,  4 Apr 2020 17:12:56 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-102-g23e67af
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 393f4c6c3e3761ceed843cb3990169a5ef2f89d1
X-Git-Newrev: 23e67af2ff21b2676bdc7636144006abd88a1da2
Message-Id: <20200404211256.169E020BC2@vcs0.savannah.gnu.org>
Date: Sat,  4 Apr 2020 17:12:55 -0400 (EDT)
From: ams@gnu.org (Alfred M. Szmidt)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Apr 2020 21:12:58 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  23e67af2ff21b2676bdc7636144006abd88a1da2 (commit)
      from  393f4c6c3e3761ceed843cb3990169a5ef2f89d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=23e67af2ff21b2676bdc7636144006abd88a1da2


commit 23e67af2ff21b2676bdc7636144006abd88a1da2
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Apr 4 23:10:05 2020 +0200

    ChangeLog: Add missing entries.

diff --git a/ChangeLog b/ChangeLog
index 287f5ce..8183e16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,161 @@
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	uucpd: Fix buffer overflows.
+
+	This fixes several missing string termination issues with strncpy.
+	Also REMOTEHOST with size NI_MAXHOST was strcpy'ed into LINE which
+	just had 32 bytes on the stack.
+
+	* src/uucpd.c (dologout): Increase LINE size.  Use exisiting SCPYN
+	instead of strncpy.
+	(SCPYN): New macro.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	uucpd: Fix heap buffer overflow.
+
+	Usernames >= 56 bytes would overflow the char arrays Username and
+	Logname.  This change mitigates this, but still silently truncates
+	these arrays.  Silent truncation should be checked throughout the
+	code possibly within a more comprehensive code review.
+
+	* src/uucpd.c (Usernaem, Logname): Increase size to 72 bytes.
+	(doit): Use snprintf instead of sprintf.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	telnet: Use strdup instead malloc+strcpy.
+
+	* telnet/commands.c (tn): Use strdup instead malloc/strcpy.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	telnet: Fix -Wsign-compare in suboption.
+
+	* telnet/telnet.c (suboption): Explicit cast to int to silence
+	-Wsign-compare.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	telnetd: Silence -Wimplicit-fallthrough.
+
+	* telnetd/state.c (willoption): Squeelch warning.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	telnetd: Silence unused warning for getterminaltype.
+
+	* telnetd/utility.c (getterminaltype): Squeelch warning.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ftp: Silence -Wimplicit-fallthrough warning.
+
+	* ftp/domacro.c (domacro): Squeelch warning.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ftp: Silence -Wimplicit-fallthrough.
+
+	* ftp/cmds.c (domap): Squeelch warning.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ftp: Fix multipliers for M(ega) and G(iga).
+
+	This is *not* a fix as the comment accidentally states.  It is to
+	silence -Wimplicit-fallthrough and to avoid multiple
+	multiplications in case of a non-optimized build.  The HASHBYTES
+	type needs to be reviewed later as g/G only allows digits 1 and 2
+	without integer overflow, which is undefined behavior.
+
+	* ftp/cmds.c (sethash): Remove cascaded multiplications.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ftp: Fix return value of remglob.
+
+	* ftp/cmds.c (remglob): Turn around NULL check.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ftp: Fix possible buffer overflow.
+
+	* ftp/ftp.c (hookup): Terminate string after strncpy.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ftp: Fix 2x misuse of strncpy (read buffer overflow).
+
+	* ftp/ftp.c (pswitch): Correctly set the terminating NUL.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	talk: Fix uninitialized variable NREADY.
+
+	* talk/ctl_transact.c (ctl_transact): Initialize NREADY to 0.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	whois: Silence -Wimplicit-fallthrough.
+
+	* whois/whois.c (main): Squeelch warnings.
+
+2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ping, ping6: Silence -Wimplicit-fallthrough.
+
+	* ping/ping.c (parse_opt): Squeelch warnings.
+	* ping/ping6.c (parse_opt): Likewise.
+
+2020-02-17  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ping6: Fix memleak in ping_set_dest.
+
+	* ping/ping6.c (ping_set_dest): Rerrange code to avoid memory
+	leak.
+	* ping/ping6.h (ping_set_dest): Change type; update callees.
+
+2020-02-17  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ping: Fix memleak in ping_set_dest.
+
+	* ping/libping.c (ping_set_dest): Rerrange code to avoid memory
+	leak.
+	* ping/ping.h (ping_set_dest): Change type; update callees.
+
+2020-02-16  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	libls: Remove unused variable kflag.
+
+	* libls/ls.c (ls_main): Remove unused variable.
+
+2020-02-16  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	ftpd: Fix multiple definition (GCC 10).
+
+	* ftpd/extern.h (errcatch): Declare as extern.
+	* ftpd/ftpd.c (errcatch): Define variable.
+
+2020-02-16  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	telnetd: Fix multiple definition (GCC 10).
+
+	* telnetd/utility.c (not42): Declare as extern.
+
+2020-02-16  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	* src/rcp.c (tolocal): Remove unused variable LEN.
+
+2020-02-16  Tim Rühsen <tim.ruehsen@gmx.de>
+
+	telnet: Fix silent truncation (off-by-one check)
+
+	If the DISPLAY variable had exactly 44 bytes, the SE byte (end sub
+	negotiation) was silently truncated.
+
+	* telnet/telnet.c (suboption): Use >= instead of >.
+
 2020-02-21  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Various compiler warnings, getting closer to `-Werror'.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Apr 04 17:32:10 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1jKqOg-0004Ij-2W
	for mharc-commit-inetutils@gnu.org; Sat, 04 Apr 2020 17:32:10 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:60961)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <ams@gnu.org>) id 1jKqOd-0004Gv-Ev
 for commit-inetutils@gnu.org; Sat, 04 Apr 2020 17:32:08 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:39238)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
 id 1jKqOd-00015t-BA
 for commit-inetutils@gnu.org; Sat, 04 Apr 2020 17:32:07 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 66085)
 id 4BFA920BC2; Sat,  4 Apr 2020 17:32:06 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-103-g2117c31
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 23e67af2ff21b2676bdc7636144006abd88a1da2
X-Git-Newrev: 2117c3140a5c9dfe9e959961e1ae4ad89bf76294
Message-Id: <20200404213206.4BFA920BC2@vcs0.savannah.gnu.org>
Date: Sat,  4 Apr 2020 17:32:05 -0400 (EDT)
From: ams@gnu.org (Alfred M. Szmidt)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Apr 2020 21:32:08 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  2117c3140a5c9dfe9e959961e1ae4ad89bf76294 (commit)
      from  23e67af2ff21b2676bdc7636144006abd88a1da2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=2117c3140a5c9dfe9e959961e1ae4ad89bf76294


commit 2117c3140a5c9dfe9e959961e1ae4ad89bf76294
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Apr 4 23:27:35 2020 +0200

    ping/ping6.c (print_packet_too_big): Use %u when printing MTU.

diff --git a/ChangeLog b/ChangeLog
index 8183e16..d817c09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-04  Alfred M. Szmidt  <ams@gnu.org>
+
+	* ping/ping6.c (print_packet_too_big): Use %u when printing MTU.
+
 2020-02-29  Tim Rühsen <tim.ruehsen@gmx.de>
 
 	uucpd: Fix buffer overflows.
diff --git a/ping/ping6.c b/ping/ping6.c
index 5de44c0..995d71d 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -655,7 +655,7 @@ print_dst_unreach (struct icmp6_hdr *icmp6)
 static void
 print_packet_too_big (struct icmp6_hdr *icmp6)
 {
-  printf ("Packet too big, mtu=%d\n", icmp6->icmp6_mtu);
+  printf ("Packet too big, mtu=%u\n", icmp6->icmp6_mtu);
 }
 
 static struct icmp_code_descr icmp_time_exceeded_desc[] = {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    | 4 ++++
 ping/ping6.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Apr 05 10:25:59 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1jL6Dn-0001Tl-Q1
	for mharc-commit-inetutils@gnu.org; Sun, 05 Apr 2020 10:25:59 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:32832)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1jL6Di-0001TZ-Ns
 for commit-inetutils@gnu.org; Sun, 05 Apr 2020 10:25:58 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:54929)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1jL6Di-00052d-G4
 for commit-inetutils@gnu.org; Sun, 05 Apr 2020 10:25:54 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 53B2620A26; Sun,  5 Apr 2020 10:25:54 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-104-g705750b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2117c3140a5c9dfe9e959961e1ae4ad89bf76294
X-Git-Newrev: 705750b8b4a62f23cc08dfc0eb06813fb49e4d1f
Message-Id: <20200405142554.53B2620A26@vcs0.savannah.gnu.org>
Date: Sun,  5 Apr 2020 10:25:53 -0400 (EDT)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Apr 2020 14:25:58 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  705750b8b4a62f23cc08dfc0eb06813fb49e4d1f (commit)
      from  2117c3140a5c9dfe9e959961e1ae4ad89bf76294 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=705750b8b4a62f23cc08dfc0eb06813fb49e4d1f


commit 705750b8b4a62f23cc08dfc0eb06813fb49e4d1f
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Apr 5 16:21:30 2020 +0200

    Support for libidn2 in addition to libidn.
    
    Prefer libidn2 when both are present and usable.

diff --git a/ChangeLog b/ChangeLog
index d817c09..d616be8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2020-04-05  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Support for libidn2 in addition to libidn.
+
+	* am/libidn.m4 (have_IDN2, have_IDN): New local variables.
+	Detect presence of libidn2 by checking for `idn2_to_ascii_lz',
+	but still aim at backwards compatibility.  Detect header file
+	`idna.h' as well as `idn2.h', but prefer libidn2 to libidn,
+	should both libraries be detected.
+	* configure.ac (--with-idn): Mention that IDN2 is acceptable.
+	(idn_link): New variable.
+	(ftp_PROPS, ping_PROPS, talk_PROPS, telnet_PROPS, tftp_PROPS)
+	(traceroute_PROPS): Update these to state `idn', or `idn2'.
+
+	* ftp/ftp.c [HAVE_IDN2_H && HAVE_IDN2]: Include `idn2.h'.
+	[(!HAVE_IDN2_H || !HAVE_IDN2) && HAVE_IDNA_H]: Include `idna.h'.
+	(hookup) [HAVE_IDN || HAVE_IDN2]: Use compatibility function
+	idna_to_ascii_lz().
+	* ping/libping.c (ping_set_dest): Likewise.
+	* ping/ping6.c (ping_set_dest): Likewise.
+	* src/tftp.c (resolve_name): Likewise.
+	* src/traceroute.c (main): Likewise.
+	* talk/get_addrs.c (get_addrs)
+	[HAVE_DECL_GETADDRINFO || HAVE_IDN || HAVE_IDN2]: Declare ERR.
+	[HAVE_IDN || HAVE_IDN2]: Likewise.
+	* telnet/commands.c (tn): Declare HOSTTMP.  Likewise.
+
 2020-04-04  Alfred M. Szmidt  <ams@gnu.org>
 
 	* ping/ping6.c (print_packet_too_big): Use %u when printing MTU.
diff --git a/am/libidn.m4 b/am/libidn.m4
index ab2121c..68c43fd 100644
--- a/am/libidn.m4
+++ b/am/libidn.m4
@@ -1,4 +1,4 @@
-# libidn.m4 serial 1
+# libidn.m4 serial 2
 dnl Copyright (C) 2013-2020 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU Inetutils.
@@ -44,9 +44,21 @@ then
     INCIDN=-I$2
   fi
 
-  AC_CHECK_LIB([idn], [idna_to_ascii_lz],
-	       [LIBIDN="$LIBIDN -lidn"], [INCIDN= LIBIDN=],
-	       [$LIBIDN])
+  AC_CHECK_LIB([idn2], [idn2_to_ascii_lz], [have_IDN2=yes], , [$LIBIDN])
+
+  AC_CHECK_LIB([idn], [idna_to_ascii_lz], [have_IDN=yes], , [$LIBIDN])
+
+  if test x"$have_IDN2" = xyes
+  then
+    LIBIDN="$LIBIDN -lidn2"
+  else
+    if test x"$have_IDN" = xyes
+    then
+      LIBIDN="$LIBIDN -lidn"
+    else
+      INCIDN= LIBIDN=
+    fi
+  fi
 
   # Some systems are known to install <idna.h> below
   # '/usr/include/idn'.  The caching performed by
@@ -54,16 +66,23 @@ then
   # repeated call of the macro.  Functional alternative?
   save_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $INCIDN"
-  AC_CHECK_HEADERS([idna.h])
+
+  AC_CHECK_HEADERS([idna.h idn2.h])
 
   AC_MSG_CHECKING([if GNU libidn is available])
-  if test "$ac_cv_lib_idn_idna_to_ascii_lz" = yes \
-      && test "$ac_cv_header_idna_h" = yes; then
-    AC_DEFINE(HAVE_IDN, 1, [Define to 1 for use of GNU Libidn.])
-    AC_MSG_RESULT($ac_cv_lib_idn_idna_to_ascii_lz)
+  if test "$ac_cv_lib_idn2_idn2_to_ascii_lz" = yes \
+      && test "$ac_cv_header_idn2_h" = yes; then
+    AC_DEFINE(HAVE_IDN2, 1, [Define to 1 for use of GNU Libidn2.])
+    AC_MSG_RESULT($ac_cv_lib_idn2_idn2_to_ascii_lz)
   else
-    AC_MSG_RESULT([no])
-    INCIDN= LIBIDN=
+    if test "$ac_cv_lib_idn_idna_to_ascii_lz" = yes \
+	&& test "$ac_cv_header_idna_h" = yes; then
+      AC_DEFINE(HAVE_IDN, 1, [Define to 1 for use of GNU Libidn.])
+      AC_MSG_RESULT($ac_cv_lib_idn_idna_to_ascii_lz)
+    else
+      AC_MSG_RESULT([no])
+      INCIDN= LIBIDN=
+    fi
   fi
   CPPFLAGS=$save_CPPFLAGS
 fi
diff --git a/configure.ac b/configure.ac
index 5852746..a8bdae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ AC_ARG_WITH([pam],
                            [Add support for PAM]))
 AC_ARG_WITH([idn],
   AS_HELP_STRING([--with-idn[[=DIR]]],
-		 [Use IDN support, with optional inclusion directory]), ,
+		 [Use IDN or IDN2 support, with optional inclusion directory]), ,
 		 [with_idn=no])
 AC_ARG_WITH([libidn-prefix],
   AS_HELP_STRING([--with-libidn-prefix[[=DIR]]],
@@ -1124,12 +1124,14 @@ rlogind_PROPS="${rlogind_PROPS:+$rlogind_PROPS }$LIBWRAP"
 
 # Support for libidn.
 
-ftp_PROPS="${ftp_PROPS:+$ftp_PROPS }${LIBIDN:+-lidn}"
-ping_PROPS="${ping_PROPS:+$ping_PROPS }${LIBIDN:+-lidn}"
-talk_PROPS="${talk_PROPS:+$talk_PROPS }${LIBIDN:+-lidn}"
-telnet_PROPS="${telnet_PROPS:+$telnet_PROPS }${LIBIDN:+-lidn}"
-tftp_PROPS="${tftp_PROPS:+$tftp_PROPS }${LIBIDN:+-lidn}"
-traceroute_PROPS="${traceroute_PROPS:+$traceroute_PROPS }${LIBIDN:+-lidn}"
+idn_link=`expr X"$LIBIDN" : '.*-l\(idn2*\)'`
+
+ftp_PROPS="${ftp_PROPS:+$ftp_PROPS }${LIBIDN:+$idn_link}"
+ping_PROPS="${ping_PROPS:+$ping_PROPS }${LIBIDN:+$idn_link}"
+talk_PROPS="${talk_PROPS:+$talk_PROPS }${LIBIDN:+$idn_link}"
+telnet_PROPS="${telnet_PROPS:+$telnet_PROPS }${LIBIDN:+$idn_link}"
+tftp_PROPS="${tftp_PROPS:+$tftp_PROPS }${LIBIDN:+$idn_link}"
+traceroute_PROPS="${traceroute_PROPS:+$traceroute_PROPS }${LIBIDN:+$idn_link}"
 
 # Termcap variants.
 
diff --git a/ftp/ftp.c b/ftp/ftp.c
index 061eccb..d474051 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -81,7 +81,9 @@
 #include <stdarg.h>
 #include <sys/select.h>
 
-#ifdef HAVE_IDNA_H
+#if defined HAVE_IDN2_H && defined HAVE_IDN2
+# include <idn2.h>
+#elif defined HAVE_IDNA_H
 # include <idna.h>
 #endif
 
@@ -135,7 +137,7 @@ hookup (char *host, int port)
   if (p && p != host && isprint (p[1]))
     host = ++p;
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   status = idna_to_ascii_lz (host, &rhost, 0);
   if (status)
     {
@@ -143,7 +145,7 @@ hookup (char *host, int port)
       code = -1;
       return ((char *) 0);
     }
-#else /* !HAVE_IDN */
+#else /* !HAVE_IDN && !HAVE_IDN2 */
   rhost = strdup (host);
 #endif
 
diff --git a/ping/libping.c b/ping/libping.c
index d771d34..9bfd9a1 100644
--- a/ping/libping.c
+++ b/ping/libping.c
@@ -32,7 +32,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#ifdef HAVE_IDNA_H
+#if defined HAVE_IDN2_H && defined HAVE_IDN2
+# include <idn2.h>
+#elif defined HAVE_IDNA_H
 # include <idna.h>
 #endif
 
@@ -293,7 +295,7 @@ ping_set_dest (PING * ping, const char *host)
   struct addrinfo hints, *res;
   char *rhost;
 
-# ifdef HAVE_IDN
+# if defined HAVE_IDN || defined HAVE_IDN2
   rc = idna_to_ascii_lz (host, &rhost, 0);	/* P is allocated.  */
   if (rc)
     return 1;
@@ -324,7 +326,7 @@ ping_set_dest (PING * ping, const char *host)
   if (res->ai_canonname)
     ping->ping_hostname = strdup (res->ai_canonname);
   else
-# ifdef HAVE_IDN
+# if defined HAVE_IDN || defined HAVE_IDN2
     ping->ping_hostname = host;
 #else
     ping->ping_hostname = strdup (host);
@@ -345,7 +347,7 @@ ping_set_dest (PING * ping, const char *host)
   else
     {
       struct hostent *hp;
-# ifdef HAVE_IDN
+# if defined HAVE_IDN || defined HAVE_IDN2
       char *rhost;
       int rc;
 
@@ -354,7 +356,7 @@ ping_set_dest (PING * ping, const char *host)
 	return 1;
       hp = gethostbyname (rhost);
       free (rhost);
-# else /* !HAVE_IDN */
+# else /* !HAVE_IDN && !HAVE_IDN2 */
       hp = gethostbyname (host);
 # endif
       if (!hp)
diff --git a/ping/ping6.c b/ping/ping6.c
index 995d71d..871f60a 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -44,7 +44,9 @@
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
-#ifdef HAVE_IDNA_H
+#if defined HAVE_IDN2_H && defined HAVE_IDN2
+# include <idn2.h>
+#elif defined HAVE_IDNA_H
 # include <idna.h>
 #endif
 
@@ -1004,12 +1006,12 @@ ping_set_dest (PING * ping, const char *host)
   struct addrinfo *result, hints;
   char *rhost;
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   err = idna_to_ascii_lz (host, &rhost, 0);
   if (err)
     return 1;
   host = rhost;
-#else /* !HAVE_IDN */
+#else /* !HAVE_IDN && !HAVE_IDN2 */
   rhost = NULL;
 #endif
 
@@ -1035,7 +1037,7 @@ ping_set_dest (PING * ping, const char *host)
   if (result->ai_canonname)
     ping->ping_hostname = strdup (result->ai_canonname);
   else
-#if HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
     ping->ping_hostname = host;
 #else
   ping->ping_hostname = strdup (host);
diff --git a/src/tftp.c b/src/tftp.c
index e44dd58..670253e 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -73,7 +73,9 @@
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
-#ifdef HAVE_IDNA_H
+#if defined HAVE_IDN2_H && defined HAVE_IDN2
+# include <idn2.h>
+#elif defined HAVE_IDNA_H
 # include <idna.h>
 #endif
 
@@ -313,14 +315,14 @@ resolve_name (char *name)
   struct sockaddr_storage ss;
   struct addrinfo hints, *ai, *aiptr;
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   err = idna_to_ascii_lz (name, &rname, 0);
   if (err)
     {
       fprintf (stderr, "tftp: %s: %s\n", name, idna_strerror (err));
       return RESOLVE_FAIL;
     }
-#else /* !HAVE_IDN */
+#else /* !HAVE_IDN && !HAVE_IDN2 */
   rname = name;
 #endif
 
@@ -342,7 +344,7 @@ resolve_name (char *name)
       return RESOLVE_FAIL;
     }
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   free (rname);
 #endif
 
diff --git a/src/traceroute.c b/src/traceroute.c
index 8d52bf2..3107c8b 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -53,7 +53,9 @@
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
-#ifdef HAVE_IDNA_H
+#if defined HAVE_IDN2_H && defined HAVE_IDN2
+# include <idn2.h>
+#elif defined HAVE_IDNA_H
 # include <idna.h>
 #endif
 
@@ -301,13 +303,13 @@ main (int argc, char **argv)
 # endif
 #endif
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   rc = idna_to_ascii_lz (hostname, &rhost, 0);
   free (hostname);
 
   if (rc)
     error (EXIT_FAILURE, 0, "unknown host");
-#else /* !HAVE_IDN */
+#else /* !HAVE_IDN && !HAVE_IDN2 */
   rhost = hostname;
 #endif
 
diff --git a/talk/get_addrs.c b/talk/get_addrs.c
index e97f0b5..563fbad 100644
--- a/talk/get_addrs.c
+++ b/talk/get_addrs.c
@@ -57,7 +57,9 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <unistd.h>
-#ifdef HAVE_IDNA_H
+#if defined HAVE_IDN2_H && defined HAVE_IDN2
+# include <idn2.h>
+#elif defined HAVE_IDNA_H
 # include <idna.h>
 #endif
 
@@ -66,7 +68,7 @@
 int
 get_addrs (char *my_machine_name, char *his_machine_name)
 {
-#if HAVE_DECL_GETADDRINFO || defined HAVE_IDN
+#if HAVE_DECL_GETADDRINFO || defined HAVE_IDN || defined HAVE_IDN2
   int err;
 #endif
   char *lhost, *rhost;
@@ -77,7 +79,7 @@ get_addrs (char *my_machine_name, char *his_machine_name)
 #endif
   struct servent *sp;
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   err = idna_to_ascii_lz (my_machine_name, &lhost, 0);
   if (err)
     {
@@ -93,7 +95,7 @@ get_addrs (char *my_machine_name, char *his_machine_name)
 	       his_machine_name, idna_strerror (err));
       exit (-1);
     }
-#else /* !HAVE_IDN */
+#else /* !HAVE_IDN && !HAVE_IDN2 */
   lhost = my_machine_name;
   rhost = his_machine_name;
 #endif
@@ -236,7 +238,7 @@ get_addrs (char *my_machine_name, char *his_machine_name)
     }
   daemon_port = ntohs (sp->s_port);
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   free (lhost);
   free (rhost);
 #endif
diff --git a/telnet/commands.c b/telnet/commands.c
index d935108..29b2bfd 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -72,7 +72,9 @@
 #include <arpa/inet.h>
 #include <arpa/telnet.h>
 
-#ifdef HAVE_IDNA_H
+#if defined HAVE_IDN2_H && defined HAVE_IDN2
+# include <idn2.h>
+#elif defined HAVE_IDNA_H
 # include <idna.h>
 #endif
 
@@ -2454,7 +2456,7 @@ tn (int argc, char *argv[])
   const int on = 1;
   int err;
   char *cmd, *hostp = 0, *portp = 0, *user = 0;
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   char *hosttmp = 0;
 #endif
 
@@ -2602,7 +2604,7 @@ tn (int argc, char *argv[])
   }
 #endif /* AUTHENTICATION || ENCRYPTION */
 
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   err = idna_to_ascii_lz (hostp, &hosttmp, 0);
   if (err)
     {
@@ -2611,7 +2613,7 @@ tn (int argc, char *argv[])
       return 0;
     }
   hostp = hosttmp;
-#endif /* !HAVE_IDN */
+#endif /* !HAVE_IDN && !HAVE_IDN2 */
 
 #ifdef IPV6
   hints.ai_socktype = SOCK_STREAM;
@@ -2786,7 +2788,7 @@ tn (int argc, char *argv[])
 #endif /* !IPV6 */
 
   cmdrc (hostp, hostname);
-#ifdef HAVE_IDN
+#if defined HAVE_IDN || defined HAVE_IDN2
   /* Last use of HOSTP, alias HOSTTMP.  */
   free (hosttmp);
 #endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         | 27 +++++++++++++++++++++++++++
 am/libidn.m4      | 41 ++++++++++++++++++++++++++++++-----------
 configure.ac      | 16 +++++++++-------
 ftp/ftp.c         |  8 +++++---
 ping/libping.c    | 12 +++++++-----
 ping/ping6.c      | 10 ++++++----
 src/tftp.c        | 10 ++++++----
 src/traceroute.c  |  8 +++++---
 talk/get_addrs.c  | 12 +++++++-----
 telnet/commands.c | 12 +++++++-----
 10 files changed, 109 insertions(+), 47 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Apr 07 18:36:54 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1jLwpx-0005NE-Ir
	for mharc-commit-inetutils@gnu.org; Tue, 07 Apr 2020 18:36:54 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:40892)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1jLwpt-0005L1-9Q
 for commit-inetutils@gnu.org; Tue, 07 Apr 2020 18:36:51 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:41812)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1jLwpr-0000sk-EI
 for commit-inetutils@gnu.org; Tue, 07 Apr 2020 18:36:48 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id 4E01A20B74; Tue,  7 Apr 2020 18:36:47 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-105-g486a9b3
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 705750b8b4a62f23cc08dfc0eb06813fb49e4d1f
X-Git-Newrev: 486a9b3861124c5a74146607ef60d85c587e0613
Message-Id: <20200407223647.4E01A20B74@vcs0.savannah.gnu.org>
Date: Tue,  7 Apr 2020 18:36:46 -0400 (EDT)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2020 22:36:52 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  486a9b3861124c5a74146607ef60d85c587e0613 (commit)
      from  705750b8b4a62f23cc08dfc0eb06813fb49e4d1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=486a9b3861124c5a74146607ef60d85c587e0613


commit 486a9b3861124c5a74146607ef60d85c587e0613
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Mon Apr 6 23:13:36 2020 +0200

    whois: Include ERX ranges for APNIC.
    
    Cover old B-class ranges as far as public documents allow.

diff --git a/ChangeLog b/ChangeLog
index d616be8..5db6855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2020-04-06  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	whois: Include ERX ranges for APNIC.
+
+	The content of the following web page was scanned to identify
+	the ranges within old B-classes that were assigned to APNIC
+	by the ERX project, Early Registration Transfer.  After some
+	cross checking, a few intermediate ranges for other registars
+	were included for better resolution.
+	https://www.apnic.net/manage-ip/manage-historical-resources/erx-project/erx-transfer-to-apnic/
+
+	* whois/ip_del_list: Add a large amount of APNIC address ranges.
+
 2020-04-05  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Support for libidn2 in addition to libidn.
diff --git a/whois/ip_del_list b/whois/ip_del_list
index 06d3509..74ca6eb 100644
--- a/whois/ip_del_list
+++ b/whois/ip_del_list
@@ -63,21 +63,257 @@
 ## The B class space is a mess :-( - something could still be missing
 # Ranges administered by ARIN are caught by default.
 #
+128.134.0.0/16	apnic	# ERX
+128.184.0.0/16	apnic	# ERX
+128.250.0.0/16	apnic	# ERX
+
+129.60.0.0/16	apnic	# ERX
+129.78.0.0/16	apnic	# ERX
+129.94.0.0/16	apnic	# ERX
+129.96.0.0/16	apnic	# ERX
+129.127.0.0/16	apnic	# ERX
+129.136.0.0/16	apnic	# ERX
+129.180.0.0/16	apnic	# ERX
+129.249.0.0/16	apnic	# ERX
+129.254.0.0/16	apnic	# ERX
+
+130.34.0.0/16	apnic	# ERX
+130.54.0.0/16	apnic	# ERX
+130.56.0.0/16	apnic	# ERX
+130.69.0.0/16	apnic	# ERX
+130.87.0.0/16	apnic	# ERX
+130.95.0.0/16	apnic	# ERX
+130.102.0.0/16	apnic	# ERX
+130.116.0.0/16	apnic	# ERX
+130.123.0.0/16	apnic	# ERX
+130.130.0.0/16	apnic	# ERX
+130.153.0.0/16	apnic	# ERX
+130.155.0.0/16	apnic	# ERX
+130.158.0.0/16	apnic	# ERX
+130.194.0.0/16	apnic	# ERX
+130.195.0.0/18	apnic
+130.195.64.0/19	apnic
+130.195.96.0/19	ripe
+130.195.128.0/17	apnic
+130.216.0.0/15	apnic	# ERX
+130.220.0.0/16	apnic	# ERX
+
+131.112.0.0/15	apnic	# ERX
+131.170.0.0/16	apnic	# ERX
+131.172.0.0/16	apnic	# ERX
+131.181.0.0/16	apnic	# ERX
+131.185.0.0/16	apnic	# ERX
+131.203.0.0/16	apnic	# ERX
+131.206.0.0/16	apnic	# ERX
+131.217.0.0/16	apnic	# ERX
+131.236.0.0/16	apnic	# ERX
+131.242.0.0/16	apnic	# ERX
+131.244.0.0/15	apnic	# ERX
+131.248.0.0/16	apnic	# ERX
+
+132.179.0.0/16	apnic	# ERX
+132.181.0.0/16	apnic	# ERX
+132.182.0.0/16	apnic	# ERX
+132.186.0.0/16	apnic	# ERX
+132.222.0.0/16	apnic	# ERX
+132.234.0.0/16	apnic	# ERX
+
 133.0.0.0/8	apnic	# administered
+
+134.7.0.0/16	apnic	# ERX
+134.18.0.0/16	apnic	# ERX
+134.75.0.0/16	apnic	# ERX
+134.115.0.0/16	apnic	# ERX
+134.144.0.0/16	apnic	# ERX
+134.148.0.0/16	apnic	# ERX
+134.159.0.0/16	apnic	# ERX
+134.178.0.0/16	apnic	# ERX
+134.180.0.0/16	apnic	# ERX
+134.196.0.0/16	apnic	# ERX
+134.208.0.0/16	apnic	# ERX
+134.211.0.0/16	apnic	# ERX
+134.237.0.0/16	apnic	# ERX
+
+136.153.0.0/16	apnic	# ERX
+136.154.0.0/16	apnic	# ERX
+136.186.0.0/15	apnic	# ERX
+136.198.0.0/16	apnic	# ERX
+
+137.68.0.0/16	apnic	# ERX
+137.76.0.0/16	apnic	# ERX
+137.92.0.0/16	apnic	# ERX
+137.109.0.0/16	apnic	# ERX
+137.111.0.0/16	apnic	# ERX
+137.132.0.0/16	apnic	# ERX
+137.147.0.0/16	apnic	# ERX
+137.153.0.0/16	apnic	# ERX
+137.154.0.0/16	apnic	# ERX
+137.157.0.0/16	apnic	# ERX
+137.166.0.0/16	apnic	# ERX
+137.172.0.0/16	apnic	# ERX
+137.189.0.0/16	apnic	# ERX
+137.219.0.0/16	apnic	# ERX
+
+138.7.0.0/16	apnic	# ERX
+138.19.0.0/16	apnic	# ERX
+138.24.0.0/16	apnic	# ERX
+138.30.0.0/16	apnic	# ERX
+138.44.0.0/16	apnic	# ERX
+138.71.0.0/16	apnic	# ERX
+138.75.0.0/16	apnic	# ERX
+138.77.0.0/16	apnic	# ERX
+138.79.0.0/16	apnic	# ERX
+138.80.0.0/16	apnic	# ERX
+138.101.0.0/16	apnic	# ERX
+138.107.0.0/16	apnic	# ERX
+138.130.0.0/16	apnic	# ERX
+138.194.0.0/16	apnic	# ERX
+138.206.0.0/16	apnic	# ERX
+138.211.0.0/16	apnic	# ERX
+138.212.0.0/15	apnic	# ERX
+138.217.0.0/16	apnic	# ERX
+138.235.0.0/16	apnic	# ERX
+138.243.0.0/16	apnic	# ERX
+138.252.0.0/16	apnic	# ERX
+
 139.20.0.0/14	ripe
 139.24.0.0/14	ripe
 139.28.0.0/15	ripe
+139.44.0.0/16	apnic	# ERX
+139.59.0.0/16	apnic	# ERX
+139.80.0.0/16	apnic	# ERX
+139.86.0.0/16	apnic	# ERX
+139.130.0.0/16	apnic	# ERX
+139.132.0.0/16	apnic	# ERX
+139.134.0.0/16	apnic	# ERX
+139.152.0.0/16	apnic	# ERX
+139.154.0.0/16	apnic	# ERX
+139.163.0.0/16	apnic	# ERX
+139.168.0.0/16	apnic	# ERX
+139.175.0.0/16	apnic	# ERX
+139.188.0.0/16	apnic	# ERX
+139.223.0.0/16	apnic	# ERX
+139.230.0.0/16	apnic	# ERX
+
+140.79.0.0/16	apnic	# ERX
+140.81.0.0/16	apnic	# ERX
+140.83.0.0/16	apnic	# ERX
+140.92.0.0/16	apnic	# ERX
+140.96.0.0/16	apnic	# ERX
+140.109.0.0/16	apnic
+140.112.0.0/12	apnic	# ERX
+140.128.0.0/13	apnic	# ERX
+140.136.0.0/15	apnic	# ERX
+140.138.0.0/16	apnic	# ERX
+140.159.0.0/16	apnic	# ERX
+140.168.0.0/16	apnic	# ERX
+140.200.0.0/16	apnic	# ERX
+140.253.0.0/16	apnic	# ERX
+
 141.0.0.0/10	ripe
 141.64.0.0/12	ripe
 141.80.0.0/14	ripe
 141.84.0.0/15	ripe
+141.103.0.0/16	apnic	# ERX
+141.120.0.0/16	apnic	# ERX
+141.132.0.0/16	apnic	# ERX
+141.168.0.0/16	apnic	# ERX
+141.178.0.0/16	apnic	# ERX
+141.223.0.0/16	apnic	# ERX
+141.229.0.0/16	apnic	# ERX
+141.243.0.0/16	apnic	# ERX
 141.0.0.0/8	ripe	# administered
+
+143.89.0.0/16	apnic	# ERX
+143.90.0.0/16	apnic	# ERX
+143.92.0.0/16	apnic	# ERX
+143.94.0.0/16	apnic	# ERX
+143.96.0.0/16	apnic	# ERX
+143.119.0.0/16	apnic	# ERX
+143.125.0.0/16	apnic	# ERX
+143.136.0.0/16	apnic	# ERX
+143.171.0.0/16	apnic	# ERX
+143.174.0.0/16	apnic	# ERX
+143.188.0.0/16	apnic	# ERX
+143.201.0.0/16	apnic	# ERX
+143.216.0.0/16	apnic	# ERX
+143.218.0.0/16	apnic	# ERX
+143.221.0.0/16	apnic	# ERX
+143.238.0.0/16	apnic	# ERX
+143.248.0.0/16	apnic	# ERX
+143.253.0.0/16	apnic	# ERX
+
+144.1.0.0/16	apnic	# ERX
+144.6.0.0/16	apnic	# ERX
+144.16.0.0/16	apnic	# ERX
+144.53.0.0/16	apnic	# ERX
+144.55.0.0/16	apnic	# ERX
+144.66.0.0/16	apnic	# ERX
+144.79.0.0/16	apnic	# ERX
+144.97.0.0/16	apnic	# ERX
+144.110.0.0/16	apnic	# ERX
+144.120.0.0/16	apnic	# ERX
+144.130.0.0/15	apnic	# ERX
+144.132.0.0/14	apnic	# ERX
+144.136.0.0/14	apnic	# ERX
+144.140.0.0/14	apnic	# ERX
+144.199.0.0/16	apnic	# ERX
+144.205.0.0/16	apnic	# ERX
+144.213.0.0/16	apnic	# ERX
+144.214.0.0/16	apnic	# ERX
+144.218.0.0/16	apnic	# ERX
+
 145.224.0.0/12	ripe
 145.240.0.0/13	ripe
 145.248.0.0/14	ripe
 145.252.0.0/15	ripe
 145.254.0.0/16	ripe
 145.0.0.0/8	ripe	# administered
+
+146.11.0.0/16	apnic	# ERX
+146.51.0.0/16	apnic	# ERX
+146.56.0.0/16	apnic	# ERX
+146.62.0.0/16	apnic	# ERX
+146.90.0.0/16	apnic	# ERX
+146.116.0.0/15	apnic	# ERX
+146.118.0.0/16	apnic	# ERX
+146.144.0.0/16	apnic	# ERX
+146.171.0.0/16	apnic	# ERX
+146.178.0.0/16	apnic	# ERX
+146.195.0.0/16	apnic	# ERX
+146.196.0.0/17	apnic	# ERX
+146.196.128.0/17	afrinic
+146.221.0.0/16	apnic	# ERX
+
+147.6.0.0/16	apnic	# ERX
+147.8.0.0/16	apnic	# ERX
+147.10.0.0/16	apnic	# ERX
+147.41.0.0/16	apnic	# ERX
+147.43.0.0/16	apnic	# ERX
+147.60.0.0/16	apnic	# ERX
+147.66.0.0/16	apnic	# ERX
+147.69.0.0/16	apnic	# ERX
+147.76.0.0/16	apnic	# ERX
+147.109.0.0/16	apnic	# ERX
+147.132.0.0/16	apnic	# ERX
+147.157.0.0/16	apnic	# ERX
+147.158.0.0/16	apnic	# ERX
+147.176.0.0/16	apnic	# ERX
+147.200.0.0/16	apnic	# ERX
+147.209.0.0/16	apnic	# ERX
+147.211.0.0/16	apnic	# ERX
+147.212.0.0/16	apnic	# ERX
+
+148.145.0.0/16	apnic	# ERX
+148.161.0.0/16	apnic	# ERX
+148.182.0.0/16	apnic	# ERX
+148.195.0.0/16	apnic	# ERX
+
+149.135.0.0/16	apnic	# ERX
+149.144.0.0/16	apnic	# ERX
+149.167.0.0/16	apnic	# ERX
+149.171.0.0/16	apnic	# ERX
+149.176.0.0/16	apnic	# ERX
 149.202.0.0/15	ripe
 149.204.0.0/16	ripe
 149.206.0.0/15	ripe
@@ -85,8 +321,10 @@
 149.224.0.0/12	ripe
 149.240.0.0/13	ripe
 149.248.0.0/14	ripe
+
 150.254.0.0/16	ripe
-150.0.0.0/8	apnic	# administered
+150.0.0.0/8	apnic	# administered, most by ERX
+
 151.13.0.0/16	ripe
 151.14.0.0/15	ripe
 151.16.0.0/12	ripe
@@ -100,21 +338,317 @@
 151.92.0.0/15	ripe
 151.95.0.0/16	ripe
 151.99.0.0/16	ripe	# interbusiness
+151.130.0.0/16	apnic	# ERX
+151.135.0.0/16	apnic	# ERX
+151.158.0.0/16	apnic	# ERX
+151.172.0.0/16	apnic	# ERX
+151.178.0.0/16	apnic	# ERX
 151.0.0.0/8	ripe	# administered
+
+152.76.0.0/16	apnic	# ERX
+152.83.0.0/16	apnic	# ERX
+152.91.0.0/16	apnic	# ERX
+152.98.0.0/15	apnic	# ERX
+152.101.0.0/16	apnic	# ERX
+152.102.0.0/15	apnic	# ERX
+152.104.0.0/16	apnic	# ERX
+152.118.0.0/16	apnic	# ERX
+152.147.0.0/16	apnic	# ERX
+152.149.0.0/16	apnic	# ERX
+152.153.0.0/16	apnic	# ERX
+152.226.0.0/16	apnic	# ERX
+
+153.20.0.0/16	apnic	# ERX
+153.107.0.0/16	apnic	# ERX
+153.111.0.0/16	apnic	# ERX
 153.0.0.0/8	apnic	# administered
+
 154.0.0.0/8	afrinic	# administered
+
+155.32.0.0/16	apnic	# ERX
+155.59.0.0/16	apnic	# ERX
+155.60.0.0/16	apnic	# ERX
+155.69.0.0/16	apnic	# ERX
+155.71.0.0/16	apnic	# ERX
+155.143.0.0/16	apnic	# ERX
+155.144.0.0/16	apnic	# ERX
+155.160.0.0/16	apnic	# ERX
+155.187.0.0/16	apnic	# ERX
+155.205.0.0/16	apnic	# ERX
+155.230.0.0/16	apnic	# ERX
+
+156.13.0.0/16	apnic	# ERX
+156.16.0.0/16	apnic	# ERX
+156.22.0.0/16	apnic	# ERX
+156.31.0.0/16	apnic	# ERX
+156.50.0.0/16	apnic	# ERX
+156.59.0.0/16	apnic	# ERX
+156.62.0.0/16	apnic	# ERX
+156.69.0.0/16	apnic	# ERX
+156.147.0.0/16	apnic	# ERX
+156.149.0.0/16	apnic	# ERX
+
+157.1.0.0/16	apnic	# ERX
+157.2.0.0/15	apnic	# ERX
+157.4.0.0/14	apnic	# ERX
+157.8.0.0/14	apnic	# ERX
+157.12.0.0/14	apnic	# ERX
+157.16.0.0/14	apnic	# ERX
+157.20.0.0/16	apnic	# ERX
+157.63.0.0/16	apnic	# ERX
+157.64.0.0/12	apnic	# ERX
+157.80.0.0/15	apnic	# ERX
+157.82.0.0/16	apnic	# ERX
+157.85.0.0/16	apnic	# ERX
+157.100.0.0/16	lacnic	# ERX
+157.101.0.0/16	apnic	# ERX
+157.102.0.0/15	apnic	# ERX
+157.104.0.0/13	apnic	# ERX
+157.112.0.0/14	apnic	# ERX
+157.116.0.0/15	apnic	# ERX
+157.118.0.0/16	apnic	# ERX
+157.119.0.0/17	apnic	# ERX
+157.119.128.0/19	apnic	#
+157.119.160.0/20	apnic	#
+157.119.176.0/21	apnic	#
+157.119.184.0/22	apnic	#
+157.119.192.0/18	apnic	# ERX
+157.120.0.0/17	apnic	# ERX
+157.120.128.0/18	apnic	# ERX
+157.120.192.0/19	apnic	# ERX
+157.120.232.0/22	apnic	# ERX
+157.128.0.0/16	apnic	# ERX
+157.155.0.0/16	apnic	# ERX
+157.179.0.0/16	apnic	# ERX
+157.192.0.0/16	apnic	# ERX
+157.197.0.0/16	apnic	# ERX
+157.205.0.0/16	apnic	# ERX
+157.211.0.0/16	apnic	# ERX
+157.227.0.0/16	apnic	# ERX
+
+158.40.0.0/16	apnic	# ERX
+158.44.0.0/15	apnic	# ERX
+158.54.0.0/16	apnic	# ERX
+158.89.0.0/16	apnic	# ERX
+158.108.0.0/16	apnic	# ERX
+158.132.0.0/16	apnic	# ERX
+158.144.0.0/16	apnic	# ERX
+158.161.0.0/16	apnic	# ERX
+158.182.0.0/16	apnic	# ERX
+158.198.0.0/15	apnic	# ERX
+158.200.0.0/13	apnic	# ERX
+158.208.0.0/13	apnic	# ERX
+158.217.0.0/13	apnic	# ERX
+
+159.13.0.0/16	apnic	# ERX
+159.52.0.0/16	apnic	# ERX
+159.73.0.0/16	apnic	# ERX
+159.80.0.0/16	apnic	# ERX
+159.111.0.0/16	apnic	# ERX
+159.117.0.0/16	apnic	# ERX
+159.196.0.0/16	apnic	# ERX
+159.207.0.0/16	apnic	# ERX
+159.211.0.0/16	apnic	# ERX
+159.226.0.0/16	apnic	# ERX
+159.228.0.0/16	apnic	# ERX
+159.248.0.0/16	apnic	# ERX
+
+160.4.0.0/16	apnic	# ERX
+160.11.0.0/16	apnic	# ERX
+160.12.0.0/14	apnic	# ERX
+160.16.0.0/15	apnic	# ERX
+160.18.0.0/16	apnic	# ERX
+160.21.0.0/16	apnic	# ERX
+160.22.0.0/15	apnic	# ERX
+160.24.0.0/14	apnic	# ERX
+160.28.0.0/15	apnic	# ERX
+160.30.0.0/16	apnic	# ERX
+160.64.0.0/16	apnic	# ERX
+160.74.0.0/16	apnic	# ERX
+160.96.0.0/16	apnic	# ERX
+160.184.0.0/16	afrinic	# ERX
+160.185.0.0/16	apnic	# ERX
+160.186.0.0/15	apnic	# ERX
+160.188.0.0/14	apnic	# ERX
+160.192.0.0/13	apnic	# ERX
+160.200.0.0/15	apnic	# ERX
+160.202.0.0/20	apnic	# ERX
+160.202.32.0/19	apnic	# ERX
+160.202.128.0/17	apnic	# ERX
+160.203.0.0/16	apnic	# ERX
+160.204.0.0/16	apnic	# ERX
+160.206.0.0/16	apnic	# ERX
+160.215.0.0/16	apnic	# ERX
 160.216.0.0/14	ripe
 160.220.0.0/16	ripe
+160.222.0.0/16	apnic	# ERX
 160.44.0.0/14	ripe
 160.48.0.0/12	ripe
+
+161.29.0.0/16	apnic	# ERX
+161.43.0.0/16	apnic	# ERX
+161.50.0.0/16	apnic	# ERX
+161.64.0.0/16	apnic	# ERX
+161.65.0.0/16	apnic	# ERX
+161.66.0.0/16	apnic	# ERX
+161.75.0.0/16	apnic	# ERX
+161.93.0.0/16	apnic	# ERX
+161.94.0.0/16	apnic	# ERX
+161.95.0.0/16	apnic	# ERX
+161.96.0.0/16	apnic	# ERX
+161.117.0.0/16	apnic	# ERX
+161.118.0.0/16	apnic	# ERX
+161.122.0.0/16	apnic	# ERX
+161.126.0.0/16	apnic	# ERX
+161.139.0.0/16	apnic	# ERX
+161.142.0.0/16	apnic	# ERX
+161.143.0.0/16	apnic	# ERX
+161.146.0.0/16	apnic	# ERX
+161.152.0.0/16	apnic	# ERX
+161.200.0.0/16	apnic	# ERX
+161.207.0.0/16	apnic	# ERX
+161.212.0.0/16	apnic	# ERX
+161.229.0.0/16	apnic	# ERX
+161.246.0.0/16	apnic	# ERX
+161.248.0.0/16	apnic	# ERX
+
+162.4.0.0/16	apnic	# ERX
+162.105.0.0/16	apnic	# ERX
+162.112.0.0/16	apnic	# ERX
+162.145.0.0/16	apnic	# ERX
+162.146.0.0/15	apnic	# ERX
+
+163.7.0.0/16	apnic	# ERX
+163.8.0.0/16	apnic	# ERX
+#163.13.0.0 - 163.32.255.255	apnic	# ERX
+#163.42.0.0 - 163.61.255.255	apnic	# ERX
+163.122.0.0/16	apnic	# ERX
+163.127.0.0/16	apnic	# ERX
+163.128.0.0/16	apnic	# ERX
+#163.130.0.0 - 163.149.255.255	apnic	# ERX
+163.152.0.0/16	apnic	# ERX
 163.156.0.0/14	ripe
 163.160.0.0/12	ripe
+163.180.0.0/16	apnic	# ERX
+163.189.0.0/16	apnic	# ERX
+#163.208.0.0 - 163.212.255.255	apnic	# ERX
+#163.214.0.0 - 163.221.255.255	apnic	# ERX
+#163.223.0.0 - 163.227.255.255	apnic	# ERX
+163.232.0.0/16	apnic	# ERX
+163.239.0.0/16	apnic	# ERX
 163.0.0.0/8	apnic	# administered
+
 164.0.0.0/11	ripe
 164.32.0.0/13	ripe
 164.40.0.0/16	ripe
+164.43.0.0/16	apnic	# ERX
+164.46.0.0/16	apnic	# ERX
+164.53.0.0/16	apnic	# ERX
+164.69.0.0/16	apnic	# ERX
+164.70.0.0/15	apnic	# ERX
+164.75.0.0/16	apnic	# ERX
+164.78.0.0/16	apnic	# ERX
+164.80.0.0/16	apnic	# ERX
+164.97.0.0/16	apnic	# ERX
+164.100.0.0/16	apnic	# ERX
+164.108.0.0/16	apnic	# ERX
+164.112.0.0/16	apnic	# ERX
+164.115.0.0/16	apnic	# ERX
+164.124.0.0/15	apnic	# ERX
 164.128.0.0/12	ripe
+164.160.0.0/16	afrinic
+164.161.0.0/16	apnic	# ERX
+164.162.0.0/16	apnic	# ERX
+164.163.0.0/16	lacnic	# ERX
+164.164.0.0/16	apnic	# ERX
+
+165.12.0.0/16	apnic	# ERX
+165.14.0.0/15	apnic	# ERX
+165.16.0.0/15	apnic	# ERX
+165.18.0.0/16	apnic	# ERX
+165.21.0.0/16	apnic	# ERX
+165.31.0.0/16	apnic	# ERX
+165.67.0.0/16	apnic	# ERX
+165.69.0.0/16	apnic	# ERX
+165.76.0.0/16	apnic	# ERX
+165.84.0.0/16	apnic	# ERX
+165.86.0.0/16	apnic	# ERX
+165.93.0.0/16	apnic	# ERX
+165.96.0.0/16	apnic	# ERX
+165.99.0.0/16	apnic	# ERX
+165.100.0.0/15	apnic	# ERX
+165.102.0.0/16	apnic	# ERX
+165.108.0.0/16	apnic	# ERX
+165.118.0.0/16	apnic	# ERX
+165.132.0.0/15	apnic	# ERX
+165.141.0.0/16	apnic	# ERX
+165.142.0.0/16	apnic	# ERX
+165.186.0.0/15	apnic	# ERX
+165.191.0.0/16	apnic	# ERX
+165.194.0.0/16	apnic	# ERX
+165.202.0.0/16	apnic	# ERX
+165.205.0.0/16	apnic	# ERX
+165.209.0.0/16	apnic	# ERX
+165.213.0.0/16	apnic	# ERX
+165.220.0.0/16	apnic	# ERX
+165.222.0.0/16	apnic	# ERX
+165.228.0.0/15	apnic	# ERX
+165.240.0.0/14	apnic	# ERX
+165.244.0.0/16	apnic	# ERX
+165.246.0.0/16	apnic	# ERX
+
+166.64.0.0/15	apnic	# ERX
+166.79.0.0/16	apnic	# ERX
+166.81.0.0/16	apnic	# ERX
+166.83.0.0/16	apnic	# ERX
+166.100.0.0/16	apnic	# ERX
+166.103.0.0/16	apnic	# ERX
+166.104.0.0/16	apnic	# ERX
+166.106.0.0/16	apnic	# ERX
+166.111.0.0/16	apnic	# ERX
+166.111.0.0/16	apnic	# ERX
+166.118.0.0/15	apnic	# ERX
+166.120.0.0/15	apnic	# ERX
+166.125.0.0/16	apnic	# ERX
+
+167.30.0.0/16	apnic	# ERX
+167.103.0.0/16	apnic	# ERX
+167.123.0.0/16	apnic	# ERX
+167.130.0.0/16	apnic	# ERX
+167.139.0.0/16	apnic	# ERX
+167.162.0.0/16	apnic	# ERX
+167.169.0.0/16	apnic	# ERX
+167.175.0.0/16	apnic	# ERX
+167.179.0.0/16	apnic	# ERX
+167.189.0.0/16	apnic	# ERX
+167.205.0.0/16	apnic	# ERX
+
+168.70.0.0/16	apnic	# ERX
+168.78.0.0/15	apnic	# ERX
+168.95.0.0/16	apnic	# ERX
+168.106.0.0/16	apnic	# ERX
+168.115.0.0/16	apnic	# ERX
+168.120.0.0/16	apnic	# ERX
+168.126.0.0/16	apnic	# ERX
+168.130.0.0/15	apnic	# ERX
+168.132.0.0/16	apnic	# ERX
+168.134.0.0/16	apnic	# ERX
+168.140.0.0/16	apnic	# ERX
+168.152.0.0/15	apnic	# ERX
+168.154.0.0/16	apnic	# ERX
+168.160.0.0/16	apnic	# ERX
+168.186.0.0/16	apnic	# ERX
+168.188.0.0/16	apnic	# ERX
+168.198.0.0/16	apnic	# ERX
+168.217.0.0/16	apnic	# ERX
+168.219.0.0/16	apnic	# ERX
+168.248.0.0/15	apnic	# ERX
+168.252.0.0/16	apnic	# ERX
+
+169.140.0.0/16	apnic	# ERX
+169.201.0.0/16	apnic	# ERX
 169.208.0.0/12	apnic
+
 171.16.0.0/12	ripe
 171.32.0.0/15	ripe
 171.0.0.0/8	apnic	# administered

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |  13 ++
 whois/ip_del_list | 536 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 548 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Apr 12 17:12:00 2020
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1jNjtY-0002nt-JX
	for mharc-commit-inetutils@gnu.org; Sun, 12 Apr 2020 17:12:00 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:41313)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <gnu@gisladisker.se>) id 1jNjtT-0002ci-FE
 for commit-inetutils@gnu.org; Sun, 12 Apr 2020 17:11:58 -0400
Received: from vcs0.savannah.gnu.org ([209.51.188.201]:43900)
 by eggs.gnu.org with esmtp (Exim 4.71)
 (envelope-from <gnu@gisladisker.se>) id 1jNjtP-0005hx-TP
 for commit-inetutils@gnu.org; Sun, 12 Apr 2020 17:11:55 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 117592)
 id C63B820D0C; Sun, 12 Apr 2020 17:11:51 -0400 (EDT)
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
 updated. inetutils-1_9_4-106-g83cfe7a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 486a9b3861124c5a74146607ef60d85c587e0613
X-Git-Newrev: 83cfe7afd39afd3dbd36bf7d6fecaf1af61e035a
Message-Id: <20200412211151.C63B820D0C@vcs0.savannah.gnu.org>
Date: Sun, 12 Apr 2020 17:11:51 -0400 (EDT)
From: gnu@gisladisker.se (Mats Erik Andersson)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
 <commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
 <mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Apr 2020 21:11:59 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  83cfe7afd39afd3dbd36bf7d6fecaf1af61e035a (commit)
      from  486a9b3861124c5a74146607ef60d85c587e0613 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=83cfe7afd39afd3dbd36bf7d6fecaf1af61e035a


commit 83cfe7afd39afd3dbd36bf7d6fecaf1af61e035a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Apr 12 23:07:04 2020 +0200

    whois: Improve delegation lists for IP and AS.
    
    The old A-class ranges should now be reasonably completely listed,
    barring the possibility of blocks smaller than 1024 addresses.

diff --git a/ChangeLog b/ChangeLog
index 5db6855..96490b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2020-04-12  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	whois: Delegation of IP and AS.
+
+	Attempt improving the list of IP range delegation within the scope
+	of old A-class ranges.  The intention is to establish as many
+	ranges of width 22, or wider, and also to verify old claims.
+
+	* whois/as_del_list: Update and correct existing AS range
+	delegations, and add a few more, random but existing.
+	* whois/ip_del_list: Add a large number of delegations within
+	former A-class ranges, and correct two erroneous instances.
+	* whois/whois.c (whereas): Raise the upper limit of known ASN.
+	(queryformat): Rewrite query statement intended for ARIN.
+
 2020-04-06  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	whois: Include ERX ranges for APNIC.
diff --git a/whois/as_del_list b/whois/as_del_list
index 773babe..c99befc 100644
--- a/whois/as_del_list
+++ b/whois/as_del_list
@@ -15,20 +15,28 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-1877	1901	ripe
+1877	1903	ripe
+2042	2042	apnic
 2043	2043	ripe
+2045	2045	ripe
 2047	2047	ripe
+2049	2049	ripe
 2057	2136	ripe
 2585	2614	ripe
+2772	2772	apnic
 2773	2822	ripe
+2823	2823	apnic
 2830	2879	ripe
 3154	3353	ripe
-4608	4863	apnic
+4608	4865	apnic
 5377	5631	ripe
-5800	5927	whois.nic.mil
 6656	6911	ripe
 7467	7722	apnic
 8192	9215	ripe
-9261	10239	apnic
+9216	10239	apnic
 12288	13311	ripe
 15360	16383	ripe
+47104	48127	ripe
+48128	49151	ripe
+49152	52223	ripe
+52224	53247	lacnic
diff --git a/whois/ip_del_list b/whois/ip_del_list
index 74ca6eb..c17b28f 100644
--- a/whois/ip_del_list
+++ b/whois/ip_del_list
@@ -20,38 +20,332 @@
 #
 # IANA IPv4 Address Space Registry: 2019-12-27
 #
+# Legend: ERX is read `Early Registration Transfer'.
+#
 
 1.0.0.0/8	apnic
 2.0.0.0/8	ripe
 5.0.0.0/8	ripe
+8.128.0.0/10	apnic	# ERX
+8.208.0.0/12	apnic	# ERX
+
+13.116.0.0/14	ripe	# ERX
+13.120.0.0/14	ripe	# ERX
+13.140.0.0/14	ripe	# ERX
+13.168.0.0/13	ripe	# ERX
+13.176.0.0/13	ripe	# ERX
+13.240.0.0/14	ripe	# ERX
 14.0.0.0/8	apnic
-24.192.0.0/14	apnic
+
+23.19.48.0/22	ripe	# ERX
+23.19.56.0/21	ripe	# ERX
+23.83.64.0/21	ripe	# ERX
+23.83.112.0/20	ripe	# ERX
+23.83.128.0/17	ripe	# ERX
+23.92.112.0/20	ripe	# ERX
+23.105.224.0/19	ripe	# ERX
+23.106.32.0/21	ripe	# ERX
+23.106.56.0/21	ripe	# ERX
+23.106.104.0/21	ripe	# ERX
+23.106.112.0/20	ripe	# ERX
+23.106.232.0/21	ripe	# ERX
+23.106.248.0/21	ripe	# ERX
+23.108.96.0/21	ripe	# ERX
+23.108.208.0/20	ripe	# ERX
+23.109.0.0/16	ripe	# ERX
+23.111.0.0/21	ripe	# ERX
+23.111.12.0/22	ripe	# ERX
+23.111.16.0/20	ripe	# ERX
+23.111.32.0/19	ripe	# ERX
+23.111.80.0/20	ripe	# ERX
+23.111.96.0/19	ripe	# ERX
+23.111.192.0/19	ripe	# ERX
+23.111.224.0/20	ripe	# ERX
+23.111.240.0/21	ripe	# ERX
+###
+### 23.128.0.0/10 claims only sparse, narrow allocation ranges.
+###
+23.226.0.0/20	apnic	# ERX
+### 23.228.0.0/18 McDonald's Corporation
+23.232.128.0/17	apnic	# ERX
+23.239.128.0/19	ripe	# ERX
+### 23.247.128.0/17 seems empty
+23.249.232.0/21	ripe	# ERX
+23.252.66.0/23	ripe	# ERX
+23.252.68.0/24	ripe	# ERX
+23.252.71.0/24	ripe	# ERX
+23.252.72.0/24	ripe	# ERX
+23.252.75.0/24	ripe	# ERX
+23.252.76.0/24	ripe	# ERX
+23.252.79.0/24	ripe	# ERX
+
+24.41.112.0/20	apnic	# ERX
+24.53.192.0/19	apnic	# ERX
 24.132.0.0/14	ripe
+24.152.0.0/17	lacnic
+24.230.0.0/19	apnic	# ERX
+24.232.0.0/16	lacnic
+24.235.22.0/23	ripe	# ERX
+24.235.24.0/21	apnic	# ERX
 25.0.0.0/8	ripe	# administered
 27.0.0.0/8	apnic
 31.0.0.0/8	ripe
 36.0.0.0/8	apnic
 37.0.0.0/8	ripe
 39.0.0.0/8	apnic
+40.72.0.0/15	apnic	# ERX
+40.125.128.0/17	apnic	# ERX
+40.126.64.0/18	apnic	# ERX
 41.0.0.0/8	afrinic
 42.0.0.0/7	apnic
+45.4.0.0/14	lacnic
+45.8.0.0/13	ripe	# ERX
+45.64.0.0/16	apnic	# ERX
+45.65.0.0/18	apnic	# ERX
+45.65.64.0/18	ripe	# ERX
+45.65.128.0/17	lacnic
+45.66.0.0/15	ripe	# ERX
+45.68.0.0/14	lacnic
+45.75.0.0/17	apnic	# ERX
+45.75.128.0/17	ripe	# ERX
+45.80.0.0/12	ripe	# ERX
+45.96.0.0/12	afrinic
+45.112.0.0/15	apnic	# ERX
+45.114.0.0/18	apnic	# ERX
+45.114.64.0/19	apnic	# ERX
+45.114.96.0/20	apnic	# ERX
+45.114.112.0/21	apnic	# ERX
+45.114.120.0/22	ripe	# ERX
+45.114.124.0/22	apnic	# ERX
+45.114.128.0/18	apnic	# ERX
+45.114.192.0/19	apnic	# ERX
+45.114.228.0/22	apnic	# ERX
+45.114.232.0/21	apnic	# ERX
+45.114.240.0/20	apnic	# ERX
+45.115.0.0/16	apnic	# ERX
+45.116.0.0/15	apnic	# ERX
+45.118.0.0/16	apnic	# ERX
+45.119.0.0/17	apnic	# ERX
+45.119.128.0/18	apnic	# ERX
+45.119.192.0/20	apnic	# ERX
+45.119.212.0/22	apnic	# ERX
+45.119.216.0/21	apnic	# ERX
+45.119.224.0/19	apnic	# ERX
+45.120.0.0/13	apnic	# ERX
+45.128.0.0/11	ripe	# ERX
+45.160.0.0/11	lacnic
+45.192.0.0/12	afrinic
+45.208.0.0/13	afrinic
+45.216.0.0/14	afrinic
+45.220.0.0/15	afrinic
+45.222.0.0/16	afrinic
+45.224.0.0/12	lacnic
+45.240.0.0/13	afrinic
+45.248.0.0/18	apnic	# ERX
+45.248.64.0/19	apnic	# ERX
+45.248.96.0/20	apnic	# ERX
+45.248.112.0/21	apnic	# ERX
+45.248.120.0/22	apnic	# ERX
+45.248.128.0/17	apnic	# ERX
+45.249.0.0/16	apnic	# ERX
+45.250.0.0/20	apnic	# ERX
+45.250.16.0/21	apnic	# ERX
+45.250.24.0/22	ripe	# ERX
+45.250.28.0/22	apnic	# ERX
+45.250.32.0/19	apnic	# ERX
+45.250.64.0/18	apnic	# ERX
+45.250.128.0/17	apnic	# ERX
+45.251.0.0/16	apnic	# ERX
+45.252.0.0/14	apnic	# ERX
 46.0.0.0/8	ripe
+47.8.0.0/15	apnic	# ERX
+47.11.0.0/16	apnic	# ERX
+47.15.0.0/16	apnic	# ERX
+47.29.0.0/16	apnic	# ERX
+47.30.0.0/15	apnic	# ERX
+47.92.0.0/14	apnic	# ERX
+47.96.0.0/15	apnic	# ERX
+47.98.0.0/15	apnic	# ERX
+47.100.0.0/14	apnic	# ERX
+47.104.0.0/13	apnic	# ERX
+47.112.0.0/12	apnic	# ERX
+47.247.0.0/16	apnic	# ERX
 49.0.0.0/8	apnic
+50.60.0.0/15	ripe	# ERX
+50.119.0.0/16	ripe	# ERX
 51.0.0.0/8	ripe	# administered
+52.80.0.0/14	apnic	# ERX
+52.130.0.0/15	apnic	# ERX
 53.0.0.0/8	ripe	# Daimler AG
-57.0.0.0/8	ripe	# administered
+54.36.0.0/15	ripe	# ERX
+54.38.0.0/16	ripe	# ERX
+54.222.0.0/15	apnic	# ERX
+57.0.0.0/8	ripe	# administered, ERX
 58.0.0.0/7	apnic
 60.0.0.0/7	apnic
 62.0.0.0/8	ripe
-63.208.0.0/13	rr.level3.net
+63.140.0.0/20	apnic	# ERX
+63.141.34.0/23	ripe	# ERX
+63.141.36.0/23	ripe	# ERX
+63.142.0.0/20	ripe	# ERX
+63.246.128.0/22	ripe	# ERX
+63.246.132.0/23	ripe	# ERX
+63.246.136.0/23	ripe	# ERX
+63.246.139.0/24	ripe	# ERX
+63.246.142.0/24	ripe	# ERX
+63.246.144.0/21	ripe	# ERX
+63.246.152.0/24	ripe	# ERX
+63.246.156.0/22	ripe	# ERX
+63.247.192.0/20	ripe	# ERX
+63.247.208.0/20	ripe	# ERX
+63.250.56.0/21	ripe	# ERX
+
+64.16.192.0/19	ripe	# ERX
+64.28.0.0/19	ripe	# ERX
+64.28.128.0/20	lacnic
+64.32.64.0/18	lacnic
+64.33.0.0/18	apnic	# ERX
+64.43.0.0/17	ripe	# ERX
+64.43.128.0/18	ripe	# ERX
+64.56.160.0/19	apnic	# ERX
+64.57.112.0/20	afrinic
+64.63.64.0/18	apnic	# ERX
+64.65.64.0/18	ripe	# ERX
+64.119.16.0/20	apnic	# ERX
+64.120.88.0/21	apnic	# ERX
+64.120.110.0/23	apnic	# ERX
+64.120.112.0/21	apnic	# ERX
+64.120.120.0/23	apnic	# ERX
+64.137.192.0/18	ripe	# ERX
+64.188.32.0/20	apnic	# ERX
+64.253.32.0/19	ripe	# ERX
+65.18.112.0/20	apnic	# ERX
+65.18.128.0/18	ripe	# ERX
+65.18.208.0/20	ripe	# ERX
+65.39.64.0/19	ripe	# ERX
+65.99.0.0/18	apnic	# ERX
+65.99.64.0/19	apnic	# ERX
+65.99.128.0/18	ripe	# ERX
+65.181.64.0/19	apnic	# ERX
+66.18.64.0/19	afrinic
+66.42.32.0/19	apnic	# ERX
+66.60.0.0/18	lacnic
+66.79.96.0/19	ripe	# ERX
+66.81.160.0/19	ripe	# ERX
+66.84.64.0/20	ripe	# ERX
+66.96.192.0/18	apnic	# ERX
+66.98.0.0/18	lacnic
+66.98.64.0/19	lacnic
+# Empty 66.118.0.0/18
+66.118.128.0/18	ripe	# ERX
+# Empty 66.118.224.0/19
+66.128.32.0/20	lacnic
+66.133.80.0/20	apnic	# ERX
+66.181.160.0/19	apnic	# ERX
+# Empty 66.187.240.0/20
+# Empty 66.196.128.0/18
+66.203.124.0/22	ripe	# ERX
+66.203.144.0/20	apnic	# ERX
+66.205.64.0/19	ripe	# ERX
+66.212.96.0/19	ripe	# ERX
+66.228.0.0/20	apnic	# ERX
+66.231.64.0/20	lacnic
+66.232.0.0/20	apnic	# ERX
+66.234.160.0/20	apnic	# ERX
+66.248.204.0/22	ripe	# ERX
+66.251.128.0/18	afrinic
+67.22.32.0/20	ripe	# ERX
+67.22.48.0/21	ripe	# ERX
+67.22.56.0/22	ripe	# ERX
+67.158.52.0/24	apnic	# ERX
+67.209.128.0/19	ripe	# ERX
+67.211.64.0/20	apnic	# ERX
+67.213.140.0/22	apnic	# ERX
+67.215.112.0/20	apnic	# ERX
+67.218.224.0/19	ripe	# ERX
+68.65.228.0/22	apnic	# ERX
+68.65.232.0/21	apnic	# ERX
+68.70.192.0/20	ripe	# ERX
+68.79.0.0/18	apnic	# ERX
+69.6.0.0/18	ripe	# ERX
+69.6.64.0/20	apnic	# ERX
+69.63.64.0/20	afrinic
+69.67.32.0/20	afrinic
+69.72.80.0/21	apnic	# ERX
+69.94.32.0/20	apnic	# ERX
+69.94.64.0/20	ripe	# ERX
+69.94.80.0/20	apnic	# ERX
+69.94.96.0/20	apnic	# ERX
+69.94.112.0/20	ripe	# ERX
+69.160.0.0/19	apnic	# ERX
+69.160.168.0/21	apnic	# ERX
+69.172.64.0/19	apnic	# ERX
+69.172.96.0/19	ripe	# ERX
+69.194.64.0/18	ripe	# ERX
+69.194.160.0/20	apnic	# ERX
+69.230.192.0/18	apnic	# ERX
+69.231.128.0/18	apnic	# ERX
+69.234.192.0/18	apnic	# ERX
+69.235.128.0/18	apnic	# ERX
+70.34.60.0/23	apnic	# ERX
+70.34.62.0/24	apnic	# ERX
+71.131.192.0/18	apnic	# ERX
+71.132.0.0/18	apnic	# ERX
+71.136.64.0/18	apnic	# ERX
+71.137.0.0/18	apnic	# ERX
+72.35.248.0/22	apnic	# ERX
+72.35.252.0/23	apnic	# ERX
+72.44.16.0/20	lacnic
+72.255.0.0/18	apnic	# ERX
+72.255.224.0/19	apnic	# ERX
+
+# 73.0.0.0/8	Comcast Cable Communications
+74.50.208.0/21	apnic	# ERX
+74.114.48.0/22	apnic	# ERX
+74.118.80.0/22	apnic	# ERX
+76.73.0.0/17	apnic	# ERX
+76.77.48.0/20	apnic	# ERX
 77.0.0.0/8	ripe
 78.0.0.0/7	ripe
 80.0.0.0/4	ripe
+
+96.9.64.0/19	apnic	# ERX
+96.9.128.0/19	ripe	# ERX
+96.9.160.0/19	apnic	# ERX
+96.30.64.0/18	apnic	# ERX
+96.125.144.0/20	ripe	# ERX
+98.128.0.0/16	ripe	# ERX
+
 101.0.0.0/8	apnic
 102.0.0.0/8	afrinic
 103.0.0.0/8	apnic
+104.37.32.0/21	ripe	# ERX
+104.153.84.0/22	ripe	# ERX
+104.160.0.0/19	ripe	# ERX
+104.161.128.0/17	apnic	# ERX
+104.166.128.0/18	ripe	# ERX
+104.200.112.0/20	apnic	# ERX
+104.232.36.0/23	ripe	# ERX
+104.233.64.0/18	ripe	# ERX
+104.243.216.0/22	ripe	# ERX
+104.244.8.0/22	ripe	# ERX
+104.250.32.0/19	apnic	# ERX
+104.251.144.0/20	apnic	# ERX
+
 105.0.0.0/8	afrinic
 106.0.0.0/8	apnic
+107.150.64.0/19	ripe	# ERX
+107.150.162.0/23	ripe	# ERX
+107.150.164.0/22	ripe	# ERX
+107.150.168.0/21	ripe	# ERX
+107.150.176.0/22	ripe	# ERX
+107.153.0.0/16	apnic	# ERX
+107.161.160.0/20	ripe	# ERX
+### Empty 107.168.0.0/15
+107.181.128.0/19	ripe	# ERX
+107.191.68.0/24	ripe	# ERX
+108.179.64.0/18	ripe	# ERX
+
 109.0.0.0/8	ripe
 110.0.0.0/7	apnic
 112.0.0.0/6	apnic
diff --git a/whois/whois.c b/whois/whois.c
index e04edc6..9a3b78a 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -381,7 +381,7 @@ whereas (int asn, struct as_del aslist[])
 {
   int i;
 
-  if (asn > 16383)
+  if (asn > 398287)
     puts (_("Unknown AS number. Please upgrade this program."));
   for (i = 0; aslist[i].serv; i++)
     if (asn >= aslist[i].first && asn <= aslist[i].last)
@@ -441,7 +441,7 @@ queryformat (const char *server, const char *flags, const char *query)
       (strcmp (server, "whois.arin.net") == 0 ||
        strcmp (server, "whois.nic.mil") == 0) &&
       strncasecmp (query, "AS", 2) == 0 && query[2] >= '0' && query[2] <= '9')
-    sprintf (buf, "AS %s", query + 2);	/* fix query for ARIN */
+    sprintf (buf, "a %s", query + 2);	/* fix query for ARIN */
   else if (!isripe && strcmp (server, "whois.corenic.net") == 0)
     sprintf (buf, "--machine %s", query);	/* machine readable output */
   else if (!isripe && strcmp (server, "whois.ncst.ernet.in") == 0 &&

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |  15 +++
 whois/as_del_list |  16 ++-
 whois/ip_del_list | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 whois/whois.c     |   4 +-
 4 files changed, 326 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


