Update

git-svn-id: file:///svnroot/gsc/trunk@286 d2de0444-eb31-0410-8365-af798a554d48

9 files changed, 223 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index b289999..eacf722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-24  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+	* README-alpha, README-hacking: New files.
+	* bootstrap: Improve
+
 	Implement final statistics.
 	
 	* wydawca/wydawca.c (log_to_stderr): Init to -1 (autodetect)
diff --git a/NEWS b/NEWS
index 9987497..e87d20e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,16 @@
-Gray Script Collection NEWS -- history of user-visible changes. 2007-08-19
-Copyright (C) 2005 Sergey Poznyakoff
+Gray Script Collection NEWS -- history of user-visible changes. 2007-08-24
+Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send gsc bug reports to <gray@gnu.org.ua>.
 
+Version 1.1.90 (CVS)
+
+* New modules
+
+ wydawca   - Release synchronization utility
+
+
 Version 1.1
 
 * Licensed under GPLv3
@@ -28,7 +35,7 @@ Version 1.0
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 2005 Sergey Poznyakoff
+Copyright (C) 2005, 2006, 2007 Sergey Poznyakoff
 
    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/README b/README
index abcd633..0d01089 100644
--- a/README
+++ b/README
@@ -4,24 +4,40 @@ See the end of file for copying conditions.
 
 * Introduction
 
-     GSC stands for Gray's Script Collection. It is a collection of
-shell scripts I use on my machines. Basically, it's for my own use,
-but you may find it useful too. All scripts and programs are under GPL.
+   GSC stands for Gray's Script Collection. It is a collection of
+various utilities I use on my machines. Basically, it was intended
+for my own use, but you may find it useful too. All scripts and
+programs are under GPL version 3 (or later). 
 
 * Installation
 
-     Configure and make:
+   Configure and make:
 
      ./configure [OPTIONS]
      make
      make install
+  
+   See the file INSTALL for the description of ./configure and its
+generic options. The options and variables specific to GSC are
+described below:
+        
+--enable-sendfile
+  Attempt to use sendfile(2) when possible
+  
+--enable-modules
+  Enable only modules from XMODLIST. This is not fully supported yet.
 
-Some C code relies on GNU libc functions, such as obstack, getline or
-getopt_long.  If you lack these, you'll have to provide replacements.
-
+--with-sendmail-version=VERSION
+  Build .cf files for the given version of Sendmail.
+			  
+--with-sendmail-cfdir=DIR
+  Specify full name of Sendmail cf directory (e.g.:
+  /usr/src/sendmail-8.13.1/cf/cf). Use this option only if
+  `--with-sendmail-version' does not work.
+     
 * Documentation
 
-     Full documentation is shipped in doc subdirectory
+   Full documentation is shipped in doc subdirectory
 
 * Bug reporting.		
 
@@ -30,7 +46,7 @@ Send bug reports to <gray@gnu.org.ua>.
 
 * Copyright information:
 
-Copyright (C) 2005 Sergey Poznyakoff
+Copyright (C) 2005, 2007 Sergey Poznyakoff
 
    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/README-alpha b/README-alpha
new file mode 100644
index 0000000..b08b1e9
--- /dev/null
+++ b/README-alpha
@@ -0,0 +1,61 @@
+This file is part of the GSC.
+This document describes the actions needed to build the pre-release
+or alpha version of the package. See end of file for copying conditions.
+
+* Introduction
+
+This is a *pre-release* version, and not ready for production
+use yet. Please send comments and problem reports to <gray@gnu.org.ua>.
+
+* Building
+
+Run the following commands in this order:
+
+1. ./configure [OPTIONS]
+
+See README and INSTALL for the available OPTIONS
+
+2. make
+
+3. make install
+
+This usually must be done with root privileges.
+
+* Checking Out the Sources
+
+The following instructions apply if you wish to obtain sources from
+the SVN repository.
+
+To checkout the source tree from SVN, issue the following command:
+
+ svn checkout http://svn.gnu.org.ua/sources/gsc/trunk gsc
+
+This will give you read-only access. If you think you need write access,
+contact the mailing list.
+
+Read the file README-hacking for the instructions on bootstrapping the
+SVN version.
+
+
+* Copyright information
+
+ Copyright (C) 2007 Sergey Poznyakoff
+
+ Permission is granted to anyone to make or distribute verbatim copies
+ of this document as received, in any medium, provided that the
+ copyright notice and this permission notice are preserved,
+ thus giving the recipient permission to redistribute in turn.
+
+ Permission is granted to distribute modified versions of this
+ document, or of portions of it, under the above conditions, provided
+ also that they carry prominent notices stating who last changed
+ them. 
+
+
+Local Variables:
+mode: outline
+paragraph-separate: "[ 	]*$"
+version-control: never
+End:
+
+
diff --git a/README-hacking b/README-hacking
new file mode 100644
index 0000000..ec29190
--- /dev/null
+++ b/README-hacking
@@ -0,0 +1,58 @@
+These notes intend to help people working on the SVN version of
+this package. See end of this file for the copying conditions.
+
+* Requirements
+
+You need the following packages to build the SVN version of GSC. I do
+not make any efforts to accommodate older versions of these packages,
+so please make sure that you have the latest stable version. 
+
+- Automake <http://www.gnu.org/software/automake/>
+- Autoconf <http://www.gnu.org/software/autoconf/>
+- Bison <http://www.gnu.org/software/bison/>
+- Gnulib <http://www.gnu.org/software/gnulib/>
+- Flex <http://flex.sourceforge.net/>
+- M4 <http://www.gnu.org/software/m4/>
+- Texinfo <http://www.gnu.org/software/texinfo>
+
+* Bootstrapping
+
+Obviously, if you are reading these notes, you did manage to check out
+the source tree from SVN. The next step is to create the configuration
+framework: 
+
+1. Change to the source tree directory
+
+ $ cd gsc
+
+2. Run `bootstrap' pointing the --gnulib-srcdir option to the location
+of the local directory where gnulib sources reside, e.g.:
+
+  ./bootstrap --gnulib-srcdir=/usr/src/gnulib
+  
+Once done, proceed as described in the file README (section
+`Installation').
+
+
+* Copyright information
+
+ Copyright (C) 2007 Sergey Poznyakoff
+
+ Permission is granted to anyone to make or distribute verbatim copies
+ of this document as received, in any medium, provided that the
+ copyright notice and this permission notice are preserved,
+ thus giving the recipient permission to redistribute in turn.
+
+ Permission is granted to distribute modified versions
+ of this document, or of portions of it,
+ under the above conditions, provided also that they
+ carry prominent notices stating who last changed them.
+
+^L
+Local Variables:
+mode: outline
+paragraph-separate: "[	^L]*$"
+version-control: never
+End:
+
+
diff --git a/bootstrap b/bootstrap
index 9903448..1fe7468 100644
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,47 @@
 #! /bin/sh
+checkout_only_file=README-hacking
+
+usage() {
+  echo >&2 "\
+  Usage: $0 [OPTION]...
+  Bootstrap this package from the checked-out sources.
+
+  Supported options are:
+
+  --force                  Attempt to bootstrap even if the sources seem
+                           not to have been checked out.
+  --gnulib-srcdir=DIRNAME  Specify the local directory where gnulib
+                           sources reside. This option is required, unless
+			   \`gnulib-tool' is in your PATH.
+  --help                   Print this help list.
+  "
+}			     
+  
+for option
+do
+  case $option in
+  --help)
+    usage
+    exit 0;;
+  --gnulib-srcdir=*)
+    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`
+    PATH=$GNULIB_SRCDIR:$PATH;;
+  --force)
+    checkout_only_file=;;
+  *)
+    echo >&2 "$0: $option: unknown option"
+    exit 1;;
+  esac
+done  	
+
+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    
+   
 test -d m4 || mkdir m4 || exit 1
 test -d gnu || mkdir gnu || exit 1
 gnulib-tool --source-base=gnu --import \
  xalloc obstack getopt hash error progname getline mkdtemp save-cwd \
- backupfile strerror
+ backupfile strerror &&
 autoreconf -f -i -s
diff --git a/wydawca/config.c b/wydawca/config.c
index 63ce935..4cd6454 100644
--- a/wydawca/config.c
+++ b/wydawca/config.c
@@ -481,7 +481,25 @@ cfg_directory (gsc_config_file_t *file, char *kw, char *val, void *unused)
     }
   else if (dpair.verify_method.type != method_none
 	   && dpair.gpg_key_method.type != method_none)
-    register_directory_pair (&dpair);
+    {
+      /* FIXME: only sql supported so far */
+      if (dpair.verify_method.type == method_builtin
+	  && dpair.gpg_key_method.type != method_builtin)
+	{
+	  file->error_msg (file->file_name, file->line,
+			   "Sorry, method `builtin' is not yet supported");
+	  file->error_count++;
+	}
+      else if (dpair.verify_method.type == method_external
+	       && dpair.gpg_key_method.type != method_external)
+	{
+	  file->error_msg (file->file_name, file->line,
+			   "Sorry, method `external' is not yet supported");
+	  file->error_count++;
+	}
+	
+      register_directory_pair (&dpair);
+    }
 }
 
 static void
diff --git a/wydawca/directive.c b/wydawca/directive.c
index bcf3429..cc9ed1d 100644
--- a/wydawca/directive.c
+++ b/wydawca/directive.c
@@ -328,8 +328,8 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair)
 	  relative_dir = safe_file_name_alloc (val);
 	  if (!relative_dir || relative_dir[0] == '/')
 	    {
-	      logmsg (LOG_ERR, "%s: invalid directive", 
-	              trp->file[file_directive].name);
+	      logmsg (LOG_ERR, "%s: invalid directory: %s",  
+	              trp->file[file_directive].name, val);
               return 1;
             }
 	  break;
diff --git a/wydawca/triplet.c b/wydawca/triplet.c
index 964b381..f5eebc6 100644
--- a/wydawca/triplet.c
+++ b/wydawca/triplet.c
@@ -195,7 +195,7 @@ triplet_processor (void *data, void *proc_data)
 	  if (debug_level)
 	    logmsg (LOG_DEBUG, "%s: incomplete triplet", trp->name);
 	  /* ignore unless expired (see below); */
-	  UPDATE_STATS (STAT_COMPLETE_TRIPLETS);
+	  UPDATE_STATS (STAT_INCOMPLETE_TRIPLETS);
 	  break;
 
 	case triplet_bad:
@@ -204,7 +204,9 @@ triplet_processor (void *data, void *proc_data)
 	  return true;
 	}
     }
-
+  else
+    UPDATE_STATS (STAT_INCOMPLETE_TRIPLETS);
+  
   if (triplet_expired_p (trp, dpair->file_sweep_time))
     {
       UPDATE_STATS (STAT_EXPIRED_TRIPLETS);