From fb77f03a80bf345a1bec0146b8b01e18425bbca9 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 23 Jun 2011 17:32:46 +0000 Subject: [PATCH] update SpamAssassin to 3.3.2, thanks Brad and pea@ for testing. ok pea@ --- mail/p5-Mail-SpamAssassin/Makefile | 11 +- mail/p5-Mail-SpamAssassin/distinfo | 20 +- .../patches/patch-Makefile_PL | 8 +- .../patch-lib_Mail_SpamAssassin_Dns_pm | 15 -- .../patch-lib_Mail_SpamAssassin_HTML_pm | 15 -- ...-lib_Mail_SpamAssassin_Plugin_AntiVirus_pm | 18 -- ...h-lib_Mail_SpamAssassin_Plugin_BodyEval_pm | 15 -- ...atch-lib_Mail_SpamAssassin_Plugin_Check_pm | 187 ------------------ ...h-lib_Mail_SpamAssassin_Plugin_MIMEEval_pm | 16 -- ...b_Mail_SpamAssassin_Util_DependencyInfo_pm | 12 +- ...l_SpamAssassin_Util_RegistrarBoundaries_pm | 12 +- .../patches/patch-spamd_spamd_raw | 21 -- mail/p5-Mail-SpamAssassin/pkg/PLIST | 6 +- 13 files changed, 35 insertions(+), 321 deletions(-) delete mode 100644 mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Dns_pm delete mode 100644 mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_HTML_pm delete mode 100644 mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_AntiVirus_pm delete mode 100644 mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_BodyEval_pm delete mode 100644 mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_Check_pm delete mode 100644 mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_MIMEEval_pm delete mode 100644 mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamd_raw diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 4561738bd83..6262f3db693 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -1,15 +1,14 @@ -# $OpenBSD: Makefile,v 1.72 2011/05/04 10:17:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.73 2011/06/23 17:32:46 sthen Exp $ COMMENT= mailfilter to identify and mark spam -VER= 3.3.1 +VER= 3.3.2 DISTNAME= Mail-SpamAssassin-${VER} PKGNAME= p5-${DISTNAME:S/-rc/rc/} -REVISION= 8 -RULESNAME= Mail-SpamAssassin-rules-${VER}.r923114 +RULESNAME= Mail-SpamAssassin-rules-${VER}-r1104058.tar.gz CATEGORIES= mail perl5 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}.tgz +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME} EXTRACT_SUFX= .tar.bz2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} WRKDIST= ${WRKDIR}/${DISTNAME:C/-rc.*//} @@ -75,7 +74,7 @@ post-install: .for i in ${FAQ} ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/SpamAssassin .endfor - cd ${PREFIX}/share/spamassassin; tar xzf ${FULLDISTDIR}/${RULESNAME}.tgz + cd ${PREFIX}/share/spamassassin; tar xzf ${FULLDISTDIR}/${RULESNAME} chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/spamassassin/* pre-regress: diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo index bf55fd0dcd5..88463040aaf 100644 --- a/mail/p5-Mail-SpamAssassin/distinfo +++ b/mail/p5-Mail-SpamAssassin/distinfo @@ -1,10 +1,10 @@ -MD5 (Mail-SpamAssassin-3.3.1.tar.bz2) = u5d5AMOyYn2xPp9E+bW/yA== -MD5 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = Pmrlo5ud0t5+wForMVw5aw== -RMD160 (Mail-SpamAssassin-3.3.1.tar.bz2) = toH8YCks0w79QFWFqtcPOcljMmA= -RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = m24X4Fs6MjuoIOwtxDLYt9/E0Kw= -SHA1 (Mail-SpamAssassin-3.3.1.tar.bz2) = 9XSAQ+soaxrLRWCTA5pV2wDG8l4= -SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = eu63q7LXJ7s106CSehOQrTzdrVk= -SHA256 (Mail-SpamAssassin-3.3.1.tar.bz2) = TDSM2VH8LFaI6XE/y8a6RT31HTKhqzMqY4ANIP8YvbQ= -SHA256 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = MyzoGJarKJCQ3AQHk6gmS1lDpBHwMCOMZGHwulaoGD4= -SIZE (Mail-SpamAssassin-3.3.1.tar.bz2) = 1015008 -SIZE (Mail-SpamAssassin-rules-3.3.1.r923114.tgz) = 255548 +MD5 (Mail-SpamAssassin-3.3.2.tar.bz2) = JT+Py+tsi/yrnROYZcGkBA== +MD5 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = cvgHVJnGGFGMaMc5nwK0WA== +RMD160 (Mail-SpamAssassin-3.3.2.tar.bz2) = rhZNGxdyWQyiYUksXN43SF1k7Zw= +RMD160 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = IoQ3JXBaypp8dz2cylDW6zDKKVw= +SHA1 (Mail-SpamAssassin-3.3.2.tar.bz2) = 84SANSk1/ju4SaJ6UmFeQA3ufWY= +SHA1 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = oZnV8PjCOB49/kIeendDVrP/2ks= +SHA256 (Mail-SpamAssassin-3.3.2.tar.bz2) = xyObS07wS6Xi1a7bkVaFAUbtP6R8iPCgdX8I4i+TogU= +SHA256 (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 6jb9Sf5oELIWGWM4OjBWpYShadSmW8U2KGCG/+G3aZA= +SIZE (Mail-SpamAssassin-3.3.2.tar.bz2) = 1006577 +SIZE (Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz) = 258995 diff --git a/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL b/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL index 41a44a248b3..ffeeb723702 100644 --- a/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL +++ b/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_PL,v 1.11 2010/03/24 23:56:04 sthen Exp $ ---- Makefile.PL.orig Mon Jan 11 19:23:34 2010 -+++ Makefile.PL Tue Jan 12 19:43:13 2010 -@@ -836,7 +836,7 @@ sub MY::install { +$OpenBSD: patch-Makefile_PL,v 1.12 2011/06/23 17:32:46 sthen Exp $ +--- Makefile.PL.orig Tue Jun 7 00:59:19 2011 ++++ Makefile.PL Wed Jun 22 14:54:40 2011 +@@ -837,7 +837,7 @@ sub MY::install { foreach (@code) { # Add our install targets as a dependency to all top-level install targets diff --git a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Dns_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Dns_pm deleted file mode 100644 index 149bf9498ea..00000000000 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Dns_pm +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_Dns_pm,v 1.1 2010/09/27 19:59:39 sthen Exp $ - -silence perl 5.12.2 warnings, from SA 3.3 svn - ---- lib/Mail/SpamAssassin/Dns.pm.orig Tue Mar 16 14:49:21 2010 -+++ lib/Mail/SpamAssassin/Dns.pm Mon Sep 27 20:39:14 2010 -@@ -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/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_HTML_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_HTML_pm deleted file mode 100644 index 4123e763b90..00000000000 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_HTML_pm +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_HTML_pm,v 1.1 2010/09/27 19:59:39 sthen Exp $ - -silence perl 5.12.2 warnings, from SA 3.3 svn - ---- lib/Mail/SpamAssassin/HTML.pm.orig Tue Mar 16 14:49:21 2010 -+++ lib/Mail/SpamAssassin/HTML.pm Mon Sep 27 20:39:14 2010 -@@ -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/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_AntiVirus_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_AntiVirus_pm deleted file mode 100644 index 1a1b8f99d4c..00000000000 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_AntiVirus_pm +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_Plugin_AntiVirus_pm,v 1.1 2011/05/04 10:17:53 sthen Exp $ - -silence spamassassin --lint warnings, from upstream r1028149 - ---- lib/Mail/SpamAssassin/Plugin/AntiVirus.pm.orig Wed May 4 10:58:19 2011 -+++ lib/Mail/SpamAssassin/Plugin/AntiVirus.pm Wed May 4 10:59:32 2011 -@@ -98,9 +98,9 @@ sub _check_attachments { - my ($ctype, $boundary, $charset, $name) = - Mail::SpamAssassin::Util::parse_content_type($p->get_header('content-type')); - -- $name = lc $name || ''; -+ $name = lc($name || ''); - -- my $cte = lc $p->get_header('content-transfer-encoding') || ''; -+ my $cte = lc($p->get_header('content-transfer-encoding') || ''); - $ctype = lc $ctype; - - if ($name && $name =~ /\.(?:ade|adp|asx|bas|bat|chm|cmd|com|cpl|crt|dll|exe|hlp|hta|inf|ins|isp|js|jse|lnk|mda|mdb|mde|mdt|mdw|mdz|msc|msi|msp|mst|nws|ops|pcd|pif|prf|reg|scf|scr\??|sct|shb|shs|shm|swf|url|vb|vbe|vbs|vbx|vxd|wsc|wsf|wsh)$/) diff --git a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_BodyEval_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_BodyEval_pm deleted file mode 100644 index 8906ee93395..00000000000 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_BodyEval_pm +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_Plugin_BodyEval_pm,v 1.1 2010/09/27 19:59:39 sthen Exp $ - -silence perl 5.12.2 warnings, from SA 3.3 svn - ---- lib/Mail/SpamAssassin/Plugin/BodyEval.pm.orig Tue Mar 16 14:49:21 2010 -+++ lib/Mail/SpamAssassin/Plugin/BodyEval.pm Mon Sep 27 20:39:14 2010 -@@ -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/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_Check_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_Check_pm deleted file mode 100644 index dd2aa5b6997..00000000000 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_Check_pm +++ /dev/null @@ -1,187 +0,0 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_Plugin_Check_pm,v 1.1 2010/09/27 19:59:39 sthen Exp $ - -silence perl 5.12.2 warnings, from SA 3.3 svn - ---- lib/Mail/SpamAssassin/Plugin/Check.pm.orig Tue Mar 16 14:49:21 2010 -+++ lib/Mail/SpamAssassin/Plugin/Check.pm Mon Sep 27 20:39:14 2010 -@@ -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}; -+ 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 { -+ 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/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_MIMEEval_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_MIMEEval_pm deleted file mode 100644 index fe68a4c0f41..00000000000 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Plugin_MIMEEval_pm +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_Plugin_MIMEEval_pm,v 1.1 2010/11/30 08:34:27 ajacoutot Exp $ - -r929342 -Bug 6396: Use of uninitialized value in lc at lib/Mail/SpamAssassin/Plugin/MIMEEval.pm - ---- lib/Mail/SpamAssassin/Plugin/MIMEEval.pm.orig Tue Mar 16 15:49:21 2010 -+++ lib/Mail/SpamAssassin/Plugin/MIMEEval.pm Tue Nov 30 08:46:20 2010 -@@ -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/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_DependencyInfo_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_DependencyInfo_pm index 60bcaf4c33d..29e649d9b26 100644 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_DependencyInfo_pm +++ b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_DependencyInfo_pm @@ -1,12 +1,12 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_Util_DependencyInfo_pm,v 1.1 2010/03/24 23:56:04 sthen Exp $ +$OpenBSD: patch-lib_Mail_SpamAssassin_Util_DependencyInfo_pm,v 1.2 2011/06/23 17:32:46 sthen Exp $ appease makewhatis ---- lib/Mail/SpamAssassin/Util/DependencyInfo.pm.orig Wed Mar 24 23:37:02 2010 -+++ lib/Mail/SpamAssassin/Util/DependencyInfo.pm Wed Mar 24 23:39:18 2010 -@@ -17,6 +17,13 @@ - # limitations under the License. - # +--- lib/Mail/SpamAssassin/Util/DependencyInfo.pm.orig Tue Jun 7 00:59:16 2011 ++++ lib/Mail/SpamAssassin/Util/DependencyInfo.pm Wed Jun 22 14:54:40 2011 +@@ -27,6 +27,13 @@ loadplugin Mail:SpamAssassin::Util::DependencyInfo + + =cut +=head1 NAME + diff --git a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_RegistrarBoundaries_pm b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_RegistrarBoundaries_pm index d258a520755..4a11dac82a2 100644 --- a/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_RegistrarBoundaries_pm +++ b/mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_Util_RegistrarBoundaries_pm @@ -1,12 +1,12 @@ -$OpenBSD: patch-lib_Mail_SpamAssassin_Util_RegistrarBoundaries_pm,v 1.1 2010/03/24 23:56:04 sthen Exp $ +$OpenBSD: patch-lib_Mail_SpamAssassin_Util_RegistrarBoundaries_pm,v 1.2 2011/06/23 17:32:46 sthen Exp $ appease makewhatis ---- lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm.orig Wed Mar 24 23:45:59 2010 -+++ lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm Wed Mar 24 23:45:43 2010 -@@ -18,6 +18,10 @@ - # limitations under the License. - # +--- lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm.orig Tue Jun 7 00:59:16 2011 ++++ lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm Wed Jun 22 14:54:40 2011 +@@ -24,6 +24,10 @@ Mail::SpamAssassin::Util::RegistrarBoundaries - domain + + =cut +=head1 +Mail::SpamAssassin::Util::RegistrarBoundaries - split domains at registry boundaries diff --git a/mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamd_raw b/mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamd_raw deleted file mode 100644 index 164d9439e77..00000000000 --- a/mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamd_raw +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-spamd_spamd_raw,v 1.1 2010/11/30 08:34:27 ajacoutot Exp $ - -r950216 -avoid undef warning: Use of uninitialized value $opt{"syslog-socket"} in lc at spamd line 444 - ---- spamd/spamd.raw.orig Tue Mar 16 15:49:25 2010 -+++ spamd/spamd.raw Tue Nov 30 08:46:27 2010 -@@ -443,10 +443,12 @@ my $log_facility = $opt{'syslog'} || 'mail'; - # 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 diff --git a/mail/p5-Mail-SpamAssassin/pkg/PLIST b/mail/p5-Mail-SpamAssassin/pkg/PLIST index 2a158ff804a..1c94a49c96a 100644 --- a/mail/p5-Mail-SpamAssassin/pkg/PLIST +++ b/mail/p5-Mail-SpamAssassin/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.29 2010/11/04 12:07:09 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.30 2011/06/23 17:32:46 sthen Exp $ @pkgpath mail/p5-Mail-SpamAssassin @newgroup _spamdaemon:506 @newuser _spamdaemon:506:506:daemon:SpamAssassin:${LOCALSTATEDIR}:/sbin/nologin @@ -117,6 +117,7 @@ ${P5SITE}/Mail/SpamAssassin/Util/RegistrarBoundaries.pm ${P5SITE}/Mail/SpamAssassin/Util/ScopedTimer.pm ${P5SITE}/Mail/SpamAssassin/Util/TieOneStringHash.pm ${P5SITE}/spamassassin-run.pod +@man man/man1/sa-awl.1 @man man/man1/sa-compile.1 @man man/man1/sa-learn.1 @man man/man1/sa-update.1 @@ -215,9 +216,9 @@ share/examples/SpamAssassin/v330.pre @owner _spamdaemon @group _spamdaemon @sample ${LOCALSTATEDIR}/ +@extraunexec rm -rf ${CONFDIR}/sa-update-keys @owner @group -@extraunexec rm -rf ${CONFDIR}/sa-update-keys share/spamassassin/ share/spamassassin/10_default_prefs.cf share/spamassassin/20_advance_fee.cf @@ -269,6 +270,7 @@ share/spamassassin/60_whitelist_spf.cf share/spamassassin/60_whitelist_subject.cf share/spamassassin/72_active.cf share/spamassassin/72_scores.cf +share/spamassassin/73_sandbox_manual_scores.cf share/spamassassin/STATISTICS-set0-72_scores.cf.txt share/spamassassin/STATISTICS-set1-72_scores.cf.txt share/spamassassin/STATISTICS-set2-72_scores.cf.txt