Update to 1.3.2, provided by the maintainer Robert Lillack in

private mail.

New in 1.3.2
 - support for matching arbitrary headers in rules
 - bugfixes

pkgsrc includes additional changes:
- fix for http://secunia.com/advisories/15977/
- work around an annoying header parsing issue which
  resulted in totally garbled date sorting
- work around random SIGSEVs

2 files changed, 49 insertions, 0 deletions

diff --git a/mail/elmo/patches/patch-aa b/mail/elmo/patches/patch-aa
new file mode 100644
index 00000000000..e72ab322f06
--- /dev/null
+++ b/mail/elmo/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2005/07/16 15:40:56 wiz Exp $
+
+--- src/mlex.l.orig	Fri Aug 13 13:18:23 2004
++++ src/mlex.l
+@@ -352,8 +352,14 @@ TEXT_PLAIN_CHARSET [ \t]*text\/plain.*(;
+                  * obsolete one first, and check if it was possible to get
+                  * the date
+                  */
++		/** FIXME FIXME FIXME:
++		 * A more sophisticated Date: parser is needed, the first
++		 * call _never_ returns NULL (at least) on *BSD. Therefore
++		 * disable support for two digit years in order to NOT
++		 * garble all correctly formatted date headers....
++
+                 tmp = strptime (date, "%d %b %y %H:%M:%S", &tm);
+-                if (tmp == NULL)
++                if (tmp == NULL) */
+                         tmp = strptime (date, "%d %b %Y %H:%M:%S", &tm);
+
+ #ifdef HAVE_LOCALE_H
diff --git a/mail/elmo/patches/patch-ab b/mail/elmo/patches/patch-ab
new file mode 100644
index 00000000000..3faf5c97bc8
--- /dev/null
+++ b/mail/elmo/patches/patch-ab
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1 2005/07/16 15:40:56 wiz Exp $
+
+--- src/stats.c.orig	Thu Apr 29 10:06:10 2004
++++ src/stats.c
+@@ -185,6 +185,8 @@ stats_dump (void)
+         FILE          *fp;
+         mail_t        *mail;
+         struct estats  stats;
++	int            fd;
++	char           fn[25] = "/tmp/elmostats.XXXXXXXXX";
+
+         if (wrapbox_marray == NULL)
+                 return;
+@@ -200,9 +202,12 @@ stats_dump (void)
+                         process_mail (& stats, mail);
+         }
+
+-        fp = fopen ("/tmp/elmostats", "w");
+-        if (fp == NULL){
+-                error_ (errno, _("couldn't open %s"), "/tmp/elmostats");
++	fp = NULL;
++	fd = mkstemp(fn);
++        if (fd != -1 )
++		fp = fdopen (fd, "w");
++        if (fp == NULL) {
++                error_ (errno, _("couldn't open %s"), fn);
+                 destroy_stats (& stats);
+                 return;
+         }