[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-316-ge1fb81d

[Mats Erik Andersson]

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

The branch, master has been updated
       via  e1fb81d0b845a758a307c1c60342b5f2eee31086 (commit)
       via  1cdb3af7f60dcd37e9934db86ca46a85abed8f2e (commit)
      from  2a3279a0babcdab8a20d8f7139254aacef2e8ed8 (commit)

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

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


commit e1fb81d0b845a758a307c1c60342b5f2eee31086
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Jul 13 13:41:02 2013 +0200

    talkd: Less ACL-logging.

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

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


commit 1cdb3af7f60dcd37e9934db86ca46a85abed8f2e
Author: Mats Erik Andersson <address@hidden>
Date:   Sat Jul 13 12:56:31 2013 +0200

    bootstrap: Updated from gnulib.

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

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

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


hooks/post-receive
-- 
GNU Inetutils