diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/dovecot/Makefile | 7 | ||||
| -rw-r--r-- | mail/dovecot/PLIST | 10 | ||||
| -rw-r--r-- | mail/dovecot/distinfo | 11 | ||||
| -rw-r--r-- | mail/dovecot/patches/patch-ab | 24 | ||||
| -rw-r--r-- | mail/dovecot/patches/patch-ac | 15 |
5 files changed, 41 insertions, 26 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 0f8792a10ef..5d8de5eee1c 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.89 2007/03/14 14:14:52 ghen Exp $ +# $NetBSD: Makefile,v 1.90 2007/03/24 14:39:40 ghen Exp $ -DISTNAME= dovecot-1.0.rc27 +DISTNAME= dovecot-1.0.rc28 PKGNAME= ${DISTNAME:S/.rc/rc/} CATEGORIES= mail MASTER_SITES= http://www.dovecot.org/releases/ @@ -50,8 +50,7 @@ post-build: > ${WRKDIR}/mkcert.sh post-install: - ${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf \ - ${DESTDIR}${EGDIR}/dovecot.conf.default + ${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${DESTDIR}${EGDIR} ${INSTALL_SCRIPT} ${WRKDIR}/mkcert.sh ${DESTDIR}${EGDIR} diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST index 946f00e25a3..b05cc3513a7 100644 --- a/mail/dovecot/PLIST +++ b/mail/dovecot/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2007/02/21 09:53:05 ghen Exp $ +@comment $NetBSD: PLIST,v 1.15 2007/03/24 14:39:43 ghen Exp $ lib/dovecot/imap/lib01_acl_plugin.so lib/dovecot/imap/lib02_lazy_expunge_plugin.so lib/dovecot/imap/lib10_quota_plugin.so @@ -27,8 +27,10 @@ libexec/dovecot/deliver libexec/dovecot/dict libexec/dovecot/dovecot-auth libexec/dovecot/gdbhelper +libexec/dovecot/idxview libexec/dovecot/imap libexec/dovecot/imap-login +libexec/dovecot/logview libexec/dovecot/pop3 libexec/dovecot/pop3-login libexec/dovecot/rawlog @@ -39,10 +41,10 @@ share/doc/dovecot/USE-WIKI-INSTEAD share/doc/dovecot/auth-protocol.txt share/doc/dovecot/securecoding.txt share/doc/dovecot/variables.txt -share/examples/dovecot/dovecot-ldap.conf +share/examples/dovecot/dovecot-example.conf +share/examples/dovecot/dovecot-ldap-example.conf share/examples/dovecot/dovecot-openssl.cnf -share/examples/dovecot/dovecot-sql.conf -share/examples/dovecot/dovecot.conf.default +share/examples/dovecot/dovecot-sql-example.conf share/examples/dovecot/mkcert.sh share/examples/rc.d/dovecot @dirrm share/examples/dovecot diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index 96fac16c54f..b936b5cb8f4 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.61 2007/03/14 14:14:52 ghen Exp $ +$NetBSD: distinfo,v 1.62 2007/03/24 14:39:43 ghen Exp $ -SHA1 (dovecot-1.0.rc27.tar.gz) = 7f026bd63234ae39658bde87a547b8c5001d892c -RMD160 (dovecot-1.0.rc27.tar.gz) = b13d0ac5c6760d7646d0c5924943be0d7ce0e480 -Size (dovecot-1.0.rc27.tar.gz) = 1521452 bytes +SHA1 (dovecot-1.0.rc28.tar.gz) = bf7f98298905f53700b3f2abde8c60f9aa6ba035 +RMD160 (dovecot-1.0.rc28.tar.gz) = 7ea445c844d382115eb4fad651ff00d51dc58e9e +Size (dovecot-1.0.rc28.tar.gz) = 1534090 bytes SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354 -SHA1 (patch-ab) = d67be516e7b5071550b6e762841b235dda1fa324 +SHA1 (patch-ab) = fa56aebfba75bbba1fb6ce6c36222ce5f21e321d +SHA1 (patch-ac) = 270dfe0c49ee20c63226dbaf6e2dbbe0fa949022 SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab index 0888b88a433..b79a9300a5a 100644 --- a/mail/dovecot/patches/patch-ab +++ b/mail/dovecot/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 ghen Exp $ +$NetBSD: patch-ab,v 1.20 2007/03/24 14:39:44 ghen Exp $ ---- dovecot-example.conf.orig 2007-02-19 21:17:46.000000000 +0100 +--- dovecot-example.conf.orig 2007-03-23 01:00:54.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.19 2007/02/21 09:53:05 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 -@@ -487,19 +484,19 @@ +@@ -497,19 +494,19 @@ protocol imap { # Login executable location. @@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 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 -@@ -509,7 +506,7 @@ protocol imap { +@@ -519,7 +516,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.19 2007/02/21 09:53:05 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. -@@ -552,11 +549,11 @@ protocol imap { +@@ -562,11 +559,11 @@ protocol imap { protocol pop3 { # Login executable location. @@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 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 -@@ -616,7 +613,7 @@ protocol pop3 { +@@ -626,7 +623,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.19 2007/02/21 09:53:05 ghen Exp $ # Workarounds for various client bugs: # outlook-no-nuls: -@@ -644,10 +641,10 @@ protocol lda { +@@ -654,10 +651,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.19 2007/02/21 09:53:05 ghen Exp $ # UNIX socket path to master authentication server to find users. #auth_socket_path = /var/run/dovecot/auth-master -@@ -658,7 +655,7 @@ protocol lda { +@@ -668,7 +665,7 @@ protocol lda { ## # Executable location @@ -109,7 +109,7 @@ $NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 ghen Exp $ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -772,7 +769,7 @@ auth default { +@@ -782,7 +779,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 @@ -118,7 +118,7 @@ $NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 ghen Exp $ # [blocking=yes] [session=yes] [setcred=yes] # [cache_key=<key>] [<service name>] # -@@ -805,18 +802,18 @@ auth default { +@@ -815,16 +812,16 @@ auth default { # args = session=yes * # args = cache_key=%u dovecot #args = dovecot @@ -131,9 +131,7 @@ $NetBSD: patch-ab,v 1.19 2007/02/21 09:53:05 ghen Exp $ # http://wiki.dovecot.org/AuthDatabase/Passwd - #passdb passwd { + passdb passwd { - # [blocking=yes] - By default the lookups are done in the main dovecot-auth - # process. This setting causes the lookups to be done in auth worker - # proceses. Useful with remote NSS lookups that may block. + # [blocking=yes] - See userdb passwd for explanation #args = - #} + } diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac new file mode 100644 index 00000000000..a7d83705ce8 --- /dev/null +++ b/mail/dovecot/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.5 2007/03/24 14:39:45 ghen Exp $ + +--- doc/Makefile.in.orig 2007-03-23 21:40:01.000000000 +0100 ++++ doc/Makefile.in +@@ -180,9 +180,7 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + confdir = $(sysconfdir) +-conf_DATA = \ +- dovecot-ldap-example.conf \ +- dovecot-sql-example.conf ++conf_DATA = + + doc_DATA = \ + USE-WIKI-INSTEAD \ |