diff options
Diffstat (limited to 'app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch')
| -rw-r--r-- | app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch b/app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch index 61847a2..25fac45 100644 --- a/app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch +++ b/app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch @@ -1,6 +1,6 @@ ---- gpg-mailkeys/gpg-mailkeys 2011-05-24 11:48:42.000000000 +0100 -+++ gpg-mailkeys/gpg-mailkeys 2011-05-24 11:48:13.817026516 +0100 -@@ -58,7 +58,7 @@ +--- gpg-mailkeys/gpg-mailkeys 2010-02-11 18:26:30.000000000 +0000 ++++ gpg-mailkeys/gpg-mailkeys 2011-05-24 13:24:37.585509519 +0100 +@@ -58,19 +58,21 @@ Here is your signed GPG key. @@ -9,15 +9,14 @@ $NAME" fi -@@ -66,11 +66,14 @@ + get_local_charset FAILKEYS= - +# Contains all the mail addresses for a specific key id +ADDR=`gpg --with-colons --fixed-list-mode --list-key EB9B4AFA | sed -e 's/^uid:[^re][^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/ */ /g' -e 's/^@@uid@@ //' -e 's/.*< *//' -e 's/ *>.*//'` -+ + while [ -n "$1" ]; do -+ for addr in ${ADDR}; do ++ for addr in ${ADDR}; do printf "[$1] " TEMPFILE=`mktemp -t gpg2mail.XXXXXX` - ADDR=`gpg --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^re][^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/ */ /g' -e 's/^@@uid@@ //' | head -1` @@ -26,7 +25,7 @@ printf "(no usable user ids)\n" FAILKEYS="$FAILKEYS:$1" shift 1 -@@ -79,12 +82,12 @@ +@@ -79,12 +81,12 @@ NANOTIME=`date +%s-%N` BOUNDARY="ksp-$$-boundary-$NANOTIME" @@ -41,7 +40,16 @@ Subject: $SUBJECT User-Agent: gpg-mailkeys/$VERSION MIME-Version: 1.0 -@@ -123,7 +126,8 @@ +@@ -115,7 +117,7 @@ + Content-Type: application/pgp-keys + Content-Disposition: attachment; filename="$1.asc" + +-`gpg --armor --export $1` ++`gpg --armor --export ${addr}` + + --$BOUNDARY-- + EOM +@@ -123,7 +125,8 @@ /usr/sbin/sendmail -ti <$TEMPFILE rm $TEMPFILE printf " done.\n" |