From 2a63c7cca2c8f614aaaa4d82fdb56b39790461b3 Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 25 Nov 2008 00:44:58 +0000 Subject: [PATCH] Update to Dovecot 1.1.7; A bug fix release. ok sthen@ --- mail/dovecot/Makefile | 6 +-- mail/dovecot/distinfo | 10 ++--- .../patches/patch-dovecot-example_conf | 38 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 67b0b55a62e..9406cf6a3eb 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.108 2008/10/29 23:16:56 brad Exp $ +# $OpenBSD: Makefile,v 1.109 2008/11/25 00:44:58 brad Exp $ SHARED_ONLY= Yes @@ -6,12 +6,12 @@ COMMENT-server= compact IMAP/POP3 server COMMENT-sieve= Sieve mail filtering for Dovecot V_MAJOR= 1.1 -V_DOVECOT= 1.1.6 +V_DOVECOT= 1.1.7 V_SIEVE= 1.1.5 PKGNAME= dovecot-${V_DOVECOT} PKGNAME-server= dovecot-${V_DOVECOT} -FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p3 +FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p4 DISTNAME= dovecot-${V_DOVECOT} CATEGORIES= mail diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index 6233e2c8861..c82d5dfe150 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,10 +1,10 @@ -MD5 (dovecot-1.1.6.tar.gz) = zL/Py15tGaMiiIWi9+ri3Q== +MD5 (dovecot-1.1.7.tar.gz) = 6oPqIAClsuF0THyX61WF0Q== MD5 (dovecot-sieve-1.1.5.tar.gz) = tDYt7+P8GIZduM+OHJQLEw== -RMD160 (dovecot-1.1.6.tar.gz) = NfDyudmmYanub7wqbOTwje3q1aM= +RMD160 (dovecot-1.1.7.tar.gz) = 4qU941aRAJTyUWsz9BVd7Uz1ptw= RMD160 (dovecot-sieve-1.1.5.tar.gz) = glqOwH1JUn2FUctfP4a2OP3br70= -SHA1 (dovecot-1.1.6.tar.gz) = ci++jNGZqPq7AYdt+donRgoLGfk= +SHA1 (dovecot-1.1.7.tar.gz) = 2FVKHh8EqE3fAJ0VmVJsAWs2WCs= SHA1 (dovecot-sieve-1.1.5.tar.gz) = ZyrfCi8WJ9lvl/xj/srwJN2fekI= -SHA256 (dovecot-1.1.6.tar.gz) = kaubeOLtQjDZb6qJrs3j5sQq1+LvSFjCksWYixlcu+w= +SHA256 (dovecot-1.1.7.tar.gz) = kVyudoRDjGM10Ecv8g7C/kTWIKph9ATOkf0ConQ0z58= SHA256 (dovecot-sieve-1.1.5.tar.gz) = 7B6pQxHV+2y13X5FFyh4Svs5UhpqWA9kC00hFVBaXd8= -SIZE (dovecot-1.1.6.tar.gz) = 2320875 +SIZE (dovecot-1.1.7.tar.gz) = 2325617 SIZE (dovecot-sieve-1.1.5.tar.gz) = 468913 diff --git a/mail/dovecot/patches/patch-dovecot-example_conf b/mail/dovecot/patches/patch-dovecot-example_conf index 3d9e1b7e5d6..8511263ecef 100644 --- a/mail/dovecot/patches/patch-dovecot-example_conf +++ b/mail/dovecot/patches/patch-dovecot-example_conf @@ -1,6 +1,6 @@ -$OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ ---- dovecot-example.conf.orig Fri Jul 11 19:14:14 2008 -+++ dovecot-example.conf Sat Aug 23 16:09:00 2008 +$OpenBSD: patch-dovecot-example_conf,v 1.44 2008/11/25 00:44:58 brad Exp $ +--- dovecot-example.conf.orig Sun Nov 23 16:53:53 2008 ++++ dovecot-example.conf Sun Nov 23 18:26:49 2008 @@ -10,13 +10,12 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " @@ -44,7 +44,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ #ssl_key_file = /etc/ssl/private/dovecot.pem # If key file is password protected, give the password here. Alternatively -@@ -132,7 +131,7 @@ +@@ -134,7 +133,7 @@ # which login needs to be able to connect to. The sockets are created when # running as root, so you don't have to worry about permissions. Note that # everything in this directory is deleted when Dovecot is started. @@ -53,7 +53,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # chroot login process to the login_dir. Only reason not to do this is if you # wish to run the whole Dovecot without roots. -@@ -142,7 +141,7 @@ +@@ -144,7 +143,7 @@ # and don't use it anywhere else. The user must also belong to a group where # only it has access, it's used to control access for authentication process. # Note that this user is NOT used to access mails. @@ -62,7 +62,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. -@@ -305,8 +304,9 @@ +@@ -307,8 +306,9 @@ #mail_log_max_lines_per_sec = 10 # Don't use mmap() at all. This is required if you store indexes to shared @@ -74,7 +74,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # 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. -@@ -447,7 +447,7 @@ +@@ -449,7 +449,7 @@ # locking methods as well. Some operating systems don't allow using some of # them simultaneously. #mbox_read_locks = fcntl @@ -83,7 +83,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Maximum time in seconds to wait for lock (all of them) before aborting. #mbox_lock_timeout = 300 -@@ -502,19 +502,19 @@ +@@ -504,19 +504,19 @@ protocol imap { # Login executable location. @@ -107,7 +107,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Maximum IMAP command line length in bytes. Some clients generate very long # command lines with huge mailboxes, so you may need to raise this if you get -@@ -528,7 +528,7 @@ protocol imap { +@@ -530,7 +530,7 @@ protocol imap { # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -116,7 +116,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Send IMAP capabilities in greeting message. This makes it unnecessary for # clients to request it with CAPABILITY command, so it saves one round-trip. -@@ -562,7 +562,7 @@ protocol imap { +@@ -564,7 +564,7 @@ protocol imap { # but not both. Thunderbird separates these two by forcing server to # accept '/' suffix in mailbox names in subscriptions list. # The list is space-separated. @@ -125,7 +125,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ } ## -@@ -571,11 +571,11 @@ protocol imap { +@@ -573,11 +573,11 @@ protocol imap { protocol pop3 { # Login executable location. @@ -139,7 +139,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Don't try to set mails non-recent or seen with POP3 sessions. This is # mostly intended to reduce disk I/O. With maildir it doesn't move files -@@ -635,7 +635,7 @@ protocol pop3 { +@@ -637,7 +637,7 @@ protocol pop3 { # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -148,7 +148,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Workarounds for various client bugs: # outlook-no-nuls: -@@ -645,7 +645,7 @@ protocol pop3 { +@@ -647,7 +647,7 @@ protocol pop3 { # 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. @@ -157,7 +157,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ } ## -@@ -663,7 +663,7 @@ protocol lda { +@@ -665,7 +665,7 @@ protocol lda { # Support for dynamically loadable plugins. mail_plugins is a space separated # list of plugins to load. #mail_plugins = @@ -166,7 +166,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # If user is over quota, return with temporary failure instead of # bouncing the mail. -@@ -677,7 +677,7 @@ protocol lda { +@@ -679,7 +679,7 @@ protocol lda { #deliver_log_format = msgid=%m: %$ # Binary to use for sending mails. @@ -175,7 +175,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Human readable error message for rejection mails. Use can use variables: # %n = CRLF, %r = reason, %s = subject, %t = recipient -@@ -692,7 +692,7 @@ protocol lda { +@@ -694,7 +694,7 @@ protocol lda { ## # Executable location @@ -184,7 +184,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -825,7 +825,7 @@ auth default { +@@ -827,7 +827,7 @@ auth default { # database (passwd usually), you can use static userdb. # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # authentication to actually work. @@ -193,7 +193,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # [session=yes] [setcred=yes] [failure_show_msg=yes] # [cache_key=] [] # -@@ -854,7 +854,7 @@ auth default { +@@ -856,7 +856,7 @@ auth default { # args = session=yes %Ls # args = cache_key=%u dovecot #args = dovecot @@ -202,7 +202,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.43 2008/08/23 20:13:39 brad Exp $ # System users (NSS, /etc/passwd, or similiar) # In many systems nowadays this uses Name Service Switch, which is -@@ -874,10 +874,10 @@ auth default { +@@ -876,10 +876,10 @@ auth default { # PAM-like authentication for OpenBSD. #