Aaron,
I have a copy around cause I was building debian packages for libsieve.
Attached.
[EMAIL PROTECTED] wrote:
A BUGNOTE has been added to this bug.
======================================================================
http://dbmail.org/mantis/bug_view_advanced_page.php?bug_id=0000094
======================================================================
Reported By: ljackson
Assigned To: aaron
======================================================================
Project: DBMail
Bug ID: 94
Category: General
Reproducibility: N/A
Severity: feature
Priority: normal
Status: assigned
======================================================================
Date Submitted: 17-Sep-04 22:26 CEST
Last Modified: 21-Nov-04 02:05 CET
======================================================================
Summary: Patch to at least let sieve code complie against
libsieve2-2.2.0pre4-cvs050404
Description:
I have created a patch that adds the dbmail tables for Mysql and the
associated db layer code to allow for the compilation and the start of
testing sieve to at least allow others to help out on this. I want to get
it into current cvs so I don't have to patch it each time myself :) This
patch should keep others from having to to do duplicate work if they would
like to help Aaron and I finish up sieve.
======================================================================
----------------------------------------------------------------------
aaron - 18-Sep-04 01:30 CEST
----------------------------------------------------------------------
Looks really good. Is that a forward-port of my database code or did you
write it from scratch? Since Sieve has primarily been my project, I can be
in charge of committing this patch, unless Ilja or Paul want to dig into
Sieve a bit...
If this works with the most recent release of libSieve, then it's a very
good place to begin working and to tease out the problems with the
libSieve API and get them fixed :-)
----------------------------------------------------------------------
ljackson - 18-Sep-04 03:19 CEST
----------------------------------------------------------------------
wrote it from scratch, there wasn't any sql code to speak of for sieve that
I could find. This is what I got as the most recent libSieve from cvs on
050404. Which appears to be 2.2.0pre4. I am hoping that at least since it
will allow dbmail head to compile the base sieve code we can at least
start hashing out where to go next..etc.
----------------------------------------------------------------------
aaron - 18-Sep-04 03:44 CEST
----------------------------------------------------------------------
Wow, cool. I had already written database code, but IIRC (not on my dev box
this week) I wrote it back when DBMail's database code was two fully
separate MySQL and PostgreSQL codebases. So, probably better that you
wrote new stuff rather than me trying to get my old stuff to compile.
Leif, you rock!
----------------------------------------------------------------------
ljackson - 18-Sep-04 03:49 CEST
----------------------------------------------------------------------
yeah I am attaching the minor changes I did to your currently available cvs
on the libsieve2 sourceforge site. As you can see they are stubs and not
the real functions that dbmail needs. At least we can get going on your
libsieve again, rember I asked you to see if you could find your updates
that you didn't get into libsieve cvs?
thx
----------------------------------------------------------------------
ljackson - 24-Sep-04 20:09 CEST
----------------------------------------------------------------------
Aaron any chance of getting this patch in to CVS head? Kinda want to start
from there once it is merged.
Thanks,
Leif
----------------------------------------------------------------------
aaron - 31-Oct-04 13:16 CET
----------------------------------------------------------------------
Sorry it took me so long, but the first patch is now in DBMail HEAD.
----------------------------------------------------------------------
aaron - 21-Nov-04 02:05 CET
----------------------------------------------------------------------
Curse you, lynx! Just deleted the libSieve patch while trying to download
it to a dev box. Umm, Leif, you wouldn't happen to have another copy,
would you?
Does Mantis really delete files with just one mis-click?!
Bug History
Date Modified Username Field Change
======================================================================
17-Sep-04 22:26ljackson New Bug
17-Sep-04 22:26ljackson File Added: dbmail-2.1cvs091504-sieve.diff
18-Sep-04 01:30aaron Bugnote Added: 0000271
18-Sep-04 03:19ljackson Bugnote Added: 0000272
18-Sep-04 03:44aaron Bugnote Added: 0000273
18-Sep-04 03:49ljackson Bugnote Added: 0000274
18-Sep-04 03:49ljackson File Added: libsieve2-cvs091704_to_2.2.0pre4.diff
24-Sep-04 20:09ljackson Bugnote Added: 0000278
15-Oct-04 18:27aaron Assigned To => aaron
15-Oct-04 18:27aaron Status new => assigned
31-Oct-04 13:16aaron Bugnote Added: 0000327
21-Nov-04 02:02aaron File Deleted: libsieve2-cvs091704_to_2.2.0pre4.diff
21-Nov-04 02:05aaron Bugnote Added: 0000361
======================================================================
_______________________________________________
Dbmail-dev mailing list
Dbmail-dev@dbmail.org
http://twister.fastxs.net/mailman/listinfo/dbmail-dev
--
________________________________________________________________
Paul Stevens [EMAIL PROTECTED]
NET FACILITIES GROUP GPG/PGP: 1024D/11F8CD31
The Netherlands_______________________________________www.nfg.nl
diff -urN libsieve2-cvs091704/Makefile libsieve2-2.2.0pre4/Makefile
--- libsieve2-cvs091704/Makefile 2003-11-23 06:34:32.000000000 -0500
+++ libsieve2-2.2.0pre4/Makefile 2004-05-04 12:03:42.000000000 -0400
@@ -1,6 +1,6 @@
# this is the version number :-)
PACKAGE = libsieve
-VERSION = 2.2.0pre3
+VERSION = 2.2.0pre4
SOURCES = src
DOCS = www rfc
OTHERS = AUTHORS COPYING NEWS README Makefile
diff -urN libsieve2-cvs091704/src/sv_interface/interp.c
libsieve2-2.2.0pre4/src/sv_interface/interp.c
--- libsieve2-cvs091704/src/sv_interface/interp.c 2003-11-05
12:02:56.000000000 -0500
+++ libsieve2-2.2.0pre4/src/sv_interface/interp.c 2004-05-04
12:12:41.000000000 -0400
@@ -87,6 +87,11 @@
return sieve_extensions;
}
+const char *sieve2_listextensions(void)
+{
+ return sieve_listextensions();
+}
+
void libsieve_free_imapflags(sieve_imapflags_t *imapflags)
{
while (imapflags->nflags)
diff -urN libsieve2-cvs091704/src/sv_interface/script2.c
libsieve2-2.2.0pre4/src/sv_interface/script2.c
--- libsieve2-cvs091704/src/sv_interface/script2.c 2003-11-23
11:59:41.000000000 -0500
+++ libsieve2-2.2.0pre4/src/sv_interface/script2.c 2004-05-04
12:49:04.000000000 -0400
@@ -157,6 +157,12 @@
return SIEVE2_OK;
}
+int sieve2_support_bind(sieve_support_t *p, sieve_script_t *s)
+{
+ /* FIXME no function sieve2_support_bind */
+ return SIEVE2_OK;
+}
+
int sieve2_support_register(sieve2_support_t *p, void *thing, int type)
{
sieve_support_t *q = (sieve_support_t *)p;
@@ -462,6 +468,18 @@
return SIEVE2_OK;
}
+int sieve2_script_parse(char *script, sieve_script_t *s)
+{
+ /* FIXME no function sieve2_script_parse */
+ return SIEVE2_OK;
+}
+
+int sieve2_script_exec(sieve_script_t *s, void *m, action_list_t *a)
+{
+ /* FIXME no function sieve2_script_exec */
+ return SIEVE2_OK;
+}
+
int sieve2_message_alloc(sieve2_message_t **m)
{
int i;
diff -urN libsieve2-cvs091704/src/sv_parser/sieve-lex.c
libsieve2-2.2.0pre4/src/sv_parser/sieve-lex.c
--- libsieve2-cvs091704/src/sv_parser/sieve-lex.c 2003-11-23
21:51:31.000000000 -0500
+++ libsieve2-2.2.0pre4/src/sv_parser/sieve-lex.c 2004-05-04
12:08:22.000000000 -0400
@@ -16,11 +16,11 @@
#define yytext libsieve_sievetext
#define yylineno libsieve_sievelineno
-#line 20 "lex.yy.c"
+#line 20 "sieve-lex.c"
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/libsieve/libsieve2/src/sv_parser/sieve-lex.c,v 1.6
2003/11/24 02:51:31 sodabrew Exp $
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48
vern Exp $
*/
#define FLEX_SCANNER
@@ -28,6 +28,7 @@
#define YY_FLEX_MINOR_VERSION 5
#include <stdio.h>
+#include <unistd.h>
/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
@@ -646,7 +647,7 @@
#define QSTRING 2
-#line 651 "lex.yy.c"
+#line 651 "sieve-lex.c"
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -797,12 +798,12 @@
YY_DECL
{
register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
+ register char *yy_cp = NULL, *yy_bp = NULL;
register int yy_act;
#line 63 "sieve-lex.l"
-#line 807 "lex.yy.c"
+#line 807 "sieve-lex.c"
if ( yy_init )
{
@@ -1216,7 +1217,7 @@
#line 133 "sieve-lex.l"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
-#line 1221 "lex.yy.c"
+#line 1221 "sieve-lex.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(QSTRING):
yyterminate();
@@ -1596,6 +1597,7 @@
#endif /* ifndef YY_NO_UNPUT */
+#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput()
#else
@@ -1670,7 +1672,7 @@
return c;
}
-
+#endif /* YY_NO_INPUT */
#ifdef YY_USE_PROTOS
void yyrestart( FILE *input_file )
