cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to Dovecot 0.99.10.4

Browse Source 
--
ok MAINTAINER
This commit is contained in:
brad 2004-05-10 00:06:47 +00:00
parent 053f74e8b6
commit 464523b0d7
19 changed files with 99 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/dovecot/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2003/11/05 03:42:06 jolan Exp $
# $OpenBSD: Makefile,v 1.5 2004/05/10 00:06:47 brad Exp $
COMMENT= "compact IMAP/POP3 server"
DISTNAME= dovecot-0.99.10
PKGNAME= ${DISTNAME}p2
DISTNAME= dovecot-0.99.10.4
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}
@ -18,8 +17,8 @@ PERMIT_DISTFILES_FTP= Yes
MODULES= iconv
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.13
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.58
CONFIGURE_ARGS+=--without-pam --without-shadow --without-vpopmail \
--localstatedir=/var --with-ssldir=/etc/ssl --with-ssl=openssl

6
mail/dovecot/distinfo
View File

@ -1,3 +1,3 @@
MD5 (dovecot-0.99.10.tar.gz) = 26d8452366a28418cc8a114781a721b6
RMD160 (dovecot-0.99.10.tar.gz) = 82f9b0abe95697fc52e5f5415a90eaba172371f7
SHA1 (dovecot-0.99.10.tar.gz) = 0a1d83cbd27c3aa3e0732416a0871afc23ee5e19
MD5 (dovecot-0.99.10.4.tar.gz) = 81eda7985e99d28acd6d286aa0e13e07
RMD160 (dovecot-0.99.10.4.tar.gz) = 831ed3487e87ff9d94a109d4614dd8f1a8bdd5fc
SHA1 (dovecot-0.99.10.4.tar.gz) = e4eabc78894e2c204d788521812497e021f45c08

8
mail/dovecot/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2003/07/14 23:44:28 jolan Exp $
--- Makefile.in.orig Thu Jun 26 11:14:04 2003
+++ Makefile.in Sat Jul 5 19:30:34 2003
@@ -345,7 +345,7 @@ install-data-am: install-confDATA
$OpenBSD: patch-Makefile_in,v 1.2 2004/05/10 00:06:47 brad Exp $
--- Makefile.in.orig 2003-11-10 17:20:57.000000000 -0500
+++ Makefile.in 2004-05-07 20:47:20.000000000 -0400
@@ -353,7 +353,7 @@ install-data-am: install-confDATA
install-data: install-data-recursive
install-am: all-am

8
mail/dovecot/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- configure.in.orig Thu Jun 26 11:12:43 2003
+++ configure.in Tue Jul 15 15:16:36 2003
@@ -593,6 +593,44 @@ AC_TRY_COMPILE([
$OpenBSD: patch-configure_in,v 1.2 2004/05/10 00:06:47 brad Exp $
--- configure.in.orig 2003-11-24 14:54:08.000000000 -0500
+++ configure.in 2004-05-07 20:47:21.000000000 -0400
@@ -649,6 +649,44 @@ AC_TRY_COMPILE([
AC_MSG_RESULT(no)
])

19
mail/dovecot/patches/patch-doc_mkcert_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_mkcert_sh,v 1.1.1.1 2003/07/14 23:44:28 jolan Exp $
--- doc/mkcert.sh.orig Mon Feb 24 13:38:23 2003
+++ doc/mkcert.sh Sun Jul 6 03:10:59 2003
@@ -5,17 +5,18 @@
$OpenBSD: patch-doc_mkcert_sh,v 1.2 2004/05/10 00:06:47 brad Exp $
--- doc/mkcert.sh.orig 2003-11-08 09:46:57.000000000 -0500
+++ doc/mkcert.sh 2004-05-07 21:19:54.000000000 -0400
@@ -5,14 +5,14 @@
OPENSSL=${OPENSSL-openssl}
SSLDIR=${SSLDIR-/etc/ssl}
@ -14,16 +14,11 @@ $OpenBSD: patch-doc_mkcert_sh,v 1.1.1.1 2003/07/14 23:44:28 jolan Exp $
+KEYFILE=$SSLDIR/private/dovecot.pem
-if [ ! -d $SSLDIR/certs ]; then
- echo $SSLDIR/certs directory doesn't exist
- echo "$SSLDIR/certs directory doesn't exist"
-fi
+#if [ ! -d $SSLDIR/certs ]; then
+# echo $SSLDIR/certs directory doesn't exist
+# echo "$SSLDIR/certs directory doesn't exist"
+#fi
if [ ! -d $SSLDIR/private ]; then
- echo $SSLDIR/private directory doesn't exist
+ echo "$SSLDIR/private directory doesn't exist"
+ exit 1
fi
if [ -f $CERTFILE ]; then
echo "$SSLDIR/private directory doesn't exist"

38
mail/dovecot/patches/patch-dovecot-example_conf
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
--- dovecot-example.conf.orig 2003-06-26 11:11:06.000000000 -0500
+++ dovecot-example.conf 2003-08-28 20:20:17.000000000 -0500
$OpenBSD: patch-dovecot-example_conf,v 1.4 2004/05/10 00:06:47 brad Exp $
--- dovecot-example.conf.orig 2003-11-08 10:21:22.000000000 -0500
+++ dovecot-example.conf 2004-05-07 21:23:23.000000000 -0400
@@ -1,13 +1,12 @@
## Dovecot 1.0 configuration file
@ -76,7 +76,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
##
## Mail processes
@@ -257,6 +256,8 @@ login = pop3
@@ -261,6 +260,8 @@ login = pop3
# Use mmap() instead of read() to read mail files. read() seems to be a bit
# faster with my Linux/x86 and it's better with NFS, so that's the default.
@ -85,7 +85,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
#mail_read_mmaped = no
# Copy mail to another folders using hard links. This is much faster than
@@ -267,6 +268,12 @@ login = pop3
@@ -271,6 +272,12 @@ login = pop3
# If you care about performance, enable it.
#maildir_copy_with_hardlinks = no
@ -98,7 +98,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
# Check if mails' content has been changed by external programs. This slows
# down things as extra stat() needs to be called for each file. If changes are
# noticed, the message is treated as a new message, since IMAP protocol
@@ -284,7 +291,7 @@ login = pop3
@@ -288,7 +295,7 @@ login = pop3
# with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
# and flock. Some operating systems don't allow using both of them
# simultaneously, eg. BSDs. If dotlock is used, it's always created first.
@ -107,7 +107,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
# Should we create dotlock file even when we want only a read-lock? Setting
# this to yes hurts the performance when the mailbox is accessed simultaneously
@@ -314,7 +321,7 @@ login = pop3
@@ -318,7 +325,7 @@ login = pop3
##
# Executable location
@ -116,7 +116,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
# 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,14 +329,14 @@ login = pop3
@@ -326,14 +333,14 @@ login = pop3
# Support for dynamically loadable modules.
#imap_use_modules = no
@ -133,7 +133,7 @@ $OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
# 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 +344,7 @@ login = pop3
@@ -341,7 +348,7 @@ login = pop3
# Support for dynamically loadable modules.
#pop3_use_modules = no
@ -142,16 +142,22 @@ $OpenBSD: patch-dovecot-example_conf,v 1.3 2003/08/30 00:11:31 jolan Exp $
##
## Authentication processes
@@ -386,10 +393,10 @@ auth_userdb = passwd
@@ -380,8 +387,7 @@ auth_mechanisms = plain
# vpopmail: vpopmail library
# 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,7 +397,7 @@ auth_userdb = pgsql /usr/local/etc/dovec
# 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 = /usr/libexec/dovecot/dovecot-auth
# Set max. process size in megabytes.
#auth_process_size = 256

12
mail/dovecot/patches/patch-src_auth_master-connection_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_auth_master-connection_c,v 1.1 2003/09/23 06:34:32 jolan Exp $
--- src/auth/master-connection.c.orig 2003-05-26 10:27:13.000000000 -0500
+++ src/auth/master-connection.c 2003-09-23 00:45:29.000000000 -0500
@@ -55,7 +55,7 @@ fill_reply(const struct user_data *user,
reply.virtual_user_idx = reply_add(buf, user->virtual_user);
reply.mail_idx = reply_add(buf, user->mail);
- p = strstr(user->home, "/./");
+ p = user->home != NULL ? strstr(user->home, "/./") : NULL;
if (p == NULL) {
reply.home_idx = reply_add(buf, user->home);
reply.chroot_idx = reply_add(buf, NULL);

105
mail/dovecot/patches/patch-src_imap_imap-fetch-body-section_c
View File

@ -1,105 +0,0 @@
$OpenBSD: patch-src_imap_imap-fetch-body-section_c,v 1.1 2003/11/05 03:42:06 jolan Exp $
--- src/imap/imap-fetch-body-section.c.orig 2003-06-04 16:45:42.000000000 -0500
+++ src/imap/imap-fetch-body-section.c 2003-11-04 20:34:00.000000000 -0600
@@ -70,6 +70,18 @@ static int seek_partial(unsigned int sel
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,
@@ -79,7 +91,7 @@ static int fetch_body(struct imap_fetch_
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);
@@ -89,13 +101,8 @@ static int fetch_body(struct imap_fetch_
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;
@@ -105,7 +112,7 @@ static int fetch_body(struct imap_fetch_
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;
@@ -308,15 +315,16 @@ static int fetch_header_from(struct imap
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,
@@ -457,16 +465,11 @@ static int fetch_part_body(struct imap_f
{
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;
@@ -474,8 +477,7 @@ static int fetch_part_body(struct imap_f
&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 =

68
mail/dovecot/patches/patch-src_lib-imap_imap-bodystructure_c
View File

@ -1,68 +0,0 @@
$OpenBSD: patch-src_lib-imap_imap-bodystructure_c,v 1.1 2003/09/23 06:34:32 jolan Exp $
--- src/lib-imap/imap-bodystructure.c.orig 2003-06-24 18:12:56.000000000 -0500
+++ src/lib-imap/imap-bodystructure.c 2003-09-23 00:45:51.000000000 -0500
@@ -365,18 +365,23 @@ static void part_write_body(struct messa
data = t_new(struct message_part_body_data, 1);
}
- /* "content type" "subtype" */
- str_append(str, NVL(data->content_type, "\"text\""));
- str_append_c(str, ' ');
- if (data->content_subtype != NULL)
- str_append(str, data->content_subtype);
+ if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822)
+ str_append(str, "\"message\" \"rfc822\"");
else {
- if (data->content_type == NULL ||
- strcasecmp(data->content_type, "\"text\"") == 0)
- str_append(str, "\"plain\"");
- else
- str_append(str, "\"unknown\"");
+ /* "content type" "subtype" */
+ str_append(str, NVL(data->content_type, "\"text\""));
+ str_append_c(str, ' ');
+ if (data->content_subtype != NULL)
+ str_append(str, data->content_subtype);
+ else {
+ if (data->content_type == NULL ||
+ strcasecmp(data->content_type, "\"text\"") == 0)
+ str_append(str, "\"plain\"");
+ else
+ str_append(str, "\"unknown\"");
+
+ }
}
/* ("content type param key" "value" ...) */
@@ -405,23 +410,18 @@ static void part_write_body(struct messa
} else if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) {
/* message/rfc822 contains envelope + body + line count */
struct message_part_body_data *child_data;
+ struct message_part_envelope_data *env_data;
i_assert(part->children != NULL);
i_assert(part->children->next == NULL);
- child_data = part->children->context;
+ child_data = part->children->context;
+ env_data = child_data != NULL ? child_data->envelope : NULL;
+
+ str_append(str, " (");
+ imap_envelope_write_part_data(env_data, str);
+ str_append(str, ") ");
- str_append_c(str, ' ');
- if (child_data != NULL && child_data->envelope != NULL) {
- str_append_c(str, '(');
- imap_envelope_write_part_data(child_data->envelope,
- str);
- str_append_c(str, ')');
- } else {
- /* buggy message */
- str_append(str, "NIL");
- }
- str_append_c(str, ' ');
part_write_bodystructure(part->children, str, extended);
str_printfa(str, " %u", part->body_size.lines);
}

18
mail/dovecot/patches/patch-src_lib-imap_imap-envelope_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_lib-imap_imap-envelope_c,v 1.1 2003/09/23 06:34:32 jolan Exp $
--- src/lib-imap/imap-envelope.c.orig 2003-06-24 18:12:56.000000000 -0500
+++ src/lib-imap/imap-envelope.c 2003-09-23 00:45:51.000000000 -0500
@@ -173,6 +173,14 @@ static void imap_write_address(string_t
void imap_envelope_write_part_data(struct message_part_envelope_data *data,
string_t *str)
{
+ static const char *empty_envelope =
+ "NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL";
+
+ if (data == NULL) {
+ str_append(str, empty_envelope);
+ return;
+ }
+
str_append(str, NVL(data->date, "NIL"));
str_append_c(str, ' ');
str_append(str, NVL(data->subject, "NIL"));

35
mail/dovecot/patches/patch-src_lib-mail_message-address_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-src_lib-mail_message-address_c,v 1.1 2003/09/23 06:34:32 jolan Exp $
--- src/lib-mail/message-address.c.orig 2003-03-20 09:46:34.000000000 -0600
+++ src/lib-mail/message-address.c 2003-09-23 00:45:01.000000000 -0500
@@ -252,14 +252,14 @@ void message_address_write(string_t *str
} 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);
- str_append_c(str, '@');
- str_append(str, addr->domain);
+ 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 @@ void message_address_write(string_t *str
str_append_c(str, ':');
}
str_append(str, addr->mailbox);
- str_append_c(str, '@');
- str_append(str, addr->domain);
+ if (addr->domain != NULL) {
+ str_append_c(str, '@');
+ str_append(str, addr->domain);
+ }
str_append_c(str, '>');
}

18
mail/dovecot/patches/patch-src_lib-storage_index_index-storage_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_lib-storage_index_index-storage_c,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- src/lib-storage/index/index-storage.c.orig Sat Jun 14 22:43:05 2003
+++ src/lib-storage/index/index-storage.c Tue Jul 15 15:18:00 2003
@@ -266,20 +266,28 @@ int index_storage_lock(struct index_mail
$OpenBSD: patch-src_lib-storage_index_index-storage_c,v 1.2 2004/05/10 00:06:47 brad Exp $
--- src/lib-storage/index/index-storage.c.orig 2003-11-08 09:55:19.000000000 -0500
+++ src/lib-storage/index/index-storage.c 2004-05-07 21:29:40.000000000 -0400
@@ -302,20 +302,28 @@ int index_storage_lock(struct index_mail
struct index_mailbox *
index_storage_init(struct mail_storage *storage, struct mailbox *box,
struct mail_index *index, const char *name,
- int readonly, int fast)
+ enum mailbox_open_flags flags)
index_storage_mailbox_init(struct mail_storage *storage, struct mailbox *box,
struct mail_index *index, const char *name,
- int readonly, int fast)
+ enum mailbox_open_flags flags)
{
struct index_mailbox *ibox;
- enum mail_index_open_flags flags;
@ -33,7 +33,7 @@ $OpenBSD: patch-src_lib-storage_index_index-storage_c,v 1.1 2003/07/23 06:03:01
ibox->index = index;
@@ -293,13 +301,7 @@ index_storage_init(struct mail_storage *
@@ -329,13 +337,7 @@ index_storage_mailbox_init(struct mail_s
index->never_cache_fields =
get_never_cache_fields();

18
mail/dovecot/patches/patch-src_lib-storage_index_index-storage_h
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_lib-storage_index_index-storage_h,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- src/lib-storage/index/index-storage.h.orig Sat Jun 14 22:43:05 2003
+++ src/lib-storage/index/index-storage.h Tue Jul 15 15:18:03 2003
@@ -49,7 +49,7 @@ void index_storage_destroy_unrefed(void)
$OpenBSD: patch-src_lib-storage_index_index-storage_h,v 1.2 2004/05/10 00:06:47 brad Exp $
--- src/lib-storage/index/index-storage.h.orig 2003-11-08 09:52:09.000000000 -0500
+++ src/lib-storage/index/index-storage.h 2004-05-07 21:32:34.000000000 -0400
@@ -53,7 +53,7 @@ void index_storage_deinit(struct mail_st
struct index_mailbox *
index_storage_init(struct mail_storage *storage, struct mailbox *box,
struct mail_index *index, const char *name,
- int readonly, int fast);
+ enum mailbox_open_flags flags);
int index_storage_close(struct mailbox *box);
index_storage_mailbox_init(struct mail_storage *storage, struct mailbox *box,
struct mail_index *index, const char *name,
- int readonly, int fast);
+ enum mailbox_open_flags flags);
int index_storage_mailbox_free(struct mailbox *box);
int index_storage_sync_and_lock(struct index_mailbox *ibox,

24
mail/dovecot/patches/patch-src_lib-storage_index_maildir_maildir-storage_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_lib-storage_index_maildir_maildir-storage_c,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- src/lib-storage/index/maildir/maildir-storage.c.orig Sat Jun 14 22:43:05 2003
+++ src/lib-storage/index/maildir/maildir-storage.c Tue Jul 15 15:18:07 2003
@@ -291,7 +291,7 @@ static int verify_inbox(struct mail_stor
$OpenBSD: patch-src_lib-storage_index_maildir_maildir-storage_c,v 1.2 2004/05/10 00:06:47 brad Exp $
--- src/lib-storage/index/maildir/maildir-storage.c.orig 2003-11-20 12:24:43.000000000 -0500
+++ src/lib-storage/index/maildir/maildir-storage.c 2004-05-07 21:36:22.000000000 -0400
@@ -294,7 +294,7 @@ static int verify_inbox(struct mail_stor
static struct mailbox *
maildir_open(struct mail_storage *storage, const char *name,
@ -10,18 +10,16 @@ $OpenBSD: patch-src_lib-storage_index_maildir_maildir-storage_c,v 1.1 2003/07/23
{
struct index_mailbox *ibox;
struct mail_index *index;
@@ -307,8 +307,8 @@ maildir_open(struct mail_storage *storag
index_storage_add(index);
@@ -311,7 +311,7 @@ maildir_open(struct mail_storage *storag
}
- ibox = index_storage_init(storage, &maildir_mailbox, index, name,
- readonly, fast);
+ ibox = index_storage_init(storage, &maildir_mailbox,
+ index, name, flags);
ibox = index_storage_mailbox_init(storage, &maildir_mailbox,
- index, name, readonly, fast);
+ index, name, flags);
if (ibox != NULL)
ibox->expunge_locked = maildir_expunge_locked;
return (struct mailbox *) ibox;
@@ -329,7 +329,7 @@ static const char *inbox_fix_case(struct
@@ -332,7 +332,7 @@ static const char *inbox_fix_case(struct
static struct mailbox *
maildir_open_mailbox(struct mail_storage *storage,
@ -30,7 +28,7 @@ $OpenBSD: patch-src_lib-storage_index_maildir_maildir-storage_c,v 1.1 2003/07/23
{
const char *path;
struct stat st;
@@ -340,7 +340,7 @@ maildir_open_mailbox(struct mail_storage
@@ -343,7 +343,7 @@ maildir_open_mailbox(struct mail_storage
if (strcmp(name, "INBOX") == 0) {
if (!verify_inbox(storage))
return NULL;
@ -39,7 +37,7 @@ $OpenBSD: patch-src_lib-storage_index_maildir_maildir-storage_c,v 1.1 2003/07/23
}
if (!maildir_is_valid_existing_name(name)) {
@@ -356,7 +356,7 @@ maildir_open_mailbox(struct mail_storage
@@ -359,7 +359,7 @@ maildir_open_mailbox(struct mail_storage
!create_control_dir(storage, name))
return FALSE;

22
mail/dovecot/patches/patch-src_lib-storage_index_mbox_mbox-storage_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_lib-storage_index_mbox_mbox-storage_c,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- src/lib-storage/index/mbox/mbox-storage.c.orig Wed Jun 25 20:02:04 2003
+++ src/lib-storage/index/mbox/mbox-storage.c Tue Jul 15 15:18:11 2003
@@ -317,7 +317,7 @@ static const char *mbox_get_path(struct
$OpenBSD: patch-src_lib-storage_index_mbox_mbox-storage_c,v 1.2 2004/05/10 00:06:47 brad Exp $
--- src/lib-storage/index/mbox/mbox-storage.c.orig 2003-11-08 09:54:54.000000000 -0500
+++ src/lib-storage/index/mbox/mbox-storage.c 2004-05-07 21:38:04.000000000 -0400
@@ -320,7 +320,7 @@ static const char *mbox_get_path(struct
}
static struct mailbox *mbox_open(struct mail_storage *storage, const char *name,
@ -10,16 +10,16 @@ $OpenBSD: patch-src_lib-storage_index_mbox_mbox-storage_c,v 1.1 2003/07/23 06:03
{
struct index_mailbox *ibox;
struct mail_index *index;
@@ -344,7 +344,7 @@ static struct mailbox *mbox_open(struct
@@ -347,7 +347,7 @@ static struct mailbox *mbox_open(struct
}
ibox = index_storage_init(storage, &mbox_mailbox, index,
- name, readonly, fast);
+ name, flags);
ibox = index_storage_mailbox_init(storage, &mbox_mailbox, index,
- name, readonly, fast);
+ name, flags);
if (ibox != NULL)
ibox->expunge_locked = mbox_expunge_locked;
return (struct mailbox *) ibox;
@@ -352,7 +352,7 @@ static struct mailbox *mbox_open(struct
@@ -355,7 +355,7 @@ static struct mailbox *mbox_open(struct
static struct mailbox *
mbox_open_mailbox(struct mail_storage *storage,
@ -28,7 +28,7 @@ $OpenBSD: patch-src_lib-storage_index_mbox_mbox-storage_c,v 1.1 2003/07/23 06:03
{
const char *path;
struct stat st;
@@ -364,7 +364,7 @@ mbox_open_mailbox(struct mail_storage *s
@@ -367,7 +367,7 @@ mbox_open_mailbox(struct mail_storage *s
/* make sure inbox exists */
if (!verify_inbox(storage))
return FALSE;
@ -37,7 +37,7 @@ $OpenBSD: patch-src_lib-storage_index_mbox_mbox-storage_c,v 1.1 2003/07/23 06:03
}
if (!mbox_is_valid_existing_name(name)) {
@@ -384,7 +384,7 @@ mbox_open_mailbox(struct mail_storage *s
@@ -387,7 +387,7 @@ mbox_open_mailbox(struct mail_storage *s
if (!create_mbox_index_dirs(storage, name))
return NULL;

8
mail/dovecot/patches/patch-src_master_mail-process_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_master_mail-process_c,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- src/master/mail-process.c.orig Tue Jun 24 18:26:44 2003
+++ src/master/mail-process.c Tue Jul 15 15:18:19 2003
@@ -188,6 +188,8 @@ int create_mail_process(int socket, stru
$OpenBSD: patch-src_master_mail-process_c,v 1.2 2004/05/10 00:06:47 brad Exp $
--- src/master/mail-process.c.orig 2003-11-08 11:29:25.000000000 -0500
+++ src/master/mail-process.c 2004-05-07 20:50:24.000000000 -0400
@@ -213,6 +213,8 @@ int create_mail_process(int socket, stru
env_put("MAILDIR_CHECK_CONTENT_CHANGES=1");
if (set->mail_full_filesystem_access)
env_put("FULL_FILESYSTEM_ACCESS=1");

10
mail/dovecot/patches/patch-src_master_master-settings_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_master_master-settings_c,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- src/master/master-settings.c.orig Wed May 21 06:43:04 2003
+++ src/master/master-settings.c Tue Jul 15 15:18:22 2003
@@ -69,6 +69,7 @@ static struct setting_def setting_defs[]
$OpenBSD: patch-src_master_master-settings_c,v 1.2 2004/05/10 00:06:47 brad Exp $
--- src/master/master-settings.c.orig 2003-11-10 17:19:49.000000000 -0500
+++ src/master/master-settings.c 2004-05-07 20:50:24.000000000 -0400
@@ -70,6 +70,7 @@ static struct setting_def setting_defs[]
DEF(SET_INT, mbox_dotlock_change_timeout),
DEF(SET_INT, umask),
DEF(SET_BOOL, mail_drop_priv_before_exec),
@ -9,7 +9,7 @@ $OpenBSD: patch-src_master_master-settings_c,v 1.1 2003/07/23 06:03:01 jolan Exp
/* imap */
DEF(SET_STR, imap_executable),
@@ -182,6 +183,11 @@ struct settings default_settings = {
@@ -184,6 +185,11 @@ struct settings default_settings = {
MEMBER(mbox_dotlock_change_timeout) 30,
MEMBER(umask) 0077,
MEMBER(mail_drop_priv_before_exec) FALSE,

8
mail/dovecot/patches/patch-src_master_master-settings_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_master_master-settings_h,v 1.1 2003/07/23 06:03:01 jolan Exp $
--- src/master/master-settings.h.orig Sun May 18 07:26:29 2003
+++ src/master/master-settings.h Tue Jul 15 15:18:26 2003
@@ -53,6 +53,7 @@ struct settings {
$OpenBSD: patch-src_master_master-settings_h,v 1.2 2004/05/10 00:06:47 brad Exp $
--- src/master/master-settings.h.orig 2003-08-24 09:11:56.000000000 -0400
+++ src/master/master-settings.h 2004-05-07 20:50:24.000000000 -0400
@@ -54,6 +54,7 @@ struct settings {
unsigned int mbox_dotlock_change_timeout;
unsigned int umask;
int mail_drop_priv_before_exec;

3
mail/dovecot/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2003/07/14 23:44:28 jolan Exp $
@comment $OpenBSD: PLIST,v 1.2 2004/05/10 00:06:47 brad Exp $
libexec/dovecot/dovecot-auth
libexec/dovecot/imap
libexec/dovecot/imap-login
@ -13,6 +13,7 @@ share/doc/dovecot/index.txt
share/doc/dovecot/mail-storages.txt
share/doc/dovecot/multiaccess.txt
share/doc/dovecot/nfs.txt
share/doc/dovecot/securecoding.txt
share/examples/dovecot/dovecot-example.conf
share/examples/dovecot/dovecot-openssl.cnf
@dirrm share/examples/dovecot