From MAILER-DAEMON Tue Oct 11 09:34:56 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RDcTw-00031V-Bt
	for mharc-commit-inetutils@gnu.org; Tue, 11 Oct 2011 09:34:56 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49632)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RDcTl-00030k-TK
	for commit-inetutils@gnu.org; Tue, 11 Oct 2011 09:34:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RDcTd-0000eS-Vd
	for commit-inetutils@gnu.org; Tue, 11 Oct 2011 09:34:45 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58822)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RDcTd-0000eF-Sm
	for commit-inetutils@gnu.org; Tue, 11 Oct 2011 09:34:37 -0400
Received: from gscrivano by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gscrivano@gnu.org>) id 1RDcTd-0008Bi-3i
	for commit-inetutils@gnu.org; Tue, 11 Oct 2011 13:34:37 +0000
Date: Tue, 11 Oct 2011 13:34:37 +0000
Message-Id: <E1RDcTd-0008Bi-3i@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-116-g0901548
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 17d6784e33ccd6a7427e79846dfe44d86d4eaa8c
X-Git-Newrev: 0901548625c1ffd921fa4b03b7f68aaf159dce10
From: Giuseppe Scrivano <gscrivano@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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: Tue, 11 Oct 2011 13:34:55 -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  0901548625c1ffd921fa4b03b7f68aaf159dce10 (commit)
      from  17d6784e33ccd6a7427e79846dfe44d86d4eaa8c (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=0901548625c1ffd921fa4b03b7f68aaf159dce10


commit 0901548625c1ffd921fa4b03b7f68aaf159dce10
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue Oct 11 15:30:45 2011 +0200

    Fix the usage of of some stack allocated variables out of their scope.

diff --git a/ChangeLog b/ChangeLog
index 76d4f03..be035cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-11  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+	* ping/ping.c (parse_opt): Make `pattern' static.
+	* ping/ping6.c (parse_opt): Likewise.
+
 2011-09-01  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/syslogd.c (BindAddress): New variable.
diff --git a/ping/ping.c b/ping/ping.c
index 9319a47..fe65dd9 100644
--- a/ping/ping.c
+++ b/ping/ping.c
@@ -131,7 +131,7 @@ static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
   char *endptr;
-  u_char pattern[16];
+  static u_char pattern[16];
   double v;
 
   switch (key)
diff --git a/ping/ping6.c b/ping/ping6.c
index fd89537..6bb7618 100644
--- a/ping/ping6.c
+++ b/ping/ping6.c
@@ -102,7 +102,7 @@ static error_t
 parse_opt (int key, char *arg, struct argp_state *state)
 {
   char *endptr;
-  u_char pattern[16];
+  static u_char pattern[16];
 
   switch (key)
     {

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

Summary of changes:
 ChangeLog    |    5 +++++
 ping/ping.c  |    2 +-
 ping/ping6.c |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Oct 15 08:41:44 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RF3Ye-0004PA-3J
	for mharc-commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:41:44 -0400
Received: from eggs.gnu.org ([140.186.70.92]:49749)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RF3Yb-0004Nz-45
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:41:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RF3YZ-00047I-Ow
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:41:41 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33517)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RF3YZ-000477-NF
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:41:39 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RF3YZ-0003jx-DI
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 12:41:39 +0000
Date: Sat, 15 Oct 2011 12:41:39 +0000
Message-Id: <E1RF3YZ-0003jx-DI@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-118-gdb9cd50
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0901548625c1ffd921fa4b03b7f68aaf159dce10
X-Git-Newrev: db9cd50ce1af23cf641c1eba2f042dc54f52e150
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 15 Oct 2011 12:41:42 -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  db9cd50ce1af23cf641c1eba2f042dc54f52e150 (commit)
       via  d35f3c9392524333361a95eccb2c787ac5bb8df2 (commit)
      from  0901548625c1ffd921fa4b03b7f68aaf159dce10 (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=db9cd50ce1af23cf641c1eba2f042dc54f52e150


commit db9cd50ce1af23cf641c1eba2f042dc54f52e150
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Oct 15 13:46:38 2011 +0200

    Fix typo.  (silent change)

diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index ac1d2aa..5ca97c7 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -2688,7 +2688,7 @@ arguments are also logged.
 @item --pidfile=@var{pidfile}
 @opindex -p
 @opindex --pidfile
-Change default location of @var{pidfile}
+Change default location of @var{pidfile}.
 
 @item -q
 @item --no-version

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


commit d35f3c9392524333361a95eccb2c787ac5bb8df2
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Oct 15 13:39:43 2011 +0200

    src/inetd.c (argp_options) <pidfile>: Updated doc. string.

diff --git a/ChangeLog b/ChangeLog
index be035cd..35338a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
+
+	* src/inetd.c (argp_options) <pidfile>: Updated doc. string.
+
 2011-10-11  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* ping/ping.c (parse_opt): Make `pattern' static.
diff --git a/src/inetd.c b/src/inetd.c
index 7fb1216..9c1f27f 100644
--- a/src/inetd.c
+++ b/src/inetd.c
@@ -189,7 +189,7 @@ static struct argp_option argp_options[] = {
   {"environment", OPT_ENVIRON, NULL, 0,
    "pass local and remote socket information in environment variables", GRP+1},
   { "pidfile", 'p', "PIDFILE", OPTION_ARG_OPTIONAL,
-    "replace the default path \"" PATH_INETDPID "\"",
+    "override pidfile (default: \"" PATH_INETDPID "\")",
     GRP+1 },
   {"rate", 'R', "NUMBER", 0,
    "maximum invocation rate (per minute)", GRP+1},

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

Summary of changes:
 ChangeLog          |    4 ++++
 doc/inetutils.texi |    2 +-
 src/inetd.c        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Oct 15 08:56:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RF3n8-0005KU-1Z
	for mharc-commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:56:42 -0400
Received: from eggs.gnu.org ([140.186.70.92]:34560)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RF3n5-0005K6-Vb
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:56:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RF3n4-0006JP-NO
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:56:39 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:60235)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RF3n4-0006JL-KQ
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 08:56:38 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RF3n3-0005hh-Vh
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 12:56:38 +0000
Date: Sat, 15 Oct 2011 12:56:37 +0000
Message-Id: <E1RF3n3-0005hh-Vh@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-119-g1647134
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: db9cd50ce1af23cf641c1eba2f042dc54f52e150
X-Git-Newrev: 1647134d6cac7ffcb11dcf576826b1bb079467c5
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 15 Oct 2011 12:56:41 -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  1647134d6cac7ffcb11dcf576826b1bb079467c5 (commit)
      from  db9cd50ce1af23cf641c1eba2f042dc54f52e150 (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=1647134d6cac7ffcb11dcf576826b1bb079467c5


commit 1647134d6cac7ffcb11dcf576826b1bb079467c5
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Oct 15 14:56:28 2011 +0200

    Clean up (some) `make syntax-check' errors.

diff --git a/ChangeLog b/ChangeLog
index 35338a0..fabac89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
 
+	Clean up (some) `make syntax-check' errors.
+
+	* src/syslogd.c (init): Removed redundant if statment before free
+	call (was reintroduced 2011-06-20).
+	* libicmp/icmp_timestamp.c: Don't include <stddef.h>.
+	* src/syslogd.c (cfline): Removed redundant parentehsis around macros.
+
+2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
+
 	* src/inetd.c (argp_options) <pidfile>: Updated doc. string.
 
 2011-10-11  Giuseppe Scrivano  <gscrivano@gnu.org>
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index 3068f17..8c0020b 100644
--- a/libicmp/icmp_timestamp.c
+++ b/libicmp/icmp_timestamp.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <stddef.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
diff --git a/src/syslogd.c b/src/syslogd.c
index ed82012..ff83f4a 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1734,8 +1734,7 @@ init (int signo _GL_UNUSED_PARAMETER)
 	  free (f->f_un.f_user.f_unames);
 	  break;
 	}
-      if (f->f_prevhost)
-	free (f->f_prevhost);
+      free (f->f_prevhost);
       next = f->f_next;
       free (f);
     }
@@ -2075,7 +2074,7 @@ cfline (const char *line, struct filed *f)
 		break;
 
 	      case EAI_NONAME:	/* The most probable causes for failure.  */
-#if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)	/* FreeBSD complains.  */
+#if defined EAI_NODATA && (EAI_NODATA != EAI_NONAME)	/* FreeBSD complains.  */
 	      case EAI_NODATA:
 #endif
 #ifdef EAI_ADDRFAMILY

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

Summary of changes:
 ChangeLog                |    9 +++++++++
 libicmp/icmp_timestamp.c |    1 -
 src/syslogd.c            |    5 ++---
 3 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Oct 15 09:08:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RF3yh-0006Va-Ar
	for mharc-commit-inetutils@gnu.org; Sat, 15 Oct 2011 09:08:39 -0400
Received: from eggs.gnu.org ([140.186.70.92]:58873)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RF3ye-0006TB-2x
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 09:08:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RF3yb-0000To-Tx
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 09:08:35 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33409)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RF3yb-0000Th-SP
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 09:08:33 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RF3yb-0007DC-Fv
	for commit-inetutils@gnu.org; Sat, 15 Oct 2011 13:08:33 +0000
Date: Sat, 15 Oct 2011 13:08:33 +0000
Message-Id: <E1RF3yb-0007DC-Fv@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-120-gc06cef5
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1647134d6cac7ffcb11dcf576826b1bb079467c5
X-Git-Newrev: c06cef529709888c71ba3b1be1d3655b4a9c2f57
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 15 Oct 2011 13:08:37 -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  c06cef529709888c71ba3b1be1d3655b4a9c2f57 (commit)
      from  1647134d6cac7ffcb11dcf576826b1bb079467c5 (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=c06cef529709888c71ba3b1be1d3655b4a9c2f57


commit c06cef529709888c71ba3b1be1d3655b4a9c2f57
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sat Oct 15 15:08:25 2011 +0200

    * .gitignore (gnulib, gnulib/, .sc-start-sc_bindtextdomain)
    (.sc-start-sc_prohibit_have_config_h,lib/, !lib/Makefile.am):
    Added to list.

diff --git a/.gitignore b/.gitignore
index a3e9634..1b19fff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@
 .deps
 .emacs*
 .libs
+.sc-start-sc_bindtextdomain
+.sc-start-sc_prohibit_have_config_h
 .tarball-version
 .version
 ABOUT-NLS
@@ -32,9 +34,13 @@ config.log
 config.status
 configure
 confpaths.h
+gnulib
+gnulib/
 include
 inetutils-*.tar.gz
 inetutils-*/
+lib/
+!lib/Makefile.am
 libtool
 m4
 maint.mk
diff --git a/ChangeLog b/ChangeLog
index fabac89..3f7c213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
 
+	* .gitignore (gnulib, gnulib/, .sc-start-sc_bindtextdomain)
+	(.sc-start-sc_prohibit_have_config_h,lib/, !lib/Makefile.am):
+	Added to list.
+
+2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
+
 	Clean up (some) `make syntax-check' errors.
 
 	* src/syslogd.c (init): Removed redundant if statment before free

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

Summary of changes:
 .gitignore |    6 ++++++
 ChangeLog  |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Oct 19 12:55:28 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RGZQO-0000MD-Ph
	for mharc-commit-inetutils@gnu.org; Wed, 19 Oct 2011 12:55:28 -0400
Received: from eggs.gnu.org ([140.186.70.92]:54508)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RGZQM-0000M0-BT
	for commit-inetutils@gnu.org; Wed, 19 Oct 2011 12:55:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RGZQL-0001JV-97
	for commit-inetutils@gnu.org; Wed, 19 Oct 2011 12:55:26 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:45617)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RGZQL-0001JO-3s
	for commit-inetutils@gnu.org; Wed, 19 Oct 2011 12:55:25 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RGZQK-0007o4-CK
	for commit-inetutils@gnu.org; Wed, 19 Oct 2011 16:55:24 +0000
Date: Wed, 19 Oct 2011 16:55:24 +0000
Message-Id: <E1RGZQK-0007o4-CK@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-121-gb241f31
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c06cef529709888c71ba3b1be1d3655b4a9c2f57
X-Git-Newrev: b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 19 Oct 2011 16:55:27 -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  b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95 (commit)
      from  c06cef529709888c71ba3b1be1d3655b4a9c2f57 (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=b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95


commit b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Wed Oct 19 18:14:30 2011 +0200

    * telnetd/telnetd.h [HAVE_STROPTS_H && !HAVE_IOCTL]: Only include <stropts.h> if HAVE_IOCTL wasn't defined.

diff --git a/ChangeLog b/ChangeLog
index 3f7c213..3ca99ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Alfred M. Szmidt  <ams@gnu.org>
+
+	* telnetd/telnetd.h [HAVE_STROPTS_H && !HAVE_IOCTL]: Only include
+	<stropts.h> if HAVE_IOCTL wasn't defined.
+
 2011-10-15  Alfred M. Szmidt  <ams@gnu.org>
 
 	* .gitignore (gnulib, gnulib/, .sc-start-sc_bindtextdomain)
diff --git a/telnetd/telnetd.h b/telnetd/telnetd.h
index 7b5c033..b5b4a5b 100644
--- a/telnetd/telnetd.h
+++ b/telnetd/telnetd.h
@@ -44,7 +44,7 @@
 #ifdef HAVE_SYS_PTYVAR_H
 # include <sys/ptyvar.h>
 #endif
-#ifdef HAVE_STROPTS_H
+#if defined HAVE_STROPTS_H && !defined HAVE_IOCTL
 # include <stropts.h>
 #endif
 #include <sys/ioctl.h>

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

Summary of changes:
 ChangeLog         |    5 +++++
 telnetd/telnetd.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Oct 22 09:39:33 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RHbnR-0002WS-68
	for mharc-commit-inetutils@gnu.org; Sat, 22 Oct 2011 09:39:33 -0400
Received: from eggs.gnu.org ([140.186.70.92]:43367)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RHbnN-0002Vp-Fe
	for commit-inetutils@gnu.org; Sat, 22 Oct 2011 09:39:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RHbnL-0002Hb-H4
	for commit-inetutils@gnu.org; Sat, 22 Oct 2011 09:39:29 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51225)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RHbnL-0002HX-6g
	for commit-inetutils@gnu.org; Sat, 22 Oct 2011 09:39:27 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RHbnK-0003PU-IA
	for commit-inetutils@gnu.org; Sat, 22 Oct 2011 13:39:26 +0000
Date: Sat, 22 Oct 2011 13:39:26 +0000
Message-Id: <E1RHbnK-0003PU-IA@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-122-gc3d2504
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95
X-Git-Newrev: c3d250417c72aedbc31086f300bd3b2b7b7021d0
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 22 Oct 2011 13:39:31 -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  c3d250417c72aedbc31086f300bd3b2b7b7021d0 (commit)
      from  b241f31e5eeb3bdd6c114c49d3fb0db01e6f3f95 (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=c3d250417c72aedbc31086f300bd3b2b7b7021d0


commit c3d250417c72aedbc31086f300bd3b2b7b7021d0
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Fri Oct 21 19:47:48 2011 +0200

    Only define PKTSIZE if needed.

diff --git a/ChangeLog b/ChangeLog
index 3ca99ef..bde311d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-21  Alfred M. Szmidt  <ams@gnu.org>
+
+	* libinetutils/tftpsubs.c (PKTSIZE) [PKTSIZE]: Only define PKTSIZE if needed.
+	* src/tftp.c, src/tftpd.c: Likewise.
+
 2011-10-19  Alfred M. Szmidt  <ams@gnu.org>
 
 	* telnetd/telnetd.h [HAVE_STROPTS_H && !HAVE_IOCTL]: Only include
diff --git a/libinetutils/tftpsubs.c b/libinetutils/tftpsubs.c
index 4551d05..65ba8cd 100644
--- a/libinetutils/tftpsubs.c
+++ b/libinetutils/tftpsubs.c
@@ -73,7 +73,10 @@
 
 #include "tftpsubs.h"
 
+/* Some systems define PKTSIZE in <arpa/tftp.h>.  */
+#ifndef PKTSIZE
 #define PKTSIZE SEGSIZE+4	/* should be moved to tftp.h */
+#endif
 
 struct bf
 {
diff --git a/src/tftp.c b/src/tftp.c
index 62c7540..9330cbd 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -80,7 +80,11 @@
 #include "progname.h"
 #include "tftpsubs.h"
 
+/* Some systems define PKTSIZE in <arpa/tftp.h>.  */
+#ifndef PKTSIZE
 #define PKTSIZE    SEGSIZE+4
+#endif
+
 char ackbuf[PKTSIZE];
 int timeout;
 jmp_buf timeoutbuf;
diff --git a/src/tftpd.c b/src/tftpd.c
index 49e7ae6..ea4122e 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -98,7 +98,10 @@ static int peer;
 static int rexmtval = TIMEOUT;
 static int maxtimeout = 5 * TIMEOUT;
 
+/* Some systems define PKTSIZE in <arpa/tftp.h>.  */
+#ifndef PKTSIZE
 #define PKTSIZE	SEGSIZE+4
+#endif
 static char buf[PKTSIZE];
 static char ackbuf[PKTSIZE];
 static struct sockaddr_storage from;

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

Summary of changes:
 ChangeLog               |    5 +++++
 libinetutils/tftpsubs.c |    3 +++
 src/tftp.c              |    4 ++++
 src/tftpd.c             |    3 +++
 4 files changed, 15 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sun Oct 23 15:00:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RI3H8-0005Ak-Bu
	for mharc-commit-inetutils@gnu.org; Sun, 23 Oct 2011 15:00:02 -0400
Received: from eggs.gnu.org ([140.186.70.92]:35512)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RI3H3-0005AX-4J
	for commit-inetutils@gnu.org; Sun, 23 Oct 2011 14:59:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RI3H0-0001hF-AJ
	for commit-inetutils@gnu.org; Sun, 23 Oct 2011 14:59:57 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34419)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RI3H0-0001hB-5V
	for commit-inetutils@gnu.org; Sun, 23 Oct 2011 14:59:54 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RI3Gz-0004RJ-II
	for commit-inetutils@gnu.org; Sun, 23 Oct 2011 18:59:54 +0000
Date: Sun, 23 Oct 2011 18:59:53 +0000
Message-Id: <E1RI3Gz-0004RJ-II@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-126-ge18e45f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c3d250417c72aedbc31086f300bd3b2b7b7021d0
X-Git-Newrev: e18e45fe5cf918508d75d2b4e892e9bbc1c16e31
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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: Sun, 23 Oct 2011 19:00:00 -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  e18e45fe5cf918508d75d2b4e892e9bbc1c16e31 (commit)
       via  8422e0fab0c97d1b08784926f43d5007d692d8d4 (commit)
       via  975c576a435ef421e3293b46456b006bda458931 (commit)
       via  12c920a3545ea1f18a20d1a2f46f01b0f744b300 (commit)
      from  c3d250417c72aedbc31086f300bd3b2b7b7021d0 (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=e18e45fe5cf918508d75d2b4e892e9bbc1c16e31


commit e18e45fe5cf918508d75d2b4e892e9bbc1c16e31
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 23 13:17:56 2011 +0200

    README-alpha: Don't mention gettext and libtool as build requirements.

diff --git a/ChangeLog b/ChangeLog
index e4d81c6..e4a62f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
 
+	* README-alpha: Don't mention gettext and libtool as build
+	requirements.
+
+2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
 	* bootstrap.conf (buildreq): New variable.
 	(bootstrap_sync): Likewise.
 
diff --git a/README-alpha b/README-alpha
index 81585f8..7057b85 100644
--- a/README-alpha
+++ b/README-alpha
@@ -46,9 +46,7 @@ latest stable version.
 - Autoconf <http://www.gnu.org/software/autoconf/>
 - Automake <http://www.gnu.org/software/automake/>
 - Bison <http://www.gnu.org/software/bison/>
-- Gettext <http://www.gnu.org/software/gettext/>
 - Gnulib <http://www.gnu.org/software/gnulib/>
-- Libtool <http://www.gnu.org/software/libtool/>
 - M4 <http://www.gnu.org/software/m4/>
 - Texinfo <http://www.gnu.org/software/texinfo>
 - help2man <http://www.gnu.org/software/help2man>

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8422e0fab0c97d1b08784926f43d5007d692d8d4


commit 8422e0fab0c97d1b08784926f43d5007d692d8d4
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 23 13:17:20 2011 +0200

    Let ./bootstrap take care about build requirements.

diff --git a/ChangeLog b/ChangeLog
index ba8952b..e4d81c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
 
+	* bootstrap.conf (buildreq): New variable.
+	(bootstrap_sync): Likewise.
+
+2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
 	* README-prereq: New file.
 	* README-alpha: Mention that help2man is required for building.
 
diff --git a/bootstrap.conf b/bootstrap.conf
index abd42b2..91c2c20 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,6 +17,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
+# Build prerequisites.
+buildreq="\
+autoconf   2.68
+automake   1.11
+bison      2.3
+m4         -
+makeinfo   -
+help2man   -
+"
+
+# Sync. bootstrap from checked out gnulib sources.
+bootstrap_sync=true
+
 ACLOCAL_FLAGS="-I am"
 
 # gnulib library name

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=975c576a435ef421e3293b46456b006bda458931


commit 975c576a435ef421e3293b46456b006bda458931
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 23 13:12:57 2011 +0200

    Updated README-alpha, and added README-prereq.

diff --git a/ChangeLog b/ChangeLog
index 5f5af5d..ba8952b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
 
+	* README-prereq: New file.
+	* README-alpha: Mention that help2man is required for building.
+
+2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
 	Updated ./bootstrap.
 
 	* bootstrap: Updated from gnulib (2011-10-23).
diff --git a/README-alpha b/README-alpha
index 75e8aef..81585f8 100644
--- a/README-alpha
+++ b/README-alpha
@@ -51,6 +51,7 @@ latest stable version.
 - Libtool <http://www.gnu.org/software/libtool/>
 - M4 <http://www.gnu.org/software/m4/>
 - Texinfo <http://www.gnu.org/software/texinfo>
+- help2man <http://www.gnu.org/software/help2man>
 
 * Building
 
diff --git a/README-prereq b/README-prereq
new file mode 100644
index 0000000..078d642
--- /dev/null
+++ b/README-prereq
@@ -0,0 +1,2 @@
+Please see README-alpha.  This file only exists for the sake of
+`bootstrap', and it only exists in the source control repository.

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=12c920a3545ea1f18a20d1a2f46f01b0f744b300


commit 12c920a3545ea1f18a20d1a2f46f01b0f744b300
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Sun Oct 23 12:45:13 2011 +0200

    Updated ./bootstrap.

diff --git a/ChangeLog b/ChangeLog
index bde311d..5f5af5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
+
+	Updated ./bootstrap.
+
+	* bootstrap: Updated from gnulib (2011-10-23).
+	* bootstrap.conf (ACLOCAL_FLAGS): New variable.
+	* Makefile.am (AUTOMAKE_OPTIONS): Removed variable.
+	(ACLOCAL_AMFLAGS): Removed variable.
+
 2011-10-21  Alfred M. Szmidt  <ams@gnu.org>
 
 	* libinetutils/tftpsubs.c (PKTSIZE) [PKTSIZE]: Only define PKTSIZE if needed.
diff --git a/Makefile.am b/Makefile.am
index acda724..d6da45c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-AUTOMAKE_OPTIONS = 1.11
-
-ACLOCAL_AMFLAGS = -I m4 -I am
-
 EXTRA_DIST = README-alpha paths ChangeLog.0
 
 SUBDIRS = lib \
diff --git a/bootstrap b/bootstrap
index 2041ca3..f76db9a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,11 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-05-14.09; # UTC
+scriptversion=2011-08-11.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 2003-2011 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,24 +42,32 @@ local_gl_dir=gl
 bt='._bootmp'
 bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
+me=$0
 
 usage() {
   cat <<EOF
-Usage: $0 [OPTION]...
+Usage: $me [OPTION]...
 Bootstrap this package from the checked-out sources.
 
 Options:
- --gnulib-srcdir=DIRNAME  Specify the local directory where gnulib
+ --gnulib-srcdir=DIRNAME  specify the local directory where gnulib
                           sources reside.  Use this if you already
                           have gnulib sources on your machine, and
                           do not want to waste your bandwidth downloading
-                          them again.  Defaults to \$GNULIB_SRCDIR.
- --copy                   Copy files instead of creating symbolic links.
- --force                  Attempt to bootstrap even if the sources seem
-                          not to have been checked out.
- --skip-po                Do not download po files.
-
-If the file $0.conf exists in the same directory as this script, its
+                          them again.  Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync         if this bootstrap script is not identical to
+                          the version in the local gnulib sources,
+                          update this script, and then restart it with
+                          /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync      do not check whether bootstrap is out of sync
+ --copy                   copy files instead of creating symbolic links
+ --force                  attempt to bootstrap even if the sources seem
+                          not to have been checked out
+ --no-git                 do not use git to update gnulib.  Requires that
+                          --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po                do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
@@ -81,6 +88,10 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
+# A function to be called to edit gnulib.mk right after it's created.
+# Override it via your own definition in bootstrap.conf.
+gnulib_mk_hook() { :; }
+
 # A function to be called after everything else in this script.
 # Override it via your own definition in bootstrap.conf.
 bootstrap_epilogue() { :; }
@@ -91,7 +102,8 @@ bootstrap_epilogue() { :; }
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
 
 extract_package_name='
   /^AC_INIT(/{
@@ -118,18 +130,7 @@ source_base=lib
 m4_base=m4
 doc_base=doc
 tests_base=tests
-
-# Extra files from gnulib, which override files from other sources.
-gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/missing
-        $build_aux/mdate-sh
-        $build_aux/texinfo.tex
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
-        doc/INSTALL
-"
+gnulib_extra_files=''
 
 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
 gnulib_tool_option_extras=
@@ -164,6 +165,13 @@ copy=false
 # on which version control system (if any) is used in the source directory.
 vc_ignore=auto
 
+# Set this to true in bootstrap.conf to enable --bootstrap-sync by
+# default.
+bootstrap_sync=false
+
+# Use git to update gnulib sources
+use_git=true
+
 # find_tool ENVVAR NAMES...
 # -------------------------
 # Search for a required program.  Use the value of ENVVAR, if set,
@@ -188,11 +196,11 @@ find_tool ()
     find_tool_error_prefix="\$$find_tool_envvar: "
   fi
   if test x"$find_tool_res" = x; then
-    echo >&2 "$0: one of these is required: $find_tool_names"
+    echo >&2 "$me: one of these is required: $find_tool_names"
     exit 1
   fi
   ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
-    echo >&2 "$0: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+    echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
     exit 1
   }
   eval "$find_tool_envvar=\$find_tool_res"
@@ -210,6 +218,18 @@ case "$0" in
   *) test -r "$0.conf" && . ./"$0.conf" ;;
 esac
 
+# Extra files from gnulib, which override files from other sources.
+test -z "${gnulib_extra_files}" && \
+  gnulib_extra_files="
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/mdate-sh
+        $build_aux/texinfo.tex
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
+"
 
 if test "$vc_ignore" = auto; then
   vc_ignore=
@@ -235,28 +255,71 @@ do
     checkout_only_file=;;
   --copy)
     copy=true;;
+  --bootstrap-sync)
+    bootstrap_sync=true;;
+  --no-bootstrap-sync)
+    bootstrap_sync=false;;
+  --no-git)
+    use_git=false;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
   esac
 done
 
+if $use_git || test -d "$GNULIB_SRCDIR"; then
+  :
+else
+  echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
+  exit 1
+fi
+
 if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
   echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
   exit 1
 fi
 
+# Ensure that lines starting with ! sort last, per gitignore conventions
+# for whitelisting exceptions after a more generic blacklist pattern.
+sort_patterns() {
+  sort -u "$@" | sed '/^!/ {
+    H
+    d
+  }
+  $ {
+    P
+    x
+    s/^\n//
+  }' | sed '/^$/d'
+}
+
 # If $STR is not already on a line by itself in $FILE, insert it,
 # sorting the new contents of the file and replacing $FILE with the result.
 insert_sorted_if_absent() {
   file=$1
   str=$2
   test -f $file || touch $file
-  echo "$str" | sort -u - $file | cmp - $file > /dev/null \
-    || echo "$str" | sort -u - $file -o $file \
+  echo "$str" | sort_patterns - $file | cmp - $file > /dev/null \
+    || { echo "$str" | sort_patterns - $file > $file.bak \
+      && mv $file.bak $file; } \
     || exit 1
 }
 
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_sorted_if_absent.
+insert_vc_ignore() {
+  vc_ignore_file="$1"
+  pattern="$2"
+  case $vc_ignore_file in
+  *.gitignore)
+    # A .gitignore entry that does not start with `/' applies
+    # recursively to subdirectories, so prepend `/' to every
+    # .gitignore entry.
+    pattern=`echo "$pattern" | sed s,^,/,`;;
+  esac
+  insert_sorted_if_absent "$vc_ignore_file" "$pattern"
+}
+
 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
 found_aux_dir=no
 grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
@@ -275,7 +338,7 @@ if test ! -d $build_aux; then
   mkdir $build_aux
   for dot_ig in x $vc_ignore; do
     test $dot_ig = x && continue
-    insert_sorted_if_absent $dot_ig $build_aux
+    insert_vc_ignore $dot_ig $build_aux
   done
 fi
 
@@ -325,17 +388,18 @@ get_version() {
   $app --version >/dev/null 2>&1 || return 1
 
   $app --version 2>&1 |
-  sed -n '# extract version within line
-          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
-          t done
+  sed -n '# Move version to start of line.
+          s/.*[v ]\([0-9]\)/\1/
+
+          # Skip lines that do not start with version.
+          /^[0-9]/!d
 
-          # extract version at start of line
-          s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
-          t done
+          # Remove characters after the version.
+          s/[^.a-z0-9-].*//
 
-          d
+          # The first component must be digits only.
+          s/^\([0-9]*\)[a-z-].*/\1/
 
-          :done
           #the following essentially does s/5.005/5.5/
           s/\.0*\([1-9]\)/.\1/g
           p
@@ -346,21 +410,43 @@ check_versions() {
   ret=0
 
   while read app req_ver; do
+    # We only need libtoolize from the libtool package.
+    if test "$app" = libtool; then
+      app=libtoolize
+    fi
+    # Exempt git if --no-git is in effect.
+    if test "$app" = git; then
+      $use_git || continue
+    fi
     # Honor $APP variables ($TAR, $AUTOCONF, etc.)
-    appvar=`echo $app | tr '[a-z]' '[A-Z]'`
+    appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
     test "$appvar" = TAR && appvar=AMTAR
-    eval "app=\${$appvar-$app}"
-    inst_ver=$(get_version $app)
-    if [ ! "$inst_ver" ]; then
-      echo "Error: '$app' not found" >&2
-      ret=1
-    elif [ ! "$req_ver" = "-" ]; then
-      latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
-      if [ ! "$latest_ver" = "$inst_ver" ]; then
-        echo "Error: '$app' version == $inst_ver is too old" >&2
-        echo "       '$app' version >= $req_ver is required" >&2
+    case $appvar in
+        GZIP) ;; # Do not use $GZIP:  it contains gzip options.
+        *) eval "app=\${$appvar-$app}" ;;
+    esac
+    if [ "$req_ver" = "-" ]; then
+      # Merely require app to exist; not all prereq apps are well-behaved
+      # so we have to rely on $? rather than get_version.
+      $app --version >/dev/null 2>&1
+      if [ 126 -le $? ]; then
+        echo "$me: Error: '$app' not found" >&2
         ret=1
       fi
+    else
+      # Require app to produce a new enough version string.
+      inst_ver=$(get_version $app)
+      if [ ! "$inst_ver" ]; then
+        echo "$me: Error: '$app' not found" >&2
+        ret=1
+      else
+        latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+        if [ ! "$latest_ver" = "$inst_ver" ]; then
+          echo "$me: Error: '$app' version == $inst_ver is too old" >&2
+          echo "       '$app' version >= $req_ver is required" >&2
+          ret=1
+        fi
+      fi
     fi
   done
 
@@ -370,16 +456,30 @@ check_versions() {
 print_versions() {
   echo "Program    Min_version"
   echo "----------------------"
-  printf "$buildreq"
+  printf %s "$buildreq"
   echo "----------------------"
   # can't depend on column -t
 }
 
+use_libtool=0
+# We'd like to use grep -E, to see if any of LT_INIT,
+# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+# but that's not portable enough (e.g., for Solaris).
+grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+  && use_libtool=1
+grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
+  && use_libtool=1
+if test $use_libtool = 1; then
+  find_tool LIBTOOLIZE glibtoolize libtoolize
+fi
+
 if ! printf "$buildreq" | check_versions; then
-  test -f README-prereq &&
-  echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2
-  echo
-  print_versions
+  echo >&2
+  if test -f README-prereq; then
+    echo "$0: See README-prereq for how to get the prerequisite programs" >&2
+  else
+    echo "$0: Please install the prerequisite programs" >&2
+  fi
   exit 1
 fi
 
@@ -390,11 +490,11 @@ if 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
-    echo "initializing git-merge-changelog driver"
+    echo "$0: initializing git-merge-changelog driver"
     git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
     git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
   else
-    echo "consider installing git-merge-changelog from gnulib"
+    echo "$0: consider installing git-merge-changelog from gnulib"
   fi
 fi
 
@@ -410,8 +510,7 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
-
-test -n "$gnulib_path" || gnulib_path="gnulib"
+test -z "$gnulib_path" && gnulib_path=gnulib
 
 # Get gnulib files.
 
@@ -427,8 +526,8 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone 2>&1 -h|grep -- --depth > /dev/null \
-        && shallow='--depth 2' || shallow=
+    shallow=
+    git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib
 
@@ -464,6 +563,16 @@ case ${GNULIB_SRCDIR--} in
   ;;
 esac
 
+if $bootstrap_sync; then
+  cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+    echo "$0: updating bootstrap and restarting..."
+    exec sh -c \
+      'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+      -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      "$0" "$@" --no-bootstrap-sync
+  }
+fi
+
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
@@ -472,20 +581,22 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 download_po_files() {
   subdir=$1
   domain=$2
-  echo "$0: getting translations into $subdir for $domain..."
+  echo "$me: getting translations into $subdir for $domain..."
   cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
   eval "$cmd"
 }
 
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
 # or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
 update_po_files() {
   # Directory containing primary .po files.
   # Overwrite them only when we're sure a .po file is new.
   po_dir=$1
   domain=$2
 
-  # Download *.po files into this dir.
+  # Mirror *.po files into this dir.
   # Usually contains *.s1 checksum files.
   ref_po_dir="$po_dir/.reference"
 
@@ -504,7 +615,7 @@ update_po_files() {
         ! test -f "$po_dir/$po.po" ||
         ! $SHA1SUM -c --status "$cksum_file" \
             < "$new_po" > /dev/null; then
-      echo "updated $po_dir/$po.po..."
+      echo "$me: updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" \
           && $SHA1SUM < "$new_po" > "$cksum_file"
     fi
@@ -542,34 +653,42 @@ symlink_to_dir()
       for dot_ig in x $vc_ignore; do
         test $dot_ig = x && continue
         ig=$parent/$dot_ig
-        insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+        insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
       done
     fi
 
     if $copy; then
       {
         test ! -h "$dst" || {
-          echo "$0: rm -f $dst" &&
+          echo "$me: rm -f $dst" &&
           rm -f "$dst"
         }
       } &&
       test -f "$dst" &&
       cmp -s "$src" "$dst" || {
-        echo "$0: cp -fp $src $dst" &&
+        echo "$me: cp -fp $src $dst" &&
         cp -fp "$src" "$dst"
       }
     else
+      # Leave any existing symlink alone, if it already points to the source,
+      # so that broken build tools that care about symlink times
+      # aren't confused into doing unnecessary builds.  Conversely, if the
+      # existing symlink's time stamp is older than the source, make it afresh,
+      # so that broken tools aren't confused into skipping needed builds.  See
+      # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
       test -h "$dst" &&
       src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
       dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
-      test "$src_i" = "$dst_i" || {
+      test "$src_i" = "$dst_i" &&
+      both_ls=`ls -dt "$src" "$dst"` &&
+      test "X$both_ls" = "X$dst$nl$src" || {
         dot_dots=
         case $src in
         /*) ;;
         *)
           case /$dst/ in
           *//* | */../* | */./* | /*/*/*/*/*/)
-             echo >&2 "$0: invalid symlink calculation: $src -> $dst"
+             echo >&2 "$me: invalid symlink calculation: $src -> $dst"
              exit 1;;
           /*/*/*/*/)	dot_dots=../../../;;
           /*/*/*/)	dot_dots=../../;;
@@ -577,7 +696,7 @@ symlink_to_dir()
           esac;;
         esac
 
-        echo "$0: ln -fs $dot_dots$src $dst" &&
+        echo "$me: ln -fs $dot_dots$src $dst" &&
         ln -fs "$dot_dots$src" "$dst"
       }
     fi
@@ -610,7 +729,7 @@ cp_mark_as_generated()
       cmp -s "$cp_src" "$cp_dst" || {
         # Copy the file first to get proper permissions if it
         # doesn't already exist.  Then overwrite the copy.
-        echo "$0: cp -f $cp_src $cp_dst" &&
+        echo "$me: cp -f $cp_src $cp_dst" &&
         rm -f "$cp_dst" &&
         cp "$cp_src" "$cp_dst-t" &&
         sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
@@ -628,7 +747,7 @@ cp_mark_as_generated()
       if cmp -s "$cp_dst-t" "$cp_dst"; then
         rm -f "$cp_dst-t"
       else
-        echo "$0: cp $cp_src $cp_dst # with edits" &&
+        echo "$me: cp $cp_src $cp_dst # with edits" &&
         mv -f "$cp_dst-t" "$cp_dst"
       fi
     fi
@@ -647,7 +766,7 @@ version_controlled_file() {
   elif test -d .svn; then
     svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
   else
-    echo "$0: no version control for $dir/$file?" >&2
+    echo "$me: no version control for $dir/$file?" >&2
   fi
   test $found = yes
 }
@@ -659,7 +778,8 @@ slurp() {
     for file in `ls -a $1/$dir`; do
       case $file in
       .|..) continue;;
-      .*) continue;; # FIXME: should all file names starting with "." be ignored?
+      # FIXME: should all file names starting with "." be ignored?
+      .*) continue;;
       esac
       test -d $1/$dir/$file && continue
       for excluded_file in $excluded_files; do
@@ -668,30 +788,19 @@ slurp() {
       if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
         copied=$copied${sep}$gnulib_mk; sep=$nl
         remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null || {
-          echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+        sed "$remove_intl" $1/$dir/$file |
+        cmp - $dir/$gnulib_mk > /dev/null || {
+          echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
           rm -f $dir/$gnulib_mk &&
-          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
+          gnulib_mk_hook $dir/$gnulib_mk
         }
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
            version_controlled_file $dir $file; then
-        echo "$0: $dir/$file overrides $1/$dir/$file"
+        echo "$me: $dir/$file overrides $1/$dir/$file"
       else
         copied=$copied$sep$file; sep=$nl
-        if test $file = gettext.m4; then
-          echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
-          rm -f $dir/$file
-          sed '
-            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-              AC_DEFUN([AM_INTL_SUBDIR], [])
-            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
-              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
-            $a\
-              AC_DEFUN([gl_LOCK_EARLY], [])
-          ' $1/$dir/$file >$dir/$file
-        else
-          cp_mark_as_generated $1/$dir/$file $dir/$file
-        fi
+        cp_mark_as_generated $1/$dir/$file $dir/$file
       fi || exit
     done
 
@@ -699,18 +808,25 @@ slurp() {
       test $dot_ig = x && continue
       ig=$dir/$dot_ig
       if test -n "$copied"; then
-        insert_sorted_if_absent $ig "$copied"
+        insert_vc_ignore $ig "$copied"
         # If an ignored file name ends with .in.h, then also add
         # the name with just ".h".  Many gnulib headers are generated,
         # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
         # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-        f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
-        insert_sorted_if_absent $ig "$f"
+        f=`echo "$copied" |
+          sed '
+            s/\.in\.h$/.h/
+            s/\.sin$/.sed/
+            s/\.y$/.c/
+            s/\.gperf$/.h/
+          '
+        `
+        insert_vc_ignore $ig "$f"
 
         # For files like sys_stat.in.h and sys_time.in.h, record as
         # ignorable the directory we might eventually create: sys/.
         f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-        insert_sorted_if_absent $ig "$f"
+        insert_vc_ignore $ig "$f"
       fi
     done
   done
@@ -735,6 +851,12 @@ gnulib_tool_options="\
  --local-dir $local_gl_dir\
  $gnulib_tool_option_extras\
 "
+if test $use_libtool = 1; then
+  case "$gnulib_tool_options " in
+    *' --libtool '*) ;;
+    *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+  esac
+fi
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
 slurp $bt || exit
@@ -771,28 +893,24 @@ find "$m4_base" "$source_base" \
 
 # Reconfigure, getting other files.
 
+# Skip autoheader if it's not needed.
+grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
+  AUTOHEADER=true
+
 for command in \
   libtool \
-  "${ACLOCAL-aclocal} --force -I m4 -I am" \
+  "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \
   "${AUTOCONF-autoconf} --force" \
   "${AUTOHEADER-autoheader} --force" \
   "${AUTOMAKE-automake} --add-missing --copy --force-missing"
 do
   if test "$command" = libtool; then
-    use_libtool=0
-    # We'd like to use grep -E, to see if any of LT_INIT,
-    # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
-    # but that's not portable enough (e.g., for Solaris).
-    grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
-      && use_libtool=1
-    grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
-      && use_libtool=1
     test $use_libtool = 0 \
       && continue
     command="${LIBTOOLIZE-libtoolize} -c -f"
   fi
   echo "$0: $command ..."
-  $command || exit
+  eval "$command" || exit
 done
 
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 34cf3c7..abd42b2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -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/'.
 
+ACLOCAL_FLAGS="-I am"
+
 # gnulib library name
 gnulib_name=libgnu
 

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

Summary of changes:
 ChangeLog                       |   24 +++
 Makefile.am                     |    4 -
 README-alpha                    |    3 +-
 README-hacking => README-prereq |    0
 bootstrap                       |  330 ++++++++++++++++++++++++++-------------
 bootstrap.conf                  |   15 ++
 6 files changed, 264 insertions(+), 112 deletions(-)
 copy README-hacking => README-prereq (100%)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Tue Oct 25 16:13:20 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RInN9-0006p0-Vt
	for mharc-commit-inetutils@gnu.org; Tue, 25 Oct 2011 16:13:19 -0400
Received: from eggs.gnu.org ([140.186.70.92]:36794)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RInN5-0006nl-LZ
	for commit-inetutils@gnu.org; Tue, 25 Oct 2011 16:13:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RInN2-0003dL-Rn
	for commit-inetutils@gnu.org; Tue, 25 Oct 2011 16:13:15 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:47362)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RInN2-0003dH-MC
	for commit-inetutils@gnu.org; Tue, 25 Oct 2011 16:13:12 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RInN2-0007Uu-1k
	for commit-inetutils@gnu.org; Tue, 25 Oct 2011 20:13:12 +0000
Date: Tue, 25 Oct 2011 20:13:12 +0000
Message-Id: <E1RInN2-0007Uu-1k@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-132-gd920709
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e18e45fe5cf918508d75d2b4e892e9bbc1c16e31
X-Git-Newrev: d920709ad12dd88e7996467c6e9fc1d34a1c6221
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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: Tue, 25 Oct 2011 20:13:18 -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  d920709ad12dd88e7996467c6e9fc1d34a1c6221 (commit)
       via  d813fb806eff793cdf12686cfc952d67c3b51cac (commit)
       via  8899e044dd48845f0850c5ec613e74cad9f9b280 (commit)
       via  05b1482b894b197602508ecfcd318d49cf272c42 (commit)
       via  5f4321535025d6ebb8c5ffcedc03ee0fb81599c3 (commit)
       via  1b143bf21d0f51c782513270777153bc5074f32e (commit)
      from  e18e45fe5cf918508d75d2b4e892e9bbc1c16e31 (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=d920709ad12dd88e7996467c6e9fc1d34a1c6221


commit d920709ad12dd88e7996467c6e9fc1d34a1c6221
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 25 17:22:37 2011 +0200

    configure.ac: Use AC_CONFIG_HEADER instead of AM_CONFIG_HEADER.

diff --git a/ChangeLog b/ChangeLog
index 390165d..782a10c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Pass regexp to git-version-gen to get version tag.
+	Use AC_CONFIG_HEADER instead of AM_CONFIG_HEADER.
 
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
 
diff --git a/configure.ac b/configure.ac
index 0d9370f..13d0aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_INIT([GNU inetutils],
 
 AC_CONFIG_SRCDIR([src/inetd.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_CONFIG_HEADER([config.h:config.hin])
+AC_CONFIG_HEADER([config.h:config.hin])
 AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE([1.11])

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


commit d813fb806eff793cdf12686cfc952d67c3b51cac
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 25 17:17:10 2011 +0200

    configure.ac: Pass regexp to git-version-gen to get version tag.

diff --git a/ChangeLog b/ChangeLog
index 0eb4b63..390165d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
 
+	* configure.ac: Pass regexp to git-version-gen to get version tag.
+
+2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
+
 	New variables (iu_LIBRARIES and iu_INCLUDES ) for specifying core
 	inetutils libraries and header files in Makefile.am.
 
diff --git a/configure.ac b/configure.ac
index 5f9786b..0d9370f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,9 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([GNU inetutils], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [bug-inetutils@gnu.org])
+AC_INIT([GNU inetutils],
+ m4_esyscmd([build-aux/git-version-gen .tarball-version 's/inetutils-/v/;s/_/./']),
+ [bug-inetutils@gnu.org])
 
 AC_CONFIG_SRCDIR([src/inetd.c])
 AC_CONFIG_AUX_DIR([build-aux])

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


commit 8899e044dd48845f0850c5ec613e74cad9f9b280
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 25 16:58:59 2011 +0200

    New variables (iu_LIBRARIES and iu_INCLUDES ) for specifying core inetutils libraries and header files in Makefile.am.

diff --git a/ChangeLog b/ChangeLog
index 904e9b7..0eb4b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
 
+	New variables (iu_LIBRARIES and iu_INCLUDES ) for specifying core
+	inetutils libraries and header files in Makefile.am.
+
+	* configure.ac (iu_INCLUDES, iu_LIBRARIES): New variables.
+
+	* whois/Makefile.am (INCLUDES, LDADD): Use $(iu_INCLUDES) and
+	$(iu_LIBRARIES), respectivley.
+	* tests/Makefile.am (AM_CPPFLAGS, LDADD): Likewise.
+	* ifconfig/Makefile.am (INCLUDES, LDADD): Likewise.
+	* ftp/Makefile.am (INCLUDES, LDADD): Likewise.
+	* ftpd/Makefile.am (INCLUDES, LDADD): Likewise.
+	* talkd/Makefile.am (INCLUDES, LDADD): Likewise.
+	* talk/Makefile.am (INCLUDES, LDADD): Likewise.
+
+	* telnetd/Makefile.am (INCLUDES): Use $(iu_INCLUDES).
+	(LDADD): Use $(iu_LIBRARIES) and explicitly use static version of libtelnet.
+	* telnet/Makefile.am (INCLUDES, LDADD): Likewise.
+	* src/Makefile.am (INCLUDES): Use $(iu_INCLUDES).
+	(LDADD): Use $(iu_LIBRARIES) and explicitly use static version of libicmp.
+	* ping/Makefile.am (ping_LDADD): Use $(iu_LIBRARIES) and
+	explicitly use static version of libicmp.
+	(INCLUDES, ping6_LDADD): Use $(iu_INCLUDES) and $(iu_LIBRARIES),
+	respectivley.
+
+	* libtelnet/Makefile.am (INCLUDES): Use $(iu_INCLUDES).
+	* libls/Makefile.am (INCLUDES): Likewise.
+	* libinetutils/Makefile.am (libinetutils_a_LIBADD): Variable removed.
+	(INCLUDES): Use $(iu_INCLUDES).
+
+2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
+
 	* configure.ac: Don't try to define ARG_UNUSED macro.
 
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
diff --git a/configure.ac b/configure.ac
index 29e87bf..5f9786b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,6 +734,12 @@ if test "$inetutils_cv_macro_fd_set_macros" = no; then
     FD_ZERO FD_CLR FD_SET FD_ISSET)
 fi
 
+dnl Set convinience variables for inetutils.
+iu_LIBRARIES='$(top_builddir)/libinetutils/libinetutils.a $(top_builddir)/lib/libgnu.a'
+iu_INCLUDES='-I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_srcdir)/libinetutils'
+AC_SUBST(iu_LIBRARIES)
+AC_SUBST(iu_INCLUDES)
+
 dnl Configure paths used by inetutils programs.  See the file `paths' for
 dnl details.
 PATHDEFS_MAKE=pathdefs.make
diff --git a/ftp/Makefile.am b/ftp/Makefile.am
index 7cb69f4..6b7c386 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -27,8 +27,7 @@ noinst_HEADERS = extern.h ftp_var.h
 
 @PATHDEFS_MAKE@
 
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
+INCLUDES = $(iu_INCLUDES)
 AM_CPPFLAGS = $(PATHDEF_TMP) $(PATHDEF_BSHELL)
 
-READLINE = $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY)
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a $(LIBGLOB) $(READLINE)
+LDADD = $(iu_LIBRARIES) $(LIBGLOB) $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY)
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index a613f42..7c49591 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -30,12 +30,11 @@ noinst_HEADERS = extern.h
 
 @PATHDEFS_MAKE@
 
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
+INCLUDES = $(iu_INCLUDES)
 AM_CPPFLAGS = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
            $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
            $(PATHDEF_DEVNULL)  $(PATHDEF_NOLOGIN) $(PATHDEF_BSHELL)
 
-LDADD = -L../libinetutils -linetutils $(LIBLS) ../lib/libgnu.a \
-          $(LIBCRYPT) $(LIBWRAP) $(LIBPAM)
+LDADD = $(iu_LIBRARIES) $(LIBLS) $(LIBCRYPT) $(LIBWRAP) $(LIBPAM)
 
 EXTRA_DIST = ftpcmd.c
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index f971fe0..8c0398c 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-SUBDIRS=system
+SUBDIRS = system
 
 bin_PROGRAMS = @ifconfig_BUILD@
 
@@ -28,6 +28,6 @@ ifconfig_SOURCES = ifconfig.c flags.c changeif.c options.c printif.c system.c if
 noinst_HEADERS = ifconfig.h if_index.h flags.h options.h printif.h system.h
 
 @PATHDEFS_MAKE@
-AM_CPPFLAGS=$(PATHDEF_PROCNET_DEV)
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
+AM_CPPFLAGS = $(PATHDEF_PROCNET_DEV)
+INCLUDES = $(iu_INCLUDES)
+LDADD = $(iu_LIBRARIES)
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 9e84994..929d1ad 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -40,10 +40,8 @@ libinetutils_a_SOURCES = \
  utmp_init.c\
  utmp_logout.c
 
-libinetutils_a_LIBADD = daemon.o $(top_builddir)/lib/libgnu.a
-
 @PATHDEFS_MAKE@
 
 AM_CPPFLAGS = $(PATHDEF_WTMPX) $(PATHDEF_TTY_PFX) $(PATHDEF_DEVNULL) $(PATHDEF_HEQUIV)
 
-INCLUDES = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib
+INCLUDES = $(iu_INCLUDES)
diff --git a/libls/Makefile.am b/libls/Makefile.am
index b90370c..02c9313 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -25,4 +25,4 @@ libls_a_SOURCES = cmp.c stat_flags.c ls.c print.c util.c fts.c
 
 noinst_HEADERS = extern.h ls.h fts.h
 
-INCLUDES=-I$(top_srcdir)/lib -I../lib
+INCLUDES = $(iu_INCLUDES)
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index f5381cd..00dae4c 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-INCLUDES = $(INCAUTH) -I$(top_srcdir)/lib -I../lib
+INCLUDES = $(iu_INCLUDES) $(INCAUTH)
 
 noinst_LIBRARIES = libtelnet.a
 
diff --git a/ping/Makefile.am b/ping/Makefile.am
index a062fac..414034b 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -21,10 +21,9 @@ bin_PROGRAMS = @ping_BUILD@ @ping6_BUILD@
 
 EXTRA_PROGRAMS = ping ping6
 
-ping_LDADD = -L../libinetutils -linetutils -L../libicmp -licmp ../lib/libgnu.a
-ping6_LDADD = ../lib/libgnu.a -L../libinetutils -linetutils
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libicmp \
-  -I$(top_srcdir)/libinetutils
+ping_LDADD = $(iu_LIBRARIES) $(top_builddir)/libicmp/libicmp.a
+ping6_LDADD = $(iu_LIBRARIES)
+INCLUDES = $(iu_INCLUDES) -I$(top_srcdir)/libicmp
 
 ping_SOURCES = ping.c ping_common.c ping_echo.c ping_address.c \
   ping_router.c ping_timestamp.c ping_common.h  ping_impl.h ping.h libping.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 23ab642..2e32b9e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,14 +85,9 @@ inetdaemon_PROGRAMS += @uucpd_BUILD@
 uucpd_SOURCES = uucpd.c
 EXTRA_PROGRAMS += uucpd
 
-INCLUDES = -I$(top_srcdir)/lib -I$(top_builddir)/lib \
-	-I$(top_srcdir)/libinetutils \
-	-I$(top_srcdir)/libicmp
-
-LDADD = -L$(top_builddir)/libicmp -licmp \
-	-L$(top_builddir)/libinetutils -linetutils \
-	-L$(top_builddir)/lib ../lib/libgnu.a \
-	$(LIBAUTH) $(LIBCRYPT) $(LIBUTIL)
+INCLUDES = $(iu_INCLUDES) -I$(top_srcdir)/libicmp
+
+LDADD = $(iu_LIBRARIES) $(top_builddir)/libicmp/libicmp.a $(LIBAUTH) $(LIBCRYPT) $(LIBUTIL)
 
 AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) $(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) $(PATHDEF_INETDPID) $(PATHDEF_KLOG) $(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_UTMP) $(PATHDEF_UUCICO)
 
diff --git a/talk/Makefile.am b/talk/Makefile.am
index e0f3cbc..b0b2087 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -25,6 +25,6 @@ talk_SOURCES = ctl.c ctl_transact.c display.c get_addrs.c get_names.c init_disp.
 
 noinst_HEADERS = talk.h talk_ctl.h
 
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils $(NCURSES_INCLUDE)
+INCLUDES = $(iu_INCLUDES) $(NCURSES_INCLUDE)
 
-LDADD = $(LIBCURSES) -L../libinetutils -linetutils ../lib/libgnu.a
+LDADD = $(iu_LIBRARIES) $(LIBCURSES)
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index e72c3d7..fa4f4c7 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -35,6 +35,5 @@ talkd_SOURCES = \
 @PATHDEFS_MAKE@
 
 AM_CPPFLAGS = $(PATHDEF_DEV)
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I${top_srcdir}/libinetutils
-
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
+INCLUDES = $(iu_INCLUDES)
+LDADD = $(iu_LIBRARIES)
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index 8209bd6..cb5bf6a 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -26,8 +26,7 @@ telnet_SOURCES = authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 
 noinst_HEADERS = defines.h externs.h general.h ring.h types.h
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-AM_CPPFLAGS=-DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
+INCLUDES = $(iu_INCLUDES)
+AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
 
-LDADD = -L../libinetutils -L../libtelnet -linetutils	\
-	-ltelnet ../lib/libgnu.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH)
+LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH)
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index bc1b000..1937870 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -28,11 +28,7 @@ noinst_HEADERS = telnetd.h
 
 @PATHDEFS_MAKE@
 
-AM_CPPFLAGS =  $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I../lib	\
-           -I$(top_srcdir)/libinetutils $(INCAUTH)
+AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
+INCLUDES = $(iu_INCLUDES) $(INCAUTH)
 
-LDADD = -L../libinetutils -linetutils \
-        -L../libtelnet -ltelnet \
-        ../lib/libgnu.a \
-	$(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
+LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a70193d..00cdd62 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,9 +17,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-AM_CPPFLAGS = -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib
+AM_CPPFLAGS = $(iu_INCLUDES)
 
-LDADD = -L../libinetutils -linetutils  ../lib/libgnu.a
+LDADD = $(iu_LIBRARIES)
 
 check_PROGRAMS = localhost
 if ENABLE_inetd
diff --git a/whois/Makefile.am b/whois/Makefile.am
index 819c683..7270be8 100644
--- a/whois/Makefile.am
+++ b/whois/Makefile.am
@@ -28,11 +28,10 @@ EXTRA_DIST = as_del_list ip_del_list tld_serv_list \
   as_del.h ip_del.h tld_serv.h
 
 noinst_HEADERS = data.h as_del.h ip_del.h tld_serv.h whois.h
-BUILT_SOURCES=as_del.h ip_del.h tld_serv.h
-
-INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils
-LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
+BUILT_SOURCES = as_del.h ip_del.h tld_serv.h
 
+INCLUDES = $(iu_INCLUDES)
+LDADD = $(iu_LIBRARIES)
 
 as_del.h: $(srcdir)/as_del_list $(srcdir)/make_as_del.pl
 	perl $(srcdir)/make_as_del.pl < $(srcdir)/as_del_list > as_del.h

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=05b1482b894b197602508ecfcd318d49cf272c42


commit 05b1482b894b197602508ecfcd318d49cf272c42
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 25 16:05:05 2011 +0200

    configure.ac: Don't try to define ARG_UNUSED macro.

diff --git a/ChangeLog b/ChangeLog
index c118892..904e9b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
 
+	* configure.ac: Don't try to define ARG_UNUSED macro.
+
+2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
+
 	* libicmp/icmp_address.c: Include <stddef.h>; reverts parts of
 	2011-10-15.
 
diff --git a/configure.ac b/configure.ac
index c818dfa..29e87bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -743,18 +743,6 @@ AH_BOTTOM(
 [/* Defaults for PATH_ variables.  */
 #include <confpaths.h>])
 
-dnl Define ARG_UNUSED macro
-dnl
-AH_BOTTOM([
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __attribute__(x)
-#endif
-
-#ifndef ARG_UNUSED
-# define ARG_UNUSED __attribute__ ((__unused__))
-#endif
-])
-
 dnl Ok this is the end of the rope, even autoconf can't help.
 dnl For example on certain system login(1) will not work if we
 dnl don't have an entry in utmpx.

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=5f4321535025d6ebb8c5ffcedc03ee0fb81599c3


commit 5f4321535025d6ebb8c5ffcedc03ee0fb81599c3
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Tue Oct 25 15:41:19 2011 +0200

    libicmp/icmp_address.c: Include <stddef.h>; reverts parts of 2011-10-15.

diff --git a/ChangeLog b/ChangeLog
index 91e55af..c118892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
+
+	* libicmp/icmp_address.c: Include <stddef.h>; reverts parts of
+	2011-10-15.
+
 2011-10-24  Alfred M. Szmidt  <ams@gnu.org>
 
 	* bootstrap.conf (buildreq): Lowered build requirement of autoconf
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index 9a9ebc3..9fce752 100644
--- a/libicmp/icmp_address.c
+++ b/libicmp/icmp_address.c
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include <stddef.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>

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


commit 1b143bf21d0f51c782513270777153bc5074f32e
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Mon Oct 24 19:49:37 2011 +0200

    Lowered build requirement of autoconf to 2.59.

diff --git a/ChangeLog b/ChangeLog
index e4a62f8..91e55af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-24  Alfred M. Szmidt  <ams@gnu.org>
+
+	* bootstrap.conf (buildreq): Lowered build requirement of autoconf
+	to 2.59.
+
 2011-10-23  Alfred M. Szmidt  <ams@gnu.org>
 
 	* README-alpha: Don't mention gettext and libtool as build
diff --git a/bootstrap.conf b/bootstrap.conf
index 91c2c20..8675fe8 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -19,7 +19,7 @@
 
 # Build prerequisites.
 buildreq="\
-autoconf   2.68
+autoconf   2.59
 automake   1.11
 bison      2.3
 m4         -

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

Summary of changes:
 ChangeLog                |   50 ++++++++++++++++++++++++++++++++++++++++++++++
 bootstrap.conf           |    2 +-
 configure.ac             |   24 +++++++++------------
 ftp/Makefile.am          |    5 +--
 ftpd/Makefile.am         |    5 +--
 ifconfig/Makefile.am     |    8 +++---
 libicmp/icmp_address.c   |    2 +
 libinetutils/Makefile.am |    4 +--
 libls/Makefile.am        |    2 +-
 libtelnet/Makefile.am    |    2 +-
 ping/Makefile.am         |    7 ++---
 src/Makefile.am          |   11 ++-------
 talk/Makefile.am         |    4 +-
 talkd/Makefile.am        |    5 +--
 telnet/Makefile.am       |    7 ++---
 telnetd/Makefile.am      |   10 ++------
 tests/Makefile.am        |    4 +-
 whois/Makefile.am        |    7 ++---
 18 files changed, 95 insertions(+), 64 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Oct 26 05:27:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RIzlk-0008I2-95
	for mharc-commit-inetutils@gnu.org; Wed, 26 Oct 2011 05:27:32 -0400
Received: from eggs.gnu.org ([140.186.70.92]:51715)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RIzlh-0008Hq-M7
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 05:27:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RIzlg-0006lr-GV
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 05:27:29 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52300)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RIzlg-0006lm-Cg
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 05:27:28 -0400
Received: from gscrivano by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gscrivano@gnu.org>) id 1RIzlf-00010c-I5
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 09:27:27 +0000
Date: Wed, 26 Oct 2011 09:27:27 +0000
Message-Id: <E1RIzlf-00010c-I5@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-133-gbbc7f34
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d920709ad12dd88e7996467c6e9fc1d34a1c6221
X-Git-Newrev: bbc7f34b6a2b8a9910d53c4122216073b677eafa
From: Giuseppe Scrivano <gscrivano@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 26 Oct 2011 09:27:31 -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  bbc7f34b6a2b8a9910d53c4122216073b677eafa (commit)
      from  d920709ad12dd88e7996467c6e9fc1d34a1c6221 (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=bbc7f34b6a2b8a9910d53c4122216073b677eafa


commit bbc7f34b6a2b8a9910d53c4122216073b677eafa
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Oct 26 11:27:22 2011 +0200

    libicmp/icmp_timeout.c: Include <stddef.h>.

diff --git a/ChangeLog b/ChangeLog
index 782a10c..6b1a008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-25  Giuseppe Scrivano <gscrivano@gnu.org>
+
+	* libicmp/icmp_timestamp.c: Include <stddef.h>; reverts parts of
+	2011-10-15.
+	Reported by: Alfred M. Szmidt  <ams@gnu.org>.
+
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
 
 	* configure.ac: Pass regexp to git-version-gen to get version tag.
diff --git a/libicmp/icmp_timestamp.c b/libicmp/icmp_timestamp.c
index 8c0020b..3e6305d 100644
--- a/libicmp/icmp_timestamp.c
+++ b/libicmp/icmp_timestamp.c
@@ -19,6 +19,8 @@
 
 #include <config.h>
 
+#include <stddef.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>

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

Summary of changes:
 ChangeLog                |    6 ++++++
 libicmp/icmp_timestamp.c |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Oct 26 07:18:32 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RJ1VA-0000h9-2f
	for mharc-commit-inetutils@gnu.org; Wed, 26 Oct 2011 07:18:32 -0400
Received: from eggs.gnu.org ([140.186.70.92]:53495)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJ1V6-0000gX-UA
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 07:18:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJ1V4-0002hw-Up
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 07:18:28 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42303)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJ1V4-0002hi-TA
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 07:18:26 -0400
Received: from gscrivano by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gscrivano@gnu.org>) id 1RJ1Ua-0001Z5-9E
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 11:18:10 +0000
Date: Wed, 26 Oct 2011 11:17:58 +0000
Message-Id: <E1RJ1Ua-0001Z5-9E@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-136-g0a7a83f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bbc7f34b6a2b8a9910d53c4122216073b677eafa
X-Git-Newrev: 0a7a83f5295621022b5b6691ae7d47c5b29ae463
From: Giuseppe Scrivano <gscrivano@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 26 Oct 2011 11:18:30 -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  0a7a83f5295621022b5b6691ae7d47c5b29ae463 (commit)
       via  ab911d3656ea6ca210c198c585c7a3a243ecdbf6 (commit)
       via  3e57e3a14f30d1cfa4ca7d7567d35d8f69b5a288 (commit)
      from  bbc7f34b6a2b8a9910d53c4122216073b677eafa (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=0a7a83f5295621022b5b6691ae7d47c5b29ae463


commit 0a7a83f5295621022b5b6691ae7d47c5b29ae463
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Oct 26 13:15:57 2011 +0200

    bootstrap.conf: Include module ioctl.

diff --git a/ChangeLog b/ChangeLog
index 0220a34..e5ad686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-10-26  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+	* bootstrap.conf: Include module ioctl.
+
 	* libicmp/icmp_address.c: Do not include <stddef.h>.  Revert change of 2011-10-25.
 
 	* ftpd/Makefile.am (LDADD): Put iu_LIBRARIES as last element of LDADD.
diff --git a/bootstrap.conf b/bootstrap.conf
index 8675fe8..0d1985e 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -64,6 +64,7 @@ git-version-gen
 glob
 gnupload
 inttostr
+ioctl
 maintainer-makefile
 malloc-gnu
 mempcpy

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


commit ab911d3656ea6ca210c198c585c7a3a243ecdbf6
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Oct 26 13:11:59 2011 +0200

    libicmp/icmp_address.c: Do not include <stddef.h>.  Revert change of 2011-10-25.

diff --git a/ChangeLog b/ChangeLog
index a1b3b20..0220a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-10-26  Giuseppe Scrivano  <gscrivano@gnu.org>
 
+	* libicmp/icmp_address.c: Do not include <stddef.h>.  Revert change of 2011-10-25.
+
 	* ftpd/Makefile.am (LDADD): Put iu_LIBRARIES as last element of LDADD.
 
 	* libicmp/icmp_timestamp.c: Include <stddef.h>; reverts parts of
diff --git a/libicmp/icmp_address.c b/libicmp/icmp_address.c
index 9fce752..9a9ebc3 100644
--- a/libicmp/icmp_address.c
+++ b/libicmp/icmp_address.c
@@ -19,8 +19,6 @@
 
 #include <config.h>
 
-#include <stddef.h>
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=3e57e3a14f30d1cfa4ca7d7567d35d8f69b5a288


commit 3e57e3a14f30d1cfa4ca7d7567d35d8f69b5a288
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed Oct 26 13:03:28 2011 +0200

    ftpd/Makefile.am (LDADD): Put iu_LIBRARIES as last element of LDADD

diff --git a/ChangeLog b/ChangeLog
index 6b1a008..a1b3b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-2011-10-25  Giuseppe Scrivano <gscrivano@gnu.org>
+2011-10-26  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+	* ftpd/Makefile.am (LDADD): Put iu_LIBRARIES as last element of LDADD.
 
 	* libicmp/icmp_timestamp.c: Include <stddef.h>; reverts parts of
 	2011-10-15.
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index 7c49591..b97d7f5 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -35,6 +35,6 @@ AM_CPPFLAGS = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
            $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
            $(PATHDEF_DEVNULL)  $(PATHDEF_NOLOGIN) $(PATHDEF_BSHELL)
 
-LDADD = $(iu_LIBRARIES) $(LIBLS) $(LIBCRYPT) $(LIBWRAP) $(LIBPAM)
+LDADD = $(LIBLS) $(LIBCRYPT) $(LIBWRAP) $(LIBPAM) $(iu_LIBRARIES)
 
 EXTRA_DIST = ftpcmd.c

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

Summary of changes:
 ChangeLog              |    8 +++++++-
 bootstrap.conf         |    1 +
 ftpd/Makefile.am       |    2 +-
 libicmp/icmp_address.c |    2 --
 4 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Oct 26 14:05:39 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RJ7r9-00022E-6C
	for mharc-commit-inetutils@gnu.org; Wed, 26 Oct 2011 14:05:39 -0400
Received: from eggs.gnu.org ([140.186.70.92]:44749)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RJ7r6-00021g-Qv
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 14:05:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ams@gnu.org>) id 1RJ7r5-0004AJ-Ch
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 14:05:36 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57927)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ams@gnu.org>)
	id 1RJ7r5-0004AC-BC
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 14:05:35 -0400
Received: from ams by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <ams@gnu.org>) id 1RJ7r2-0002My-DH
	for commit-inetutils@gnu.org; Wed, 26 Oct 2011 18:05:33 +0000
Date: Wed, 26 Oct 2011 18:05:32 +0000
Message-Id: <E1RJ7r2-0002My-DH@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-137-ge65b393
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0a7a83f5295621022b5b6691ae7d47c5b29ae463
X-Git-Newrev: e65b39335ce1ac05e9acf57600116d7bb54f143e
From: "Alfred M. Szmidt" <ams@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 26 Oct 2011 18:05:37 -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  e65b39335ce1ac05e9acf57600116d7bb54f143e (commit)
      from  0a7a83f5295621022b5b6691ae7d47c5b29ae463 (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=e65b39335ce1ac05e9acf57600116d7bb54f143e


commit e65b39335ce1ac05e9acf57600116d7bb54f143e
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Wed Oct 26 20:05:25 2011 +0200

    Minor cleanup in ChangeLog.  (silent change)

diff --git a/ChangeLog b/ChangeLog
index e5ad686..5b4279d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,14 @@
 2011-10-26  Giuseppe Scrivano  <gscrivano@gnu.org>
 
-	* bootstrap.conf: Include module ioctl.
+	* bootstrap.conf (gnulib_modules): Add ioctl to list.
 
-	* libicmp/icmp_address.c: Do not include <stddef.h>.  Revert change of 2011-10-25.
-
-	* ftpd/Makefile.am (LDADD): Put iu_LIBRARIES as last element of LDADD.
+	* ftpd/Makefile.am (LDADD): Put iu_LIBRARIES as last element of
+	LDADD.
 
 	* libicmp/icmp_timestamp.c: Include <stddef.h>; reverts parts of
 	2011-10-15.
-	Reported by: Alfred M. Szmidt  <ams@gnu.org>.
+	* libicmp/icmp_address.c: Do not include <stddef.h>.  Revert
+	change of 2011-10-25.
 
 2011-10-25  Alfred M. Szmidt  <ams@gnu.org>
 

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

Summary of changes:
 ChangeLog |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Oct 27 04:30:27 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RJLM3-0001ue-7g
	for mharc-commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:30:27 -0400
Received: from eggs.gnu.org ([140.186.70.92]:32944)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJLM0-0001u3-IE
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:30:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJLLw-0002nn-3R
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:30:24 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:45877)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJLLw-0002nj-06
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:30:20 -0400
Received: from gscrivano by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gscrivano@gnu.org>) id 1RJLLq-0001IB-Mz
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 08:30:17 +0000
Date: Thu, 27 Oct 2011 08:30:15 +0000
Message-Id: <E1RJLLq-0001IB-Mz@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-138-g8160647
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e65b39335ce1ac05e9acf57600116d7bb54f143e
X-Git-Newrev: 81606478bd8b51e9d4daaaa06a21dc7996abadee
From: Giuseppe Scrivano <gscrivano@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 27 Oct 2011 08:30:25 -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  81606478bd8b51e9d4daaaa06a21dc7996abadee (commit)
      from  e65b39335ce1ac05e9acf57600116d7bb54f143e (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=81606478bd8b51e9d4daaaa06a21dc7996abadee


commit 81606478bd8b51e9d4daaaa06a21dc7996abadee
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu Oct 27 10:28:37 2011 +0200

    telnetd/Makefile.am (INCLUDES): Add -I$(top_srcdir)/libtelnet.

diff --git a/ChangeLog b/ChangeLog
index 5b4279d..1b087d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-27  Alfred M. Szmidt  <ams@gnu.org>
+
+	* telnetd/Makefile.am (INCLUDES): Add -I$(top_srcdir)/libtelnet to list.
+
 2011-10-26  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* bootstrap.conf (gnulib_modules): Add ioctl to list.
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 1937870..76825a1 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -29,6 +29,6 @@ noinst_HEADERS = telnetd.h
 @PATHDEFS_MAKE@
 
 AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
-INCLUDES = $(iu_INCLUDES) $(INCAUTH)
+INCLUDES = $(iu_INCLUDES) $(INCAUTH) -I$(top_srcdir)/libtelnet
 
 LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)

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

Summary of changes:
 ChangeLog           |    4 ++++
 telnetd/Makefile.am |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Thu Oct 27 04:36:05 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RJLRV-0002hD-V1
	for mharc-commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:36:05 -0400
Received: from eggs.gnu.org ([140.186.70.92]:46746)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJLRS-0002gn-Sv
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:36:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJLRR-00041L-IB
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:36:02 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44040)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1RJLRR-00041G-FC
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 04:36:01 -0400
Received: from gscrivano by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gscrivano@gnu.org>) id 1RJLRR-00025v-0j
	for commit-inetutils@gnu.org; Thu, 27 Oct 2011 08:36:01 +0000
Date: Thu, 27 Oct 2011 08:36:01 +0000
Message-Id: <E1RJLRR-00025v-0j@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-139-g290a699
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 81606478bd8b51e9d4daaaa06a21dc7996abadee
X-Git-Newrev: 290a699d8c3780ca9a9907eeca3036c87cde282c
From: Giuseppe Scrivano <gscrivano@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 27 Oct 2011 08:36: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  290a699d8c3780ca9a9907eeca3036c87cde282c (commit)
      from  81606478bd8b51e9d4daaaa06a21dc7996abadee (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=290a699d8c3780ca9a9907eeca3036c87cde282c


commit 290a699d8c3780ca9a9907eeca3036c87cde282c
Author: Alfred M. Szmidt <ams@gnu.org>
Date:   Thu Oct 27 10:34:55 2011 +0200

    Fixed typo. (silent change)

diff --git a/ChangeLog b/ChangeLog
index 1b087d6..fa7e87b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2011-10-27  Alfred M. Szmidt  <ams@gnu.org>
 
-	* telnetd/Makefile.am (INCLUDES): Add -I$(top_srcdir)/libtelnet to list.
+	* telnetd/Makefile.am (INCLUDES): Add -I$(top_srcdir) to list.
 
 2011-10-26  Giuseppe Scrivano  <gscrivano@gnu.org>
 
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 76825a1..71cb7b1 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -29,6 +29,6 @@ noinst_HEADERS = telnetd.h
 @PATHDEFS_MAKE@
 
 AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN)
-INCLUDES = $(iu_INCLUDES) $(INCAUTH) -I$(top_srcdir)/libtelnet
+INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH)
 
 LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)

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

Summary of changes:
 ChangeLog           |    2 +-
 telnetd/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Oct 28 04:56:44 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RJiF2-0002xh-I8
	for mharc-commit-inetutils@gnu.org; Fri, 28 Oct 2011 04:56:44 -0400
Received: from eggs.gnu.org ([140.186.70.92]:54625)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RJiEz-0002x0-Eo
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 04:56:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RJiEx-0003Qn-MR
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 04:56:41 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51417)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RJiEx-0003Qj-EK
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 04:56:39 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RJiEw-0003qe-UH
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 08:56:39 +0000
Date: Fri, 28 Oct 2011 08:56:38 +0000
Message-Id: <E1RJiEw-0003qe-UH@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-141-geb560b5
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 290a699d8c3780ca9a9907eeca3036c87cde282c
X-Git-Newrev: eb560b5bcb985f24bb99de4e3fa6fd618cff2eaf
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 28 Oct 2011 08:56:42 -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  eb560b5bcb985f24bb99de4e3fa6fd618cff2eaf (commit)
       via  e19d48d6a01fd8ee57a9aefbbfacbd90813fdeef (commit)
      from  290a699d8c3780ca9a9907eeca3036c87cde282c (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=eb560b5bcb985f24bb99de4e3fa6fd618cff2eaf


commit eb560b5bcb985f24bb99de4e3fa6fd618cff2eaf
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Oct 27 23:59:13 2011 +0200

    tftpd: Use sendto() instead of send().

diff --git a/ChangeLog b/ChangeLog
index 9132370..ea339fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-10-27  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* src/tftpd.c (main) [HAVE_STRUCT_SOCKADDR_SA_LEN]: Assign
+	value to `sin.ss_len'.
+	(main): Do not use connect() on the socket.
+	(send_file, recvfile, nak): Replace send() by sendto().
+
+2011-10-27  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* configure.ac (HAVE_STRUCT_TFTPHDR_TH_U): Detect whether
 	`struct tftphdr' contains a member `th_u'.
 	* src/tftp.c (makerequest, tpacket) [HAVE_STRUCT_TFTPHDR_TH_U]:
diff --git a/src/tftpd.c b/src/tftpd.c
index 2777919..44cb333 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -288,16 +288,15 @@ main (int argc, char *argv[])
     }
   memset (&sin, 0, sizeof (sin));
   sin.ss_family = from.ss_family;
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
+  sin.ss_len = from.ss_len;
+#endif
   if (bind (peer, (struct sockaddr *) &sin, fromlen) < 0)
     {
       syslog (LOG_ERR, "bind: %m\n");
       exit (EXIT_FAILURE);
     }
-  if (connect (peer, (struct sockaddr *) &from, fromlen) < 0)
-    {
-      syslog (LOG_ERR, "connect: %m\n");
-      exit (EXIT_FAILURE);
-    }
+
   tp = (struct tftphdr *) buf;
   tp->th_opcode = ntohs (tp->th_opcode);
   if (tp->th_opcode == RRQ || tp->th_opcode == WRQ)
@@ -564,7 +563,8 @@ send_file (struct formats *pf)
       sigsetjmp (timeoutbuf, SIGALRM);
 
     send_data:
-      if (send (peer, (const char *) dp, size + 4, 0) != size + 4)
+      if (sendto (peer, (const char *) dp, size + 4, 0,
+		 (struct sockaddr *) &from, fromlen) != size + 4)
 	{
 	  syslog (LOG_ERR, "tftpd: write: %m\n");
 	  goto abort;
@@ -634,7 +634,7 @@ recvfile (struct formats *pf)
       block++;
       sigsetjmp (timeoutbuf, SIGALRM);
     send_ack:
-      if (send (peer, ackbuf, 4, 0) != 4)
+      if (sendto (peer, ackbuf, 4, 0, (struct sockaddr *) &from, fromlen) != 4)
 	{
 	  syslog (LOG_ERR, "tftpd: write: %m\n");
 	  goto abort;
@@ -683,7 +683,7 @@ recvfile (struct formats *pf)
 
   ap->th_opcode = htons ((u_short) ACK);	/* send the "final" ack */
   ap->th_block = htons ((u_short) (block));
-  send (peer, ackbuf, 4, 0);
+  sendto (peer, ackbuf, 4, 0, (struct sockaddr *) &from, fromlen);
 
   signal (SIGALRM, justquit);	/* just quit on timeout */
   alarm (rexmtval);
@@ -693,7 +693,7 @@ recvfile (struct formats *pf)
       dp->th_opcode == DATA &&	/* and got a data block */
       block == dp->th_block)
     {				/* then my last ack was lost */
-      send (peer, ackbuf, 4, 0);	/* resend final ack */
+      sendto (peer, ackbuf, 4, 0, (struct sockaddr *) &from, fromlen);	/* resend final ack */
     }
 abort:
   return;
@@ -758,7 +758,7 @@ nak (int error)
   length = strlen (pe->e_msg);
   tp->th_msg[length] = '\0';
   length += 5;
-  if (send (peer, buf, length, 0) != length)
+  if (sendto (peer, buf, length, 0, (struct sockaddr *) &from, fromlen) != length)
     syslog (LOG_ERR, "nak: %m\n");
 }
 

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


commit e19d48d6a01fd8ee57a9aefbbfacbd90813fdeef
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Oct 27 16:18:04 2011 +0200

    tftp,tftpd: `struct tftphdr' depends on OS.

diff --git a/ChangeLog b/ChangeLog
index fa7e87b..9132370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-27  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* configure.ac (HAVE_STRUCT_TFTPHDR_TH_U): Detect whether
+	`struct tftphdr' contains a member `th_u'.
+	* src/tftp.c (makerequest, tpacket) [HAVE_STRUCT_TFTPHDR_TH_U]:
+	Use pointer variable `tp->th_stuff', or generate a correct pointer.
+	* src/tftpd.c (tftp) [HAVE_STRUCT_TFTPHDR_TH_U]: Likewise.
+
 2011-10-27  Alfred M. Szmidt  <ams@gnu.org>
 
 	* telnetd/Makefile.am (INCLUDES): Add -I$(top_srcdir) to list.
diff --git a/configure.ac b/configure.ac
index 13d0aba..06c6a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,6 +548,14 @@ IU_CHECK_MEMBERS([struct hostent.h_addr_list], , , [#include <netdb.h>])
 
 IU_CHECK_MEMBERS([struct stat.st_blksize])
 
+dnl OpenSolaris does not use a union for `struct tftphdr.th_u'.
+dnl As a consequence `struct tftphdr.th_stuff' is a macro
+dnl resolving to a `ushort_t'. BSD and Linux produce `char *'.
+IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
+		 [#include <sys/types.h>
+		  #include <sys/socket.h>
+		  #include <arpa/tftp.h>])
+
 ### Checks for compiler characteristics.
 AM_C_PROTOTYPES dnl FIXME: Does inetutils even compile on pre-ANSI compilers?
 AC_C_CONST
diff --git a/src/tftp.c b/src/tftp.c
index 9330cbd..46eb7eb 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -1071,7 +1071,11 @@ makerequest (int request, const char *name, struct tftphdr *tp,
   register char *cp;
 
   tp->th_opcode = htons ((u_short) request);
+#if HAVE_STRUCT_TFTPHDR_TH_U
   cp = tp->th_stuff;
+#else
+  cp = (char *) &(tp->th_stuff);
+#endif
   strcpy (cp, name);
   cp += strlen (name);
   *cp++ = '\0';
@@ -1148,7 +1152,11 @@ tpacket (const char *s, struct tftphdr *tp, int n)
     case RRQ:
     case WRQ:
       n -= 2;
+#if HAVE_STRUCT_TFTPHDR_TH_U
       file = cp = tp->th_stuff;
+#else
+      file = cp = (char *) &(tp->th_stuff);
+#endif
       cp = strchr (cp, '\0');
       printf ("<file=%s, mode=%s>\n", file, cp + 1);
       break;
diff --git a/src/tftpd.c b/src/tftpd.c
index ea4122e..2777919 100644
--- a/src/tftpd.c
+++ b/src/tftpd.c
@@ -335,7 +335,11 @@ tftp (struct tftphdr *tp, int size)
   register struct formats *pf;
   char *filename, *mode;
 
+#if HAVE_STRUCT_TFTPHDR_TH_U
   filename = cp = tp->th_stuff;
+#else
+  filename = cp = (char *) &(tp->th_stuff);
+#endif
 again:
   while (cp < buf + size)
     {

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

Summary of changes:
 ChangeLog    |   15 +++++++++++++++
 configure.ac |    8 ++++++++
 src/tftp.c   |    8 ++++++++
 src/tftpd.c  |   24 ++++++++++++++----------
 4 files changed, 45 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Oct 28 07:14:10 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RJkO2-0007nA-8O
	for mharc-commit-inetutils@gnu.org; Fri, 28 Oct 2011 07:14:10 -0400
Received: from eggs.gnu.org ([140.186.70.92]:54420)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RJkNz-0007n4-GO
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 07:14:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RJkNx-0004Wf-Sq
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 07:14:07 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44034)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RJkNx-0004WY-RL
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 07:14:05 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RJkMG-0007dK-PL
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 11:12:32 +0000
Date: Fri, 28 Oct 2011 11:12:26 +0000
Message-Id: <E1RJkMG-0007dK-PL@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-142-gc4457e9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: eb560b5bcb985f24bb99de4e3fa6fd618cff2eaf
X-Git-Newrev: c4457e97b26331534fe83c35768f92f98403c24a
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 28 Oct 2011 11:14: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  c4457e97b26331534fe83c35768f92f98403c24a (commit)
      from  eb560b5bcb985f24bb99de4e3fa6fd618cff2eaf (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=c4457e97b26331534fe83c35768f92f98403c24a


commit c4457e97b26331534fe83c35768f92f98403c24a
Author: Simon Josefsson <simon@josefsson.org>
Date:   Fri Oct 28 13:01:08 2011 +0200

    cfg.mk: Add variable, gnulib now needs this for syntax-check.

diff --git a/ChangeLog b/ChangeLog
index ea339fc..6a3809d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-28  Simon Josefsson  <simon@josefsson.org>
+
+	* cfg.mk (_build-aux): Add variable, gnulib now needs this for
+	syntax-check.
+
 2011-10-27  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/tftpd.c (main) [HAVE_STRUCT_SOCKADDR_SA_LEN]: Assign
diff --git a/cfg.mk b/cfg.mk
index c33c6ec..4833ba4 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -20,6 +20,8 @@ news-check-regexp = '^Version $(VERSION_REGEXP):'
 
 _makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
 
+_build-aux = build-aux
+
 local-checks-to-skip = \
 	sc_error_message_period \
 	sc_error_message_uppercase \

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

Summary of changes:
 ChangeLog |    5 +++++
 cfg.mk    |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri Oct 28 19:38:25 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RJw0H-0001JF-5a
	for mharc-commit-inetutils@gnu.org; Fri, 28 Oct 2011 19:38:25 -0400
Received: from eggs.gnu.org ([140.186.70.92]:41366)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RJw0D-0001Iw-Jc
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 19:38:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RJw0C-00021K-6p
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 19:38:21 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38286)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RJw0C-00021E-5Q
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 19:38:20 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RJw0A-000263-Tw
	for commit-inetutils@gnu.org; Fri, 28 Oct 2011 23:38:19 +0000
Date: Fri, 28 Oct 2011 23:38:19 +0000
Message-Id: <E1RJw0A-000263-Tw@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-143-gf526fef
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c4457e97b26331534fe83c35768f92f98403c24a
X-Git-Newrev: f526fef2535fabc21da4377716dd8805cad9476a
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 28 Oct 2011 23:38: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  f526fef2535fabc21da4377716dd8805cad9476a (commit)
      from  c4457e97b26331534fe83c35768f92f98403c24a (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=f526fef2535fabc21da4377716dd8805cad9476a


commit f526fef2535fabc21da4377716dd8805cad9476a
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Oct 29 01:35:58 2011 +0200

    tftp: Set default port for non-connected transfers.

diff --git a/ChangeLog b/ChangeLog
index 6a3809d..84e372f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-29  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/tftp.c (main): New variable SP. Set default value for PORT.
+
 2011-10-28  Simon Josefsson  <simon@josefsson.org>
 
 	* cfg.mk (_build-aux): Add variable, gnulib now needs this for
diff --git a/src/tftp.c b/src/tftp.c
index 46eb7eb..89b6b4b 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -225,11 +225,19 @@ int
 main (int argc, char *argv[])
 {
   struct sockaddr_in sin;
+  struct servent *sp;
 
   set_program_name (argv[0]);
   iu_argp_init ("tftp", default_program_authors);
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
+  /* Initiate a default port.  */
+  sp = getservbyname ("tftp", "udp");
+  if (sp == 0)
+    port = htons (69);
+  else
+    port = sp->s_port;
+
   f = socket (AF_INET, SOCK_DGRAM, 0);
   if (f < 0)
     {

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

Summary of changes:
 ChangeLog  |    4 ++++
 src/tftp.c |    8 ++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat Oct 29 12:22:02 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RKBfW-0001L1-9I
	for mharc-commit-inetutils@gnu.org; Sat, 29 Oct 2011 12:22:02 -0400
Received: from eggs.gnu.org ([140.186.70.92]:47152)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RKBfS-0001KP-JK
	for commit-inetutils@gnu.org; Sat, 29 Oct 2011 12:22:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RKBfO-0000xH-ML
	for commit-inetutils@gnu.org; Sat, 29 Oct 2011 12:21:58 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57929)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1RKBfO-0000xD-J8
	for commit-inetutils@gnu.org; Sat, 29 Oct 2011 12:21:54 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <gnu@gisladisker.se>) id 1RKBfN-0007XA-Id
	for commit-inetutils@gnu.org; Sat, 29 Oct 2011 16:21:54 +0000
Date: Sat, 29 Oct 2011 16:21:53 +0000
Message-Id: <E1RKBfN-0007XA-Id@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-144-g2aa8b85
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f526fef2535fabc21da4377716dd8805cad9476a
X-Git-Newrev: 2aa8b851fbba6a129b1db29cc0e46345c8a9d367
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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, 29 Oct 2011 16:22:00 -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  2aa8b851fbba6a129b1db29cc0e46345c8a9d367 (commit)
      from  f526fef2535fabc21da4377716dd8805cad9476a (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=2aa8b851fbba6a129b1db29cc0e46345c8a9d367


commit 2aa8b851fbba6a129b1db29cc0e46345c8a9d367
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sat Oct 29 18:05:57 2011 +0200

    tftp: Full IPv6 support.

diff --git a/ChangeLog b/ChangeLog
index 84e372f..f099f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2011-10-29  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* src/tftp.c (peeraddr): Change to `struct sockaddr_storage'.
+	(peerlen): New variable.
+	(port): Changed to use host byte order.
+	(get_port, set_port): New functions.
+	(main): Remove SIN. Do not initiate F as a socket.
+	(resolve_name): New signature `int r_n (char *)'.
+	Remove unused return state RESOLVE_NOT_RESOLVED.  Replace use
+	of gethostbyname() by code based on getaddrinfo().
+	(setpeer): Simplifications brought in by resolve_name() and PORT.
+	(put): Handle square bracket escaping of host address.
+	Use new function set_port().
+	(get): Likewise.
+	(send_file): Change FROM to be `struct sockaddr_storage'.
+	Use PEERLEN in sendto().  Use set_port() and get_port().
+	(recvfile): Likewise.
+	(nak): Use PEERLEN in sendto().
+	* doc/inetutils.texi (tftp): Mention escaping of IPv6 addresses.
+
+2011-10-29  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* src/tftp.c (main): New variable SP. Set default value for PORT.
 
 2011-10-28  Simon Josefsson  <simon@josefsson.org>
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 5ca97c7..ea2df5f 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -1543,12 +1543,19 @@ host can be specified as part of the get or put commands.
 @item get @var{file-name}
 @itemx get @var{remotename} @var{localname}
 @itemx get @var{file}@dots{}
-Get a file or set of files from the specified sources.  Source can be
-in one of two forms: a filename on the remote host, if the host has
-already been specified, or a string of the form @samp{hosts:filename}
-to specify both a host and filename at the same time.  If the latter
+Get a file, or a set of files, from the specified sources.  The source can
+be in one of two forms: a file name on the remote host, if the host has
+already been specified, or a string of the form @samp{host:filename}
+to specify both a host and file name at the same time.  If the latter
 form is used, the last hostname specified becomes the default for
-future transfers.
+future transfers.  When specifying a numeric IPv6 address as host
+part, then this address must be enclosed between square brackets,
+since it contains colons and would interfere with the delimiter
+before the file name.  Brackets are optional for IPv4 addresses.
+
+@example
+tftp> get [2001:1234::12]:issue
+@end example
 
 @item mode @var{transfer-mode}
 Set the mode for transfers; @var{transfer-mode} may be one of
@@ -1560,10 +1567,12 @@ Set the mode for transfers; @var{transfer-mode} may be one of
 Put a file or set of files to the specified remote file or directory.
 The destination can be in one of two forms: a filename on the remote
 host, if the host has already been specified, or a string of the form
-@samp{hosts:filename} to specify both a host and filename at the same
+@samp{host:filename} to specify both a host and filename at the same
 time.  If the latter form is used, the hostname specified becomes the
 default for future transfers.  If the @file{remote-directory} form is
-used, the remote host is assumed to be a UNIX machine.
+used, the remote host is assumed to be a UNIX machine.  The same use
+of square brackets for enclosing numeric IPv6 addresses applies here,
+as was mentioned for the command @command{get}.
 
 @item quit
 Exit @command{tftp}.  An end of file also exits.
diff --git a/src/tftp.c b/src/tftp.c
index 89b6b4b..d852b56 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -102,9 +102,10 @@ static void tpacket (const char *, struct tftphdr *, int);
 static int rexmtval = TIMEOUT;
 static int maxtimeout = 5 * TIMEOUT;
 
-static struct sockaddr_in peeraddr;	/* filled in by main */
-static int f;			/* the opened socket */
-static int port; /* Port number in network byte order of the server. */
+static struct sockaddr_storage peeraddr;	/* filled in by main */
+static socklen_t peerlen;
+static int f = -1;				/* the opened socket */
+static int port; /* Port number in host byte order of the server. */
 static int trace;
 static int verbose;
 static int connected;
@@ -137,6 +138,8 @@ static void getusage (char *);
 static void makeargv (void);
 static void putusage (char *);
 static void settftpmode (char *);
+static in_port_t get_port (struct sockaddr_storage *);
+static void set_port (struct sockaddr_storage *, in_port_t);
 
 #define HELPINDENT (sizeof("connect"))
 
@@ -193,6 +196,36 @@ static struct argp_option argp_options[] = {
 char *hostport_argv[3] = { "connect" };
 int hostport_argc = 1;
 
+static in_port_t
+get_port (struct sockaddr_storage *ss)
+{
+  switch (ss->ss_family)
+    {
+    case AF_INET6:
+      return ntohs (((struct sockaddr_in6 *) ss)->sin6_port);
+      break;
+    case AF_INET:
+    default:
+      return ntohs (((struct sockaddr_in *) ss)->sin_port);
+      break;
+    }
+}
+
+static void
+set_port (struct sockaddr_storage *ss, in_port_t port)
+{
+  switch (ss->ss_family)
+    {
+    case AF_INET6:
+      ((struct sockaddr_in6 *) ss)->sin6_port = htons(port);
+      break;
+    case AF_INET:
+    default:
+      ((struct sockaddr_in *) ss)->sin_port = htons(port);
+      break;
+    }
+}
+
 void recvfile (int, char *, char *);
 void send_file (int, char *, char *);
 
@@ -224,7 +257,6 @@ static struct argp argp = {argp_options, parse_opt, args_doc, doc};
 int
 main (int argc, char *argv[])
 {
-  struct sockaddr_in sin;
   struct servent *sp;
 
   set_program_name (argv[0]);
@@ -234,23 +266,10 @@ main (int argc, char *argv[])
   /* Initiate a default port.  */
   sp = getservbyname ("tftp", "udp");
   if (sp == 0)
-    port = htons (69);
+    port = 69;
   else
-    port = sp->s_port;
+    port = ntohs (sp->s_port);
 
-  f = socket (AF_INET, SOCK_DGRAM, 0);
-  if (f < 0)
-    {
-      perror ("tftp: socket");
-      exit (EXIT_FAILURE);
-    }
-  memset (&sin, 0, sizeof (sin));
-  sin.sin_family = AF_INET;
-  if (bind (f, (struct sockaddr *) &sin, sizeof (sin)) < 0)
-    {
-      perror ("tftp: bind");
-      exit (EXIT_FAILURE);
-    }
   strcpy (mode, "netascii");
   signal (SIGINT, intr);
   if (hostport_argc > 1)
@@ -268,36 +287,72 @@ char *hostname;
 
 #define RESOLVE_OK            0
 #define RESOLVE_FAIL         -1
-#define RESOLVE_NOT_RESOLVED  1
 
 /* Resolve NAME. Fill in peeraddr, hostname and set connected on success.
    Return value: RESOLVE_OK success
                  RESOLVE_FAIL error
-		 RESOLVE_NOT_RESOLVED name is not resolved and ALLOW_NULL
-		 is true */
+ */
 static int
-resolve_name (char *name, int allow_null)
+resolve_name (char *name)
 {
-  struct hostent *hp = gethostbyname (name);
-  if (hp == NULL)
+  int err;
+  struct sockaddr_storage ss;
+  struct addrinfo hints, *ai, *aiptr;
+
+  memset (&hints, 0, sizeof (hints));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_DGRAM;
+  hints.ai_flags = AI_CANONNAME;
+#ifdef AI_ADDRCONFIG
+  hints.ai_flags += AI_ADDRCONFIG;
+#endif
+
+  err = getaddrinfo (name, "tftp", &hints, &aiptr);
+  if (err)
     {
-      if (allow_null)
-	return RESOLVE_NOT_RESOLVED;
-      fprintf (stderr, "tftp: %s: ", name);
-      herror ((char *) NULL);
+      fprintf (stderr, "tftp: %s: %s\n", name, gai_strerror (err));
       return RESOLVE_FAIL;
     }
-  else if (hp->h_length != sizeof peeraddr.sin_addr)
+
+  if (f >= 0)
     {
-      fprintf (stderr, "tftp: resolving %s returns unexpected length", name);
-      return RESOLVE_FAIL;
+      close (f);
+      f = -1;
     }
-  memcpy (&peeraddr.sin_addr, hp->h_addr, hp->h_length);
-  peeraddr.sin_family = hp->h_addrtype;
-  connected = 1;
-  free (hostname);
-  hostname = xstrdup (hp->h_name);
-  return RESOLVE_OK;
+
+  for (ai = aiptr; ai; ai = ai->ai_next)
+    {
+      f = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+      if (f < 0)
+	continue;
+
+      memset (&ss, 0, sizeof (ss));
+      ss.ss_family = ai->ai_family;
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
+      ss.ss_len = ai->ai_addrlen;
+#endif
+      if (bind (f, (struct sockaddr *) &ss, ai->ai_addrlen))
+        {
+	  close (f);
+	  f = -1;
+	  continue;
+	}
+
+      /* Successfully resolved hostname. */
+      peerlen = ai->ai_addrlen;
+      memcpy (&peeraddr, ai->ai_addr, ai->ai_addrlen);
+      connected = 1;
+      free (hostname);
+      hostname = xstrdup (ai->ai_canonname);
+      break;
+    }
+
+  freeaddrinfo (aiptr);
+
+  if (ai == NULL)
+    return RESOLVE_FAIL;
+  else
+    return RESOLVE_OK;
 }
 
 /* Prompt for more arguments from the user with PROMPT, putting the results
@@ -331,37 +386,25 @@ setpeer (int argc, char *argv[])
       return;
     }
 
-  switch (resolve_name (argv[1], 1))
+  switch (resolve_name (argv[1]))
     {
     case RESOLVE_OK:
       break;
 
     case RESOLVE_FAIL:
       return;
-
-    case RESOLVE_NOT_RESOLVED:
-      peeraddr.sin_family = AF_INET;
-      peeraddr.sin_addr.s_addr = inet_addr (argv[1]);
-      if (peeraddr.sin_addr.s_addr == -1)
-	{
-	  connected = 0;
-	  printf ("%s: unknown host\n", argv[1]);
-	  return;
-	}
-      hostname = xstrdup (argv[1]);
     }
 
   if (argc == 3)
     {
       /* Take a user-specified port number.  */
       port = atoi (argv[2]);
-      if (port < 0)
+      if (port <= 0)
 	{
 	  printf ("%s: bad port number\n", argv[2]);
 	  connected = 0;
 	  return;
 	}
-      port = htons (port);
     }
   else
     {
@@ -370,7 +413,7 @@ setpeer (int argc, char *argv[])
       sp = getservbyname ("tftp", "udp");
       if (sp == 0)
 	error (EXIT_FAILURE, 0, "udp/tftp: unknown service\n");
-      port = sp->s_port;
+      port = ntohs (sp->s_port);
     }
   connected = 1;
 }
@@ -476,9 +519,38 @@ put (int argc, char *argv[])
 	    return;
 	  }
       cp = argv[argc - 1];
-      targ = strchr (cp, ':');
-      *targ++ = 0;
-      if (resolve_name (cp, 0) != RESOLVE_OK)
+      /* Is host string escaped using square brackets?  */
+      if (cp[0] == '[')
+	{ /* Locate far end.  */
+	  cp = strchr (cp, ']');
+	  if (cp == NULL)
+	    return;	/* Unpaired bracket.  Fail!  */
+
+	  /* Erase far end and capture valid host string.  */
+	  *cp = 0;
+	  targ = cp + 1;	/* Position beyond bracket.  */
+	  cp = argv[argc - 1] + 1;
+	  /* Verify presence of a colon. Else backup
+	   * in order to accept a strange file name.  */
+	  if (targ[0] == ':')
+	    ++targ;
+	  else
+	    {
+	      targ = argv[argc - 1];
+	      cp = NULL;	/* Invalidate host name string.  */
+	    }
+	}
+      else
+	{
+	  targ = strchr (cp, ':');
+	  *targ++ = 0;
+	  /* Test whether host string lacks content.
+	   * Then the host string will be ignored.  */
+	  if (strlen (cp) == 0)
+	    cp = NULL;	/* Invalidate host name string.  */
+	}
+      /* If a remote host was stated, resolve it!  */
+      if (cp != NULL && resolve_name (cp) != RESOLVE_OK)
 	return;
     }
   if (!connected)
@@ -498,7 +570,7 @@ put (int argc, char *argv[])
 	}
       if (verbose)
 	printf ("putting %s to %s:%s [%s]\n", cp, hostname, targ, mode);
-      peeraddr.sin_port = port;
+      set_port (&peeraddr, port);
       send_file (fd, targ, mode);
       return;
     }
@@ -518,7 +590,7 @@ put (int argc, char *argv[])
 	}
       if (verbose)
 	printf ("putting %s to %s:%s [%s]\n", argv[n], hostname, targ, mode);
-      peeraddr.sin_port = port;
+      set_port (&peeraddr, port);
       send_file (fd, targ, mode);
     }
 }
@@ -563,10 +635,34 @@ get (int argc, char *argv[])
       src = strchr (argv[n], ':');
       if (src == NULL)
 	src = argv[n];
-      else
+      else if (src == argv[n])
 	{
-	  *src++ = 0;
-	  if (resolve_name (argv[n], 0) != RESOLVE_OK)
+	  /* Degenerate case: silently drop initial colon.
+	   * No usable host name.  */
+	  ++src;
+	}
+      else
+	{ /* Parse the host name string; remove square brackets.  */
+	  cp = argv[n];
+
+	  if (cp[0] == '[')
+	    {
+	      cp = strchr (argv[n], ']');
+	      if (cp)
+		{
+		  /* Calculate host string and sorce file name.  */
+		  src = cp + 1;
+		  *cp = 0;
+		  if (*src == ':')
+		    ++src;
+		  cp = argv[n] + 1;
+		}
+	    }
+	  else
+	    { /* No escaping; break string at first colon.  */
+	      *src++ = 0;
+	    }
+	  if (cp != NULL && resolve_name (cp) != RESOLVE_OK)
 	    continue;
 	}
 
@@ -583,7 +679,7 @@ get (int argc, char *argv[])
 	  if (verbose)
 	    printf ("getting from %s:%s to %s [%s]\n",
 		    hostname, src, cp, mode);
-	  peeraddr.sin_port = port;
+	  set_port (&peeraddr, port);
 	  recvfile (fd, src, mode);
 	  break;
 	}
@@ -597,7 +693,7 @@ get (int argc, char *argv[])
 	}
       if (verbose)
 	printf ("getting from %s:%s to %s [%s]\n", hostname, src, cp, mode);
-      peeraddr.sin_port = port;
+      set_port (&peeraddr, port);
       recvfile (fd, src, mode);
     }
 }
@@ -847,7 +943,7 @@ send_file (int fd, char *name, char *mode)
   register int n;
   volatile int block, size, convert;
   volatile unsigned long amount;
-  struct sockaddr_in from;
+  struct sockaddr_storage from;
   socklen_t fromlen;
   FILE *file;
 
@@ -883,7 +979,7 @@ send_file (int fd, char *name, char *mode)
       if (trace)
 	tpacket ("sent", dp, size + 4);
       n = sendto (f, (const char *) dp, size + 4, 0,
-		  (struct sockaddr *) &peeraddr, sizeof (peeraddr));
+		  (struct sockaddr *) &peeraddr, peerlen);
       if (n != size + 4)
 	{
 	  perror ("tftp: sendto");
@@ -907,7 +1003,7 @@ send_file (int fd, char *name, char *mode)
 	      perror ("tftp: recvfrom");
 	      goto abort;
 	    }
-	  peeraddr.sin_port = from.sin_port;	/* added */
+	  set_port (&peeraddr, get_port (&from));
 	  if (trace)
 	    tpacket ("received", ap, n);
 	  /* should verify packet came from server */
@@ -960,7 +1056,7 @@ recvfile (int fd, char *name, char *mode)
   register int n;
   volatile int block, size, firsttrip;
   volatile unsigned long amount;
-  struct sockaddr_in from;
+  struct sockaddr_storage from;
   socklen_t fromlen;
   FILE *file;
   volatile int convert;		/* true if converting crlf -> lf */
@@ -996,7 +1092,7 @@ recvfile (int fd, char *name, char *mode)
       if (trace)
 	tpacket ("sent", ap, size);
       if (sendto (f, ackbuf, size, 0, (struct sockaddr *) &peeraddr,
-		  sizeof (peeraddr)) != size)
+		  peerlen) != size)
 	{
 	  alarm (0);
 	  perror ("tftp: sendto");
@@ -1021,7 +1117,7 @@ recvfile (int fd, char *name, char *mode)
 	      perror ("tftp: recvfrom");
 	      goto abort;
 	    }
-	  peeraddr.sin_port = from.sin_port;	/* added */
+	  set_port (&peeraddr, get_port (&from));
 	  if (trace)
 	    tpacket ("received", dp, n);
 	  /* should verify client address */
@@ -1064,7 +1160,7 @@ recvfile (int fd, char *name, char *mode)
 abort:				/* ok to ack, since user */
   ap->th_opcode = htons ((u_short) ACK);	/* has seen err msg */
   ap->th_block = htons ((u_short) block);
-  sendto (f, ackbuf, 4, 0, (struct sockaddr *) &peeraddr, sizeof (peeraddr));
+  sendto (f, ackbuf, 4, 0, (struct sockaddr *) &peeraddr, peerlen);
   write_behind (file, convert);	/* flush last buffer */
   fclose (file);
   stopclock ();
@@ -1140,7 +1236,7 @@ nak (int error)
   if (trace)
     tpacket ("sent", tp, length);
   if (sendto (f, ackbuf, length, 0, (struct sockaddr *) &peeraddr,
-	      sizeof (peeraddr)) != length)
+	      peerlen) != length)
     perror ("nak");
 }
 

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

Summary of changes:
 ChangeLog          |   20 +++++
 doc/inetutils.texi |   23 ++++--
 src/tftp.c         |  238 ++++++++++++++++++++++++++++++++++++----------------
 3 files changed, 203 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Oct 31 08:02:29 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RKqZR-0003Vy-6q
	for mharc-commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:02:29 -0400
Received: from eggs.gnu.org ([140.186.70.92]:48225)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RKqZK-0003Vf-5Q
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:02:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RKqZI-0000UE-Fg
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:02:22 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:48186)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RKqZI-0000Tt-E7
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:02:20 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RKqZH-0002xr-DC
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 12:02:19 +0000
Date: Mon, 31 Oct 2011 12:02:19 +0000
Message-Id: <E1RKqZH-0002xr-DC@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-146-g69d2f0b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2aa8b851fbba6a129b1db29cc0e46345c8a9d367
X-Git-Newrev: 69d2f0be179459be70da5dfe4371133332f13bc8
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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: Mon, 31 Oct 2011 12:02:27 -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  69d2f0be179459be70da5dfe4371133332f13bc8 (commit)
       via  bbcd8c0ff5b565085cae69f3ed4eb61c1eb33023 (commit)
      from  2aa8b851fbba6a129b1db29cc0e46345c8a9d367 (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=69d2f0be179459be70da5dfe4371133332f13bc8


commit 69d2f0be179459be70da5dfe4371133332f13bc8
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Oct 31 13:02:09 2011 +0100

    tests/.gitignore: Add addrpeek.

diff --git a/ChangeLog b/ChangeLog
index c20c724..10faf41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-31  Simon Josefsson  <simon@josefsson.org>
 
+	* tests/.gitignore: Add addrpeek.
+
+2011-10-31  Simon Josefsson  <simon@josefsson.org>
+
 	* cfg.mk (local-checks-to-skip): Add sc_bindtextdomain.
 	(exclude_file_name_regexp--sc_prohibit_have_config_h): New
 	variable, to silence syntax-check warning.
diff --git a/tests/.gitignore b/tests/.gitignore
index 2fbb50c..eb2c542 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,2 @@
 localhost
+addrpeek

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


commit bbcd8c0ff5b565085cae69f3ed4eb61c1eb33023
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Oct 31 12:57:28 2011 +0100

    cfg.mk: Silence syntax-check warnings.
    
    * cfg.mk (local-checks-to-skip): Add sc_bindtextdomain.
    (exclude_file_name_regexp--sc_prohibit_have_config_h): New
    variable, to silence syntax-check warning.

diff --git a/ChangeLog b/ChangeLog
index f099f00..c20c724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-31  Simon Josefsson  <simon@josefsson.org>
+
+	* cfg.mk (local-checks-to-skip): Add sc_bindtextdomain.
+	(exclude_file_name_regexp--sc_prohibit_have_config_h): New
+	variable, to silence syntax-check warning.
+
 2011-10-29  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/tftp.c (peeraddr): Change to `struct sockaddr_storage'.
diff --git a/cfg.mk b/cfg.mk
index 4833ba4..0fd9d7d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -30,7 +30,11 @@ local-checks-to-skip = \
 	sc_prohibit_atoi_atof \
 	sc_prohibit_stat_st_blocks \
 	sc_prohibit_strcmp \
-	sc_unmarked_diagnostics
+	sc_unmarked_diagnostics \
+	sc_bindtextdomain
+
+exclude_file_name_regexp--sc_prohibit_have_config_h = \
+	^libinetutils/libinetutils.h$$
 
 htmldir = ../www-$(PACKAGE)
 

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

Summary of changes:
 ChangeLog        |   10 ++++++++++
 cfg.mk           |    6 +++++-
 tests/.gitignore |    1 +
 3 files changed, 16 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon Oct 31 08:25:31 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RKqvj-00071s-6X
	for mharc-commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:25:31 -0400
Received: from eggs.gnu.org ([140.186.70.92]:43519)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RKqvg-00071M-MG
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:25:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RKqve-0005l4-BS
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:25:28 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42915)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1RKqve-0005kw-6w
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 08:25:26 -0400
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <simon@josefsson.org>) id 1RKqvd-0005d3-Ut
	for commit-inetutils@gnu.org; Mon, 31 Oct 2011 12:25:26 +0000
Date: Mon, 31 Oct 2011 12:25:25 +0000
Message-Id: <E1RKqvd-0005d3-Ut@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-147-g094ba8a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 69d2f0be179459be70da5dfe4371133332f13bc8
X-Git-Newrev: 094ba8a78999a741759a7537b6fc980e5e3ce8ae
From: Simon Josefsson <simon@josefsson.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
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: Mon, 31 Oct 2011 12:25:30 -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  094ba8a78999a741759a7537b6fc980e5e3ce8ae (commit)
      from  69d2f0be179459be70da5dfe4371133332f13bc8 (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=094ba8a78999a741759a7537b6fc980e5e3ce8ae


commit 094ba8a78999a741759a7537b6fc980e5e3ce8ae
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Oct 31 13:25:04 2011 +0100

    doc: Some cosmetic fixes.
    
    * doc/inetutils.texi (Top): Remove 'Concept Index'.  Doc fix.
    (Introduction): Doc fix.
    (Concept Index): Removed chapter, not used properly.
    (Index): Remove incorrect description text.

diff --git a/ChangeLog b/ChangeLog
index 10faf41..bd401db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-10-31  Simon Josefsson  <simon@josefsson.org>
 
+	* doc/inetutils.texi (Top): Remove 'Concept Index'.  Doc fix.
+	(Introduction): Doc fix.
+	(Concept Index): Removed chapter, not used properly.
+	(Index): Remove incorrect description text.
+
+2011-10-31  Simon Josefsson  <simon@josefsson.org>
+
 	* tests/.gitignore: Add addrpeek.
 
 2011-10-31  Simon Josefsson  <simon@josefsson.org>
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index ea2df5f..751fd57 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -129,8 +129,7 @@ Daemons
 * uucpd invocation::                   Unix to Unix Copy.
 
 * GNU Free Documentation License::     The license for this manual.
-* Concept Index::                      Index of concepts.
-* Index::                              Index of commands, options and variables.
+* Index::                              Index of manual.
 @end menu
 
 @c OK -- 2009-04-27
@@ -138,6 +137,9 @@ Daemons
 @chapter Introduction
 @cindex introduction
 
+The GNU Network Utilities is a distribution of common networking
+utilities and servers, including for example ping, traceroute and ftp.
+
 This manual is a work in progress: many sections make no attempt to
 explain basic concepts in a way suitable for novices.  Thus, if you
 are interested, please get involved in improving this manual.  The
@@ -152,9 +154,10 @@ please include a description of the problem as well, since this is
 sometimes difficult to infer.
 
 The individual utilities were originally derived from the 4.4BSDLite2
-distribution.  What you are reading now is the authoritative
-documentation for these utilities; the man pages are no longer being
-maintained.
+distribution, although some of them have more or less been rewritten.
+What you are reading now is the authoritative and complete
+documentation for these utilities; the man pages are now automatically
+generated.
 
 Many features were integrated from NetBSD, OpenBSD, FreeBSD and
 GNU/Linux, the merges were done by a group of dedicated hackers (in no
@@ -3466,21 +3469,9 @@ uucpd [@var{option}]...
 @include fdl-1.3.texi
 
 @page
-@node Concept Index
-@unnumbered Concept Index
-
-This is a general index of all issues discussed in this manual, with
-the exception of the commands and command-line options.
-
-@printindex cp
-
-@page
 @node Index
 @unnumbered Index
 
-This is an alphabetical list of all commands, command-line options,
-and environment variables.
-
-@printindex fn
+@printindex cp
 
 @bye

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

Summary of changes:
 ChangeLog          |    7 +++++++
 doc/inetutils.texi |   27 +++++++++------------------
 2 files changed, 16 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


