Mercurial Mercurial > gentoo-repos / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
net-misc/keychain/files/keychain-2.7.0-fix-pinentry.patch
author Da Risk <darisk972@gmail.com>
Mon, 30 Aug 2010 15:17:00 +0200
changeset 0 58d5cc68f922
permissions -rw-r--r--
Initial import
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
diff -Nur keychain-2.7.0/keychain.sh keychain-2.7.0-b/keychain.sh
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
--- keychain-2.7.0/keychain.sh	2009-10-23 22:23:07.000000000 +0200
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
+++ keychain-2.7.0-b/keychain.sh	2010-04-11 22:58:25.570963964 +0200
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
@@ -767,6 +767,8 @@
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     5
 
 gpg_listmissing() {
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
     unset glm_missing
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
+    GPG_TTY=`tty`
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
+
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
     # Parse $gpgkeys into positional params to preserve spaces in filenames
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
 
     set -f          # disable globbing
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
     glm_IFS="$IFS"  # save current IFS
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
@@ -778,7 +780,7 @@
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    14
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    15
 
     for glm_k in "$@"; do
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    16
 
         # Check if this key is known to the agent.  Don't know another way...
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    17
 
-        if echo | env -i PATH="$PATH" GPG_AGENT_INFO="$GPG_AGENT_INFO" \
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    18
 
+        if echo | env -i GPG_TTY="$GPG_TTY" PATH="$PATH" GPG_AGENT_INFO="$GPG_AGENT_INFO" \
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    19
 
                 gpg --no-options --use-agent --no-tty --sign --local-user "$glm_k" -o- >/dev/null 2>&1; then
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    20
 
             # already know about this key
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    21
 
             mesg "Known gpg key: ${CYANN}${glm_k}${OFF}"
gentoo repos