[svn] GnuPG - r4805 - in trunk: . doc g10 tools

[svn author wk]

Author: wk
Date: 2008-08-01 12:51:11 +0200 (Fri, 01 Aug 2008)
New Revision: 4805

Modified:
   trunk/THANKS
   trunk/doc/ChangeLog
   trunk/doc/debugging.texi
   trunk/doc/gpgsm.texi
   trunk/doc/scdaemon.texi
   trunk/g10/ChangeLog
   trunk/g10/tdbio.c
   trunk/tools/ChangeLog
Log:
Fix !EROFS bug.
Doc updates


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/doc/ChangeLog	2008-08-01 10:51:11 UTC (rev 4805)
@@ -1,3 +1,7 @@
+2008-07-30  Werner Koch  <wk at g10code.com>
+
+	* gpgsm.texi (GPGSM Configuration): Mention com-cert.pem.
+
 2008-06-25  Werner Koch  <wk at g10code.com>
 
 	* qualified.txt: Add new BnetzA certs 12R and 13R.

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/g10/ChangeLog	2008-08-01 10:51:11 UTC (rev 4805)
@@ -1,3 +1,8 @@
+2008-08-01  Werner Koch  <wk at g10code.com>
+
+	* tdbio.c (open_db) [!EROFS]: Move closing parens out of the
+	ifdef.  Reported by Ken Takusagawa.
+
 2008-06-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpg.c (enum cmd_and_opt_values): Remove option

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/tools/ChangeLog	2008-08-01 10:51:11 UTC (rev 4805)
@@ -1,7 +1,7 @@
 2008-06-19  Werner Koch  <wk at g10code.com>
 
 	* gpgconf-comp.c (GC_ARG_TYPE_ALIAS_LIST): New.
-	(gc_arg_type): Add fallbacl type.
+	(gc_arg_type): Add fallback type.
 	(gc_options_gpg): Add option "group".
 
 2008-06-12  Marcus Brinkmann  <marcus at g10code.de>

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/THANKS	2008-08-01 10:51:11 UTC (rev 4805)
@@ -138,6 +138,7 @@
 Kazu Yamamoto              kazu at iij.ad.jp
 Kazuyoshi Kakihara         
 Keith Clayton              keith at claytons.org
+Ken Takusagawa             ken.takusagawa.2  at gmail.com
 Kevin Ryde                 user42 at zip.com.au
 Klaus Singvogel            ks at caldera.de
 Kurt Garloff               garloff at suse.de

Modified: trunk/doc/debugging.texi
===================================================================
--- trunk/doc/debugging.texi	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/doc/debugging.texi	2008-08-01 10:51:11 UTC (rev 4805)
@@ -208,6 +208,26 @@
 number N is the internal algorighm indentifier; for example 8 refers to
 SHA-256.
 
+
+ at item The Windows version does not work under Wine
+
+When running the W32 version of @command{gpg} under Wine you may get
+an error messages like:
+
+ at smallexample
+gpg: fatal: WriteConsole failed: Access denied
+ at end smallexample
+
+ at noindent
+The solution is to use the command @command{wineconsole}. 
+
+Some operations like gen-key really want to talk to the console directly
+for increased security (for example to prevent the passphrase from
+appearing on the screen).  So, you should use @command{wineconsole}
+instead of @command{wine}, which will launch a windows console that
+implements those additional features.
+
+
 @end itemize
 
 

Modified: trunk/doc/gpgsm.texi
===================================================================
--- trunk/doc/gpgsm.texi	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/doc/gpgsm.texi	2008-08-01 10:51:11 UTC (rev 4805)
@@ -787,6 +787,14 @@
 @file{help.txt} file.
 
 
+ at item com-certs.pem
+ at cindex com-certs.pem
+This file is a collection of common certificates used to populated a
+newly created @file{pubring.kbx}.  An administrator may replace this
+file with a custom one.  The format is a concatenation of PEM encoded
+X.509 certificates.  This global file is installed in the data directory
+(e.g. @file{/usr/share/gnupg/qualified.txt}).
+
 @end table
 
 @c man:.RE
@@ -796,7 +804,7 @@
 helper script is provided to create these files (@pxref{addgnupghome}).
 
 For internal purposes gpgsm creates and maintaines a few other files;
-They all live in in the current home directory (@pxref{option
+they all live in in the current home directory (@pxref{option
 --homedir}).  Only @command{gpgsm} may modify these files.
 
 
@@ -806,7 +814,7 @@
 This a database file storing the certificates as well as meta
 information.  For debugging purposes the tool @command{kbxutil} may be
 used to show the internal structure of this file.
-      
+
 @item random_seed
 @cindex random_seed
 This content of this file is used to maintain the internal state of the

Modified: trunk/doc/scdaemon.texi
===================================================================
--- trunk/doc/scdaemon.texi	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/doc/scdaemon.texi	2008-08-01 10:51:11 UTC (rev 4805)
@@ -266,7 +266,7 @@
 where this is supported.  Currently we support it for the OpenPGP
 card.  Deny is the default.  This commands is useful to inhibit
 accidental access to admin class command which could ultimately lock
-the card through worng PIN numbers.
+the card through wrong PIN numbers.
 
 @item --disable-application @var{name}
 @opindex disable-application

Modified: trunk/g10/tdbio.c
===================================================================
--- trunk/g10/tdbio.c	2008-08-01 10:48:36 UTC (rev 4804)
+++ trunk/g10/tdbio.c	2008-08-01 10:51:11 UTC (rev 4805)
@@ -603,8 +603,9 @@
   db_fd = open (db_name, O_RDWR | MY_O_BINARY );
   if (db_fd == -1 && (errno == EACCES
 #ifdef EROFS
-                      || errno == EROFS)
+                      || errno == EROFS
 #endif
+                      )
       ) {
       db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
       if (db_fd != -1)