diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/cyrus-imapd21/Makefile | 6 | ||||
-rw-r--r-- | mail/cyrus-imapd21/PLIST | 4 | ||||
-rw-r--r-- | mail/cyrus-imapd21/distinfo | 14 | ||||
-rw-r--r-- | mail/cyrus-imapd21/patches/patch-ac | 10 | ||||
-rw-r--r-- | mail/cyrus-imapd21/patches/patch-af | 8 | ||||
-rw-r--r-- | mail/cyrus-imapd21/patches/patch-ak | 33 |
6 files changed, 24 insertions, 51 deletions
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 49996a25b59..816e3436cbf 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 21:45:51 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/08/16 09:23:58 recht Exp $ -DISTNAME= cyrus-imapd-2.1.13 +DISTNAME= cyrus-imapd-2.1.14 SVR4_PKGNAME= cimap CATEGORIES= mail MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -20,7 +20,7 @@ AUTOCONF_REQD= 2.13 .if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES" PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/ -PATCHFILES= ${DISTNAME}-ipv6-20030503.diff.gz +PATCHFILES= ${DISTNAME}-ipv6-20030703.diff.gz .endif # CYRUS_USER username of the Cyrus administrator diff --git a/mail/cyrus-imapd21/PLIST b/mail/cyrus-imapd21/PLIST index 6b6e7046267..c0d7f005405 100644 --- a/mail/cyrus-imapd21/PLIST +++ b/mail/cyrus-imapd21/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/11/01 01:05:34 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/08/16 09:23:58 recht Exp $ bin/imtest bin/installsieve bin/lmtptest @@ -20,6 +20,7 @@ cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd cyrus/bin/master +cyrus/bin/mbexamine cyrus/bin/mbpath cyrus/bin/mkimap cyrus/bin/notifyd @@ -89,6 +90,7 @@ man/man8/fud.8 man/man8/idled.8 man/man8/ipurge.8 man/man8/lmtpd.8 +man/man8/mbexamine.8 man/man8/mbpath.8 man/man8/notifyd.8 man/man8/quota.8 diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo index b5e79b568a9..4934861fbf8 100644 --- a/mail/cyrus-imapd21/distinfo +++ b/mail/cyrus-imapd21/distinfo @@ -1,16 +1,14 @@ -$NetBSD: distinfo,v 1.7 2003/05/26 06:53:06 martti Exp $ +$NetBSD: distinfo,v 1.8 2003/08/16 09:23:59 recht Exp $ -SHA1 (cyrus-imapd-2.1.13.tar.gz) = 21dd5bf5685692cf63b95a36753fdcea9f75892d -Size (cyrus-imapd-2.1.13.tar.gz) = 1664658 bytes -SHA1 (cyrus-imapd-2.1.13-ipv6-20030503.diff.gz) = 93bdfdc2e797a31951799c9bb5034ba3002bd97e -Size (cyrus-imapd-2.1.13-ipv6-20030503.diff.gz) = 32684 bytes +SHA1 (cyrus-imapd-2.1.14.tar.gz) = 820bfdf600ca4684bbd1b55602547e793f95eee4 +Size (cyrus-imapd-2.1.14.tar.gz) = 1691926 bytes SHA1 (patch-aa) = ef3630c2bafc752eb3af56815c44b3a2037d221a -SHA1 (patch-ac) = dc1bf6f9e8587887f5763379bc39202f56f5230c +SHA1 (patch-ac) = f8692c380ece97839ee66ff34ff29d4a19b41ccd SHA1 (patch-ad) = 80329b5a72cb7aa6890304cd89912096f3a66df3 SHA1 (patch-ae) = 003d6ecc2caf0bf2985a871691ba970c6a6f4755 -SHA1 (patch-af) = 511d304315c9bdeb0f770181b1fdd9c13b0f2020 +SHA1 (patch-af) = 7bbb1e63c1bc3654732844fde4ac7311850fc770 SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892 SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1 SHA1 (patch-aj) = fcf0ce2c630459ea27c3d950a31ed907f5884de6 -SHA1 (patch-ak) = 31124c296228bd821022adf2a21ceb9d839148ce +SHA1 (patch-ak) = b0c8916d8e427c06625013595c06842544ef2125 diff --git a/mail/cyrus-imapd21/patches/patch-ac b/mail/cyrus-imapd21/patches/patch-ac index 33b12fd3c76..8de04b0e8f9 100644 --- a/mail/cyrus-imapd21/patches/patch-ac +++ b/mail/cyrus-imapd21/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2003/05/26 06:53:07 martti Exp $ +$NetBSD: patch-ac,v 1.3 2003/08/16 09:23:59 recht Exp $ ---- imap/imapd.c.orig 2003-04-22 19:02:06.000000000 +0300 -+++ imap/imapd.c 2003-05-21 10:19:38.000000000 +0300 -@@ -5837,7 +5837,7 @@ +--- imap/imapd.c.orig 2003-06-25 05:33:59.000000000 +0200 ++++ imap/imapd.c 2003-07-26 14:26:27.000000000 +0200 +@@ -5839,7 +5839,7 @@ { int i=0, j=0; char tagbuf[128]; @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 2003/05/26 06:53:07 martti Exp $ struct buf tag, cmd, tmp, user; int r = 0; -@@ -5952,7 +5952,7 @@ +@@ -5954,7 +5954,7 @@ char *mailbox, char *acl_in) { int r = 0; diff --git a/mail/cyrus-imapd21/patches/patch-af b/mail/cyrus-imapd21/patches/patch-af index 90873eaae32..dc074d2f046 100644 --- a/mail/cyrus-imapd21/patches/patch-af +++ b/mail/cyrus-imapd21/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.3 2003/05/26 06:53:08 martti Exp $ +$NetBSD: patch-af,v 1.4 2003/08/16 09:23:59 recht Exp $ ---- configure.in.orig 2003-03-24 19:58:03.000000000 +0200 -+++ configure.in 2003-05-21 10:21:05.000000000 +0300 -@@ -885,6 +885,10 @@ +--- configure.in.orig 2003-06-25 23:12:54.000000000 +0200 ++++ configure.in 2003-07-26 14:27:03.000000000 +0200 +@@ -891,6 +891,10 @@ dnl and compile perl/cyradm PERL_SUBDIRS="imap" PERL="${with_perl}" diff --git a/mail/cyrus-imapd21/patches/patch-ak b/mail/cyrus-imapd21/patches/patch-ak index d7956eeff08..38b68019077 100644 --- a/mail/cyrus-imapd21/patches/patch-ak +++ b/mail/cyrus-imapd21/patches/patch-ak @@ -1,7 +1,7 @@ -$NetBSD: patch-ak,v 1.2 2003/01/08 21:26:35 chris Exp $ +$NetBSD: patch-ak,v 1.3 2003/08/16 09:23:59 recht Exp $ ---- imap/ctl_cyrusdb.c.orig Wed May 29 12:49:14 2002 -+++ imap/ctl_cyrusdb.c Tue Jan 7 13:03:45 2003 +--- imap/ctl_cyrusdb.c.orig 2003-05-02 17:23:05.000000000 +0200 ++++ imap/ctl_cyrusdb.c 2003-07-26 14:21:45.000000000 +0200 @@ -231,9 +231,9 @@ /* create the names of the backup directories */ @@ -14,15 +14,6 @@ $NetBSD: patch-ak,v 1.2 2003/01/08 21:26:35 chris Exp $ syslog(LOG_NOTICE, "%s", msg); -@@ -274,7 +274,7 @@ - r2 = (dblist[i].env)->sync(); - if (r2) { - syslog(LOG_ERR, "DBERROR: sync %s: %s", dirname, -- cyrusdb_strerror(r)); -+ cyrusdb_strerror(r2)); - fprintf(stderr, - "ctl_cyrusdb: unable to sync environment\n"); - } @@ -289,6 +289,7 @@ struct dirent *dirent; @@ -40,21 +31,3 @@ $NetBSD: patch-ak,v 1.2 2003/01/08 21:26:35 chris Exp $ r2 = rmdir(backup2); /* move db.backup1 to db.backup2 */ -@@ -323,7 +324,7 @@ - - if (r2) { - syslog(LOG_ERR, "DBERROR: archive %s: %s", dirname, -- cyrusdb_strerror(r)); -+ cyrusdb_strerror(r2)); - fprintf(stderr, - "ctl_cyrusdb: unable to archive environment\n"); - } -@@ -342,7 +343,7 @@ - - r2 = (dblist[i].env)->done(); - if (r2) { -- syslog(LOG_ERR, "DBERROR: done: %s", cyrusdb_strerror(r)); -+ syslog(LOG_ERR, "DBERROR: done: %s", cyrusdb_strerror(r2)); - } - } - |