[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-109-g546c6c3

--===============1278969111249670648==
Content-Type: text/plain

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  546c6c385d46674c7955aede58985b2b4ac09216 (commit)
       via  8899eaae0d237c63b48b35503c496cc90388b680 (commit)
      from  100cfe0866b3aa60dd2cd78a379b1bfc691423f9 (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=546c6c385d46674c7955aede58985b2b4ac09216


commit 546c6c385d46674c7955aede58985b2b4ac09216
Author: Mats Erik Andersson <[email protected]>
Date:   Thu May 7 00:33:10 2020 +0200

    whois: Improved hiding of legal disclaimers.
    
    Let hiding detect more than one instance, and add some few patterns
    relevant for servers running at the present time.

diff --git a/ChangeLog b/ChangeLog
index 3de8196..21a2e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-05-07  Mats Erik Andersson  <[email protected]>
+
+	whois: Improved hiding of legal disclaimers.
+
+	* whois/as_del_list: Two additional delegations.
+	* whois/data.h (hide_strings): Add string patterns for present
+	day services at ARIN, LACNIC, and RIPE.
+	* whois/whois.c (do_query): After successful location of a stop
+	pattern, go back into search state, instead of cancelling further
+	matching.  The service at ARIN inserts identical disclaimer at
+	the beginning, as well as at the end of a response.
+
 2020-05-06  Mats Erik Andersson  <[email protected]>
 
 	* bootstrap: Updated from gnulib.
diff --git a/whois/as_del_list b/whois/as_del_list
index c99befc..48e69c6 100644
--- a/whois/as_del_list
+++ b/whois/as_del_list
@@ -36,6 +36,8 @@
 9216	10239	apnic
 12288	13311	ripe
 15360	16383	ripe
+23552	24575	apnic
+24576	25599	ripe
 47104	48127	ripe
 48128	49151	ripe
 49152	52223	ripe
diff --git a/whois/data.h b/whois/data.h
index 3046647..88c5c36 100644
--- a/whois/data.h
+++ b/whois/data.h
@@ -80,6 +80,10 @@ const char *hide_strings[] = {
   "Signature Domains' Whois Service", "agree to abide by the above",
   "Access to ASNIC", "by this policy.",
   "* Copyright (C) 1998 by SGNIC", "* modification.",
+  "% The RIPE Database is subject", "\n",
+  "% This query was served", "\n",
+  "% Copyright LACNIC", "%  only for lawful",
+  "# ARIN WHOIS data and services", "# Copyright 19",
   NULL, NULL
 };
 
diff --git a/whois/whois.c b/whois/whois.c
index 9a3b78a..373b7ae 100644
--- a/whois/whois.c
+++ b/whois/whois.c
@@ -477,7 +477,7 @@ do_query (const int sock, const char *query)
 	{
 	  if (strncmp (buf, hide_strings[i + 1], strlen (hide_strings[i + 1]))
 	      == 0)
-	    hide = 2;		/* stop hiding */
+	    hide = 0;		/* go into testing mode */
 	  continue;		/* hide this line */
 	}
       if (hide == 0)

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8899eaae0d237c63b48b35503c496cc90388b680


commit 8899eaae0d237c63b48b35503c496cc90388b680
Author: Mats Erik Andersson <[email protected]>
Date:   Wed May 6 23:20:33 2020 +0200

    bootstrap: Update from gnulib.

diff --git a/ChangeLog b/ChangeLog
index 4fa4640..3de8196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-06  Mats Erik Andersson  <[email protected]>
+
+	* bootstrap: Updated from gnulib.
+
 2020-04-27  Tim Rühsen  <[email protected]>
 
 	telnet: Use memove for overlapping memory instead of strncpy.
diff --git a/bootstrap b/bootstrap
index 70fd73c..8f76d69 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2019-01-04.17; # UTC
+scriptversion=2020-04-13.15; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -970,7 +970,7 @@ bootstrap_post_import_hook \
 # Uninitialized submodules are listed with an initial dash.
 if $use_git && git submodule | grep '^-' >/dev/null; then
   die "some git submodules are not initialized. "     \
-      "Run 'git submodule init' and bootstrap again."
+      "Run 'git submodule update --init' and bootstrap again."
 fi
 
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some

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

Summary of changes:
 ChangeLog         | 16 ++++++++++++++++
 bootstrap         |  4 ++--
 whois/as_del_list |  2 ++
 whois/data.h      |  4 ++++
 whois/whois.c     |  2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


--===============1278969111249670648==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQ29tbWl0LWlu
ZXR1dGlscyBtYWlsaW5nIGxpc3QKQ29tbWl0LWluZXR1dGlsc0BnbnUub3JnCmh0dHBzOi8vbGlz
dHMuZ251Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2NvbW1pdC1pbmV0dXRpbHMK

--===============1278969111249670648==--