OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Sep-2007 18:42:42
Branch: HEAD Handle: 2007090517424100
Modified files:
openpkg-src/dbmail dbmail.patch dbmail.spec
Log:
fix building under with_mysql=yes by resolving a namespace clash
between libmysqlclient and dbmail
Summary:
Revision Changes Path
1.6 +62 -8 openpkg-src/dbmail/dbmail.patch
1.25 +1 -1 openpkg-src/dbmail/dbmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 dbmail.patch
--- openpkg-src/dbmail/dbmail.patch 3 Aug 2007 20:45:29 -0000 1.5
+++ openpkg-src/dbmail/dbmail.patch 5 Sep 2007 16:42:41 -0000 1.6
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2007-07-14 11:56:54 +0200
-+++ configure 2007-08-03 22:38:16 +0200
+--- configure.orig 2007-09-02 12:10:29 +0200
++++ configure 2007-09-05 18:15:10 +0200
@@ -2620,19 +2620,19 @@
withval=$with_pkglibdir; pkglibdirname="$withval"
fi
@@ -24,9 +24,39 @@
then
DM_CONFDIR="/etc"
else
+Index: dbmail-mailbox.c
+--- 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 @@
+
+ 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]));
+@@ -903,7 +903,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%%'",
+@@ -912,7 +912,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: debug.c
---- debug.c.orig 2007-07-14 11:56:54 +0200
-+++ debug.c 2007-08-03 22:38:16 +0200
+--- debug.c.orig 2007-09-02 12:10:29 +0200
++++ debug.c 2007-09-05 18:15:10 +0200
@@ -23,7 +23,7 @@
* Debugging and memory checking functions */
@@ -36,9 +66,33 @@
extern char *__progname; /* Program name, from crt0. */
#else
char *__progname = NULL;
+Index: misc.c
+--- misc.c.orig 2007-09-02 12:10:29 +0200
++++ misc.c 2007-09-05 18:26:50 +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-09-02 12:10:29 +0200
++++ misc.h 2007-09-05 18:27:02 +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
Index: modules/dbsqlite.c
---- modules/dbsqlite.c.orig 2007-07-14 11:56:54 +0200
-+++ modules/dbsqlite.c 2007-08-03 22:40:59 +0200
+--- 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 *);
@@ -48,7 +102,7 @@
const char * db_get_sql(sql_fragment_t frag)
{
-@@ -106,7 +106,7 @@
+@@ -107,7 +107,7 @@
static void dbsqlite_current_timestamp_unix(sqlite3_context *f, int argc
UNUSED, const sqlite3_value **argv UNUSED)
{
char buf[63];
@@ -57,7 +111,7 @@
(void)sqlite3_result_text(f,buf,-1,SQLITE_TRANSIENT);
}
-@@ -236,7 +236,7 @@
+@@ -237,7 +237,7 @@
** Otherwise, return an error.
*/
const unsigned char *zEsc = sqlite3_value_text(argv[2]);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 dbmail.spec
--- openpkg-src/dbmail/dbmail.spec 4 Sep 2007 17:09:55 -0000 1.24
+++ openpkg-src/dbmail/dbmail.spec 5 Sep 2007 16:42:41 -0000 1.25
@@ -38,7 +38,7 @@
Group: Mail
License: GPL
Version: %{V_major}.%{V_minor}%{V_micro}
-Release: 20070904
+Release: 20070905
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
