Bug#545295: x11-common: add use-gpg-agent option to Xsession.options

[intrigeri@boum.org]

Package: x11-common
Version: 1:7.4+4
Severity: wishlist
Tags: patch

Hi,

As suggested by the bug 412993 against gnupg-agent, adding
a use-gpg-agent option to /etc/X11/Xsession.options would allow the
gnupg-agent Xsession.d script to only be started if this option is
enabled, just like the ssh-agent Xsession.d script already does.

Please find, attached, a patch implementing this new option.

Bye,
--
  intrigeri <intrigeri@boum.org>
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr-fingerprint.asc
  | If you must label the absolute, use it's proper name: Temporary.

diff -Naur xorg-7.4+4/debian/changelog xorg-7.4+4.intri0/debian/changelog
--- xorg-7.4+4/debian/changelog	2009-08-14 03:19:17.000000000 +0200
+++ xorg-7.4+4.intri0/debian/changelog	2009-09-06 12:02:03.988184693 +0200
@@ -1,3 +1,10 @@
+xorg (1:7.4+4.intri0) unstable; urgency=low
+
+  * Add use-gpg-agent option to Xsession.options
+  * NMU
+
+ -- intrigeri <intrigeri@boum.org>  Sun, 06 Sep 2009 12:01:29 +0200
+
 xorg (1:7.4+4) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff -Naur xorg-7.4+4/debian/local/Xsession.options xorg-7.4+4.intri0/debian/local/Xsession.options
--- xorg-7.4+4/debian/local/Xsession.options	2009-09-06 11:57:52.992184487 +0200
+++ xorg-7.4+4.intri0/debian/local/Xsession.options	2009-09-06 11:58:14.660185171 +0200
@@ -7,3 +7,4 @@
 allow-user-xsession
 use-ssh-agent
 use-session-dbus
+use-gpg-agent
diff -Naur xorg-7.4+4/debian/local/Xsession.options.5 xorg-7.4+4.intri0/debian/local/Xsession.options.5
--- xorg-7.4+4/debian/local/Xsession.options.5	2009-02-16 01:05:32.000000000 +0100
+++ xorg-7.4+4.intri0/debian/local/Xsession.options.5	2009-09-06 12:00:30.848188187 +0200
@@ -81,6 +81,14 @@
 the X session will be invoked by exec'ing
 .B ssh\-agent
 with the startup command, instead of the startup command directly.
+.TP
+.B use\-gpg\-agent
+If the
+.BR gpg\-agent (1)
+program is available and no agent process appears to be running already,
+the X session will be invoked by exec'ing
+.B gpg\-agent
+with the startup command, instead of the startup command directly.
 .PP
 All of the above options are enabled by default.
 Additional options may be supported by the local administrator.