From 01b446bd1e432782cc324f8d6a813e567731d7ce Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sun, 29 May 2011 21:58:27 +0100 Subject: Revbump fo apply new patch --- app-crypt/signing-party/Manifest | 4 +- .../files/signing-party-1.1.3-multiple-uids.patch | 29 ++++-- .../signing-party/signing-party-1.1.3-r100.ebuild | 110 +++++++++++++++++++++ .../signing-party/signing-party-1.1.3-r99.ebuild | 110 --------------------- 4 files changed, 132 insertions(+), 121 deletions(-) create mode 100644 app-crypt/signing-party/signing-party-1.1.3-r100.ebuild delete mode 100644 app-crypt/signing-party/signing-party-1.1.3-r99.ebuild 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-r100.ebuild b/app-crypt/signing-party/signing-party-1.1.3-r100.ebuild new file mode 100644 index 0000000..e2bebe5 --- /dev/null +++ b/app-crypt/signing-party/signing-party-1.1.3-r100.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit eutils toolchain-funcs + +DESCRIPTION="A collection of several tools related to OpenPGP" +HOMEPAGE="http://pgp-tools.alioth.debian.org/" +SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos" +IUSE="" + +DEPEND="" +RDEPEND=">=app-crypt/gnupg-1.3.92 + dev-perl/GnuPG-Interface + dev-perl/text-template + dev-perl/MIME-tools + net-mail/qprint + >=dev-perl/MailTools-1.62 + virtual/mailx + virtual/mta + dev-lang/perl + || ( + dev-perl/libintl-perl + dev-perl/Text-Iconv + app-text/recode + )" + +src_prepare() { + # app-crypt/keylookup + rm -fr keylookup + # media-gfx/springgraph + rm -fr springgraph + + epatch "${FILESDIR}"/${PN}-makefile.diff + + # Custom patch for multiple uids + #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" \ + caff/caff || die "Sed failed" + sed -i -e "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile \ + || die "Sed failed" + sed -i -e \ + "s|:/usr/share/signing-party|:${EPREFIX}/usr/share/signing-party|" \ + gpgsigs/gpgsigs || die "Sed failed" +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" +} + +src_install() { + # Check Makefile when a new tool is introduced to this package. + # caff + dobin caff/caff caff/pgp-clean caff/pgp-fixkey || die + docinto caff + dodoc caff/{README*,THANKS,TODO,caffrc.sample} || die + # gpgdir + dobin gpgdir/gpgdir || die + docinto gpgdir + dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*} || die + # gpg-key2ps + dobin gpg-key2ps/gpg-key2ps || die + docinto gpg-key2ps + dodoc gpg-key2ps/README || die + # gpglist + dobin gpglist/gpglist || die + # gpg-mailkeys + dobin gpg-mailkeys/gpg-mailkeys || die + docinto gpg-mailkeys + dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README} || die + # gpgparticipants + dobin gpgparticipants/gpgparticipants || die + # gpgwrap + dobin gpgwrap/bin/gpgwrap || die + docinto gpgwrap + dodoc gpgwrap/{LICENSE,NEWS,README} || die + doman gpgwrap/doc/gpgwrap.1 || die + # gpgsigs + dobin gpgsigs/gpgsigs || die + insinto /usr/share/signing-party + doins gpgsigs/gpgsigs-eps-helper || die + # keyanalyze + # TODO: some of the scripts are intended for webpages, and not really + # packaging, so they are NOT installed yet. + newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze || die + dobin keyanalyze/{keyanalyze,process_keys} || die + docinto keyanalyze + dodoc keyanalyze/{README,Changelog} || die + # See app-crypt/keylookup instead + #dobin keylookup/keylookup + #docinto keylookup + #dodoc keylookup/NEWS + # sig2dot + dobin sig2dot/sig2dot || die + dodoc sig2dot/README.sig2dot || die + # See media-gfx/springgraph instead + #dobin springgraph/springgraph + #dodoc springgraph/README.springgraph + # all other manpages, and the root doc + doman */*.1 || die + dodoc README || die +} diff --git a/app-crypt/signing-party/signing-party-1.1.3-r99.ebuild b/app-crypt/signing-party/signing-party-1.1.3-r99.ebuild deleted file mode 100644 index c4fb48c..0000000 --- a/app-crypt/signing-party/signing-party-1.1.3-r99.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -inherit eutils toolchain-funcs - -DESCRIPTION="A collection of several tools related to OpenPGP" -HOMEPAGE="http://pgp-tools.alioth.debian.org/" -SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos" -IUSE="" - -DEPEND="" -RDEPEND=">=app-crypt/gnupg-1.3.92 - dev-perl/GnuPG-Interface - dev-perl/text-template - dev-perl/MIME-tools - net-mail/qprint - >=dev-perl/MailTools-1.62 - virtual/mailx - virtual/mta - dev-lang/perl - || ( - dev-perl/libintl-perl - dev-perl/Text-Iconv - app-text/recode - )" - -src_prepare() { - # app-crypt/keylookup - rm -fr keylookup - # media-gfx/springgraph - rm -fr springgraph - - epatch "${FILESDIR}"/${PN}-makefile.diff - - # Custom patch for multiple uids - 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" \ - caff/caff || die "Sed failed" - sed -i -e "s/make pgpring/\$(MAKE) pgpring/" keyanalyze/Makefile \ - || die "Sed failed" - sed -i -e \ - "s|:/usr/share/signing-party|:${EPREFIX}/usr/share/signing-party|" \ - gpgsigs/gpgsigs || die "Sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - # Check Makefile when a new tool is introduced to this package. - # caff - dobin caff/caff caff/pgp-clean caff/pgp-fixkey || die - docinto caff - dodoc caff/{README*,THANKS,TODO,caffrc.sample} || die - # gpgdir - dobin gpgdir/gpgdir || die - docinto gpgdir - dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*} || die - # gpg-key2ps - dobin gpg-key2ps/gpg-key2ps || die - docinto gpg-key2ps - dodoc gpg-key2ps/README || die - # gpglist - dobin gpglist/gpglist || die - # gpg-mailkeys - dobin gpg-mailkeys/gpg-mailkeys || die - docinto gpg-mailkeys - dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README} || die - # gpgparticipants - dobin gpgparticipants/gpgparticipants || die - # gpgwrap - dobin gpgwrap/bin/gpgwrap || die - docinto gpgwrap - dodoc gpgwrap/{LICENSE,NEWS,README} || die - doman gpgwrap/doc/gpgwrap.1 || die - # gpgsigs - dobin gpgsigs/gpgsigs || die - insinto /usr/share/signing-party - doins gpgsigs/gpgsigs-eps-helper || die - # keyanalyze - # TODO: some of the scripts are intended for webpages, and not really - # packaging, so they are NOT installed yet. - newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze || die - dobin keyanalyze/{keyanalyze,process_keys} || die - docinto keyanalyze - dodoc keyanalyze/{README,Changelog} || die - # See app-crypt/keylookup instead - #dobin keylookup/keylookup - #docinto keylookup - #dodoc keylookup/NEWS - # sig2dot - dobin sig2dot/sig2dot || die - dodoc sig2dot/README.sig2dot || die - # See media-gfx/springgraph instead - #dobin springgraph/springgraph - #dodoc springgraph/README.springgraph - # all other manpages, and the root doc - doman */*.1 || die - dodoc README || die -} -- cgit v1.2.3-65-gdbad