From ad9f9335feec0d3c0b5e1f9a8af588b78da69467 Mon Sep 17 00:00:00 2001 From: Cheng-Lung Sung Date: Mon, 2 Oct 2006 01:11:06 +0000 Subject: - fix the issue "SpamAssassin's sa-learn --mbx is broken" http://issues.apache.org/SpamAssassin/show_bug.cgi?id=5101 PR: ports/103308 Submitted by: Larry Rosenman --- mail/p5-Mail-SpamAssassin/Makefile | 1 + .../files/patch-lib-Mail-SpamAssassin-ArchiveIterator.pm | 11 +++++++++++ .../files/patch-lib-Mail-SpamAssassin-Constants.pm | 11 +++++++++++ 3 files changed, 23 insertions(+) create mode 100644 mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-ArchiveIterator.pm create mode 100644 mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-Constants.pm (limited to 'mail/p5-Mail-SpamAssassin') diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index f12b372fc938..c3f994bc776d 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -7,6 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.1.5 +PORTREVISION= 1 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-ArchiveIterator.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-ArchiveIterator.pm new file mode 100644 index 000000000000..1a3f922dddec --- /dev/null +++ b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-ArchiveIterator.pm @@ -0,0 +1,11 @@ +--- lib/Mail/SpamAssassin/ArchiveIterator.pm.orig Tue Aug 29 23:16:47 2006 ++++ lib/Mail/SpamAssassin/ArchiveIterator.pm Fri Sep 29 10:49:46 2006 +@@ -1141,7 +1141,7 @@ + } + + $self->bump_scan_progress(); +- $info->{"$file.$offset"} = Mail::SpamAssassin::Util::receive_date($header); ++ $info->{$offset} = Mail::SpamAssassin::Util::receive_date($header); + + # go onto the next message + seek(INPUT, $offset + $size, 0); diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-Constants.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-Constants.pm new file mode 100644 index 000000000000..0adc333f2f8e --- /dev/null +++ b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin-Constants.pm @@ -0,0 +1,11 @@ +--- lib/Mail/SpamAssassin/Constants.pm.orig Tue Aug 29 23:16:47 2006 ++++ lib/Mail/SpamAssassin/Constants.pm Fri Sep 29 10:49:46 2006 +@@ -265,7 +265,7 @@ + + # regular expression that matches message separators in The University of + # Washington's MBX mailbox format +-use constant MBX_SEPARATOR => qr/([\s|\d]\d-[a-zA-Z]{3}-\d{4}\s\d{2}:\d{2}:\d{2}.*),(\d+);([\da-f]{12})-(\w{8})/; ++use constant MBX_SEPARATOR => qr/^([\s|\d]\d-[a-zA-Z]{3}-\d{4}\s\d{2}:\d{2}:\d{2}.*),(\d+);([\da-f]{12})-(\w{8})\r?$/; + # $1 = datestamp (str) + # $2 = size of message in bytes (int) + # $3 = message status - binary (hex) -- cgit v1.2.3