4 files changed, 52 insertions, 36 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 5d5a0c9d98ae..49a4b310787f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	1.1.16
+PORTVERSION=	1.2.3
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.dovecot.org/releases/1.1/
+MASTER_SITES=	http://www.dovecot.org/releases/1.2/
 
 MAINTAINER=	yds@CoolRat.org
 COMMENT=	Secure and compact IMAP and POP3 servers
@@ -219,6 +219,7 @@ post-patch:
 .endif
 	@${LN} -f ${WRKSRC}/dovecot-example.conf		${WRKSRC}/dovecot.conf
 	@${LN} -f ${WRKSRC}/doc/dovecot-db-example.conf		${WRKSRC}/doc/dovecot-db.conf
+	@${LN} -f ${WRKSRC}/doc/dovecot-dict-sql-example.conf	${WRKSRC}/doc/dovecot-dict-sql.conf
 	@${LN} -f ${WRKSRC}/doc/dovecot-ldap-example.conf	${WRKSRC}/doc/dovecot-ldap.conf
 	@${LN} -f ${WRKSRC}/doc/dovecot-sql-example.conf	${WRKSRC}/doc/dovecot-sql.conf
 
@@ -228,6 +229,7 @@ pre-install:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dovecot.conf ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-db.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-dict-sql.conf ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-ldap.conf ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-sql.conf ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${EXAMPLESDIR}
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index c433a0abe9fb..217dfca3522c 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,6 +1,3 @@
-MD5 (dovecot-1.1.16.tar.gz) = 2e20c761416b16aa0fe9cac260ca0d2d
-SHA256 (dovecot-1.1.16.tar.gz) = 1204c3d008eade19cb0211039c4a0fb16d089326e0aa9102880090f23f320fc3
-SIZE (dovecot-1.1.16.tar.gz) = 2383947
-MD5 (dovecot-1.1.16-managesieve-0.10.6.diff.gz) = 6379049defcc4e3a665c2992f479c5d2
-SHA256 (dovecot-1.1.16-managesieve-0.10.6.diff.gz) = 0d71af4a23be6aa6388d6bb645a5055b6838204784da7daa75c0e95819119ae8
-SIZE (dovecot-1.1.16-managesieve-0.10.6.diff.gz) = 6172
+MD5 (dovecot-1.2.3.tar.gz) = 28905211d9301022a1ed20df71ad2b08
+SHA256 (dovecot-1.2.3.tar.gz) = 8507c3321a2ad1deb0f8485086647857419fa034d7d30f2e5aef7fabd90c9406
+SIZE (dovecot-1.2.3.tar.gz) = 2652036
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index 6de45f29b524..b3fd157a4fb4 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,5 +1,5 @@
---- dovecot-example.conf.orig	2009-05-13 12:41:46.000000000 -0400
-+++ dovecot-example.conf	2009-05-13 12:41:46.000000000 -0400
+--- dovecot-example.conf.orig	2009-07-27 09:57:30.000000000 +0900
++++ dovecot-example.conf	2009-07-30 13:21:50.000000000 +0900
 @@ -21,7 +21,7 @@
  
  # Protocols we want to be serving: imap imaps pop3 pop3s
@@ -18,7 +18,7 @@
  
  # Should all IMAP and POP3 processes be killed when Dovecot master process
  # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -215,7 +215,7 @@
+@@ -221,7 +221,7 @@
  #
  # <doc/wiki/MailLocation.txt>
  #
@@ -27,7 +27,7 @@
  
  # If you need to set multiple mailbox locations or want to change default
  # namespace settings, you can do it by defining namespace sections.
-@@ -273,7 +273,7 @@
+@@ -302,7 +302,7 @@
  # Group to enable temporarily for privileged operations. Currently this is
  # used only with INBOX when either its initial creation or dotlocking fails.
  # Typically this is set to "mail" to give access to /var/mail.
@@ -36,7 +36,7 @@
  
  # Grant access to these supplementary groups for mail processes. Typically
  # these are used to set up access to shared mailboxes. Note that it may be
-@@ -312,7 +312,7 @@
+@@ -341,7 +341,7 @@
  
  # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
  # since version 3, so this should be safe to use nowadays by default.
@@ -45,7 +45,7 @@
  
  # Don't use fsync() or fdatasync() calls. This makes the performance better
  # at the cost of potential data loss if the server (or the file server)
-@@ -340,20 +340,20 @@
+@@ -369,20 +369,20 @@
  # Show more verbose process titles (in ps). Currently shows user name and
  # IP address. Useful for seeing who are actually using the IMAP processes
  # (eg. shared mailboxes or if same uid is used for multiple accounts).
@@ -69,7 +69,7 @@
  #last_valid_gid = 0
  
  # Maximum number of running mail processes. When this limit is reached,
-@@ -420,7 +420,7 @@
+@@ -449,7 +449,7 @@
  
  # When copying a message, do it with hard links whenever possible. This makes
  # the performance much better, and it's unlikely to have any side effects.
@@ -78,16 +78,7 @@
  
  # When copying a message, try to preserve the base filename. Only if the
  # destination mailbox already contains the same name (ie. the mail is being
-@@ -535,7 +535,7 @@
-   # Send IMAP capabilities in greeting message. This makes it unnecessary for
-   # clients to request it with CAPABILITY command, so it saves one round-trip.
-   # Many clients however don't understand it and ask the CAPABILITY anyway.
--  #login_greeting_capability = no
-+  login_greeting_capability = yes
- 
-   # IMAP logout format string:
-   #  %i - total number of bytes read from client
-@@ -564,7 +564,7 @@
+@@ -605,7 +605,7 @@
    #     but not both. Thunderbird separates these two by forcing server to
    #     accept '/' suffix in mailbox names in subscriptions list.
    # The list is space-separated.
@@ -96,7 +87,7 @@
  }
    
  ##
-@@ -616,7 +616,7 @@
+@@ -657,7 +657,7 @@
    # Dovecot's default, so if you're building a new server it would be a good
    # idea to change this. %08Xu%08Xv should be pretty fail-safe.
    #
@@ -105,7 +96,7 @@
  
    # POP3 logout format string:
    #  %i - total number of bytes read from client
-@@ -647,7 +647,7 @@
+@@ -688,7 +688,7 @@
    #     Outlook Express and Netscape Mail breaks if end of headers-line is
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
@@ -114,7 +105,7 @@
  }
  
  ##
-@@ -742,7 +742,7 @@
+@@ -784,7 +784,7 @@
  # the standard variables here, eg. %Lu would lowercase the username, %n would
  # drop away the domain if it was given, or "%n-AT-%d" would change the '@' into
  # "-AT-". This translation is done after auth_username_translation changes.
@@ -123,7 +114,7 @@
  
  # If you want to allow master users to log in by specifying the master
  # username within the normal username string (ie. not using SASL mechanism's
-@@ -798,7 +798,7 @@
+@@ -835,7 +835,7 @@
    #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey
    #   gss-spnego
    # NOTE: See also disable_plaintext_auth setting.
@@ -132,7 +123,7 @@
  
    #
    # Password database is used to verify user's password (and nothing more).
-@@ -860,6 +860,7 @@
+@@ -901,6 +901,7 @@
      #   args = session=yes %Ls
      #   args = cache_key=%u dovecot
      #args = dovecot
@@ -140,7 +131,7 @@
    }
  
    # System users (NSS, /etc/passwd, or similiar)
-@@ -903,14 +904,16 @@
+@@ -944,14 +945,16 @@
  
    # SQL database <doc/wiki/AuthDatabase.SQL.txt>
    #passdb sql {
@@ -161,7 +152,7 @@
    #}
  
    # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
-@@ -945,7 +948,7 @@
+@@ -986,7 +989,7 @@
      # proceses. Useful with remote NSS lookups that may block.
      # NOTE: Be sure to use this setting with nss_ldap or users might get
      # logged in as each others!
@@ -170,7 +161,7 @@
    }
  
    # passwd-like file with specified location
-@@ -974,14 +977,16 @@
+@@ -1022,14 +1025,16 @@
  
    # SQL database <doc/wiki/AuthDatabase.SQL.txt>
    #userdb sql {
@@ -191,7 +182,7 @@
    #}
  
    # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
-@@ -1013,25 +1018,25 @@
+@@ -1061,25 +1066,25 @@
    #ssl_username_from_cert = no
  
    # It's possible to export the authentication interface to other programs:
@@ -227,7 +218,7 @@
  }
  
  # If you wish to use another authentication server than dovecot-auth, you can
-@@ -1059,11 +1064,12 @@
+@@ -1107,11 +1112,12 @@
  
  dict {
    #quota = mysql:/etc/dovecot-dict-quota.conf 
@@ -243,7 +234,7 @@
  
  ##
  ## Plugin settings
-@@ -1100,8 +1106,8 @@
+@@ -1148,8 +1154,8 @@
    # Each quota root has separate limits. Only the command for the first
    # exceeded limit is excecuted, so put the highest limit first.
    # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index b43336b8472d..285832040bfe 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -1,36 +1,48 @@
 @comment $FreeBSD$
 @dirrmtry include/dovecot
 lib/dovecot/imap/lib01_acl_plugin.so
+lib/dovecot/imap/lib02_imap_acl_plugin.so
+lib/dovecot/imap/lib02_imap_acl_plugin.la
+lib/dovecot/imap/lib02_imap_acl_plugin.a
 lib/dovecot/imap/lib02_lazy_expunge_plugin.so
 lib/dovecot/imap/lib10_quota_plugin.so
 lib/dovecot/imap/lib11_imap_quota_plugin.a
 lib/dovecot/imap/lib11_imap_quota_plugin.la
 lib/dovecot/imap/lib11_imap_quota_plugin.so
 lib/dovecot/imap/lib11_trash_plugin.so
+lib/dovecot/imap/lib20_autocreate_plugin.so
 lib/dovecot/imap/lib20_convert_plugin.so
 lib/dovecot/imap/lib20_expire_plugin.so
 lib/dovecot/imap/lib20_fts_plugin.so
+lib/dovecot/imap/lib20_listescape_plugin.so
 lib/dovecot/imap/lib20_mail_log_plugin.so
 lib/dovecot/imap/lib20_mbox_snarf_plugin.so
+lib/dovecot/imap/lib20_virtual_plugin.so
 lib/dovecot/imap/lib20_zlib_plugin.so
 lib/dovecot/imap/lib21_fts_squat_plugin.so
 @dirrm lib/dovecot/imap
 lib/dovecot/lda/lib01_acl_plugin.so
 lib/dovecot/lda/lib10_quota_plugin.so
 lib/dovecot/lda/lib11_trash_plugin.so
+lib/dovecot/lda/lib20_autocreate_plugin.so
 lib/dovecot/lda/lib20_convert_plugin.so
 lib/dovecot/lda/lib20_expire_plugin.so
 lib/dovecot/lda/lib20_fts_plugin.so
+lib/dovecot/lda/lib20_listescape_plugin.so
 lib/dovecot/lda/lib20_mail_log_plugin.so
+lib/dovecot/lda/lib20_virtual_plugin.so
 lib/dovecot/lda/lib21_fts_squat_plugin.so
 @dirrmtry lib/dovecot/lda
+lib/dovecot/pop3/lib20_autocreate_plugin.so
 lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
 lib/dovecot/pop3/lib10_quota_plugin.so
 lib/dovecot/pop3/lib20_convert_plugin.so
 lib/dovecot/pop3/lib20_expire_plugin.so
 lib/dovecot/pop3/lib20_fts_plugin.so
+lib/dovecot/pop3/lib20_listescape_plugin.so
 lib/dovecot/pop3/lib20_mail_log_plugin.so
 lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
+lib/dovecot/pop3/lib20_virtual_plugin.so
 lib/dovecot/pop3/lib20_zlib_plugin.so
 lib/dovecot/pop3/lib21_fts_squat_plugin.so
 @dirrm lib/dovecot/pop3
@@ -48,6 +60,9 @@ lib/dovecot/lib10_quota_plugin.so
 lib/dovecot/lib11_trash_plugin.a
 lib/dovecot/lib11_trash_plugin.la
 lib/dovecot/lib11_trash_plugin.so
+lib/dovecot/lib20_autocreate_plugin.so
+lib/dovecot/lib20_autocreate_plugin.la
+lib/dovecot/lib20_autocreate_plugin.a
 lib/dovecot/lib20_convert_plugin.a
 lib/dovecot/lib20_convert_plugin.la
 lib/dovecot/lib20_convert_plugin.so
@@ -57,12 +72,18 @@ lib/dovecot/lib20_expire_plugin.so
 lib/dovecot/lib20_fts_plugin.a
 lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_fts_plugin.so
+lib/dovecot/lib20_listescape_plugin.so
+lib/dovecot/lib20_listescape_plugin.la
+lib/dovecot/lib20_listescape_plugin.a
 lib/dovecot/lib20_mail_log_plugin.a
 lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mail_log_plugin.so
 lib/dovecot/lib20_mbox_snarf_plugin.a
 lib/dovecot/lib20_mbox_snarf_plugin.la
 lib/dovecot/lib20_mbox_snarf_plugin.so
+lib/dovecot/lib20_virtual_plugin.so
+lib/dovecot/lib20_virtual_plugin.la
+lib/dovecot/lib20_virtual_plugin.a
 lib/dovecot/lib20_zlib_plugin.so
 lib/dovecot/lib20_zlib_plugin.a
 lib/dovecot/lib20_zlib_plugin.la
@@ -80,6 +101,7 @@ libexec/dovecot/gdbhelper
 libexec/dovecot/idxview
 libexec/dovecot/imap
 libexec/dovecot/imap-login
+libexec/dovecot/imap-utf7
 libexec/dovecot/listview
 libexec/dovecot/logview
 libexec/dovecot/maildirlock
@@ -87,6 +109,7 @@ libexec/dovecot/maildirlock
 %%POP3%%libexec/dovecot/pop3-login
 libexec/dovecot/rawlog
 libexec/dovecot/ssl-build-param
+libexec/dovecot/threadview
 @dirrmtry libexec/dovecot
 sbin/dovecot
 sbin/dovecotpw
@@ -96,6 +119,9 @@ sbin/dovecotpw
 %%BDB%%@unexec if cmp -s %D/%%EXAMPLESDIR%%/dovecot-db.conf %D/etc/dovecot-db.conf; then rm -f %D/etc/dovecot-db.conf; fi
 %%EXAMPLESDIR%%/dovecot-db.conf
 %%BDB%%@exec if [ ! -f %D/etc/dovecot-db.conf ]; then cp -p %D/%%EXAMPLESDIR%%/dovecot-db.conf %D/etc/dovecot-db.conf; fi
+%%SQL%%@unexec if cmp -s %D/%%EXAMPLESDIR%%/dovecot-dict-sql.conf %D/etc/dovecot-dict-sql.conf; then rm -f %D/etc/dovecot-dict-sql.conf; fi
+%%EXAMPLESDIR%%/dovecot-dict-sql.conf
+%%SQL%%@exec if [ ! -f %D/etc/dovecot-dict-sql.conf ]; then cp -p %D/%%EXAMPLESDIR%%/dovecot-dict-sql.conf %D/etc/dovecot-dict-sql.conf; fi
 %%LDAP%%@unexec if cmp -s %D/%%EXAMPLESDIR%%/dovecot-ldap.conf %D/etc/dovecot-ldap.conf; then rm -f %D/etc/dovecot-ldap.conf; fi
 %%EXAMPLESDIR%%/dovecot-ldap.conf
 %%LDAP%%@exec if [ ! -f %D/etc/dovecot-ldap.conf ]; then cp -p %D/%%EXAMPLESDIR%%/dovecot-ldap.conf %D/etc/dovecot-ldap.conf; fi