diff options
Diffstat (limited to 'mail/cyrus-imapd')
-rw-r--r-- | mail/cyrus-imapd/Makefile | 20 | ||||
-rw-r--r-- | mail/cyrus-imapd/distinfo | 4 | ||||
-rw-r--r-- | mail/cyrus-imapd/patches/patch-ag | 47 |
3 files changed, 58 insertions, 13 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 40defaab5e4..a2af24fa7a3 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2010/01/17 12:02:23 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2010/06/02 12:56:39 adam Exp $ DISTNAME= cyrus-imapd-2.2.13p1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ @@ -18,7 +18,7 @@ USE_TOOLS+= perl USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes PERL5_CONFIGURE= no -BDB_ACCEPTED= db4 db3 +BDB_ACCEPTED= db3 db4 db5 .include "../../mk/bsd.prefs.mk" @@ -30,12 +30,12 @@ CYRUS_GROUP?= mail PKG_GROUPS_VARS+= CYRUS_GROUP PKG_USERS_VARS+= CYRUS_USER -FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} -FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q} +FILES_SUBST+= CYRUS_USER=${CYRUS_USER} +FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER:Q} -CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} +CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --with-krb=/usr . endif .elif !empty(PKG_OPTIONS:Mgssapi) . include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} GSSIMPL.heimdal= heimdal GSSIMPL.mit-krb5= mit @@ -131,7 +131,7 @@ PERL5_PACKLIST= \ .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" -CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE:Q} +CONFIGURE_ENV+= BDB_TYPE=${BDB_TYPE} # Only imap/mupdate needs to be build with pthreads support, so selectively # enable it via patches for just that one program. diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo index 3c2defe3919..0ecaf8cfea2 100644 --- a/mail/cyrus-imapd/distinfo +++ b/mail/cyrus-imapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2009/09/10 05:13:56 obache Exp $ +$NetBSD: distinfo,v 1.31 2010/06/02 12:56:39 adam Exp $ SHA1 (cyrus-imapd-2.2.13p1.tar.gz) = b9bc268c40fbb60aeb5253d61c4bfe5cffd3fb15 RMD160 (cyrus-imapd-2.2.13p1.tar.gz) = 1604f07491d41f05563181bce46ff1b7a6e5f739 @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d SHA1 (patch-ae) = b1865b68a8f798a3766e53e60e9e68099df9bd54 SHA1 (patch-af) = 2aaf1be5fcb102b047a57fe0a908b3e8f95037ea -SHA1 (patch-ag) = 85d931a197d9185cbcff592efd67c2090724d7fd +SHA1 (patch-ag) = e51020accbd2a259a9abe27e5d220e61c9ab314e SHA1 (patch-al) = d28a0e604f0ddcf22c6753be333216780558e05c SHA1 (patch-am) = 6e67366a0ad01cf075c23c5a32f1c9d456e1498f SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b diff --git a/mail/cyrus-imapd/patches/patch-ag b/mail/cyrus-imapd/patches/patch-ag index fdb310870e6..e9f7b21a76b 100644 --- a/mail/cyrus-imapd/patches/patch-ag +++ b/mail/cyrus-imapd/patches/patch-ag @@ -1,7 +1,25 @@ -$NetBSD: patch-ag,v 1.4 2007/06/12 11:34:29 obache Exp $ +$NetBSD: patch-ag,v 1.5 2010/06/02 12:56:39 adam Exp $ --- lib/cyrusdb_berkeley.c.orig 2006-03-17 16:12:32.000000000 +0000 +++ lib/cyrusdb_berkeley.c +@@ -104,7 +104,7 @@ static void db_panic(DB_ENV *dbenv __att + exit(EC_TEMPFAIL); + } + +-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) + static void db_err(const DB_ENV *dbenv __attribute__((unused)), + const char *db_prfx, const char *buffer) + #else +@@ -160,7 +160,7 @@ static int init(const char *dbdir, int m + #endif + } + +-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3) ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) + dbenv->set_msgcall(dbenv, db_msg); + #endif + dbenv->set_errcall(dbenv, db_err); @@ -173,7 +173,15 @@ static int init(const char *dbdir, int m syslog(LOG_WARNING, "DBERROR: invalid berkeley_locks_max value, using internal default"); @@ -18,3 +36,30 @@ $NetBSD: patch-ag,v 1.4 2007/06/12 11:34:29 obache Exp $ if (r) { dbenv->err(dbenv, r, "set_lk_max"); syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r)); +@@ -270,7 +278,7 @@ static int mysync(void) + + assert(dbinit); + +-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) ++#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) + do { + #endif + #if (DB_VERSION_MAJOR > 3) || ((DB_VERSION_MAJOR == 3) && (DB_VERSION_MINOR > 0)) +@@ -278,7 +286,7 @@ static int mysync(void) + #else + r = txn_checkpoint(dbenv, 0, 0); + #endif +-#if !(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) ++#if !(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) + } while (r == DB_INCOMPLETE); /* Never returned by BDB 4.1 */ + #endif + if (r) { +@@ -393,7 +401,7 @@ static int myopen(const char *fname, DBT + } + /* xxx set comparator! */ + +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) + r = db->open(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664); + #else + r = db->open(db, fname, NULL, type, dbflags, 0664); |