dovecot-2.1-pigeonhole: Incorporated sieve_duplicate plugin into...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Fri May 11 03:55:09 EEST 2012
details: http://hg.rename-it.nl/dovecot-2.1-pigeonhole/rev/12bcfe5e748a
changeset: 1622:12bcfe5e748a
user: Stephan Bosch <stephan at rename-it.nl>
date: Fri May 11 02:54:42 2012 +0200
description:
Incorporated sieve_duplicate plugin into main Pigeonhole tree as a normal extension (vnd.dovecot.duplicate).
Also restructured doc dir a bit in the process.
diffstat:
INSTALL | 13 +-
Makefile.am | 2 +
configure.in | 2 +
doc/Makefile.am | 7 +-
doc/editheader.txt | 51 --
doc/extensions/editheader.txt | 51 ++
doc/extensions/include.txt | 32 +
doc/extensions/spamtest-virustest.txt | 140 ++++++
doc/extensions/vacation.txt | 95 ++++
doc/extensions/vnd.dovecot.duplicate.txt | 56 ++
doc/include.txt | 32 -
doc/rfc/Makefile.am | 32 +
doc/rfc/spec-bosch-sieve-duplicate.txt | 224 ++++++++++
doc/rfc/xml/reference.KEYWORDS.xml | 44 +
doc/rfc/xml/reference.SIEVE.xml | 17 +
doc/rfc/xml/spec-bosch-sieve-duplicate.xml | 159 +++++++
doc/spamtest-virustest.txt | 136 ------
doc/vacation.txt | 95 ----
src/lib-sieve/Makefile.am | 1 +
src/lib-sieve/plugins/vnd.dovecot/Makefile.am | 2 +-
src/lib-sieve/plugins/vnd.dovecot/duplicate/Makefile.am | 20 +
src/lib-sieve/plugins/vnd.dovecot/duplicate/ext-duplicate-common.c | 120 +++++
src/lib-sieve/plugins/vnd.dovecot/duplicate/ext-duplicate-common.h | 40 +
src/lib-sieve/plugins/vnd.dovecot/duplicate/ext-duplicate.c | 53 ++
src/lib-sieve/plugins/vnd.dovecot/duplicate/tst-duplicate.c | 151 ++++++
src/lib-sieve/sieve-extensions.c | 3 +-
tests/extensions/vnd.dovecot/duplicate/errors.svtest | 18 +
tests/extensions/vnd.dovecot/duplicate/errors/syntax.sieve | 16 +
tests/extensions/vnd.dovecot/duplicate/execute.svtest | 12 +
29 files changed, 1298 insertions(+), 326 deletions(-)
diffs (truncated from 1822 to 300 lines):
diff -r f362b56485fa -r 12bcfe5e748a INSTALL
--- a/INSTALL Fri May 11 02:45:33 2012 +0200
+++ b/INSTALL Fri May 11 02:54:42 2012 +0200
@@ -346,7 +346,8 @@
to delete and add header fields.
The editheader extension requires explicit configuration and is not enabled
- for use by default. Refer to doc/editheader.txt for configuration information.
+ for use by default. Refer to doc/extensions/editheader.txt for configuration
+ information.
- Vacation extension:
@@ -354,8 +355,8 @@
automatic replies to incoming email messages.
The vacation extension is available by default, but it has its own specific
- configuration options. Refer to doc/vacation.txt for settings specific to the
- vacation extension.
+ configuration options. Refer to doc/extensions/vacation.txt for settings
+ specific to the vacation extension.
- Include extension:
@@ -363,8 +364,8 @@
into another.
The include extension is available by default, but it has its own specific
- configuration options. Refer to doc/include.txt for settings specific to the
- include extension.
+ configuration options. Refer to doc/extensions/include.txt for settings
+ specific to the include extension.
- Spamtest and Virustest extensions:
@@ -379,7 +380,7 @@
The spamtest, spamtestplus and virustest extensions require explicit
configuration and are not enabled for use by default. Refer to
- doc/spamtest-virustest.txt for configuration information.
+ doc/extensions/spamtest-virustest.txt for configuration information.
Sieve Interpreter - Migration from CMUSieve (Dovecot v1.0/v1.1)
---------------------------------------------------------------
diff -r f362b56485fa -r 12bcfe5e748a Makefile.am
--- a/Makefile.am Fri May 11 02:45:33 2012 +0200
+++ b/Makefile.am Fri May 11 02:54:42 2012 +0200
@@ -133,6 +133,8 @@
tests/extensions/editheader/protected.svtest \
tests/extensions/editheader/errors.svtest \
tests/extensions/vnd.dovecot/debug/execute.svtest \
+ tests/extensions/vnd.dovecot/duplicate/errors.svtest \
+ tests/extensions/vnd.dovecot/duplicate/execute.svtest \
tests/deprecated/notify/basic.svtest \
tests/deprecated/notify/mailto.svtest \
tests/deprecated/notify/errors.svtest \
diff -r f362b56485fa -r 12bcfe5e748a configure.in
--- a/configure.in Fri May 11 02:45:33 2012 +0200
+++ b/configure.in Fri May 11 02:54:42 2012 +0200
@@ -97,6 +97,7 @@
doc/man/Makefile
doc/example-config/Makefile
doc/example-config/conf.d/Makefile
+doc/rfc/Makefile
src/Makefile
src/lib-sieve/Makefile
src/lib-sieve/plugins/Makefile
@@ -121,6 +122,7 @@
src/lib-sieve/plugins/editheader/Makefile
src/lib-sieve/plugins/vnd.dovecot/Makefile
src/lib-sieve/plugins/vnd.dovecot/debug/Makefile
+src/lib-sieve/plugins/vnd.dovecot/duplicate/Makefile
src/lib-sieve-tool/Makefile
src/lib-sievestorage/Makefile
src/lib-managesieve/Makefile
diff -r f362b56485fa -r 12bcfe5e748a doc/Makefile.am
--- a/doc/Makefile.am Fri May 11 02:45:33 2012 +0200
+++ b/doc/Makefile.am Fri May 11 02:54:42 2012 +0200
@@ -1,15 +1,14 @@
-SUBDIRS = man example-config
+SUBDIRS = man example-config rfc
docfiles = \
- vacation.txt \
- spamtest-virustest.txt
+ script-location-dict.txt
if BUILD_DOCS
sieve_doc_DATA = $(docfiles)
endif
EXTRA_DIST = \
- rfc \
devel \
+ extensions \
$(docfiles)
diff -r f362b56485fa -r 12bcfe5e748a doc/editheader.txt
--- a/doc/editheader.txt Fri May 11 02:45:33 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-Editheader Extension
-
-Relevant specifications
-=======================
-
- RFC5293 - doc/rfc/editheader.rfc5293.txt
-
-Description
-===========
-
-The editheader extension [RFC5293] enables sieve scripts to interact with other
-components that consume or produce header fields by allowing the script to
-delete and add header fields.
-
-Configuration
-=============
-
-The editheader is not available by default and needs to be enabled explicitly by
-adding it to the sieve_extensions setting.
-
-The following settings can be configured for the editheader extension (default
-values are indicated):
-
-sieve_editheader_max_header_size = 2048
- The maximum size in bytes of a header field value passed to the addheader
- command. The minimum value for this setting is 1024 bytes. The value is in
- bytes, unless followed by a k(ilo).
-
-sieve_editheader_protected =
- A space-separated list of headers that cannot be added to nor removed from the
- message header. The `Received:' and `Auto-Submitted:' fields are always
- protected and the `Subject:' header cannot be protected, as required by the
- RFC specification; adding one of these headers to this setting has no effect.
-
-Invalid values for the settings above will make the Sieve interpreter log
-a warning and revert to the default values.
-
-Example
-=======
-
-plugin {
- # Use editheader
- sieve_extensions = +editheader
-
- # Header fiels must not exceed one 1k
- sieve_editheader_max_header_size = 1k
-
- # Protect special header
- sieve_editheader_protected = X-Verified
-}
-
diff -r f362b56485fa -r 12bcfe5e748a doc/extensions/editheader.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/extensions/editheader.txt Fri May 11 02:54:42 2012 +0200
@@ -0,0 +1,51 @@
+Editheader Extension
+
+Relevant specifications
+=======================
+
+ RFC5293 - doc/rfc/editheader.rfc5293.txt
+
+Description
+===========
+
+The editheader extension [RFC5293] enables sieve scripts to interact with other
+components that consume or produce header fields by allowing the script to
+delete and add header fields.
+
+Configuration
+=============
+
+The editheader is not available by default and needs to be enabled explicitly by
+adding it to the sieve_extensions setting.
+
+The following settings can be configured for the editheader extension (default
+values are indicated):
+
+sieve_editheader_max_header_size = 2048
+ The maximum size in bytes of a header field value passed to the addheader
+ command. The minimum value for this setting is 1024 bytes. The value is in
+ bytes, unless followed by a k(ilo).
+
+sieve_editheader_protected =
+ A space-separated list of headers that cannot be added to nor removed from the
+ message header. The `Received:' and `Auto-Submitted:' fields are always
+ protected and the `Subject:' header cannot be protected, as required by the
+ RFC specification; adding one of these headers to this setting has no effect.
+
+Invalid values for the settings above will make the Sieve interpreter log
+a warning and revert to the default values.
+
+Example
+=======
+
+plugin {
+ # Use editheader
+ sieve_extensions = +editheader
+
+ # Header fiels must not exceed one 1k
+ sieve_editheader_max_header_size = 1k
+
+ # Protect special header
+ sieve_editheader_protected = X-Verified
+}
+
diff -r f362b56485fa -r 12bcfe5e748a doc/extensions/include.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/extensions/include.txt Fri May 11 02:54:42 2012 +0200
@@ -0,0 +1,32 @@
+Include Extension
+
+Relevant Specifications
+=======================
+
+ draft-ietf-sieve-include-05 - doc/rfc/draft-ietf-sieve-include-05.txt
+
+Description
+===========
+
+The Sieve include extension permits users to include one Sieve script into
+another. This can make managing large scripts or multiple sets of scripts much
+easier, and allows a site and its users to build up libraries of scripts. Users
+are able to include their own personal scripts or site-wide scripts.
+
+Included scripts can include more scripts of their own, yielding a tree of
+included scripts with the main script (typically the user's personal script) at
+its root.
+
+Configuration
+=============
+
+The include extension is available by default. The include extension has its own
+specific settings. The following settings can be configured for the include
+extension (default values are indicated):
+
+sieve_include_max_includes = 255
+ The maximum number of scripts that may be included. This is the total number
+ of scripts involved in the include tree.
+
+sieve_include_max_nesting_depth = 10
+ The maximum nesting depth for the include tree.
diff -r f362b56485fa -r 12bcfe5e748a doc/extensions/spamtest-virustest.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/extensions/spamtest-virustest.txt Fri May 11 02:54:42 2012 +0200
@@ -0,0 +1,140 @@
+Spamtest and Virustest Extensions
+
+Relevant Specifications
+=======================
+
+ RFC5235 - doc/rfc/spamvirustest.rfc5235.txt
+
+Description
+===========
+
+Using the spamtest and virustest extensions (RFC 5235), the Sieve language
+provides a uniform and standardized command interface for evaluating spam and
+virus tests performed on the message. Users no longer need to know what headers
+need to be checked and how the scanner's verdict is represented in the header
+field value. They only need to know how to use the spamtest (spamtestplus) and
+virustest extensions. This also gives GUI-based Sieve editors the means to
+provide a portable and easy to install interface for spam and virus filter
+configuration. The burden of specifying which headers need to be checked and how
+the scanner output is represented falls onto the Sieve administrator.
+
+Configuration
+=============
+
+The spamtest, spamtestplus and virustest extensions are not enabled by default
+and thus need to be enabled explicitly using the sieve_extensions setting.
+
+The following settings need to be configured for using the spamtest and
+spamtestplus extensions. The virustest extension has identical configuration
+settings, but with a `sieve_virustest_' prefix instead of a `sieve_spamtest_'
+prefix:
+
+sieve_spamtest_status_type = "score" / "strlen" / "text"
+ This specifies the type of status result that the spam/virus scanner produces.
+ This can either be a numeric score ("score"), a string of identical characters
+ ("strlen"), e.g. '*******', or a textual description, e.g. `Spam'
+ or `Not Spam'.
+
+sieve_spamtest_status_header = <header-field> [ ":" <regexp> ]
+ This specifies the header field that contains the result information of the
+ spam scanner and it may express the syntax of the content of the header. If no
+ matching header is found in the message, the spamtest command will match
+ against "0".
+
+ This is a structured setting. The first part specifies the header field name.
+ Optionally, a POSIX regular expression follows the header field name,
+ separated by a colon. Any whitespace directly following the colon is not part
+ of the regular expression. If the regular expression is omitted, any header
+ content is accepted and the full header value is used. When a regular
+ expression is used, it must specify one match value (inside brackets) that
+ yields the desired spam scanner result. If the header does not match the
+ regular expression or if no value match is found, the spamtest will match
+ against "0".
+
More information about the dovecot-cvs
mailing list