net-misc/keychain/files/keychain-2.7.0-fix-pinentry.patch
changeset 91 1d785ddc05fa
parent 90 34f40a129599
child 92 f9b5620446cf
equal deleted inserted replaced
90:34f40a129599 91:1d785ddc05fa
     1 diff -Nur keychain-2.7.0/keychain.sh keychain-2.7.0-b/keychain.sh
       
     2 --- keychain-2.7.0/keychain.sh	2009-10-23 22:23:07.000000000 +0200
       
     3 +++ keychain-2.7.0-b/keychain.sh	2010-04-11 22:58:25.570963964 +0200
       
     4 @@ -767,6 +767,8 @@
       
     5  gpg_listmissing() {
       
     6      unset glm_missing
       
     7  
       
     8 +    GPG_TTY=`tty`
       
     9 +
       
    10      # Parse $gpgkeys into positional params to preserve spaces in filenames
       
    11      set -f          # disable globbing
       
    12      glm_IFS="$IFS"  # save current IFS
       
    13 @@ -778,7 +780,7 @@
       
    14  
       
    15      for glm_k in "$@"; do
       
    16          # Check if this key is known to the agent.  Don't know another way...
       
    17 -        if echo | env -i PATH="$PATH" GPG_AGENT_INFO="$GPG_AGENT_INFO" \
       
    18 +        if echo | env -i GPG_TTY="$GPG_TTY" PATH="$PATH" GPG_AGENT_INFO="$GPG_AGENT_INFO" \
       
    19                  gpg --no-options --use-agent --no-tty --sign --local-user "$glm_k" -o- >/dev/null 2>&1; then
       
    20              # already know about this key
       
    21              mesg "Known gpg key: ${CYANN}${glm_k}${OFF}"