From 46a126af7b435de0cbc62a8b5cd8eab5a7f0b770 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Mon, 16 Feb 2009 23:31:38 +0000
Subject: fix another 64-bit time_t problem which can unfortunately lead to
 mail database corruption, bump PKGREVISION

---
 mail/evolution-data-server/Makefile         |  4 ++--
 mail/evolution-data-server/distinfo         |  3 ++-
 mail/evolution-data-server/patches/patch-bc | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 mail/evolution-data-server/patches/patch-bc

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index d63c192ed3a..c732ce4d7d2 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2009/02/09 22:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.81 2009/02/16 23:31:38 drochner Exp $
 #
 
 DISTNAME=	evolution-data-server-2.24.4.1
-PKGREVISION=		1
+PKGREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index 37cc31c809b..2c362729db2 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2009/02/06 17:27:10 drochner Exp $
+$NetBSD: distinfo,v 1.56 2009/02/16 23:31:38 drochner Exp $
 
 SHA1 (evolution-data-server-2.24.4.1.tar.bz2) = 95ec53d366d82d51aea8e253b4360cb0db9ba984
 RMD160 (evolution-data-server-2.24.4.1.tar.bz2) = d08d08e85a9da85f24fee845bc98de62bddfb717
@@ -13,3 +13,4 @@ SHA1 (patch-as) = 1394759db4c47911f4e224e89fbb0ca66b789883
 SHA1 (patch-at) = 32bb4f9de33a3799ad7a1a00dd072b38a800185c
 SHA1 (patch-ba) = d90f9aa715725780d01b71e3464d20c9575d2db4
 SHA1 (patch-bb) = 915106112ec4606dc6b7626c6d81ccce1cab0d57
+SHA1 (patch-bc) = 6a1f6a549325f1067e4ff85c845b81e024955411
diff --git a/mail/evolution-data-server/patches/patch-bc b/mail/evolution-data-server/patches/patch-bc
new file mode 100644
index 00000000000..09a47fc06e8
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-bc
@@ -0,0 +1,18 @@
+$NetBSD: patch-bc,v 1.1 2009/02/16 23:31:38 drochner Exp $
+
+--- ./camel/camel-db.c.orig	2009-02-16 21:33:19.000000000 +0100
++++ ./camel/camel-db.c
+@@ -1213,11 +1213,11 @@ write_mir (CamelDB *cdb, const char *fol
+ 
+ 	/* NB: UGLIEST Hack. We can't modify the schema now. We are using msg_security (an unsed one to notify of FLAGGED/Dirty infos */
+ 
+-	ins_query = sqlite3_mprintf ("INSERT OR REPLACE INTO %Q VALUES (%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %ld, %ld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q )", 
++	ins_query = sqlite3_mprintf ("INSERT OR REPLACE INTO %Q VALUES (%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %lld, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q )", 
+ 			folder_name, record->uid, record->flags,
+ 			record->msg_type, record->read, record->deleted, record->replied,
+ 			record->important, record->junk, record->attachment, record->dirty,
+-			record->size, record->dsent, record->dreceived,
++			record->size, (long long)record->dsent, (long long)record->dreceived,
+ 			record->subject, record->from, record->to,
+ 			record->cc, record->mlist, record->followup_flag,
+ 			record->followup_completed_on, record->followup_due_by, 
-- 
cgit v1.2.3