45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
# From upstream, SVN rev. 4937
|
|
# Fix (bnc#477362)
|
|
Index: doc/gpg-agent.texi
|
|
===================================================================
|
|
--- doc/gpg-agent.texi (revision 4936)
|
|
+++ doc/gpg-agent.texi (revision 4937)
|
|
@@ -433,13 +433,13 @@
|
|
@item --display @var{string}
|
|
@itemx --ttyname @var{string}
|
|
@itemx --ttytype @var{string}
|
|
-@itemx --lc-type @var{string}
|
|
+@itemx --lc-ctype @var{string}
|
|
@itemx --lc-messages @var{string}
|
|
@itemx --xauthority @var{string}
|
|
@opindex display
|
|
@opindex ttyname
|
|
@opindex ttytype
|
|
-@opindex lc-type
|
|
+@opindex lc-ctype
|
|
@opindex lc-messages
|
|
@opindex xauthority
|
|
These options are used with the server mode to pass localization
|
|
Index: agent/gpg-agent.c
|
|
===================================================================
|
|
--- agent/gpg-agent.c (revision 4936)
|
|
+++ agent/gpg-agent.c (revision 4937)
|
|
@@ -1,6 +1,6 @@
|
|
/* gpg-agent.c - The GnuPG Agent
|
|
* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
|
|
- * 2006, 2007 Free Software Foundation, Inc.
|
|
+ * 2006, 2007, 2009 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
@@ -141,6 +141,9 @@
|
|
{ oDisableScdaemon, "disable-scdaemon", 0, N_("do not use the SCdaemon") },
|
|
{ oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
|
|
|
|
+ { oBatch, "batch", 0, "@" },
|
|
+ { oHomedir, "homedir", 2, "@"},
|
|
+
|
|
{ oDisplay, "display", 2, "@" },
|
|
{ oTTYname, "ttyname", 2, "@" },
|
|
{ oTTYtype, "ttytype", 2, "@" },
|