From 4f68de9a02eefb7699e3210ab9d3033bf4b772b3 Mon Sep 17 00:00:00 2001 From: jakob Date: Sat, 3 Feb 2007 08:19:18 +0000 Subject: [PATCH] dovecot 1.0.rc21 (from brad@) --- mail/dovecot/Makefile | 6 ++--- mail/dovecot/distinfo | 8 +++--- .../patches/patch-dovecot-example_conf | 26 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index d6a70b1bfa1..58e99d055af 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,16 +1,16 @@ -# $OpenBSD: Makefile,v 1.70 2007/01/25 07:48:39 jakob Exp $ +# $OpenBSD: Makefile,v 1.71 2007/02/03 08:19:18 jakob Exp $ SHARED_ONLY= Yes COMMENT-server= "compact IMAP/POP3 server" COMMENT-sieve= "sieve mail filtering for Dovecot" -V_DOVECOT= 1.0.rc19 +V_DOVECOT= 1.0.rc21 V_SIEVE= 1.0 PKGNAME= dovecot-${V_DOVECOT} PKGNAME-server= dovecot-${V_DOVECOT} -PKGNAME-sieve= dovecot-sieve-${V_SIEVE}p1 +PKGNAME-sieve= dovecot-sieve-${V_SIEVE}p2 DISTNAME= dovecot-${V_DOVECOT} CATEGORIES= mail diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index b6128e7aad8..9bec350df6a 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,8 +1,8 @@ -MD5 (dovecot-1.0.rc19.tar.gz) = f2c1df951f3e9bd61aa51890ab158ab7 +MD5 (dovecot-1.0.rc21.tar.gz) = b42be5947e641909918a863da3249951 MD5 (sieve/dovecot-sieve-1.0.tar.gz) = dabe564d2ef262a008622737ad84579f -RMD160 (dovecot-1.0.rc19.tar.gz) = feb9e5927ab2c651273c9aaec1727b894a5a6e17 +RMD160 (dovecot-1.0.rc21.tar.gz) = 58193d387acde95d1bec5fcfa18d4c767c207788 RMD160 (sieve/dovecot-sieve-1.0.tar.gz) = b56f5a7391607125184755b9bbcbe749e79e26d4 -SHA1 (dovecot-1.0.rc19.tar.gz) = c9c41ed83c775e8eecc40fe13bab135261383b82 +SHA1 (dovecot-1.0.rc21.tar.gz) = efe6c70af07b8792f16a578ee855deb31ecef4d6 SHA1 (sieve/dovecot-sieve-1.0.tar.gz) = 6d151c4140e0cf89e3d771fb32b5da065dbbed24 -SIZE (dovecot-1.0.rc19.tar.gz) = 1498105 +SIZE (dovecot-1.0.rc21.tar.gz) = 1500380 SIZE (sieve/dovecot-sieve-1.0.tar.gz) = 442943 diff --git a/mail/dovecot/patches/patch-dovecot-example_conf b/mail/dovecot/patches/patch-dovecot-example_conf index b6ff08107d6..6360b54bfc7 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.31 2007/01/25 07:48:39 jakob Exp $ ---- dovecot-example.conf.orig Fri Jan 19 11:42:40 2007 -+++ dovecot-example.conf Mon Jan 22 14:34:11 2007 +$OpenBSD: patch-dovecot-example_conf,v 1.32 2007/02/03 08:19:18 jakob Exp $ +--- dovecot-example.conf.orig Fri Feb 2 12:17:48 2007 ++++ dovecot-example.conf Tue Jan 30 13:15:48 2007 @@ -7,13 +7,12 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " @@ -55,7 +55,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. -@@ -273,7 +272,7 @@ +@@ -278,7 +277,7 @@ # Don't write() to mmaped files. This is required for some operating systems # which use separate caches for them, such as OpenBSD. @@ -64,7 +64,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ # Rely on O_EXCL to work when creating dotlock files. The default is to use # hard linking. O_EXCL makes the dotlocking faster, but it doesn't always -@@ -426,7 +425,7 @@ +@@ -431,7 +430,7 @@ # locking methods as well. Some operating systems don't allow using some of # them simultaneously. #mbox_read_locks = fcntl @@ -73,7 +73,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ # Maximum time in seconds to wait for lock (all of them) before aborting. #mbox_lock_timeout = 300 -@@ -481,19 +480,19 @@ +@@ -486,19 +485,19 @@ protocol imap { # Login executable location. @@ -97,7 +97,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob 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 -@@ -537,7 +536,7 @@ protocol imap { +@@ -542,7 +541,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. @@ -106,7 +106,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ } ## -@@ -546,11 +545,11 @@ protocol imap { +@@ -551,11 +550,11 @@ protocol imap { protocol pop3 { # Login executable location. @@ -120,7 +120,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob 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 -@@ -595,7 +594,7 @@ protocol pop3 { +@@ -600,7 +599,7 @@ protocol pop3 { # installations. %08Xu%08Xv will be the new default, so use it for new # installations. # @@ -129,7 +129,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ # POP3 logout format string: # %t - number of TOP commands -@@ -620,7 +619,7 @@ protocol pop3 { +@@ -625,7 +624,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. @@ -138,7 +138,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ } ## -@@ -652,7 +651,7 @@ protocol lda { +@@ -657,7 +656,7 @@ protocol lda { ## # Executable location @@ -147,7 +147,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -766,7 +765,7 @@ auth default { +@@ -771,7 +770,7 @@ auth default { # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # authentication to actually work. # http://wiki.dovecot.org/PasswordDatabase/PAM @@ -156,7 +156,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.31 2007/01/25 07:48:39 jakob Exp $ # [session=yes] [setcred=yes] [cache_key=] [] # # session=yes makes Dovecot open and immediately close PAM session. Some -@@ -794,14 +793,14 @@ auth default { +@@ -799,14 +798,14 @@ auth default { # args = session=yes * # args = cache_key=%u dovecot #args = dovecot