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 | 18 |
1 files changed, 5 insertions, 13 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 b8c0375..96e7167 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 @@ -27,7 +27,7 @@ Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys printf "(no usable user ids)\n" FAILKEYS="$FAILKEYS:$1" shift 1 -@@ -79,12 +81,15 @@ while [ -n "$1" ]; do +@@ -79,12 +81,13 @@ while [ -n "$1" ]; do NANOTIME=`date +%s-%N` BOUNDARY="ksp-$$-boundary-$NANOTIME" @@ -37,34 +37,26 @@ Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys 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 -@@ -113,9 +118,9 @@ cat << EOM >> $TEMPFILE - - --$BOUNDARY +@@ -115,7 +118,7 @@ cat << EOM >> $TEMPFILE Content-Type: application/pgp-keys --Content-Disposition: attachment; filename="$1.asc" -+Content-Disposition: attachment; filename="$1.asc.gpg" + Content-Disposition: attachment; filename="$1.asc" -`gpg --armor --export $1` -+`gpg --encrypt --recipient ${addr} /tmp/$1.asc; cat /tmp/$1.asc.gpg` ++`gpg --armor --export ${addr}` --$BOUNDARY-- EOM -@@ -123,7 +128,11 @@ EOM +@@ -123,7 +126,8 @@ 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 |