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: 03-Aug-2007 22:45:30
Branch: HEAD Handle: 2007080321452900
Modified files:
openpkg-src/dbmail dbmail.patch dbmail.spec
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
Summary:
Revision Changes Path
1.5 +34 -4 openpkg-src/dbmail/dbmail.patch
1.17 +8 -7 openpkg-src/dbmail/dbmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dbmail/dbmail.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 dbmail.patch
--- openpkg-src/dbmail/dbmail.patch 3 Jun 2007 08:22:21 -0000 1.4
+++ openpkg-src/dbmail/dbmail.patch 3 Aug 2007 20:45:29 -0000 1.5
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2007-06-02 15:14:40 +0200
-+++ configure 2007-06-03 10:11:09 +0200
+--- configure.orig 2007-07-14 11:56:54 +0200
++++ configure 2007-08-03 22:38:16 +0200
@@ -2620,19 +2620,19 @@
withval=$with_pkglibdir; pkglibdirname="$withval"
fi
@@ -25,8 +25,8 @@
DM_CONFDIR="/etc"
else
Index: debug.c
---- debug.c.orig 2007-06-02 15:14:40 +0200
-+++ debug.c 2007-06-03 10:13:51 +0200
+--- debug.c.orig 2007-07-14 11:56:54 +0200
++++ debug.c 2007-08-03 22:38:16 +0200
@@ -23,7 +23,7 @@
* Debugging and memory checking functions */
@@ -36,3 +36,33 @@
extern char *__progname; /* Program name, from crt0. */
#else
char *__progname = NULL;
+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
+@@ -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)
+ {
+@@ -106,7 +106,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);
+ }
+
+@@ -236,7 +236,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.16 -r1.17 dbmail.spec
--- openpkg-src/dbmail/dbmail.spec 20 Jul 2007 20:16:16 -0000 1.16
+++ openpkg-src/dbmail/dbmail.spec 3 Aug 2007 20:45:29 -0000 1.17
@@ -24,7 +24,8 @@
# package component versions
%define V_major 2.2
-%define V_minor 5
+%define V_minor 6
+%define V_micro rc1
# package information
Name: dbmail
@@ -36,8 +37,8 @@
Class: EVAL
Group: Mail
License: GPL
-Version: %{V_major}.%{V_minor}
-Release: 20070720
+Version: %{V_major}.%{V_minor}%{V_micro}
+Release: 20070803
# package options
%option with_fsl yes
@@ -53,7 +54,7 @@
%endif
# list of sources
-Source0:
http://www.dbmail.org/download/%{V_major}/dbmail-%{V_major}.%{V_minor}.tar.gz
+Source0:
http://www.dbmail.org/download/%{V_major}/dbmail-%{V_major}.%{V_minor}-%{V_micro}.tar.gz
Source1: fsl.dbmail
Source2: rc.dbmail
Source3: dbmail-setup.sh
@@ -75,8 +76,8 @@
PreReq: libsieve >= 2.2
%endif
%if "%{with_sqlite}" == "yes"
-BuildPreReq: sqlite
-PreReq: sqlite
+BuildPreReq: sqlite >= 3.4.1
+PreReq: sqlite >= 3.4.1
%endif
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql, mysql::with_innobase = yes, zlib
@@ -108,7 +109,7 @@
}
%prep
- %setup -q
+ %setup -q -n dbmail-%{V_major}.%{V_minor}-%{V_micro}
%patch -p0
%build
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
