<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[136666] trunk/dports/mail/signing-party</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/136666">136666</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-05-23 11:33:47 -0700 (Sat, 23 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>signing-party: update to 2.0
Drop patch that forces use of MacPorts GPG because it is complicated to update
it for each version. We should probably work with upstream and provide
a --with-gpg=$BIN option that does it correctly if we want this.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmailsigningpartyPortfile">trunk/dports/mail/signing-party/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmailsigningpartyfilespatchusemacportsgpgdiff">trunk/dports/mail/signing-party/files/patch-use-macports-gpg.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmailsigningpartyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/mail/signing-party/Portfile (136665 => 136666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/signing-party/Portfile 2015-05-23 18:19:18 UTC (rev 136665)
+++ trunk/dports/mail/signing-party/Portfile 2015-05-23 18:33:47 UTC (rev 136666)
</span><span class="lines">@@ -4,10 +4,9 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name signing-party
</span><del>-version 1.1.12
-revision 1
-checksums rmd160 5bd05b4adfe00d683af9029dc4383be9d93c6c55 \
- sha256 fa818002c6f3baa1348b10b3b9c98d6f1af5ef359ba4d9f06b9591d7d7876e12
</del><ins>+version 2.0
+checksums rmd160 6d1bda32cd549a9c17d18e3cf3f4793153c00d57 \
+ sha256 cc23e48b2f06dee7cbf7b80ee4dfbed69908cb4584d3d5fa29ed7b2f962ec16e
</ins><span class="cx">
</span><span class="cx"> categories mail security
</span><span class="cx"> maintainers cal openmaintainer
</span><span class="lines">@@ -26,8 +25,7 @@
</span><span class="cx"> extract.suffix .orig.tar.gz
</span><span class="cx">
</span><span class="cx"> patchfiles gpgwrap-makefile-usingtherightcompiler.patch \
</span><del>- keyanalyze-makefile-usingtherightcompiler.patch \
- patch-use-macports-gpg.diff
</del><ins>+ keyanalyze-makefile-usingtherightcompiler.patch
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmailsigningpartyfilespatchusemacportsgpgdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/mail/signing-party/files/patch-use-macports-gpg.diff (136665 => 136666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/mail/signing-party/files/patch-use-macports-gpg.diff 2015-05-23 18:19:18 UTC (rev 136665)
+++ trunk/dports/mail/signing-party/files/patch-use-macports-gpg.diff 2015-05-23 18:33:47 UTC (rev 136666)
</span><span class="lines">@@ -1,260 +0,0 @@
</span><del>---- ./caff/caff.orig 2015-01-29 21:39:55.000000000 +0100
-+++ ./caff/caff 2015-01-29 21:44:31.000000000 +0100
-@@ -169,7 +169,7 @@
-
- =item B<gpg> [string]
-
--Path to the GnuPG binary. Default: B<gpg>.
-+Path to the GnuPG binary. Default: B<@GPG_PATH@>.
-
- =item B<gpg-sign> [string]
-
-@@ -456,7 +456,7 @@
- $gecos =~ s/,.*//;
-
- my $gpg = GnuPG::Interface->new();
-- $gpg->call( 'gpg' );
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->hash_init(
- 'meta_interactive' => 0,
- 'always_trust' => 1,
-@@ -566,7 +566,7 @@
- };
- @{$CONFIG{'keyid'}} = map { s/^0x//; uc (substr y/ //dr, -16) } @{$CONFIG{'keyid'}};
- $CONFIG{'export-sig-age'} //= 24*60*60;
-- $CONFIG{'gpg'} //= 'gpg';
-+ $CONFIG{'gpg'} //= '@GPG_PATH@';
- $CONFIG{'gpg-sign'} //= $CONFIG{'gpg'};
- $CONFIG{'gpg-delsig'} //= $CONFIG{'gpg'};
- check_executable($_, $CONFIG{$_}) for qw/gpg gpg-sign gpg-delsig/;
---- ./caff/pgp-clean.orig 2015-01-29 21:40:04.000000000 +0100
-+++ ./caff/pgp-clean 2015-01-29 21:45:59.000000000 +0100
-@@ -237,6 +237,7 @@
- my ($gnupghome, $keyid) = @_;
-
- my $gpg = GnuPG::Interface->new();
-+ $gpg->call( '@GPG_PATH@' );
- my %confighash = ( armor => 1 );
- $confighash{'homedir'}=$gnupghome if (defined $gnupghome);
- $gpg->options->hash_init( %confighash );
-@@ -317,6 +318,7 @@
- # get key listing
- #################
- my $gpg = GnuPG::Interface->new();
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->meta_interactive( 0 );
- my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
- $gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] );
-@@ -354,6 +356,7 @@
- ###############################
- my $tempdir = tempdir( "caff-$keyid-XXXXX", DIR => '/tmp/', CLEANUP => 1);
- $gpg = GnuPG::Interface->new();
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->hash_init( 'homedir' => $tempdir );
- $gpg->options->meta_interactive( 0 );
- ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
-@@ -369,6 +372,7 @@
- # prune it
- ##########
- $gpg = GnuPG::Interface->new();
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->hash_init(
- 'homedir' => $tempdir,
- 'extra_args' => [ '--with-colons', '--fixed-list-mode', '--command-fd=0', '--no-tty' ] );
---- ./caff/pgp-fixkey.orig 2015-01-29 21:40:12.000000000 +0100
-+++ ./caff/pgp-fixkey 2015-01-29 21:46:36.000000000 +0100
-@@ -245,6 +245,7 @@
- # find a list of all interesting keys.
- if (scalar @KEYIDS == 0) {
- my $gpg = GnuPG::Interface->new();
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->meta_interactive( 0 );
- my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
- $gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fast-list-mode', '--fixed-list-mode' ] );
-@@ -279,6 +280,7 @@
- # get key listing
- #################
- my $gpg = GnuPG::Interface->new();
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->meta_interactive( 0 );
- my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
- $gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] );
-@@ -311,6 +313,7 @@
- # prune it
- ##########
- $gpg = GnuPG::Interface->new();
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->hash_init(
- 'extra_args' => [ '--with-colons', '--fixed-list-mode', '--command-fd=0', '--no-tty' ] );
- ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
---- ./gpg-key2latex/gpg-key2latex.orig 2015-01-29 21:47:12.000000000 +0100
-+++ ./gpg-key2latex/gpg-key2latex 2015-01-29 21:47:52.000000000 +0100
-@@ -51,6 +51,7 @@
- # Get the list of all matching keys.
- {
- my $gpg = GnuPG::Interface::->new();
-+ $gpg->call( '@GPG_PATH@' );
- $gpg->options->hash_init( 'extra_args' => [ qw/--fingerprint
- --fixed-list-mode
- --no-auto-check-trustdb --with-colons/ ]
-@@ -69,6 +70,7 @@
- foreach my $keyid (@KEYIDS) {
- my $photos = $options{'show-photo'} ? File::Temp::->new(TMPDIR => 1) : '/dev/null';
- my $gpg = GnuPG::Interface::->new();
-+ $gpg->call( '@GPG_PATH@' );
- # we need --attribute-{fd,file} and --status-{fd,file} to get the
- # correct attribute size
- $gpg->options->hash_init( 'extra_args' => [ '--attribute-file', $photos,
---- ./gpg-key2ps/gpg-key2ps.orig 2015-01-29 21:48:04.000000000 +0100
-+++ ./gpg-key2ps/gpg-key2ps 2015-01-29 21:48:29.000000000 +0100
-@@ -102,7 +102,7 @@
-
- # open a gpg process we'll be reading from below
- # --list-key due to #382794
--open GPG, '-|', qw/gpg --list-key --with-fingerprint --with-colons/, @ARGV;
-+open GPG, '-|', qw/@GPG_PATH@ --list-key --with-fingerprint --with-colons/, @ARGV;
-
- sub start_postscript {
- # start the PostScript output
---- ./gpg-mailkeys/gpg-mailkeys.orig 2015-01-29 21:48:50.000000000 +0100
-+++ ./gpg-mailkeys/gpg-mailkeys 2015-01-29 21:49:16.000000000 +0100
-@@ -73,7 +73,7 @@
- while [ -n "$1" ]; do
- printf "[$1] "
- TEMPFILE=`mktemp -t gpg2mail.XXXXXX`
-- ADDR=`gpg --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^rei:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/ */ /g' -e 's/^@@uid@@ //' | head -1`
-+ ADDR=`@GPG_PATH@ --with-colons --fixed-list-mode --list-key $1 | sed -e 's/^uid:[^rei:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:<]*<[^:>]*>\):.*/@@uid@@ \1/' -e '/^@@uid@@ /!d' -e 's/([^)]*)//g' -e 's/ */ /g' -e 's/^@@uid@@ //' | head -1`
- if [ -z "$ADDR" ]; then
- printf "(no usable user ids)\n"
- FAILKEYS="$FAILKEYS:$1"
-@@ -117,7 +117,7 @@
- Content-Type: application/pgp-keys
- Content-Disposition: attachment; filename="$1.asc"
-
--`gpg --armor --export $1`
-+`@GPG_PATH@ --armor --export $1`
-
- --$BOUNDARY--
- EOM
---- ./gpgdir/gpgdir.orig 2015-01-29 21:49:49.000000000 +0100
-+++ ./gpgdir/gpgdir 2015-01-29 21:52:37.000000000 +0100
-@@ -411,6 +411,7 @@
- my ($in_file, $out_file, $del_flag) = @_;
-
- my $gpg = GnuPG::Interface->new();
-+ $gpg->call('@GPG_PATH@');
- $gpg->options->hash_init(%options);
-
- die "[*] Could not create new gpg object with ",
-@@ -513,6 +514,7 @@
- my $handles = '';
-
- my $gpg = GnuPG::Interface->new();
-+ $gpg->call('@GPG_PATH@');
- $gpg->options->hash_init(%options);
-
- die "[*] Could not create new gpg object with ",
---- ./gpglist/gpglist.orig 2015-01-29 21:52:48.000000000 +0100
-+++ ./gpglist/gpglist 2015-01-29 21:53:16.000000000 +0100
-@@ -86,7 +86,7 @@
- die "Usage: $PROGRAM_NAME <keyid>\n";
- }
-
--open SIGS, '-|', qw/gpg --no-auto-check-trustdb --list-options show-sig-subpackets --fixed-list-mode --with-colons --list-sigs/, $key
-+open SIGS, '-|', qw/@GPG_PATH@ --no-auto-check-trustdb --list-options show-sig-subpackets --fixed-list-mode --with-colons --list-sigs/, $key
- or die "can't get gpg listing";
-
- my ($uid, $id) = ('', '');
---- ./gpgparticipants/gpgparticipants.orig 2015-01-29 21:56:07.000000000 +0100
-+++ ./gpgparticipants/gpgparticipants 2015-01-29 21:56:47.000000000 +0100
-@@ -52,7 +52,7 @@
- algos=$(echo "$algos" | tr ',' ' ')
- for algo in $algos; do
- # Ensure this is a valid algo
-- gpg --print-md "$algo" /dev/null >/dev/null || exit $?
-+ @GPG_PATH@ --print-md "$algo" /dev/null >/dev/null || exit $?
- done
-
- input="$1"
-@@ -83,7 +83,7 @@
-
- EOF
- for algo in $algos; do
-- printf " gpg --print-md %s %s\n" "$algo" "$output"
-+ printf " @GPG_PATH@ --print-md %s %s\n" "$algo" "$output"
- done
- cat <<EOF
-
-@@ -149,7 +149,7 @@
- while read i; do
- k=$(($k+1));
- printf "\n%03d [ ] Fingerprint OK [ ] ID OK\n" $k;
-- LANGUAGE=en gpg $options --display-charset utf-8 --fingerprint --list-keys -- $i \
-+ LANGUAGE=en @GPG_PATH@ $options --display-charset utf-8 --fingerprint --list-keys -- $i \
- | grep -ve "^sub" -e '^uid *\[jpeg image of size ';
- echo "_______________________________________________________________________________"
- done
---- ./gpgsigs/gpgsigs.orig 2015-01-29 21:57:34.000000000 +0100
-+++ ./gpgsigs/gpgsigs 2015-01-29 21:58:19.000000000 +0100
-@@ -119,7 +119,7 @@
- # get all known signatures
- if ($recv_keys) {
- print STDERR "Requesting keys from keyserver\n";
-- system qw/gpg --recv-keys/, @keys;
-+ system qw/@GPG_PATH@ --recv-keys/, @keys;
- }
-
- my $now = time;
-@@ -127,7 +127,7 @@
-
- my $photos = $latex ? File::Temp::->new(TMPDIR => 1) : '/dev/null';
- my $gpg = GnuPG::Interface::->new();
--$gpg->call( 'gpg' );
-+$gpg->call( '@GPG_PATH@' );
- # we need --attribute-{fd,file} and --status-{fd,file} to get the
- # correct attribute size
- $gpg->options->hash_init( 'extra_args' => [ '--attribute-file', $photos,
-@@ -330,7 +330,7 @@
-
- sub getChecksum ($$) {
- my ($algo, $infile) = @_;
-- open MD, '-|', qw/gpg --with-colons --print-md/, $algo, $infile or warn "Can't get gpg $algo digest\n";
-+ open MD, '-|', qw/@GPG_PATH@ --with-colons --print-md/, $algo, $infile or warn "Can't get gpg $algo digest\n";
- my $digest = <MD>;
- close MD;
- return $1 if $digest and $digest =~ /:([0-9A-F]+):[^:]*$/;
---- ./keyart/keyart.orig 2015-01-29 22:12:25.000000000 +0100
-+++ ./keyart/keyart 2015-01-29 22:14:18.000000000 +0100
-@@ -28,10 +28,8 @@
- def test_env():
- """Test if and where GPG is installed."""
- try:
-- if os.access('/usr/bin/gpg', os.X_OK):
-- gnupg = '/usr/bin/gpg'
-- else:
-- gnupg = '/usr/bin/gpg2'
-+ if os.access('@GPG_PATH@', os.X_OK):
-+ gnupg = '@GPG_PATH@'
- return gnupg
- except OSError:
- print("Please install GnuPG before using this script.")
---- ./keylookup/keylookup.orig 2015-01-29 22:20:24.000000000 +0100
-+++ ./keylookup/keylookup 2015-01-29 22:20:48.000000000 +0100
-@@ -80,7 +80,7 @@
- open (STDIN, "/dev/null") || die ("Cannot open /dev/null as stdin: $!\n");
-
- # child
-- my @ops = ('gpg');
-+ my @ops = ('@GPG_PATH@');
- if ($options->{'keyserver'}) {
- push @ops, '--keyserver='.$options->{'keyserver'};
- };
-@@ -289,7 +289,7 @@
- my $keyids = shift;
- my $options = shift;
-
-- my @args = ('gpg');
-+ my @args = ('@GPG_PATH@');
- if ($options->{'keyserver'}) {
- push @args, '--keyserver='.$options->{'keyserver'};
- };
</del></span></pre>
</div>
</div>
</body>
</html>