Update to cyrus-imapd-2.4.16.

This commit is contained in:
ajacoutot 2012-04-20 20:54:16 +00:00
parent bc6c332de1
commit d5e1185b8f
5 changed files with 39 additions and 27 deletions

View File

@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.71 2012/03/12 17:21:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.72 2012/04/20 20:54:16 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT-main= Cyrus IMAP server
COMMENT-perl= perl utils for the Cyrus IMAP server
V= 2.4.14
V= 2.4.16
DISTNAME= cyrus-imapd-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl=cyrus-imapd-perl-${V}
@ -25,7 +27,12 @@ MASTER_SITES= http://cyrusimap.org/releases/ \
ftp://ftp.cyrusimap.org/cyrus-imapd/ \
ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
MULTI_PACKAGES= -main -perl
WANTLIB += crypto ssl z sasl2 lib/db4/db>=4
WANTLIB-main += ${WANTLIB} asn1 c com_err gssapi krb5 pthread
WANTLIB-main += pcre pcreposix
WANTLIB-perl += ${WANTLIB}
LIB_DEPENDS= security/cyrus-sasl2 \
databases/db/v4
@ -33,6 +40,8 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
devel/pcre
RUN_DEPENDS-main=${RUN_DEPENDS}
NO_REGRESS= Yes
PATCH_LIST= patch-*
CONFIGURE_STYLE=gnu
@ -61,17 +70,12 @@ CONFIGURE_ARGS= --with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
--without-libwrap \
--without-zephyr \
--without-snmp \
--with-perl \
--with-ldap=no \
--with-mysql=no \
--with-pgsql=no \
--with-sqlite=no
# this is a needed hack; to update PLIST:
# make SHARED_ONLY=Yes plist
MULTI_PACKAGES= -main ${NO_SHARED_LIBS:S/Yes//:S/No/-perl/}
CONFIGURE_ARGS+=--with${NO_SHARED_LIBS:S/Yes/out/:S/No//}-perl
USE_GROFF = Yes
FLAVORS= drac
FLAVOR?=
@ -82,12 +86,6 @@ pre-patch:
cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
.endif
WANTLIB-main += ${WANTLIB} asn1 c com_err gssapi krb5 pthread
WANTLIB-main += pcre pcreposix
WANTLIB-perl += ${WANTLIB}
NO_REGRESS= Yes
MAN8= fetchnews idled master imapd deliver
SIEVEREF= lib/imapoptions man/imapd.conf.5 \
tools/masssievec tools/rehash tools/translatesieve \

View File

@ -1,5 +1,5 @@
MD5 (cyrus-imapd-2.4.14.tar.gz) = djxjsukQ2yxqBuXYKilEGQ==
RMD160 (cyrus-imapd-2.4.14.tar.gz) = jtu3AwolUSIz7qVASmRpEZxxuBI=
SHA1 (cyrus-imapd-2.4.14.tar.gz) = hEupL6egzVwI6x77BNHrMTJqD0c=
SHA256 (cyrus-imapd-2.4.14.tar.gz) = EBvnnjBMgYtMd5GOpBKtB6tlPeWZjhc1n1zuxv7xAOs=
SIZE (cyrus-imapd-2.4.14.tar.gz) = 2481254
MD5 (cyrus-imapd-2.4.16.tar.gz) = 3mGPrwjsPgIipxYw88mJRA==
RMD160 (cyrus-imapd-2.4.16.tar.gz) = eJkKe+RpHJR4GhduNkcEMAy3FV0=
SHA1 (cyrus-imapd-2.4.16.tar.gz) = LTNDeY4XiKPULpwoJfXdlmqYquA=
SHA256 (cyrus-imapd-2.4.16.tar.gz) = vqydYFloC79llI22CjDG6PWXht9KeCHHDcJ7KiJfMsQ=
SIZE (cyrus-imapd-2.4.16.tar.gz) = 2484201

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_imapoptions,v 1.8 2012/03/12 17:21:10 ajacoutot Exp $
--- lib/imapoptions.orig Mon Mar 12 12:47:51 2012
+++ lib/imapoptions Mon Mar 12 18:10:32 2012
$OpenBSD: patch-lib_imapoptions,v 1.9 2012/04/20 20:54:17 ajacoutot Exp $
--- lib/imapoptions.orig Thu Apr 19 11:39:51 2012
+++ lib/imapoptions Fri Apr 20 22:37:09 2012
@@ -263,7 +263,7 @@ Blank lines and lines beginning with ``#'' are ignored
/* Debug command to be used by processes started with -D option. The string
is a C format string that gets 3 options: the first is the name of the
@ -10,7 +10,7 @@ $OpenBSD: patch-lib_imapoptions,v 1.8 2012/03/12 17:21:10 ajacoutot Exp $
{ "defaultacl", "anyone lrs", STRING }
/* The Access Control List (ACL) placed on a newly-created (non-user)
@@ -1086,7 +1086,7 @@ And the notification message will be available on \fIs
@@ -1089,7 +1089,7 @@ And the notification message will be available on \fIs
{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
/* The cyrusdb backend to use for the seen state. */

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-lib_util_c,v 1.1 2012/04/20 20:54:17 ajacoutot Exp $
util.c:284: error: 'UINT32_MAX' undeclared (first use in this function)
--- lib/util.c.orig Fri Apr 20 22:38:29 2012
+++ lib/util.c Fri Apr 20 22:39:23 2012
@@ -45,6 +45,7 @@
#include <config.h>
#include <stdio.h>
+#include <stdint.h>
#include <ctype.h>
#include <errno.h>
#include <grp.h>

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-man_imapd_conf_5,v 1.7 2012/03/12 17:21:10 ajacoutot Exp $
--- man/imapd.conf.5.orig Mon Mar 12 12:59:30 2012
+++ man/imapd.conf.5 Mon Mar 12 18:10:32 2012
$OpenBSD: patch-man_imapd_conf_5,v 1.8 2012/04/20 20:54:17 ajacoutot Exp $
--- man/imapd.conf.5.orig Thu Apr 19 11:41:06 2012
+++ man/imapd.conf.5 Fri Apr 20 22:37:09 2012
@@ -239,7 +239,7 @@ required.
Debug command to be used by processes started with -D option. The string
is a C format string that gets 3 options: the first is the name of the
@ -10,7 +10,7 @@ $OpenBSD: patch-man_imapd_conf_5,v 1.7 2012/03/12 17:21:10 ajacoutot Exp $
.IP "\fBdefaultacl:\fR anyone lrs" 5
The Access Control List (ACL) placed on a newly-created (non-user)
mailbox that does not have a parent mailbox.
@@ -923,7 +923,7 @@ Possible values include "auxprop", "saslauthd", and "p
@@ -926,7 +926,7 @@ Possible values include "auxprop", "saslauthd", and "p
The cyrusdb backend to use for the seen state.
Allowed values: \fIflat\fR, \fIberkeley\fR, \fIberkeley-hash\fR, \fIskiplist\fR