diff options
author | Doug Barton <dougb@FreeBSD.org> | 2002-11-05 10:24:18 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2002-11-05 10:24:18 +0000 |
commit | 07b7160db6c4d601dbe894ed1b46b2831d93c3f9 (patch) | |
tree | b5badb62a1c4002178b1dab3ca2c4687ffd443ac /mail | |
parent | Update to 6.1.2, released 10/31. It's a very simple bugfix upgrade. (diff) |
Upgrade to 2.43, which has some nice bug fixes, most significantly
to the auto-whitelist feature, and some core-dump problems that
could cause a user to lose mail if spamd was down.
Regenerate my usedcc patches.
Fix the problem of the port using /etc/mail for its config files.
This is the patch I submitted on 10/17, but never got a response
from MAINTAINER.
PR: ports/44105
Notes
Notes:
svn path=/head/; revision=69518
Diffstat (limited to 'mail')
-rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 5 | ||||
-rw-r--r-- | mail/p5-Mail-SpamAssassin/distinfo | 2 | ||||
-rw-r--r-- | mail/p5-Mail-SpamAssassin/files/patch-use_dcc-option | 65 |
3 files changed, 36 insertions, 36 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 0a07b8321a16..1f2e805e2f6e 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -6,8 +6,7 @@ # PORTNAME= Mail-SpamAssassin -PORTVERSION= 2.41 -PORTREVISION= 1 +PORTVERSION= 2.43 CATEGORIES= mail perl5 MASTER_SITES= http://spamassassin.org/released/ \ ${MASTER_SITE_PERL_CPAN} @@ -28,6 +27,8 @@ RUN_DEPENDS+= ${PODPARSER} BUILD_DEPENDS+= ${PODPARSER} PERL_CONFIGURE= yes +CONFIGURE_ARGS+= SYSCONFDIR="${PREFIX}/etc" + MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \ Mail::SpamAssassin::Conf.3 \ diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo index 0f95c99ef167..5fa2de141543 100644 --- a/mail/p5-Mail-SpamAssassin/distinfo +++ b/mail/p5-Mail-SpamAssassin/distinfo @@ -1 +1 @@ -MD5 (Mail-SpamAssassin-2.41.tar.gz) = e96b278beecb4b549a79b1497bd354e3 +MD5 (Mail-SpamAssassin-2.43.tar.gz) = b39d3b597f8e0abd13aa9da46c83f2d2 diff --git a/mail/p5-Mail-SpamAssassin/files/patch-use_dcc-option b/mail/p5-Mail-SpamAssassin/files/patch-use_dcc-option index 6a8c84f596eb..e806dcd0567c 100644 --- a/mail/p5-Mail-SpamAssassin/files/patch-use_dcc-option +++ b/mail/p5-Mail-SpamAssassin/files/patch-use_dcc-option @@ -1,16 +1,17 @@ -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf.pm Mon Jun 10 00:59:38 2002 -+++ ./lib/Mail/SpamAssassin/Conf.pm Sat Jun 15 01:35:42 2002 -@@ -135,6 +135,8 @@ - $self->{allow_user_rules} = 0; +diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm +--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm Fri Oct 4 05:54:15 2002 ++++ ./lib/Mail/SpamAssassin/Conf.pm Thu Oct 17 22:12:05 2002 +@@ -144,6 +144,9 @@ $self->{user_rules_to_compile} = 0; + $self->{fold_headers} = 1; ++ # Added by FreeBSD ports + $self->{use_dcc} = 1; + + $self->{dcc_path} = undef; # Browse PATH $self->{dcc_body_max} = 999999; $self->{dcc_fuz1_max} = 999999; - $self->{dcc_fuz2_max} = 999999; -@@ -613,6 +615,16 @@ +@@ -763,6 +766,16 @@ if (/^rbl[-_]timeout\s+(\d+)$/) { $self->{rbl_timeout} = $1+0; next; @@ -26,22 +27,21 @@ diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Conf. + $self->{use_dcc} = $1+0; next; } - =item ok_locales xx [ yy zz ... ] (default: en) -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.pm Wed Jun 12 02:10:43 2002 -+++ ./lib/Mail/SpamAssassin/Dns.pm Sat Jun 15 01:37:22 2002 -@@ -301,6 +301,10 @@ - + =item ok_locales xx [ yy zz ... ] (default: all) +diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm +--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm Fri Oct 4 05:54:16 2002 ++++ ./lib/Mail/SpamAssassin/Dns.pm Thu Oct 17 22:12:51 2002 +@@ -449,6 +449,9 @@ sub is_dcc_available { my ($self) = @_; -+ + + # Added by FreeBSD ports + return 0 unless $self->{conf}->{use_dcc}; + - my (@resp); - if ($self->{main}->{local_tests_only}) { -@@ -324,6 +328,10 @@ + dbg ("local tests only, ignoring DCC"); + return 0; +@@ -476,6 +479,10 @@ sub dcc_lookup { my ($self, $fulltext) = @_; @@ -52,10 +52,10 @@ diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Dns.p my $response = undef; my %count; my $left; -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalTests.pm Fri Jun 14 10:21:47 2002 -+++ ./lib/Mail/SpamAssassin/EvalTests.pm Sat Jun 15 01:37:34 2002 -@@ -1430,6 +1430,9 @@ +diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm +--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm Fri Oct 4 05:54:16 2002 ++++ ./lib/Mail/SpamAssassin/EvalTests.pm Thu Oct 17 22:10:46 2002 +@@ -2026,6 +2026,9 @@ sub check_dcc { my ($self, $fulltext) = @_; @@ -65,24 +65,23 @@ diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/EvalT return 0 unless ($self->is_dcc_available()); return 0 if ($self->{already_checked_dcc}); -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/lib/Mail/SpamAssassin/Reporter.pm Fri Jun 14 11:52:17 2002 -+++ ./lib/Mail/SpamAssassin/Reporter.pm Sat Jun 15 00:56:39 2002 -@@ -147,6 +147,10 @@ - +diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm +--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm Mon Oct 14 09:44:35 2002 ++++ ./lib/Mail/SpamAssassin/Reporter.pm Thu Oct 17 22:13:19 2002 +@@ -238,6 +238,9 @@ sub is_dcc_available { my ($self) = @_; -+ + + # Added by FreeBSD ports + return 0 unless $self->{conf}->{use_dcc}; + - my (@resp); - if ($self->{main}->{local_tests_only}) { -diff -ur /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf ./rules/10_misc.cf ---- /usr/local/home/doug/Mail-SpamAssassin-2.30/rules/10_misc.cf Thu May 30 19:12:10 2002 -+++ ./rules/10_misc.cf Sat Jun 15 00:56:39 2002 -@@ -102,6 +102,9 @@ + dbg ("local tests only, ignoring DCC"); + return 0; +diff -ur ../Mail-SpamAssassin-2.43/rules/10_misc.cf ./rules/10_misc.cf +--- ../Mail-SpamAssassin-2.43/rules/10_misc.cf Thu Sep 26 03:50:25 2002 ++++ ./rules/10_misc.cf Thu Oct 17 22:10:46 2002 +@@ -107,6 +107,9 @@ # test, so it is set to "all" so the test will not be used by default. ok_languages all |