pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/dovecot Update to 0.99.10.4 provided by Charlie A...
details: https://anonhg.NetBSD.org/pkgsrc/rev/aa4907324c52
branches: trunk
changeset: 464439:aa4907324c52
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Tue Dec 09 04:06:37 2003 +0000
description:
Update to 0.99.10.4 provided by Charlie Allom in PR pkg/23696.
Changes:
v0.99.10.4 2003-11-24 Timo Sirainen <tss%iki.fi@localhost>
- Fixed reference counters in imap-login and pop3-login.
IMAP AUTHENTICATE and POP3 AUTH commands could have left the
process stuck doing nothing forever.
v0.99.10.3 2003-11-24 Timo Sirainen <tss%iki.fi@localhost>
- FETCH RFC822.HEADER returned message body as well
- SUBSCRIBE broke subscription lists
- LIST code rewritten, children flags should be correct now
- SORT and THREAD could have given invalid replies
- Partial BODY[...] fetches might have returned wrong data or at
least performed worse than was necessary
v0.99.10.1 2003-11-10 Timo Sirainen <tss%iki.fi@localhost>
* mbox: \Draft and \Deleted flags used opposite flag chars in
X-Status header. We were incompatible with other mbox accessing
software.
WARNING: Upgrading from previous version doesn't automatically
swap the flags, so be careful not to accidentally expunge messages
that had their \Draft flag changed to \Deleted.
* Configuration file changes:
- Whitespace at end of line is stripped, use quotes if you need it
- # comments are supported after key=value lines. if you need '#'
character, quote the value
- Both " and ' quotes are supported. If you need to use them, '\'
can be used for escaping.
- mbox: COPY into same mailbox didn't work and could have corrupted
the mailbox
- Using Dovecot without index files would crash after using a while
- Partial BODY[header] or BODY[part] fetches were buggy if client
requested more data than was available in the header/part.
- Partial BODY[...] fetches were buggy with messages that had CRLFs
- Some BODY and BODYSTRUCTURE replies missed data for message/rfc822
MIME parts causing clients to break
- SORT (SUBJECT) was buggy
- Timezone fixes with Date-header
This also includes Joshua Goodall's patch (now in the CVS tree) for
CRAM-MD5 for the -release tag.
diffstat:
mail/dovecot/Makefile | 9 +-
mail/dovecot/distinfo | 16 ++---
mail/dovecot/patches/patch-ab | 44 +++++++++-------
mail/dovecot/patches/patch-ac | 32 ------------
mail/dovecot/patches/patch-ad | 106 ------------------------------------------
5 files changed, 35 insertions(+), 172 deletions(-)
diffs (299 lines):
diff -r 35401e0aa982 -r aa4907324c52 mail/dovecot/Makefile
--- a/mail/dovecot/Makefile Tue Dec 09 01:29:16 2003 +0000
+++ b/mail/dovecot/Makefile Tue Dec 09 04:06:37 2003 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/09 04:06:37 xtraeme Exp $
#
-DISTNAME= dovecot-0.99.10
-PKGREVISION= 4
+DISTNAME= dovecot-0.99.10.4
CATEGORIES= mail
MASTER_SITES= http://dovecot.procontrol.fi/
-PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= auth-home.patch bodystructure.patch
+PATCH_SITES= http://www.roughtrade.net/dovecot/
+PATCHFILES= dovecot-crammd5-0.99.10.2.diff
PATCH_DIST_STRIP= -p1
MAINTAINER= tom%replic8.net@localhost
diff -r 35401e0aa982 -r aa4907324c52 mail/dovecot/distinfo
--- a/mail/dovecot/distinfo Tue Dec 09 01:29:16 2003 +0000
+++ b/mail/dovecot/distinfo Tue Dec 09 04:06:37 2003 +0000
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.6 2003/11/02 17:24:07 salo Exp $
+$NetBSD: distinfo,v 1.7 2003/12/09 04:06:37 xtraeme Exp $
-SHA1 (dovecot-0.99.10.tar.gz) = 0a1d83cbd27c3aa3e0732416a0871afc23ee5e19
-Size (dovecot-0.99.10.tar.gz) = 735615 bytes
-SHA1 (auth-home.patch) = 5af6aa64c81d4bf8b0bc0f7684a1c500198b981a
-Size (auth-home.patch) = 612 bytes
-SHA1 (bodystructure.patch) = f9a94981a4b8527001203725d22ac74f21968d57
-Size (bodystructure.patch) = 3010 bytes
+SHA1 (dovecot-0.99.10.4.tar.gz) = e4eabc78894e2c204d788521812497e021f45c08
+Size (dovecot-0.99.10.4.tar.gz) = 859856 bytes
+SHA1 (dovecot-crammd5-0.99.10.2.diff) = bd879993f2275bcafd9f6ae1e673114b0fbd82a2
+Size (dovecot-crammd5-0.99.10.2.diff) = 16476 bytes
SHA1 (patch-aa) = 6ed31ba47883903e5a7b2fcb715432e0c3e8947c
-SHA1 (patch-ab) = 0aca5084186f7faa812351e83d1c9535248da2b0
-SHA1 (patch-ac) = 6593c335779aacd0bf285a4faf6411150d4acdcf
-SHA1 (patch-ad) = b96fe0aa1d6d0f846624802b37b72f7213568a87
+SHA1 (patch-ab) = 05efdd1f833cdf6a8df942f071c9961b31bd55e7
diff -r 35401e0aa982 -r aa4907324c52 mail/dovecot/patches/patch-ab
--- a/mail/dovecot/patches/patch-ab Tue Dec 09 01:29:16 2003 +0000
+++ b/mail/dovecot/patches/patch-ab Tue Dec 09 04:06:37 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/07/04 14:39:38 salo Exp $
+$NetBSD: patch-ab,v 1.3 2003/12/09 04:06:37 xtraeme Exp $
---- dovecot-example.conf.orig Thu Jun 26 18:11:06 2003
-+++ dovecot-example.conf Fri Jul 4 12:37:14 2003
-@@ -1,10 +1,8 @@
+--- dovecot-example.conf.orig 2003-12-09 04:45:27.000000000 +0100
++++ dovecot-example.conf 2003-12-09 04:50:48.000000000 +0100
+@@ -1,17 +1,15 @@
## Dovecot 1.0 configuration file
# Default values are shown after each value, it's not required to uncomment
@@ -15,7 +15,6 @@
# Base directory where to store runtime data.
#base_dir = /var/run/dovecot/
-@@ -11,7 +9,7 @@
# Protocols we want to be serving:
# imap imaps pop3 pop3s
@@ -38,7 +37,7 @@
# 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
@@ -47,56 +46,63 @@
# 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
-@@ -314,7 +312,7 @@
+@@ -318,7 +316,7 @@
##
# 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.
-@@ -322,7 +320,7 @@
+@@ -326,14 +324,14 @@
# 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
-@@ -329,7 +327,7 @@
##
# 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.
-@@ -337,7 +335,7 @@
+@@ -341,7 +339,7 @@
# 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
-@@ -386,10 +384,10 @@
+@@ -381,7 +379,7 @@
+ # ldap <config path>: LDAP, see doc/dovecot-ldap.conf
+ # pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
+ #auth_userdb = passwd
+-auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf
++auth_userdb = passwd
+
+ # Where password database is kept:
+ # passwd: /etc/passwd or similiar, using getpwnam()
+@@ -391,9 +389,9 @@
# 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 = pam
+-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
+auth_passdb = passwd
- # Executable location
-#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
diff -r 35401e0aa982 -r aa4907324c52 mail/dovecot/patches/patch-ac
--- a/mail/dovecot/patches/patch-ac Tue Dec 09 01:29:16 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/09/23 13:54:25 salo Exp $
-
---- src/lib-mail/message-address.c.orig 2003-03-20 16:46:34.000000000 +0100
-+++ src/lib-mail/message-address.c 2003-09-23 15:42:11.000000000 +0200
-@@ -252,14 +252,14 @@
- } else if ((addr->name == NULL || *addr->name == '\0') &&
- addr->route == NULL) {
- i_assert(addr->mailbox != NULL);
-- i_assert(addr->domain != NULL);
-
- str_append(str, addr->mailbox);
-+ if (addr->domain != NULL) {
- str_append_c(str, '@');
- str_append(str, addr->domain);
-+ }
- } else {
- i_assert(addr->mailbox != NULL);
-- i_assert(addr->domain != NULL);
-
- if (addr->name != NULL) {
- str_append(str, addr->name);
-@@ -272,8 +272,10 @@
- str_append_c(str, ':');
- }
- str_append(str, addr->mailbox);
-+ if (addr->domain != NULL) {
- str_append_c(str, '@');
- str_append(str, addr->domain);
-+ }
- str_append_c(str, '>');
- }
-
diff -r 35401e0aa982 -r aa4907324c52 mail/dovecot/patches/patch-ad
--- a/mail/dovecot/patches/patch-ad Tue Dec 09 01:29:16 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/11/02 17:24:07 salo Exp $
-
---- src/imap/imap-fetch-body-section.c 21 Sep 2003 16:21:36 -0000 1.18
-+++ src/imap/imap-fetch-body-section.c 3 Oct 2003 14:36:03 -0000
-@@ -73,6 +73,18 @@
- return cr_skipped;
- }
-
-+static uoff_t get_send_size(const struct imap_fetch_body_data *body,
-+ uoff_t max_size)
-+{
-+ uoff_t size;
-+
-+ if (body->skip >= max_size)
-+ return 0;
-+
-+ size = max_size - body->skip;
-+ return size <= body->max_size ? size : body->max_size;
-+}
-+
- /* fetch BODY[] or BODY[TEXT] */
- static int fetch_body(struct imap_fetch_context *ctx,
- const struct imap_fetch_body_data *body,
-@@ -82,7 +94,7 @@
- struct istream *stream;
- const char *str;
- int skip_cr, last_cr;
-- uoff_t size;
-+ uoff_t send_size;
- off_t ret;
-
- stream = mail->get_stream(mail, &hdr_size, &body_size);
-@@ -92,13 +104,8 @@
- if (fetch_header)
- message_size_add(&body_size, &hdr_size);
-
-- if (body->skip >= body_size.virtual_size)
-- size = 0;
-- else {
-- size = body_size.virtual_size - body->skip;
-- if (size > body->max_size) size = body->max_size;
-- }
-- str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n", ctx->prefix, size);
-+ send_size = get_send_size(body, body_size.virtual_size);
-+ str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n", ctx->prefix, send_size);
- if (o_stream_send_str(ctx->output, str) < 0)
- return FALSE;
-
-@@ -108,7 +115,7 @@
- body->skip);
-
- ret = message_send(ctx->output, stream, &body_size,
-- skip_cr, body->max_size, &last_cr,
-+ skip_cr, send_size, &last_cr,
- !mail->has_no_nuls);
- if (ret > 0) {
- partial.cr_skipped = last_cr != 0;
-@@ -297,15 +304,16 @@
- const char *str;
- const void *data;
- size_t data_size;
-- uoff_t start_offset;
-+ uoff_t start_offset, send_size;
- int failed;
-
- /* HEADER, MIME, HEADER.FIELDS (list), HEADER.FIELDS.NOT (list) */
-
- if (strcmp(header_section, "HEADER") == 0) {
- /* all headers */
-+ send_size = get_send_size(body, size->virtual_size);
- str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n",
-- ctx->prefix, size->virtual_size);
-+ ctx->prefix, send_size);
- if (o_stream_send_str(ctx->output, str) < 0)
- return FALSE;
- return message_send(ctx->output, input, size,
-@@ -453,16 +461,11 @@
- {
- const char *str;
- int skip_cr, last_cr;
-- uoff_t size;
-+ uoff_t send_size;
- off_t ret;
-
-- if (body->skip >= part->body_size.virtual_size)
-- size = 0;
-- else {
-- size = part->body_size.virtual_size - body->skip;
-- if (size > body->max_size) size = body->max_size;
-- }
-- str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n", ctx->prefix, size);
-+ send_size = get_send_size(body, part->body_size.virtual_size);
-+ str = t_strdup_printf("%s {%"PRIuUOFF_T"}\r\n", ctx->prefix, send_size);
- if (o_stream_send_str(ctx->output, str) < 0)
- return FALSE;
-
-@@ -470,8 +473,7 @@
- &partial, stream, part->physical_pos +
- part->header_size.physical_size, body->skip);
- ret = message_send(ctx->output, stream, &part->body_size,
-- skip_cr, body->max_size, &last_cr,
-- !mail->has_no_nuls);
-+ skip_cr, send_size, &last_cr, !mail->has_no_nuls);
- if (ret > 0) {
- partial.cr_skipped = last_cr != 0;
- partial.pos.physical_size =
Home |
Main Index |
Thread Index |
Old Index