Update to Dovecot 1.2.10, Sieve 0.1.15 and ManageSieve 0.11.11.

Changelog for Dovecot 1.2.10:

	+ %variables now support %{host}, %{pid} and %{env:ENVIRONMENT_NAME}
	  everywhere.
	+ LIST-STATUS capability is now advertised
	- maildir: Fixed several assert-crashes.
	- imap: LIST "" inbox shouldn't crash when using namespace with
	  "INBOX." prefix.
	- lazy_expunge now ignores non-private namespaces.

Changelog for Sieve 0.1.15:

  * Enotify extension:
     - Adjusted notify method API for addition of new notification
       methods.
     - Set default importance level to 'normal' (was 'high').
  * Include extension: updated implementation towards most recent
    specification (all should be backwards compatible):
     - Implemented global variables namespace.
     - Global command may now appear anywhere in a script.
     - Implemented script name checking using the requirements specified
       in the ManageSieve draft.
     - One issue remains: ManageSieve currently requires included scripts
       to be uploaded first, which is not according to specification.
   * Changed envelope path parser to allow to and from envelope addresses
     that have no domain part.
   + Added preliminary support for Sieve plugins and added support for
     installing Sieve development headers.
   + Started work on the implementation of the spamtest, spamtestplus and
     virustest extensions (unfinished).
   + Deprecated notify extension: implemented denotify command.
   + Variables extension: added support for variable namespaces.
   + Added configurable script size limit. Compiler will refuse to
     compile files larger than sieve_max_script_size.
   + Testsuite changes:
      - Added support for changing and testing an extension's
        configuration.
      - Added a command line parameter for copying errors to stderr.
   - Fixed a bug in the i;ascii-numeric comparator. If one of the
     strings started with a non-digit character, the comparator would
     always yield less-than.
   - Imap4flags extension: fixed bug in removeflag: removing a single
     flag failed due to off-by-one error (bug report by Julian Cowley).
   - Improved EACCES error messages for stat() and lstat() syscalls and
     slightly improved error messages that may uccur when saving a
     binary.
   - Vacation extension: fixed typo in runtime log message (patch by
     Julian Cowley).
   - Fixed use of minus '-' in man pages; it is now properly escaped.
   - Fixed parser recovery. In particular cases it would trigger spurious
     errors after an initial valid error and sometimes additional errors
     were inappropriately ignored.

Changelog for ManageSieve 0.11.11:

   * This release contains adjustments to match changes in the Sieve API.
     This means that this release will only compile against Pigeonhole
     Sieve v0.1.15.
   + Implemented ManageSieve QUOTA enforcement.
   + Added MAXREDIRECTS capability after login.
   + Implemented new script name rules specified in most recent
     ManageSieve draft.
   - Fixed assertion failure occuring with challenge-response SASL
     mechanisms.
   - Made configure complain about trying to compile against installed
     Dovecot headers alone.
   - Fixed compile warning for compilation against CMUSieve.

4 files changed, 57 insertions, 27 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index ac62194a3eb..b65db128df1 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.142 2010/01/15 18:41:11 ghen Exp $
+# $NetBSD: Makefile,v 1.143 2010/01/25 12:31:20 ghen Exp $
 
 DOVECOT_VERSION=	1.2
-DOVECOT_SUBVERSION=	.9
-SIEVE_VERSION=		0.1.14
-MANAGESIEVE_VERSION=	0.11.10
+DOVECOT_SUBVERSION=	.10
+SIEVE_VERSION=		0.1.15
+MANAGESIEVE_VERSION=	0.11.11
 DISTNAME=		dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/${DOVECOT_VERSION}/
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index a620725ec8e..7f8c47b2d30 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2009/12/11 20:52:22 ghen Exp $
+@comment $NetBSD: PLIST,v 1.27 2010/01/25 12:31:20 ghen Exp $
 include/dovecot/config.h
 include/dovecot/src/auth/auth-cache.h
 include/dovecot/src/auth/auth-client-connection.h
@@ -365,7 +365,6 @@ share/doc/dovecot/wiki/Design.Indexes.txt
 share/doc/dovecot/wiki/Design.MailProcess.txt
 share/doc/dovecot/wiki/Design.Processes.txt
 share/doc/dovecot/wiki/Design.txt
-share/doc/dovecot/wiki/DomainLost.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
 share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
@@ -383,8 +382,6 @@ share/doc/dovecot/wiki/LDA.Indexing.txt
 share/doc/dovecot/wiki/LDA.Postfix.txt
 share/doc/dovecot/wiki/LDA.Qmail.txt
 share/doc/dovecot/wiki/LDA.Sendmail.txt
-share/doc/dovecot/wiki/LDA.Sieve.CMU.txt
-share/doc/dovecot/wiki/LDA.Sieve.Dovecot.txt
 share/doc/dovecot/wiki/LDA.Sieve.txt
 share/doc/dovecot/wiki/LDA.txt
 share/doc/dovecot/wiki/Logging.txt
@@ -404,11 +401,6 @@ share/doc/dovecot/wiki/MailboxFormat.mailstore.txt
 share/doc/dovecot/wiki/MailboxFormat.mbox.txt
 share/doc/dovecot/wiki/MailboxFormat.mbx.txt
 share/doc/dovecot/wiki/MailboxFormat.txt
-share/doc/dovecot/wiki/ManageSieve.Clients.txt
-share/doc/dovecot/wiki/ManageSieve.Configuration.txt
-share/doc/dovecot/wiki/ManageSieve.Install.1.0.txt
-share/doc/dovecot/wiki/ManageSieve.Install.txt
-share/doc/dovecot/wiki/ManageSieve.Troubleshooting.txt
 share/doc/dovecot/wiki/ManageSieve.txt
 share/doc/dovecot/wiki/MboxLocking.txt
 share/doc/dovecot/wiki/MboxProblems.txt
diff --git a/mail/dovecot/PLIST.sieve b/mail/dovecot/PLIST.sieve
index 806b34a376f..7284b4d8653 100644
--- a/mail/dovecot/PLIST.sieve
+++ b/mail/dovecot/PLIST.sieve
@@ -1,7 +1,45 @@
-@comment $NetBSD: PLIST.sieve,v 1.1 2009/12/11 20:52:22 ghen Exp $
+@comment $NetBSD: PLIST.sieve,v 1.2 2010/01/25 12:31:20 ghen Exp $
 bin/sieve-test
 bin/sievec
 bin/sieved
+include/dovecot/sieve/dsieve-config.h
+include/dovecot/sieve/rfc2822.h
+include/dovecot/sieve/sieve-actions.h
+include/dovecot/sieve/sieve-address-parts.h
+include/dovecot/sieve/sieve-address.h
+include/dovecot/sieve/sieve-ast.h
+include/dovecot/sieve/sieve-binary-dumper.h
+include/dovecot/sieve/sieve-binary.h
+include/dovecot/sieve/sieve-code-dumper.h
+include/dovecot/sieve/sieve-code.h
+include/dovecot/sieve/sieve-commands.h
+include/dovecot/sieve/sieve-common.h
+include/dovecot/sieve/sieve-comparators.h
+include/dovecot/sieve/sieve-config.h
+include/dovecot/sieve/sieve-dump.h
+include/dovecot/sieve/sieve-error-private.h
+include/dovecot/sieve/sieve-error.h
+include/dovecot/sieve/sieve-ext-enotify.h
+include/dovecot/sieve/sieve-ext-environment.h
+include/dovecot/sieve/sieve-ext-variables.h
+include/dovecot/sieve/sieve-extensions.h
+include/dovecot/sieve/sieve-generator.h
+include/dovecot/sieve/sieve-interpreter.h
+include/dovecot/sieve/sieve-lexer.h
+include/dovecot/sieve/sieve-limits.h
+include/dovecot/sieve/sieve-match-types.h
+include/dovecot/sieve/sieve-match.h
+include/dovecot/sieve/sieve-message.h
+include/dovecot/sieve/sieve-objects.h
+include/dovecot/sieve/sieve-parser.h
+include/dovecot/sieve/sieve-plugins.h
+include/dovecot/sieve/sieve-result.h
+include/dovecot/sieve/sieve-script-private.h
+include/dovecot/sieve/sieve-script.h
+include/dovecot/sieve/sieve-settings.h
+include/dovecot/sieve/sieve-types.h
+include/dovecot/sieve/sieve-validator.h
+include/dovecot/sieve/sieve.h
 lib/dovecot/lda/lib90_sieve_plugin.la
 man/man1/sieve-test.1
 man/man1/sievec.1
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 1be93b69587..38562ae5db5 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.107 2010/01/15 18:41:12 ghen Exp $
+$NetBSD: distinfo,v 1.108 2010/01/25 12:31:20 ghen Exp $
 
-SHA1 (dovecot-1.2-managesieve-0.11.10.tar.gz) = f79eef8cda5db41f6b61ec0723d60c72559980eb
-RMD160 (dovecot-1.2-managesieve-0.11.10.tar.gz) = b151df06a3f4be86f0a8327390ee8356a9a713c8
-Size (dovecot-1.2-managesieve-0.11.10.tar.gz) = 400657 bytes
-SHA1 (dovecot-1.2-sieve-0.1.14.tar.gz) = 2ba2b4208fa9ed341c38ec8e918b4a87e46b8367
-RMD160 (dovecot-1.2-sieve-0.1.14.tar.gz) = b61c9448c876062f2b1fd3d1cf72cbc430c5a82e
-Size (dovecot-1.2-sieve-0.1.14.tar.gz) = 992724 bytes
-SHA1 (dovecot-1.2.9-managesieve-0.11.10.diff.gz) = f817137163eb4b1cf9e310753f49569dde3f038b
-RMD160 (dovecot-1.2.9-managesieve-0.11.10.diff.gz) = 5e9692bf733d2100c5af7c066765c1383c43d346
-Size (dovecot-1.2.9-managesieve-0.11.10.diff.gz) = 6456 bytes
-SHA1 (dovecot-1.2.9.tar.gz) = 7c1013a1bc856a4366f76ac1f40e856185695e20
-RMD160 (dovecot-1.2.9.tar.gz) = fa17bafabdd6fab69c22d617deff368a4bc165d1
-Size (dovecot-1.2.9.tar.gz) = 2889394 bytes
+SHA1 (dovecot-1.2-managesieve-0.11.11.tar.gz) = 53f8618a9e02f953912390a7b803eb6218bf969a
+RMD160 (dovecot-1.2-managesieve-0.11.11.tar.gz) = 161d143f5a42aee929abf51b62b3b0e6e7a9f07a
+Size (dovecot-1.2-managesieve-0.11.11.tar.gz) = 439239 bytes
+SHA1 (dovecot-1.2-sieve-0.1.15.tar.gz) = 2827df60028639ec15422a86f48a1c9b2a78431a
+RMD160 (dovecot-1.2-sieve-0.1.15.tar.gz) = 7fd3d23d5ef93d443cdedc8512dab649b2a99694
+Size (dovecot-1.2-sieve-0.1.15.tar.gz) = 1051262 bytes
+SHA1 (dovecot-1.2.10-managesieve-0.11.11.diff.gz) = 11ff602015221300f291001daa09965e3e199428
+RMD160 (dovecot-1.2.10-managesieve-0.11.11.diff.gz) = 875011115ac4050a57f1c96725628ca531ccb61f
+Size (dovecot-1.2.10-managesieve-0.11.11.diff.gz) = 6415 bytes
+SHA1 (dovecot-1.2.10.tar.gz) = b717de1ab63f3d521c93385cbd20c49293921079
+RMD160 (dovecot-1.2.10.tar.gz) = 0b508502b7c2e9aecd274bf15f1ec5adbb1843a7
+Size (dovecot-1.2.10.tar.gz) = 2864295 bytes
 SHA1 (patch-aa) = 447e46268a93201b3ef22491ff0968752978d020
 SHA1 (patch-ab) = e5b5d72f0553da42d14ee05a9ed0faff8a6c7075
 SHA1 (patch-ac) = 5912392abb79df8e78de6f710c2a83264ee58fe7