Update to 1.1.6.

PR:		ports/128469
Submitted by:	maintainer (see reply to the PR)

4 files changed, 13 insertions, 42 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 10aa9c023025..56986ed63bc4 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # New ports collection makefile for:	dovecot
 # Date created:				12/08/2002
 # Whom:			Dominic Marks <dominic.marks@btinternet.com>
@@ -7,12 +6,11 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.1.6

 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/1.1/
 
-MAINTAINER=	yds@coolrat.org
+MAINTAINER=	yds@CoolRat.org

 COMMENT=	Secure and compact IMAP and POP3 servers
 
 USE_ICONV=	yes
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index d31aa6ec0fa5..eed933d21ccb 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,6 +1,6 @@
-MD5 (dovecot-1.1.3.tar.gz) = 103ff0ffb4bcb37f22c27779553e48bc
-SHA256 (dovecot-1.1.3.tar.gz) = e07d52e6d61a653672c5173d6d27fe119970c792478cbbd23b87f9fdfc0c13c7
-SIZE (dovecot-1.1.3.tar.gz) = 2306933
-MD5 (dovecot-1.1.3-managesieve-0.10.3.diff.gz) = 3e1755a2ca4dab1a8d1cb00d8ea9e451
-SHA256 (dovecot-1.1.3-managesieve-0.10.3.diff.gz) = 045520404c0928e63a7127d9a38b7c12ff68ff74dc423f88f8af9e93f129e756
-SIZE (dovecot-1.1.3-managesieve-0.10.3.diff.gz) = 5837
+MD5 (dovecot-1.1.6.tar.gz) = ccbfcfcb5e6d19a3228885a2f7eae2dd

+SHA256 (dovecot-1.1.6.tar.gz) = 91ab9b78e2ed4230d96faa89aecde3e6c42ad7e2ef4858c292c5988b195cbbec

+SIZE (dovecot-1.1.6.tar.gz) = 2320875

+MD5 (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 0450151b4515afb036b4c94ac9e912fc

+SHA256 (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 4a9612f788796d1c18653bc0aa5cc9269b3365d4a0358b3f6bf05cda206c139f

+SIZE (dovecot-1.1.6-managesieve-0.10.3.diff.gz) = 5912

diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.sh.in
index 25fb7281c054..3db31630ed93 100644
--- a/mail/dovecot/files/dovecot.sh.in
+++ b/mail/dovecot/files/dovecot.sh.in
@@ -30,8 +30,8 @@ dovecot_prestart()
 {	# Ensure runtime directories exist with correct permissions
 	local base user gid
 	base=/var/run/${name}
-	user=$(awk -F '[[:space:]]*=[[:space:]]*' '/^[[:space:]]*login_user[[:space:]]*=/ { print $2 }' ${required_files})
-	gid=$(pw usershow -n "${user:-${name}}" 2>/dev/null | cut -d: -f4)
+	user=$(/usr/bin/awk -F '[[:space:]]*=[[:space:]]*' '/^[[:space:]]*login_user[[:space:]]*=/ { print $2 }' ${required_files})

+	gid=$(/usr/sbin/pw usershow -n "${user:-${name}}" 2>/dev/null | /usr/bin/cut -d: -f4)

 	/usr/bin/install -o root -g wheel -m 0755 -d ${base}
 	/usr/bin/install -o root -g ${gid} -m 0750 -d ${base}/login
 }
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index ba0fe1984864..e6b5d4421dc0 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	2008-08-28 06:53:28.000000000 -0400
-+++ dovecot-example.conf	2008-08-28 06:53:28.000000000 -0400
+--- dovecot-example.conf.orig	2008-10-26 11:00:45.000000000 -0400

++++ dovecot-example.conf	2008-10-26 11:00:45.000000000 -0400

 @@ -20,7 +20,7 @@
  
  # Protocols we want to be serving: imap imaps pop3 pop3s
@@ -78,15 +78,6 @@
  
  # 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
-@@ -426,7 +426,7 @@
- # done only by looking at dovecot-uidlist file, so if something outside
- # Dovecot does similar filename preserving copies, you may run into problems.
- # NOTE: This setting requires maildir_copy_with_hardlinks = yes to work.
--#maildir_copy_preserve_filename = no
-+maildir_copy_preserve_filename = yes
- 
- ##
- ## mbox-specific settings
 @@ -533,7 +533,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.
@@ -105,15 +96,6 @@
  }
    
  ##
-@@ -585,7 +585,7 @@
-   # Support LAST command which exists in old POP3 specs, but has been removed
-   # from new ones. Some clients still wish to use this though. Enabling this
-   # makes RSET command clear all \Seen flags from messages.
--  #pop3_enable_last = no
-+  pop3_enable_last = yes
- 
-   # If mail has X-UIDL header, use it as the mail's UIDL.
-   #pop3_reuse_xuidl = no
 @@ -614,7 +614,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.
@@ -132,21 +114,12 @@
  }
  
  ##
-@@ -667,7 +667,7 @@
- 
-   # If user is over quota, return with temporary failure instead of
-   # bouncing the mail.
--  #quota_full_tempfail = no
-+  quota_full_tempfail = yes
- 
-   # Format to use for logging mail deliveries. You can use variables:
-   #  %$ - Delivery status message (e.g. "saved to INBOX")
 @@ -736,7 +736,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.
 -#auth_username_format =
-+auth_username_format = %Ln
++auth_username_format = %Lu

  
  # 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