Package: gnupg-agent
Version: 2.0.6-1
Severity: wishlist
Tags: patch

If /etc/X11/Xsession has "use-ssh-agent" disabled, and $GNUPGHOME/gpg.conf has use-agent, we might as well enable ssh-agent support in gpg-agent.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages gnupg-agent depends on:
ii  libc6                  2.6.1-5    GNU C Library: Shared libraries
ii  libgcrypt11            1.2.4-2    LGPL Crypto library - runtime libr
ii  libgpg-error0          1.4-2      library for common error values an
ii  libpth20               2.0.7-8    The GNU Portable Threads

Versions of packages gnupg-agent recommends:
ii  gnupg                  1.4.6-2    GNU privacy guard - a free PGP rep
ii  gnupg2                 2.0.6-1    GNU privacy guard - a free PGP rep
ii  gpgsm                  2.0.6-1    GNU privacy guard - S/MIME version
ii  pinentry-qt [pinentry] 0.7.3-1    Qt-based PIN or pass-phrase entry

-- no debconf information

--
Tim Riker - http://Rikers.org/ - [EMAIL PROTECTED]
Embedded Linux Technologist - http://eLinux.org/
BZFlag maintainer - http://BZFlag.org/ - for fun!
--- /etc/X11/Xsession.d/90gpg-agent.orig	2007-09-25 23:30:55.000000000 -0600
+++ /etc/X11/Xsession.d/90gpg-agent	2007-09-25 23:36:38.000000000 -0600
@@ -4,6 +4,12 @@
 PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)"
 
 if grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" &&
+
+   # user wants gpg-agent, but not ssh-agent, assume ssh support in gpg-agent
+   if ! grep -qs ^use-ssh-agent "$OPTIONFILE"; then
+       ENABLESSH='--enable-ssh-support'
+   fi
+
    test -x $GPGAGENT &&
    { test -z "$GPG_AGENT_INFO" || ! $GPGAGENT 2>/dev/null; }; then
 
@@ -14,6 +20,6 @@
    # Invoking gpg-agent with no arguments exits successfully if the agent
    # is already running as pointed by $GPG_AGENT_INFO
    if ! $GPGAGENT 2>/dev/null; then
-       STARTUP="$GPGAGENT --daemon --sh --write-env-file='$PID_FILE' $STARTUP"
+       STARTUP="$GPGAGENT --daemon $ENABLESSH --sh --write-env-file='$PID_FILE' $STARTUP"
    fi
 fi

Reply via email to