From dbe3dc7726a588b6a2e42326e4a8ab7f2fad1aaf Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 16 Jul 2006 02:43:08 +0000 Subject: [PATCH] upgrade to Dovecot 1.0rc2 "That works way better." ok marco@ --- mail/dovecot/Makefile | 5 +- mail/dovecot/distinfo | 8 +-- mail/dovecot/patches/patch-Makefile_in | 8 +-- mail/dovecot/patches/patch-doc_mkcert_sh | 25 ++++----- .../patches/patch-dovecot-example_conf | 54 +++++++++---------- mail/dovecot/pkg/PLIST | 3 +- 6 files changed, 52 insertions(+), 51 deletions(-) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 951aa355957..48bd98d6f2a 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.46 2006/06/19 11:49:07 bernd Exp $ +# $OpenBSD: Makefile,v 1.47 2006/07/16 02:43:08 brad Exp $ COMMENT= "compact IMAP/POP3 server" -DISTNAME= dovecot-1.0.beta8 -PKGNAME= ${DISTNAME}p1 +DISTNAME= dovecot-1.0.rc2 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE}releases/ diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index a80c28d8014..d7c2b5b8c57 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,4 +1,4 @@ -MD5 (dovecot-1.0.beta8.tar.gz) = 6a87718a86ee1ae2334c75843dd9a7df -RMD160 (dovecot-1.0.beta8.tar.gz) = 101a7011467691ba5f4a6f48e21d6d1dc5626c16 -SHA1 (dovecot-1.0.beta8.tar.gz) = fedd38c29a2bc396df386636ed5d8b65ecab0ff6 -SIZE (dovecot-1.0.beta8.tar.gz) = 1392106 +MD5 (dovecot-1.0.rc2.tar.gz) = e27a248b2ee224e4618aa2f020150041 +RMD160 (dovecot-1.0.rc2.tar.gz) = cbb1919f30ccc82033ddda5a9a4b2e9695f78eb9 +SHA1 (dovecot-1.0.rc2.tar.gz) = 548d691166c71533cce05f72204d5f728941bab6 +SIZE (dovecot-1.0.rc2.tar.gz) = 1257435 diff --git a/mail/dovecot/patches/patch-Makefile_in b/mail/dovecot/patches/patch-Makefile_in index 128526594f2..130d4e30e17 100644 --- a/mail/dovecot/patches/patch-Makefile_in +++ b/mail/dovecot/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.10 2006/06/19 11:49:08 bernd Exp $ ---- Makefile.in.orig Fri May 12 05:11:23 2006 -+++ Makefile.in Fri May 12 14:24:54 2006 -@@ -582,7 +582,7 @@ install-data: install-data-recursive +$OpenBSD: patch-Makefile_in,v 1.11 2006/07/16 02:43:08 brad Exp $ +--- Makefile.in.orig Tue Jun 27 18:17:45 2006 ++++ Makefile.in Wed Jun 28 03:47:43 2006 +@@ -598,7 +598,7 @@ install-data: install-data-recursive uninstall: uninstall-recursive install-am: all-am diff --git a/mail/dovecot/patches/patch-doc_mkcert_sh b/mail/dovecot/patches/patch-doc_mkcert_sh index 3541edb44a0..59200d609af 100644 --- a/mail/dovecot/patches/patch-doc_mkcert_sh +++ b/mail/dovecot/patches/patch-doc_mkcert_sh @@ -1,23 +1,24 @@ -$OpenBSD: patch-doc_mkcert_sh,v 1.5 2006/06/19 11:49:08 bernd Exp $ ---- doc/mkcert.sh.orig Thu Jul 22 20:05:00 2004 -+++ doc/mkcert.sh Wed Nov 3 21:59:54 2004 -@@ -5,14 +5,14 @@ +$OpenBSD: patch-doc_mkcert_sh,v 1.6 2006/07/16 02:43:08 brad Exp $ +--- doc/mkcert.sh.orig Fri Jun 9 07:01:10 2006 ++++ doc/mkcert.sh Tue Jun 13 20:42:58 2006 +@@ -5,18 +5,12 @@ OPENSSL=${OPENSSL-openssl} SSLDIR=${SSLDIR-/etc/ssl} -OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf} +OPENSSLCONFIG=${OPENSSLCONFIG-${SSLDIR}/dovecot-openssl.cnf} --CERTFILE=$SSLDIR/certs/dovecot.pem +-CERTDIR=$SSLDIR/certs + KEYDIR=$SSLDIR/private + +-CERTFILE=$CERTDIR/dovecot.pem +CERTFILE=$SSLDIR/dovecotcert.pem - KEYFILE=$SSLDIR/private/dovecot.pem - --if [ ! -d $SSLDIR/certs ]; then + KEYFILE=$KEYDIR/dovecot.pem +- +-if [ ! -d $CERTDIR ]; then - echo "$SSLDIR/certs directory doesn't exist" +- exit 1 -fi -+#if [ ! -d $SSLDIR/certs ]; then -+# echo "$SSLDIR/certs directory doesn't exist" -+#fi - if [ ! -d $SSLDIR/private ]; then + if [ ! -d $KEYDIR ]; then echo "$SSLDIR/private directory doesn't exist" diff --git a/mail/dovecot/patches/patch-dovecot-example_conf b/mail/dovecot/patches/patch-dovecot-example_conf index 6458e384471..a3209fabd1a 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.19 2006/06/19 11:49:08 bernd Exp $ ---- dovecot-example.conf.orig Thu Apr 20 22:01:27 2006 -+++ dovecot-example.conf Fri May 12 14:24:17 2006 +$OpenBSD: patch-dovecot-example_conf,v 1.20 2006/07/16 02:43:08 brad Exp $ +--- dovecot-example.conf.orig Sat Jul 1 16:07:32 2006 ++++ dovecot-example.conf Wed Jul 5 08:41:43 2006 @@ -7,13 +7,12 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " @@ -17,9 +17,18 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd Exp $ -#base_dir = /var/run/dovecot/ +base_dir = /var/dovecot/ - # Protocols we want to be serving: - # imap imaps pop3 pop3s -@@ -49,7 +48,7 @@ + # Protocols we want to be serving: imap imaps pop3 pop3s + #protocols = imap imaps +@@ -41,7 +40,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. +-#disable_plaintext_auth = yes ++disable_plaintext_auth = yes + + # 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 @@ # 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 @@ -28,16 +37,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd Exp $ #ssl_key_file = /etc/ssl/private/dovecot.pem # If key file is password protected, give the password here. Alternatively -@@ -74,7 +73,7 @@ - # SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and - # IPv6 ::1 addresses are considered secure, this setting has no effect if - # you connect from those addresses. --#disable_plaintext_auth = yes -+disable_plaintext_auth = yes - - # 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 -@@ -108,7 +107,7 @@ +@@ -118,7 +117,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.19 2006/06/19 11:49:08 bernd 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. -@@ -120,7 +119,7 @@ +@@ -130,7 +129,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.19 2006/06/19 11:49:08 bernd Exp $ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. -@@ -336,7 +335,7 @@ +@@ -265,7 +264,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.19 2006/06/19 11:49:08 bernd 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 -@@ -439,19 +438,19 @@ +@@ -467,19 +466,19 @@ protocol imap { # Login executable location. @@ -88,7 +88,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd 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 -@@ -492,7 +491,7 @@ protocol imap { +@@ -520,7 +519,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. @@ -97,7 +97,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd Exp $ } ## -@@ -501,10 +500,10 @@ protocol imap { +@@ -529,10 +528,10 @@ protocol imap { protocol pop3 { # Login executable location. @@ -110,7 +110,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd 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 -@@ -547,7 +546,7 @@ protocol pop3 { +@@ -576,7 +575,7 @@ protocol pop3 { # installations. %08Xu%08Xv will be the new default, so use it for new # installations. # @@ -119,7 +119,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd Exp $ # POP3 logout format string: # %t - number of TOP commands -@@ -572,7 +571,7 @@ protocol pop3 { +@@ -601,7 +600,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. @@ -128,7 +128,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd Exp $ } ## -@@ -580,7 +579,7 @@ protocol pop3 { +@@ -633,7 +632,7 @@ protocol lda { ## # Executable location @@ -137,16 +137,16 @@ $OpenBSD: patch-dovecot-example_conf,v 1.19 2006/06/19 11:49:08 bernd Exp $ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -691,7 +690,7 @@ auth default { +@@ -745,7 +744,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. - passdb pam { + #passdb pam { - # [session=yes] [cache_key=] [] + # [session=yes] [setcred=yes] [cache_key=] [] # # session=yes makes Dovecot open and immediately close PAM session. Some -@@ -715,13 +714,13 @@ auth default { +@@ -773,13 +772,13 @@ auth default { # args = session=yes * # args = cache_key=%u dovecot #args = dovecot diff --git a/mail/dovecot/pkg/PLIST b/mail/dovecot/pkg/PLIST index 300d30113f3..ff0de96e1b0 100644 --- a/mail/dovecot/pkg/PLIST +++ b/mail/dovecot/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2006/06/19 11:49:08 bernd Exp $ +@comment $OpenBSD: PLIST,v 1.18 2006/07/16 02:43:08 brad Exp $ @newgroup _dovecot:518 @newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin %%SHARED%% @@ -20,6 +20,7 @@ lib/dovecot/lda/ lib/dovecot/pop3/ libexec/dovecot/ libexec/dovecot/checkpassword-reply +libexec/dovecot/deliver libexec/dovecot/dict libexec/dovecot/dovecot-auth libexec/dovecot/gdbhelper