head	1.9;
access;
symbols
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_HEAD:1.2;
locks; strict;
comment	@# @;


1.9
date	2007.12.12.15.44.38;	author cs;	state Exp;
branches;
next	1.8;
commitid	NMw0LkyLK5MsK9Js;

1.8
date	2007.10.27.18.09.27;	author cs;	state Exp;
branches;
next	1.7;
commitid	zI7NQPFvzs0P1gDs;

1.7
date	2007.10.20.15.11.03;	author rse;	state Exp;
branches;
next	1.6;
commitid	OCRSAN4XtYwzglCs;

1.6
date	2007.09.05.16.42.41;	author rse;	state Exp;
branches;
next	1.5;
commitid	fbF0UWLTSVAGdzws;

1.5
date	2007.08.03.20.45.29;	author rse;	state Exp;
branches;
next	1.4;
commitid	CVSMY9PIuCgKClss;

1.4
date	2007.06.03.08.22.21;	author rse;	state Exp;
branches;
next	1.3;
commitid	l4JjwZ5Snpgntrks;

1.3
date	2007.01.31.19.06.04;	author rse;	state Exp;
branches;
next	1.2;
commitid	mft4tdIggZjkZG4s;

1.2
date	2006.12.16.11.51.01;	author rse;	state Exp;
branches;
next	1.1;
commitid	8hF3tsDcG3TK3KYr;

1.1
date	2006.11.24.20.49.24;	author rse;	state Exp;
branches;
next	;
commitid	yPqRsMpP9lDiKXVr;


desc
@@


1.9
log
@upgrading package: dbmail 2.2.7 -> 2.2.8
@
text
@Index: configure
--- configure.orig	2007-10-20 13:21:16 +0200
+++ configure	2007-10-20 17:07:11 +0200
@@@@ -2620,19 +2620,19 @@@@
   withval=$with_pkglibdir; pkglibdirname="$withval"
 fi
 
-  if test "x$pkglibdirname" = "x"
+  if false
   then
   	DM_PKGLIBDIR="/usr/lib/dbmail"
   else
   	DM_PKGLIBDIR=$pkglibdirname
   fi
-  if test "x$localstatedir" = 'x${prefix}/var'
+  if false
   then
   	DM_STATEDIR="/var/run"
   else
   	DM_STATEDIR=$localstatedir
   fi
-  if test "x$sysconfdir" = 'x${prefix}/etc'
+  if false
   then
   	DM_CONFDIR="/etc"
   else
Index: dbmail-mailbox.c
--- dbmail-mailbox.c.orig	2007-10-20 13:21:16 +0200
+++ dbmail-mailbox.c	2007-10-20 17:07:11 +0200
@@@@ -905,7 +905,7 @@@@
 
 	else if ( MATCH(key, "before") ) {
 		g_return_val_if_fail(search_keys[*idx + 1], -1);
-		g_return_val_if_fail(check_date(search_keys[*idx + 1]),-1);
+		g_return_val_if_fail(dbmail_check_date(search_keys[*idx + 1]),-1);
 		value->type = IST_IDATE;
 		(*idx)++;
 		g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date < '%s'", date_imap2sql(search_keys[*idx]));
@@@@ -913,7 +913,7 @@@@
 		
 	} else if ( MATCH(key, "on") ) {
 		g_return_val_if_fail(search_keys[*idx + 1], -1);
-		g_return_val_if_fail(check_date(search_keys[*idx + 1]),-1);
+		g_return_val_if_fail(dbmail_check_date(search_keys[*idx + 1]),-1);
 		value->type = IST_IDATE;
 		(*idx)++;
 		g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date %s '%s%%'", 
@@@@ -922,7 +922,7 @@@@
 		
 	} else if ( MATCH(key, "since") ) {
 		g_return_val_if_fail(search_keys[*idx + 1], -1);
-		g_return_val_if_fail(check_date(search_keys[*idx + 1]),-1);
+		g_return_val_if_fail(dbmail_check_date(search_keys[*idx + 1]),-1);
 		value->type = IST_IDATE;
 		(*idx)++;
 		g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date > '%s'", date_imap2sql(search_keys[*idx]));
Index: misc.c
--- misc.c.orig	2007-10-20 13:21:16 +0200
+++ misc.c	2007-10-20 17:07:11 +0200
@@@@ -923,7 +923,7 @@@@
 // Define len if "01-Jan-1970" string
 #define STRLEN_MINDATA	11
 
-int check_date(const char *date)
+int dbmail_check_date(const char *date)
 {
 	char sub[4];
 	int days, i, j=1;
Index: misc.h
--- misc.h.orig	2007-10-20 13:21:16 +0200
+++ misc.h	2007-10-20 17:07:11 +0200
@@@@ -137,7 +137,7 @@@@
 
 int checkmailboxname(const char *s);
 int check_msg_set(const char *s);
-int check_date(const char *date);
+int dbmail_check_date(const char *date);
 
 /**
  * \brief discards all input coming from instream
@


1.8
log
@fix build on NetBSD
@
text
@a56 12
Index: debug.c
--- debug.c.orig	2007-10-20 13:21:16 +0200
+++ debug.c	2007-10-20 17:07:11 +0200
@@@@ -23,7 +23,7 @@@@
  * Debugging and memory checking functions */
 
 #include "dbmail.h"
-#if defined(BSD4_4)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(BSD4_4)
 extern char     *__progname;            /* Program name, from crt0. */
 #else
 char            *__progname = NULL;
@


1.7
log
@upgrading package: dbmail 2.2.7rc3 -> 2.2.7rc4
@
text
@d65 1
a65 1
+#if defined(__FreeBSD__) || defined(BSD4_4)
@


1.6
log
@fix building under with_mysql=yes by resolving a namespace clash between libmysqlclient and dbmail
@
text
@d2 2
a3 2
--- configure.orig	2007-09-02 12:10:29 +0200
+++ configure	2007-09-05 18:15:10 +0200
d28 3
a30 3
--- dbmail-mailbox.c.orig	2007-09-02 12:10:29 +0200
+++ dbmail-mailbox.c	2007-09-05 18:27:27 +0200
@@@@ -895,7 +895,7 @@@@
d39 1
a39 1
@@@@ -903,7 +903,7 @@@@
d48 1
a48 1
@@@@ -912,7 +912,7 @@@@
d58 2
a59 2
--- debug.c.orig	2007-09-02 12:10:29 +0200
+++ debug.c	2007-09-05 18:15:10 +0200
d70 2
a71 2
--- misc.c.orig	2007-09-02 12:10:29 +0200
+++ misc.c	2007-09-05 18:26:50 +0200
d82 2
a83 2
--- misc.h.orig	2007-09-02 12:10:29 +0200
+++ misc.h	2007-09-05 18:27:02 +0200
a92 30
Index: modules/dbsqlite.c
--- modules/dbsqlite.c.orig	2007-09-02 12:10:29 +0200
+++ modules/dbsqlite.c	2007-09-05 18:15:10 +0200
@@@@ -36,7 +36,7 @@@@
 /* SQLITE3 internals... */
 extern int sqlite3ReadUtf8(const unsigned char *);
 extern const unsigned char sqlite3UpperToLower[];
-extern int sqlite3utf8CharLen(const char *pData, int nByte);
+extern int sqlite3Utf8CharLen(const char *pData, int nByte);
 
 const char * db_get_sql(sql_fragment_t frag)
 {
@@@@ -107,7 +107,7 @@@@
 static void dbsqlite_current_timestamp_unix(sqlite3_context *f, int argc UNUSED,  const sqlite3_value **argv UNUSED)
 {
 	char buf[63];
-	sprintf(buf, "%ld", time(NULL)); /* assumes time() is signed int */
+	sprintf(buf, "%ld", (long)time(NULL)); /* assumes time() is signed int */
 	(void)sqlite3_result_text(f,buf,-1,SQLITE_TRANSIENT);
 }
 
@@@@ -237,7 +237,7 @@@@
 		** Otherwise, return an error.
 		*/
 		const unsigned char *zEsc = sqlite3_value_text(argv[2]);
-		if (sqlite3utf8CharLen((const char *)zEsc, -1) != 1) {
+		if (sqlite3Utf8CharLen((const char *)zEsc, -1) != 1) {
 			sqlite3_result_error(context, 
 				"ESCAPE expression must be a single character", -1);
 			return;
@


1.5
log
@fix building against internal API of SQLite 3.4.1 and upgrade to 2.2.6-rc1 as this finally provides IMAP IDLE support
@
text
@d2 2
a3 2
--- configure.orig	2007-07-14 11:56:54 +0200
+++ configure	2007-08-03 22:38:16 +0200
d27 30
d58 2
a59 2
--- debug.c.orig	2007-07-14 11:56:54 +0200
+++ debug.c	2007-08-03 22:38:16 +0200
d69 24
d94 2
a95 2
--- modules/dbsqlite.c.orig	2007-07-14 11:56:54 +0200
+++ modules/dbsqlite.c	2007-08-03 22:40:59 +0200
d105 1
a105 1
@@@@ -106,7 +106,7 @@@@
d114 1
a114 1
@@@@ -236,7 +236,7 @@@@
@


1.4
log
@upgrading package: dbmail 2.2.4 -> 2.2.5
@
text
@d2 2
a3 2
--- configure.orig	2007-06-02 15:14:40 +0200
+++ configure	2007-06-03 10:11:09 +0200
d28 2
a29 2
--- debug.c.orig	2007-06-02 15:14:40 +0200
+++ debug.c	2007-06-03 10:13:51 +0200
d39 30
@


1.3
log
@upgrading package: dbmail 2.2.1 -> 2.2.2
@
text
@d2 10
a11 3
--- configure.orig	2007-01-24 15:48:58 +0100
+++ configure	2007-01-31 20:02:46 +0100
@@@@ -2098,13 +2098,13 @@@@
d13 1
a13 1
   	DM_LOGDIR="$logdirname"
d18 1
a18 1
   	DM_STATEDIR='/var/run'
d25 1
a25 1
   	DM_CONFDIR='/etc'
d27 12
@


1.2
log
@apply fix for segfault problem (bug #461 in dbmail bug tracker)
@
text
@d2 3
a4 3
--- configure.orig	2006-11-18 14:36:23 +0100
+++ configure	2006-12-16 12:48:06 +0100
@@@@ -2097,13 +2097,13 @@@@
a19 19
Index: misc.c
--- misc.c.orig	2006-11-15 16:55:45 +0100
+++ misc.c	2006-12-16 12:48:06 +0100
@@@@ -2112,8 +2112,14 @@@@
 	char prev,next=0;
 	unsigned incode=0, inquote=0;
 	size_t i, l;
-	GString *s = g_string_new("");
+	GString *s;
+
+	if (!a)
+		return g_strdup("");
+	if (!a[0])
+		return g_strdup("");
 	
+	s = g_string_new("");
 	t = g_strdup(a);
 	inptr = t;
 	inptr = g_strstrip(inptr);
@


1.1
log
@new package: dbmail 2.2.1 (Fast Scalable RDBMS Mail Server)
@
text
@d3 1
a3 1
+++ configure	2006-11-24 20:08:37 +0100
d20 19
@