From 4fe6f64f6444237f5325be72ece32a97350c2b8b Mon Sep 17 00:00:00 2001
From: tonio <tonio>
Date: Thu, 5 Feb 2009 13:45:28 +0000
Subject: Avoid crash with 64bit time_t. From PR pkg/40548

---
 mail/mutt-devel/Makefile         |  4 ++--
 mail/mutt-devel/distinfo         |  3 ++-
 mail/mutt-devel/patches/patch-aq | 29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 mail/mutt-devel/patches/patch-aq

(limited to 'mail/mutt-devel')

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d36f8c13caa..4b4ba4b3f97 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2009/01/27 19:50:33 tonio Exp $
+# $NetBSD: Makefile,v 1.73 2009/02/05 13:45:28 tonio Exp $
 
 DISTNAME=		mutt-1.5.19
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 446a3fe63cd..5f8f2fd66c0 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2009/01/27 19:50:33 tonio Exp $
+$NetBSD: distinfo,v 1.55 2009/02/05 13:45:28 tonio Exp $
 
 SHA1 (mutt-1.5.19.tar.gz) = 96e4cc1e1419ba816fcc19d77255978e62c20793
 RMD160 (mutt-1.5.19.tar.gz) = dcb8d027593bfccd62eb7aba338007bce3c7e22e
@@ -12,3 +12,4 @@ SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
 SHA1 (patch-an) = 96eb3aeea3f567b4835eac5d799355f62ad5a455
 SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
 SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
+SHA1 (patch-aq) = d327ac440e65516515ddc1646b849b27af61e864
diff --git a/mail/mutt-devel/patches/patch-aq b/mail/mutt-devel/patches/patch-aq
new file mode 100644
index 00000000000..9663d13af03
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-aq
@@ -0,0 +1,29 @@
+$NetBSD: patch-aq,v 1.1 2009/02/05 13:45:28 tonio Exp $
+
+Avoid crash with 64bit time_t.
+From PR pkg/40548
+
+--- mh.c.orig	2009-01-05 20:20:53.000000000 +0100
++++ mh.c
+@@ -1242,8 +1242,8 @@ int maildir_open_new_message (MESSAGE * 
+   omask = umask (mh_umask (dest));
+   FOREVER
+   {
+-    snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%ld.%u_%d.%s%s",
+-	      dest->path, subdir, time (NULL), (unsigned int)getpid (),
++    snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%lld.%u_%d.%s%s",
++	      dest->path, subdir, (long long)time (NULL), (unsigned int)getpid (),
+ 	      Counter++, NONULL (Hostname), suffix);
+ 
+     dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
+@@ -1328,8 +1328,8 @@ int maildir_commit_message (CONTEXT * ct
+   /* construct a new file name. */
+   FOREVER
+   {
+-    snprintf (path, _POSIX_PATH_MAX, "%s/%ld.%u_%d.%s%s", subdir,
+-	      time (NULL), (unsigned int)getpid (), Counter++, 
++    snprintf (path, _POSIX_PATH_MAX, "%s/%lld.%u_%d.%s%s", subdir,
++	      (long long)time (NULL), (unsigned int)getpid (), Counter++, 
+ 	      NONULL (Hostname), suffix);
+     snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path);
+ 
-- 
cgit v1.2.3