See ChangeLog: Wed Apr 19 10:57:26 CEST 2000 Werner Koch

ChangeLog

@@ -1,3 +1,7 @@
+Wed Apr 19 10:57:26 CEST 2000  Werner Koch  <wk@openit.de>
+
+	* acconfig.h (HAVE_MLOCK): Added
+
 Wed Mar 22 13:50:24 CET 2000  Werner Koch  <wk@openit.de>
 
 	* acinclude.m4 (GNUPG_CHECK_MLOCK): Changed the way to test for

Makefile.am

@@ -27,20 +27,4 @@ dist-hook:
 	    > $(distdir)/scripts/gnupg.spec
 
 
-if MAINTAINER_MODE
-# This is only useful within my local environment (wk)
-cvs-get:
-	rsync -Cavuzb  --exclude scratch --exclude .deps \
-		      wkoch@sigtrap.guug.de:work/gnupg .
-
-cvs-put:
-	rsync -Cavuzb --exclude .deps --exclude scratch \
-		      . wkoch@sigtrap.guug.de:work/gnupg
-
-cvs-sync: cvs-get cvs-put
-
-endif
-
-
-.PHONY: cvs-get cvs-put cvs-sync
 

TODO

@@ -1,7 +1,4 @@
 
-  * add a check to the make dist target to see whether the man page
-    was build.
-
   * at least an option to prefer DSA keys over RSA when selecting the key to
     use.  Depending on creation time would be nice too.  I think this is
     already done for the subkeys - check it.

acconfig.h

@@ -53,6 +53,7 @@
 
 #undef HAVE_STPCPY
 
+#undef HAVE_MLOCK
 
 #undef BIG_ENDIAN_HOST
 #undef LITTLE_ENDIAN_HOST

doc/Makefile.am

@@ -25,3 +25,7 @@ endif
 	-db2html $<
 
 
+dist-hook:
+	@if test `wc -c < gpg.1` -lt 200; then \
+	    echo 'ERROR: dummy man page'; false; fi
+

doc/gpg.sgml

@@ -759,7 +759,8 @@ does not contain a slash, it is assumed to be in the
 home-directory ("~/.gnupg" if --homedir is not used).
 The filename may be prefixed with a scheme:</para>
 <para>"gnupg-ring:" is the default one.</para>
-<para>"gnupg-gdbm:" may be used for a GDBM ring.</para>
+<para>"gnupg-gdbm:" may be used for a GDBM ring. Note that GDBM
+is experimental and likely to be removed in future versions.</para>
 <para>It might make sense to use it together with --no-default-keyring.
 </para></listitem></varlistentry>
 
@@ -1190,7 +1191,7 @@ option may lead to data and key corruption.
 <varlistentry>
 <term>--no-random-seed-file</term>
 <listitem><para>
-&gnupg; uses a file to store it's internal random pool over invocations.
+GnuPG uses a file to store it's internal random pool over invocations.
 This makes random generation faster; however sometimes write operations
 are not desired.  This option can be used to achive that with the cost of
 slower random generation.

g10/g10.c

@@ -1450,7 +1450,7 @@ main( int argc, char **argv )
 	break;
 
       case aFixTrustDB:
-	log_error("this command is not yet implemented.\"\n");
+	log_error("this command is not yet implemented.\n");
 	log_error("A workaround is to use \"--export-ownertrust\", remove\n");
 	log_error("the trustdb file and do an \"--import-ownertrust\".\n" );
 	break;