diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2002-02-26 17:06:25 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2002-02-26 17:06:25 +0000 |
| commit | d5d63dd20e3a0d2a68536f62ef52a9d150fb55bf (patch) | |
| tree | 32dbf018a33b94ef2aeee12aed687f63ba8118c2 /mail/p5-Mail-SpamAssassin | |
| parent | Fix a problem where pipsecd opens a tun device that was previously used (diff) | |
1) Fix bug: check_for_faraway_charset_in_headers() does nothing
2) Add missing charsets into decode_mime_bit()
Notes
Notes:
svn path=/head/; revision=55271
Diffstat (limited to 'mail/p5-Mail-SpamAssassin')
3 files changed, 33 insertions, 1 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 8e0b072efefb..79710e08a2d2 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -7,7 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 2.01 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Mail 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 new file mode 100644 index 000000000000..c1307e54631d --- /dev/null +++ b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm @@ -0,0 +1,21 @@ +--- lib/Mail/SpamAssassin/EvalTests.pm.bak Fri Jan 25 07:36:02 2002 ++++ lib/Mail/SpamAssassin/EvalTests.pm Tue Feb 26 19:17:43 2002 +@@ -688,10 +688,17 @@ + + sub check_for_faraway_charset_in_headers { + my ($self) = @_; ++ my $hdr; + + 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 ++ my @hdrs = $self->{msg}->get_header ($h); ++ if ($#hdrs >= 0) { ++ $hdr = join (" ", @hdrs); ++ } else { ++ $hdr = ''; ++ } + while ($hdr =~ /=\?(.+?)\?.\?.*?\?=/g) { + Mail::SpamAssassin::Locales::is_charset_ok_for_locales($1, @locales) + or return 1; diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::PerMsgStatus.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::PerMsgStatus.pm new file mode 100644 index 000000000000..362d23a91753 --- /dev/null +++ b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::PerMsgStatus.pm @@ -0,0 +1,11 @@ +--- lib/Mail/SpamAssassin/PerMsgStatus.pm.bak Thu Jan 24 05:39:15 2002 ++++ lib/Mail/SpamAssassin/PerMsgStatus.pm Tue Feb 26 19:08:32 2002 +@@ -788,6 +788,8 @@ + if ($encoding =~ /^US-ASCII$/i + || $encoding =~ /^ISO-8859-\d+$/i + || $encoding =~ /^UTF-8$/i ++ || $encoding =~ /^KOI8-\w$/i ++ || $encoding =~ /^WINDOWS-125\d$/i + ) + { + # keep 8-bit stuff. forget mapping charsets though |