Merge lp:~kramsmada/ubuntu/vivid/gnupg2/1407513-gpg-agent-set-ssh-env-vars into lp:ubuntu/vivid/gnupg2

[Mark Adams]

This fixes a bug I reported (LP: #1407513) which describes an issue where the upstart gpg-agent script only sets the GPG_AGENT_INFO environment variable when, in fact, it should also set SSH_AGENT_PID and SSH_AUTH_SOCK if "enable-ssh-support" is set in the GPG agent configuration.

Essentially, this patch modifies the existing upstart script so that it checks to see if the "enable-ssh-support" config flag is set, and if so, it sets and unsets the associated SSH environment variables appropriately.

This fix mainly applies to users who store their SSH keys on a GPG smartcard and would like to easily make them available to SSH-based applications.

[lp:~kramsmada/ubuntu/vivid/gnupg2/1407513-gpg-agent-set-ssh-env-vars]

29. By Mark Adams on 2015-01-05

Updated debian/gpg-agent.user-session.upstart so that global environment
variables SSH_AUTH_SOCK and SSH_AGENT_PID are set if gpg-agent is running
with SSH support.; LP: #1407513

[Marc Deslauriers (mdeslaur)]

I think the merge request looks good. Once the dev release opens, it can be uploaded.

review: Approve

[Mark Adams (kramsmada)]

> I think the merge request looks good. Once the dev release opens, it can be
> uploaded.

Do you have any idea when that will be? (I'm new so I don't know how the dev releases usually work)

Unmerged revisions

29. By Mark Adams on 2015-01-05

Updated debian/gpg-agent.user-session.upstart so that global environment
variables SSH_AUTH_SOCK and SSH_AGENT_PID are set if gpg-agent is running
with SSH support.; LP: #1407513

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-30 15:32:48 +0000
+++ debian/changelog	2015-01-05 00:16:42 +0000
@@ -1,3 +1,11 @@
+gnupg2 (2.0.26-3ubuntu2) UNRELEASED; urgency=medium
+
+  * Updated debian/gpg-agent.user-session.upstart so that global environment
+    variables SSH_AUTH_SOCK and SSH_AGENT_PID are set if gpg-agent is running
+    with SSH support.; LP: #1407513 
+
+ -- Mark Adams <[e-mail]>  Sun, 04 Jan 2015 17:57:24 -0600
+
 gnupg2 (2.0.26-3ubuntu1) vivid; urgency=medium
 
   * Merge from Debian, remaining changes:

=== modified file 'debian/gpg-agent.user-session.upstart'
--- debian/gpg-agent.user-session.upstart	2014-04-28 16:42:05 +0000
+++ debian/gpg-agent.user-session.upstart	2015-01-05 00:16:42 +0000
@@ -13,10 +13,24 @@
 
     eval "$(gpg-agent --daemon --sh)" >/dev/null
     initctl set-env --global GPG_AGENT_INFO=$GPG_AGENT_INFO
+    
+    grep -qs "^enable-ssh-support$" "$GNUPGHOME/gpg-agent.conf"
+
+    if [ $? -eq 0 ]; then
+        initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK
+        initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID
+    fi    
 end script
 
 post-stop script
     GPG_AGENT_PID=$(echo $GPG_AGENT_INFO | cut -d : -f2)
     kill $GPG_AGENT_PID 2>/dev/null || true
     initctl unset-env --global GPG_AGENT_INFO
+    
+    grep -qs "^enable-ssh-support$" "$GNUPGHOME/gpg-agent.conf"
+    
+    if [ $? -eq 0 ]; then
+        initctl unset-env --global SSH_AUTH_SOCK
+        initctl unset-env --global SSH_AGENT_PID
+    fi  
 end script