[packages/spamassassin] - SA Bugzilla – Bug 6937 patch
dzeus
dzeus at pld-linux.org
Wed Sep 18 10:59:00 CEST 2013
commit bc50aad6c661b18916f75c9d597e1d6dfbc2ff0f
Author: Robert Graużenis <dzeus at dc.net.pl>
Date: Wed Sep 18 10:58:09 2013 +0200
- SA Bugzilla – Bug 6937 patch
spamassassin-perl_5.18.patch | 113 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 113 insertions(+)
---
diff --git a/spamassassin-perl_5.18.patch b/spamassassin-perl_5.18.patch
new file mode 100644
index 0000000..589904b
--- /dev/null
+++ b/spamassassin-perl_5.18.patch
@@ -0,0 +1,113 @@
+--- Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/AsyncLoop.pm.orig 2011-06-06 23:59:17.000000000 +0000
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/AsyncLoop.pm
+@@ -360,7 +360,14 @@ sub complete_lookups {
+ }
+ $now = time; # capture new timestamp, after possible sleep in 'select'
+
+- while (my($key,$ent) = each %$pending) {
++ # A callback routine may generate another DNS query, which may insert
++ # an entry into the %$pending hash thus invalidating the each() context.
++ # So, make sure that callbacks are not called while the each() context
++ # is open, or avoid using each(). [Bug 6937]
++ #
++ # while (my($key,$ent) = each %$pending) {
++ foreach my $key (keys %$pending) {
++ my $ent = $pending->{$key};
+ my $id = $ent->{id};
+ if (defined $ent->{poll_callback}) { # call a "poll_callback" if exists
+ # be nice, provide fresh info to a callback routine
+@@ -448,7 +455,8 @@ sub abort_remaining_lookups {
+ my $pending = $self->{pending_lookups};
+ my $foundcnt = 0;
+ my $now = time;
+- while (my($key,$ent) = each %$pending) {
++ foreach my $key (keys %$pending) {
++ my $ent = $pending->{$key};
+ dbg("async: aborting after %.3f s, %s: %s",
+ $now - $ent->{start_time},
+ (defined $ent->{timeout_initial} &&
+--- Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Conf/Parser.pm.orig 2013-06-14 14:47:39.000000000 +0000
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Conf/Parser.pm
+@@ -1248,7 +1248,7 @@ sub is_regexp_valid {
+ my $safere = $re;
+ my $mods = '';
+ local ($1,$2);
+- if ($re =~ s/^m{//) {
++ if ($re =~ s/^m\{//) {
+ $re =~ s/}([a-z]*)$//; $mods = $1;
+ }
+ elsif ($re =~ s/^m\(//) {
+--- Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/DnsResolver.pm.orig 2011-06-06 23:59:17.000000000 +0000
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/DnsResolver.pm
+@@ -440,10 +440,16 @@ sub poll_responses {
+ { my $timer; # collects timestamp when variable goes out of scope
+ if (!defined($timeout) || $timeout > 0)
+ { $timer = $self->{main}->time_method("poll_dns_idle") }
++ $! = 0;
+ ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout);
+ }
+ if (!defined $nfound || $nfound < 0) {
+- warn "dns: select failed: $!";
++ if ($!) { warn "dns: select failed: $!\n" }
++ else { info("dns: select interrupted") }
++ return;
++ } elsif (!$nfound) {
++ if (!defined $timeout) { warn("dns: select returned empty-handed\n") }
++ elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) }
+ return;
+ }
+
+--- Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Message.pm.orig 2011-06-06 23:59:17.000000000 +0000
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Message.pm
+@@ -566,7 +566,7 @@ sub finish {
+ while (my $part = shift @toclean) {
+ # bug 5557: windows requires tmp file be closed before it can be rm'd
+ if (ref $part->{'raw'} eq 'GLOB') {
+- close($part->{'raw'}) or die "error closing input file: $!";
++ close($part->{'raw'}) or warn "error closing input file: $!";
+ }
+
+ # bug 5858: avoid memory leak with deep MIME structure
+--- Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/PerMsgStatus.pm.orig 2011-06-06 23:59:17.000000000 +0000
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/PerMsgStatus.pm
+@@ -420,8 +420,8 @@ sub _get_autolearn_points {
+ }
+ }
+
+- # ignore tests with 0 score in this scoreset
+- next if ($scores->{$test} == 0);
++ # ignore tests with 0 score (or undefined) in this scoreset
++ next if !$scores->{$test};
+
+ # Go ahead and add points to the proper locations
+ if (!$self->{conf}->maybe_header_only ($test)) {
+@@ -1252,13 +1252,12 @@ sub _get_tag {
+ my $arg = (shift || ",");
+ my $line = '';
+ foreach my $test (sort @{$self->{test_names_hit}}) {
+- if (!$line) {
+- $line .= $test . "=" . $self->{conf}->{scores}->{$test};
+- } else {
+- $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test};
+- }
++ my $score = $self->{conf}->{scores}->{$test};
++ $score = '0' if !defined $score;
++ $line .= $arg if $line ne '';
++ $line .= $test . "=" . $score;
+ }
+- $line ? $line : 'none';
++ $line ne '' ? $line : 'none';
+ },
+
+ PREVIEW => sub { $self->get_content_preview() },
+--- Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Util.pm.orig 2011-06-06 23:59:17.000000000 +0000
++++ Mail-SpamAssassin-3.3.2/lib/Mail/SpamAssassin/Util.pm
+@@ -1582,7 +1582,7 @@ sub regexp_remove_delimiters {
+ warn "cannot remove delimiters from null regexp";
+ return undef; # invalid
+ }
+- elsif ($re =~ s/^m{//) { # m{foo/bar}
++ elsif ($re =~ s/^m\{//) { # m{foo/bar}
+ $delim = '}';
+ }
+ elsif ($re =~ s/^m\(//) { # m(foo/bar)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spamassassin.git/commitdiff/bc50aad6c661b18916f75c9d597e1d6dfbc2ff0f
More information about the pld-cvs-commit
mailing list