diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-05-29 21:58:27 +0100 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-05-29 21:58:27 +0100 |
| commit | 01b446bd1e432782cc324f8d6a813e567731d7ce (patch) | |
| tree | 1d93bb7f31ef98be2cb19af522db50a0e04ab8be | |
| parent | Moved to gx86 (diff) | |
| download | hwoarang-01b446bd1e432782cc324f8d6a813e567731d7ce.tar.gz hwoarang-01b446bd1e432782cc324f8d6a813e567731d7ce.tar.bz2 hwoarang-01b446bd1e432782cc324f8d6a813e567731d7ce.zip | |
Revbump fo apply new patch
| -rw-r--r-- | app-crypt/signing-party/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/signing-party/files/signing-party-1.1.3-multiple-uids.patch | 29 | ||||
| -rw-r--r-- | app-crypt/signing-party/signing-party-1.1.3-r100.ebuild (renamed from app-crypt/signing-party/signing-party-1.1.3-r99.ebuild) | 2 |
3 files changed, 23 insertions, 12 deletions
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest index 461aca5..b3881a3 100644 --- a/app-crypt/signing-party/Manifest +++ b/app-crypt/signing-party/Manifest @@ -1,5 +1,5 @@ -AUX signing-party-1.1.3-multiple-uids.patch 1718 RMD160 9016035fd0bf7bd9be82fe023057a2ad026b724a SHA1 99d5bc11c3d920bae7e61f90b85a2985b05b2225 SHA256 a833eebfe5031eaabccd9071ca6e1454c5bc377e2ac9b90ffc871a36c8b6cf95 +AUX signing-party-1.1.3-multiple-uids.patch 2078 RMD160 127dd8a12caddafc9ec1691eb40b076d783f98e2 SHA1 4b1fab5dc1e5c73a369c412419f8978c66632e28 SHA256 698b25ff0e6b1d84b2df44860c6802c012523177114e6b111195841baed94606 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 +EBUILD signing-party-1.1.3-r100.ebuild 3004 RMD160 2c80f7ddcc3653c5da17670f2f72dcaa42d6d502 SHA1 47420511c3ae99ea9ef3c5c2b1b91fd3510c3a35 SHA256 53d3c636a86acb2ba73c8d08ab34c6285d1342b2ae782835a6d40c4da7207507 MISC metadata.xml 248 RMD160 d300a6a39cab5cfc836dd8154166ea93795e7682 SHA1 651e99b4c63f219da583fdc286e904f57bfa7741 SHA256 cab631a70b543455c36e9f6125586ae2421fb453f6b20a158fcdd7317b57f2aa 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 279f5c4..0e5dcf4 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,8 @@ ---- 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 @@ +Index: signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys +=================================================================== +--- signing-party-1.1.3.orig/gpg-mailkeys/gpg-mailkeys ++++ signing-party-1.1.3/gpg-mailkeys/gpg-mailkeys +@@ -58,19 +58,21 @@ if [ -z "$TEXT" ]; then Here is your signed GPG key. @@ -16,7 +18,7 @@ +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@@ //' -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` @@ -25,7 +27,7 @@ printf "(no usable user ids)\n" FAILKEYS="$FAILKEYS:$1" shift 1 -@@ -79,12 +81,12 @@ +@@ -79,12 +81,15 @@ while [ -n "$1" ]; do NANOTIME=`date +%s-%N` BOUNDARY="ksp-$$-boundary-$NANOTIME" @@ -34,26 +36,35 @@ if [ $FROM ]; then 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 -@@ -115,7 +117,7 @@ +@@ -113,9 +118,9 @@ cat << EOM >> $TEMPFILE + + --$BOUNDARY Content-Type: application/pgp-keys - Content-Disposition: attachment; filename="$1.asc" +-Content-Disposition: attachment; filename="$1.asc" ++Content-Disposition: attachment; filename="$1.asc.gpg" -`gpg --armor --export $1` -+`gpg --armor --export ${addr}` ++`gpg --encrypt --recipient ${addr} /tmp/$1.asc` --$BOUNDARY-- EOM -@@ -123,7 +125,8 @@ +@@ -123,7 +128,11 @@ 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 diff --git a/app-crypt/signing-party/signing-party-1.1.3-r99.ebuild b/app-crypt/signing-party/signing-party-1.1.3-r100.ebuild index c4fb48c..e2bebe5 100644 --- a/app-crypt/signing-party/signing-party-1.1.3-r99.ebuild +++ b/app-crypt/signing-party/signing-party-1.1.3-r100.ebuild @@ -40,7 +40,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-makefile.diff # Custom patch for multiple uids - epatch "${FILESDIR}"/${P}-multiple-uids.patch + #epatch "${FILESDIR}"/${P}-multiple-uids.patch sed -i -e \ "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \ |