diff options
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 5 | ||||
| -rw-r--r-- | mail/cyrus-imapd/PLIST | 4 | ||||
| -rw-r--r-- | mail/cyrus-imapd/distinfo | 11 | ||||
| -rw-r--r-- | mail/cyrus-imapd/patches/patch-aa | 22 | ||||
| -rw-r--r-- | mail/cyrus-imapd/patches/patch-aq | 13 |
5 files changed, 12 insertions, 43 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 16ee5d36a10..92f62f1b8bf 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.64 2006/05/07 17:47:05 recht Exp $ +# $NetBSD: Makefile,v 1.65 2006/10/04 12:18:14 obache Exp $ -DISTNAME= cyrus-imapd-2.2.12 -PKGREVISION= 5 +DISTNAME= cyrus-imapd-2.2.13 CATEGORIES= mail MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ diff --git a/mail/cyrus-imapd/PLIST b/mail/cyrus-imapd/PLIST index 6fa4e1d81ae..d362c65769c 100644 --- a/mail/cyrus-imapd/PLIST +++ b/mail/cyrus-imapd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2005/05/02 20:33:59 reed Exp $ +@comment $NetBSD: PLIST,v 1.9 2006/10/04 12:18:14 obache Exp $ bin/imtest bin/installsieve bin/lmtptest @@ -77,6 +77,8 @@ include/cyrus/stristr.h include/cyrus/sysexits.h include/cyrus/util.h include/cyrus/xmalloc.h +include/cyrus/xstrlcat.h +include/cyrus/xstrlcpy.h lib/libcyrus.a lib/libcyrus_min.a man/man1/imtest.1 diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo index bd7bb19d8c8..39e0dbc85ed 100644 --- a/mail/cyrus-imapd/distinfo +++ b/mail/cyrus-imapd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.22 2006/05/07 17:47:05 recht Exp $ +$NetBSD: distinfo,v 1.23 2006/10/04 12:18:14 obache Exp $ -SHA1 (cyrus-imapd-2.2.12.tar.gz) = 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06 -RMD160 (cyrus-imapd-2.2.12.tar.gz) = ff4a95e519ea066ed9b21b515b18bdacaf0d1852 -Size (cyrus-imapd-2.2.12.tar.gz) = 1961161 bytes -SHA1 (patch-aa) = 248a84368764d57872425f49a32b33df25c5d17f +SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4 +RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 +Size (cyrus-imapd-2.2.13.tar.gz) = 2109770 bytes +SHA1 (patch-aa) = 379da5df874f3514d654d895e8b8e56a6f26c63d SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1 SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d @@ -11,7 +11,6 @@ SHA1 (patch-af) = de3c788417eaf8d7febd4903af4828c9a6e63e3d SHA1 (patch-al) = 6fa8967eb97f7cfdb93de86a45aa90ab3a1bd129 SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b -SHA1 (patch-aq) = 071fbe29ae526144e2bbea8b827eddfb8739693c SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33 SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15 diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa index 5d8cef338bd..bdd2f9cef9f 100644 --- a/mail/cyrus-imapd/patches/patch-aa +++ b/mail/cyrus-imapd/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2005/08/15 02:20:33 rh Exp $ +$NetBSD: patch-aa,v 1.6 2006/10/04 12:18:14 obache Exp $ ---- tools/config2header.orig 2004-06-23 05:02:31.000000000 +1000 +--- tools/config2header.orig 2005-04-19 20:54:32.000000000 +0200 +++ tools/config2header @@ -77,6 +77,14 @@ while ($#ARGV >= 0) { @@ -17,21 +17,3 @@ $NetBSD: patch-aa,v 1.5 2005/08/15 02:20:33 rh Exp $ die "wrong number of arguments" if ($#ARGV != 1); my ($cfile, $hfile) = @ARGV; -@@ -214,7 +222,6 @@ while (<STDIN>) { - print HFILE <<EOF - IMAPOPT_LAST - }; --extern struct imapopt_s imapopts[]; - - enum enum_value { - IMAP_ENUM_ZERO = 0, -@@ -260,6 +267,9 @@ print HFILE " const struct enum_optio - - print HFILE <<EOF - }; -+ -+extern struct imapopt_s imapopts[]; -+ - #endif /* INCLUDED_IMAPOPTIONS_H */ - EOF - ; diff --git a/mail/cyrus-imapd/patches/patch-aq b/mail/cyrus-imapd/patches/patch-aq deleted file mode 100644 index 56148f34d05..00000000000 --- a/mail/cyrus-imapd/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2006/05/07 17:47:05 recht Exp $ - ---- lib/cyrusdb_berkeley.c.orig 2006-05-07 19:27:50.000000000 +0200 -+++ lib/cyrusdb_berkeley.c 2006-05-07 19:28:04.000000000 +0200 -@@ -104,7 +104,7 @@ - exit(EC_TEMPFAIL); - } - --static void db_err(const char *db_prfx, char *buffer) -+static void db_err(const DB_ENV *dbenv, const char *db_prfx, char *buffer) - { - syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer); - } |