Date: Sat, 3 Oct 2015 18:21:00 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398551 - in head/mail/spamassassin: . files Message-ID: <201510031821.t93IL0Y8047024@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Oct 3 18:20:59 2015 New Revision: 398551 URL: https://svnweb.freebsd.org/changeset/ports/398551 Log: Add upstream r1684653 from bug #7208, which fixes warnings stemming from calling each/keys on a hashref. While here, convert @unexec stuff into preunexec and postunexec. Submitted by: Larry Rosenman Obtained from: https://svn.apache.org/viewvc?view=revision&revision=1684653 Added: head/mail/spamassassin/files/patch-bug7208 (contents, props changed) Modified: head/mail/spamassassin/Makefile head/mail/spamassassin/pkg-plist Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Sat Oct 3 18:04:52 2015 (r398550) +++ head/mail/spamassassin/Makefile Sat Oct 3 18:20:59 2015 (r398551) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.1 -PORTREVISION?= 3 # also bump japanese/spamassassin +PORTREVISION?= 4 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} Added: head/mail/spamassassin/files/patch-bug7208 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamassassin/files/patch-bug7208 Sat Oct 3 18:20:59 2015 (r398551) @@ -0,0 +1,29 @@ +--- lib/Mail/SpamAssassin/Plugin/URILocalBL.pm 2015/06/10 12:15:22 1684652 ++++ lib/Mail/SpamAssassin/Plugin/URILocalBL.pm 2015/06/10 12:18:50 1684653 +@@ -350,7 +350,7 @@ + # look for W3 links only + next unless (defined $info->{types}->{a}); + +- while (my($host, $domain) = each $info->{hosts}) { ++ while (my($host, $domain) = each %{$info->{hosts}}) { + + # skip if the domain name was matched + if (exists $rule->{exclusions} && exists $rule->{exclusions}->{$domain}) { +@@ -374,7 +374,7 @@ + } + + if (exists $rule->{countries}) { +- dbg("check: uri_local_bl countries %s\n", join(' ', sort keys $rule->{countries})); ++ dbg("check: uri_local_bl countries %s\n", join(' ', sort keys %{$rule->{countries}})); + + my $cc = $self->{geoip}->country_code_by_addr($ip); + +@@ -403,7 +403,7 @@ + } + + if (exists $rule->{isps}) { +- dbg("check: uri_local_bl isps %s\n", join(' ', map { '"' . $_ . '"'; } sort keys $rule->{isps})); ++ dbg("check: uri_local_bl isps %s\n", join(' ', map { '"' . $_ . '"'; } sort keys %{$rule->{isps}})); + + my $isp = $self->{geoisp}->isp_by_name($ip); + Modified: head/mail/spamassassin/pkg-plist ============================================================================== --- head/mail/spamassassin/pkg-plist Sat Oct 3 18:04:52 2015 (r398550) +++ head/mail/spamassassin/pkg-plist Sat Oct 3 18:20:59 2015 (r398551) @@ -7,7 +7,7 @@ bin/sa-update bin/spamassassin bin/spamc bin/spamd -@unexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true +@preunexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true @sample %%ETCDIR%%/local.cf.sample @sample %%ETCDIR%%/init.pre.sample @sample %%ETCDIR%%/v310.pre.sample @@ -211,15 +211,15 @@ lib/libspamc.so.0 %%DATADIR%%/sa-update-pubkey.txt %%DATADIR%%/user_prefs.template @comment ################################################################## -@unexec rm -rf /var/lib/spamassassin/2* 2>&1 >/dev/null || true +@postunexec rm -rf /var/lib/spamassassin/2* 2>&1 >/dev/null || true @dir /var/lib/spamassassin @dir /var/lib @dir /var/db/spamassassin @dir(%%USER%%,%%GROUP%%,) /var/run/spamd @comment ################################################################## -@unexec [ -d /var/db/spamassassin ] && echo "If you are no longer using SpamAssassin, remove /var/db/spamassassin" -@unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && echo "To delete %%USER%% permanently, 'rmuser %%USER%%'" -@unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && [ -d /var/spool/spamd ] && echo " Note that this will remove /var/spool/spamd" +@postunexec [ -d /var/db/spamassassin ] && echo "If you are no longer using SpamAssassin, remove /var/db/spamassassin" +@postunexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && echo "To delete %%USER%% permanently, 'rmuser %%USER%%'" +@postunexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && [ -d /var/spool/spamd ] && echo " Note that this will remove /var/spool/spamd" @comment ################################################################## -@exec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Downloading SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-update || true; fi -@exec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Compiling SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-compile || true; fi +@postexec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Downloading SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-update || true; fi +@postexec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Compiling SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-compile || true; fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510031821.t93IL0Y8047024>