From cvs at cvs.gnupg.org  Thu Aug  4 18:16:03 2011
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Thu, 04 Aug 2011 18:16:03 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
	updated. gnupg-2.0.18-1-gcb70852
Message-ID: <E1QozRj-0003SN-5a@lists.gnupg.org>

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 "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  cb7085244b4ecf7e04fe05ef43e94e1847f7986b (commit)
      from  a7585eeabebf61aaa3209a893892b779b3447df9 (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 -----------------------------------------------------------------
commit cb7085244b4ecf7e04fe05ef43e94e1847f7986b
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 4 17:36:33 2011 +0200

    Post release updates

diff --git a/NEWS b/NEWS
index 540bf8d..f531889 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.0.19 (unreleased)
+-------------------------------------------------
+
+
 Noteworthy changes in version 2.0.18 (2011-08-04)
 -------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 9be244b..758d00c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.0.18])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.0.19])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))

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

Summary of changes:
 NEWS         |    4 ++++
 configure.ac |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org



From cvs at cvs.gnupg.org  Mon Aug  8 11:24:46 2011
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Mon, 08 Aug 2011 11:24:46 +0200
Subject: [git] GnuPG - branch, master,
	updated. post-nuke-of-trailing-ws-84-g14e0b60
Message-ID: <E1QqKvF-00048q-72@lists.gnupg.org>

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  14e0b60efd9d9ef40cdae7e3b5ad2b41e62c1186 (commit)
       via  663768f9af49098ce91e59b27c58192c09280c3a (commit)
      from  fe8619d29ca599cc9f38538db62d1dd42bfbee40 (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 -----------------------------------------------------------------
commit 14e0b60efd9d9ef40cdae7e3b5ad2b41e62c1186
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 8 10:44:03 2011 +0200

    Adjust for signed integer passed to OpenPGP card decrypt.

diff --git a/scd/ChangeLog b/scd/ChangeLog
index 9c4d035..4f2d2f2 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-08  Werner Koch  <wk at g10code.com>
+
+	* app-openpgp.c (do_decipher): Take care of accidentally passed
+	signed integer data with a leading 0.
+
 2011-06-16  Werner Koch  <wk at g10code.com>
 
 	* app-openpgp.c (send_key_data): Implemented chunked mode.
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index fef17fa..eb0b4f0 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -3367,17 +3367,19 @@ do_decipher (app_t app, const char *keyidstr,
   rc = verify_chv2 (app, pincb, pincb_arg);
   if (!rc)
     {
-      size_t fixuplen;
+      int fixuplen;
       unsigned char *fixbuf = NULL;
       int padind = 0;
 
       /* We might encounter a couple of leading zeroes in the
-         cryptogram.  Due to internal use of MPIs thease leading
-         zeroes are stripped.  However the OpenPGP card expects
-         exactly 128 bytes for the cryptogram (for a 1k key).  Thus we
-         need to fix it up.  We do this for up to 16 leading zero
-         bytes; a cryptogram with more than this is with a very high
-         probability anyway broken.  */
+         cryptogram.  Due to internal use of MPIs these leading zeroes
+         are stripped.  However the OpenPGP card expects exactly 128
+         bytes for the cryptogram (for a 1k key).  Thus we need to fix
+         it up.  We do this for up to 16 leading zero bytes; a
+         cryptogram with more than this is with a very high
+         probability anyway broken.  If a signed conversion was used
+         we may also encounter one leading zero followed by the correct
+         length.  We fix that as well.  */
       if (indatalen >= (128-16) && indatalen < 128)      /* 1024 bit key.  */
         fixuplen = 128 - indatalen;
       else if (indatalen >= (192-16) && indatalen < 192) /* 1536 bit key.  */
@@ -3388,10 +3390,16 @@ do_decipher (app_t app, const char *keyidstr,
         fixuplen = 384 - indatalen;
       else if (indatalen >= (512-16) && indatalen < 512) /* 4096 bit key.  */
         fixuplen = 512 - indatalen;
+      else if (!*(const char *)indata && (indatalen == 129
+                                          || indatalen == 193
+                                          || indatalen == 257
+                                          || indatalen == 385
+                                          || indatalen == 513))
+        fixuplen = -1;
       else
         fixuplen = 0;
 
-      if (fixuplen)
+      if (fixuplen > 0)
         {
           /* While we have to prepend stuff anyway, we can also
              include the padding byte here so that iso1816_decipher
@@ -3408,6 +3416,11 @@ do_decipher (app_t app, const char *keyidstr,
           indatalen = fixuplen + indatalen;
           padind = -1; /* Already padded.  */
         }
+      else if (fixuplen < 0)
+        {
+          /* We use the extra leading zero as the padding byte.  */
+          padind = -1;
+        }
 
       if (app->app_local->cardcap.ext_lc_le && indatalen > 254 )
         {

commit 663768f9af49098ce91e59b27c58192c09280c3a
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 8 10:17:33 2011 +0200

    Minor doc updates v2.0 vs. v2.1)

diff --git a/.gitignore b/.gitignore
index 6eeeb5c..d5ccfa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ common/t-sexputil
 common/t-sysutils
 common/t-stringhelp
 common/t-timestuff
+common/t-ssh-utils
 doc/addgnupghome.8
 doc/applygnupgdefaults.8
 doc/faq.html
@@ -129,6 +130,9 @@ tests/private-keys-v1.d/
 tests/pubring.kbx
 tests/testdir.stamp
 tests/trustlist.txt
+tests/openpgp/*.log
+tests/openpgp/trustdb.gpg
+tests/openpgp/z
 tools/clean-sat
 tools/gpg-check-pattern
 tools/gpg-connect-agent
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 8811d05..73fa2ef 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -348,11 +348,13 @@ Allow clients to mark keys as trusted, i.e. put them into the
 @file{trustlist.txt} file.  This is by default not allowed to make it
 harder for users to inadvertently accept Root-CA keys.
 
+ at ifset gpgtwoone
 @anchor{option --allow-loopback-pinentry}
 @item --allow-loopback-pinentry
 @opindex allow-loopback-pinentry
 Allow clients to use the loopback pinentry features; see the option
 @option{pinentry-mode} for details.
+ at end ifset
 
 @item --ignore-cache-for-signing
 @opindex ignore-cache-for-signing
@@ -1332,6 +1334,7 @@ See Assuan command @code{PKSIGN}.
 This does not need any value.  It is used to enable the
 PINENTRY_LAUNCHED inquiry.
 
+ at ifset gpgtwoone
 @item pinentry-mode
 This option is used to change the operation mode of the pinentry.  The
 following values are defined:
@@ -1355,12 +1358,16 @@ following values are defined:
   Use the @xref{option --allow-loopback-pinentry}.
 
   @end table
+ at end ifset
 
+ at ifset gpgtwoone
 @item cache-ttl-opt-preset
 This option sets the cache TTL for new entries created by GENKEY and
 PASSWD commands when using the @option{--preset} option.  It it is not
 used a default value is used.
+ at end ifset
 
+ at ifset gpgtwoone
 @item s2k-count
 Instead of using the standard S2K counted (which is computed on the
 fly), the given S2K count is used for new keys or when changing the
@@ -1368,6 +1375,7 @@ passphrase of a key.  Values below 65536 are considered to be 0.  This
 option is valid for the entire session or until reset to 0.  This
 option is useful if the key is later used on boxes which are either
 much slower or faster than the actual box.
+ at end ifset
 
 @end table
 
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 1f4950a..0de3daf 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -165,12 +165,20 @@ use @samp{--help} to get a list of supported operations.
 @table @gnupgtabopt
 @item --gen-key
 @opindex gen-key
+ at ifclear gpgtwoone
+-This command allows the creation of a certificate signing request.  It
+-is commonly used along with the @option{--output} option to save the
+-created CSR into a file.  If used with the @option{--batch} a parameter
+-file is used to create the CSR.
+ at end ifclear
+ at ifset gpgtwoone
 This command allows the creation of a certificate signing request or a
 self-signed certificate.  It is commonly used along with the
 @option{--output} option to save the created CSR or certificate into a
 file.  If used with the @option{--batch} a parameter file is used to
 create the CSR or certificate and it is further possible to create
 non-self-signed certificates.
+ at end ifset
 
 @item --list-keys
 @itemx -k
@@ -955,10 +963,16 @@ this is a missing certificate.
 @node CSR and certificate creation,,,Unattended Usage
 @section CSR and certificate creation
 
+ at ifclear gpgtwoone
+ at strong{Please notice}: The immediate creation of certificates is only
+supported by GnuPG version 2.1 or later.  With a 2.0 version you may
+only create a CSR.
+ at end ifclear
+
 The command @option{--gen-key} may be used along with the option
- at option{--batch} to either create a certificate signing request (CSR) or an
-X.509 certificate.  The is controlled by a parameter file; the format
-of this file is as follows:
+ at option{--batch} to either create a certificate signing request (CSR)
+or an X.509 certificate. The is controlled by a parameter file; the
+format of this file is as follows:
 
 @itemize @bullet
 @item Text only, line length is limited to about 1000 characters.

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

Summary of changes:
 .gitignore         |    4 ++++
 doc/gpg-agent.texi |    8 ++++++++
 doc/gpgsm.texi     |   20 +++++++++++++++++---
 scd/ChangeLog      |    5 +++++
 scd/app-openpgp.c  |   29 +++++++++++++++++++++--------
 5 files changed, 55 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Aug  9 20:27:20 2011
From: cvs at cvs.gnupg.org (cvs user werner)
Date: Tue, 09 Aug 2011 20:27:20 +0200
Subject: misc-scripts (heating-control.c mkdiff)
Message-ID: <E1Qqr1M-0003ZB-Hv@lists.gnupg.org>

    Date: Tuesday, August 9, 2011 @ 20:27:20
  Author: werner
    Path: /cvs/wk/misc-scripts

Modified: heating-control.c mkdiff

Various updates


+


From cvs at cvs.gnupg.org  Wed Aug 10 14:52:05 2011
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 10 Aug 2011 14:52:05 +0200
Subject: [git] GnuPG - branch, master,
	updated. post-nuke-of-trailing-ws-89-g816bee1
Message-ID: <E1Qr76a-0006Ie-Dl@lists.gnupg.org>

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  816bee1fa0d833ac72ea4e7d52465e6e1da2645d (commit)
       via  14442d2be06750665125aab81671174a98e4e614 (commit)
       via  7316b53426eeb4dfe6a62fdff5cfeaf1a2674f52 (commit)
       via  28eac436bbe894c0464a3b3d3ad20ed841d0ca9d (commit)
       via  81389383a3169fe5130162dbb4cbc4bb0e806c3a (commit)
      from  14e0b60efd9d9ef40cdae7e3b5ad2b41e62c1186 (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 -----------------------------------------------------------------
commit 816bee1fa0d833ac72ea4e7d52465e6e1da2645d
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 10 14:11:30 2011 +0200

    Fixed set but unused variable bugs

diff --git a/agent/ChangeLog b/agent/ChangeLog
index b4a333a..ec2dca2 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* genkey.c (check_passphrase_pattern): Use gpg_strerror instead of
+	strerror.
+	* command-ssh.c (ssh_receive_mpint_list): Remove unused var
+	ELEMS_PUBLIC_N.
+	* gpg-agent.c (main): Remove unused var MAY_COREDUMP.
+
 2011-08-09  Ben Kibbey <bjk at luxsci.net>
 
 	* command.c (option_handler): Have option s2k-count match the
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index ae193ec..7b4d479 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -933,7 +933,6 @@ static gpg_error_t
 ssh_receive_mpint_list (estream_t stream, int secret,
 			ssh_key_type_spec_t key_spec, gcry_mpi_t **mpi_list)
 {
-  unsigned int elems_public_n;
   const char *elems_public;
   unsigned int elems_n;
   const char *elems;
@@ -952,7 +951,6 @@ ssh_receive_mpint_list (estream_t stream, int secret,
   elems_n = strlen (elems);
 
   elems_public = key_spec.elems_key_public;
-  elems_public_n = strlen (elems_public);
 
   mpis = xtrycalloc (elems_n + 1, sizeof *mpis );
   if (!mpis)
diff --git a/agent/genkey.c b/agent/genkey.c
index e01a7bc..09f1c72 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -106,7 +106,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
   if (!infp)
     {
       err = gpg_error_from_syserror ();
-      log_error (_("error creating temporary file: %s\n"), strerror (errno));
+      log_error (_("error creating temporary file: %s\n"), gpg_strerror (err));
       return 1; /* Error - assume password should not be used.  */
     }
 
@@ -114,7 +114,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
     {
       err = gpg_error_from_syserror ();
       log_error (_("error writing to temporary file: %s\n"),
-                 strerror (errno));
+                 gpg_strerror (err));
       fclose (infp);
       return 1; /* Error - assume password should not be used.  */
     }
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index a548664..0616875 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -568,7 +568,6 @@ main (int argc, char **argv )
 {
   ARGPARSE_ARGS pargs;
   int orig_argc;
-  int may_coredump;
   char **orig_argv;
   FILE *configfp = NULL;
   char *configname = NULL;
@@ -642,7 +641,7 @@ main (int argc, char **argv )
   setup_libgcrypt_logging ();
   gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
 
-  may_coredump = disable_core_dumps ();
+  disable_core_dumps ();
 
   /* Set default options.  */
   parse_rereadable_options (NULL, 0); /* Reset them to default values. */
diff --git a/common/ChangeLog b/common/ChangeLog
index c56bc4d..95aef65 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* t-exechelp.c (test_close_all_fds): Don't use the DUMMY_FD var.
+
+	* pka.c (get_pka_info): Remove unused var.
+
+	* signal.c (got_fatal_signal): Remove unused var.
+
+	* estream.c (es_fread, es_fwrite): Remove unused var.
+
 2011-07-20  Werner Koch  <wk at g10code.com>
 
 	* ssh-utils.c, ssh-utils.h: New.
diff --git a/common/estream.c b/common/estream.c
index 5b55674..8087a62 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -3425,12 +3425,11 @@ es_fread (void *ES__RESTRICT ptr, size_t size, size_t nitems,
 	  estream_t ES__RESTRICT stream)
 {
   size_t ret, bytes;
-  int err;
 
   if (size * nitems)
     {
       ESTREAM_LOCK (stream);
-      err = es_readn (stream, ptr, size * nitems, &bytes);
+      es_readn (stream, ptr, size * nitems, &bytes);
       ESTREAM_UNLOCK (stream);
 
       ret = bytes / size;
@@ -3447,12 +3446,11 @@ es_fwrite (const void *ES__RESTRICT ptr, size_t size, size_t nitems,
 	   estream_t ES__RESTRICT stream)
 {
   size_t ret, bytes;
-  int err;
 
   if (size * nitems)
     {
       ESTREAM_LOCK (stream);
-      err = es_writen (stream, ptr, size * nitems, &bytes);
+      es_writen (stream, ptr, size * nitems, &bytes);
       ESTREAM_UNLOCK (stream);
 
       ret = bytes / size;
diff --git a/common/pka.c b/common/pka.c
index 7ac70d9..89761f5 100644
--- a/common/pka.c
+++ b/common/pka.c
@@ -175,7 +175,7 @@ get_pka_info (const char *address, unsigned char *fpr)
 #else /*!USE_ADNS*/
   unsigned char answer[PACKETSZ];
   int anslen;
-  int qdcount, ancount, nscount, arcount;
+  int qdcount, ancount;
   int rc;
   unsigned char *p, *pend;
   const char *domain;
@@ -212,8 +212,6 @@ get_pka_info (const char *address, unsigned char *fpr)
 
   qdcount = ntohs (header.qdcount);
   ancount = ntohs (header.ancount);
-  nscount = ntohs (header.nscount);
-  arcount = ntohs (header.arcount);
 
   if (!ancount)
     return NULL; /* Got no answer. */
diff --git a/common/signal.c b/common/signal.c
index 9f11b99..28b2acc 100644
--- a/common/signal.c
+++ b/common/signal.c
@@ -89,8 +89,6 @@ get_signal_name( int signum )
 static RETSIGTYPE
 got_fatal_signal (int sig)
 {
-  /* Dummy result variable to suppress gcc warning.  */
-  int res;
   const char *s;
 
   if (caught_fatal_sig)
@@ -100,14 +98,14 @@ got_fatal_signal (int sig)
   if (cleanup_fnc)
     cleanup_fnc ();
   /* Better don't translate these messages. */
-  res = write (2, "\n", 1 );
+  (void)write (2, "\n", 1 );
   s = log_get_prefix (NULL);
   if (s)
-    res = write(2, s, strlen (s));
-  res = write (2, ": signal ", 9 );
+    (void)write(2, s, strlen (s));
+  (void)write (2, ": signal ", 9 );
   s = get_signal_name(sig);
   if (s)
-    res = write (2, s, strlen(s) );
+    (void) write (2, s, strlen(s) );
   else
     {
       /* We are in a signal handler so we can't use any kind of printf
@@ -117,7 +115,7 @@ got_fatal_signal (int sig)
          things are messed up because we modify its value.  Although
          this is a bug in that system, we will protect against it.  */
       if (sig < 0 || sig >= 100000)
-        res = write (2, "?", 1);
+        (void)write (2, "?", 1);
       else
         {
           int i, value, any=0;
@@ -126,7 +124,7 @@ got_fatal_signal (int sig)
             {
               if (value >= i || ((any || i==1) && !(value/i)))
                 {
-                  res = write (2, "0123456789"+(value/i), 1);
+                  (void)write (2, "0123456789"+(value/i), 1);
                   if ((value/i))
                     any = 1;
                   value %= i;
@@ -134,7 +132,7 @@ got_fatal_signal (int sig)
             }
         }
     }
-  res = write (2, " caught ... exiting\n", 20);
+  (void)write (2, " caught ... exiting\n", 20);
 
   /* Reset action to default action and raise signal again */
   init_one_signal (sig, SIG_DFL, 0);
diff --git a/common/t-exechelp.c b/common/t-exechelp.c
index e4c88d1..19079d3 100644
--- a/common/t-exechelp.c
+++ b/common/t-exechelp.c
@@ -76,7 +76,6 @@ test_close_all_fds (void)
   int max_fd = get_max_fds ();
   int *array;
   int fd;
-  int dummy_fd;
   int initial_count, count, n;
 #if 0
   char buffer[100];
@@ -93,10 +92,10 @@ test_close_all_fds (void)
   free (array);
 
   /* Some dups to get more file descriptors and close one. */
-  dummy_fd = dup (1);
-  dummy_fd = dup (1);
+  dup (1);
+  dup (1);
   fd = dup (1);
-  dummy_fd = dup (1);
+  dup (1);
   close (fd);
 
   array = xget_all_open_fds ();
@@ -137,14 +136,14 @@ test_close_all_fds (void)
       int except[] = { 20, 23, 24, -1 };
 
       for (n=initial_count; n < 31; n++)
-        dummy_fd = dup (1);
+        dup (1);
       array = xget_all_open_fds ();
       if (verbose)
         print_open_fds (array);
       free (array);
       for (n=0; n < 5; n++)
         {
-          dummy_fd = dup (1);
+          dup (1);
           array = xget_all_open_fds ();
           if (verbose)
             print_open_fds (array);
diff --git a/common/t-timestuff.c b/common/t-timestuff.c
index c9c8fe5..8e5fa65 100644
--- a/common/t-timestuff.c
+++ b/common/t-timestuff.c
@@ -81,10 +81,9 @@ test_timegm (void)
 
   };
   int tidx;
-  time_t now, atime, counter;
+  time_t now, atime;
   struct tm tbuf, tbuf2, *tp;
 
-  counter = 0;
   for (tidx=0; tidx < DIM (tvalues); tidx++)
     {
       if (tvalues[tidx].year == -1)
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6de122f..8ab0db5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* export.c (transfer_format_to_openpgp): Don't parse unneeded CSUM.
+
+	* import.c (import_secret_one): Use arg OPTIONS instead of global
+	import options var.
+
+	* sig-check.c (do_check): Remove unused var CTX.
+
+	* build-packet.c (do_user_id): Return value.
+
 2011-07-29  Werner Koch  <wk at g10code.com>
 
 	* tdbio.c (open_db): Do not print read-only warning in quiet mode.
diff --git a/g10/build-packet.c b/g10/build-packet.c
index f2ef691..159b783 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -242,19 +242,19 @@ write_fake_data (IOBUF out, gcry_mpi_t a)
 static int
 do_user_id( IOBUF out, int ctb, PKT_user_id *uid )
 {
-    int rc;
+  int rc;
 
-    if( uid->attrib_data )
-      {
-	write_header(out, ctb, uid->attrib_len);
-	rc = iobuf_write( out, uid->attrib_data, uid->attrib_len );
-      }
-    else
-      {
-        write_header2( out, ctb, uid->len, 2 );
-	rc = iobuf_write( out, uid->name, uid->len );
-      }
-    return 0;
+  if (uid->attrib_data)
+    {
+      write_header(out, ctb, uid->attrib_len);
+      rc = iobuf_write( out, uid->attrib_data, uid->attrib_len );
+    }
+  else
+    {
+      write_header2( out, ctb, uid->len, 2 );
+      rc = iobuf_write( out, uid->name, uid->len );
+    }
+  return rc;
 }
 
 
diff --git a/g10/export.c b/g10/export.c
index 1b575dd..7deee6b 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -377,7 +377,6 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
   u32  s2k_count = 0;
   size_t npkey, nskey;
   gcry_mpi_t skey[10];  /* We support up to 9 parameters.  */
-  u16 desired_csum;
   int skeyidx = 0;
   struct seckey_info *ski;
 
@@ -509,20 +508,21 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk)
   skey[skeyidx++] = NULL;
 
   gcry_sexp_release (list);
-  list = gcry_sexp_find_token (top_list, "csum", 0);
-  if (list)
-    {
-      string = gcry_sexp_nth_string (list, 1);
-      if (!string)
-        goto bad_seckey;
-      desired_csum = strtoul (string, NULL, 10);
-      xfree (string);
-    }
-  else
-    desired_csum = 0;
 
+  /* We have no need for the CSUM valuel thus we don't parse it.  */
+  /* list = gcry_sexp_find_token (top_list, "csum", 0); */
+  /* if (list) */
+  /*   { */
+  /*     string = gcry_sexp_nth_string (list, 1); */
+  /*     if (!string) */
+  /*       goto bad_seckey; */
+  /*     desired_csum = strtoul (string, NULL, 10); */
+  /*     xfree (string); */
+  /*   } */
+  /* else */
+  /*   desired_csum = 0; */
+  /* gcry_sexp_release (list); list = NULL; */
 
-  gcry_sexp_release (list); list = NULL;
   gcry_sexp_release (top_list); top_list = NULL;
 
   /* log_debug ("XXX is_v4=%d\n", is_v4); */
diff --git a/g10/import.c b/g10/import.c
index ffbcf16..b48f126 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1596,7 +1596,7 @@ import_secret_one (ctrl_t ctrl, const char *fname, KBNODE keyblock,
 	 public key block, and below we will output another one for
 	 the secret keys.  FIXME?  */
       import_one (ctrl, fname, pub_keyblock, stats,
-		  NULL, NULL, opt.import_options, 1);
+		  NULL, NULL, options, 1);
 
       /* Fixme: We should check for an invalid keyblock and
 	 cancel the secret key import in this case.  */
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 973fa8d..62b193a 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2683,7 +2683,6 @@ show_key_with_all_names (KBNODE keyblock, int only_marked, int with_revoker,
   KBNODE node;
   int i;
   int do_warn = 0;
-  byte pk_version = 0;
   PKT_public_key *primary = NULL;
 
   if (opt.with_colons)
@@ -2719,7 +2718,6 @@ show_key_with_all_names (KBNODE keyblock, int only_marked, int with_revoker,
 		  do_warn = 1;
 		}
 
-	      pk_version = pk->version;
 	      primary = pk;
 	    }
 
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 531497e..134bcfa 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -263,7 +263,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, gcry_md_hd_t digest,
 {
     gcry_mpi_t result = NULL;
     int rc = 0;
-    struct cmp_help_context_s ctx;
 
     if( (rc=do_check_messages(pk,sig,r_expired,r_revoked)) )
         return rc;
@@ -316,8 +315,6 @@ do_check( PKT_public_key *pk, PKT_signature *sig, gcry_md_hd_t digest,
     result = encode_md_value (pk, digest, sig->digest_algo );
     if (!result)
         return G10ERR_GENERAL;
-    ctx.sig = sig;
-    ctx.md = digest;
     rc = pk_verify( pk->pubkey_algo, result, sig->data, pk->pkey );
     gcry_mpi_release (result);
 
diff --git a/kbx/keybox-openpgp.c b/kbx/keybox-openpgp.c
index 4306ed1..37e2771 100644
--- a/kbx/keybox-openpgp.c
+++ b/kbx/keybox-openpgp.c
@@ -170,7 +170,6 @@ parse_key (const unsigned char *data, size_t datalen,
   const unsigned char *data_start = data;
   int i, version, algorithm;
   size_t n;
-  unsigned long timestamp, expiredate;
   int npkey;
   unsigned char hashbuffer[768];
   const unsigned char *mpi_n = NULL;
@@ -184,21 +183,15 @@ parse_key (const unsigned char *data, size_t datalen,
   if (version < 2 || version > 4 )
     return gpg_error (GPG_ERR_INV_PACKET); /* Invalid version. */
 
-  timestamp = ((data[0]<<24)|(data[1]<<16)|(data[2]<<8)|(data[3]));
+  /*timestamp = ((data[0]<<24)|(data[1]<<16)|(data[2]<<8)|(data[3]));*/
   data +=4; datalen -=4;
 
   if (version < 4)
     {
-      unsigned short ndays;
-
       if (datalen < 2)
         return gpg_error (GPG_ERR_INV_PACKET);
-      ndays = ((data[0]<<8)|(data[1]));
       data +=2; datalen -= 2;
-      expiredate = ndays? (timestamp + ndays * 86400L) : 0;
     }
-  else
-    expiredate = 0; /* This is stored in the self-signature. */
 
   if (!datalen)
     return gpg_error (GPG_ERR_INV_PACKET);
diff --git a/scd/apdu.c b/scd/apdu.c
index 176ab91..ac563ad 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -1602,7 +1602,7 @@ open_pcsc_reader_wrapped (const char *portstr)
   unsigned char msgbuf[9];
   int err;
   unsigned int dummy_status;
-  int sw = SW_HOST_CARD_IO_ERROR;
+
   /* Note that we use the constant and not the fucntion because this
      code won't be be used under Windows.  */
   const char *wrapperpgm = GNUPG_LIBEXECDIR "/gnupg-pcsc-wrapper";
@@ -1746,7 +1746,6 @@ open_pcsc_reader_wrapped (const char *portstr)
   if (err)
     {
       log_error ("PC/SC OPEN failed: %s\n", pcsc_error_string (err));
-      sw = pcsc_error_to_sw (err);
       goto command_failed;
     }
 
diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
index f2f6d52..ee974ac 100644
--- a/scd/pcsc-wrapper.c
+++ b/scd/pcsc-wrapper.c
@@ -384,7 +384,7 @@ handle_open (unsigned char *argbuf, size_t arglen)
   long err;
   const char * portstr;
   char *list = NULL;
-  unsigned long nreader, listlen, atrlen;
+  unsigned long nreader, atrlen;
   char *p;
   unsigned long card_state, card_protocol;
   unsigned char atr[33];
@@ -431,7 +431,6 @@ handle_open (unsigned char *argbuf, size_t arglen)
       return;
     }
 
-  listlen = nreader;
   p = list;
   while (nreader)
     {
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 5702395..0999847 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -375,7 +375,6 @@ main (int argc, char **argv )
   ARGPARSE_ARGS pargs;
   int orig_argc;
   gpg_error_t err;
-  int may_coredump;
   char **orig_argv;
   FILE *configfp = NULL;
   char *configname = NULL;
@@ -442,7 +441,7 @@ main (int argc, char **argv )
   setup_libgcrypt_logging ();
   gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
 
-  may_coredump = disable_core_dumps ();
+  disable_core_dumps ();
 
   /* Set default options. */
   opt.allow_admin = 1;
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 9e6d92f..aee3efc 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* keydb.c (keydb_add_resource): Remove unsued var CREATED_FNAME.
+
+	* gpgsm.c (main): Remove unused var FNAME.
+
 2011-07-21  Werner Koch  <wk at g10code.com>
 
 	* call-dirmngr.c (get_cached_cert, get_cached_cert_data_cb): New.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index c6732fc..f08e0f8 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -862,7 +862,6 @@ main ( int argc, char **argv)
   ARGPARSE_ARGS pargs;
   int orig_argc;
   char **orig_argv;
-  const char *fname;
   /*  char *username;*/
   int may_coredump;
   strlist_t sl, remusr= NULL, locusr=NULL;
@@ -1635,8 +1634,6 @@ main ( int argc, char **argv)
   if (log_get_errorcount(0))
     gpgsm_exit(1); /* Must stop for invalid recipients. */
 
-  fname = argc? *argv : NULL;
-
   /* Dispatch command.  */
   switch (cmd)
     {
diff --git a/sm/keydb.c b/sm/keydb.c
index d3b911e..fe5d0e7 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -82,7 +82,6 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created)
   int rc = 0;
   FILE *fp;
   KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE;
-  const char *created_fname = NULL;
 
   if (auto_created)
     *auto_created = 0;
@@ -194,7 +193,6 @@ keydb_add_resource (const char *url, int force, int secret, int *auto_created)
 
           if (!opt.quiet)
             log_info (_("keybox `%s' created\n"), filename);
-          created_fname = filename;
           if (auto_created)
             *auto_created = 1;
 	}

commit 14442d2be06750665125aab81671174a98e4e614
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 10 13:39:38 2011 +0200

    Fix autoconf warnings and update config.* files.

diff --git a/ChangeLog b/ChangeLog
index edd82ed..475aa0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Fix new autoconf warnings.
+
 2011-05-20  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Require libgpg-error 1.10.
diff --git a/configure.ac b/configure.ac
index c7be7f7..69c2370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,10 +31,10 @@ m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
           | awk '/^\* / {printf "%s",$3}']))
-AC_INIT([gnupg],
-        [my_version[]m4_if(my_issvn,[yes],
-        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
-        [http://bugs.gnupg.org])
+m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
+          [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
+
+AC_INIT([gnupg],[my_full_version], [http://bugs.gnupg.org])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
@@ -940,10 +940,10 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes \
     # it does not support v6.
 
     AC_MSG_CHECKING([whether the resolver is usable])
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <sys/types.h>
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
 [[unsigned char answer[PACKETSZ];
   res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
   dn_skipname(0,0);
@@ -957,11 +957,11 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes \
     if test x"$have_resolver" != xyes ; then
        AC_MSG_CHECKING(
              [whether I can make the resolver usable with BIND_8_COMPAT])
-       AC_LINK_IFELSE([AC_LANG_PROGRAM([#define BIND_8_COMPAT
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define BIND_8_COMPAT
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>],
+#include <resolv.h>]],
 [[unsigned char answer[PACKETSZ];
   res_query("foo.bar",C_IN,T_A,answer,PACKETSZ);
   dn_skipname(0,0); dn_expand(0,0,0,0,0);
@@ -1213,8 +1213,8 @@ GNUPG_TIME_T_UNSIGNED
 # Ensure that we have UINT64_C before we bother to check for uint64_t
 # Fixme: really needed in gnupg?  I think it is only useful in libcgrypt.
 AC_CACHE_CHECK([for UINT64_C],[gnupg_cv_uint64_c_works],
-   AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <inttypes.h>
-       uint64_t foo=UINT64_C(42);]),
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <inttypes.h>]],
+       [[uint64_t foo=UINT64_C(42);]])],
      gnupg_cv_uint64_c_works=yes,gnupg_cv_uint64_c_works=no))
 if test "$gnupg_cv_uint64_c_works" = "yes" ; then
    AC_CHECK_SIZEOF(uint64_t)
@@ -1450,7 +1450,7 @@ if test "$GCC" = yes; then
         AC_MSG_CHECKING([if gcc supports -Wno-missing-field-initializers])
         _gcc_cflags_save=$CFLAGS
         CFLAGS="-Wno-missing-field-initializers"
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_wopt=yes,_gcc_wopt=no)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
         AC_MSG_RESULT($_gcc_wopt)
         CFLAGS=$_gcc_cflags_save;
         if test x"$_gcc_wopt" = xyes ; then
@@ -1459,7 +1459,7 @@ if test "$GCC" = yes; then
         AC_MSG_CHECKING([if gcc supports -Wdeclaration-after-statement])
         _gcc_cflags_save=$CFLAGS
         CFLAGS="-Wdeclaration-after-statement"
-        AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_wopt=yes,_gcc_wopt=no)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_wopt=yes,_gcc_wopt=no)
         AC_MSG_RESULT($_gcc_wopt)
         CFLAGS=$_gcc_cflags_save;
         if test x"$_gcc_wopt" = xyes ; then
@@ -1472,7 +1472,7 @@ if test "$GCC" = yes; then
     AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
     _gcc_cflags_save=$CFLAGS
     CFLAGS="-Wno-pointer-sign"
-    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
     AC_MSG_RESULT($_gcc_psign)
     CFLAGS=$_gcc_cflags_save;
     if test x"$_gcc_psign" = xyes ; then
@@ -1482,7 +1482,7 @@ if test "$GCC" = yes; then
     AC_MSG_CHECKING([if gcc supports -Wpointer-arith])
     _gcc_cflags_save=$CFLAGS
     CFLAGS="-Wpointer-arith"
-    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
     AC_MSG_RESULT($_gcc_psign)
     CFLAGS=$_gcc_cflags_save;
     if test x"$_gcc_psign" = xyes ; then
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 29af1fb..56c20df 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* readline.m4, libcurl.m4: Fix use of AC_LANG_PROGRAM.
+	* libcurl.m4: s/ifelse/m4_if/.
+
 2011-02-25  Werner Koch  <wk at g10code.com>
 
 	* ksba.m4: Update from git master.
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index a9bfa2e..a0d258d 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -58,7 +58,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
 
   AC_ARG_WITH(libcurl,
      AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
-     [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
+     [_libcurl_with=$withval],[_libcurl_with=m4_if([$1],,[yes],[$1])])
 
   if test "$_libcurl_with" != "no" ; then
 
@@ -82,7 +82,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
            [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
 
 	_libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
-	_libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
+	_libcurl_wanted=`echo m4_if([$2],,[0],[$2]) | $_libcurl_version_parse`
 
         if test $_libcurl_wanted -gt 0 ; then
 	   AC_CACHE_CHECK([for libcurl >= version $2],
@@ -141,9 +141,9 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
            _libcurl_save_libs=$LIBS
            LIBS="$LIBCURL $LIBS"
 
-           AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
+           AC_LINK_IFELSE([AC_LANG_PROGRAM([[include <curl/curl.h>]],[[
 /* Try and use a few common options to force a failure if we are
-   missing symbols or can't link. */
+   missing symbols or cannot link. */
 int x;
 curl_easy_setopt(NULL,CURLOPT_URL,NULL);
 x=CURL_ERROR_SIZE;
@@ -152,7 +152,7 @@ x=CURLOPT_FILE;
 x=CURLOPT_ERRORBUFFER;
 x=CURLOPT_STDERR;
 x=CURLOPT_VERBOSE;
-]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
+]])],[libcurl_cv_lib_curl_usable=yes],[libcurl_cv_lib_curl_usable=no])
 
            CPPFLAGS=$_libcurl_save_cppflags
            LIBS=$_libcurl_save_libs
@@ -229,10 +229,10 @@ x=CURLOPT_VERBOSE;
 
   if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
      # This is the IF-NO path
-     ifelse([$4],,:,[$4])
+     m4_if([$4],,:,[$4])
   else
      # This is the IF-YES path
-     ifelse([$3],,:,[$3])
+     m4_if([$3],,:,[$3])
   fi
 
   unset _libcurl_with
diff --git a/m4/readline.m4 b/m4/readline.m4
index d252346..783f401 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -30,18 +30,18 @@ AC_DEFUN([GNUPG_CHECK_READLINE],
 
         AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane])
 
-        AC_LINK_IFELSE(AC_LANG_PROGRAM([
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
-],[
+]],[[
 rl_completion_func_t *completer;
 add_history("foobar");
 rl_catch_signals=0;
 rl_inhibit_completion=0;
 rl_attempted_completion_function=NULL;
 rl_completion_matches(NULL,NULL);
-]),_found_readline=yes,_found_readline=no)
+]])],[_found_readline=yes],[_found_readline=no])
 
         AC_MSG_RESULT([$_found_readline])
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 9b536bf..c183599 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* config.guess, config.sub: Update to version 2011-06-03.
+
 2010-10-26  Werner Koch  <wk at g10code.com>
 
 	* config.guess: Update to version 2010-09-24.
diff --git a/scripts/config.guess b/scripts/config.guess
index 4c8f032..b02565c 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2010-09-24'
+timestamp='2011-06-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -92,7 +92,7 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' HUP INT TERM
+trap 'exit 1' 1 2 15
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +484,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -595,52 +598,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -770,14 +773,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -867,7 +870,7 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
@@ -892,7 +901,7 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -960,7 +969,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -969,7 +978,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
@@ -978,7 +987,7 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -987,11 +996,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1023,7 +1032,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1051,13 +1060,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1092,8 +1101,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1136,10 +1145,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel at ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel at ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes at openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1165,11 +1174,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1282,13 +1291,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1328,11 +1337,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/scripts/config.sub b/scripts/config.sub
index 320e303..f9fcdc8 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2010-09-11'
+timestamp='2011-06-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@ version="\
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -158,8 +158,8 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -175,10 +175,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -286,9 +286,10 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
 	| rx \
 	| score \
@@ -296,12 +297,12 @@ case $basic_machine in
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -325,6 +326,18 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -382,24 +395,26 @@ case $basic_machine in
 	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
 	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -424,7 +439,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -507,7 +522,7 @@ case $basic_machine in
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -539,7 +554,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -755,7 +770,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -862,10 +877,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-        neo-tandem)
+	neo-tandem)
 		basic_machine=neo-tandem
 		;;
-        nse-tandem)
+	nse-tandem)
 		basic_machine=nse-tandem
 		;;
 	nsr-tandem)
@@ -950,9 +965,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1046,6 +1062,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1102,13 +1121,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-        # This must be matched before tile*.
-        tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1178,6 +1192,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1275,11 +1292,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1364,7 +1381,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1413,7 +1430,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1458,8 +1475,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1482,10 +1499,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1497,8 +1514,8 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
 		;;
 	tic54x-*)
 		os=-coff
@@ -1534,7 +1551,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1561,7 +1578,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)

commit 7316b53426eeb4dfe6a62fdff5cfeaf1a2674f52
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 10 13:26:17 2011 +0200

    Typo fix

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 73fa2ef..b212153 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -1369,7 +1369,7 @@ used a default value is used.
 
 @ifset gpgtwoone
 @item s2k-count
-Instead of using the standard S2K counted (which is computed on the
+Instead of using the standard S2K count (which is computed on the
 fly), the given S2K count is used for new keys or when changing the
 passphrase of a key.  Values below 65536 are considered to be 0.  This
 option is valid for the entire session or until reset to 0.  This

commit 28eac436bbe894c0464a3b3d3ad20ed841d0ca9d
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Tue Aug 9 18:56:16 2011 -0400

    Update option s2k-count to match the documentation.
    
    The option would previously return an error if its value was < 65536.

diff --git a/agent/ChangeLog b/agent/ChangeLog
index 60ea7ee..b4a333a 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-09  Ben Kibbey <bjk at luxsci.net>
+
+	* command.c (option_handler): Have option s2k-count match the
+	documentation.
+
 2011-07-27  Werner Koch  <wk at g10code.com>
 
 	* call-scd.c (struct inq_needpin_s): Add field ANY_INQ_SEEN.
diff --git a/agent/command.c b/agent/command.c
index 4fbbfb5..6973e78 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2505,10 +2505,10 @@ option_handler (assuan_context_t ctx, const char *key, const char *value)
   else if (!strcmp (key, "s2k-count"))
     {
       ctrl->s2k_count = *value? strtoul(value, NULL, 10) : 0;
-      if (ctrl->s2k_count && ctrl->s2k_count < 65536) {
+      if (ctrl->s2k_count && ctrl->s2k_count < 65536)
+        {
 	  ctrl->s2k_count = 0;
-	  err = gpg_error (GPG_ERR_INV_VALUE);
-      }
+        }
     }
   else
     err = gpg_error (GPG_ERR_UNKNOWN_OPTION);

commit 81389383a3169fe5130162dbb4cbc4bb0e806c3a
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 10 11:47:04 2011 +0200

    Made the KILLAGENT and KILLSCD commands working again.
    
    This requires that GnuPG is build with a newer version of Libassuan
    (2.0.3).

diff --git a/NEWS b/NEWS
index ed37e3b..08d6bfe 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Noteworthy changes in version 2.1.0beta3
 
  * Support the SSH confirm flag.
 
+ * The Assuan commands KILLAGENT and KILLSCD are working again.
+
 
 Noteworthy changes in version 2.1.0beta2 (2011-03-08)
 -----------------------------------------------------
diff --git a/agent/command.c b/agent/command.c
index b03c786..4fbbfb5 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2259,7 +2259,12 @@ cmd_killagent (assuan_context_t ctx, char *line)
     return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket");
 
   ctrl->server_local->stopme = 1;
+#ifdef ASSUAN_FORCE_CLOSE
+  assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
+  return 0;
+#else
   return gpg_error (GPG_ERR_EOF);
+#endif
 }
 
 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 4f2d2f2..45c9c7c 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* command.c (cmd_killscd): Use the new assuan force close flag
+	if available.
+
 2011-08-08  Werner Koch  <wk at g10code.com>
 
 	* app-openpgp.c (do_decipher): Take care of accidentally passed
diff --git a/scd/command.c b/scd/command.c
index a579b24..9bb5005 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1862,7 +1862,15 @@ cmd_killscd (assuan_context_t ctx, char *line)
   (void)line;
 
   ctrl->server_local->stopme = 1;
+#ifdef ASSUAN_FORCE_CLOSE
+  assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
+  return 0;
+#else
+  /* Actually returning an EOF does not anymore work with modern
+     Libassuan versions.  However we keep that non working code until
+     we make a Libassuan with the force close flag a requirement.  */
   return gpg_error (GPG_ERR_EOF);
+#endif
 }
 
 

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

Summary of changes:
 ChangeLog            |    4 +
 NEWS                 |    2 +
 agent/ChangeLog      |   13 +++
 agent/command-ssh.c  |    2 -
 agent/command.c      |   11 ++-
 agent/genkey.c       |    4 +-
 agent/gpg-agent.c    |    3 +-
 common/ChangeLog     |   10 +++
 common/estream.c     |    6 +-
 common/pka.c         |    4 +-
 common/signal.c      |   16 ++--
 common/t-exechelp.c  |   11 +--
 common/t-timestuff.c |    3 +-
 configure.ac         |   28 +++---
 doc/gpg-agent.texi   |    2 +-
 g10/ChangeLog        |   11 +++
 g10/build-packet.c   |   24 +++---
 g10/export.c         |   26 +++---
 g10/import.c         |    2 +-
 g10/keyedit.c        |    2 -
 g10/sig-check.c      |    3 -
 kbx/keybox-openpgp.c |    9 +--
 m4/ChangeLog         |    5 +
 m4/libcurl.m4        |   14 ++--
 m4/readline.m4       |    6 +-
 scd/ChangeLog        |    5 +
 scd/apdu.c           |    3 +-
 scd/command.c        |    8 ++
 scd/pcsc-wrapper.c   |    3 +-
 scd/scdaemon.c       |    3 +-
 scripts/ChangeLog    |    4 +
 scripts/config.guess |  217 ++++++++++++++++++++++++++------------------------
 scripts/config.sub   |  113 +++++++++++++++-----------
 sm/ChangeLog         |    6 ++
 sm/gpgsm.c           |    3 -
 sm/keydb.c           |    2 -
 36 files changed, 328 insertions(+), 260 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org



From cvs at cvs.gnupg.org  Wed Aug 10 15:47:48 2011
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 10 Aug 2011 15:47:48 +0200
Subject: [git] Pinentry - branch, master, updated. pinentry-0.8.1-5-gb2f95de
Message-ID: <E1Qr7yV-0007uK-HO@lists.gnupg.org>

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 "The standard pinentry collection".

The branch, master has been updated
       via  b2f95de90094bd4f6cf96d8831f9f43bae8effe9 (commit)
       via  e2b89cbdcba7475047ca3c46fc7d03825355b3ff (commit)
      from  671a1a70eceb7a31feb0df997fbc8eb25f722895 (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 -----------------------------------------------------------------
commit b2f95de90094bd4f6cf96d8831f9f43bae8effe9
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 10 15:07:07 2011 +0200

    Fix autoconf/m4 stuff.
    
    Also add a gitignore file.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..872e4af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+*.lo
+*.o
+.deps/
+.libs/
+/aclocal.m4
+/autom4te.cache
+/config.h.in
+/config.h
+/config.log
+/config.status
+/configure
+/Makefile.in
+autom4te.cache/
+assuan/Makefile.in
+assuan/Makefile
+curses/Makefile.in
+curses/Makefile
+doc/Makefile.in
+doc/Makefile
+doc/pinentry.info
+doc/stamp-vti
+doc/version.texi
+gtk+-2/Makefile.in
+gtk+-2/Makefile
+gtk/Makefile.in
+gtk/Makefile
+pinentry/Makefile.in
+pinentry/Makefile
+qt/Makefile.in
+qt/Makefile
+qt4/Makefile.in
+qt4/Makefile
+secmem/Makefile.in
+secmem/Makefile
+w32/Makefile.in
+w32/Makefile
+
diff --git a/ChangeLog b/ChangeLog
index 9b208d9..8805399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-10  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Change bug report address to the BTS.  Fix
+	autoconf warnings.
+
 2011-06-28  Werner Koch  <wk at g10code.com>
 
 	* gtk+-2/gtksecentry.c (PROP_EDITING_CANCELED): New.
diff --git a/configure.ac b/configure.ac
index bcbe26e..abe4167 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,23 @@
 # configure.ac
 # Copyright (C) 1999 Robert Bihlmeyer <robbe at orcus.priv.at>
 # Copyright (C) 2001, 2002, 2003, 2004, 2007 g10 Code GmbH
-# 
+#
 # This file is part of PINENTRY.
-# 
+#
 # PINENTRY 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 of the License, or
 # (at your option) any later version.
-# 
+#
 # PINENTRY is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- 
+
 # (Process this file with autoconf to produce a configure script.)
 AC_PREREQ(2.57)
 min_automake_version="1.10"
@@ -38,12 +38,12 @@ m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
            | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
           | awk '/^\* / {printf "%s",$3}']))
+m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes],
+          [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])])
+
 # Remember to remove the "-cvs" suffix *before* a release and to bump the
 # version number immediately *after* a release and to re-append the suffix.
-AC_INIT(pinentry,
-        [my_version[]m4_if(my_issvn,[yes],
-        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
-	[gnupg-devel at gnupg.org])
+AC_INIT([pinentry],[my_full_version],[http://bugs.gnupg.org])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(pinentry/pinentry.h)
 AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
@@ -96,7 +96,7 @@ case "${host}" in
                   [Set this to limit filenames to the 8.3 format])
         have_dosish_system=yes
         have_w32_system=yes
-        case "${host}" in 
+        case "${host}" in
           *-mingw32ce*)
             have_w32ce_system=yes
             ;;
@@ -121,7 +121,7 @@ esac
 
 if test "$have_dosish_system" = yes; then
    AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
-             [Defined if we run on some of the PCDOS like systems 
+             [Defined if we run on some of the PCDOS like systems
               (DOS, Windoze. OS/2) with special properties like
               no file modes])
 fi
@@ -147,7 +147,7 @@ if test "$GCC" = yes; then
     AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
     _gcc_cflags_save=$CFLAGS
     CFLAGS="-Wno-pointer-sign"
-    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],_gcc_psign=yes,_gcc_psign=no)
     AC_MSG_RESULT($_gcc_psign)
     CFLAGS=$_gcc_cflags_save;
     if test x"$_gcc_psign" = xyes ; then
@@ -364,7 +364,7 @@ if test $have_qt = "no"; then
 *** end of config.log.$missing_qt_mt
 ***]])
 	else
-	  pinentry_qt="no"	  
+	  pinentry_qt="no"
 	fi
 fi
 if test $have_moc = "no"; then
@@ -380,7 +380,7 @@ if test $have_moc = "no"; then
 *** configure.
 ***]])
 	else
-	  pinentry_qt="no"	  
+	  pinentry_qt="no"
 	fi
 fi
 fi

commit e2b89cbdcba7475047ca3c46fc7d03825355b3ff
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Wed Aug 10 12:50:43 2011 +0900

    Add wide-char support to pinentry-curses.

diff --git a/configure.ac b/configure.ac
index 4b8ed79..bcbe26e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ fi
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(string.h unistd.h langinfo.h termio.h locale.h utime.h)
+AC_CHECK_HEADERS(string.h unistd.h langinfo.h termio.h locale.h utime.h wchar.h)
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(seteuid stpcpy mmap)
diff --git a/m4/curses.m4 b/m4/curses.m4
index 1e1cb4f..3a01881 100644
--- a/m4/curses.m4
+++ b/m4/curses.m4
@@ -28,7 +28,13 @@ AC_DEFUN([IU_LIB_NCURSES], [
   AC_ARG_ENABLE(ncurses,    [  --disable-ncurses       don't prefer -lncurses over -lcurses],
               , enable_ncurses=yes)
   if test "$enable_ncurses" = yes; then
-    AC_CHECK_LIB(ncurses, initscr, LIBNCURSES="-lncurses")
+    AC_CHECK_LIB(ncursesw, initscr, LIBNCURSES="-lncursesw",
+      AC_CHECK_LIB(ncurses, initscr, LIBNCURSES="-lncurses"))
+    if test "$ac_cv_lib_ncursesw_initscr" = yes; then
+      have_ncursesw=yes
+    else
+      have_ncursesw=no
+    fi
     if test "$LIBNCURSES"; then
       # Use ncurses header files instead of the ordinary ones, if possible;
       # is there a better way of doing this, that avoids looking in specific
@@ -53,9 +59,14 @@ AC_DEFUN([IU_LIB_NCURSES], [
       else
 	AC_CACHE_CHECK(for ncurses include dir,
 		       inetutils_cv_includedir_ncurses,
+          if test "$have_ncursesw" = yes; then
+            ncursesdir=ncursesw
+          else
+            ncursesdir=ncurses
+          fi
 	  for D in $includedir $prefix/include /local/include /usr/local/include /include /usr/include; do
-	    if test -d $D/ncurses; then
-	      inetutils_cv_includedir_ncurses="$D/ncurses"
+	    if test -d $D/$ncursesdir; then
+	      inetutils_cv_includedir_ncurses="$D/$ncursesdir"
 	      break
 	    fi
 	    test "$inetutils_cv_includedir_ncurses" \
@@ -68,6 +79,9 @@ AC_DEFUN([IU_LIB_NCURSES], [
         NCURSES_INCLUDE="-I$inetutils_cv_includedir_ncurses"
       fi
     fi
+    if test $have_ncursesw = yes; then
+      AC_DEFINE(HAVE_NCURSESW, 1, [Define if you have working ncursesw])
+    fi
   fi
   AC_SUBST(NCURSES_INCLUDE)
   AC_SUBST(LIBNCURSES)])dnl
diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
index 76ddbdd..585059f 100644
--- a/pinentry/pinentry-curses.c
+++ b/pinentry/pinentry-curses.c
@@ -42,6 +42,10 @@
 
 #include <memory.h>
 
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif /*HAVE_WCHAR_H*/
+
 #include "pinentry.h"
 
 /* FIXME: We should allow configuration of these button labels and in
@@ -94,6 +98,24 @@ struct dialog
 typedef struct dialog *dialog_t;
 
 
+#ifdef HAVE_NCURSESW
+typedef wchar_t CH;
+#define STRLEN(x) wcslen (x)
+#define ADDCH(x) addnwstr (&x, 1);
+#define CHWIDTH(x) wcwidth (x)
+#define NULLCH L'\0'
+#define NLCH L'\n'
+#define SPCH L' '
+#else
+typedef char CH;
+#define STRLEN(x) strlen (x)
+#define ADDCH(x) addch ((unsigned char) x)
+#define CHWIDTH(x) 1
+#define NULLCH '\0'
+#define NLCH '\n'
+#define SPCH ' '
+#endif
+
 /* Return the next line up to MAXLEN columns wide in START and LEN.
    The first invocation should have 0 as *LEN.  If the line ends with
    a \n, it is a normal line that will be continued.  If it is a '\0'
@@ -101,40 +123,95 @@ typedef struct dialog *dialog_t;
    there is a forced line break.  A full line is returned and will be
    continued in the next line.  */
 static void
-collect_line (int maxlen, char **start_p, int *len_p)
+collect_line (int maxwidth, wchar_t **start_p, int *len_p)
 {
   int last_space = 0;
   int len = *len_p;
-  char *end;
+  int width = 0;
+  CH *end;
 
   /* Skip to next line.  */
   *start_p += len;
   /* Skip leading space.  */
-  while (**start_p == ' ')
+  while (**start_p == SPCH)
     (*start_p)++;
 
   end = *start_p;
   len = 0;
 
-  while (len < maxlen - 1 && *end && *end != '\n')
+  while (width < maxwidth - 1 && *end != NULLCH && *end != NLCH)
     {
       len++;
       end++;
-      if (*end == ' ')
+      if (*end == SPCH)
 	last_space = len;
+      width += CHWIDTH (*end);
     }
 
-  if (*end && *end != '\n' && last_space != 0)
+  if (*end != NULLCH && *end != NLCH && last_space != 0)
     {
       /* We reached the end of the available space, but still have
 	 characters to go in this line.  We can break the line into
 	 two parts at a space.  */
       len = last_space;
-      (*start_p)[len] = '\n';
+      (*start_p)[len] = NLCH;
     }
   *len_p = len + 1;
 }
 
+#ifdef HAVE_NCURSESW
+static CH *
+utf8_to_local (char *lc_ctype, char *string)
+{
+  mbstate_t ps;
+  size_t len;
+  char *local;
+  const char *p;
+  wchar_t *wcs = NULL;
+  char *old_ctype = NULL;
+
+  local = pinentry_utf8_to_local (lc_ctype, string);
+  if (!local)
+    return NULL;
+
+  old_ctype = strdup (setlocale (LC_CTYPE, NULL));
+  setlocale (LC_CTYPE, lc_ctype? lc_ctype : "");
+
+  p = local;
+  memset (&ps, 0, sizeof(mbstate_t));
+  len = mbsrtowcs (NULL, &p, strlen (string), &ps);
+  if (len == (size_t)-1)
+    {
+      free (local);
+      goto leave;
+    }
+  wcs = calloc (len + 1, sizeof(wchar_t));
+  if (!wcs)
+    {
+      free (local);
+      goto leave;
+    }
+
+  p = local;
+  memset (&ps, 0, sizeof(mbstate_t));
+  mbsrtowcs (wcs, &p, len, &ps);
+
+ leave:
+  if (old_ctype)
+    {
+      setlocale (LC_CTYPE, old_ctype);
+      free (old_ctype);
+    }
+
+  return wcs;
+}
+#else
+static CH *
+utf8_to_local (const char *lc_ctype, const char *string)
+{
+  return pinentry_utf8_to_local (lc_ctype, string);
+}
+#endif
 
 static int
 dialog_create (pinentry_t pinentry, dialog_t dialog)
@@ -148,16 +225,15 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
   int xpos;
   int description_x = 0;
   int error_x = 0;
-  char *description = NULL;
-  char *error = NULL;
-  char *prompt = NULL;
+  CH *description = NULL;
+  CH *error = NULL;
+  CH *prompt = NULL;
 
 #define COPY_OUT(what)							\
   do									\
     if (pinentry->what)							\
       {									\
-        what = pinentry_utf8_to_local (pinentry->lc_ctype,		\
-				       pinentry->what);			\
+        what = utf8_to_local (pinentry->lc_ctype, pinentry->what);	\
         if (!what)							\
 	  {								\
 	    err = 1;							\
@@ -214,7 +290,7 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
   y = 1;		/* Top frame.  */
   if (description)
     {
-      char *start = description;
+      CH *start = description;
       int len = 0;
 
       do
@@ -232,7 +308,7 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
     {
       if (error)
 	{
-	  char *p = error;
+	  CH *p = error;
 	  int err_x = 0;
 
 	  while (*p)
@@ -287,7 +363,9 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
 
       new_x = MIN_PINENTRY_LENGTH;
       if (prompt)
-	new_x += strlen (prompt) + 1;	/* One space after prompt.  */
+	{
+	  new_x += STRLEN (prompt) + 1;	/* One space after prompt.  */
+	}
       if (new_x > size_x - 4)
 	new_x = size_x - 4;
       if (new_x > x)
@@ -335,7 +413,7 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
   ypos++;
   if (description)
     {
-      char *start = description;
+      CH *start = description;
       int len = 0;
 
       do
@@ -347,9 +425,11 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
 	  addch (' ');
 	  collect_line (size_x - 4, &start, &len);
 	  for (i = 0; i < len - 1; i++)
-	    addch ((unsigned char) start[i]);
-	  if (start[len - 1] && start[len - 1] != '\n')
-	    addch ((unsigned char) start[len - 1]);
+	    {
+	      ADDCH (start[i]);
+	    }
+	  if (start[len - 1] != NULLCH && start[len - 1] != NLCH)
+	    ADDCH (start[len - 1]);
 	  ypos++;
 	}
       while (start[len - 1]);
@@ -363,7 +443,7 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
 
       if (error)
 	{
-	  char *p = error;
+	  CH *p = error;
 	  i = 0;
 
 	  while (*p)
@@ -378,11 +458,11 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
 		}
 	      else
 		standout ();
-	      for (;*p && *p != '\n'; p++)
+	      for (;*p && *p != NLCH; p++)
 		if (i < x - 4)
 		  {
 		    i++;
-		    addch ((unsigned char) *p);
+		    ADDCH (*p);
 		  }
 	      if (USE_COLORS && pinentry->color_so != PINENTRY_COLOR_NONE)
 		{
@@ -410,14 +490,16 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
       dialog->pin_size = x - 4;
       if (prompt)
 	{
-	  char *p = prompt;
-	  i = strlen (prompt);
+	  CH *p = prompt;
+	  i = STRLEN (prompt);
 	  if (i > x - 4 - MIN_PINENTRY_LENGTH)
 	    i = x - 4 - MIN_PINENTRY_LENGTH;
 	  dialog->pin_x += i + 1;
 	  dialog->pin_size -= i + 1;
 	  while (i-- > 0)
-	    addch ((unsigned char) *(p++));
+	    {
+	      ADDCH (*(p++));
+	    }
 	  addch (' ');
 	}
       for (i = 0; i < dialog->pin_size; i++)
@@ -631,6 +713,17 @@ dialog_run (pinentry_t pinentry, const char *tty_name, const char *tty_type)
   SCREEN *screen = 0;
   int done = 0;
   char *pin_utf8;
+#ifdef HAVE_NCURSESW
+  char *old_ctype = NULL;
+
+  if (pinentry->lc_ctype)
+    {
+      old_ctype = strdup (setlocale (LC_CTYPE, NULL));
+      setlocale (LC_CTYPE, pinentry->lc_ctype);
+    }
+  else
+    setlocale (LC_CTYPE, "");
+#endif
 
   /* Open the desired terminal if necessary.  */
   if (tty_name)
@@ -804,6 +897,13 @@ dialog_run (pinentry_t pinentry, const char *tty_name, const char *tty_type)
   if (screen)
     delscreen (screen);
 
+#ifdef HAVE_NCURSESW
+  if (old_ctype)
+    {
+      setlocale (LC_CTYPE, old_ctype);
+      free (old_ctype);
+    }
+#endif
   if (ttyfi)
     fclose (ttyfi);
   if (ttyfo)

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

Summary of changes:
 .gitignore                 |   37 +++++++++++
 ChangeLog                  |    5 ++
 configure.ac               |   30 +++++-----
 m4/curses.m4               |   20 +++++-
 pinentry/pinentry-curses.c |  150 ++++++++++++++++++++++++++++++++++++-------
 5 files changed, 199 insertions(+), 43 deletions(-)
 create mode 100644 .gitignore


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Aug 23 16:18:47 2011
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 23 Aug 2011 16:18:47 +0200
Subject: [git] GPG-ERROR - branch, master,
	updated. libgpg-error-1.10-23-ge6bda00
Message-ID: <E1QvqcG-0004cM-7o@lists.gnupg.org>

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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  e6bda00b966010934150b0c2134b24ff07b7c9fc (commit)
       via  b128b8b1d60a615a41d2a4d717358f2bcce26c67 (commit)
      from  2a9687fced289571f19c95e0c759ac9eac41940c (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 -----------------------------------------------------------------
commit e6bda00b966010934150b0c2134b24ff07b7c9fc
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 23 15:37:27 2011 +0200

    Add GPG_ERR_DUP_KEY

diff --git a/ChangeLog b/ChangeLog
index a96f402..887758e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-23  Werner Koch  <wk at g10code.com>
+
+	* src/err-codes.h.in: Add GPG_ERR_DUP_KEY.
+
 2011-04-06  Werner Koch  <wk at g10code.com>
 
 	* autogen.sh: Support option --build-w64.
diff --git a/NEWS b/NEWS
index 972f61c..856fda0 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Noteworthy changes in version 1.11 (unreleased)
  GPG_ERR_NO_KEYSERVER          NEW.
  GPG_ERR_INV_CURVE             NEW.
  GPG_ERR_UNKNOWN_CURVE         NEW.
+ GPG_ERR_DUP_KEY               NEW.
 
 
 Noteworthy changes in version 1.10 (2010-10-26)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index 7c6627a..afabb0b 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -130,7 +130,13 @@ GPG_ERR_NO_VALUE		No value
 
 
 27	GPG_ERR_NOT_FOUND		Not found
-28	GPG_ERR_VALUE_NOT_FOUND		Value not found
+
+GPG_ERR_VALUE_NOT_FOUND		Value not found
+
+    GNUPG:  - A keyblock or a cert object was requested but not
+              found.  This might indicate an internal error here.
+
+
 29	GPG_ERR_SYNTAX			Syntax error
 30	GPG_ERR_BAD_MPI			Bad MPI value
 31	GPG_ERR_INV_PASSPHRASE		Invalid passphrase
@@ -169,6 +175,8 @@ GPG_ERR_INV_ARG			Invalid argument
     GCRYPT:  - Unsupported length of input data in encrypt or decrypt
                cipher functions.  For example not matching the block
                lengths of the algorithm.
+             - Incompatible args given; e.g. two or none if exactly one
+               is required.
     [more to come]
 
 
@@ -315,6 +323,7 @@ GPG_ERR_INV_LENGTH		Invalid length
               modes.
             - Bad length of input data; e.g. not a multiple of the
               block length.
+            - A length does not match the size of the digest algorithm.
     [more to come]
     GNUPG:  - Invalid hash length for a pubkey
     [more to come]
@@ -336,7 +345,12 @@ GPG_ERR_UNSUPPORTED_ENCODING	Unsupported encoding
 
 
 148	GPG_ERR_UNSUPPORTED_CMS_VERSION	Unsupported CMS version
+
+
 149	GPG_ERR_UNKNOWN_ALGORITHM	Unknown algorithm
+
+    GCRYPT:  gcry_kdf_proc for an unknown kdf algorithm
+
 150	GPG_ERR_INV_ENGINE		Invalid crypto engine
 151	GPG_ERR_PUBKEY_NOT_TRUSTED	Public key not trusted
 152	GPG_ERR_DECRYPT_FAILED		Decryption failed
@@ -418,5 +432,11 @@ GPG_ERR_LIMIT_REACHED           Limit reached
         many of directories with a similar name are already existing.
 
 
+GPG_ERR_DUP_KEY                 Duplicated key
+
+        A duplicated key was detected.  For example a unique key in a
+        database occurred more than once.
+
+
 199	GPG_ERR_UNFINISHED		Operation not yet finished
 200	GPG_ERR_BUFFER_TOO_SHORT	Buffer too short
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index 8bf8d87..e722688 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -218,7 +218,8 @@
 186	GPG_ERR_NO_KEYSERVER		No keyserver available
 187	GPG_ERR_INV_CURVE		Invalid elliptic curve
 188	GPG_ERR_UNKNOWN_CURVE		Unknown elliptic curve
-# 189 to 197 are free to be used.
+189     GPG_ERR_DUP_KEY                 Duplicated key
+# 190 to 197 are free to be used.
 
 198	GPG_ERR_FULLY_CANCELED		Operation fully cancelled
 199	GPG_ERR_UNFINISHED		Operation not yet finished

commit b128b8b1d60a615a41d2a4d717358f2bcce26c67
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Apr 6 16:13:02 2011 +0200

    Prepare for a W64 target.

diff --git a/ChangeLog b/ChangeLog
index 9334c75..a96f402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-06  Werner Koch  <wk at g10code.com>
 
+	* autogen.sh: Support option --build-w64.
+	* configure.ac (HAVE_W64_SYSTEM): New.
+
 	* src/gpg-error.m4: Test whether gpg-error-config exists.
 
 2011-02-23  Werner Koch  <wk at g10code.com>
@@ -1179,7 +1182,7 @@
 
 	* Initial check-in.
 
- Copyright 2003, 2004, 2005, 2006, 2007, 2010 g10 Code GmbH
+ Copyright 2003, 2004, 2005, 2006, 2007, 2010, 2011 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/autogen.sh b/autogen.sh
index dbc5080..596565b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,6 +64,10 @@ case "$1" in
         myhost="w32"
         myhostsub="ce"
         ;;
+    --build-w64)
+        myhost="w32"
+        myhostsub="64"
+        ;;
     --build*)
         echo "**Error**: invalid build option $1" >&2
         exit 1
@@ -92,6 +96,11 @@ if [ "$myhost" = "w32" ]; then
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
           toolprefixes="arm-mingw32ce"
           ;;
+        64)
+          w32root="$w64root"
+          [ -z "$w32root" ] && w32root="$HOME/w64root"
+          toolprefixes="amd64-mingw32msvc"
+          ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
           toolprefixes="i586-mingw32msvc i386-mingw32msvc"
@@ -110,7 +119,7 @@ if [ "$myhost" = "w32" ]; then
     done
     if [ -z "$crossbindir" ]; then
         echo "Cross compiler kit not installed" >&2
-        if [ -z "$sub" ]; then
+        if [ -z "$myhostsub" ]; then
           echo "Under Debian GNU/Linux, you may install it using" >&2
           echo "  apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
         fi
diff --git a/configure.ac b/configure.ac
index 5ae5b16..a2ad1dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +88,13 @@ AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
 
 # Set some internal variables depending on the platform for later use.
 have_w32_system=no
+have_w64_system=no
 have_w32ce_system=no
 case "${host}" in
+    x86_64-*mingw32*)
+        have_w32_system=yes
+        have_w64_system=yes
+        ;;
     *-mingw32ce*)
         have_w32_system=yes
         have_w32ce_system=yes
@@ -151,6 +156,9 @@ AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
 # Special defines for certain platforms
 if test "$have_w32_system" = yes; then
     AC_DEFINE(HAVE_W32_SYSTEM,1,[Defined if we run on a W32 API based system])
+    if test "$have_w64_system" = yes; then
+      AC_DEFINE(HAVE_W64_SYSTEM,1,[Defined if we run on 64 bit W32 API system])
+    fi
     if test "$have_w32ce_system" = yes; then
       AC_DEFINE(HAVE_W32CE_SYSTEM,1,[Defined if we run on WindowsCE])
       GPG_ERROR_CONFIG_ISUBDIRAFTER="gpg-extra"
@@ -170,6 +178,7 @@ fi
 AC_SUBST(BUILD_TIMESTAMP)
 AC_SUBST(BUILD_FILEVERSION)
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
+AM_CONDITIONAL(HAVE_W64_SYSTEM, test "$have_w64_system" = yes)
 AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
 
 

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

Summary of changes:
 ChangeLog          |    9 ++++++++-
 NEWS               |    1 +
 autogen.sh         |   11 ++++++++++-
 configure.ac       |    9 +++++++++
 doc/errorref.txt   |   22 +++++++++++++++++++++-
 src/err-codes.h.in |    3 ++-
 6 files changed, 51 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org



From cvs at cvs.gnupg.org  Tue Aug 23 16:28:25 2011
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Tue, 23 Aug 2011 16:28:25 +0200
Subject: [git] GPG-ERROR - branch, master,
	updated. libgpg-error-1.10-24-g27ffbcf
Message-ID: <E1Qvqla-0004kT-6t@lists.gnupg.org>

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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  27ffbcf63cf4e0cf87d0f4012735f709e215d5cb (commit)
      from  e6bda00b966010934150b0c2134b24ff07b7c9fc (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 -----------------------------------------------------------------
commit 27ffbcf63cf4e0cf87d0f4012735f709e215d5cb
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 23 15:46:50 2011 +0200

    Add GPG_ERR_AMBIGUOUS

diff --git a/ChangeLog b/ChangeLog
index 887758e..ecf78dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2011-08-23  Werner Koch  <wk at g10code.com>
 
-	* src/err-codes.h.in: Add GPG_ERR_DUP_KEY.
+	* src/err-codes.h.in: Add GPG_ERR_DUP_KEY and GPG_ERR_AMBIGUOUS.
 
 2011-04-06  Werner Koch  <wk at g10code.com>
 
diff --git a/NEWS b/NEWS
index 856fda0..6ca6e3f 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Noteworthy changes in version 1.11 (unreleased)
  GPG_ERR_INV_CURVE             NEW.
  GPG_ERR_UNKNOWN_CURVE         NEW.
  GPG_ERR_DUP_KEY               NEW.
+ GPG_ERR_AMBIGUOUS             NEW.
 
 
 Noteworthy changes in version 1.10 (2010-10-26)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index afabb0b..bbc9001 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -437,6 +437,11 @@ GPG_ERR_DUP_KEY                 Duplicated key
         A duplicated key was detected.  For example a unique key in a
         database occurred more than once.
 
+GPG_ERR_AMBIGUOUS		Ambiguous search
+
+        A search etc returned an ambigious result.  This usually means
+        that the search string was not specific enough.
+
 
 199	GPG_ERR_UNFINISHED		Operation not yet finished
 200	GPG_ERR_BUFFER_TOO_SHORT	Buffer too short
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index e722688..dcef931 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -218,8 +218,9 @@
 186	GPG_ERR_NO_KEYSERVER		No keyserver available
 187	GPG_ERR_INV_CURVE		Invalid elliptic curve
 188	GPG_ERR_UNKNOWN_CURVE		Unknown elliptic curve
-189     GPG_ERR_DUP_KEY                 Duplicated key
-# 190 to 197 are free to be used.
+189	GPG_ERR_DUP_KEY			Duplicated key
+190	GPG_ERR_AMBIGUOUS		Ambiguous result
+# 191 to 197 are free to be used.
 
 198	GPG_ERR_FULLY_CANCELED		Operation fully cancelled
 199	GPG_ERR_UNFINISHED		Operation not yet finished

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

Summary of changes:
 ChangeLog          |    2 +-
 NEWS               |    1 +
 doc/errorref.txt   |    5 +++++
 src/err-codes.h.in |    5 +++--
 4 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Aug 26 16:02:43 2011
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 26 Aug 2011 16:02:43 +0200
Subject: [git] GnuPG - branch, master,
	updated. post-nuke-of-trailing-ws-91-gbea3b7c
Message-ID: <E1Qwvmp-00070t-Dj@lists.gnupg.org>

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  bea3b7c93f0a611dcd5921d04596ab2dc6e3d547 (commit)
       via  4379c01a24570c01a355f47e5e187d09676d64d6 (commit)
      from  816bee1fa0d833ac72ea4e7d52465e6e1da2645d (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 -----------------------------------------------------------------
commit bea3b7c93f0a611dcd5921d04596ab2dc6e3d547
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 26 15:20:41 2011 +0200

    Mark component descriptions for translation.

diff --git a/tools/ChangeLog b/tools/ChangeLog
index 3888802..9ae75d1 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-26  Werner Koch  <wk at g10code.com>
+
+	* gpgconf-comp.c (gc_component): Mark for translation.  Suggested
+	by Yuri Chornoivan.
+
 2011-03-08  Werner Koch  <wk at g10code.com>
 
 	* symcryptrun.c [HAVE_UTMP_H]: Include utmp.h.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index bcdecfd..0b39ac4 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1023,12 +1023,12 @@ static struct
   gc_option_t *options;
 } gc_component[] =
   {
-    { "gpg", NULL,   "GPG for OpenPGP", gc_options_gpg },
-    { "gpg-agent", NULL, "GPG Agent", gc_options_gpg_agent },
-    { "scdaemon", NULL, "Smartcard Daemon", gc_options_scdaemon },
-    { "gpgsm", NULL, "GPG for S/MIME", gc_options_gpgsm },
-    { "dirmngr", NULL, "Directory Manager", gc_options_dirmngr },
-    { "pinentry", NULL, "PIN and Passphrase Entry", gc_options_pinentry }
+    { "gpg",      "gnupg", N_("GPG for OpenPGP"), gc_options_gpg },
+    { "gpg-agent","gnupg", N_("GPG Agent"), gc_options_gpg_agent },
+    { "scdaemon", "gnupg", N_("Smartcard Daemon"), gc_options_scdaemon },
+    { "gpgsm",    "gnupg", N_("GPG for S/MIME"), gc_options_gpgsm },
+    { "dirmngr",  "gnupg", N_("Directory Manager"), gc_options_dirmngr },
+    { "pinentry", "gnupg", N_("PIN and Passphrase Entry"), gc_options_pinentry }
   };
 
 

commit 4379c01a24570c01a355f47e5e187d09676d64d6
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 12 14:40:47 2011 +0200

    Beautified the online html manual

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 32ce715..39c8dec 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-12  Werner Koch  <wk at g10code.com>
+
+	* texi.css: Override some elements.
+	* gnupg-log-tr.png: New.
+	* gnupg.texi:  Use transparent logo.
+
 2011-03-01  Werner Koch  <wk at g10code.com>
 
 	* gpgsm.texi (CSR and certificate creation): New.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9c15c64..f9fd008 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,7 +29,7 @@ helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
 EXTRA_DIST = samplekeys.asc \
-	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png \
+	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png\
              gnupg-card-architecture.eps gnupg-card-architecture.png \
              gnupg-card-architecture.pdf \
              FAQ gnupg7.texi \
@@ -129,7 +129,7 @@ gnupg.texi : $(gnupg_TEXINFOS)
 online: gnupg.html gnupg.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
-	cp $(srcdir)/gnupg-logo.png gnupg.html/; \
+	cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \
         user=werner ; dashdevel="" ; \
         if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \
 	  dashdevel="-devel" ; \
diff --git a/doc/gnupg-logo-tr.png b/doc/gnupg-logo-tr.png
new file mode 100644
index 0000000..af21af9
Binary files /dev/null and b/doc/gnupg-logo-tr.png differ
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 7bb54af..1f0682b 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -5,12 +5,12 @@
 @settitle Using the GNU Privacy Guard
 
 @c A couple of macros with no effect on texinfo
- at c but used by the yat2m processor. 
+ at c but used by the yat2m processor.
 @macro manpage {a}
 @end macro
 @macro mansect {a}
 @end macro
- at macro manpause 
+ at macro manpause
 @end macro
 @macro mancont
 @end macro
@@ -110,12 +110,12 @@ section entitled ``Copying''.
 @end ifnothtml
 
 @ifhtml
- at center @image{gnupg-logo,6cm,,The GnuPG Logo}
+ at center @image{gnupg-logo-tr,6cm,,The GnuPG Logo}
 @end ifhtml
 
 @ifnottex
 @node Top
- at top 
+ at top
 @insertcopying
 
 This manual documents how to use the GNU Privacy Guard system as well as
@@ -207,14 +207,14 @@ the administration and the architecture.
 
 @c @node History
 @c @unnumbered History
- at c 
- at c Here are the notices from the old dirmngr manual: 
+ at c
+ at c Here are the notices from the old dirmngr manual:
 @c
 @c @itemize
 @c @item Using DirMngr, 2002, Steffen Hansen, Klar"alvdalens Datakonsult AB.
 @c @item Using DirMngr, 2004, 2005, 2006, 2008 Werner Koch, g10 Code GmbH.
 @c @end itemize
- at c 
+ at c
 
 
 @bye
diff --git a/doc/texi.css b/doc/texi.css
index a369abc..c1e9f48 100644
--- a/doc/texi.css
+++ b/doc/texi.css
@@ -1,6 +1,23 @@
 /* The gnupg.org standard stylesheet.  */
   @import url(/share/site.css);
 
+/* The gnupg site sets body margins to zero.  Because we don't have
+   the table layout here we have to set our own margins for the body.  */
+body {
+    margin-left: 1em;
+    margin-right: 1em;
+}
+
+/* Make the top header larger.  */
+h1 {
+  text-align: center;
+  font-size: 200%;
+}
+
+h1:first-letter {
+  font-size: 120%;
+}
+
 
 
 

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

Summary of changes:
 doc/ChangeLog         |    6 ++++++
 doc/Makefile.am       |    4 ++--
 doc/gnupg-logo-tr.png |  Bin 0 -> 9415 bytes
 doc/gnupg.texi        |   14 +++++++-------
 doc/texi.css          |   17 +++++++++++++++++
 tools/ChangeLog       |    5 +++++
 tools/gpgconf-comp.c  |   12 ++++++------
 7 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 doc/gnupg-logo-tr.png


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org