Sun Feb 1 22:53:10 2009 UTC ()
Pullup ticket #2675 - requested by ghen
dovecot: bug fixes

Revisions pulled up:
- mail/dovecot/Makefile				1.125-1.127
- mail/dovecot/PLIST				1.23
- mail/dovecot/distinfo				1.90-1.92
- mail/dovecot/patches/patch-ab			1.24-1.25
- mail/dovecot/patches/patch-ac			1.10
---
Module Name:	pkgsrc
Committed By:	abs
Date:		Thu Jan  8 00:02:44 UTC 2009

Modified Files:
	pkgsrc/mail/dovecot: Makefile PLIST distinfo
	pkgsrc/mail/dovecot/patches: patch-ab patch-ac

Log Message:
Updated mail/dovecot to 1.1.8

Most importantly mbox bugfixes. v1.1 should finally be as stable with
mboxes as it was with v1.0. Hopefully we'll also soon have the first
v1.2 beta release and the final v1.2.0 somewhat soon after that.

	- mbox: Several bugfixes. Fixes "next message unexpectedly lost"
          errors and perhaps some other problems as well.
	- deliver: It wasn't possible to override boolean settings in
	  lda section by setting them to "no".
	- Maildir++ quota didn't correctly check if maildirs had changed
	  during recalculation.
	- kqueue notify: Fixed assert-crash in some situations
	- dbox: Several fixes to handling Maildir migrations
	- Logging/error message improvements
---
Module Name:	pkgsrc
Committed By:	ghen
Date:		Sat Jan 24 10:51:35 UTC 2009

Modified Files:
	pkgsrc/mail/dovecot: Makefile distinfo
	pkgsrc/mail/dovecot/patches: patch-ab

Log Message:
Update to Dovecot 1.1.9.  From the release announcement mail:

Lots of small dbox fixes, hopefully migrations from Maildir are now working
correctly.

+ Sending SIGUSR2 to dovecot-auth now also logs statistics about cache inserts.
  This could help figuring out auth cache size.
+ deliver: Added rejection_subject setting, which is used for rejected mails.
+ pop3: Prevent clients from looping forever trying to fetch an expunged
  message.
+ If login process crashes, log the IP address that (maybe) caused it.
+ If core dump limit is 0, add "core dumps disabled" to startup log line.
+ Log better messages for "Permission denied" errors
- mbox: Fixed assert-crash with pop3_lock_session=3Dyes
- dbox: Fixes to handling maildir-converted files.
- Auth cache wasn't working correctly for all fields (e.g. allow_nets) with
  blocking passdbs (e.g. mysql).
- pgsql: Handle reconnecting to server without failing auth lookups.
- Berkeley DB memory/resource leak fixes.
- maildir: Fixes to handling over 26 keywords.
---
Module Name:	pkgsrc
Committed By:	ghen
Date:		Tue Jan 27 08:29:31 UTC 2009

Modified Files:
	pkgsrc/mail/dovecot: Makefile distinfo

Log Message:
Update to Dovecot 1.1.10.

- Maildir: Keyword handling was somewhat broken in v1.1.9
- userdb prefetch was broken with blocking passdbs in v1.1.9
- dict process didn't always die with the rest of Dovecot
- dict quota was somewhat broken with pgsql


(tron)
diff -r1.124 -r1.124.2.1 pkgsrc/mail/dovecot/Makefile
diff -r1.22 -r1.22.2.1 pkgsrc/mail/dovecot/PLIST
diff -r1.89 -r1.89.2.1 pkgsrc/mail/dovecot/distinfo
diff -r1.23 -r1.23.10.1 pkgsrc/mail/dovecot/patches/patch-ab
diff -r1.9 -r1.9.6.1 pkgsrc/mail/dovecot/patches/patch-ac
cvs diff -r1.124 -r1.124.2.1 pkgsrc/mail/dovecot/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/Attic/Makefile 2008/11/24 09:54:29 1.124
+++ pkgsrc/mail/dovecot/Attic/Makefile 2009/02/01 22:53:09 1.124.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.124 2008/11/24 09:54:29 ghen Exp $ 1# $NetBSD: Makefile,v 1.124.2.1 2009/02/01 22:53:09 tron Exp $
2 2
3DISTNAME= dovecot-1.1.7 3DISTNAME= dovecot-1.1.10
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= http://www.dovecot.org/releases/1.1/ 5MASTER_SITES= http://www.dovecot.org/releases/1.1/
6 6
7MAINTAINER= ghen@NetBSD.org 7MAINTAINER= ghen@NetBSD.org
8HOMEPAGE= http://www.dovecot.org/ 8HOMEPAGE= http://www.dovecot.org/
9COMMENT= Secure IMAP and POP3 server 9COMMENT= Secure IMAP and POP3 server
10 10
11PKG_INSTALLATION_TYPES= overwrite pkgviews 11PKG_INSTALLATION_TYPES= overwrite pkgviews
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
cvs diff -r1.22 -r1.22.2.1 pkgsrc/mail/dovecot/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/Attic/PLIST 2008/10/22 21:16:36 1.22
+++ pkgsrc/mail/dovecot/Attic/PLIST 2009/02/01 22:53:09 1.22.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.22 2008/10/22 21:16:36 ghen Exp $ 1@comment $NetBSD: PLIST,v 1.22.2.1 2009/02/01 22:53:09 tron Exp $
2include/dovecot/config.h 2include/dovecot/config.h
3include/dovecot/src/auth/auth-cache.h 3include/dovecot/src/auth/auth-cache.h
4include/dovecot/src/auth/auth-client-connection.h 4include/dovecot/src/auth/auth-client-connection.h
5include/dovecot/src/auth/auth-client-interface.h 5include/dovecot/src/auth/auth-client-interface.h
6include/dovecot/src/auth/auth-master-connection.h 6include/dovecot/src/auth/auth-master-connection.h
7include/dovecot/src/auth/auth-master-interface.h 7include/dovecot/src/auth/auth-master-interface.h
8include/dovecot/src/auth/auth-master-listener.h 8include/dovecot/src/auth/auth-master-listener.h
9include/dovecot/src/auth/auth-request-handler.h 9include/dovecot/src/auth/auth-request-handler.h
10include/dovecot/src/auth/auth-request.h 10include/dovecot/src/auth/auth-request.h
11include/dovecot/src/auth/auth-stream.h 11include/dovecot/src/auth/auth-stream.h
12include/dovecot/src/auth/auth-worker-client.h 12include/dovecot/src/auth/auth-worker-client.h
13include/dovecot/src/auth/auth-worker-server.h 13include/dovecot/src/auth/auth-worker-server.h
14include/dovecot/src/auth/auth.h 14include/dovecot/src/auth/auth.h
@@ -276,26 +276,27 @@ libexec/dovecot/listview @@ -276,26 +276,27 @@ libexec/dovecot/listview
276libexec/dovecot/logview 276libexec/dovecot/logview
277libexec/dovecot/maildirlock 277libexec/dovecot/maildirlock
278libexec/dovecot/pop3 278libexec/dovecot/pop3
279libexec/dovecot/pop3-login 279libexec/dovecot/pop3-login
280libexec/dovecot/rawlog 280libexec/dovecot/rawlog
281libexec/dovecot/ssl-build-param 281libexec/dovecot/ssl-build-param
282sbin/dovecot 282sbin/dovecot
283sbin/dovecotpw 283sbin/dovecotpw
284share/doc/dovecot/auth-protocol.txt 284share/doc/dovecot/auth-protocol.txt
285share/doc/dovecot/documentation.txt 285share/doc/dovecot/documentation.txt
286share/doc/dovecot/securecoding.txt 286share/doc/dovecot/securecoding.txt
287share/doc/dovecot/wiki/ACL.txt 287share/doc/dovecot/wiki/ACL.txt
288share/doc/dovecot/wiki/AixPluginsSupport.txt 288share/doc/dovecot/wiki/AixPluginsSupport.txt
 289share/doc/dovecot/wiki/AuthDatabase.CheckPassword.txt
289share/doc/dovecot/wiki/AuthDatabase.LDAP.txt 290share/doc/dovecot/wiki/AuthDatabase.LDAP.txt
290share/doc/dovecot/wiki/AuthDatabase.Passwd.txt 291share/doc/dovecot/wiki/AuthDatabase.Passwd.txt
291share/doc/dovecot/wiki/AuthDatabase.PasswdFile.txt 292share/doc/dovecot/wiki/AuthDatabase.PasswdFile.txt
292share/doc/dovecot/wiki/AuthDatabase.SQL.txt 293share/doc/dovecot/wiki/AuthDatabase.SQL.txt
293share/doc/dovecot/wiki/AuthDatabase.VPopMail.txt 294share/doc/dovecot/wiki/AuthDatabase.VPopMail.txt
294share/doc/dovecot/wiki/AuthDatabase.txt 295share/doc/dovecot/wiki/AuthDatabase.txt
295share/doc/dovecot/wiki/Authentication.Caching.txt 296share/doc/dovecot/wiki/Authentication.Caching.txt
296share/doc/dovecot/wiki/Authentication.Kerberos.txt 297share/doc/dovecot/wiki/Authentication.Kerberos.txt
297share/doc/dovecot/wiki/Authentication.MasterUsers.txt 298share/doc/dovecot/wiki/Authentication.MasterUsers.txt
298share/doc/dovecot/wiki/Authentication.Mechanisms.DigestMD5.txt 299share/doc/dovecot/wiki/Authentication.Mechanisms.DigestMD5.txt
299share/doc/dovecot/wiki/Authentication.Mechanisms.NTLM.txt 300share/doc/dovecot/wiki/Authentication.Mechanisms.NTLM.txt
300share/doc/dovecot/wiki/Authentication.Mechanisms.Winbind.txt 301share/doc/dovecot/wiki/Authentication.Mechanisms.Winbind.txt
301share/doc/dovecot/wiki/Authentication.Mechanisms.txt 302share/doc/dovecot/wiki/Authentication.Mechanisms.txt
@@ -366,68 +367,75 @@ share/doc/dovecot/wiki/Migration.Courier @@ -366,68 +367,75 @@ share/doc/dovecot/wiki/Migration.Courier
366share/doc/dovecot/wiki/Migration.Cyrus.txt 367share/doc/dovecot/wiki/Migration.Cyrus.txt
367share/doc/dovecot/wiki/Migration.Linuxconf.txt 368share/doc/dovecot/wiki/Migration.Linuxconf.txt
368share/doc/dovecot/wiki/Migration.MailFormat.txt 369share/doc/dovecot/wiki/Migration.MailFormat.txt
369share/doc/dovecot/wiki/Migration.Teapop.txt 370share/doc/dovecot/wiki/Migration.Teapop.txt
370share/doc/dovecot/wiki/Migration.UW.txt 371share/doc/dovecot/wiki/Migration.UW.txt
371share/doc/dovecot/wiki/Migration.Vm-pop3d.txt 372share/doc/dovecot/wiki/Migration.Vm-pop3d.txt
372share/doc/dovecot/wiki/Migration.txt 373share/doc/dovecot/wiki/Migration.txt
373share/doc/dovecot/wiki/MissingMailboxes.txt 374share/doc/dovecot/wiki/MissingMailboxes.txt
374share/doc/dovecot/wiki/NFS.txt 375share/doc/dovecot/wiki/NFS.txt
375share/doc/dovecot/wiki/Namespaces.txt 376share/doc/dovecot/wiki/Namespaces.txt
376share/doc/dovecot/wiki/OSCompatibility.txt 377share/doc/dovecot/wiki/OSCompatibility.txt
377share/doc/dovecot/wiki/POP3Server.txt 378share/doc/dovecot/wiki/POP3Server.txt
378share/doc/dovecot/wiki/PasswordDatabase.BSDAuth.txt 379share/doc/dovecot/wiki/PasswordDatabase.BSDAuth.txt
379share/doc/dovecot/wiki/PasswordDatabase.CheckPassword.txt 
380share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.AllowNets.txt 380share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.AllowNets.txt
381share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Host.txt 381share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Host.txt
382share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoDelay.txt 382share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoDelay.txt
383share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoLogin.txt 383share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoLogin.txt
384share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Proxy.txt 384share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Proxy.txt
385share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.User.txt 385share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.User.txt
386share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.txt 386share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.txt
387share/doc/dovecot/wiki/PasswordDatabase.PAM.txt 387share/doc/dovecot/wiki/PasswordDatabase.PAM.txt
388share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt 388share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
389share/doc/dovecot/wiki/PasswordDatabase.txt 389share/doc/dovecot/wiki/PasswordDatabase.txt
390share/doc/dovecot/wiki/PerformanceTuning.txt 390share/doc/dovecot/wiki/PerformanceTuning.txt
 391share/doc/dovecot/wiki/Plugins.Autocreate.txt
391share/doc/dovecot/wiki/Plugins.Convert.txt 392share/doc/dovecot/wiki/Plugins.Convert.txt
392share/doc/dovecot/wiki/Plugins.Expire.txt 393share/doc/dovecot/wiki/Plugins.Expire.txt
 394share/doc/dovecot/wiki/Plugins.FTS.Lucene.txt
 395share/doc/dovecot/wiki/Plugins.FTS.Solr.txt
 396share/doc/dovecot/wiki/Plugins.FTS.Squat.txt
393share/doc/dovecot/wiki/Plugins.FTS.txt 397share/doc/dovecot/wiki/Plugins.FTS.txt
394share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt 398share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
 399share/doc/dovecot/wiki/Plugins.Listescape.txt
395share/doc/dovecot/wiki/Plugins.MailLog.txt 400share/doc/dovecot/wiki/Plugins.MailLog.txt
 401share/doc/dovecot/wiki/Plugins.MboxSnarf.txt
396share/doc/dovecot/wiki/Plugins.Trash.txt 402share/doc/dovecot/wiki/Plugins.Trash.txt
 403share/doc/dovecot/wiki/Plugins.Virtual.txt
 404share/doc/dovecot/wiki/Plugins.Zlib.txt
397share/doc/dovecot/wiki/Plugins.txt 405share/doc/dovecot/wiki/Plugins.txt
398share/doc/dovecot/wiki/PostLoginScripting.txt 406share/doc/dovecot/wiki/PostLoginScripting.txt
399share/doc/dovecot/wiki/QuickConfiguration.txt 407share/doc/dovecot/wiki/QuickConfiguration.txt
400share/doc/dovecot/wiki/Quota.1.1.txt 408share/doc/dovecot/wiki/Quota.1.1.txt
401share/doc/dovecot/wiki/Quota.Dict.txt 409share/doc/dovecot/wiki/Quota.Dict.txt
402share/doc/dovecot/wiki/Quota.Dirsize.txt 410share/doc/dovecot/wiki/Quota.Dirsize.txt
403share/doc/dovecot/wiki/Quota.FS.txt 411share/doc/dovecot/wiki/Quota.FS.txt
404share/doc/dovecot/wiki/Quota.Maildir.txt 412share/doc/dovecot/wiki/Quota.Maildir.txt
405share/doc/dovecot/wiki/Quota.txt 413share/doc/dovecot/wiki/Quota.txt
406share/doc/dovecot/wiki/RunningDovecot.txt 414share/doc/dovecot/wiki/RunningDovecot.txt
407share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt 415share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
408share/doc/dovecot/wiki/SSL.CertificateCreation.txt 416share/doc/dovecot/wiki/SSL.CertificateCreation.txt
409share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt 417share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt
410share/doc/dovecot/wiki/SSL.txt 418share/doc/dovecot/wiki/SSL.txt
411share/doc/dovecot/wiki/Sasl.txt 419share/doc/dovecot/wiki/Sasl.txt
412share/doc/dovecot/wiki/SecurityTuning.txt 420share/doc/dovecot/wiki/SecurityTuning.txt
413share/doc/dovecot/wiki/SharedMailboxes.txt 421share/doc/dovecot/wiki/SharedMailboxes.txt
414share/doc/dovecot/wiki/ShellEasyConf.txt 
415share/doc/dovecot/wiki/SystemUsers.txt 422share/doc/dovecot/wiki/SystemUsers.txt
416share/doc/dovecot/wiki/TestInstallation.txt 423share/doc/dovecot/wiki/TestInstallation.txt
417share/doc/dovecot/wiki/TestPop3Installation.txt 424share/doc/dovecot/wiki/TestPop3Installation.txt
418share/doc/dovecot/wiki/TimeMovedBackwards.txt 425share/doc/dovecot/wiki/TimeMovedBackwards.txt
419share/doc/dovecot/wiki/Upgrading.1.0.txt 426share/doc/dovecot/wiki/Upgrading.1.0.txt
420share/doc/dovecot/wiki/Upgrading.1.1.txt 427share/doc/dovecot/wiki/Upgrading.1.1.txt
 428share/doc/dovecot/wiki/Upgrading.1.2.txt
421share/doc/dovecot/wiki/Upgrading.txt 429share/doc/dovecot/wiki/Upgrading.txt
422share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt 430share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
423share/doc/dovecot/wiki/UserDatabase.NSS.txt 431share/doc/dovecot/wiki/UserDatabase.NSS.txt
424share/doc/dovecot/wiki/UserDatabase.Prefetch.txt 432share/doc/dovecot/wiki/UserDatabase.Prefetch.txt
425share/doc/dovecot/wiki/UserDatabase.Static.txt 433share/doc/dovecot/wiki/UserDatabase.Static.txt
426share/doc/dovecot/wiki/UserDatabase.txt 434share/doc/dovecot/wiki/UserDatabase.txt
427share/doc/dovecot/wiki/UserIds.txt 435share/doc/dovecot/wiki/UserIds.txt
428share/doc/dovecot/wiki/Variables.txt 436share/doc/dovecot/wiki/Variables.txt
429share/doc/dovecot/wiki/VirtualUsers.txt 437share/doc/dovecot/wiki/VirtualUsers.txt
430share/doc/dovecot/wiki/WhyDoesItNotWork.txt 438share/doc/dovecot/wiki/WhyDoesItNotWork.txt
431share/doc/dovecot/wiki/maildrop.txt 439share/doc/dovecot/wiki/maildrop.txt
432share/doc/dovecot/wiki/mutt.txt 440share/doc/dovecot/wiki/mutt.txt
433share/doc/dovecot/wiki/uw2dovecot.sh.txt 441share/doc/dovecot/wiki/uw2dovecot.sh.txt
cvs diff -r1.89 -r1.89.2.1 pkgsrc/mail/dovecot/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/Attic/distinfo 2008/11/24 09:54:29 1.89
+++ pkgsrc/mail/dovecot/Attic/distinfo 2009/02/01 22:53:09 1.89.2.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.89 2008/11/24 09:54:29 ghen Exp $ 1$NetBSD: distinfo,v 1.89.2.1 2009/02/01 22:53:09 tron Exp $
2 2
3SHA1 (dovecot-1.1.7.tar.gz) = d8554a1e1f04a84ddf009d1599526c016b36582b 3SHA1 (dovecot-1.1.10.tar.gz) = 7b509975e52473e86c4fdf13bd6f464144837f02
4RMD160 (dovecot-1.1.7.tar.gz) = e2a53de356910094f2516b33f4155ded4cf5a6dc 4RMD160 (dovecot-1.1.10.tar.gz) = b5cbd15d03407cad78846e59c4ca22a3713d21af
5Size (dovecot-1.1.7.tar.gz) = 2325617 bytes 5Size (dovecot-1.1.10.tar.gz) = 2360885 bytes
6SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354 6SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
7SHA1 (patch-ab) = e298616fa4b88da4f0748b025deeedd36b5a49dd 7SHA1 (patch-ab) = 8cdfefa1e8112334f734afc9b68fac1463637c94
8SHA1 (patch-ac) = 6fe2f73109ff611040b816d14cd587212c319f32 8SHA1 (patch-ac) = bf4c21c0e08832926944ad43c8678ef505e92dd6
9SHA1 (patch-ag) = c9989f71bdfd9ae22883450b85fc55a215594df1 9SHA1 (patch-ag) = c9989f71bdfd9ae22883450b85fc55a215594df1
cvs diff -r1.23 -r1.23.10.1 pkgsrc/mail/dovecot/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/patches/Attic/patch-ab 2008/06/22 17:41:23 1.23
+++ pkgsrc/mail/dovecot/patches/Attic/patch-ab 2009/02/01 22:53:10 1.23.10.1
@@ -1,139 +1,139 @@ @@ -1,139 +1,139 @@
1$NetBSD: patch-ab,v 1.23 2008/06/22 17:41:23 ghen Exp $ 1$NetBSD: patch-ab,v 1.23.10.1 2009/02/01 22:53:10 tron Exp $
2 2
3--- dovecot-example.conf.orig 2007-12-09 19:14:26.000000000 +0100 3--- dovecot-example.conf.orig 2009-01-13 22:51:40.000000000 +0100
4+++ dovecot-example.conf 4+++ dovecot-example.conf
5@@ -10,17 +10,14 @@ 5@@ -10,17 +10,14 @@
6 # value inside quotes, eg.: key = "# char and trailing whitespace " 6 # value inside quotes, eg.: key = "# char and trailing whitespace "
7  7
8 # Default values are shown for each setting, it's not required to uncomment 8 # Default values are shown for each setting, it's not required to uncomment
9-# any of the lines. Exception to this are paths, they're just examples with 9-# any of the lines. Exception to this are paths, they're just examples with
10-# the real defaults being based on configure options. The paths listed here 10-# the real defaults being based on configure options. The paths listed here
11-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var 11-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
12-# --with-ssldir=/etc/ssl 12-# --with-ssldir=/etc/ssl
13+# any of the lines.  13+# any of the lines.
14  14
15 # Base directory where to store runtime data. 15 # Base directory where to store runtime data.
16 #base_dir = /var/run/dovecot/ 16 #base_dir = /var/run/dovecot/
17  17
18 # Protocols we want to be serving: imap imaps pop3 pop3s 18 # Protocols we want to be serving: imap imaps pop3 pop3s
19 # If you only want to use dovecot-auth, you can set this to "none". 19 # If you only want to use dovecot-auth, you can set this to "none".
20-#protocols = imap imaps 20-#protocols = imap imaps
21+protocols = imap pop3 21+protocols = imap pop3
22  22
23 # A space separated list of IP or host addresses where to listen in for 23 # A space separated list of IP or host addresses where to listen in for
24 # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6 24 # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
25@@ -85,7 +82,7 @@ 25@@ -85,7 +82,7 @@
26 #ssl_listen = 26 #ssl_listen =
27  27
28 # Disable SSL/TLS support. 28 # Disable SSL/TLS support. <doc/wiki/SSL>
29-#ssl_disable = no 29-#ssl_disable = no
30+ssl_disable = yes 30+ssl_disable = yes
31  31
32 # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before 32 # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
33 # dropping root privileges, so keep the key file unreadable by anyone but 33 # dropping root privileges, so keep the key file unreadable by anyone but
34@@ -495,19 +492,19 @@ 34@@ -503,19 +500,19 @@
35  35
36 protocol imap { 36 protocol imap {
37 # Login executable location. 37 # Login executable location.
38- #login_executable = /usr/libexec/dovecot/imap-login 38- #login_executable = /usr/libexec/dovecot/imap-login
39+ #login_executable = @PREFIX@/libexec/dovecot/imap-login 39+ #login_executable = @PREFIX@/libexec/dovecot/imap-login
40  40
41 # IMAP executable location. Changing this allows you to execute other 41 # IMAP executable location. Changing this allows you to execute other
42 # binaries before the imap process is executed. 42 # binaries before the imap process is executed.
43 # 43 #
44 # This would write rawlogs into ~/dovecot.rawlog/ directory: 44 # This would write rawlogs into ~/dovecot.rawlog/ directory:
45- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap 45- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
46+ # mail_executable = @PREFIX@/libexec/dovecot/rawlog @PREFIX@/libexec/dovecot/imap 46+ # mail_executable = @PREFIX@/libexec/dovecot/rawlog @PREFIX@/libexec/dovecot/imap
47 # 47 #
48 # This would attach gdb into the imap process and write backtraces into 48 # This would attach gdb into the imap process and write backtraces into
49 # /tmp/gdbhelper.* files: 49 # /tmp/gdbhelper.* files:
50- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap 50- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
51+ # mail_executable = @PREFIX@/libexec/dovecot/gdbhelper @PREFIX@/libexec/dovecot/imap 51+ # mail_executable = @PREFIX@/libexec/dovecot/gdbhelper @PREFIX@/libexec/dovecot/imap
52 # 52 #
53- #mail_executable = /usr/libexec/dovecot/imap 53- #mail_executable = /usr/libexec/dovecot/imap
54+ #mail_executable = @PREFIX@/libexec/dovecot/imap 54+ #mail_executable = @PREFIX@/libexec/dovecot/imap
55  55
56 # Maximum IMAP command line length in bytes. Some clients generate very long 56 # Maximum IMAP command line length in bytes. Some clients generate very long
57 # command lines with huge mailboxes, so you may need to raise this if you get 57 # command lines with huge mailboxes, so you may need to raise this if you get
58@@ -521,7 +518,7 @@ protocol imap { 58@@ -529,7 +526,7 @@ protocol imap {
59 # Support for dynamically loadable plugins. mail_plugins is a space separated 59 # Support for dynamically loadable plugins. mail_plugins is a space separated
60 # list of plugins to load. 60 # list of plugins to load.
61 #mail_plugins =  61 #mail_plugins =
62- #mail_plugin_dir = /usr/lib/dovecot/imap 62- #mail_plugin_dir = /usr/lib/dovecot/imap
63+ #mail_plugin_dir = @PREFIX@/lib/dovecot/imap 63+ #mail_plugin_dir = @PREFIX@/lib/dovecot/imap
64  64
65 # Send IMAP capabilities in greeting message. This makes it unnecessary for 65 # Send IMAP capabilities in greeting message. This makes it unnecessary for
66 # clients to request it with CAPABILITY command, so it saves one round-trip. 66 # clients to request it with CAPABILITY command, so it saves one round-trip.
67@@ -564,11 +561,11 @@ protocol imap { 67@@ -572,11 +569,11 @@ protocol imap {
68  68
69 protocol pop3 { 69 protocol pop3 {
70 # Login executable location. 70 # Login executable location.
71- #login_executable = /usr/libexec/dovecot/pop3-login 71- #login_executable = /usr/libexec/dovecot/pop3-login
72+ #login_executable = @PREFIX@/libexec/dovecot/pop3-login 72+ #login_executable = @PREFIX@/libexec/dovecot/pop3-login
73  73
74 # POP3 executable location. See IMAP's mail_executable above for examples 74 # POP3 executable location. See IMAP's mail_executable above for examples
75 # how this could be changed. 75 # how this could be changed.
76- #mail_executable = /usr/libexec/dovecot/pop3 76- #mail_executable = /usr/libexec/dovecot/pop3
77+ #mail_executable = @PREFIX@/libexec/dovecot/pop3 77+ #mail_executable = @PREFIX@/libexec/dovecot/pop3
78  78
79 # Don't try to set mails non-recent or seen with POP3 sessions. This is 79 # Don't try to set mails non-recent or seen with POP3 sessions. This is
80 # mostly intended to reduce disk I/O. With maildir it doesn't move files 80 # mostly intended to reduce disk I/O. With maildir it doesn't move files
81@@ -628,7 +625,7 @@ protocol pop3 { 81@@ -636,7 +633,7 @@ protocol pop3 {
82 # Support for dynamically loadable plugins. mail_plugins is a space separated 82 # Support for dynamically loadable plugins. mail_plugins is a space separated
83 # list of plugins to load. 83 # list of plugins to load.
84 #mail_plugins =  84 #mail_plugins =
85- #mail_plugin_dir = /usr/lib/dovecot/pop3 85- #mail_plugin_dir = /usr/lib/dovecot/pop3
86+ #mail_plugin_dir = @PREFIX@/lib/dovecot/pop3 86+ #mail_plugin_dir = @PREFIX@/lib/dovecot/pop3
87  87
88 # Workarounds for various client bugs: 88 # Workarounds for various client bugs:
89 # outlook-no-nuls: 89 # outlook-no-nuls:
90@@ -656,7 +653,7 @@ protocol lda { 90@@ -664,7 +661,7 @@ protocol lda {
91 # Support for dynamically loadable plugins. mail_plugins is a space separated 91 # Support for dynamically loadable plugins. mail_plugins is a space separated
92 # list of plugins to load. 92 # list of plugins to load.
93 #mail_plugins =  93 #mail_plugins =
94- #mail_plugin_dir = /usr/lib/dovecot/lda 94- #mail_plugin_dir = /usr/lib/dovecot/lda
95+ #mail_plugin_dir = @PREFIX@/lib/dovecot/lda 95+ #mail_plugin_dir = @PREFIX@/lib/dovecot/lda
96  96
97 # If user is over quota, return with temporary failure instead of 97 # If user is over quota, return with temporary failure instead of
98 # bouncing the mail. 98 # bouncing the mail.
99@@ -670,7 +667,7 @@ protocol lda { 99@@ -678,7 +675,7 @@ protocol lda {
100 #deliver_log_format = msgid=%m: %$ 100 #deliver_log_format = msgid=%m: %$
101  101
102 # Binary to use for sending mails. 102 # Binary to use for sending mails.
103- #sendmail_path = /usr/lib/sendmail 103- #sendmail_path = /usr/lib/sendmail
104+ #sendmail_path = /usr/sbin/sendmail 104+ #sendmail_path = /usr/sbin/sendmail
105  105
106 # Human readable error message for rejection mails. Use can use variables: 106 # Subject: header to use for rejection mails. You can use the same variables
107 # %n = CRLF, %r = reason, %s = subject, %t = recipient 107 # as for rejection_reason below.
108@@ -685,7 +682,7 @@ protocol lda { 108@@ -697,7 +694,7 @@ protocol lda {
109 ## 109 ##
110  110
111 # Executable location 111 # Executable location
112-#auth_executable = /usr/libexec/dovecot/dovecot-auth 112-#auth_executable = /usr/libexec/dovecot/dovecot-auth
113+#auth_executable = @PREFIX@/libexec/dovecot/dovecot-auth 113+#auth_executable = @PREFIX@/libexec/dovecot/dovecot-auth
114  114
115 # Set max. process size in megabytes. 115 # Set max. process size in megabytes.
116 #auth_process_size = 256 116 #auth_process_size = 256
117@@ -815,7 +812,7 @@ auth default { 117@@ -830,7 +827,7 @@ auth default {
118 # database (passwd usually), you can use static userdb. 118 # database (passwd usually), you can use static userdb.
119 # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM 119 # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
120 # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt> 120 # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
121- passdb pam { 121- passdb pam {
122+ #passdb pam { 122+ #passdb pam {
123 # [session=yes] [setcred=yes] [failure_show_msg=yes] 123 # [session=yes] [setcred=yes] [failure_show_msg=yes]
124 # [cache_key=<key>] [<service name>] 124 # [cache_key=<key>] [<service name>]
125 # 125 #
126@@ -844,15 +841,15 @@ auth default { 126@@ -859,15 +856,15 @@ auth default {
127 # args = session=yes %Ls 127 # args = session=yes %Ls
128 # args = cache_key=%u dovecot 128 # args = cache_key=%u dovecot
129 #args = dovecot 129 #args = dovecot
130- } 130- }
131+ #} 131+ #}
132  132
133 # System users (NSS, /etc/passwd, or similiar) 133 # System users (NSS, /etc/passwd, or similiar)
134 # In many systems nowadays this uses Name Service Switch, which is 134 # In many systems nowadays this uses Name Service Switch, which is
135 # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt> 135 # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
136- #passdb passwd { 136- #passdb passwd {
137+ passdb passwd { 137+ passdb passwd {
138 # [blocking=yes] - See userdb passwd for explanation 138 # [blocking=yes] - See userdb passwd for explanation
139 #args =  139 #args =
cvs diff -r1.9 -r1.9.6.1 pkgsrc/mail/dovecot/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/dovecot/patches/Attic/patch-ac 2008/07/24 07:38:51 1.9
+++ pkgsrc/mail/dovecot/patches/Attic/patch-ac 2009/02/01 22:53:10 1.9.6.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ac,v 1.9 2008/07/24 07:38:51 ghen Exp $ 1$NetBSD: patch-ac,v 1.9.6.1 2009/02/01 22:53:10 tron Exp $
2 2
3--- doc/Makefile.in.orig 2008-07-20 23:59:55.000000000 +0200 3--- doc/Makefile.in.orig 2009-01-06 13:53:39.000000000 +0000
4+++ doc/Makefile.in 4+++ doc/Makefile.in
5@@ -212,10 +212,7 @@ top_builddir = @top_builddir@ 5@@ -217,10 +217,7 @@ top_builddir = @top_builddir@
6 top_srcdir = @top_srcdir@ 6 top_srcdir = @top_srcdir@
7 SUBDIRS = wiki 7 SUBDIRS = wiki
8 confdir = $(sysconfdir) 8 confdir = $(sysconfdir)
9-conf_DATA = \ 9-conf_DATA = \
10- dovecot-db-example.conf \ 10- dovecot-db-example.conf \
11- dovecot-ldap-example.conf \ 11- dovecot-ldap-example.conf \
12- dovecot-sql-example.conf 12- dovecot-sql-example.conf
13+conf_DATA = 13+conf_DATA =
14  14
15 doc_DATA = \ 15 doc_DATA = \
16 auth-protocol.txt \ 16 auth-protocol.txt \