<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c236ffa1d5f42936800c390128c480e0402fe571">https://github.com/macports/macports-ports/commit/c236ffa1d5f42936800c390128c480e0402fe571</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 c236ffa p5-mail-spamassassin: Update to release v3.4.2 * Integrates 3+ years of bug fixes including former MacPorts patches * Fixes 4 CVEs * Adds multiple optional new features
</span>c236ffa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c236ffa1d5f42936800c390128c480e0402fe571
</span>Author: Bill Cole <billcole@apache.org>
AuthorDate: Mon Sep 17 17:52:14 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> p5-mail-spamassassin: Update to release v3.4.2
</span><span style='display:block; white-space:pre;color:#404040;'> * Integrates 3+ years of bug fixes including former MacPorts patches
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes 4 CVEs
</span><span style='display:block; white-space:pre;color:#404040;'> * Adds multiple optional new features
</span>---
perl/p5-mail-spamassassin/Portfile | 11 ++++-------
.../files/patch-default-inc-excludes-dot.diff | 11 -----------
.../files/patch-lib-Mail-SpamAssassin-DnsResolver.pm.diff | 14 --------------
3 files changed, 4 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-mail-spamassassin/Portfile b/perl/p5-mail-spamassassin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06db6f9..6825cfb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-mail-spamassassin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-mail-spamassassin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
perl5.branches 5.26
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.setup Mail-SpamAssassin 3.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.setup Mail-SpamAssassin 3.4.2
</span> categories-append mail
license Apache-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +18,9 @@ long_description SpamAssassin(tm) is a mail filter to identify spam. \
</span>
homepage http://spamassassin.apache.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4b7d6a6def068eb015e8d4699db410ade76b28f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9b7a95a594cdca4f265707364478b57813b82a0ec7e520d9bc818bfbcafdd726
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dd3cbd744a642478d5773e2fb524461b2cd864e3\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8a1c139ee08f140d3d3fdf13e03d98cf68a5cae27a082c4a614d154565a3c34f\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3185452
</span>
if {${perl5.major} != ""} {
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,9 +56,6 @@ if {${perl5.major} != ""} {
</span> startupitem.executable ${perl5.bindir}/spamd -l
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-lib-Mail-SpamAssassin-DnsResolver.pm.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-default-inc-excludes-dot.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|return ''|return 'PRIV'|" ${worksrcpath}/Makefile.PL
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-mail-spamassassin/files/patch-default-inc-excludes-dot.diff b/perl/p5-mail-spamassassin/files/patch-default-inc-excludes-dot.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c1cf515..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-mail-spamassassin/files/patch-default-inc-excludes-dot.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spamc/configure.pl.orig 2017-07-03 07:14:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spamc/configure.pl 2017-07-03 07:15:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Do the same thing as for the preprocessor below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package version_h;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $Z = $0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- local $0 = "version.h.pl";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ local $0 = "./version.h.pl";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- local @ARGV = ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Got to check for defined because the script returns shell error level!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unless (defined do $0) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-mail-spamassassin/files/patch-lib-Mail-SpamAssassin-DnsResolver.pm.diff b/perl/p5-mail-spamassassin/files/patch-lib-Mail-SpamAssassin-DnsResolver.pm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 71003f1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-mail-spamassassin/files/patch-lib-Mail-SpamAssassin-DnsResolver.pm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://svn.apache.org/viewvc?view=revision&revision=1691992
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Mail/SpamAssassin/DnsResolver.pm.orig 2015/07/20 18:23:18 1691991
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Mail/SpamAssassin/DnsResolver.pm 2015/07/20 18:24:48 1691992
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -592,6 +592,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($packet) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $packet->header->rd(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # my $udp_payload_size = $self->{res}->udppacketsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($udp_payload_size && $udp_payload_size > 512) {
</span></pre><pre style='margin:0'>
</pre>