OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Oct-2006 08:19:33
Branch: HEAD Handle: 2006100207193300
Added files:
openpkg-src/spamassassin
spamassassin.patch
Modified files:
openpkg-src/spamassassin
spamassassin.spec
Log:
apply a vendor fix
Summary:
Revision Changes Path
1.4 +26 -0 openpkg-src/spamassassin/spamassassin.patch
1.76 +3 -1 openpkg-src/spamassassin/spamassassin.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.patch
============================================================================
$ cvs diff -u -r0 -r1.4 spamassassin.patch
--- /dev/null 2006-10-02 08:18:36 +0200
+++ spamassassin.patch 2006-10-02 08:19:33 +0200
@@ -0,0 +1,26 @@
+http://issues.apache.org/SpamAssassin/show_bug.cgi?id=5101
+
+Index: lib/Mail/SpamAssassin/ArchiveIterator.pm
+--- lib/Mail/SpamAssassin/ArchiveIterator.pm.orig 2006-08-29 17:16:47
+0200
++++ lib/Mail/SpamAssassin/ArchiveIterator.pm 2006-10-02 08:16:59 +0200
+@@ -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);
+Index: lib/Mail/SpamAssassin/Constants.pm
+--- lib/Mail/SpamAssassin/Constants.pm.orig 2006-08-29 17:16:47 +0200
++++ lib/Mail/SpamAssassin/Constants.pm 2006-10-02 08:16:59 +0200
+@@ -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)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.75 -r1.76 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 30 Aug 2006 16:10:41
-0000 1.75
+++ openpkg-src/spamassassin/spamassassin.spec 2 Oct 2006 06:19:33
-0000 1.76
@@ -38,7 +38,7 @@
Group: Mail
License: ASF
Version: %{V_here}
-Release: 20060830
+Release: 20061002
# package options
%option with_fsl yes
@@ -48,6 +48,7 @@
Source1: rc.spamassassin
Source2: local.cf
Source3: fsl.spamassassin
+Patch0: spamassassin.patch
# build information
Prefix: %{l_prefix}
@@ -81,6 +82,7 @@
%prep
%setup -q -n Mail-SpamAssassin-%{V_sdir}
+ %patch -p0
%build
# configure package
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
