diff options
author | ghen <ghen> | 2006-03-13 09:35:27 +0000 |
---|---|---|
committer | ghen <ghen> | 2006-03-13 09:35:27 +0000 |
commit | 6928c933e5e037bd1b39dc2f24a9996a55181043 (patch) | |
tree | d21106a7f9a83182656deafdf5d522caa30f4b8a /mail/dovecot | |
parent | 1d4d2dcd60953b9a03bfdea59eb500b3fb754736 (diff) | |
download | pkgsrc-6928c933e5e037bd1b39dc2f24a9996a55181043.tar.gz |
Revert tv's last commit: the paths in the config file ARE the real defaults
(we've patched them). Wanted to wait with this for dovecot1.0beta4 but this
takes longer than I thought. Not worth bumping PKGREVISION, IMO.
Ok with tv.
Diffstat (limited to 'mail/dovecot')
-rw-r--r-- | mail/dovecot/distinfo | 4 | ||||
-rw-r--r-- | mail/dovecot/patches/patch-ab | 27 |
2 files changed, 16 insertions, 15 deletions
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index ed9bb72ec5f..50d4e202df1 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.24 2006/02/12 19:13:49 markd Exp $ +$NetBSD: distinfo,v 1.25 2006/03/13 09:35:27 ghen Exp $ SHA1 (dovecot-1.0.beta3.tar.gz) = a5d1fc471c88b96e0ef9d7296b25450a1d7a1419 RMD160 (dovecot-1.0.beta3.tar.gz) = 180e694ee78b73e69995096e1598cca427f6c87d Size (dovecot-1.0.beta3.tar.gz) = 1360574 bytes SHA1 (patch-aa) = be37d7ed741930e683028e6ea626aa1d312a328e -SHA1 (patch-ab) = a96efac8c8fbaf90f2706e5cb4a3288e405d946f +SHA1 (patch-ab) = 4fc3888eb96692e82364295e3aae75f48a042982 SHA1 (patch-ac) = 27de0de32111e351cd547cb5a9847a15e4c991a0 SHA1 (patch-ad) = c390d007c60b80a6456c42f3512afdea76e5e03c SHA1 (patch-ae) = b34743e2276eff0c1fc37e0fd622fdd598c0bca3 diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab index 0c7b94b4cc8..353f2f4368f 100644 --- a/mail/dovecot/patches/patch-ab +++ b/mail/dovecot/patches/patch-ab @@ -1,15 +1,16 @@ -$NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv Exp $ +$NetBSD: patch-ab,v 1.11 2006/03/13 09:35:27 ghen Exp $ ---- dovecot-example.conf.orig 2006-02-02 16:31:21.000000000 -0500 +--- dovecot-example.conf.orig 2006-02-06 16:39:00.000000000 +0100 +++ dovecot-example.conf -@@ -6,16 +6,14 @@ +@@ -5,17 +5,14 @@ + # value inside quotes, eg.: key = "# char and trailing whitespace " # 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 +-# 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 -+# with real defaults being based on configure options. ++# any of the lines. # Base directory where to store runtime data. #base_dir = /var/run/dovecot/ @@ -21,7 +22,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv 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. -@@ -31,7 +29,7 @@ +@@ -31,7 +28,7 @@ #ssl_listen = # Disable SSL/TLS support. @@ -30,7 +31,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv 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 -@@ -420,19 +418,19 @@ +@@ -420,19 +417,19 @@ protocol imap { # Login executable location. @@ -54,7 +55,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv 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 -@@ -441,7 +439,7 @@ protocol imap { +@@ -441,7 +438,7 @@ protocol imap { # Support for dynamically loadable modules. #mail_use_modules = no @@ -63,7 +64,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv 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. -@@ -481,10 +479,10 @@ protocol imap { +@@ -481,10 +478,10 @@ protocol imap { protocol pop3 { # Login executable location. @@ -76,7 +77,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv 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 -@@ -535,7 +533,7 @@ protocol pop3 { +@@ -535,7 +532,7 @@ protocol pop3 { # Support for dynamically loadable modules. #mail_use_modules = no @@ -85,7 +86,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv Exp $ # Workarounds for various client bugs: # outlook-no-nuls: -@@ -553,7 +551,7 @@ protocol pop3 { +@@ -553,7 +550,7 @@ protocol pop3 { ## # Executable location @@ -94,7 +95,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv Exp $ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -642,7 +640,7 @@ auth default { +@@ -642,7 +639,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. @@ -103,7 +104,7 @@ $NetBSD: patch-ab,v 1.10 2006/02/10 12:20:56 tv Exp $ # [session=yes] [cache_key=<key>] [<service name>] # # session=yes makes Dovecot open and immediately close PAM session. Some -@@ -666,13 +664,13 @@ auth default { +@@ -666,13 +663,13 @@ auth default { # args = session=yes * # args = cache_key=%u dovecot #args = dovecot |