diff options
author | 2011-05-24 13:28:58 +0100 | |
---|---|---|
committer | 2011-05-24 13:28:58 +0100 | |
commit | ca7a511b44e880d73a7d2add8632e251d7c7616b (patch) | |
tree | 0aaa3b4e70f0e93627d36afe63e4d7e90c2a5eb7 | |
parent | singing-party: Add custom patch to send to multiple uids (diff) | |
download | hwoarang-ca7a511b44e880d73a7d2add8632e251d7c7616b.tar.gz hwoarang-ca7a511b44e880d73a7d2add8632e251d7c7616b.tar.bz2 hwoarang-ca7a511b44e880d73a7d2add8632e251d7c7616b.zip |
Refactor patch
-rw-r--r-- | app-crypt/signing-party/Manifest | 2 | ||||
-rw-r--r-- | app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch | 26 |
2 files changed, 18 insertions, 10 deletions
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest index db5589e..07a2cc2 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 1533 RMD160 59a47e1bfb36286ce93182532cd1f078a0497593 SHA1 b3c656eabb624a7b445ae705dcb850a5cf6f1849 SHA256 681116285a21de3b8953dd853e16c6c72e19ef0e85792e52cd45662860c3a14f +AUX signing-party-1.1.3-multiple-uids.patch 1724 RMD160 a3e42868613a4e425f1d0e7c048813482ad22040 SHA1 9437b037afd761f844a04e6a37055623dcdf08ab SHA256 1da9ac75b9f9d6e988e8e7bacf3b412be162a26d6f7f4e84d70b59819f578260 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-r99.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 61847a2..25fac45 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,6 @@ ---- gpg-mailkeys/gpg-mailkeys 2011-05-24 11:48:42.000000000 +0100 -+++ gpg-mailkeys/gpg-mailkeys 2011-05-24 11:48:13.817026516 +0100 -@@ -58,7 +58,7 @@ +--- 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 @@ Here is your signed GPG key. @@ -9,15 +9,14 @@ $NAME" fi -@@ -66,11 +66,14 @@ + get_local_charset FAILKEYS= - +# Contains all the mail addresses for a specific key id +ADDR=`gpg --with-colons --fixed-list-mode --list-key EB9B4AFA | 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` @@ -26,7 +25,7 @@ printf "(no usable user ids)\n" FAILKEYS="$FAILKEYS:$1" shift 1 -@@ -79,12 +82,12 @@ +@@ -79,12 +81,12 @@ NANOTIME=`date +%s-%N` BOUNDARY="ksp-$$-boundary-$NANOTIME" @@ -41,7 +40,16 @@ Subject: $SUBJECT User-Agent: gpg-mailkeys/$VERSION MIME-Version: 1.0 -@@ -123,7 +126,8 @@ +@@ -115,7 +117,7 @@ + Content-Type: application/pgp-keys + Content-Disposition: attachment; filename="$1.asc" + +-`gpg --armor --export $1` ++`gpg --armor --export ${addr}` + + --$BOUNDARY-- + EOM +@@ -123,7 +125,8 @@ /usr/sbin/sendmail -ti <$TEMPFILE rm $TEMPFILE printf " done.\n" |