diff options
Diffstat (limited to 'mail/dovecot/patches/patch-ab')
| -rw-r--r-- | mail/dovecot/patches/patch-ab | 49 |
1 files changed, 18 insertions, 31 deletions
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab index b3f94693506..2c41d23cc01 100644 --- a/mail/dovecot/patches/patch-ab +++ b/mail/dovecot/patches/patch-ab @@ -1,20 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2004/08/01 05:17:19 schmonz Exp $ +$NetBSD: patch-ab,v 1.7 2005/01/08 19:58:16 schmonz Exp $ ---- dovecot-example.conf.orig 2004-07-13 06:56:55.000000000 -0400 +--- dovecot-example.conf.orig 2004-12-29 13:00:24.000000000 -0500 +++ dovecot-example.conf -@@ -1,17 +1,15 @@ - ## Dovecot 1.0 configuration file - - # Default values are shown after each value, it's not required to uncomment --# any of the lines. Exception to this are paths, they're just examples --# with real defaults being based on configure options. The paths listed here --# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --# --with-ssldir=/etc/ssl -+# any of the lines. Exception to this are paths, they're just examples with -+# real defaults being based on configure options. - - # Base directory where to store runtime data. - #base_dir = /var/run/dovecot/ +@@ -11,7 +11,7 @@ # Protocols we want to be serving: # imap imaps pop3 pop3s @@ -23,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2004/08/01 05:17:19 schmonz Exp $ # IP or host address where to listen in for connections. It's not currently # possible to specify multiple addresses. "*" listens in all IPv4 interfaces. -@@ -27,7 +25,7 @@ +@@ -27,7 +27,7 @@ #pop3s_listen = # Disable SSL/TLS support. @@ -32,39 +20,39 @@ $NetBSD: patch-ab,v 1.6 2004/08/01 05:17:19 schmonz 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 -@@ -82,7 +80,7 @@ +@@ -85,7 +85,7 @@ login = imap # Executable location. -#login_executable = /usr/libexec/dovecot/imap-login -+login_executable = @PREFIX@/libexec/dovecot/imap-login ++#login_executable = @PREFIX@/libexec/dovecot/imap-login # User to use for the login process. Create a completely new user for this, # and don't use it anywhere else. The user must also belong to a group where -@@ -127,7 +125,7 @@ login = imap +@@ -132,7 +132,7 @@ login = imap login = pop3 # Exception to above rule being the executable location. -#login_executable = /usr/libexec/dovecot/pop3-login -+login_executable = @PREFIX@/libexec/dovecot/pop3-login ++#login_executable = @PREFIX@/libexec/dovecot/pop3-login ## ## Mail processes -@@ -333,7 +331,7 @@ login = pop3 +@@ -338,7 +338,7 @@ login = pop3 ## # Executable location -#imap_executable = /usr/libexec/dovecot/imap -+imap_executable = @PREFIX@/libexec/dovecot/imap ++#imap_executable = @PREFIX@/libexec/dovecot/imap # Set max. process size in megabytes. Most of the memory goes to mmap()ing # files, so it shouldn't harm much even if this limit is set pretty high. -@@ -341,14 +339,14 @@ login = pop3 +@@ -346,14 +346,14 @@ login = pop3 # Support for dynamically loadable modules. #imap_use_modules = no -#imap_modules = /usr/lib/dovecot/imap -+imap_modules = @PREFIX@/lib/dovecot/imap ++#imap_modules = @PREFIX@/lib/dovecot/imap ## ## POP3 process @@ -72,29 +60,28 @@ $NetBSD: patch-ab,v 1.6 2004/08/01 05:17:19 schmonz Exp $ # Executable location -#pop3_executable = /usr/libexec/dovecot/pop3 -+pop3_executable = @PREFIX@/libexec/dovecot/pop3 ++#pop3_executable = @PREFIX@/libexec/dovecot/pop3 # Set max. process size in megabytes. Most of the memory goes to mmap()ing # files, so it shouldn't harm much even if this limit is set pretty high. -@@ -356,7 +354,7 @@ login = pop3 +@@ -361,7 +361,7 @@ login = pop3 # Support for dynamically loadable modules. #pop3_use_modules = no -#pop3_modules = /usr/lib/dovecot/pop3 -+pop3_modules = @PREFIX@/lib/dovecot/pop3 ++#pop3_modules = @PREFIX@/lib/dovecot/pop3 ## ## Authentication processes -@@ -406,9 +404,10 @@ auth_userdb = passwd +@@ -438,9 +438,9 @@ auth_userdb = passwd # vpopmail: vpopmail authentication # ldap <config path>: LDAP, see doc/dovecot-ldap.conf # pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf --auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf -+#auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf +-auth_passdb = pam +auth_passdb = passwd -#auth_executable = /usr/libexec/dovecot/dovecot-auth -+auth_executable = @PREFIX@/libexec/dovecot/dovecot-auth ++#auth_executable = @PREFIX@/libexec/dovecot/dovecot-auth # Set max. process size in megabytes. #auth_process_size = 256 |