summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-06-02 18:11:29 +0100
committerMarkos Chandras <hwoarang@gentoo.org>2011-06-02 18:11:29 +0100
commitcc8aa983915f7f3b4aa3ff98231d62b72c649fe0 (patch)
treef37618d7b603ce9467a9dacc714d4b66fc03a72f /app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch
parentYet another fix (diff)
downloadhwoarang-cc8aa983915f7f3b4aa3ff98231d62b72c649fe0.tar.gz
hwoarang-cc8aa983915f7f3b4aa3ff98231d62b72c649fe0.tar.bz2
hwoarang-cc8aa983915f7f3b4aa3ff98231d62b72c649fe0.zip
Do not encrypt the key afterall
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.patch18
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