From 0f633ebc83595d60c256f2fec72692d4f6abffee Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 3 Oct 2015 18:20:59 +0000
Subject: 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
---
 mail/spamassassin/files/patch-bug7208 | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 mail/spamassassin/files/patch-bug7208

(limited to 'mail/spamassassin/files/patch-bug7208')

diff --git a/mail/spamassassin/files/patch-bug7208 b/mail/spamassassin/files/patch-bug7208
new file mode 100644
index 000000000000..4c00d13424c0
--- /dev/null
+++ b/mail/spamassassin/files/patch-bug7208
@@ -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);
+ 
-- 
cgit v1.2.3