From MAILER-DAEMON Thu Apr 02 08:37:02 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YdeMo-0007vc-28
	for mharc-commit-inetutils@gnu.org; Thu, 02 Apr 2015 08:37:02 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47795)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YdeMl-0007v0-Pl
	for commit-inetutils@gnu.org; Thu, 02 Apr 2015 08:37:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YdeMk-0005Iz-LC
	for commit-inetutils@gnu.org; Thu, 02 Apr 2015 08:36:59 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57239)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YdeMk-0005Is-Io
	for commit-inetutils@gnu.org; Thu, 02 Apr 2015 08:36:58 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YdeMj-0005xG-H2
	for commit-inetutils@gnu.org; Thu, 02 Apr 2015 12:36:57 +0000
Date: Thu, 02 Apr 2015 12:36:57 +0000
Message-Id: <E1YdeMj-0005xG-H2@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-61-g434c5ce
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ae6b5b5f5c134e710fb45e20ea7ff8b3da10c030
X-Git-Newrev: 434c5ce5e0242af677e44e31fb7e39e9d832bc91
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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: Thu, 02 Apr 2015 12:37:01 -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  434c5ce5e0242af677e44e31fb7e39e9d832bc91 (commit)
      from  ae6b5b5f5c134e710fb45e20ea7ff8b3da10c030 (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=434c5ce5e0242af677e44e31fb7e39e9d832bc91


commit 434c5ce5e0242af677e44e31fb7e39e9d832bc91
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Apr 2 14:36:04 2015 +0200

    Testing of inetd service.
    
    Display configuration when the SIGHUP test fails.

diff --git a/ChangeLog b/ChangeLog
index f93388a..7a3dde8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-04-02  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Testing of inetd service.
+
+	* tests/inetd.sh: In verbose mode, report the value of USER.
+	Include a printout of the configuration file when the SIGHUP
+	test loop fails.
+
 2015-03-31  Alfred M. Szmidt  <ams@gnu.org>
 
 	* doc/inetutils.texi: Re-order chapters.
diff --git a/tests/inetd.sh b/tests/inetd.sh
index 7671fa5..ab51945 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -70,6 +70,9 @@ if test -n "$VERBOSE"; then
     $INETD --version | $SED '1q'
 fi
 
+# The value of USER is vital to the test configuration.
+$silence echo "Running test as user $USER."
+
 # For file creation below IU_TESTDIR.
 umask 0077
 
@@ -146,7 +149,14 @@ else
 	    grep "Your address is $TARGET." >/dev/null 2>&1 || errno=1
 
 	test $errno -eq 0 ||
-	    { echo >&2 "Repetition $nn failed."; break; }
+	    { cat >&2 <<-EOT
+		*** Repetition $nn of SIGHUP test has failed. ***
+		Configuration file:
+		##### $CONF
+		`cat $CONF`
+		###########
+		EOT
+	      break; }
 
 	# Update with new port for next round.
 	PORT=`expr $PORT + 1 + ${RANDOM:-$$} % 521`

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

Summary of changes:
 ChangeLog      |    8 ++++++++
 tests/inetd.sh |   12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Apr 08 14:45:07 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YfuyJ-0004Ll-GT
	for mharc-commit-inetutils@gnu.org; Wed, 08 Apr 2015 14:45:07 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42020)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YfuyG-0004In-3p
	for commit-inetutils@gnu.org; Wed, 08 Apr 2015 14:45:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YfuyE-0006Ge-Ej
	for commit-inetutils@gnu.org; Wed, 08 Apr 2015 14:45:04 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42231)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YfuyE-0006FR-Ad
	for commit-inetutils@gnu.org; Wed, 08 Apr 2015 14:45:02 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YfuyD-00038F-2l
	for commit-inetutils@gnu.org; Wed, 08 Apr 2015 18:45:01 +0000
Date: Wed, 08 Apr 2015 18:45:01 +0000
Message-Id: <E1YfuyD-00038F-2l@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-62-g485bcb2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 434c5ce5e0242af677e44e31fb7e39e9d832bc91
X-Git-Newrev: 485bcb20768a867c3f06b912634f658d8b934dde
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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: Wed, 08 Apr 2015 18:45:06 -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  485bcb20768a867c3f06b912634f658d8b934dde (commit)
      from  434c5ce5e0242af677e44e31fb7e39e9d832bc91 (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=485bcb20768a867c3f06b912634f658d8b934dde


commit 485bcb20768a867c3f06b912634f658d8b934dde
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Apr 8 19:05:36 2015 +0200

    syslogd: Overlapping string locations.
    
    A configuration line with leading white space is copied
    into an overlapping location with insufficient care.

diff --git a/ChangeLog b/ChangeLog
index 7a3dde8..8e58e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2015-04-08  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	syslogd: Overlapping string locations.
+	Configuration lines with leading white space are normalized
+	by copying a string to an overlapping location.  Issue found
+	by Alex Kost and reported to us in
+	http://lists.gnu.org/archive/html/bug-inetutils/2015-04/msg00001.html
+
+	* src/syslogd.c (load_conffile): Declare P in smallest
+	possible code block.  Use `memmove' instead of `strcpy'
+	to neutralize the effects of overlapping locations.
+
+	* tests/syslogd.sh: Add a new test case, checking resistance
+	to leading white space and wrapped lines in configuration file.
+	(OUT_NOTICE, COUNT_NOTICE, wrapped, COUNT_WRAP): New variables.
+
 2015-04-02  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Testing of inetd service.
diff --git a/src/syslogd.c b/src/syslogd.c
index c1280e9..0fa4194 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1837,7 +1837,6 @@ load_conffile (const char *filename, struct filed **nextp)
 {
   FILE *cf;
   struct filed *f;
-  char *p;
 #ifndef LINE_MAX
 # define LINE_MAX 2048
 #endif
@@ -1896,6 +1895,7 @@ load_conffile (const char *filename, struct filed **nextp)
      - deal with continuation lines, last char is '\' .  */
   while (fgets (cline, line_max - (cline - cbuf), cf) != NULL)
     {
+      char *p;
       size_t len = strlen (cline);
 
       /* If this is a continuation line, skip leading whitespace for
@@ -1989,7 +1989,7 @@ load_conffile (const char *filename, struct filed **nextp)
       if (*p == '\0' || *p == '#')
 	continue;
 
-      strcpy (cline, p);
+      memmove (cline, p, strlen (p) + 1);
 
       /* Cut the trailing spaces.  */
       for (p = strchr (cline, '\0'); isspace (*--p);)
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index a0c2e9d..0ba984d 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -144,6 +144,7 @@ CONF="$IU_TESTDIR"/syslog.conf
 CONFD="$IU_TESTDIR"/syslog.d
 PID="$IU_TESTDIR"/syslogd.pid
 OUT="$IU_TESTDIR"/messages
+OUT_NOTICE="$IU_TESTDIR"/notice
 : ${SOCKET:=$IU_TESTDIR/log}
 
 mkdir -p "$CONFD"
@@ -277,7 +278,7 @@ fi
 TAG="syslogd-test"
 
 # Remove old files in use by daemon.
-rm -f "$OUT" "$PID" "$CONF"
+rm -f "$OUT" "$OUT_NOTICE" "$PID" "$CONF"
 
 # Full testing at the standard port needs a superuser.
 # Randomise if necessary to get an underprivileged port.
@@ -312,6 +313,9 @@ fi
 #
 cat > "$CONF" <<-EOT
 	*.*	$OUT
+	# Test the removal of leading blanks and correct line wrapping.
+	     *.notice \\
+	   $OUT_NOTICE
 	# Empty priority and action.
 	12345
 	# Missing action.
@@ -420,6 +424,11 @@ if $do_unix_socket; then
     TESTCASES=`expr $TESTCASES + 1`
     $LOGGER -h "$SOCKET" -p user.info -t "$TAG" \
 	"Sending BSD message. (pid $$)"
+
+    # Presence is checked in $OUT and $OUT_NOTICE, so merit value is 2.
+    TESTCASES=`expr $TESTCASES + 2`
+    $LOGGER -h "$SOCKET" -p daemon.notice -t "$TAG" \
+	"Attemping to locate wrapped configuration. (pid $$)"
 fi
 
 if $do_socket_length; then
@@ -571,6 +580,14 @@ sleep 3
 # Initial message logging.
 COUNT=`$GREP -c "$TAG" "$OUT"`
 
+# All notices in $OUT_NOTICE should be present also in $OUT.
+# Assign value 1 to full outcome.
+COUNT_NOTICE=`$SED -n '$=' "$OUT_NOTICE"`
+wrapped=`$GREP -c -f "$OUT_NOTICE" "$OUT"`
+
+COUNT_WRAP=0
+test $COUNT_NOTICE -ne $wrapped || COUNT_WRAP=1
+
 # Second set-up after SIGHUP.
 COUNT2=`$GREP -c "$TAG2" "$OUT_USER"`
 COUNT3=`$GREP -c "$TAG2" "$OUT_DEBUG"`
@@ -597,7 +614,7 @@ COUNT5_user=`$GREP -c "$TAG2.*user" "$OUT_LOCAL0"`
 COUNT5_local=`cat "$OUT_USER" "$OUT_UNOTICE" "$OUT_DEBUG" | \
 	      $GREP -c "$TAG2.*local0"`
 
-SUCCESSES=`expr $SUCCESSES + $COUNT \
+SUCCESSES=`expr $SUCCESSES + $COUNT + $COUNT_WRAP \
 		+ 2 \* $COUNT2 - $COUNT2_debug \
 		+ 2 \* $COUNT3 - $COUNT3_info \
 		+ 2 \* $COUNT4 - $COUNT4_notice - $COUNT4_illegal \
@@ -611,6 +628,8 @@ if [ -n "${VERBOSE+yes}" ]; then
 			  "$OUT_LOCAL0"`
 	---------- Full message log for syslogd. ------------
 	`cat "$OUT"`
+	---------- Notices during first stage. --------------
+	`cat "$OUT_NOTICE"`
 	---------- User notice message log. -----------------
 	`cat "$OUT_UNOTICE"`
 	---------- User info message log. -------------------

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

Summary of changes:
 ChangeLog        |   16 ++++++++++++++++
 src/syslogd.c    |    4 ++--
 tests/syslogd.sh |   23 +++++++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Apr 09 18:23:30 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YgKrC-0007d7-En
	for mharc-commit-inetutils@gnu.org; Thu, 09 Apr 2015 18:23:30 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55432)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YgKr9-0007cw-Si
	for commit-inetutils@gnu.org; Thu, 09 Apr 2015 18:23:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YgKr6-0001fa-6V
	for commit-inetutils@gnu.org; Thu, 09 Apr 2015 18:23:27 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60493)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YgKr6-0001fV-2g
	for commit-inetutils@gnu.org; Thu, 09 Apr 2015 18:23:24 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YgKr5-0008GI-Cn
	for commit-inetutils@gnu.org; Thu, 09 Apr 2015 22:23:23 +0000
Date: Thu, 09 Apr 2015 22:23:23 +0000
Message-Id: <E1YgKr5-0008GI-Cn@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-63-g7026c69
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 485bcb20768a867c3f06b912634f658d8b934dde
X-Git-Newrev: 7026c695a0ccaabf8a223852f22291d8bf98220e
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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: Thu, 09 Apr 2015 22:23:29 -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  7026c695a0ccaabf8a223852f22291d8bf98220e (commit)
      from  485bcb20768a867c3f06b912634f658d8b934dde (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=7026c695a0ccaabf8a223852f22291d8bf98220e


commit 7026c695a0ccaabf8a223852f22291d8bf98220e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Apr 10 00:18:08 2015 +0200

    Incomplete test of syslogd.
    
    The recent addition to `tests/syslogd.sh' can cause
    a false negative.

diff --git a/ChangeLog b/ChangeLog
index 8e58e57..78ac9d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-04-09  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	Incomplete test of syslogd.
+	Whenever message passing via local socket is disabled,
+	the wrapping test caused a false negative.  Fix this by
+	letting it fall back to an INET socket.
+
+	* tests/syslogd.sh: Include the `wrapping message' whenever
+	either of $do_unix_socket or $do_inet_socket is true.  Fix the
+	counter COUNT_WRAP to be set under the same prerequisite only.
+
 2015-04-08  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	syslogd: Overlapping string locations.
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 0ba984d..a0996ea 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -424,11 +424,6 @@ if $do_unix_socket; then
     TESTCASES=`expr $TESTCASES + 1`
     $LOGGER -h "$SOCKET" -p user.info -t "$TAG" \
 	"Sending BSD message. (pid $$)"
-
-    # Presence is checked in $OUT and $OUT_NOTICE, so merit value is 2.
-    TESTCASES=`expr $TESTCASES + 2`
-    $LOGGER -h "$SOCKET" -p daemon.notice -t "$TAG" \
-	"Attemping to locate wrapped configuration. (pid $$)"
 fi
 
 if $do_socket_length; then
@@ -448,6 +443,19 @@ if $do_inet_socket; then
     fi
 fi
 
+# Send message of priority notice, either via local socket or IPv4,
+# but not both.  The presence is checked in $OUT and in $OUT_NOTICE,
+# so merit value is 2.
+if $do_unix_socket; then
+    TESTCASES=`expr $TESTCASES + 2`
+    $LOGGER -h "$SOCKET" -p daemon.notice -t "$TAG" \
+	"Attemping to locate wrapped configuration. (pid $$)"
+elif $do_inet_socket; then
+    TESTCASES=`expr $TESTCASES + 2`
+    $LOGGER -4 -h "$TARGET:$PORT" -p daemon.notice -t "$TAG" \
+	"Attemping to locate wrapped configuration. (pid $$)"
+fi
+
 # Generate a more elaborate message routing, aimed at confirming
 # discrimination of severity and facility.  This is made active
 # by sending SIGHUP to the server process.
@@ -586,7 +594,9 @@ COUNT_NOTICE=`$SED -n '$=' "$OUT_NOTICE"`
 wrapped=`$GREP -c -f "$OUT_NOTICE" "$OUT"`
 
 COUNT_WRAP=0
-test $COUNT_NOTICE -ne $wrapped || COUNT_WRAP=1
+if $do_unix_socket || $do_inet_socket; then
+    test $COUNT_NOTICE -ne $wrapped || COUNT_WRAP=1
+fi
 
 # Second set-up after SIGHUP.
 COUNT2=`$GREP -c "$TAG2" "$OUT_USER"`

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

Summary of changes:
 ChangeLog        |   11 +++++++++++
 tests/syslogd.sh |   22 ++++++++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Apr 16 09:54:08 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YikF6-0006zu-QB
	for mharc-commit-inetutils@gnu.org; Thu, 16 Apr 2015 09:54:08 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38029)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YiUoO-0003uc-9F
	for commit-inetutils@gnu.org; Wed, 15 Apr 2015 17:25:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YiUoN-0006gQ-4V
	for commit-inetutils@gnu.org; Wed, 15 Apr 2015 17:25:32 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48616)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1YiUoN-0006gJ-0b
	for commit-inetutils@gnu.org; Wed, 15 Apr 2015 17:25:31 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1YiUoM-000453-Cm
	for commit-inetutils@gnu.org; Wed, 15 Apr 2015 21:25:30 +0000
Date: Wed, 15 Apr 2015 21:25:30 +0000
Message-Id: <E1YiUoM-000453-Cm@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-64-g52aa241
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7026c695a0ccaabf8a223852f22291d8bf98220e
X-Git-Newrev: 52aa241af16aaeb280a354fa5ae61416b450fd99
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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: Wed, 15 Apr 2015 21:25:33 -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  52aa241af16aaeb280a354fa5ae61416b450fd99 (commit)
      from  7026c695a0ccaabf8a223852f22291d8bf98220e (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=52aa241af16aaeb280a354fa5ae61416b450fd99


commit 52aa241af16aaeb280a354fa5ae61416b450fd99
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Apr 15 23:02:24 2015 +0200

    Update bootstrap from gnulib.

diff --git a/ChangeLog b/ChangeLog
index 78ac9d2..8f183e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-15  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* bootstrap: Updated from gnulib.
+	* doc/.gitignore: Add `/gendocs_template_min'.  The file
+	is added during bootstrap.
+
 2015-04-09  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	Incomplete test of syslogd.
diff --git a/bootstrap b/bootstrap
index 2fdf267..e72894c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -915,7 +915,8 @@ if test $use_libtool = 1; then
   esac
 fi
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+  || die "gnulib-tool failed"
 
 for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file \
diff --git a/doc/.gitignore b/doc/.gitignore
index ba54d04..6bf83eb 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,5 +1,6 @@
 /fdl-1.3.texi
 /gendocs_template
+/gendocs_template_min
 fdl-1.3.texi
 gendocs_template
 inetutils.info*

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

Summary of changes:
 ChangeLog      |    6 ++++++
 bootstrap      |    3 ++-
 doc/.gitignore |    1 +
 3 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Apr 16 09:56:51 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1YikHj-00009z-Uv
	for mharc-commit-inetutils@gnu.org; Thu, 16 Apr 2015 09:56:51 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46721)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yiij6-0000OQ-71
	for commit-inetutils@gnu.org; Thu, 16 Apr 2015 08:17:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yiij5-000443-18
	for commit-inetutils@gnu.org; Thu, 16 Apr 2015 08:17:00 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58877)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yiij4-00043z-Ub
	for commit-inetutils@gnu.org; Thu, 16 Apr 2015 08:16:58 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Yiij4-0005T2-EV
	for commit-inetutils@gnu.org; Thu, 16 Apr 2015 12:16:58 +0000
Date: Thu, 16 Apr 2015 12:16:58 +0000
Message-Id: <E1Yiij4-0005T2-EV@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-65-ge21f5d1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 52aa241af16aaeb280a354fa5ae61416b450fd99
X-Git-Newrev: e21f5d17338a0b2e63206b487df8d0dbab9f7537
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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: Thu, 16 Apr 2015 12:17:04 -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  e21f5d17338a0b2e63206b487df8d0dbab9f7537 (commit)
      from  52aa241af16aaeb280a354fa5ae61416b450fd99 (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=e21f5d17338a0b2e63206b487df8d0dbab9f7537


commit e21f5d17338a0b2e63206b487df8d0dbab9f7537
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Apr 16 14:11:12 2015 +0200

    Cleaner use of checked-out source tree.
    
    Add a second, missing instance of the sed script
    expected by `git-version-gen' for mangling our
    annotated tags.

diff --git a/ChangeLog b/ChangeLog
index 8f183e8..aa7960f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-04-16  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* cfg.mk (git-version-gen-tag-sed-script): New variable using
+	the same sed script as found in `configure.ac'.  It is needed
+	to get a more reliable target `dist'.
+
+	* tests/.gitignore: Add some generated test products.
+
 2015-04-15  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* bootstrap: Updated from gnulib.
diff --git a/cfg.mk b/cfg.mk
index 12f0e4d..436e694 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
+git-version-gen-tag-sed-script = 's/inetutils-/v/; s/_/./g'
+
 news-check-regexp = '^Version $(VERSION_REGEXP):'
 
 _makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
diff --git a/tests/.gitignore b/tests/.gitignore
index 1901dcd..bb8b2f6 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,5 +1,10 @@
 addrpeek
+identify
 localhost
+ls
 readutmp
+tcpget
 tools.sh
 waitdaemon
+*.log
+*.trs

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

Summary of changes:
 ChangeLog        |    8 ++++++++
 cfg.mk           |    2 ++
 tests/.gitignore |    5 +++++
 3 files changed, 15 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Apr 17 09:46:17 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Yj6b3-0005j3-FX
	for mharc-commit-inetutils@gnu.org; Fri, 17 Apr 2015 09:46:17 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49800)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yj6ax-0005iP-Vj
	for commit-inetutils@gnu.org; Fri, 17 Apr 2015 09:46:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yj6aw-0005Az-Cw
	for commit-inetutils@gnu.org; Fri, 17 Apr 2015 09:46:11 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48013)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Yj6aw-0005Av-9f
	for commit-inetutils@gnu.org; Fri, 17 Apr 2015 09:46:10 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Yj6av-0004D7-Gt
	for commit-inetutils@gnu.org; Fri, 17 Apr 2015 13:46:09 +0000
Date: Fri, 17 Apr 2015 13:46:09 +0000
Message-Id: <E1Yj6av-0004D7-Gt@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_2-66-g055ea0a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e21f5d17338a0b2e63206b487df8d0dbab9f7537
X-Git-Newrev: 055ea0a73f8a54f2278a7526dcffd81662eb3eba
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
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: <http://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: Fri, 17 Apr 2015 13:46:16 -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  055ea0a73f8a54f2278a7526dcffd81662eb3eba (commit)
      from  e21f5d17338a0b2e63206b487df8d0dbab9f7537 (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=055ea0a73f8a54f2278a7526dcffd81662eb3eba


commit 055ea0a73f8a54f2278a7526dcffd81662eb3eba
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Apr 17 15:38:22 2015 +0200

    Fix sc_prohibit_double_semicolon.

diff --git a/ChangeLog b/ChangeLog
index aa7960f..ef75489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-17  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* ftpd/conf.c, ftpd/ftpd.c, ifconfig/system/bsd.c,
+	ifconfig/system/linux.c, libtelnet/encrypt.c: Remove
+	duplicate semicolon.
+
 2015-04-16  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	* cfg.mk (git-version-gen-tag-sed-script): New variable using
diff --git a/ftpd/conf.c b/ftpd/conf.c
index 25fdf17..911c702 100644
--- a/ftpd/conf.c
+++ b/ftpd/conf.c
@@ -64,7 +64,7 @@ checkuser (const char *filename, const char *name)
   FILE *fp;
   int found = 0, ngroups = 0;
   char *p, line[BUFSIZ];
-  gid_t *groups = NULL;;
+  gid_t *groups = NULL;
   struct passwd *pwd = NULL;
 
   fp = fopen (filename, "r");
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 6da2f77..5db88d0 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1206,7 +1206,7 @@ bad:
   /* Return the real value of errno (close may change it) */
   t = errno;
   if (seteuid ((uid_t) cred.uid) != 0)
-    _exit (EXIT_FAILURE);;
+    _exit (EXIT_FAILURE);
   close (s);
   errno = t;
   return NULL;
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index e13402d..43a4122 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -404,9 +404,9 @@ system_fh_media (format_data_t form, int argc _GL_UNUSED_PARAMETER,
 	      if (item->ifmt_word == IFM_SUBTYPE (ifm.ifm_active))
 		active_subtype = item->ifmt_string;
 	    }
-	  ;;
+	  ;
 	default:
-	  ;;
+	  ;
 	}
 
       /* Shared media sub-types.  Only works if the previous
diff --git a/ifconfig/system/linux.c b/ifconfig/system/linux.c
index cb4c692..ef27d65 100644
--- a/ifconfig/system/linux.c
+++ b/ifconfig/system/linux.c
@@ -433,7 +433,7 @@ pnd_read ()
 
   while (getline (&buf, &bufsize, fp) > 0)
     {
-      struct pnd_stats *stats = xzalloc (sizeof (*stats));;
+      struct pnd_stats *stats = xzalloc (sizeof (*stats));
       char *p = buf, *q;
       size_t len;
 
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index c7aff0e..e2b8c48 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -1012,7 +1012,7 @@ encrypt_gen_printsub (unsigned char *data, int cnt,
   data += 2;
   buf[buflen - 1] = '\0';
   buf[buflen - 2] = '*';
-  buflen -= 2;;
+  buflen -= 2;
   for (; cnt > 0; cnt--, data++)
     {
       sprintf (tbuf, " %d", *data);

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

Summary of changes:
 ChangeLog               |    6 ++++++
 ftpd/conf.c             |    2 +-
 ftpd/ftpd.c             |    2 +-
 ifconfig/system/bsd.c   |    4 ++--
 ifconfig/system/linux.c |    2 +-
 libtelnet/encrypt.c     |    2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


