Attachment 332308 Details for Bug 486025 – Make gpg-agent startup use --write-env-file

[patch] Make gpg-agent startup use --write-env-file

kde-gpg-agent-start.patch (text/plain), 1.11 KB, created by Ville Skyttä on 2009-02-17 22:12:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2009-02-17 22:12:44 UTC

Size: 1.11 KB

patch

obsolete

>Index: etc/kde/env/gpg-agent-startup.sh
>===================================================================
>--- etc/kde/env/gpg-agent-startup.sh	(revision 28)
>+++ etc/kde/env/gpg-agent-startup.sh	(working copy)
>@@ -12,7 +12,7 @@
>     if [ ! "x${GPG_PID_NAME}" = "xgpg-agent" ]; then
>       rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
>     else
>-       GPG_SOCKET=`cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d:`
>+       GPG_SOCKET=`cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d: | cut -f2 -d=`
>        if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
>          rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
>        fi
>@@ -21,11 +21,11 @@
>   fi
> 
>   if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
>-    export GPG_AGENT_INFO=$(cat "${GPG_AGENT_INFO_FILE}")
>+    eval "$(cat \"${GPG_AGENT_INFO_FILE}\")"
>+    eval "$(cut -d= -f 1 < \"${GPG_AGENT_INFO_FILE}\" | xargs echo export)"
>     export GPG_TTY=$(tty)
>   else
>-    eval "$(${GPG_AGENT} -s --daemon ${GPG_OPTIONS})"
>-    echo ${GPG_AGENT_INFO} > "${HOME}/.gpg-agent-info"
>+    eval "$(${GPG_AGENT} -s --daemon --write-env-file \"${GPG_AGENT_INFO_FILE}\" ${GPG_OPTIONS})"
>   fi
> 
> fi

Actions: View | Diff

Attachments on bug 486025: 332308