[git] GPA - branch, master, updated. gpa-0.9.2-3-g58ad96d
by Werner Koch
cvs at cvs.gnupg.org
Fri Jul 13 15:27:34 CEST 2012
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
More information about the Gnupg-commits
mailing list