- Update to 1.1.14

PR:		ports/133199
Submitted by:	Darren Pilgrim <ports.maintainer@evilphi.com>
Approved by:	maintainer timeout

3 files changed, 33 insertions, 38 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index fc48c5c1e1d8..d8e0f1be93a4 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	1.1.11
+PORTVERSION=	1.1.14
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/1.1/
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index cb3fdbb2640a..eaaab2e0b4a0 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,6 +1,6 @@
-MD5 (dovecot-1.1.11.tar.gz) = c973eb41aca79fb16630a16f0d84f765
-SHA256 (dovecot-1.1.11.tar.gz) = d37fa251219559841151e12ba000565da6b999f48827db6beee612865f7a5a34
-SIZE (dovecot-1.1.11.tar.gz) = 2362415
-MD5 (dovecot-1.1.11-managesieve-0.10.5.diff.gz) = 420aa314145670a1ea2d015a7d0cecb6
-SHA256 (dovecot-1.1.11-managesieve-0.10.5.diff.gz) = 26fd83c760c250e09951c8016e469e36100b1a81b7b6dc0b18c610c6d6361aa3
-SIZE (dovecot-1.1.11-managesieve-0.10.5.diff.gz) = 5906
+MD5 (dovecot-1.1.14.tar.gz) = 60b1deccc0ae77e5669060d2b1894e5e
+SHA256 (dovecot-1.1.14.tar.gz) = 95aa89b65fd89a42484850bbd33d463601039eea21107febc15175d4f3652c4c
+SIZE (dovecot-1.1.14.tar.gz) = 2372939
+MD5 (dovecot-1.1.14-managesieve-0.10.6.diff.gz) = 09f9dea802678cb0fbd6f66cea0b0e2d
+SHA256 (dovecot-1.1.14-managesieve-0.10.6.diff.gz) = c6d0329ab99eb73e0d464fb38b0806b93e444af2ae9603996fadf2ee58788f4f
+SIZE (dovecot-1.1.14-managesieve-0.10.6.diff.gz) = 6488
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index 8f5635fe64b3..fbd6a2563193 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,15 +1,15 @@
---- dovecot-example.conf.orig	2009-01-25 20:12:41.000000000 -0500
-+++ dovecot-example.conf	2009-01-25 20:12:41.000000000 -0500
+--- dovecot-example.conf.orig	2009-05-09 18:13:35.000000000 -0700
++++ dovecot-example.conf	2009-05-09 18:14:44.000000000 -0700
 @@ -20,7 +20,7 @@
  
- # Protocols we want to be serving: imap imaps pop3 pop3s
+ # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
  # If you only want to use dovecot-auth, you can set this to "none".
 -#protocols = imap imaps
 +protocols = %%PROTOCOLS%%
  
  # A space separated list of IP or host addresses where to listen in for
  # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -44,7 +44,7 @@
+@@ -48,7 +48,7 @@
  # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
  # matches the local IP (ie. you're connecting from the same computer), the
  # connection is considered secure and plaintext authentication is allowed.
@@ -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
-@@ -214,7 +214,7 @@
+@@ -218,7 +218,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.
-@@ -272,7 +272,7 @@
+@@ -276,7 +276,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
-@@ -311,7 +311,7 @@
+@@ -315,7 +315,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)
-@@ -339,20 +339,20 @@
+@@ -343,20 +343,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,
-@@ -419,7 +419,7 @@
+@@ -423,7 +423,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,7 +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
-@@ -534,7 +534,7 @@
+@@ -538,7 +538,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.
@@ -87,7 +87,7 @@
  
    # IMAP logout format string:
    #  %i - total number of bytes read from client
-@@ -563,7 +563,7 @@
+@@ -567,7 +567,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 +96,7 @@
  }
    
  ##
-@@ -615,7 +615,7 @@
+@@ -619,7 +619,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 +105,7 @@
  
    # POP3 logout format string:
    #  %i - total number of bytes read from client
-@@ -646,7 +646,7 @@
+@@ -650,7 +650,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 +114,7 @@
  }
  
  ##
-@@ -741,7 +741,7 @@
+@@ -787,7 +787,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 +123,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
-@@ -797,7 +797,7 @@
+@@ -843,7 +843,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 +132,7 @@
  
    #
    # Password database is used to verify user's password (and nothing more).
-@@ -859,6 +859,7 @@
+@@ -905,6 +905,7 @@
      #   args = session=yes %Ls
      #   args = cache_key=%u dovecot
      #args = dovecot
@@ -140,7 +140,7 @@
    }
  
    # System users (NSS, /etc/passwd, or similiar)
-@@ -902,14 +903,16 @@
+@@ -948,14 +949,16 @@
  
    # SQL database <doc/wiki/AuthDatabase.SQL.txt>
    #passdb sql {
@@ -161,7 +161,7 @@
    #}
  
    # vpopmail authentication <doc/wiki/AuthDatabase.VPopMail.txt>
-@@ -944,7 +947,7 @@
+@@ -990,7 +993,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 +170,7 @@
    }
  
    # passwd-like file with specified location
-@@ -973,14 +976,16 @@
+@@ -1019,14 +1022,16 @@
  
    # SQL database <doc/wiki/AuthDatabase.SQL.txt>
    #userdb sql {
@@ -191,7 +191,7 @@
    #}
  
    # vpopmail <doc/wiki/AuthDatabase.VPopMail.txt>
-@@ -1012,25 +1017,25 @@
+@@ -1058,25 +1063,25 @@
    #ssl_username_from_cert = no
  
    # It's possible to export the authentication interface to other programs:
@@ -227,8 +227,12 @@
  }
  
  # If you wish to use another authentication server than dovecot-auth, you can
-@@ -1060,8 +1065,9 @@
+@@ -1104,11 +1109,12 @@
+ 
+ dict {
    #quota = mysql:/etc/dovecot-dict-quota.conf 
+-  #expire = db:/var/lib/dovecot/expire.db
++  #expire = db:/var/db/dovecot/expire.db
  }
  
 -# Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf
@@ -239,7 +243,7 @@
  
  ##
  ## Plugin settings
-@@ -1098,8 +1104,8 @@
+@@ -1145,8 +1151,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.
@@ -250,12 +254,3 @@
    #quota = maildir
  
    # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir
-@@ -1136,7 +1142,7 @@
-   # you must set up:
-   #   dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool
-   #expire = Trash 7 Spam 30
--  #expire_dict = db:/var/lib/dovecot/expire.db
-+  #expire_dict = db:/var/db/dovecot/expire.db
- 
-   # Lazy expunge plugin. Currently works only with maildirs. When a user
-   # expunges mails, the mails are moved to a mailbox in another namespace