found 412993 2.0.12-1
thanks
Hi,
Alex Samad wrote (17 May 2008 09:03:23 GMT) :
> I would like to second Edward Guldemond request, gpg-agent should
> only be started if use-gpg-agent is in the Xsessions.option file
+1
The attached patch implements such conditional starting of gpg-agent.
It depends on my proposed patch against x11-common (see bug 545295),
adding a use-gpg-agent setting to Xsession.options.
In order to have the Xsession.d script work as it currently does when
the installed x11-common is older than the one that will introduce the
use-gpg-agent setting, the x11-common installed version is checked at
runtime using dpkg-query; this seems a bit overkill to me, but I did
not find any other way to provide a smooth upgrade path
=>
a) the version it is compared to will have to be adapted depending
on when my patch is applied to x11-common
b) this check can probably be removed once the patched gnupg2 and
x11-common both have hit squeeze, or maybe once squeeze
is released.
Bye,
--
intrigeri <intrig...@boum.org>
diff -Naur gnupg2-2.0.12/debian/changelog gnupg2-2.0.12+intri0/debian/changelog
--- gnupg2-2.0.12/debian/changelog 2009-09-06 11:50:52.000000000 +0200
+++ gnupg2-2.0.12+intri0/debian/changelog 2009-09-06 13:20:11.928184140 +0200
@@ -1,3 +1,12 @@
+gnupg2 (2.0.12+intri0) unstable; urgency=low
+
+ * NMU
+ * Do not start gpg-agent for X sessions unless use-gpg-agent is set in
+ /etc/X11/Xsession.options. This check is only performed when
+ x11-common newer than FIXME is installed. (Closes: #412993)
+
+ -- intrigeri <intrig...@boum.org> Sun, 06 Sep 2009 12:54:06 +0200
+
gnupg2 (2.0.12-1) unstable; urgency=low
* New upstream release. (Closes: #499569, #463270, #446494, #314068,
diff -Naur gnupg2-2.0.12/debian/gnupg-agent.xsession gnupg2-2.0.12+intri0/debian/gnupg-agent.xsession
--- gnupg2-2.0.12/debian/gnupg-agent.xsession 2009-09-06 11:50:52.000000000 +0200
+++ gnupg2-2.0.12+intri0/debian/gnupg-agent.xsession 2009-09-06 13:22:33.752186267 +0200
@@ -2,10 +2,13 @@
GPGAGENT=/usr/bin/gpg-agent
PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)"
+X11_COMMON_VERSION="`dpkg-query -W -f='${Version}' x11-common 2>/dev/null`"
if grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" &&
test -x $GPGAGENT &&
- { test -z "$GPG_AGENT_INFO" || ! $GPGAGENT 2>/dev/null; }; then
+ { test -z "$GPG_AGENT_INFO" || ! $GPGAGENT 2>/dev/null; } &&
+ { dpkg --compare-versions "$X11_COMMON_VERSION" lt "1:7.4+4.intri0" ||
+ grep -qs ^use-gpg-agent "$OPTIONFILE"; }; then
if [ -r "$PID_FILE" ]; then
. "$PID_FILE"
