From MAILER-DAEMON Thu Jul 04 11:05:24 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Uul64-0003CQ-Bp
	for mharc-commit-inetutils@gnu.org; Thu, 04 Jul 2013 11:05:24 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41650)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uul61-0003Aa-2b
	for commit-inetutils@gnu.org; Thu, 04 Jul 2013 11:05:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uul5y-0001pI-Ti
	for commit-inetutils@gnu.org; Thu, 04 Jul 2013 11:05:20 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51038)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1Uul5y-0001p9-PN
	for commit-inetutils@gnu.org; Thu, 04 Jul 2013 11:05:18 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1Uul5x-0002JE-RB
	for commit-inetutils@gnu.org; Thu, 04 Jul 2013 15:05:18 +0000
Date: Thu, 04 Jul 2013 15:05:17 +0000
Message-Id: <E1Uul5x-0002JE-RB@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-313-gf8d2f1e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 625b1fa2254eee5962db1e3ff76f999d556a6d8d
X-Git-Newrev: f8d2f1e566c07f985948990d67d867b723cb133f
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, 04 Jul 2013 15:05:23 -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  f8d2f1e566c07f985948990d67d867b723cb133f (commit)
      from  625b1fa2254eee5962db1e3ff76f999d556a6d8d (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=f8d2f1e566c07f985948990d67d867b723cb133f


commit f8d2f1e566c07f985948990d67d867b723cb133f
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Jul 4 14:58:44 2013 +0200

    traceroute: Gateway selection.

diff --git a/ChangeLog b/ChangeLog
index 381c0b0..02ec2df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-04  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	traceroute: Gateway selection.
+	Make `-g' additive in repeated use to better
+	conform with other implementations.
+
+	* src/traceroute.c (parse_opt) [IP_OPTIONS] <'g'>:
+	Append `arg' to `opt_gateways' if the latter has
+	already been assigned a value.
+
 2013-06-28  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	traceroute: Portability of PID range.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 0d2de39..7e9010e 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -1060,6 +1060,7 @@ using spaces, commata, or semicola as separators.
 These hosts must be traversed in the given order
 before the intended host receives any datagram.
 At most eight host names or addresses may be specified.
+Multiple uses of @option{-g} produce a concatenated list.
 
 @item -I
 @itemx --icmp
diff --git a/src/traceroute.c b/src/traceroute.c
index a16b0d5..e42b7c0 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -179,7 +179,22 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 #ifdef IP_OPTIONS
     case 'g':
-      opt_gateways = xstrdup (arg);
+      if (opt_gateways)
+	{
+	  size_t len = 0;
+
+	  len = strlen (opt_gateways);
+	  opt_gateways = xrealloc (opt_gateways, len + strlen (arg) + 3);
+
+	  /* Append new gateways to old list,
+	   * separating the two parts by a comma.
+	   */
+	  opt_gateways[len] = ',';
+	  opt_gateways[len + 1] = '\0';
+	  strcat (opt_gateways, arg);
+	}
+      else
+	opt_gateways = xstrdup (arg);
       break;
 #endif /* IP_OPTIONS */
 

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

Summary of changes:
 ChangeLog          |   10 ++++++++++
 doc/inetutils.texi |    1 +
 src/traceroute.c   |   17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Jul 12 20:16:31 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UxnVn-0002Ky-FG
	for mharc-commit-inetutils@gnu.org; Fri, 12 Jul 2013 20:16:31 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37419)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UxnVj-0002KP-Q9
	for commit-inetutils@gnu.org; Fri, 12 Jul 2013 20:16:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UxnVi-0002kf-2E
	for commit-inetutils@gnu.org; Fri, 12 Jul 2013 20:16:27 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44789)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UxnVh-0002kX-VI
	for commit-inetutils@gnu.org; Fri, 12 Jul 2013 20:16:26 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UxnVh-0007jT-EZ
	for commit-inetutils@gnu.org; Sat, 13 Jul 2013 00:16:25 +0000
Date: Sat, 13 Jul 2013 00:16:25 +0000
Message-Id: <E1UxnVh-0007jT-EZ@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-314-g2a3279a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f8d2f1e566c07f985948990d67d867b723cb133f
X-Git-Newrev: 2a3279a0babcdab8a20d8f7139254aacef2e8ed8
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: Sat, 13 Jul 2013 00:16: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  2a3279a0babcdab8a20d8f7139254aacef2e8ed8 (commit)
      from  f8d2f1e566c07f985948990d67d867b723cb133f (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=2a3279a0babcdab8a20d8f7139254aacef2e8ed8


commit 2a3279a0babcdab8a20d8f7139254aacef2e8ed8
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jul 13 01:17:41 2013 +0200

    talk, talkd: Convenience changes.

diff --git a/ChangeLog b/ChangeLog
index 02ec2df..e623d1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-07-11  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	talk, talkd: Convenience changes.
+
+	* talk/display.c (display) <'^D'>: Clear both
+	local windows, but render the character as
+	notification on the remote terminal.
+
+	* talkd/process.c (process_request) <ANNOUNCE>:
+	If logging is set and reply is successful, make
+	a syslog note about the participants.
+	<LOOK_UP>: Likewise.
+
 2013-07-04  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	traceroute: Gateway selection.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 7e9010e..bfaa2e4 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -2761,10 +2761,19 @@ talk @var{your_name}@@@var{your_machine}
 
 It doesn't matter from which machine the recipient replies, as long as
 his login-name is the same.  Once communication is established, the
-two parties may type simultaneously, with their output appearing in
-separate windows.  Typing @kbd{C-L} will cause the screen to be
+two parties may type text simultaneously, with their output appearing
+in separate windows.
+Typing @kbd{C-L} will cause the screen to be
 reprinted, while erase, kill, and word kill characters will
-behave normally.  To exit, just type an interrupt character;
+behave normally.
+In addition, @kbd{C-D} will cause both windows to be
+locally cleared of all text.
+This keystroke will appear as a simple @samp{^D} on the remote
+terminal, though.
+It signals to the other party that you yourself have just
+cleared your terminal of all text.
+
+To exit, just type an interrupt character @kbd{C-C};
 @command{talk} then moves the cursor to the bottom of the screen
 and restores the terminal to its previous state.
 
@@ -3162,7 +3171,7 @@ services:
 
 @example
 ftp           stream  tcp   nowait root  /usr/libexec/ftpd       ftpd -l
-ntalk         dgram   udp   wait   root  /usr/libexec/ntalkd     ntalkd
+ntalk         dgram   udp   wait   nobody:tty  /usr/libexec/talkd  talkd
 tcpmux        stream  tcp   nowait root  internal
 tcpmux/+date  stream  tcp   nowait guest /bin/date               date
 tcpmux/phonebook stream tcp nowait guest /usr/bin/phonebook      phonebook
@@ -4605,15 +4614,20 @@ for a conversation.
 This implementation uses the newer protocol @samp{ntalk/udp},
 and is intended to be invoked by a super-server
 @command{inetd} at that datagram port.
+It is recommended that @command{inetd} launch @command{talkd}
+with ownership @samp{nobody:tty}, or with @samp{tty:tty}.
+
 Bear in mind that this service is usable with IPv4 only,
 since the exchange protocol was conceived to handle only
-one address family.
-This fact is independent of @command{inetd}.
+this particular address family.
+This fact is independent of the abilities of @command{inetd}.
 
-Observe that the server @command{talkd} is dependent
+Observe also that the server @command{talkd} is dependent
 on the name claimed by @command{hostname}, for establishing
-connections between interested parties.  Multi-homed hosts
-are not well behaved together with @command{talkd}.
+connections between interested parties.
+The server @command{talkd} running on a multi-homed host
+is not able to respond to invitations for a valid host name
+that differs from the name reported by @command{hostname}.
 
 The present implementation offers ACL-mechanisms for fine
 grained access control.
diff --git a/talk/display.c b/talk/display.c
index 3978b82..70b1c78 100644
--- a/talk/display.c
+++ b/talk/display.c
@@ -191,6 +191,9 @@ display (register xwin_t * win, register char *text, int size)
 	  text++;
 	  continue;
 	}
+      /* Refresh screen with input ^L, Ctrl-L.
+       * Local trigger only.
+       */
       if (*text == '\f')
 	{
 	  if (win == &my_win)
@@ -198,6 +201,18 @@ display (register xwin_t * win, register char *text, int size)
 	  text++;
 	  continue;
 	}
+      /* Clear both windows with input ^D, Ctrl-D.
+       * Local trigger only.
+       */
+      if (*text == '\04' && win == &my_win)
+	{
+	  wclear (my_win.x_win);
+	  wclear (his_win.x_win);
+	  wrefresh (my_win.x_win);
+	  wrefresh (his_win.x_win);
+	  text++;
+	  continue;
+	}
       if (win->x_col == COLS - 1)
 	{
 	  /* check for wraparound */
diff --git a/talkd/process.c b/talkd/process.c
index 620de13..dad2394 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -42,6 +42,11 @@ process_request (CTL_MSG * msg, struct sockaddr_in *sa_in, CTL_RESPONSE * rp)
       return 0;
     }
 
+  /* Convert the machine independent represention
+   * of the talk protocol to the present architecture.
+   * In particular, `msg->addr.sa_family' will be
+   * valid for socket initialization.
+   */
   msg->id_num = ntohl (msg->id_num);
   msg->addr.sa_family = ntohs (msg->addr.sa_family);
   if (msg->addr.sa_family != AF_INET)
@@ -51,6 +56,7 @@ process_request (CTL_MSG * msg, struct sockaddr_in *sa_in, CTL_RESPONSE * rp)
       rp->answer = BADADDR;
       return 0;
     }
+  /* Convert to valid socket address for this architecture.  */
   msg->ctl_addr.sa_family = ntohs (msg->ctl_addr.sa_family);
   if (msg->ctl_addr.sa_family != AF_INET)
     {
@@ -67,8 +73,10 @@ process_request (CTL_MSG * msg, struct sockaddr_in *sa_in, CTL_RESPONSE * rp)
       if (logging || debug)
 	syslog (LOG_NOTICE, "dropping request: %s@%s",
 		msg->l_name, inet_ntoa (sa_in->sin_addr));
-      /* Answer FAILED to minimise information leakage,
-       * since ACL has denied access.  */
+
+      /* The answer FAILED is returned to minimize the amount
+       * of information disclosure, since ACL has denied access.
+       */
       rp->answer = FAILED;
       return 0;
     }
@@ -84,6 +92,14 @@ process_request (CTL_MSG * msg, struct sockaddr_in *sa_in, CTL_RESPONSE * rp)
     {
     case ANNOUNCE:
       do_announce (msg, rp);
+      if (logging && rp->answer == SUCCESS)
+	syslog (LOG_INFO, "%s@%s called by %s@%s",
+		msg->r_name,
+		(msg->r_tty[0]
+		  ? msg->r_tty
+		  : inet_ntoa (sa_in->sin_addr)),
+		msg->l_name,
+		inet_ntoa (os2sin_addr (msg->addr)));
       break;
 
     case LEAVE_INVITE:
@@ -105,6 +121,9 @@ process_request (CTL_MSG * msg, struct sockaddr_in *sa_in, CTL_RESPONSE * rp)
 	  rp->addr = ptr->addr;
 	  rp->addr.sa_family = htons (ptr->addr.sa_family);
 	  rp->answer = SUCCESS;
+	  if (logging)
+	    syslog (LOG_INFO, "%s talks to %s@%s",
+		msg->r_name, msg->l_name, inet_ntoa (sa_in->sin_addr));
 	}
       else
 	rp->answer = NOT_HERE;

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

Summary of changes:
 ChangeLog          |   13 +++++++++++++
 doc/inetutils.texi |   32 +++++++++++++++++++++++---------
 talk/display.c     |   15 +++++++++++++++
 talkd/process.c    |   23 +++++++++++++++++++++--
 4 files changed, 72 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Jul 13 07:40:37 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1UxyBo-0000aO-TW
	for mharc-commit-inetutils@gnu.org; Sat, 13 Jul 2013 07:40:37 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44915)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UxyBl-0000Yz-G1
	for commit-inetutils@gnu.org; Sat, 13 Jul 2013 07:40:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UxyBj-0004ql-OZ
	for commit-inetutils@gnu.org; Sat, 13 Jul 2013 07:40:33 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:49758)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1UxyBj-0004ox-9e
	for commit-inetutils@gnu.org; Sat, 13 Jul 2013 07:40:31 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1UxyBg-0001Yw-UO
	for commit-inetutils@gnu.org; Sat, 13 Jul 2013 11:40:29 +0000
Date: Sat, 13 Jul 2013 11:40:28 +0000
Message-Id: <E1UxyBg-0001Yw-UO@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-316-ge1fb81d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2a3279a0babcdab8a20d8f7139254aacef2e8ed8
X-Git-Newrev: e1fb81d0b845a758a307c1c60342b5f2eee31086
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: Sat, 13 Jul 2013 11:40:35 -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  e1fb81d0b845a758a307c1c60342b5f2eee31086 (commit)
       via  1cdb3af7f60dcd37e9934db86ca46a85abed8f2e (commit)
      from  2a3279a0babcdab8a20d8f7139254aacef2e8ed8 (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=e1fb81d0b845a758a307c1c60342b5f2eee31086


commit e1fb81d0b845a758a307c1c60342b5f2eee31086
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jul 13 13:41:02 2013 +0200

    talkd: Less ACL-logging.

diff --git a/ChangeLog b/ChangeLog
index 9c95db2..35ff971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2013-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
+	talkd: Less ACL-logging.
+
+	* talkd/process.c (process_request): File only
+	a single syslog message when acl_match() denies
+	access, by checking for message type LOOK_UP.
+
+2013-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
 	* bootstrap: Updated from gnulib.
 
 2013-07-11  Mats Erik Andersson  <gnu@gisladisker.se>
diff --git a/talkd/process.c b/talkd/process.c
index dad2394..e70172c 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -70,7 +70,11 @@ process_request (CTL_MSG * msg, struct sockaddr_in *sa_in, CTL_RESPONSE * rp)
 
   if (acl_match (msg, sa_in) == ACL_DENY)
     {
-      if (logging || debug)
+      /* This denial happens for each of LOOK_UP,
+       * ANNOUNCE, and DELETE, in this order.
+       * Make a syslog note only for the first of them.
+       */
+      if ((logging || debug) && msg->type == LOOK_UP)
 	syslog (LOG_NOTICE, "dropping request: %s@%s",
 		msg->l_name, inet_ntoa (sa_in->sin_addr));
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=1cdb3af7f60dcd37e9934db86ca46a85abed8f2e


commit 1cdb3af7f60dcd37e9934db86ca46a85abed8f2e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jul 13 12:56:31 2013 +0200

    bootstrap: Updated from gnulib.

diff --git a/ChangeLog b/ChangeLog
index e623d1e..9c95db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	* bootstrap: Updated from gnulib.
+
 2013-07-11  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	talk, talkd: Convenience changes.
diff --git a/bootstrap b/bootstrap
index 96f1e76..9c52204 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-03-08.16; # UTC
+scriptversion=2013-07-03.20; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -140,20 +140,21 @@ po_download_command_format2=\
 "wget --mirror -nd -q -np -A.po -P '%s' \
  http://translationproject.org/latest/%s/"
 
+# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
+# fall back to the package name (1st argument with munging)
 extract_package_name='
-  /^AC_INIT(/{
-     /.*,.*,.*, */{
-       s///
-       s/[][]//g
-       s/)$//
+  /^AC_INIT(\[*/{
+     s///
+     /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
+       s//\1/
+       s/[],)].*//
        p
        q
      }
-     s/AC_INIT(\[*//
-     s/]*,.*//
+     s/[],)].*//
      s/^GNU //
      y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^A-Za-z0-9_]/-/g
+     s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
      p
   }
 '
@@ -550,7 +551,7 @@ fi
 echo "$0: Bootstrapping from checked-out $package sources..."
 
 # See if we can use gnulib's git-merge-changelog merge driver.
-if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+if $use_git && test -d .git && (git --version) >/dev/null 2>/dev/null ; then
   if git config merge.merge-changelog.driver >/dev/null ; then
     :
   elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
@@ -573,13 +574,17 @@ git_modules_config () {
   test -f .gitmodules && git config --file .gitmodules "$@"
 }
 
-gnulib_path=$(git_modules_config submodule.gnulib.path)
-test -z "$gnulib_path" && gnulib_path=gnulib
+if $use_git; then
+  gnulib_path=$(git_modules_config submodule.gnulib.path)
+  test -z "$gnulib_path" && gnulib_path=gnulib
+fi
 
-# Get gnulib files.
+# Get gnulib files.  Populate $GNULIB_SRCDIR, possibly updating a
+# submodule, for use in the rest of the script.
 
 case ${GNULIB_SRCDIR--} in
 -)
+  # Note that $use_git is necessarily true in this case.
   if git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
     git submodule init || exit $?
@@ -600,8 +605,8 @@ case ${GNULIB_SRCDIR--} in
   GNULIB_SRCDIR=$gnulib_path
   ;;
 *)
-  # Use GNULIB_SRCDIR as a reference.
-  if test -d "$GNULIB_SRCDIR"/.git && \
+  # Use GNULIB_SRCDIR directly or as a reference.
+  if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
         git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
     if git submodule -h|grep -- --reference > /dev/null; then
@@ -627,6 +632,9 @@ case ${GNULIB_SRCDIR--} in
   ;;
 esac
 
+# $GNULIB_SRCDIR now points to the version of gnulib to use, and
+# we no longer need to use git or $gnulib_path below here.
+
 if $bootstrap_sync; then
   cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
     echo "$0: updating bootstrap and restarting..."

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

Summary of changes:
 ChangeLog       |   12 ++++++++++++
 bootstrap       |   38 +++++++++++++++++++++++---------------
 talkd/process.c |    6 +++++-
 3 files changed, 40 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Jul 19 11:50:05 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V0CwX-0007ZW-EP
	for mharc-commit-inetutils@gnu.org; Fri, 19 Jul 2013 11:50:05 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40769)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V0CwU-0007Xj-4u
	for commit-inetutils@gnu.org; Fri, 19 Jul 2013 11:50:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V0CwO-0002p5-SO
	for commit-inetutils@gnu.org; Fri, 19 Jul 2013 11:50:02 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60231)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V0CwO-0002p1-PS
	for commit-inetutils@gnu.org; Fri, 19 Jul 2013 11:49:56 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1V0CwO-0006CC-6V
	for commit-inetutils@gnu.org; Fri, 19 Jul 2013 15:49:56 +0000
Date: Fri, 19 Jul 2013 15:49:56 +0000
Message-Id: <E1V0CwO-0006CC-6V@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-317-g939fa3b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e1fb81d0b845a758a307c1c60342b5f2eee31086
X-Git-Newrev: 939fa3b7b899e1b843dfd2301d3ce1afc9183570
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, 19 Jul 2013 15:50: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  939fa3b7b899e1b843dfd2301d3ce1afc9183570 (commit)
      from  e1fb81d0b845a758a307c1c60342b5f2eee31086 (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=939fa3b7b899e1b843dfd2301d3ce1afc9183570


commit 939fa3b7b899e1b843dfd2301d3ce1afc9183570
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri Jul 19 17:50:32 2013 +0200

    Documentation (silent change)

diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index bfaa2e4..2b110b8 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -2739,7 +2739,8 @@ then @var{person} is of the form @samp{user@@host}.
 @item ttyname
 If you wish to talk to a local user who is logged in more than once,
 the argument @var{ttyname} may be used to indicate the appropriate
-terminal name, where @var{ttyname} is of the form @samp{ttyXX}.
+terminal name, where @var{ttyname} typically is of the form @samp{ttyXX},
+or @samp{pts/X}.
 @end table
 
 When first called, @command{talk} sends a message to
@@ -4617,15 +4618,15 @@ and is intended to be invoked by a super-server
 It is recommended that @command{inetd} launch @command{talkd}
 with ownership @samp{nobody:tty}, or with @samp{tty:tty}.
 
-Bear in mind that this service is usable with IPv4 only,
+Keep in mind that this service is usable with IPv4 only,
 since the exchange protocol was conceived to handle only
 this particular address family.
 This fact is independent of the abilities of @command{inetd}.
 
-Observe also that the server @command{talkd} is dependent
-on the name claimed by @command{hostname}, for establishing
+Observe also that the server @command{talkd} depends
+on the name returned by @command{hostname}, for establishing
 connections between interested parties.
-The server @command{talkd} running on a multi-homed host
+A server @command{talkd} running on a multi-homed host
 is not able to respond to invitations for a valid host name
 that differs from the name reported by @command{hostname}.
 
@@ -4660,6 +4661,7 @@ Set idle timeout length
 @opindex -i
 @opindex --logging
 Enable a somewhat enhanced logging verbosity, reporting
+attempted and dropped connections, as well as
 some more unexpected events that might arise.
 
 @item -r @var{seconds}
@@ -4697,54 +4699,70 @@ the recorded invitation to respond with the appropriate rendezvous
 address and the caller and callee client programs establish a stream
 connection through which the conversation takes place.
 
-This implementation inserts an additional preparation where a site-wide
-access control list can be used to limit service access in general, and
-for any local user, i.e., present on the server's system, a further user
-owned file @file{.talkrc} is parsed if at all present, in order to even
+This implementation offers an additional mechanism, whereby a site-wide
+access control list can be used to limit service access in general.
+For any local user, i.e., present on the server's system, a further user
+owned file @file{.talkrc} is parsed, if at all present, in order to even
 further fine tune access to this particular user.
 
 @section Access control in talkd
 
 The server can be run in a mode with additional access control,
-beyond the legacy capabilities of @command{ntalkd}.  This is done
+beyond the legacy capabilities of @command{ntalkd}.  This is activated
 using the option @option{-a}, or equivalently @option{--acl}.
-The format of this access control is shared with the user specific
+
+The format of this access control list is shared with the user specific
 file @file{.talkrc}.  Normally the site-wide setting operates with
 a default value @samp{allow}, but specifying the option @option{-S},
-or @option{--strict-policy}, changes this to @samp{deny}.
-In addition, strict policy disables the possibility that an
-allowing outcome from the user specific ACL would be able to override
-a denial resulting from the system-wide ACL.
+or @option{--strict-policy}, changes this default action to @samp{deny}.
+In addition, the strict policy disables the possibility that an
+allowing action from the user specific ACL be able to override
+a denial resulting from the system-wide ACL setting.
 
 As is usual, indentation, empty lines, and lines whose first printable
-character is the hash character, are all ignored.  Each active line
-must contain at least two fields, an @code{action} and a @code{user-exp},
-where the only acceptable action types are @samp{allow} and @samp{deny}.
-The second field @code{user-exp} is a POSIX regular expression crafted
-to match user names.
-
-In a site-wide ACL the expression is matched against the requested
-local user name, whereas in a user specific ACL the matching is done
-against the remote caller's name of obvious reasons.  Remember that
-the regular expression would need anchors in order to test not only
-substrings.
+character is the hash character, are all ignored.
+The general line format is
 
 @example
 action user-exp [net-exp @dots{}]
 @end example
 
+@noindent
+Each active line must contain at least two fields:
+an @code{action} and a @code{user-exp}.
+
+The first field, @code{action}, must be either of @samp{allow} and @samp{deny}.
+Any other value will lead to the line being ignored,
+but reported in the system log.
+Of course, the two values represent admitting and rejecting
+interpretations for the resulting rule.
+
+The second field, @code{user-exp}, is a POSIX regular expression
+crafted to match user names.
+Remember that the regular expression would need anchors in order
+to test not only substrings.
+
+It is important to note that in a site-wide ACL, the file selected
+by the switch @option{-a}, the expression @code{user-exp} is matched
+against the requested local user name, that of the callee.
+
+While checking the callee's private ACL-file @file{.talkrc},
+the matching of @code{user-exp} is done against the remote
+caller's name.  Any other interpretation is plainly futile.
+
 Each line may be augmented by a net list, containing one or more
 expressions @code{net-exp}. Each of these is either the simple
-word @samp{any}, a full IPv4 address, or a full IPv4 address with
+word @samp{any}, a numeric IPv4 address, or a full IPv4 address with
 an appended netmask.  The effect is to restrict the applicability
-of the rule to the specified address ranges, or to set an explicit
-wildcard match.  The absence of a net list is equivalent to specifying
+of the rule to the specified address range, or to set an explicit
+wildcard match @samp{any}.
+The absence of a net list is equivalent to specifying
 a single @samp{any}.  The netmask can be specified as a CIDR mask
 length, or as an explicit address mask.
 
-The actual evaluation is run separately for the site-wide ACL,
-and the requested local user ACL contained in the private file
-@file{.talkrc} of this user.  This latter file must be a regular
+The actual evaluation is made separately for the site-wide ACL,
+and for the requested local user ACL, contained in the callee's
+private file @file{.talkrc}.  This latter file must be a regular
 file and must be owned by the very same user, have his primary
 group ownership, and not be group or world writeable.  Should
 any of these prerequisites be violated, the user's ACL is replaced
@@ -4754,14 +4772,21 @@ All rules in each set are evaluated, in the sense that whenever
 an expression @code{net-exp} matches the incoming IPv4 address,
 then the regular expression @code{user-exp} is tested for a match.
 That being the case, the corresponding action is recorded.  The last
-match in each set determines the outcome.
-
-In the most common case, a system wide @samp{deny} can be overridden
-if the local user has specified valid access rules. In the contrary
-case where no valid user rule could be established at all, then a
-@samp{deny} from a system wide ACL will be used as the final action.
-This final ruling, without any possibility of user intervention,
-is always enforced whenever the server is being run in strict policy mode.
+match in each set determines the outcome in its category.
+
+In the most common case, a system wide @samp{deny} is overridden
+if the local user has specified at least one valid and applicable rule,
+admitting access.
+In the contrary case, where no admitting user rule could be established
+at all, then a resulting @samp{deny}, from a system wide ACL,
+will be used as the final action.
+
+In strict policy mode, a site-wide @samp{deny} is always final,
+ignoring any user's desire.
+The administrator must explicitly arrange some admitting rule,
+with an action @samp{allow}, and some suitable net list.
+Still, the individual user can arrange his private file
+for an even narrower selection of friends.
 
 
 @node telnetd invocation

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

Summary of changes:
 doc/inetutils.texi |  105 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 65 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Jul 19 21:33:41 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V0M3J-0001gH-BE
	for mharc-commit-inetutils@gnu.org; Fri, 19 Jul 2013 21:33:41 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53512)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V0M3G-0001fc-Ip
	for commit-inetutils@gnu.org; Fri, 19 Jul 2013 21:33:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V0M3F-0007Ii-Ag
	for commit-inetutils@gnu.org; Fri, 19 Jul 2013 21:33:38 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:43055)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1V0M3F-0007Id-6j
	for commit-inetutils@gnu.org; Fri, 19 Jul 2013 21:33:37 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1V0M3E-0003OA-JS
	for commit-inetutils@gnu.org; Sat, 20 Jul 2013 01:33:36 +0000
Date: Sat, 20 Jul 2013 01:33:36 +0000
Message-Id: <E1V0M3E-0003OA-JS@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_9_1-318-g2e8cad2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 939fa3b7b899e1b843dfd2301d3ce1afc9183570
X-Git-Newrev: 2e8cad2200e7d1d794a23451d902de5a11528536
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: Sat, 20 Jul 2013 01:33:39 -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  2e8cad2200e7d1d794a23451d902de5a11528536 (commit)
      from  939fa3b7b899e1b843dfd2301d3ce1afc9183570 (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=2e8cad2200e7d1d794a23451d902de5a11528536


commit 2e8cad2200e7d1d794a23451d902de5a11528536
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Jul 20 03:23:08 2013 +0200

    talkd: Small audit of ACL.

diff --git a/ChangeLog b/ChangeLog
index 35ff971..672adbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2013-07-20  Mats Erik Andersson  <gnu@gisladisker.se>
+
+	talkd: Small audit of ACL.
+
+	* talkd/acl.c (struct netdef): Let `ipaddr' and
+	`netmask' be of type in_addr_t for better
+	architecture independence.
+	(netdef_parse): Likewise for IPADDR, NETMASK.
+	(acl_match): Likewise for IP.  When checking
+	address matches, make a bitwise AND of
+	`net->ipaddr' with `net->netmask'.
+
+	* talkd/talkd.c (main): Call openlog() before read_acl().
+	(talkd_init): Delete call to openlog().
+
 2013-07-13  Mats Erik Andersson  <gnu@gisladisker.se>
 
 	talkd: Less ACL-logging.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 2b110b8..bc20491 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -4617,6 +4617,10 @@ and is intended to be invoked by a super-server
 @command{inetd} at that datagram port.
 It is recommended that @command{inetd} launch @command{talkd}
 with ownership @samp{nobody:tty}, or with @samp{tty:tty}.
+However, this works with ACL only if @file{.talkrc} can be assumed
+to be world readable for all users.
+This failing, the process ownership will need to be @samp{root:tty}
+if the ACL-mechanism is to be usable and trustworthy.
 
 Keep in mind that this service is usable with IPv4 only,
 since the exchange protocol was conceived to handle only
diff --git a/talkd/acl.c b/talkd/acl.c
index 7b50a82..6f63c1e 100644
--- a/talkd/acl.c
+++ b/talkd/acl.c
@@ -30,8 +30,8 @@ typedef struct netdef netdef_t;
 struct netdef
 {
   netdef_t *next;
-  unsigned int ipaddr;
-  unsigned int netmask;
+  in_addr_t ipaddr;
+  in_addr_t netmask;
 };
 
 typedef struct acl acl_t;
@@ -76,7 +76,7 @@ read_address (char **line_ptr, char *ptr)
 static netdef_t *
 netdef_parse (char *str)
 {
-  unsigned int ipaddr, netmask;
+  in_addr_t ipaddr, netmask;
   netdef_t *netdef;
   char ipbuf[DOTTED_QUAD_LEN + 1];
 
@@ -384,7 +384,7 @@ int
 acl_match (CTL_MSG * msg, struct sockaddr_in *sa_in)
 {
   acl_t *acl, *mark;
-  unsigned int ip;
+  in_addr_t ip;
   int system_action = ACL_ALLOW, user_action = ACL_ALLOW;
   int found_user_acl = 0;
 
@@ -402,7 +402,14 @@ acl_match (CTL_MSG * msg, struct sockaddr_in *sa_in)
 
       for (net = acl->netlist; net; net = net->next)
 	{
-	  if (net->ipaddr == (ip & net->netmask))
+	  /* Help the administrator and his users
+	   * to simplify net list syntax:
+	   *
+	   *   mask the address `net->ipaddr' with
+	   *   `net->netmask' for less computations
+	   *   within the ACL specification.
+	   */
+	  if ((net->ipaddr & net->netmask) == (ip & net->netmask))
 	    {
 	      /*
 	       * Site-wide ACLs concern user's name on this machine,
diff --git a/talkd/talkd.c b/talkd/talkd.c
index 981ac83..908766e 100644
--- a/talkd/talkd.c
+++ b/talkd/talkd.c
@@ -117,6 +117,7 @@ main (int argc, char *argv[])
   iu_argp_init ("talkd", program_authors);
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
+  openlog ("talkd", LOG_PID, LOG_FACILITY);
   read_acl (acl_file, 1);	/* System wide ACL.  Can abort.  */
   talkd_init ();
   talkd_run (STDIN_FILENO);
@@ -126,7 +127,6 @@ main (int argc, char *argv[])
 void
 talkd_init (void)
 {
-  openlog ("talkd", LOG_PID, LOG_FACILITY);
   hostname = localhost ();
   if (!hostname)
     {

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

Summary of changes:
 ChangeLog          |   15 +++++++++++++++
 doc/inetutils.texi |    4 ++++
 talkd/acl.c        |   17 ++++++++++++-----
 talkd/talkd.c      |    2 +-
 4 files changed, 32 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


