From cc8aa983915f7f3b4aa3ff98231d62b72c649fe0 Mon Sep 17 00:00:00 2001
From: Markos Chandras <hwoarang@gentoo.org>
Date: Thu, 2 Jun 2011 18:11:29 +0100
Subject: Do not encrypt the key afterall

---
 app-crypt/signing-party/Manifest                       |  2 +-
 .../files/signing-party-1.1.3-multiple-uids.patch      | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index cfe4562..185648e 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,4 +1,4 @@
-AUX signing-party-1.1.3-multiple-uids.patch 2100 RMD160 a46026cfccead85919e10fda92016a17f5545e8f SHA1 814fcd8f7e262a0b0cb08f954c0c3357fc93c9bb SHA256 38518b5ed10713ee2cf7c45c7a7f6ac87ae71c80960bf347662e9067495b6767
+AUX signing-party-1.1.3-multiple-uids.patch 1887 RMD160 13da46b9db328fb6cceeca564e30c3225c98b357 SHA1 b7b5555983c804162ccf2e055b5ca3a332c3341a SHA256 698215d9926003aa038bde54354bca05101a52c07b772fda10ced5301054f5f6
 AUX signing-party-makefile.diff 469 RMD160 5b7977c6ad67d448a43b7f48c78681b82dfa02f7 SHA1 e89482d480eaee9ab00d69e7b05d232ffd208eb2 SHA256 c9930db5439f522af8f492f1fd5eabfbcb490e9bb50ec36a07f908badc65db9a
 DIST signing-party_1.1.3.orig.tar.gz 223459 RMD160 cfbc658854e0e9f562bd31221eaa0e1a25bcb742 SHA1 072c306e8c63e205aff07b6c4165140a7d59cdba SHA256 b3d774de41b97861f1acd33502be44e5f3dcec05d990a4095518dc65106237c4
 EBUILD signing-party-1.1.3-r100.ebuild 3003 RMD160 124b56f89cd79482b6e171e24ab582d670e477ef SHA1 738de170bf3510b4cc5d0b8d5fbf693d9d56c859 SHA256 c3414527b528685b432cc3f11b362a7f8189d8cd262b98a3ba0f40bdf80b733a
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"
  	
@@ -36,8 +36,6 @@ Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys
  	if [ $FROM ]; then
  		printf >$TEMPFILE "From: $NAME <$FROM>\n"
  	fi
-+
-+gpg --armor --export ${addr} >> /tmp/$1.asc
 +
  cat << EOM >> $TEMPFILE
 -To: $ADDR
@@ -45,26 +43,20 @@ Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys
  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
-- 
cgit v1.2.3-65-gdbad