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

Update to cyrus-imapd-2.4.6.

Browse Source
This commit is contained in:
ajacoutot 2010-12-20 14:39:31 +00:00
parent 746282fe00
commit 0ee0c3fc8e
6 changed files with 17 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/cyrus-imapd/Makefile
View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.51 2010/12/14 18:45:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.52 2010/12/20 14:39:31 ajacoutot Exp $
COMMENT-main= Cyrus IMAP server
COMMENT-perl= perl utils for the Cyrus IMAP server
V= 2.4.5
V= 2.4.6
DISTNAME= cyrus-imapd-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl=cyrus-imapd-perl-${V}
FULLPKGPATH-perl=mail/cyrus-imapd,-perl
REVISION-main= 7
REVISION-perl= 1
CATEGORIES= mail
HOMEPAGE= http://www.cyrusimap.org/

10
mail/cyrus-imapd/distinfo
View File

@ -1,5 +1,5 @@
MD5 (cyrus-imapd-2.4.5.tar.gz) = 4WSQ4b9UXL43obrHpBSxpg==
RMD160 (cyrus-imapd-2.4.5.tar.gz) = sFa4Jr9rdLrGj5llXi+n/UNEBI4=
SHA1 (cyrus-imapd-2.4.5.tar.gz) = xuppL3XweFtQF6tVtkUxToZ5/+Q=
SHA256 (cyrus-imapd-2.4.5.tar.gz) = KTiJRyfHviDx8aOMBzTGy8w1rbw1dlsrCTfBcJVQWNQ=
SIZE (cyrus-imapd-2.4.5.tar.gz) = 2371680
MD5 (cyrus-imapd-2.4.6.tar.gz) = w3sGziQZc02O3z1nAE5bDA==
RMD160 (cyrus-imapd-2.4.6.tar.gz) = R/DrB1DzZLD9a7+XCHO8EBLtKr8=
SHA1 (cyrus-imapd-2.4.6.tar.gz) = LihUPDzKrXniSQt6aYYw2St1aXM=
SHA256 (cyrus-imapd-2.4.6.tar.gz) = /AB2Sa0KQ1j1eUqU3C1Qqa7h1pqfE+UP0G1mRWvNGqk=
SIZE (cyrus-imapd-2.4.6.tar.gz) = 2377895

16
mail/cyrus-imapd/patches/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig Mon Nov 29 14:29:23 2010
+++ configure Thu Dec 2 09:20:29 2010
@@ -5052,9 +5052,7 @@ CFLAGS=$save_CFLAGS
--- configure.orig Mon Dec 20 14:20:42 2010
+++ configure Mon Dec 20 14:55:45 2010
@@ -5051,9 +5051,7 @@ CFLAGS=$save_CFLAGS
fi
if test "$ac_cv_fpic" = "yes"; then
@ -11,7 +11,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
$as_echo "$ac_cv_fpic" >&6; }
@@ -6421,7 +6419,7 @@ fi
@@ -6420,7 +6418,7 @@ fi
@ -20,7 +20,7 @@
CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
@@ -9575,7 +9573,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
@@ -9574,7 +9572,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; th
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -29,7 +29,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -9877,8 +9875,8 @@ fi
@@ -9876,8 +9874,8 @@ fi
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
@ -40,7 +40,7 @@
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
@@ -10446,7 +10444,7 @@ elif test "${with_perl}" != "no"; then
@@ -10445,7 +10443,7 @@ elif test "${with_perl}" != "no"; then
PERL_SUBDIRS="imap"
PERL="${with_perl}"
case "${target_os}" in
@ -49,7 +49,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl cccdlflags needed on \"${target_os}\"" >&5
$as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
eval `${PERL} -V:cccdlflags`
@@ -10559,6 +10557,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10508,6 +10506,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
extern "C"
#endif
char request_init ();

17
mail/cyrus-imapd/patches/patch-imap_cyr_expire_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-imap_cyr_expire_c,v 1.1 2010/12/12 11:52:30 ajacoutot Exp $
From 48f2fab8c42716201c1f55646110df306ae750ed Mon Sep 17 00:00:00 2001
From: Bron Gondwana <brong@opera.com>
Date: Sun, 31 Oct 2010 00:22:37 +0000
Subject: Commit mailbox after annotation based expiry
--- imap/cyr_expire.c.orig Sun Dec 12 09:50:04 2010
+++ imap/cyr_expire.c Sun Dec 12 09:50:26 2010
@@ -228,6 +228,7 @@ int expire(char *name, int matchlen, int maycreate __a
}
r = mailbox_expunge(mailbox, expire_cb, erock, NULL);
+ if (!r) r = mailbox_commit(mailbox);
if (r) {
syslog(LOG_ERR, "failed to expire old messages: %s", mailbox->name);
}

21
mail/cyrus-imapd/patches/patch-imap_mailbox_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-imap_mailbox_c,v 1.4 2010/12/12 11:52:30 ajacoutot Exp $
From 2f2018020d9976bdbd419632328e144f7e43574c Mon Sep 17 00:00:00 2001
From: Bron Gondwana <brong@opera.com>
Date: Sun, 12 Dec 2010 11:27:25 +0000
Subject: Bug #3370 - always map_refresh before reading index header
--- imap/mailbox.c.orig Mon Nov 29 14:28:06 2010
+++ imap/mailbox.c Sun Dec 12 12:34:47 2010
@@ -1348,6 +1348,11 @@ static int mailbox_read_index_header(struct mailbox *m
if (mailbox->index_size < INDEX_HEADER_SIZE)
return IMAP_MAILBOX_BADFORMAT;
+ /* need to make sure we're reading fresh data! */
+ map_refresh(mailbox->index_fd, 1, &mailbox->index_base,
+ &mailbox->index_len, mailbox->index_size,
+ "index", mailbox->name);
+
r = mailbox_buf_to_index_header(mailbox->index_base, &mailbox->i);
if (r) return r;

4
mail/cyrus-imapd/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2010/12/12 11:52:30 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2010/12/20 14:39:31 ajacoutot Exp $
@pkgpath ${BASE_PKGPATH}
@pkgpath ${BASE_PKGPATH},-main,kerberos
@newgroup _cyrus:543
@ -24,7 +24,6 @@ include/cyrus/cyrusdb.h
include/cyrus/glob.h
include/cyrus/gmtoff.h
include/cyrus/hash.h
include/cyrus/hmac-md5.h
include/cyrus/imapopts.h
include/cyrus/imapurl.h
include/cyrus/imclient.h
@ -147,6 +146,7 @@ share/doc/cyrus-imapd/COPYRIGHT
share/doc/cyrus-imapd/text/
@comment share/doc/cyrus-imapd/text/.cvsignore
@comment share/doc/cyrus-imapd/text/Makefile
share/doc/cyrus-imapd/text/ag
share/doc/cyrus-imapd/text/altnamespace
share/doc/cyrus-imapd/text/anoncvs
share/doc/cyrus-imapd/text/bugs