[Pkg-gnupg-commit] r306 - in /gpa/trunk/debian: changelog patches/634930_backport_disable_x509_switch.patch patches/series

[dleidert at users.alioth.debian.org]

Author: dleidert
Date: Sun Jan 27 14:41:54 2013
New Revision: 306

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=306
Log:
gpa (0.9.0-3) unstable; urgency=low
 
* debian/patches/634930_backport_disable_x509_switch.patch: Added.
  - Added option to disable X.509. Workaround for #634930.
* debian/patches/series: Adjusted.

Added:
    gpa/trunk/debian/patches/634930_backport_disable_x509_switch.patch
Modified:
    gpa/trunk/debian/changelog
    gpa/trunk/debian/patches/series

Modified: gpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/changelog?rev=306&op=diff
==============================================================================
--- gpa/trunk/debian/changelog (original)
+++ gpa/trunk/debian/changelog Sun Jan 27 14:41:54 2013
@@ -1,9 +1,11 @@
-gpa (0.9.0-3) UNRELEASED; urgency=low
+gpa (0.9.0-3) unstable; urgency=low
 
-  * NOT RELEASED YET
   * debian/gpa.1: Added hidden options and missing references.
+  * debian/patches/634930_backport_disable_x509_switch.patch: Added.
+    - Added option to disable X.509. Workaround for #634930.
+  * debian/patches/series: Adjusted.
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sat, 23 Jun 2012 17:10:07 +0200
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 13 Jan 2013 19:47:37 +0100
 
 gpa (0.9.0-2) unstable; urgency=low
 

Added: gpa/trunk/debian/patches/634930_backport_disable_x509_switch.patch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/patches/634930_backport_disable_x509_switch.patch?rev=306&op=file
==============================================================================
--- gpa/trunk/debian/patches/634930_backport_disable_x509_switch.patch (added)
+++ gpa/trunk/debian/patches/634930_backport_disable_x509_switch.patch Sun Jan 27 14:41:54 2013
@@ -1,0 +1,58 @@
+Author: Werner Koch
+Description: Added an option to disable X.509
+ Added an option to disable X.509 on the command line or via the conf file.
+Origin: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpa.git;a=commitdiff;h=61e00549baf8992983b1fc9bff9f492429ec64c8
+Forwarded: not-needed
+
+--- a/src/gpa.c
++++ b/src/gpa.c
+@@ -67,6 +67,7 @@
+   gboolean start_clipboard;
+   gboolean start_settings;
+   gboolean start_only_server;
++  gboolean disable_x509;
+   gchar *options_filename;
+ } gpa_args_t;
+ 
+@@ -106,6 +107,8 @@
+       N_("Open the settings dialog"), NULL },
+     { "daemon", 'd', 0, G_OPTION_ARG_NONE, &args.start_only_server,
+       N_("Enable the UI server"), NULL },
++    { "disable-x509", 0, 0, G_OPTION_ARG_NONE, &args.disable_x509,
++      N_("Disable support for X.509"), NULL },
+     { "options", 'o', 0, G_OPTION_ARG_FILENAME, &args.options_filename,
+       N_("Read options from file"), "FILE" },
+     /* Note:  the cms option will eventually be removed.  */
+@@ -398,7 +401,7 @@
+   gpa_start_agent ();
+ 
+   /* Handle command line options.  */
+-  cms_hack = 1; /* CMS is now always enabled.  */
++  cms_hack = !args.disable_x509;
+ 
+   /* Start the key manger by default.  */
+   if (!args.start_key_manager
+--- a/src/keytable.c
++++ b/src/keytable.c
+@@ -209,7 +209,20 @@
+     {
+       if (keytable->first_half_err)
+         gpa_gpgme_warning (keytable->first_half_err);
+-      gpa_gpgme_warning (err);
++
++      if (gpg_err_code (err) == GPG_ERR_INV_ENGINE
++          && gpg_err_source (err) == GPG_ERR_SOURCE_GPGME)
++        {
++          gpa_window_error
++            (_("It seems that GPGSM is not installed.\n\n"
++               "Temporary disabling support for X.509.\n\n"
++               "Please install GPGSM or invoke this program\n"
++               "with the option --disable-x509 ."), NULL);
++          cms_hack = 0;
++          err = 0;
++        }
++      else
++        gpa_gpgme_warning (err);
+       if (keytable->end)
+ 	{
+ 	  keytable->end (keytable->data);

Modified: gpa/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnupg/gpa/trunk/debian/patches/series?rev=306&op=diff
==============================================================================
--- gpa/trunk/debian/patches/series (original)
+++ gpa/trunk/debian/patches/series Sun Jan 27 14:41:54 2013
@@ -1,3 +1,4 @@
+634930_backport_disable_x509_switch.patch
 625513_fix_expiration_date.patch
 448765_grammar_fixes.patch
 628305_build_with_libassuan_v2.patch