maintenance update to 1.1.13, from Brad

This commit is contained in:
sthen 2009-03-18 23:23:20 +00:00
parent fd5bb03941
commit f3dc523319
5 changed files with 11 additions and 56 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.116 2009/03/17 09:09:10 sthen Exp $
# $OpenBSD: Makefile,v 1.117 2009/03/18 23:23:20 sthen Exp $
SHARED_ONLY= Yes
@ -6,12 +6,12 @@ COMMENT-server= compact IMAP/POP3 server
COMMENT-sieve= Sieve mail filtering for Dovecot
V_MAJOR= 1.1
V_DOVECOT= 1.1.12
V_DOVECOT= 1.1.13
V_SIEVE= 1.1.6
PKGNAME= dovecot-${V_DOVECOT}
PKGNAME-server= dovecot-${V_DOVECOT}
FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p3
FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p4
DISTNAME= dovecot-${V_DOVECOT}
CATEGORIES= mail

View File

@ -1,10 +1,10 @@
MD5 (dovecot-1.1.12.tar.gz) = kgXt9wrGMUNDzE0Yk5L/rw==
MD5 (dovecot-1.1.13.tar.gz) = jz4Q0BYUKbFVRqitbotNJQ==
MD5 (dovecot-sieve-1.1.6.tar.gz) = es89mJdKUVuGit29tzBU6w==
RMD160 (dovecot-1.1.12.tar.gz) = SRorz8ADGuVoWBJ4xiRsGY2kF08=
RMD160 (dovecot-1.1.13.tar.gz) = PsVcjIwLYHgdhqn9urp17PRG6l4=
RMD160 (dovecot-sieve-1.1.6.tar.gz) = 7W913B/9sOxR7PN4aqcQkoUSifU=
SHA1 (dovecot-1.1.12.tar.gz) = 7ETzEbF3mV5tqMoqJ7o4YKkl0vU=
SHA1 (dovecot-1.1.13.tar.gz) = MDwUgqi4agHfJhFO6KdGNpfvREg=
SHA1 (dovecot-sieve-1.1.6.tar.gz) = wQnuirHH/+znlA+y43EEuveERA4=
SHA256 (dovecot-1.1.12.tar.gz) = STSNKcd2ZVg8Ol6cDtvvozsP4d0ea7jDmFLNZJ01QRo=
SHA256 (dovecot-1.1.13.tar.gz) = VTvj1IoUQe8D3LBGfaAUXD6HDuecqRyPh97bOmGuiz0=
SHA256 (dovecot-sieve-1.1.6.tar.gz) = ohMKjn1zK7NBqWqWoktN22aDThFlc6EMF+aDRP5xKzY=
SIZE (dovecot-1.1.12.tar.gz) = 2368733
SIZE (dovecot-1.1.13.tar.gz) = 2369604
SIZE (dovecot-sieve-1.1.6.tar.gz) = 470071

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.17 2009/03/17 09:09:10 sthen Exp $
--- configure.in.orig Thu Mar 12 17:47:10 2009
+++ configure.in Thu Mar 12 18:50:02 2009
$OpenBSD: patch-configure_in,v 1.18 2009/03/18 23:23:20 sthen Exp $
--- configure.in.orig Wed Mar 18 17:31:49 2009
+++ configure.in Wed Mar 18 18:09:40 2009
@@ -13,6 +13,7 @@ AC_PROG_CXX # lucene plugin needs this
AC_HEADER_STDC
AC_C_INLINE

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_lib-storage_index_mbox_mbox-lock_c,v 1.1 2009/03/17 09:09:10 sthen Exp $
--- src/lib-storage/index/mbox/mbox-lock.c.orig Mon Mar 16 14:38:42 2009
+++ src/lib-storage/index/mbox/mbox-lock.c Mon Mar 16 14:40:41 2009
@@ -325,20 +325,9 @@ static int mbox_dotlock_privileged_op(struct mbox_mail
mbox->mbox_used_privileges = FALSE;
break;
case MBOX_DOTLOCK_OP_TOUCH:
- if (!file_dotlock_is_locked(mbox->mbox_dotlock)) {
- if (file_dotlock_delete(&mbox->mbox_dotlock) < 0) {
- mbox_set_syscall_error(mbox,
- "file_dotlock_delete()");
- }
- mbox->mbox_used_privileges = TRUE;
- ret = -1;
- } else {
- ret = file_dotlock_touch(mbox->mbox_dotlock);
- if (ret < 0) {
- mbox_set_syscall_error(mbox,
- "file_dotlock_touch()");
- }
- }
+ ret = file_dotlock_touch(mbox->mbox_dotlock);
+ if (ret < 0)
+ mbox_set_syscall_error(mbox, "file_dotlock_touch()");
break;
}

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_master_master-settings_c,v 1.8 2009/03/17 09:09:10 sthen Exp $
--- src/master/master-settings.c.orig Mon Mar 16 14:41:23 2009
+++ src/master/master-settings.c Mon Mar 16 14:43:01 2009
@@ -908,10 +908,12 @@ static bool login_want_core_dumps(struct settings *set
{
const char *p;
- p = strstr(set->server->pop3->login_executable, " -D");
+ p = set->server->pop3 == NULL ? NULL :
+ strstr(set->server->pop3->login_executable, " -D");
if (p != NULL && p[3] == '\0')
return TRUE;
- p = strstr(set->server->imap->login_executable, " -D");
+ p = set->server->imap == NULL ? NULL :
+ strstr(set->server->imap->login_executable, " -D");
if (p != NULL && p[3] == '\0')
return TRUE;
return FALSE;