From cvs at cvs.gnupg.org  Fri Jul 13 11:39:02 2012
From: cvs at cvs.gnupg.org (by Daniel Leidert)
Date: Fri, 13 Jul 2012 11:39:02 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.2-1-gfb738b2
Message-ID: <E1Spb9O-0003NN-2Z@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 Assistant".

The branch, master has been updated
       via  fb738b2e624081751b09726b98eb9d011c44f37b (commit)
      from  817a6b3896ad645711836bea3c9fd6592458b44d (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 fb738b2e624081751b09726b98eb9d011c44f37b
Author: Daniel Leidert <dleidert at debian.org>
Date:   Fri Jul 13 10:22:16 2012 +0200

    Fix a segmentation fault opening file-manager mode.
    
    * src/fileman.c (file_list_new): s/select/sel, which is undefined.

diff --git a/src/fileman.c b/src/fileman.c
index 11636b4..90c60dd 100644
--- a/src/fileman.c
+++ b/src/fileman.c
@@ -737,7 +737,7 @@ file_list_new (GpaFileManager * fileman)
 
   sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
   gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE);
-  g_signal_connect_swapped (select, "changed",
+  g_signal_connect_swapped (sel, "changed",
 			    G_CALLBACK (update_selection_sensitive_actions),
 			    fileman);
 

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

Summary of changes:
 src/fileman.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Jul 13 15:17:24 2012
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 13 Jul 2012 15:17:24 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.3.2-3-ge7aeaeb
Message-ID: <E1SpeYg-00085i-GB@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 "GnuPG Made Easy".

The branch, master has been updated
       via  e7aeaebb01395b170c91f290bf3ff5021023420f (commit)
       via  9f081da7356288a96e8ea4d81a74ff706c00b0cd (commit)
      from  4751a0e1bcd68a0c9f59a2685e3a2bee9d5008a6 (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 e7aeaebb01395b170c91f290bf3ff5021023420f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 13 14:00:22 2012 +0200

    Do not include the removed file status-table.h
    
    * src/engine-uiserver.c: Remove status-table.h which is not anymore
    built.  Fixes bug#1412.
    --
    
    The file was actually removed from the code by 885243e0 but for
    unknown reasons the missing file was not reported by "make distcheck".

diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
index c705a4b..5468a44 100644
--- a/src/engine-uiserver.c
+++ b/src/engine-uiserver.c
@@ -1,19 +1,19 @@
 /* engine-uiserver.c - Uiserver engine.
    Copyright (C) 2000 Werner Koch (dd9jn)
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 g10 Code GmbH
- 
+
    This file is part of GPGME.
 
    GPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as
    published by the Free Software Foundation; either version 2.1 of
    the License, or (at your option) any later version.
-   
+
    GPGME 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
    Lesser General Public License for more details.
-   
+
    You should have received a copy of the GNU Lesser General Public
    License along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -49,7 +49,6 @@
 #include "data.h"
 
 #include "assuan.h"
-#include "status-table.h"
 #include "debug.h"
 
 #include "engine-backend.h"
@@ -104,7 +103,7 @@ struct engine_uiserver
       int linelen;
     } attic;
     int any; /* any data line seen */
-  } colon; 
+  } colon;
 
   gpgme_data_t inline_data;  /* Used to collect D lines.  */
 
@@ -114,7 +113,7 @@ struct engine_uiserver
 typedef struct engine_uiserver *engine_uiserver_t;
 
 
-static void uiserver_io_event (void *engine, 
+static void uiserver_io_event (void *engine,
                             gpgme_event_io_t type, void *type_data);
 
 
@@ -422,7 +421,7 @@ uiserver_set_locale (void *engine, int category, const char *value)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   /* FIXME: Reset value to default.  */
-  if (!value) 
+  if (!value)
     return 0;
 
   if (asprintf (&optstr, "OPTION %s=%s", catstr, value) < 0)
@@ -658,7 +657,7 @@ status_handler (void *opaque, int fd)
 	  if (uiserver->status.fnc)
 	    err = uiserver->status.fnc (uiserver->status.fnc_value,
 				     GPGME_STATUS_EOF, "");
-	  
+
 	  if (!err && uiserver->colon.fnc && uiserver->colon.any)
             {
               /* We must tell a colon function about the EOF. We do
@@ -721,12 +720,12 @@ status_handler (void *opaque, int fd)
 		      *dst = *src++;
 		      (*alinelen)++;
 		    }
-		  
+
 		  if (*dst == '\n')
 		    {
 		      /* Terminate the pending line, pass it to the colon
 			 handler and reset it.  */
-		      
+
 		      uiserver->colon.any = 1;
 		      if (*alinelen > 1 && *(dst - 1) == '\r')
 			dst--;
@@ -769,10 +768,10 @@ status_handler (void *opaque, int fd)
                 }
               else
                 *dst++ = *src++;
-              
+
               linelen++;
             }
-          
+
           src = line + 2;
           while (linelen > 0)
             {
@@ -796,7 +795,7 @@ status_handler (void *opaque, int fd)
 	{
 	  char *rest;
 	  gpgme_status_code_t r;
-	  
+
 	  rest = strchr (line + 2, ' ');
 	  if (!rest)
 	    rest = line + linelen; /* set to an empty string */
@@ -819,7 +818,7 @@ status_handler (void *opaque, int fd)
       else if (linelen >= 7
                && line[0] == 'I' && line[1] == 'N' && line[2] == 'Q'
                && line[3] == 'U' && line[4] == 'I' && line[5] == 'R'
-               && line[6] == 'E' 
+               && line[6] == 'E'
                && (line[7] == '\0' || line[7] == ' '))
         {
           char *keyword = line+7;
@@ -832,7 +831,7 @@ status_handler (void *opaque, int fd)
 
     }
   while (!err && assuan_pending_line (uiserver->assuan_ctx));
-	  
+
   return err;
 }
 
@@ -1093,7 +1092,7 @@ uiserver_encrypt (void *engine, gpgme_key_t recp[], gpgme_encrypt_flags_t flags,
 	  return err;
 	}
     }
-    
+
   if (ciph)
     {
       uiserver->output_cb.data = ciph;
@@ -1154,14 +1153,14 @@ uiserver_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
   if (key)
     {
       const char *s = NULL;
-      
+
       if (key && key->uids)
         s = key->uids->email;
-      
+
       if (s && strlen (s) < 80)
         {
           char buf[100];
-          
+
           strcpy (stpcpy (buf, "SENDER --info "), s);
           err = uiserver_assuan_simple_command (uiserver->assuan_ctx, buf,
                                                 uiserver->status.fnc,
@@ -1170,7 +1169,7 @@ uiserver_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
       else
         err = gpg_error (GPG_ERR_INV_VALUE);
       gpgme_key_unref (key);
-      if (err) 
+      if (err)
       {
 	free (cmd);
 	return err;
@@ -1257,7 +1256,7 @@ uiserver_verify (void *engine, gpgme_data_t sig, gpgme_data_t signed_text,
 
 static void
 uiserver_set_status_handler (void *engine, engine_status_handler_t fnc,
-			  void *fnc_value) 
+			  void *fnc_value)
 {
   engine_uiserver_t uiserver = engine;
 
@@ -1268,7 +1267,7 @@ uiserver_set_status_handler (void *engine, engine_status_handler_t fnc,
 
 static gpgme_error_t
 uiserver_set_colon_line_handler (void *engine, engine_colon_line_handler_t fnc,
-			      void *fnc_value) 
+			      void *fnc_value)
 {
   engine_uiserver_t uiserver = engine;
 

commit 9f081da7356288a96e8ea4d81a74ff706c00b0cd
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 13 10:59:22 2012 +0200

    Make handling of new conf values more robust (bug#1413).
    
    * src/engine-gpgconf.c (arg_to_data): Allow for NULL as value.string.
    --
    
    I was not able to replicate the problem.  However this patch makes the
    code more robust and tolerates errors by the user.  IT should fix the
    problem at hand.

diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index 6807dce..8de847c 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -1,19 +1,19 @@
 /* engine-gpgconf.c - gpg-conf engine.
    Copyright (C) 2000 Werner Koch (dd9jn)
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008 g10 Code GmbH
- 
+
    This file is part of GPGME.
 
    GPGME is free software; you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as
    published by the Free Software Foundation; either version 2.1 of
    the License, or (at your option) any later version.
-   
+
    GPGME 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
    Lesser General Public License for more details.
-   
+
    You should have received a copy of the GNU Lesser General Public
    License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -147,7 +147,7 @@ release_opt (gpgme_conf_opt_t opt)
   release_arg (opt->default_value, opt->alt_type);
   if (opt->default_description)
     free (opt->default_description);
-  
+
   release_arg (opt->no_arg_value, opt->alt_type);
   release_arg (opt->value, opt->alt_type);
   release_arg (opt->new_value, opt->alt_type);
@@ -218,7 +218,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
 
   /* _gpgme_engine_new guarantees that this is not NULL.  */
   argv[0] = gpgconf->file_name;
-  
+
   if (_gpgme_io_pipe (rp, 1) < 0)
     return gpg_error_from_syserror ();
 
@@ -234,7 +234,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
 
   do
     {
-      nread = _gpgme_io_read (rp[0], 
+      nread = _gpgme_io_read (rp[0],
                               linebuf + linelen, LINELENGTH - linelen - 1);
       if (nread > 0)
 	{
@@ -268,7 +268,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
 	}
     }
   while (nread > 0 && linelen < LINELENGTH - 1);
-  
+
   if (!err && nread < 0)
     err = gpg_error_from_syserror ();
   if (!err && nread > 0)
@@ -369,15 +369,15 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
 	    case GPGME_CONF_UINT32:
 	      arg->value.uint32 = strtoul (line, NULL, 0);
 	      break;
-	      
+
 	    case GPGME_CONF_INT32:
 	      arg->value.uint32 = strtol (line, NULL, 0);
 	      break;
-	      
+
 	    case GPGME_CONF_STRING:
               /* The complex types below are only here to silent the
                  compiler warning. */
-            case GPGME_CONF_FILENAME: 
+            case GPGME_CONF_FILENAME:
             case GPGME_CONF_LDAP_SERVER:
             case GPGME_CONF_KEY_FPR:
             case GPGME_CONF_PUB_KEY:
@@ -385,7 +385,7 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
             case GPGME_CONF_ALIAS_LIST:
 	      /* Skip quote character.  */
 	      line++;
-	      
+
 	      err = _gpgme_decode_percent_string (line, &arg->value.string,
 						  0, 0);
 	      if (err)
@@ -557,11 +557,11 @@ _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p,
 	case GPGME_CONF_UINT32:
 	  arg->value.uint32 = *((unsigned int *) value);
 	  break;
-	  
+
 	case GPGME_CONF_INT32:
 	  arg->value.int32 = *((int *) value);
 	  break;
-	  
+
 	case GPGME_CONF_STRING:
 	case GPGME_CONF_FILENAME:
 	case GPGME_CONF_LDAP_SERVER:
@@ -576,7 +576,7 @@ _gpgme_conf_arg_new (gpgme_conf_arg_t *arg_p,
 	      return gpg_error_from_syserror ();
 	    }
 	  break;
-	  
+
 	default:
 	  free (arg);
 	  return gpg_error (GPG_ERR_INV_VALUE);
@@ -600,7 +600,7 @@ _gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type)
     case GPGME_CONF_STRING:
     default:
       break;
-       
+
     case GPGME_CONF_FILENAME:
     case GPGME_CONF_LDAP_SERVER:
     case GPGME_CONF_KEY_FPR:
@@ -737,53 +737,54 @@ arg_to_data (gpgme_data_t conf, gpgme_conf_opt_t option, gpgme_conf_arg_t arg)
 	  buf[sizeof (buf) - 1] = '\0';
 	  amt = gpgme_data_write (conf, buf, strlen (buf));
 	  break;
-	  
+
 	case GPGME_CONF_INT32:
 	  snprintf (buf, sizeof (buf), "%i", arg->value.uint32);
 	  buf[sizeof (buf) - 1] = '\0';
 	  amt = gpgme_data_write (conf, buf, strlen (buf));
 	  break;
-	
-          
+
+
 	case GPGME_CONF_STRING:
           /* The complex types below are only here to silent the
              compiler warning. */
-        case GPGME_CONF_FILENAME: 
+        case GPGME_CONF_FILENAME:
         case GPGME_CONF_LDAP_SERVER:
         case GPGME_CONF_KEY_FPR:
         case GPGME_CONF_PUB_KEY:
         case GPGME_CONF_SEC_KEY:
         case GPGME_CONF_ALIAS_LIST:
-	  /* One quote character, and three times to allow
-	     for percent escaping.  */
-	  {
-	    char *ptr = arg->value.string;
-	    amt = gpgme_data_write (conf, "\"", 1);
-	    if (amt < 0)
-	      break;
-
-	    while (!err && *ptr)
-	      {
-		switch (*ptr)
-		  {
-		  case '%':
-		    amt = gpgme_data_write (conf, "%25", 3);
-		    break;
-
-		  case ':':
-		    amt = gpgme_data_write (conf, "%3a", 3);
-		    break;
-
-		  case ',':
-		    amt = gpgme_data_write (conf, "%2c", 3);
-		    break;
-
-		  default:
-		    amt = gpgme_data_write (conf, ptr, 1);
-		  }
-		ptr++;
-	      }
-	  }
+          if (arg->value.string)
+            {
+              /* One quote character, and three times to allow for
+                 percent escaping.  */
+              char *ptr = arg->value.string;
+              amt = gpgme_data_write (conf, "\"", 1);
+              if (amt < 0)
+                break;
+
+              while (!err && *ptr)
+                {
+                  switch (*ptr)
+                    {
+                    case '%':
+                      amt = gpgme_data_write (conf, "%25", 3);
+                      break;
+
+                    case ':':
+                      amt = gpgme_data_write (conf, "%3a", 3);
+                      break;
+
+                    case ',':
+                      amt = gpgme_data_write (conf, "%2c", 3);
+                      break;
+
+                    default:
+                      amt = gpgme_data_write (conf, ptr, 1);
+                    }
+                  ptr++;
+                }
+            }
 	  break;
 	}
 
@@ -798,7 +799,7 @@ arg_to_data (gpgme_data_t conf, gpgme_conf_opt_t option, gpgme_conf_arg_t arg)
 
   if (amt < 0)
     return gpg_error_from_syserror ();
-  
+
   return 0;
 }
 

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

Summary of changes:
 src/engine-gpgconf.c  |  101 +++++++++++++++++++++++++------------------------
 src/engine-uiserver.c |   43 ++++++++++-----------
 2 files changed, 72 insertions(+), 72 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Fri Jul 13 15:27:34 2012
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 13 Jul 2012 15:27:34 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.2-3-g58ad96d
Message-ID: <E1SpeiW-0008Nq-QL@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 Assistant".

The branch, master has been updated
       via  58ad96da3adc3c0dcaac71f92a3db91747cb55f9 (commit)
       via  44b6bdf63bd459f4469b37ae2454345992cfb661 (commit)
      from  fb738b2e624081751b09726b98eb9d011c44f37b (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 58ad96da3adc3c0dcaac71f92a3db91747cb55f9
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 13 14:11:44 2012 +0200

    Update man page from Debian (bug#1412)
    
    * doc/gpa.1: Update.

diff --git a/doc/gpa.1 b/doc/gpa.1
index b3712ab..bc8724c 100644
--- a/doc/gpa.1
+++ b/doc/gpa.1
@@ -1,75 +1,101 @@
-.TH "GPA" "1" "" "" "User Commands"
-.nh
-.SH "NAME"
-gpa \- graphical frontend for the GNU Privacy Guard
-
-.SH "SYNOPSIS"
-.B gpa
-.RI [ "OPTION(S)" ]
-
-.SH "DESCRIPTION"
-The GNU Privacy Assistant (GPA) is a graphical user interface for the GNU
-Privacy Guard (GnuPG).
-.PP
-\fBgpa\fP can be used to encrypt, decrypt, and sign files, to verify
-signatures and to manage the private and public keys.
-
-.SH "OPTIONS"
-.TP
-.B \-C, \-\-card
-Start with the card-manager open.
-.TP
-.B \-c, \-\-clipboard
-Open the clipboard.
-.TP
-.B \-d, \-\-daemon
-Enable the UI server.
-.TP
-.B \-\-display=\fIDISPLAY\fP
-Open on the specified \fIDISPLAY\fP.
-.TP
-.B \-f, \-\-files
-Start with the file-manager open.
-.TP
-.B \-k, \-\-keyring
-Start with the keyring editor. This is the \fIdefault\fP.
-.TP
-.B \-o, \-\-options=\fIFILE\fP
-Read options from the specified file instead of \fI\%~/.gnupg/gpa.conf\fP.
-.TP
-.B \-s, \-\-settings
-Open the settings dialog.
-.TP
-.B \-?, \-\-help, \-\-help\-all
-Print usage information and exit.
-.TP
-.B \-\-help\-gtk
-Print options related to GTK. See also
-.BR \%gtk\-options "(7)."
-.TP
-.B \-v, \-\-version
-Print version information and exit.
-
-.SH FILES
-.TP
-.I \%~/.gnupg/gpa.conf
-Standard user configuration file read by \fBgpa\fP on startup.
-
-.SH "BUGS"
-Please report bugs to <\&\%bug\-gpa at gnupg.org\&>.
-
-.SH AUTHORS
-.B gpa
-was written by \fBMiguel Coca\fP, amongst others.
-.PP 
-This manual page was written by \fBArthur de Jong\fP <\&adejong at debian.org\&>
-and \fBDaniel Leidert\fP <\&daniel.leidert at wgdd.de\&> for the Debian GNU/Linux
-system (but may be used by others).
-\" Accroding to https://bugs.g10code.com/gnupg/issue1165:
-\" After talking to Arthur, the author of the manual page, the manual
-\" page is provided under the GNU General Public license version 2 or
-\" (at your option) any later version.
-
-.SH "SEE ALSO"
-.BR gpg (1),
-.BR gtk\-options (7)
+.TH "gpa" "1" "" "" "User Commands"
+.nh
+.SH "NAME"
+gpa \- graphical frontend for the GNU Privacy Guard
+
+.SH "SYNOPSIS"
+.B gpa
+.RB [ "OPTION(S)" ]
+.RI [ "FILE(S)" ]
+
+.SH "DESCRIPTION"
+The GNU Privacy Assistant (GPA) is a graphical user interface for the GNU
+Privacy Guard (GnuPG).
+.PP
+\fBgpa\fP can be used to encrypt, decrypt, and sign files, to verify
+signatures and to manage the private and public keys.
+
+.SH "OPTIONS"
+.TP
+.B \-c, \-\-clipboard
+Open the clipboard.
+.TP
+.B \-C, \-\-card
+Start with the card-manager open.
+.TP
+.B \-d, \-\-daemon
+Enable the UI server.
+.TP
+.B \-\-debug-edit-fsm
+Debug the Finite State Machine (FSM).
+.TP
+.B \-\-disable\-ticker
+Disable ticker used for card operations.
+.TP
+.B \-\-disable-x509
+Disable support for X.509.
+.TP
+.B \-\-enable-logging
+Enable logging on Win32 systems.
+.TP
+.B \-f, \-\-files
+Start with the file-manager open. This is the \fIdefault\fP if one or more
+\fIFILE(S)\fP are added to the command arguments.
+.TP
+.B \-\-gpg-binary=\fIFILE\fP
+Path to the
+.BR gpg (1)
+or
+.BR gpg2 (1)
+binary.
+.TP
+.B \-\-gpgsm-binary=\fIFILE\fP
+Path to the
+.BR gpgsm (1)
+binary.
+.TP
+.B \-k, \-\-keyring
+Start with the keyring editor. This is the \fIdefault\fP.
+.TP
+.B \-o, \-\-options=\fIFILE\fP
+Read options from the specified file instead of \fI~/.gnupg/gpa.conf\fP.
+.TP
+.B \-s, \-\-settings
+Open the settings dialog.
+.TP
+.B \-v, \-\-version
+Print version information and exit.
+.TP
+.B \-x, \-\-cms
+Enable basic support for X.509.
+.TP
+.B \-\-help\-gtk
+Print options related to GTK. See also
+.BR gtk-options "(7)."
+.TP
+.B \-?, \-\-help, \-\-help\-all
+Print usage information and exit.
+
+.SH FILES
+.TP
+.I ~/.gnupg/gpa.conf
+Standard user configuration file read by \fBgpa\fP on startup.
+
+.SH "BUGS"
+Please report bugs to <bug\-gpa at gnupg.org> or to
+\fI\%https://bugs.g10code.com/gnupg/\fR.
+
+.SH AUTHORS
+.B gpa
+was written by \fBMiguel Coca\fP, amongst others.
+.PP
+This manual page was written by \fBArthur de Jong\fP <\&adejong at debian.org\&>
+and \fBDaniel Leidert\fP <\&daniel.leidert at wgdd.de\&> for the Debian GNU/Linux
+system (but may be used by others).
+
+.SH "SEE ALSO"
+.BR gpg (1),
+.BR gpg2 (1),
+.BR gpgconf (1),
+.BR gpgsm (1),
+.BR gtk-options (7)

commit 44b6bdf63bd459f4469b37ae2454345992cfb661
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 13 13:48:32 2012 +0200

    Fix segv in option setting
    
    * src/confdialog.c (arg_to_str, args_are_equal): Take care of the
    NO_ARG field to using the values if it has been set.
    --
    
    This is a part of the fix for bug#1413.  The other part is a fix in
    gpgme.  It would be possible to do fix this only in GPA but the fix in
    gpgme makes gpgme also more robust.

diff --git a/src/confdialog.c b/src/confdialog.c
index c95e35d..fc1252b 100644
--- a/src/confdialog.c
+++ b/src/confdialog.c
@@ -198,33 +198,36 @@ arg_to_str (gpgme_conf_arg_t arg, gpgme_conf_type_t type)
       else
 	result = g_strdup ("");
 
-      switch (type)
-	{
-	case GPGME_CONF_NONE:
-	case GPGME_CONF_UINT32:
-	  new_result = g_strdup_printf ("%s%u", result, arg->value.uint32);
-	  g_free (result);
-	  result = new_result;
-	  break;
-
-	case GPGME_CONF_INT32:
-	  new_result = g_strdup_printf ("%s%i", result, arg->value.int32);
-	  g_free (result);
-	  result = new_result;
-	  break;
-
-	case GPGME_CONF_STRING:
-	case GPGME_CONF_PATHNAME:
-	case GPGME_CONF_LDAP_SERVER:
-	  new_result = g_strdup_printf ("%s%s", result, arg->value.string);
-	  g_free (result);
-	  result = new_result;
-	  break;
-
-	default:
-	  assert (!"Not supported.");
-	  break;
-	}
+      if (!arg->no_arg)
+        {
+          switch (type)
+            {
+            case GPGME_CONF_NONE:
+            case GPGME_CONF_UINT32:
+              new_result = g_strdup_printf ("%s%u", result, arg->value.uint32);
+              g_free (result);
+              result = new_result;
+              break;
+
+            case GPGME_CONF_INT32:
+              new_result = g_strdup_printf ("%s%i", result, arg->value.int32);
+              g_free (result);
+              result = new_result;
+              break;
+
+            case GPGME_CONF_STRING:
+            case GPGME_CONF_PATHNAME:
+            case GPGME_CONF_LDAP_SERVER:
+              new_result = g_strdup_printf ("%s%s", result, arg->value.string);
+              g_free (result);
+              result = new_result;
+              break;
+
+            default:
+              assert (!"Not supported.");
+              break;
+            }
+        }
       arg = arg->next;
     }
   return result;
@@ -412,30 +415,35 @@ args_are_equal (gpgme_conf_arg_t arg1, gpgme_conf_arg_t arg2,
 {
   while (arg1 && arg2)
     {
-      switch (type)
-	{
-	case GPGME_CONF_NONE:
-	case GPGME_CONF_UINT32:
-	  if (arg1->value.uint32 != arg2->value.uint32)
-	    return 0;
-	  break;
-
-	case GPGME_CONF_INT32:
-	  if (arg1->value.int32 != arg2->value.int32)
-	    return 0;
-	  break;
-
-	case GPGME_CONF_STRING:
-	case GPGME_CONF_LDAP_SERVER:
-	case GPGME_CONF_PATHNAME:
-	  if (strcmp (arg1->value.string, arg2->value.string))
-	    return 0;
-	  break;
-
-	default:
-	  assert (!"Not supported.");
-	  break;
-	}
+      if ((!arg1->no_arg ^ !arg2->no_arg))
+        return 0;
+      if (!arg1->no_arg)
+        {
+          switch (type)
+            {
+            case GPGME_CONF_NONE:
+            case GPGME_CONF_UINT32:
+              if (arg1->value.uint32 != arg2->value.uint32)
+                return 0;
+              break;
+
+            case GPGME_CONF_INT32:
+              if (arg1->value.int32 != arg2->value.int32)
+                return 0;
+              break;
+
+            case GPGME_CONF_STRING:
+            case GPGME_CONF_LDAP_SERVER:
+            case GPGME_CONF_PATHNAME:
+              if (strcmp (arg1->value.string, arg2->value.string))
+                return 0;
+              break;
+
+            default:
+              assert (!"Not supported.");
+              break;
+            }
+        }
 
       arg1 = arg1->next;
       arg2 = arg2->next;

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

Summary of changes:
 doc/gpa.1        |  176 +++++++++++++++++++++++++++++++-----------------------
 src/confdialog.c |  110 ++++++++++++++++++----------------
 2 files changed, 160 insertions(+), 126 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Jul 13 16:04:01 2012
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Fri, 13 Jul 2012 16:04:01 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.2-4-gc062aa8
Message-ID: <E1SpfHn-0001NG-9Y@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 Assistant".

The branch, master has been updated
       via  c062aa82e4fa18ebaf4aaf38a963acb976aa74ad (commit)
      from  58ad96da3adc3c0dcaac71f92a3db91747cb55f9 (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 c062aa82e4fa18ebaf4aaf38a963acb976aa74ad
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jul 13 14:42:34 2012 +0200

    Fix minor gpa.desktop bugs (bug#1132)
    
    * gpa.desktop: Remove Encoding line and remove suffix from icon name.

diff --git a/gpa.desktop b/gpa.desktop
index f06c63f..789ce7c 100644
--- a/gpa.desktop
+++ b/gpa.desktop
@@ -6,8 +6,7 @@ GenericName=GNU Privacy Assistant
 GenericName[sv]=GNU Integritets-hj?lpreda
 GenericName[en_US.ISO8859-1]=GNU Privacy Assistant
 Exec=gpa
-Icon=gpa.png
+Icon=gpa
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=GTK;Application;Security;Utility;

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

Summary of changes:
 gpa.desktop |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


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



From cvs at cvs.gnupg.org  Wed Jul 18 15:38:03 2012
From: cvs at cvs.gnupg.org (by Werner Koch)
Date: Wed, 18 Jul 2012 15:38:03 +0200
Subject: [git] GPA - branch, master, updated. gpa-0.9.2-5-g510f7f1
Message-ID: <E1SrTFZ-0001zn-LM@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 Assistant".

The branch, master has been updated
       via  510f7f1195086530043b748c83b982169b63597e (commit)
      from  c062aa82e4fa18ebaf4aaf38a963acb976aa74ad (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 510f7f1195086530043b748c83b982169b63597e
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 18 14:22:26 2012 +0200

    Fix uninitialized variable (bug#1416)
    
    * src/server.c (prepare_io_streams): Set ERR to 0 on success.
    Reported by Daniel Leidert.

diff --git a/src/server.c b/src/server.c
index 4f39167..ee4ec8f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -544,6 +544,8 @@ prepare_io_streams (assuan_context_t ctx,
         goto leave;
     }
 
+  err = 0;
+
  leave:
   if (err)
     finish_io_streams (ctx, r_input_data, r_output_data, r_message_data);

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

Summary of changes:
 src/server.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


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



From cvs at cvs.gnupg.org  Fri Jul 20 10:51:43 2012
From: cvs at cvs.gnupg.org (by NIIBE Yutaka)
Date: Fri, 20 Jul 2012 10:51:43 +0200
Subject: [git] GnuPG - branch, STABLE-BRANCH-2-0,
	updated. gnupg-2.0.19-30-gb6b08b6
Message-ID: <E1Ss7jG-0005wu-Th@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  b6b08b6b93886ee8f466aea37da83286447992cb (commit)
      from  34b78c7d82f3923052e36d405ba403787ae9df16 (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 b6b08b6b93886ee8f466aea37da83286447992cb
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jul 20 16:34:07 2012 +0900

    scd: Add forgotten VENDOR_FSIJ to ccid-driver.
    
    * scd/ccid-driver.c (ccid_transceive_secure): Handle VENDOR_FSIJ.

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 5281a2f..49dde61 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -3129,6 +3129,7 @@ ccid_transceive_secure (ccid_driver_t handle,
     {
     case VENDOR_SCM:  /* Tested with SPR 532. */
     case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */
+    case VENDOR_FSIJ: /* Tested with Gnuk (0.21). */
       break;
     case VENDOR_VASCO: /* Tested with DIGIPASS 920 */
       pinlen_max = 15;

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

Summary of changes:
 scd/ccid-driver.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


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



From cvs at cvs.gnupg.org  Sat Jul 28 02:33:06 2012
From: cvs at cvs.gnupg.org (by Marcus Brinkmann)
Date: Sat, 28 Jul 2012 02:33:06 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.3.2-4-g434735f
Message-ID: <E1Sutjq-0002qV-Hw@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 "GnuPG Made Easy".

The branch, master has been updated
       via  434735f71e6969248651ac01c6bd6f6789a6305d (commit)
      from  e7aeaebb01395b170c91f290bf3ff5021023420f (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 434735f71e6969248651ac01c6bd6f6789a6305d
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Sat Jul 28 01:17:03 2012 +0200

    Allow null context on gpgme_set_locale.
    
    * gpgme.c (gpgme_set_locale): Allow CTX to be a null pointer.

diff --git a/src/gpgme.c b/src/gpgme.c
index c8e6a8b..927b2a0 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -639,9 +639,6 @@ gpgme_set_locale (gpgme_ctx_t ctx, int category, const char *value)
   TRACE_BEG2 (DEBUG_CTX, "gpgme_set_locale", ctx,
 	       "category=%i, value=%s", category, value ? value : "(null)");
 
-  if (!ctx)
-    return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
-
 #define PREPARE_ONE_LOCALE(lcat, ucat)				\
   if (!failed && value						\
       && (category == LC_ALL || category == LC_ ## ucat))	\

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

Summary of changes:
 src/gpgme.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Sat Jul 28 23:23:01 2012
From: cvs at cvs.gnupg.org (by Marcus Brinkmann)
Date: Sat, 28 Jul 2012 23:23:01 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.3.2-5-g8384ccb
Message-ID: <E1SvDFH-0002r5-UA@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 "GnuPG Made Easy".

The branch, master has been updated
       via  8384ccbd1a51447dccbd608fc5df3c24cb8999b1 (commit)
      from  434735f71e6969248651ac01c6bd6f6789a6305d (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 8384ccbd1a51447dccbd608fc5df3c24cb8999b1
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Sat Jul 28 22:06:09 2012 +0200

    Fix sign error in position calculation for mem_seek.
    
    * data-mem.c (mem_seek): Fix sign error in position calculation.

diff --git a/src/data-mem.c b/src/data-mem.c
index eda695a..512c295 100644
--- a/src/data-mem.c
+++ b/src/data-mem.c
@@ -137,7 +137,7 @@ mem_seek (gpgme_data_t dh, off_t offset, int whence)
 	  gpg_err_set_errno (EINVAL);
 	  return -1;
 	}
-      dh->data.mem.offset = dh->data.mem.length - offset;
+      dh->data.mem.offset = dh->data.mem.length + offset;
       break;
     default:
       gpg_err_set_errno (EINVAL);

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

Summary of changes:
 src/data-mem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org



From cvs at cvs.gnupg.org  Sat Jul 28 23:27:26 2012
From: cvs at cvs.gnupg.org (by Marcus Brinkmann)
Date: Sat, 28 Jul 2012 23:27:26 +0200
Subject: [git] GPGME - branch, master, updated. gpgme-1.3.2-6-g83e7420
Message-ID: <E1SvDJY-0003LV-Po@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 "GnuPG Made Easy".

The branch, master has been updated
       via  83e74202cd7c4c975d149c49e2507fdb0e60ef32 (commit)
      from  8384ccbd1a51447dccbd608fc5df3c24cb8999b1 (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 83e74202cd7c4c975d149c49e2507fdb0e60ef32
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Sat Jul 28 22:09:01 2012 +0200

    Add two recent contributors.

diff --git a/THANKS b/THANKS
index 41aebc8..9d79004 100644
--- a/THANKS
+++ b/THANKS
@@ -14,6 +14,7 @@ Igor Belyi		gpgme at katehok.ac93.org
 Jan-Oliver Wagner       jan at intevation.de
 Johannes Poehlmann      jhp at caldera.de
 Jose C. Garc?a Sogo     jose at jaimedelamo.eu.org
+Leo Gaspard             ekleog at gmail.com
 Mark Mutz               mutz at kde.org
 Miguel Coca		mcoca at gnu.org
 Noel Torres		envite at rolamasao.org
@@ -21,9 +22,9 @@ Patrick Spendrin        patrick.spendrin at kdab.com
 St?phane Corth?sy       stephane at sente.ch
 Timo Schulz             twoaday at freakmail.de
 Tommy Reynolds          reynolds at redhat.com
-                        
+W. Trevor King          wking at tremily.us
 
- Copyright 2001, 2002, 2004, 2010 g10 Code GmbH
+ Copyright 2001, 2002, 2004, 2010, 2012 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

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

Summary of changes:
 THANKS |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org