Fix loop-detection code, add some minor improvements.

* README-hacking: Update.
* bootstrap.conf: Add sysexits.
* build/bootstrap: Synch with gnulib repository.
* build/gnulib.modules: Remove.
* lib/.cvsignore, m4/.cvsignore, po/.cvsignore: Update.
* lib/Makefile.am: Remove unnecessary initializations.
* src/authmode.c (anubis_authenticate_mode): Remove a block of
code duplicated in transmode.c and replace it with a call to
session_prologue.
* src/transmode.c (anubis_transparent_mode): Likewise.
(string_to_ipaddr, session_prologue): New functions.
* src/env.opt: Fix Emacs mode marker.
* src/headers.h: Include sysexits.h unconditionally.
(session_prologue): New prototype.
* src/tls.c (cipher_info): Add missing newline.

14 files changed, 304 insertions, 304 deletions

diff --git a/ChangeLog b/ChangeLog
index d2a27ac..f1031b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-07-03  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        Fix loop-detection code, add some minor improvements.
+        
+        * README-hacking: Update.
+        * bootstrap.conf: Add sysexits.
+        * build/bootstrap: Synch with gnulib repository.
+        * build/gnulib.modules: Remove.
+        * lib/.cvsignore, m4/.cvsignore, po/.cvsignore: Update.
+        * lib/Makefile.am: Remove unnecessary initializations.
+        * src/authmode.c (anubis_authenticate_mode): Remove a block of
+        code duplicated in transmode.c and replace it with a call to
+        session_prologue.
+        * src/transmode.c (anubis_transparent_mode): Likewise.
+        (string_to_ipaddr, session_prologue): New functions.
+        * src/env.opt: Fix Emacs mode marker.
+        * src/headers.h: Include sysexits.h unconditionally.
+        (session_prologue): New prototype.
+        * src/tls.c (cipher_info): Add missing newline.
+
 2007-11-04  Wojciech Polak  <polak@gnu.org>
 
         ======================
diff --git a/README-hacking b/README-hacking
index 5b86625..7f4710e 100644
--- a/README-hacking
+++ b/README-hacking
@@ -29,9 +29,7 @@ which are extracted from other source packages:
 
 2. Run
 
-   ./build/bootstrap GNULIB-DIR
-
-where GNULIB-DIR is the directory where Gnulib sources reside.      
+   ./build/bootstrap
 
 Once done, proceed as described in the file README (section
 INSTALLATION).
@@ -43,17 +41,19 @@ avoiding downloading the same files again. If so, create in GNU anubis
 root directory the file named `.bootstrap' with the following
 contents:
 
-   $HOME/gnulib --skip-po
+   --gnulib-srcdir=$HOME/gnulib
 
 Replace `$HOME/gnulib' with the actual directory where the Gnulib
-sources reside.
+sources reside.  Another option that might be useful in `.bootstrap'
+is `--skip-po', which tells bootstrap not to download localization
+files.
    
 For more information about `bootstrap', run `bootstrap --help'.
 
 
 * Copyright information
 
- Copyright (C) 2007 The Anubis Team.
+ Copyright (C) 2007, 2008 The Anubis Team.
 
  Permission is granted to anyone to make or distribute verbatim copies
  of this document as received, in any medium, provided that the
diff --git a/bootstrap.conf b/bootstrap.conf
index 25bb922..b113971 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -11,6 +11,7 @@ gnulib_modules="\
  getopt\
  getpass\
  setenv\
+ sysexits\
  xalloc"
 
 build_aux=build
diff --git a/build/bootstrap b/build/bootstrap
index 223e820..9a85762 100755
--- a/build/bootstrap
+++ b/build/bootstrap
@@ -2,12 +2,12 @@
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Written by Paul Eggert.
 
@@ -25,10 +23,11 @@ nl='
 '
 
 # Ensure file names are sorted consistently across platforms.
-# Also, ensure diagnostics are in English, e.g., "wget --help" below.
 LC_ALL=C
 export LC_ALL
 
+local_gl_dir=gl
+
 # Temporary directory names.
 bt='._bootmp'
 bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
@@ -49,8 +48,6 @@ Options:
  --force                  Attempt to bootstrap even if the sources seem
                           not to have been checked out.
  --skip-po                Do not download po files.
- --cvs-user=USERNAME      Set the username to use when checking out
-                          sources from the gnulib repository.
 
 If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.
@@ -70,15 +67,20 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
-# Translation Project URL, for the registry of all projects
-# and for the translation-team master directory.
-TP_URL="http://translationproject.org/latest/"
+# The command to download all .po files for a specified domain into
+# a specified directory.  Fill in the first %s is the domain name, and
+# the second with the destination directory.  Use rsync's -L and -r
+# 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'"
 
 extract_package_name='
   /^AC_INIT(/{
-     /.*,.*,.*,/{
+     /.*,.*,.*, */{
        s///
        s/[][]//g
+       s/)$//
        p
        q
      }
@@ -94,6 +96,11 @@ package=`sed -n "$extract_package_name" configure.ac` || exit
 gnulib_name=lib$package
 
 build_aux=build-aux
+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
@@ -119,6 +126,9 @@ XGETTEXT_OPTIONS='\\\
  --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
 
+# Package bug report address for gettext files
+MSGID_BUGS_ADDRESS=bug-$package@gnu.org
+
 # Files we don't want to import.
 excluded_files=
 
@@ -129,9 +139,21 @@ checkout_only_file=README-hacking
 # Whether to use copies instead of symlinks.
 copy=false
 
+# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
+# those files to be generated in directories like lib/, m4/, and po/.
+# Or set it to 'auto' to make this script select which to use based
+# on which version control system (if any) is used in the source directory.
+vc_ignore=auto
+
 # Override the default configuration, if necessary.
 test -r bootstrap.conf && . ./bootstrap.conf
 
+if test "$vc_ignore" = auto; then
+  vc_ignore=
+  test -d .git && vc_ignore=.gitigno