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 | 29 |
1 files changed, 20 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 279f5c4..0e5dcf4 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,8 @@ ---- 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 @@ +Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys +=================================================================== +--- signing-party-1.1.3.orig/gpg-mailkeys/gpg-mailkeys ++++ signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys +@@ -58,19 +58,21 @@ if [ -z "$TEXT" ]; then Here is your signed GPG key. @@ -16,7 +18,7 @@ +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@@ //' -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` @@ -25,7 +27,7 @@ printf "(no usable user ids)\n" FAILKEYS="$FAILKEYS:$1" shift 1 -@@ -79,12 +81,12 @@ +@@ -79,12 +81,15 @@ while [ -n "$1" ]; do NANOTIME=`date +%s-%N` BOUNDARY="ksp-$$-boundary-$NANOTIME" @@ -34,26 +36,35 @@ if [ $FROM ]; then printf >$TEMPFILE "From: $NAME <$FROM>\n" fi ++ ++gpg --armor --export ${addr} > /tmp/$1.asc ++ cat << EOM >> $TEMPFILE -To: $ADDR +To: $addr Subject: $SUBJECT User-Agent: gpg-mailkeys/$VERSION MIME-Version: 1.0 -@@ -115,7 +117,7 @@ +@@ -113,9 +118,9 @@ cat << EOM >> $TEMPFILE + + --$BOUNDARY Content-Type: application/pgp-keys - Content-Disposition: attachment; filename="$1.asc" +-Content-Disposition: attachment; filename="$1.asc" ++Content-Disposition: attachment; filename="$1.asc.gpg" -`gpg --armor --export $1` -+`gpg --armor --export ${addr}` ++`gpg --encrypt --recipient ${addr} /tmp/$1.asc` --$BOUNDARY-- EOM -@@ -123,7 +125,8 @@ +@@ -123,7 +128,11 @@ EOM /usr/sbin/sendmail -ti <$TEMPFILE rm $TEMPFILE printf " done.\n" - shift 1 ++ # clean up file ++ rm /tmp/$1.asc ++ rm /tmp/$1.asc.gpg + done + shift 1 done |