diff options
| -rw-r--r-- | mail/elmo/Makefile | 6 | ||||
| -rw-r--r-- | mail/elmo/PLIST | 8 | ||||
| -rw-r--r-- | mail/elmo/distinfo | 10 | ||||
| -rw-r--r-- | mail/elmo/patches/patch-aa | 20 | ||||
| -rw-r--r-- | mail/elmo/patches/patch-ab | 29 |
5 files changed, 65 insertions, 8 deletions
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile index 27438d37249..c9e133d301f 100644 --- a/mail/elmo/Makefile +++ b/mail/elmo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:18 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/07/16 15:40:56 wiz Exp $ # -DISTNAME= elmo-1.3.1 +DISTNAME= elmo-1.3.2 PKGREVISION= # empty CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=elmo/} @@ -16,6 +16,8 @@ GNU_CONFIGURE= yes REPLACE_PERL= elmoconf.pl CONFIGURE_ARGS+= --with-gpgme-prefix=${BUILDLINK_PREFIX.gpgme} +# I get segmentation faults when not compiled with debug enabled +CONFIGURE_ARGS+= --enable-debug SUBST_CLASSES= tux SUBST_STAGE.tux= post-patch diff --git a/mail/elmo/PLIST b/mail/elmo/PLIST index 7f38321805a..78d3d1a98dd 100644 --- a/mail/elmo/PLIST +++ b/mail/elmo/PLIST @@ -1,10 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/06 14:28:42 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/07/16 15:40:56 wiz Exp $ bin/elmo bin/elmoconf.pl man/man1/elmo.1 man/man1/elmoconf.pl.1 -share/elmo/tutorial share/elmo/template +share/elmo/themes/80x25 +share/elmo/themes/README +share/elmo/themes/outlook +share/elmo/tutorial ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/elmo.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/elmo.mo +@dirrm share/elmo/themes @dirrm share/elmo diff --git a/mail/elmo/distinfo b/mail/elmo/distinfo index ff3a7511f35..3c20ce610b2 100644 --- a/mail/elmo/distinfo +++ b/mail/elmo/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 09:59:21 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/07/16 15:40:56 wiz Exp $ -SHA1 (elmo-1.3.1.tar.gz) = e4d0a8b2119af101290e400fd9c0f1cca4411d8b -RMD160 (elmo-1.3.1.tar.gz) = 6db0c5b9d1db8d979fdb3dfae59002c829df8008 -Size (elmo-1.3.1.tar.gz) = 534779 bytes +SHA1 (elmo-1.3.2.tar.gz) = d4e7999ce85c17df082a016fd70ee4978cfe1043 +RMD160 (elmo-1.3.2.tar.gz) = 3db1fafbbe38636459c4b1bbc3dae414e54c92d6 +Size (elmo-1.3.2.tar.gz) = 536768 bytes +SHA1 (patch-aa) = 8bfed77e5b5bae8c649b7474a3e64a188fb96f75 +SHA1 (patch-ab) = 1c66367cda9e26b98dd475b9f87e51a74be239de 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; + } |