Update "spamassassin" package to version 3.3.2. Changes since version 3.3.1:

This is a minor release, primarily to support perl-5.12 and later.
Additionally several other minor bugs are fixed.

8 files changed, 17 insertions, 298 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 93538b060f6..dc10e2c7949 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2010/10/06 21:27:29 pettai Exp $
+# $NetBSD: Makefile,v 1.101 2011/08/07 07:47:20 tron Exp $
 
-DISTNAME=	Mail-SpamAssassin-3.3.1
-PKGNAME=	spamassassin-3.3.1
-PKGREVISION=	3
+DISTNAME=	Mail-SpamAssassin-3.3.2
+PKGNAME=	spamassassin-3.3.2
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -22,7 +21,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
-RULESARCHIVE=	Mail-SpamAssassin-rules-3.3.1.r923114.tgz
+RULESARCHIVE=	Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz
 RULESARCHIVEASC=${RULESARCHIVE}.asc
 RULESARCHIVESHA=${RULESARCHIVE}.sha1
 FILES_SUBST+=	RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index f2404434cf8..398bb80785c 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,25 +1,19 @@
-$NetBSD: distinfo,v 1.56 2011/02/11 19:10:53 tnn Exp $
+$NetBSD: distinfo,v 1.57 2011/08/07 07:47:20 tron Exp $
 
-SHA1 (Mail-SpamAssassin-3.3.1.tar.gz) = 8b32a857cc89c8d057442400bc00f33fd703ce06
-RMD160 (Mail-SpamAssassin-3.3.1.tar.gz) = 154fb16de88b3cc9fac41f721af21b181a2368f3
-Size (Mail-SpamAssassin-3.3.1.tar.gz) = 1196842 bytes
-SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 7aeeb7abb2d727bb35d3a0927a1390ad3cddad59
-RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 9b6e17e05b3a323ba820ec2dc432d8b7dfc4d0ac
-Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 255548 bytes
-SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = 3e11775118e0e4be5720fdc3b99661e187943fd8
-RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = bc9c1755977c0b8677a3a8e700068f0e7288f434
-Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = 823 bytes
-SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 949b64216a6bb6833bd4f2ccab18b53719dda311
-RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 8b6c82596c158e5e010643a4d16a987dcc65244c
-Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 84 bytes
+SHA1 (Mail-SpamAssassin-3.3.2.tar.gz) = de954f69e190496eff4a796a9bab61747f03072b
+RMD160 (Mail-SpamAssassin-3.3.2.tar.gz) = 78e22ba6ba62a48fb7d24c40170124881b975fd9
+Size (Mail-SpamAssassin-3.3.2.tar.gz) = 1208182 bytes
+SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = a199d5f0f8c2381e3dfe421e7a774356b3ffda4b
+RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 22843725705aca9a7c773d9cca50d6eb30ca295c
+Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 258995 bytes
+SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 102cbd61d3d37243d17a48748fc468a1a4e91d05
+RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 764ea0f583c370c3c11f7245005327afa6c19988
+Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc) = 823 bytes
+SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 13003cfad508bd45863e02711aaee041ab9bc30e
+RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = aa218d53eb3dda0737171f75d63b7a64f97c2930
+Size (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.sha1) = 88 bytes
 SHA1 (patch-aa) = 2715638de88d0a299a65919cbf0d573699307100
 SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
-SHA1 (patch-bf) = 8b68125be019e84fbc9886e6624f518c2117dc66
-SHA1 (patch-bg) = 29a06349f3f34b5f5de5142c6c0ec4b3e9e14cab
-SHA1 (patch-bh) = 3fb1753552819bf1ae47a0275aac237b684d8d78
-SHA1 (patch-bi) = 896a0eb836bf9227454cd947c3b4f09f010c1c2a
-SHA1 (patch-bj) = 0ea3dd23fa5505e0ac8ecbb4b8cc84205b3c41d8
-SHA1 (patch-bk) = b93142e01e6a25a0143676866a6b717ab5f96497
diff --git a/mail/spamassassin/patches/patch-bf b/mail/spamassassin/patches/patch-bf
deleted file mode 100644
index bed88654c71..00000000000
--- a/mail/spamassassin/patches/patch-bf
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2010/10/04 22:12:06 pettai Exp $
-
-  fixes spamassassin bug #6392 (running spamassassin 3.3.1 on perl 5.12.x)
-  https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6392
-
---- ./lib/Mail/SpamAssassin/Dns.pm.orig	2010-10-01 20:52:41.000000000 +0000
-+++ ./lib/Mail/SpamAssassin/Dns.pm
-@@ -754,7 +754,7 @@ sub enter_helper_run_mode {
-   dbg("dns: entering helper-app run mode");
-   $self->{old_slash} = $/;              # Razor pollutes this
-   %{$self->{old_env}} = ();
--  if ( defined %ENV ) {
-+  if ( %ENV ) {
-     # undefined values in %ENV can result due to autovivification elsewhere,
-     # this prevents later possible warnings when we restore %ENV
-     while (my ($key, $value) = each %ENV) {
diff --git a/mail/spamassassin/patches/patch-bg b/mail/spamassassin/patches/patch-bg
deleted file mode 100644
index d5d3b7c9c8c..00000000000
--- a/mail/spamassassin/patches/patch-bg
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bg,v 1.2 2010/10/04 22:12:06 pettai Exp $
-
-  fixes spamassassin bug #6392 (running spamassassin 3.3.1 on perl 5.12.x)
-  https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6392
-
---- ./lib/Mail/SpamAssassin/Plugin/BodyEval.pm.orig	2010-03-16 14:49:21.000000000 +0000
-+++ ./lib/Mail/SpamAssassin/Plugin/BodyEval.pm
-@@ -119,7 +119,7 @@ sub _multipart_alternative_difference {
-         }
- 
- 	# If there are no words, mark if there's at least 1 image ...
--	if (keys %html == 0 && exists $pms->{html}{inside}{img}) {
-+	if (!%html && exists $pms->{html}{inside}{img}) {
- 	  # Use "\n" as the mark since it can't ever occur normally
- 	  $html{"\n"}=1;
- 	}
diff --git a/mail/spamassassin/patches/patch-bh b/mail/spamassassin/patches/patch-bh
deleted file mode 100644
index 4393f30446a..00000000000
--- a/mail/spamassassin/patches/patch-bh
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bh,v 1.2 2010/10/04 22:12:06 pettai Exp $
-
-  fixes spamassassin bug #6392 (running spamassassin 3.3.1 on perl 5.12.x)
-  https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6392
-
---- ./lib/Mail/SpamAssassin/HTML.pm.orig	2010-10-01 20:58:44.000000000 +0000
-+++ ./lib/Mail/SpamAssassin/HTML.pm
-@@ -191,7 +191,7 @@ sub get_rendered_text {
-   my $self = shift;
-   my %options = @_;
- 
--  return join('', @{ $self->{text} }) unless keys %options;
-+  return join('', @{ $self->{text} }) unless %options;
- 
-   my $mask;
-   while (my ($k, $v) = each %options) {
diff --git a/mail/spamassassin/patches/patch-bi b/mail/spamassassin/patches/patch-bi
deleted file mode 100644
index a665b25a3b9..00000000000
--- a/mail/spamassassin/patches/patch-bi
+++ /dev/null
@@ -1,190 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2010/10/04 22:12:06 pettai Exp $
-
-  fixes spamassassin bug #6392 (running spamassassin 3.3.1 on perl 5.12.x)
-  https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6392
-
---- ./lib/Mail/SpamAssassin/Plugin/Check.pm.orig	2010-03-16 14:49:21.000000000 +0000
-+++ ./lib/Mail/SpamAssassin/Plugin/Check.pm
-@@ -307,64 +307,51 @@ sub run_generic_tests {
-   my $package_name = __PACKAGE__;
-   my $methodname = $package_name."::_".$ruletype."_tests_".$clean_priority;
- 
--  if (defined &{$methodname} && !$doing_user_rules) {
--run_compiled_method:
--  # dbg("rules: run_generic_tests - calling %s", $methodname);
--    my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline });
--    my $err = $t->run(sub {
--      no strict "refs";
--      $methodname->($pms, @{$opts{args}});
--    });
--    if ($t->timed_out() && $master_deadline && time > $master_deadline) {
--      info("check: exceeded time limit in $methodname, skipping further tests");
--      $pms->{deadline_exceeded} = 1;
--    }
--    return;
--  }
-+  if (!defined &{$methodname} || $doing_user_rules) {
- 
--  # use %nopts for named parameter-passing; it's more friendly to future-proof
--  # subclassing, since new parameters can be added without breaking third-party
--  # subclassed implementations of this plugin.
--  my %nopts = (
--    ruletype => $ruletype,
--    doing_user_rules => $doing_user_rules,
--    priority => $priority,
--    clean_priority => $clean_priority
--  );
-+    # use %nopts for named parameter-passing; it's more friendly
-+    # to future-proof subclassing, since new parameters can be added without
-+    # breaking third-party subclassed implementations of this plugin.
-+    my %nopts = (
-+      ruletype => $ruletype,
-+      doing_user_rules => $doing_user_rules,
-+      priority => $priority,
-+      clean_priority => $clean_priority
-+    );
-+
-+    # build up the eval string...
-+    $self->{evalstr_methodname} = $methodname;
-+    $self->{evalstr_chunk_current_methodname} = undef;
-+    $self->{evalstr_chunk_methodnames} = [];
-+    $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections
-+    $self->{evalstr} = ''; $self->{evalstr_l} = 0;
-+    $self->{evalstr2} = '';
-+    $self->begin_evalstr_chunk($pms);
- 
--  # build up the eval string...
--  $self->{evalstr_methodname} = $methodname;
--  $self->{evalstr_chunk_current_methodname} = undef;
--  $self->{evalstr_chunk_methodnames} = [];
--  $self->{evalstr_chunk_prefix} = [];  # stack (array) of source code sections
--  $self->{evalstr} = ''; $self->{evalstr_l} = 0;
--  $self->{evalstr2} = '';
--  $self->begin_evalstr_chunk($pms);
--
--  $self->push_evalstr_prefix($pms, '
--      # start_rules_plugin_code '.$ruletype.' '.$priority.'
--      my $scoresptr = $self->{conf}->{scores};
--  ');
--  if (defined $opts{pre_loop_body}) {
--    $opts{pre_loop_body}->($self, $pms, $conf, %nopts);
--  }
--  $self->add_evalstr($pms,
--                     $self->start_rules_plugin_code($ruletype, $priority) );
--  while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) {
--    $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts);
--  }
--  if (defined $opts{post_loop_body}) {
--    $opts{post_loop_body}->($self, $pms, $conf, %nopts);
--  }
-+    $self->push_evalstr_prefix($pms, '
-+        # start_rules_plugin_code '.$ruletype.' '.$priority.'
-+        my $scoresptr = $self->{conf}->{scores};
-+    ');
-+    if (defined $opts{pre_loop_body}) {
-+      $opts{pre_loop_body}->($self, $pms, $conf, %nopts);
-+    }
-+    $self->add_evalstr($pms,
-+                       $self->start_rules_plugin_code($ruletype, $priority) );
-+    while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) {
-+      $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts);
-+    }
-+    if (defined $opts{post_loop_body}) {
-+      $opts{post_loop_body}->($self, $pms, $conf, %nopts);
-+    }
- 
--  $self->flush_evalstr($pms, 'run_generic_tests');
--  $self->free_ruleset_source($pms, $ruletype, $priority);
-+    $self->flush_evalstr($pms, 'run_generic_tests');
-+    $self->free_ruleset_source($pms, $ruletype, $priority);
- 
--  # clear out a previous version of this method
--  undef &{$methodname};
-+    # clear out a previous version of this method
-+    undef &{$methodname};
- 
--  # generate the loop that goes through each line...
--  my $evalstr = <<"EOT";
-+    # generate the loop that goes through each line...
-+    my $evalstr = <<"EOT";
-   {
-     package $package_name;
- 
-@@ -373,40 +360,51 @@ run_compiled_method:
-     sub $methodname {
- EOT
- 
--  for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) {
--    $evalstr .= "      $chunk_methodname(\@_);\n";
--  }
-+    for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) {
-+      $evalstr .= "      $chunk_methodname(\@_);\n";
-+    }
- 
--  $evalstr .= <<"EOT";
-+    $evalstr .= <<"EOT";
-     }
- 
-     1;
-   }
- EOT
- 
--  delete $self->{evalstr};   # free up some RAM before we eval()
--  delete $self->{evalstr2};
--  delete $self->{evalstr_methodname};
--  delete $self->{evalstr_chunk_current_methodname};
--  delete $self->{evalstr_chunk_methodnames};
--  delete $self->{evalstr_chunk_prefix};
--
--  dbg("rules: run_generic_tests - compiling eval code: %s, priority %s",
--      $ruletype, $priority);
--# dbg("rules: eval code to compile: $evalstr");
--  my $eval_result;
--  { my $timer = $self->{main}->time_method('compile_gen');
--    $eval_result = eval($evalstr);
--  }
--  if (!$eval_result) {
--    my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
--    warn "rules: failed to compile $ruletype tests, skipping:\n".
--         "\t($eval_stat)\n";
--    $pms->{rule_errors}++;
--  }
--  else {
-+    delete $self->{evalstr};   # free up some RAM before we eval()
-+    delete $self->{evalstr2};
-+    delete $self->{evalstr_methodname};
-+    delete $self->{evalstr_chunk_current_methodname};
-+    delete $self->{evalstr_chunk_methodnames};
-+    delete $self->{evalstr_chunk_prefix};
-+
-+    dbg("rules: run_generic_tests - compiling eval code: %s, priority %s",
-+        $ruletype, $priority);
-+  # dbg("rules: eval code to compile: $evalstr");
-+    my $eval_result;
-+    { my $timer = $self->{main}->time_method('compile_gen');
-+      $eval_result = eval($evalstr);
-+    }
-+    if (!$eval_result) {
-+      my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
-+      warn "rules: failed to compile $ruletype tests, skipping:\n".
-+           "\t($eval_stat)\n";
-+      $pms->{rule_errors}++;
-+      return;
-+    }
-     dbg("rules: compiled $ruletype tests");
--    goto run_compiled_method;
-+  }
-+
-+#run_compiled_method:
-+# dbg("rules: run_generic_tests - calling %s", $methodname);
-+  my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline });
-+  my $err = $t->run(sub {
-+    no strict "refs";
-+    $methodname->($pms, @{$opts{args}});
-+  });
-+  if ($t->timed_out() && $master_deadline && time > $master_deadline) {
-+    info("check: exceeded time limit in $methodname, skipping further tests");
-+    $pms->{deadline_exceeded} = 1;
-   }
- }
- 
diff --git a/mail/spamassassin/patches/patch-bj b/mail/spamassassin/patches/patch-bj
deleted file mode 100644
index b4b111eaec2..00000000000
--- a/mail/spamassassin/patches/patch-bj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bj,v 1.2 2010/10/04 22:12:06 pettai Exp $
-
-  fixes spamassassin bug #6396 (perl 5.12.x and spamassassin 3.3.1)
-  https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6396
-
---- lib/Mail/SpamAssassin/Plugin/MIMEEval.pm.orig	2010-03-16 14:49:21.000000000 +0000
-+++ lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
-@@ -498,7 +498,7 @@ sub _check_base64_length {
-     # perhaps just limit to test, and image?
-     next if ($ctype eq 'application/ics');
- 
--    my $cte = lc $p->get_header('content-transfer-encoding') || '';
-+    my $cte = lc($p->get_header('content-transfer-encoding') || '');
-     next if ($cte !~ /^base64$/);
-     foreach my $l ( @{$p->raw()} ) {
-       my $len = length $l;
diff --git a/mail/spamassassin/patches/patch-bk b/mail/spamassassin/patches/patch-bk
deleted file mode 100644
index 17f8661d5fd..00000000000
--- a/mail/spamassassin/patches/patch-bk
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bk,v 1.1 2010/10/06 21:27:30 pettai Exp $
-
-  fixes "Use of uninitialized value $opt{"syslog-socket"} in lc" error
-
---- spamd/spamd.raw.orig	2010-03-16 14:49:25.000000000 +0000
-+++ spamd/spamd.raw
-@@ -443,10 +443,12 @@ my $log_facility = $opt{'syslog'} || 'ma
- #  socket of 'none' means as much as --syslog=null. Sounds complicated? It is.
- #  But it works.
- # )
--my $log_socket = lc($opt{'syslog-socket'});
-+my $log_socket = $opt{'syslog-socket'};
- 
- if (!defined $log_socket || $log_socket eq '') {
-   $log_socket = am_running_on_windows() ? 'none' : 'unix';
-+} else {
-+  $log_socket = lc $log_socket;
- }
- 
- # This is the default log file; it can be changed on the command line