From d734e1ab3f1dbc4ad746de8bacb73faa5097f2fa Mon Sep 17 00:00:00 2001 From: brad Date: Mon, 9 Oct 2006 19:26:53 +0000 Subject: [PATCH] upgrade to Dovecot 1.0rc8 --- mail/dovecot/Makefile | 5 +-- mail/dovecot/distinfo | 8 ++-- .../patches/patch-dovecot-example_conf | 39 ++++++++++--------- .../patch-src_lib_ioloop-notify-kqueue_c | 15 ------- 4 files changed, 26 insertions(+), 41 deletions(-) delete mode 100644 mail/dovecot/patches/patch-src_lib_ioloop-notify-kqueue_c diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index e07374cb764..167cbdb96e8 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.55 2006/09/22 15:46:28 brad Exp $ +# $OpenBSD: Makefile,v 1.56 2006/10/09 19:26:53 brad Exp $ COMMENT= "compact IMAP/POP3 server" -DISTNAME= dovecot-1.0.rc7 -PKGNAME= ${DISTNAME}p1 +DISTNAME= dovecot-1.0.rc8 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE}releases/ diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index c3258da9e7f..36d8b10f38b 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,4 +1,4 @@ -MD5 (dovecot-1.0.rc7.tar.gz) = 665ec0f09fe4f0a8f3f9efd7b9a02297 -RMD160 (dovecot-1.0.rc7.tar.gz) = 6edd633380da810d21a729330fa9c3ccec6d7039 -SHA1 (dovecot-1.0.rc7.tar.gz) = be1f7efe3cdf15c7581580954e42438173bb67a5 -SIZE (dovecot-1.0.rc7.tar.gz) = 1273427 +MD5 (dovecot-1.0.rc8.tar.gz) = 888ecd634dbb4a4755c1a892e8eb3950 +RMD160 (dovecot-1.0.rc8.tar.gz) = 865b948e3e702ab74a8e0f3cd12c0daa39573ad9 +SHA1 (dovecot-1.0.rc8.tar.gz) = 166da9716f5d27af30075ce8f0b07c2e8f0c801f +SIZE (dovecot-1.0.rc8.tar.gz) = 1446336 diff --git a/mail/dovecot/patches/patch-dovecot-example_conf b/mail/dovecot/patches/patch-dovecot-example_conf index cee9651e2cd..6ef92504a3e 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.24 2006/09/18 05:04:28 brad Exp $ ---- dovecot-example.conf.orig Thu Aug 10 17:21:05 2006 -+++ dovecot-example.conf Thu Aug 17 18:41:36 2006 +$OpenBSD: patch-dovecot-example_conf,v 1.25 2006/10/09 19:26:53 brad Exp $ +--- dovecot-example.conf.orig Fri Sep 22 10:40:56 2006 ++++ dovecot-example.conf Mon Oct 9 15:20:25 2006 @@ -7,13 +7,12 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " @@ -18,8 +18,8 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ +base_dir = /var/dovecot/ # Protocols we want to be serving: imap imaps pop3 pop3s - #protocols = imap imaps -@@ -41,7 +40,7 @@ + # If you only want to use dovecot-auth, you can set this to "none". +@@ -42,7 +41,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. @@ -28,7 +28,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ # 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 -@@ -86,7 +85,7 @@ +@@ -87,7 +86,7 @@ # dropping root privileges, so keep the key file unreadable by anyone but # root. Included doc/mkcert.sh can be used to easily generate self-signed # certificate, just make sure to update the domains in dovecot-openssl.cnf @@ -37,7 +37,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ #ssl_key_file = /etc/ssl/private/dovecot.pem # If key file is password protected, give the password here. Alternatively -@@ -118,7 +117,7 @@ +@@ -119,7 +118,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. @@ -46,7 +46,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 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. -@@ -130,7 +129,7 @@ +@@ -131,7 +130,7 @@ # only it has access, it's used to control access for authentication process. # Note that this user is NOT used to access mails. # http://wiki.dovecot.org/UserIds @@ -55,7 +55,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. -@@ -265,7 +264,7 @@ +@@ -266,7 +265,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.24 2006/09/18 05:04:28 brad Exp $ # Locking method for index files. Alternatives are fcntl, flock and dotlock. # Dotlocking uses some tricks which may create more disk I/O than other locking -@@ -412,7 +411,7 @@ +@@ -413,7 +412,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.24 2006/09/18 05:04:28 brad Exp $ # Maximum time in seconds to wait for lock (all of them) before aborting. #mbox_lock_timeout = 300 -@@ -467,19 +466,19 @@ +@@ -468,19 +467,19 @@ protocol imap { # Login executable location. @@ -97,7 +97,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 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 -@@ -520,7 +519,7 @@ protocol imap { +@@ -521,7 +520,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,20 +106,21 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ } ## -@@ -529,10 +528,10 @@ protocol imap { +@@ -530,11 +529,11 @@ protocol imap { protocol pop3 { # Login executable location. - #login_executable = /usr/libexec/dovecot/pop3-login + #login_executable = /usr/local/libexec/dovecot/pop3-login - # POP3 executable location + # POP3 executable location. See IMAP's mail_executable above for examples + # how this could be changed. - #mail_executable = /usr/libexec/dovecot/pop3 + #mail_executable = /usr/local/libexec/dovecot/pop3 # 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 -@@ -576,7 +575,7 @@ protocol pop3 { +@@ -578,7 +577,7 @@ protocol pop3 { # installations. %08Xu%08Xv will be the new default, so use it for new # installations. # @@ -128,7 +129,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ # POP3 logout format string: # %t - number of TOP commands -@@ -601,7 +600,7 @@ protocol pop3 { +@@ -603,7 +602,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. @@ -137,7 +138,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ } ## -@@ -633,7 +632,7 @@ protocol lda { +@@ -635,7 +634,7 @@ protocol lda { ## # Executable location @@ -146,7 +147,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -745,7 +744,7 @@ auth default { +@@ -747,7 +746,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. @@ -155,7 +156,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.24 2006/09/18 05:04:28 brad Exp $ # [session=yes] [setcred=yes] [cache_key=] [] # # session=yes makes Dovecot open and immediately close PAM session. Some -@@ -773,13 +772,13 @@ auth default { +@@ -775,13 +774,13 @@ auth default { # args = session=yes * # args = cache_key=%u dovecot #args = dovecot diff --git a/mail/dovecot/patches/patch-src_lib_ioloop-notify-kqueue_c b/mail/dovecot/patches/patch-src_lib_ioloop-notify-kqueue_c deleted file mode 100644 index 76383b85269..00000000000 --- a/mail/dovecot/patches/patch-src_lib_ioloop-notify-kqueue_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_lib_ioloop-notify-kqueue_c,v 1.4 2006/09/22 15:46:28 brad Exp $ ---- src/lib/ioloop-notify-kqueue.c.orig Fri Sep 22 10:39:05 2006 -+++ src/lib/ioloop-notify-kqueue.c Fri Sep 22 10:40:08 2006 -@@ -111,7 +111,10 @@ struct io *io_loop_notify_add(struct iol - io->callback = callback; - io->context = context; - -- EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD, -+ /* EV_CLEAR flag is needed because the EVFILT_VNODE filter reports -+ event state transitions and not the current state. With this flag, -+ the same event is only returned once. */ -+ EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, - NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_REVOKE, 0, io); - if (kevent(ctx->kq, &ev, 1, NULL, 0, NULL) < 0) { - i_error("kevent(%d, %s) for notify failed: %m", fd, path);