dovecot-1.2-sieve: Added spamtest and virustest extensions to th...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/939eb4311735
changeset: 1230:939eb4311735
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Jan 25 18:42:30 2010 +0100
description:
Added spamtest and virustest extensions to the default build.

diffstat:

 Makefile.am                                             |   8 ++++----
 src/lib-sieve/Makefile.am                               |   4 ++--
 src/lib-sieve/plugins/Makefile.am                       |   3 ++-
 src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c |   8 +-------
 src/lib-sieve/sieve-extensions.c                        |  14 ++++++--------
 5 files changed, 15 insertions(+), 22 deletions(-)

diffs (129 lines):

diff -r b873b2ae075a -r 939eb4311735 Makefile.am
--- a/Makefile.am	Mon Jan 25 18:22:07 2010 +0100
+++ b/Makefile.am	Mon Jan 25 18:42:30 2010 +0100
@@ -44,10 +44,7 @@
 endif
 
 if BUILD_UNFINISHED
-test_unfinished = \
-	tests/extensions/spamvirustest/spamtest.svtest \
-	tests/extensions/spamvirustest/virustest.svtest \
-	tests/extensions/spamvirustest/spamtestplus.svtest
+test_unfinished =
 else
 test_unfinished = 
 endif
@@ -134,6 +131,9 @@
 	tests/deprecated/notify/errors.svtest \
 	tests/deprecated/notify/execute.svtest \
 	tests/deprecated/notify/denotify.svtest \
+	tests/extensions/spamvirustest/spamtest.svtest \
+	tests/extensions/spamvirustest/virustest.svtest \
+	tests/extensions/spamvirustest/spamtestplus.svtest \
 	$(test_unfinished)
 
 if HAVE_DOVECOT_LIBS
diff -r b873b2ae075a -r 939eb4311735 src/lib-sieve/Makefile.am
--- a/src/lib-sieve/Makefile.am	Mon Jan 25 18:22:07 2010 +0100
+++ b/src/lib-sieve/Makefile.am	Mon Jan 25 18:42:30 2010 +0100
@@ -44,8 +44,7 @@
 	cmp-i-ascii-casemap.c
 
 if BUILD_UNFINISHED
-unfinished_plugins = \
-	./plugins/spamvirustest/libsieve_ext_spamvirustest.la
+unfinished_plugins =
 endif
 
 # These are not actual plugins just yet...
@@ -65,6 +64,7 @@
 	./plugins/environment/libsieve_ext_environment.la \
 	./plugins/mailbox/libsieve_ext_mailbox.la \
 	./plugins/date/libsieve_ext_date.la \
+	./plugins/spamvirustest/libsieve_ext_spamvirustest.la \
 	$(unfinished_plugins)
 
 libsieve_la_DEPENDENCIES = $(plugins)
diff -r b873b2ae075a -r 939eb4311735 src/lib-sieve/plugins/Makefile.am
--- a/src/lib-sieve/plugins/Makefile.am	Mon Jan 25 18:22:07 2010 +0100
+++ b/src/lib-sieve/plugins/Makefile.am	Mon Jan 25 18:42:30 2010 +0100
@@ -1,5 +1,5 @@
 if BUILD_UNFINISHED
-UNFINISHED = spamvirustest
+UNFINISHED = 
 endif
 
 SUBDIRS = \
@@ -18,6 +18,7 @@
 	environment \
 	mailbox \
 	date \
+	spamvirustest \
 	$(UNFINISHED)
 
 
diff -r b873b2ae075a -r 939eb4311735 src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c	Mon Jan 25 18:22:07 2010 +0100
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest.c	Mon Jan 25 18:42:30 2010 +0100
@@ -6,7 +6,7 @@
  *
  * Authors: Stephan Bosch
  * Specification: RFC 5235
- * Implementation: unfinished
+ * Implementation: full
  * Status: experimental
  *
  */
@@ -45,12 +45,6 @@
  * sieve_virustest_text_value1 = clean
  * sieve_virustest_text_value5 = infected
  */
-
-/* TODO: 
- *   - Spamtest/Spamtestplus configuration needs testing
- *   - Virustest configuration is currently not present
- *   - Testsuite tests
- */
  
 #include "lib.h"
 #include "array.h"
diff -r b873b2ae075a -r 939eb4311735 src/lib-sieve/sieve-extensions.c
--- a/src/lib-sieve/sieve-extensions.c	Mon Jan 25 18:22:07 2010 +0100
+++ b/src/lib-sieve/sieve-extensions.c	Mon Jan 25 18:42:30 2010 +0100
@@ -94,6 +94,9 @@
 extern const struct sieve_extension_def environment_extension;
 extern const struct sieve_extension_def mailbox_extension;
 extern const struct sieve_extension_def date_extension;
+extern const struct sieve_extension_def spamtest_extension;
+extern const struct sieve_extension_def spamtestplus_extension;
+extern const struct sieve_extension_def virustest_extension;
 
 /*
  * List of native extensions
@@ -113,7 +116,8 @@
 	&relational_extension, &regex_extension, &imap4flags_extension,
 	&copy_extension, &include_extension, &body_extension,
 	&variables_extension, &enotify_extension, &environment_extension,
-	&mailbox_extension, &date_extension
+	&mailbox_extension, &date_extension, &spamtest_extension, 
+	&spamtestplus_extension, &virustest_extension
 };
 
 const unsigned int sieve_core_extensions_count =
@@ -141,15 +145,9 @@
 #ifdef HAVE_SIEVE_UNFINISHED
 
 extern const struct sieve_extension_def ereject_extension;
-extern const struct sieve_extension_def spamtest_extension;
-extern const struct sieve_extension_def spamtestplus_extension;
-extern const struct sieve_extension_def virustest_extension;
 
 const struct sieve_extension_def *sieve_unfinished_extensions[] = {
-	&ereject_extension,
-	&spamtest_extension,
-	&spamtestplus_extension,
-	&virustest_extension
+	&ereject_extension
 };
 
 const unsigned int sieve_unfinished_extensions_count =