diff options
7 files changed, 18 insertions, 60 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 4b347b74f99f..6566f21aa228 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -6,10 +6,10 @@ # PORTNAME= Mail-SpamAssassin -PORTVERSION= 2.01 -PORTREVISION= 8 +PORTVERSION= 2.11 CATEGORIES= mail perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} +MASTER_SITES= http://www.spamassassin.org/released/ \ + ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Mail PKGNAMEPREFIX= p5- @@ -26,7 +26,7 @@ MAN3= Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \ Mail::SpamAssassin::PersistentAddrList.3 \ Mail::SpamAssassin::SMTP::SmartHost.3 MAN1PREFIX= ${PREFIX} -MAN1= spamd.1 spamassassin.1 spamc.1 +MAN1= spamd.1 spamassassin.1 spamc.1 spamproxyd.1 post-patch: @find ${WRKSRC} -type f -name "*.orig" -exec rm -f "{}" ";" @@ -41,11 +41,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/sample-nonspam.txt ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/sample-spam.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/spamd/README ${DOCSDIR}/spamd.README - ${INSTALL_DATA} ${WRKSRC}/spamproxy/README ${DOCSDIR}/spamproxy.README - ${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/sql.README - ${INSTALL_DATA} ${WRKSRC}/sql/spamassassin.sql ${DOCSDIR}/spamassassin.sql - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/spamd/README.spamd ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/spamproxy/README ${DOCSDIR}/README.spamproxy + ${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql + ${INSTALL_DATA} ${WRKSRC}/sql/spamassassin.sql ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo index 30e5e2bfac6e..89c446dfb6c9 100644 --- a/mail/p5-Mail-SpamAssassin/distinfo +++ b/mail/p5-Mail-SpamAssassin/distinfo @@ -1 +1 @@ -MD5 (Mail-SpamAssassin-2.01.tar.gz) = 7e37001a0c82cde89e04a801e7d7913c +MD5 (Mail-SpamAssassin-2.11.tar.gz) = 1d8d5413d3bd8655a1d9ef70d7b6e332 diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm index c6758efc6be7..137fa8967108 100644 --- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm +++ b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm @@ -1,14 +1,5 @@ --- lib/Mail/SpamAssassin/EvalTests.pm.orig Fri Jan 25 07:36:02 2002 +++ lib/Mail/SpamAssassin/EvalTests.pm Sun Mar 3 13:02:37 2002 -@@ -115,7 +115,7 @@ - my $rcvd = $self->get ('Received'); - $rcvd =~ s/\s+/ /gs; # just spaces, simplify the regexp - -- my $ip = $self->get ('X-Originating-Ip'); -+ my $ip = $self->get ('X-Originating-IP'); - if ($ip =~ /\d+\.\d+\.\d+\.\d+/) { $ip = 1; } else { $ip = 0; } - - # Hotmail formats its received headers like this: @@ -688,10 +688,17 @@ sub check_for_faraway_charset_in_headers { @@ -18,7 +9,7 @@ my @locales = $self->get_my_locales(); for my $h (qw(From Subject)) { - my $hdr = $self->get($h); -+# Can't use just get() because it un-mime header ++# Can't use just get() because it un-mime header and strip charset part + my @hdrs = $self->{msg}->get_header ($h); + if ($#hdrs >= 0) { + $hdr = join (" ", @hdrs); diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Locales.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Locales.pm deleted file mode 100644 index 34ed60bf65f3..000000000000 --- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Locales.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Mail/SpamAssassin/Locales.pm.bak Tue Jan 22 04:27:46 2002 -+++ lib/Mail/SpamAssassin/Locales.pm Tue Feb 26 12:58:16 2002 -@@ -62,7 +62,7 @@ - $locale =~ s/^([a-z][a-z]).*$/$1/; # zh_TW... => zh - - my $ok_for_loc = $charsets_for_locale{$locale}; -- return 0 if (!defined $ok_for_loc); -+ next if (!defined $ok_for_loc); - - if ($ok_for_loc =~ /(?:^| )\Q${cs}\E(?:$| )/) { - return 1; diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::NoMailAudit.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::NoMailAudit.pm deleted file mode 100644 index 0188f5e36187..000000000000 --- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::NoMailAudit.pm +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/Mail/SpamAssassin/NoMailAudit.pm.orig Mon Feb 11 15:42:13 2002 -+++ lib/Mail/SpamAssassin/NoMailAudit.pm Mon Feb 11 15:42:23 2002 -@@ -302,7 +302,7 @@ - my $file = shift; - - # some bits of code from Mail::Audit here: -- $file ||= $ENV{'MAIL'} || "/var/spool/mail/".getpwuid($>); -+ $file ||= $ENV{'MAIL'} || "/var/mail/".getpwuid($>); - - if (exists $self->{accept}) { - return $self->{accept}->(); -@@ -321,7 +321,7 @@ - - if (!defined $gotlock) { - # dot-locking not supported here (probably due to file permissions -- # on the /var/spool/mail dir). just use flock(). -+ # on the /var/mail dir). just use flock(). - $nodotlocking = 1; - } diff --git a/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf b/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf index df8e517230e2..334cc4981896 100644 --- a/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf +++ b/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf @@ -1,11 +1,11 @@ ---- rules/20_head_tests.cf.bak Fri Jan 25 07:36:02 2002 -+++ rules/20_head_tests.cf Tue Feb 26 13:01:16 2002 -@@ -44,7 +44,7 @@ +--- rules/20_head_tests.cf.orig Fri Mar 1 22:23:04 2002 ++++ rules/20_head_tests.cf Mon Mar 4 12:29:57 2002 +@@ -47,7 +47,7 @@ header TO_INVESTORS To =~ /\bInvestors\@/ describe TO_INVESTORS To: non-existent 'Investors' address --header SUBJ_ALL_CAPS Subject =~ /^[A-Z0-9\W]{6,}[^a-z]+$/ -+header SUBJ_ALL_CAPS Subject =~ /^[^[:lower:]]*([[:upper:]][^[:lower:]]*){6,}[^[:lower:]]*$/ +-header SUBJ_ALL_CAPS Subject =~ /^[^a-z]*$/ ++header SUBJ_ALL_CAPS Subject =~ /^[^a-z]*([A-Z][^a-z]*){3,}[^a-z]*$/ describe SUBJ_ALL_CAPS Subject is all capitals # (allow this test to pass if there's no Message-Id header) diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist index 97d1960b392d..2b188a36892f 100644 --- a/mail/p5-Mail-SpamAssassin/pkg-plist +++ b/mail/p5-Mail-SpamAssassin/pkg-plist @@ -14,13 +14,11 @@ lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ExposedMessage.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm -lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/MyMailAudit.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PersistentAddrList.pm -lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DirBasedAddrList.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AutoWhitelist.pm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist @@ -28,9 +26,9 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist %%PORTDOCS%%share/doc/Mail-SpamAssassin/sample-nonspam.txt %%PORTDOCS%%share/doc/Mail-SpamAssassin/sample-spam.txt %%PORTDOCS%%share/doc/Mail-SpamAssassin/spamassassin.sql -%%PORTDOCS%%share/doc/Mail-SpamAssassin/spamd.README -%%PORTDOCS%%share/doc/Mail-SpamAssassin/spamproxy.README -%%PORTDOCS%%share/doc/Mail-SpamAssassin/sql.README +%%PORTDOCS%%share/doc/Mail-SpamAssassin/README.spamd +%%PORTDOCS%%share/doc/Mail-SpamAssassin/README.spamproxy +%%PORTDOCS%%share/doc/Mail-SpamAssassin/README.sql %%PORTDOCS%%share/spamassassin/10_misc.cf %%PORTDOCS%%share/spamassassin/20_body_tests.cf %%PORTDOCS%%share/spamassassin/20_head_tests.cf |