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: 20-Oct-2007 17:11:04
Branch: HEAD Handle: 2007102016110300
Modified files:
openpkg-src/dbmail dbmail.patch dbmail.spec
Log:
upgrading package: dbmail 2.2.7rc3 -> 2.2.7rc4
Summary:
Revision Changes Path
1.7 +13 -43 openpkg-src/dbmail/dbmail.patch
1.31 +3 -3 openpkg-src/dbmail/dbmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 dbmail.patch
--- openpkg-src/dbmail/dbmail.patch 5 Sep 2007 16:42:41 -0000 1.6
+++ openpkg-src/dbmail/dbmail.patch 20 Oct 2007 15:11:03 -0000 1.7
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2007-09-02 12:10:29 +0200
-+++ configure 2007-09-05 18:15:10 +0200
+--- 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
@@ -25,9 +25,9 @@
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 @@
+--- 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);
@@ -36,7 +36,7 @@
value->type = IST_IDATE;
(*idx)++;
g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date <
'%s'", date_imap2sql(search_keys[*idx]));
-@@ -903,7 +903,7 @@
+@@ -913,7 +913,7 @@
} else if ( MATCH(key, "on") ) {
g_return_val_if_fail(search_keys[*idx + 1], -1);
@@ -45,7 +45,7 @@
value->type = IST_IDATE;
(*idx)++;
g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date %s
'%s%%'",
-@@ -912,7 +912,7 @@
+@@ -922,7 +922,7 @@
} else if ( MATCH(key, "since") ) {
g_return_val_if_fail(search_keys[*idx + 1], -1);
@@ -55,8 +55,8 @@
(*idx)++;
g_snprintf(value->search, MAX_SEARCH_LEN, "internal_date >
'%s'", date_imap2sql(search_keys[*idx]));
Index: debug.c
---- debug.c.orig 2007-09-02 12:10:29 +0200
-+++ debug.c 2007-09-05 18:15:10 +0200
+--- 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 */
@@ -67,8 +67,8 @@
#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
+--- 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
@@ -79,8 +79,8 @@
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
+--- 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);
@@ -90,33 +90,3 @@
/**
* \brief discards all input coming from instream
-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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 dbmail.spec
--- openpkg-src/dbmail/dbmail.spec 5 Oct 2007 14:20:27 -0000 1.30
+++ openpkg-src/dbmail/dbmail.spec 20 Oct 2007 15:11:03 -0000 1.31
@@ -25,8 +25,8 @@
# package component versions
%define V_major 2.2
%define V_minor 7
-%define V_micro rc3
-%define V_micro_sep -rc3
+%define V_micro rc4
+%define V_micro_sep -rc4
# package information
Name: dbmail
@@ -39,7 +39,7 @@
Group: Mail
License: GPL
Version: %{V_major}.%{V_minor}%{V_micro}
-Release: 20071005
+Release: 20071020
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
