<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/807c08b9105b0b0907ac8c023339ad04f749dcf7">https://github.com/macports/macports-ports/commit/807c08b9105b0b0907ac8c023339ad04f749dcf7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 807c08b p5-module-signature: allow configuration with either gnupg v1 or gnupg v2
</span>807c08b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 807c08b9105b0b0907ac8c023339ad04f749dcf7
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Nov 2 13:05:39 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> p5-module-signature: allow configuration with either gnupg v1 or gnupg v2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add +gnupg1 variant to specify configuration with gnupg v1 rather than
</span><span style='display:block; white-space:pre;color:#404040;'> default gnupg v2 even if both are installed. In the default case, patch
</span><span style='display:block; white-space:pre;color:#404040;'> Makefile.PL to ignore any installed instance of gnupg v1.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/52795
</span>---
perl/p5-module-signature/Portfile | 15 ++++++++++++---
perl/p5-module-signature/files/patch-ignore-gnupg1.diff | 11 +++++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-module-signature/Portfile b/perl/p5-module-signature/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cb6dbc..ca33836 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-module-signature/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-module-signature/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup perl5 1.0
perl5.branches 5.24
perl5.setup Module-Signature 0.81
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license public-domain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Permissive
</span> maintainers nomaintainer
description Module signature file manipulation
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,10 +17,19 @@ supported_archs noarch
</span> checksums rmd160 fd34447fa5597880a2643551a3d63039ef6f456c \
sha256 7df547ceb8e45d40f75e481a868f389aaed5641c2cf4e133146ccea4b8facec6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gnupg1 description {Use old gnupg v1 rather than default gnupg v2} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${perl5.major} != ""} {
depends_build-append \
port:p${perl5.major}-ipc-run
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset gnupg1]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span> port:gnupg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/gpg2:gnupg2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-ignore-gnupg1.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-module-signature/files/patch-ignore-gnupg1.diff b/perl/p5-module-signature/files/patch-ignore-gnupg1.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a0ca8e0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-module-signature/files/patch-ignore-gnupg1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.PL.orig 2016-11-02 12:38:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.PL 2016-11-02 12:40:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "Looking for GNU Privacy Guard (gpg), a cryptographic signature tool...\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($gpg, $gpg_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for my $gpg_bin ('gpg', 'gpg2', 'gnupg', 'gnupg2') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for my $gpg_bin ('gpg2', 'gnupg2') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $gpg_path = can_run($gpg_bin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ next unless $gpg_path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ next unless `$gpg_bin --version` =~ /GnuPG/;
</span></pre><pre style='margin:0'>
</pre>