From 72af5b8a4e1d2d38521a5a4ebedb67e6e1774b45 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 13 Sep 2003 23:03:17 +0000 Subject: Update mail/cyrus-imapd21 to 2.1.15. Changes from version 2.1.14 include: * Correct a potential DOS attack in the fud daemon. * Arbitron now works again * Telemetry logging for mupdate * Duplicate Suppression logging for redirect sieve actions * A number of bugs in reconstruct have been fixed. also added the -p and -x options * Better stubbing out of user_deleteacl * No longer log any shutdown() failures * Improved IPv6 support (for systems with two getnameinfo implementations) * Misc Documentation Improvements --- mail/cyrus-imapd21/Makefile | 6 +++--- mail/cyrus-imapd21/distinfo | 14 ++++++++------ mail/cyrus-imapd21/patches/patch-aa | 17 ----------------- mail/cyrus-imapd21/patches/patch-ab | 21 +++++++++++++++++++++ mail/cyrus-imapd21/patches/patch-ac | 10 +++++----- mail/cyrus-imapd21/patches/patch-af | 18 ++++++++++++++---- 6 files changed, 51 insertions(+), 35 deletions(-) delete mode 100644 mail/cyrus-imapd21/patches/patch-aa create mode 100644 mail/cyrus-imapd21/patches/patch-ab (limited to 'mail/cyrus-imapd21') diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 9f9be021db6..2f984e6ccc2 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2003/09/13 20:09:57 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2003/09/13 23:03:17 jlam Exp $ -DISTNAME= cyrus-imapd-2.1.14 +DISTNAME= cyrus-imapd-2.1.15 SVR4_PKGNAME= cimap CATEGORIES= mail MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -23,7 +23,7 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL .if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES" PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/ -PATCHFILES= ${DISTNAME}-ipv6-20030703.diff.gz +PATCHFILES= ${DISTNAME}-ipv6-20030819.diff.gz .endif # CYRUS_USER username of the Cyrus administrator diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo index 4934861fbf8..141cb1d832d 100644 --- a/mail/cyrus-imapd21/distinfo +++ b/mail/cyrus-imapd21/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.8 2003/08/16 09:23:59 recht Exp $ +$NetBSD: distinfo,v 1.9 2003/09/13 23:03:17 jlam Exp $ -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) = f8692c380ece97839ee66ff34ff29d4a19b41ccd +SHA1 (cyrus-imapd-2.1.15.tar.gz) = d15490b23a222858688bb592797a0c4f0c4205de +Size (cyrus-imapd-2.1.15.tar.gz) = 1698648 bytes +SHA1 (cyrus-imapd-2.1.15-ipv6-20030819.diff.gz) = 3ee03f649ae4d9791e1a56d9cf11c514eab0312b +Size (cyrus-imapd-2.1.15-ipv6-20030819.diff.gz) = 33437 bytes +SHA1 (patch-ab) = c1c5cfa6b43d206224fa6107be9b4eae3302bb7f +SHA1 (patch-ac) = 44ec55f4811af1942872b4d276a0a2f57a803ef2 SHA1 (patch-ad) = 80329b5a72cb7aa6890304cd89912096f3a66df3 SHA1 (patch-ae) = 003d6ecc2caf0bf2985a871691ba970c6a6f4755 -SHA1 (patch-af) = 7bbb1e63c1bc3654732844fde4ac7311850fc770 +SHA1 (patch-af) = 0441995df180d9b20ffee88bf880fc711afa2558 SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892 SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1 diff --git a/mail/cyrus-imapd21/patches/patch-aa b/mail/cyrus-imapd21/patches/patch-aa deleted file mode 100644 index 8bcddc6f0b0..00000000000 --- a/mail/cyrus-imapd21/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/10/27 16:08:53 chris Exp $ - ---- imap/lmtpengine.h~ Fri Aug 2 17:54:49 2002 -+++ imap/lmtpengine.h Thu Aug 29 21:14:03 2002 -@@ -44,7 +44,12 @@ - #define LMTPENGINE_H - - /* configuration parameters */ -+#ifdef __NetBSD__ -+#include -+#define DEFAULT_SENDMAIL (_PATH_SENDMAIL) -+#else - #define DEFAULT_SENDMAIL ("/usr/lib/sendmail") -+#endif - #define DEFAULT_POSTMASTER ("postmaster") - - #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL)) diff --git a/mail/cyrus-imapd21/patches/patch-ab b/mail/cyrus-imapd21/patches/patch-ab new file mode 100644 index 00000000000..2dc4ec2bb11 --- /dev/null +++ b/mail/cyrus-imapd21/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.3 2003/09/13 23:03:18 jlam Exp $ + +--- acconfig.h.orig Sat Sep 13 16:49:05 2003 ++++ acconfig.h Sat Sep 13 17:01:59 2003 +@@ -270,8 +270,16 @@ + #define shutdown(fd, mode) 0 + #endif + ++#ifdef HAVE_PATHS_H ++#include ++#endif ++ + /* sendmail configuration parameters */ ++#if defined(_PATH_SENDMAIL) ++#define DEFAULT_SENDMAIL (_PATH_SENDMAIL) ++#else + #define DEFAULT_SENDMAIL ("/usr/lib/sendmail") ++#endif + #define DEFAULT_POSTMASTER ("postmaster") + + #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL)) diff --git a/mail/cyrus-imapd21/patches/patch-ac b/mail/cyrus-imapd21/patches/patch-ac index 8de04b0e8f9..1b73ceca1e0 100644 --- a/mail/cyrus-imapd21/patches/patch-ac +++ b/mail/cyrus-imapd21/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2003/08/16 09:23:59 recht Exp $ +$NetBSD: patch-ac,v 1.4 2003/09/13 23:03:18 jlam Exp $ ---- 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 @@ +--- imap/imapd.c.orig Sat Sep 13 16:49:05 2003 ++++ imap/imapd.c Sat Sep 13 16:49:22 2003 +@@ -5838,7 +5838,7 @@ { int i=0, j=0; char tagbuf[128]; @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2003/08/16 09:23:59 recht Exp $ struct buf tag, cmd, tmp, user; int r = 0; -@@ -5954,7 +5954,7 @@ +@@ -5953,7 +5953,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 dc074d2f046..62e98ccbc3e 100644 --- a/mail/cyrus-imapd21/patches/patch-af +++ b/mail/cyrus-imapd21/patches/patch-af @@ -1,8 +1,18 @@ -$NetBSD: patch-af,v 1.4 2003/08/16 09:23:59 recht Exp $ +$NetBSD: patch-af,v 1.5 2003/09/13 23:03:18 jlam Exp $ ---- 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 @@ +--- configure.in.orig Sat Sep 13 16:49:05 2003 ++++ configure.in Sat Sep 13 16:59:11 2003 +@@ -260,6 +260,9 @@ + dnl for et routines + AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR),AC_DEFINE(NEED_SYS_ERRLIST)) + ++dnl for path to sendmail ++AC_CHECK_HEADERS(paths.h) ++ + dnl for master fd limits + AC_CHECK_HEADERS(sys/resource.h) + AC_CHECK_FUNCS(setrlimit) +@@ -898,6 +901,10 @@ dnl and compile perl/cyradm PERL_SUBDIRS="imap" PERL="${with_perl}" -- cgit v1.2.3