From a4b5e15989f10af4b7fb5cfff87804fb32a4355b Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 20 Oct 2005 18:28:48 +0000 Subject: [PATCH] upgrade to Dovecot 1.0alpha4 --- mail/dovecot/Makefile | 5 ++-- mail/dovecot/distinfo | 8 ++--- mail/dovecot/patches/patch-configure_in | 8 ++--- .../patches/patch-dovecot-example_conf | 29 ++++++++++++------- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index fbb6caa7614..15a18907d28 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.23 2005/10/06 17:03:21 brad Exp $ +# $OpenBSD: Makefile,v 1.24 2005/10/20 18:28:48 brad Exp $ COMMENT= "compact IMAP/POP3 server" -DISTNAME= dovecot-1.0.alpha3 -PKGNAME= ${DISTNAME}p1 +DISTNAME= dovecot-1.0.alpha4 CATEGORIES= mail MASTER_SITES= ${HOMEPAGE}releases/ diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index 8830bd62da6..81ef633fe9d 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,4 +1,4 @@ -MD5 (dovecot-1.0.alpha3.tar.gz) = 2006624ce4328dcdef6a71376c3be05d -RMD160 (dovecot-1.0.alpha3.tar.gz) = 35033d9765274692ae10edc2bf0171c0d1ccf81f -SHA1 (dovecot-1.0.alpha3.tar.gz) = 78d716fcd381dd0311477ad1d8330e11c75186d0 -SIZE (dovecot-1.0.alpha3.tar.gz) = 1193017 +MD5 (dovecot-1.0.alpha4.tar.gz) = 65f8e2cd097e80b536a75c31a974b5de +RMD160 (dovecot-1.0.alpha4.tar.gz) = c05cac3700ba538da19881e21e42f9500387767d +SHA1 (dovecot-1.0.alpha4.tar.gz) = cfd4b298630b4e6abced182edfa28568bde0c96a +SIZE (dovecot-1.0.alpha4.tar.gz) = 1203714 diff --git a/mail/dovecot/patches/patch-configure_in b/mail/dovecot/patches/patch-configure_in index d571eb69015..fbf5de8e6ef 100644 --- a/mail/dovecot/patches/patch-configure_in +++ b/mail/dovecot/patches/patch-configure_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_in,v 1.6 2005/09/04 18:22:30 brad Exp $ ---- configure.in.orig Sat Mar 5 15:02:47 2005 -+++ configure.in Sun Mar 6 16:46:00 2005 +$OpenBSD: patch-configure_in,v 1.7 2005/10/20 18:28:48 brad Exp $ +--- configure.in.orig Thu Oct 20 05:12:19 2005 ++++ configure.in Thu Oct 20 14:00:00 2005 @@ -12,6 +12,7 @@ AC_PROG_CPP AC_HEADER_STDC AC_C_INLINE @@ -8,4 +8,4 @@ $OpenBSD: patch-configure_in,v 1.6 2005/09/04 18:22:30 brad Exp $ +LIBS="${LIBS} -liconv" AM_ICONV - AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h \ + AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h inttypes.h \ diff --git a/mail/dovecot/patches/patch-dovecot-example_conf b/mail/dovecot/patches/patch-dovecot-example_conf index e7ba8e89ce2..848d718d7cd 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.10 2005/09/04 18:22:30 brad Exp $ ---- dovecot-example.conf.orig Fri Jul 22 13:49:52 2005 -+++ dovecot-example.conf Fri Jul 22 13:58:29 2005 +$OpenBSD: patch-dovecot-example_conf,v 1.11 2005/10/20 18:28:48 brad Exp $ +--- dovecot-example.conf.orig Sun Oct 16 11:48:53 2005 ++++ dovecot-example.conf Thu Oct 20 14:02:48 2005 @@ -5,13 +5,12 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " @@ -64,7 +64,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.10 2005/09/04 18:22:30 brad Exp $ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. -@@ -301,7 +300,7 @@ +@@ -303,7 +302,7 @@ # Don't write() to mmaped files. This is required for some operating systems # which use separate caches for them, such as OpenBSD. @@ -73,7 +73,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.10 2005/09/04 18:22:30 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 -@@ -389,12 +388,12 @@ +@@ -391,12 +390,12 @@ protocol imap { # Login executable location. @@ -89,7 +89,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.10 2005/09/04 18:22:30 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 -@@ -442,10 +441,10 @@ protocol imap { +@@ -444,10 +443,10 @@ protocol imap { protocol pop3 { # Login executable location. @@ -102,7 +102,16 @@ $OpenBSD: patch-dovecot-example_conf,v 1.10 2005/09/04 18:22:30 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 -@@ -506,7 +505,7 @@ protocol pop3 { +@@ -484,7 +483,7 @@ protocol pop3 { + # installations. %08Xu%08Xv will be the new default, so use it for new + # installations. + # +- #pop3_uidl_format = ++ pop3_uidl_format = %08Xv%08Xu + + # POP3 logout format string: + # %t - number of TOP commands +@@ -515,7 +514,7 @@ protocol pop3 { ## # Executable location @@ -111,16 +120,16 @@ $OpenBSD: patch-dovecot-example_conf,v 1.10 2005/09/04 18:22:30 brad Exp $ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -573,7 +572,7 @@ auth default { +@@ -596,7 +595,7 @@ auth default { # Note that PAM can only be used to verify if user's password is correct, # so it can't be used as userdb. If you don't want to use a separate user # database (passwd usually), you can use static userdb. - passdb pam { + #passdb pam { - # [-session] [] + # [-session] [cache_key=] [] # # -session makes Dovecot open and immediately close PAM session. Some -@@ -582,13 +581,13 @@ auth default { +@@ -616,13 +615,13 @@ auth default { # If service name is "*", it means the authenticating service name # is used, eg. pop3 or imap. #args = dovecot