summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/dovecot/Makefile4
-rw-r--r--mail/dovecot/distinfo10
-rw-r--r--mail/dovecot/patches/patch-ab28
3 files changed, 21 insertions, 21 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index a987284fab7..ebde86cd13f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2006/11/05 15:45:09 ghen Exp $
+# $NetBSD: Makefile,v 1.73 2006/11/08 14:40:20 ghen Exp $
-DISTNAME= dovecot-1.0.rc12
+DISTNAME= dovecot-1.0.rc13
PKGNAME= ${DISTNAME:S/.rc/rc/}
CATEGORIES= mail
MASTER_SITES= http://www.dovecot.org/releases/
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 9a5f487387b..f3cb4193719 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2006/11/05 15:45:09 ghen Exp $
+$NetBSD: distinfo,v 1.46 2006/11/08 14:40:20 ghen Exp $
-SHA1 (dovecot-1.0.rc12.tar.gz) = a537064551f48987729bb6707db8505aa4d84978
-RMD160 (dovecot-1.0.rc12.tar.gz) = 8b34078472b38164bfc26c675740076a43ba7af1
-Size (dovecot-1.0.rc12.tar.gz) = 1457955 bytes
+SHA1 (dovecot-1.0.rc13.tar.gz) = 2264979e131ffbec2767b4d77ca8ceee12300f46
+RMD160 (dovecot-1.0.rc13.tar.gz) = 89bf059c4922ba744e29b3a077cd33b67354cd22
+Size (dovecot-1.0.rc13.tar.gz) = 1459922 bytes
SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = 6b6b1dcc9201eca1cedbea5daf6071403e04f14d
+SHA1 (patch-ab) = 7a6441459bcf6d291d9fef7d99f46e825283f673
SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index b9f119e8d74..dfe615fea2a 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen Exp $
+$NetBSD: patch-ab,v 1.18 2006/11/08 14:40:20 ghen Exp $
---- dovecot-example.conf.orig 2006-10-16 00:12:31.000000000 +0200
+--- dovecot-example.conf.orig 2006-11-05 18:14:37.000000000 +0100
+++ dovecot-example.conf
@@ -7,17 +7,14 @@
# value inside quotes, eg.: key = "# char and trailing whitespace "
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen Exp $
# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
# dropping root privileges, so keep the key file unreadable by anyone but
-@@ -470,19 +467,19 @@
+@@ -480,19 +477,19 @@
protocol imap {
# Login executable location.
@@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen 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 +489,7 @@ protocol imap {
+@@ -502,7 +499,7 @@ protocol imap {
# Support for dynamically loadable plugins. mail_plugins is a space separated
# list of plugins to load.
#mail_plugins =
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen 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.
-@@ -532,11 +529,11 @@ protocol imap {
+@@ -545,11 +542,11 @@ protocol imap {
protocol pop3 {
# Login executable location.
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen 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 +592,7 @@ protocol pop3 {
+@@ -608,7 +605,7 @@ protocol pop3 {
# Support for dynamically loadable plugins. mail_plugins is a space separated
# list of plugins to load.
#mail_plugins =
@@ -87,7 +87,7 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen Exp $
# Workarounds for various client bugs:
# outlook-no-nuls:
-@@ -623,10 +620,10 @@ protocol lda {
+@@ -636,10 +633,10 @@ protocol lda {
# Support for dynamically loadable plugins. mail_plugins is a space separated
# list of plugins to load.
#mail_plugins =
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen Exp $
# UNIX socket path to master authentication server to find users.
#auth_socket_path = /var/run/dovecot/auth-master
-@@ -637,7 +634,7 @@ protocol lda {
+@@ -650,7 +647,7 @@ protocol lda {
##
# Executable location
@@ -109,16 +109,16 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen Exp $
# Set max. process size in megabytes.
#auth_process_size = 256
-@@ -751,7 +748,7 @@ auth default {
- # database (passwd usually), you can use static userdb.
+@@ -765,7 +762,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
- passdb pam {
+ #passdb pam {
# [session=yes] [setcred=yes] [cache_key=<key>] [<service name>]
#
# session=yes makes Dovecot open and immediately close PAM session. Some
-@@ -779,14 +776,14 @@ auth default {
+@@ -793,14 +790,14 @@ auth default {
# args = session=yes *
# args = cache_key=%u dovecot
#args = dovecot
@@ -127,12 +127,12 @@ $NetBSD: patch-ab,v 1.17 2006/10/16 06:55:47 ghen Exp $
# /etc/passwd or similar, using getpwnam()
# In many systems nowadays this uses Name Service Switch, which is
- # configured in /etc/nsswitch.conf. WARNING: nss_ldap is known to be broken
- # with Dovecot. Don't use it, or users might log in as each others!
+ # configured in /etc/nsswitch.conf.
+ # http://wiki.dovecot.org/AuthDatabase/Passwd
- #passdb passwd {
- #}
+ passdb passwd {
+ }
# /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
- #passdb shadow {
+ # http://wiki.dovecot.org/PasswordDatabase/Shadow