1 |
commit: cc8aa983915f7f3b4aa3ff98231d62b72c649fe0 |
2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 2 17:11:29 2011 +0000 |
4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 2 17:11:29 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=cc8aa983 |
7 |
|
8 |
Do not encrypt the key afterall |
9 |
|
10 |
--- |
11 |
app-crypt/signing-party/Manifest | 2 +- |
12 |
.../files/signing-party-1.1.3-multiple-uids.patch | 18 +++++------------- |
13 |
2 files changed, 6 insertions(+), 14 deletions(-) |
14 |
|
15 |
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest |
16 |
index cfe4562..185648e 100644 |
17 |
--- a/app-crypt/signing-party/Manifest |
18 |
+++ b/app-crypt/signing-party/Manifest |
19 |
@@ -1,4 +1,4 @@ |
20 |
-AUX signing-party-1.1.3-multiple-uids.patch 2100 RMD160 a46026cfccead85919e10fda92016a17f5545e8f SHA1 814fcd8f7e262a0b0cb08f954c0c3357fc93c9bb SHA256 38518b5ed10713ee2cf7c45c7a7f6ac87ae71c80960bf347662e9067495b6767 |
21 |
+AUX signing-party-1.1.3-multiple-uids.patch 1887 RMD160 13da46b9db328fb6cceeca564e30c3225c98b357 SHA1 b7b5555983c804162ccf2e055b5ca3a332c3341a SHA256 698215d9926003aa038bde54354bca05101a52c07b772fda10ced5301054f5f6 |
22 |
AUX signing-party-makefile.diff 469 RMD160 5b7977c6ad67d448a43b7f48c78681b82dfa02f7 SHA1 e89482d480eaee9ab00d69e7b05d232ffd208eb2 SHA256 c9930db5439f522af8f492f1fd5eabfbcb490e9bb50ec36a07f908badc65db9a |
23 |
DIST signing-party_1.1.3.orig.tar.gz 223459 RMD160 cfbc658854e0e9f562bd31221eaa0e1a25bcb742 SHA1 072c306e8c63e205aff07b6c4165140a7d59cdba SHA256 b3d774de41b97861f1acd33502be44e5f3dcec05d990a4095518dc65106237c4 |
24 |
EBUILD signing-party-1.1.3-r100.ebuild 3003 RMD160 124b56f89cd79482b6e171e24ab582d670e477ef SHA1 738de170bf3510b4cc5d0b8d5fbf693d9d56c859 SHA256 c3414527b528685b432cc3f11b362a7f8189d8cd262b98a3ba0f40bdf80b733a |
25 |
|
26 |
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 |
27 |
index b8c0375..96e7167 100644 |
28 |
--- a/app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch |
29 |
+++ b/app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch |
30 |
@@ -27,7 +27,7 @@ Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys |
31 |
printf "(no usable user ids)\n" |
32 |
FAILKEYS="$FAILKEYS:$1" |
33 |
shift 1 |
34 |
-@@ -79,12 +81,15 @@ while [ -n "$1" ]; do |
35 |
+@@ -79,12 +81,13 @@ while [ -n "$1" ]; do |
36 |
NANOTIME=`date +%s-%N` |
37 |
BOUNDARY="ksp-$$-boundary-$NANOTIME" |
38 |
|
39 |
@@ -37,34 +37,26 @@ Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys |
40 |
printf >$TEMPFILE "From: $NAME <$FROM>\n" |
41 |
fi |
42 |
+ |
43 |
-+gpg --armor --export ${addr} >> /tmp/$1.asc |
44 |
-+ |
45 |
cat << EOM >> $TEMPFILE |
46 |
-To: $ADDR |
47 |
+To: $addr |
48 |
Subject: $SUBJECT |
49 |
User-Agent: gpg-mailkeys/$VERSION |
50 |
MIME-Version: 1.0 |
51 |
-@@ -113,9 +118,9 @@ cat << EOM >> $TEMPFILE |
52 |
- |
53 |
- --$BOUNDARY |
54 |
+@@ -115,7 +118,7 @@ cat << EOM >> $TEMPFILE |
55 |
Content-Type: application/pgp-keys |
56 |
--Content-Disposition: attachment; filename="$1.asc" |
57 |
-+Content-Disposition: attachment; filename="$1.asc.gpg" |
58 |
+ Content-Disposition: attachment; filename="$1.asc" |
59 |
|
60 |
-`gpg --armor --export $1` |
61 |
-+`gpg --encrypt --recipient ${addr} /tmp/$1.asc; cat /tmp/$1.asc.gpg` |
62 |
++`gpg --armor --export ${addr}` |
63 |
|
64 |
--$BOUNDARY-- |
65 |
EOM |
66 |
-@@ -123,7 +128,11 @@ EOM |
67 |
+@@ -123,7 +126,8 @@ EOM |
68 |
/usr/sbin/sendmail -ti <$TEMPFILE |
69 |
rm $TEMPFILE |
70 |
printf " done.\n" |
71 |
- shift 1 |
72 |
-+ # clean up file |
73 |
-+ rm /tmp/$1.asc |
74 |
-+ rm /tmp/$1.asc.gpg |
75 |
+ done |
76 |
+ shift 1 |
77 |
done |