Import cyrus-imapd-2.4.2 as mail/cyrus-imapd24.

IMAP (Internet Message Access Protocol) is an Internet standards-track
protocol for accessing messages (mail, bboards, news, etc). The Cyrus
IMAP server differs from other IMAP server implementations in that it
is generally intended to be run on "sealed" servers, where normal users
are not permitted to log in. The mailbox database is stored in parts of
the filesystem that are private to the Cyrus IMAP system. All user
access to mail is through the IMAP, POP3, or KPOP protocols.

18 files changed, 350 insertions, 0 deletions

diff --git a/mail/cyrus-imapd24/patches/patch-aa b/mail/cyrus-imapd24/patches/patch-aa
new file mode 100644
index 00000000000..d6f529132d6
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- configure.in.orig	2010-10-19 03:08:28.000000000 +0000
++++ configure.in
+@@ -391,11 +391,11 @@ if test "$sievedir" != "no"; then
+ 	AC_CHECK_LIB(fl,main)
+ 
+ 	AC_CHECK_HEADERS(pcreposix.h rxposix.h)
+-	if test "$ac_cv_header_pcreposix_h" == "yes"; then
++	if test "$ac_cv_header_pcreposix_h" = "yes"; then
+ 		LIBS="$LIBS -lpcre -lpcreposix";
+ 		AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
+ 	else 
+-		if test "$ac_cv_header_rxposix_h" == "yes"; then
++		if test "$ac_cv_header_rxposix_h" = "yes"; then
+ 			LIBS="$LIBS -lrx"
+ 			AC_DEFINE(ENABLE_REGEX, [],
+ 				  [Do we have a regex library?])
diff --git a/mail/cyrus-imapd24/patches/patch-ab b/mail/cyrus-imapd24/patches/patch-ab
new file mode 100644
index 00000000000..8a592f11387
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- configure.orig	2010-10-19 09:58:48.000000000 +0000
++++ configure
+@@ -7145,13 +7145,13 @@ fi
+ 
+ done
+ 
+-	if test "$ac_cv_header_pcreposix_h" == "yes"; then
++	if test "$ac_cv_header_pcreposix_h" = "yes"; then
+ 		LIBS="$LIBS -lpcre -lpcreposix";
+ 
+ $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
+ 
+ 	else
+-		if test "$ac_cv_header_rxposix_h" == "yes"; then
++		if test "$ac_cv_header_rxposix_h" = "yes"; then
+ 			LIBS="$LIBS -lrx"
+ 
+ $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
diff --git a/mail/cyrus-imapd24/patches/patch-ac b/mail/cyrus-imapd24/patches/patch-ac
new file mode 100644
index 00000000000..d6c816767b9
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ac
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imap/Makefile.in.orig	2010-10-19 03:08:28.000000000 +0000
++++ imap/Makefile.in
+@@ -179,6 +179,9 @@ mupdate_err.c: mupdate_err.et
+ 
+ mupdate_err.h: mupdate_err.c
+ 
++mutex_pthread.o: mutex_pthread.c
++	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $<
++
+ ### Services
+ idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
+ 	$(CC) $(LDFLAGS) -o idled \
+@@ -213,16 +216,16 @@ imapd.quant: $(IMAPDOBJS) mutex_fake.o l
+ 
+ mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
+ 	libimap.a $(DEPLIBS)
+-	$(CC) $(LDFLAGS) -o mupdate \
++	$(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate \
+ 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+ 	 mutex_pthread.o tls.o libimap.a \
+-	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+ 
+ mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
+ 	libimap.a $(DEPLIBS)
+-	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
++	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \
+ 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+-	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
++	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
+ 
+ pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
+ 	$(DEPLIBS) $(SERVICE)
diff --git a/mail/cyrus-imapd24/patches/patch-ad b/mail/cyrus-imapd24/patches/patch-ad
new file mode 100644
index 00000000000..1c46325bdec
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imap/cvt_cyrusdb.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ imap/cvt_cyrusdb.c
+@@ -59,7 +59,9 @@
+ #include <syslog.h>
+ 
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ 
+ #include "acl.h"
+ #include "assert.h"
diff --git a/mail/cyrus-imapd24/patches/patch-ae b/mail/cyrus-imapd24/patches/patch-ae
new file mode 100644
index 00000000000..02e8c1aa999
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imap/mboxlist.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ imap/mboxlist.c
+@@ -59,7 +59,9 @@
+ #include <syslog.h>
+ 
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ 
+ #include "acl.h"
+ #include "annotate.h"
diff --git a/mail/cyrus-imapd24/patches/patch-af b/mail/cyrus-imapd24/patches/patch-af
new file mode 100644
index 00000000000..9f655ed67b2
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imap/message.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ imap/message.c
+@@ -76,6 +76,10 @@
+ #include "global.h"
+ #include "retry.h"
+ 
++#ifdef __APPLE__
++struct et_list *_et_list = NULL;
++#endif
++
+ /* Message being parsed */
+ struct msg {
+     const char *base;
diff --git a/mail/cyrus-imapd24/patches/patch-ag b/mail/cyrus-imapd24/patches/patch-ag
new file mode 100644
index 00000000000..c527504b55c
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ag
@@ -0,0 +1,25 @@
+$NetBSD: patch-ag,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imtest/imtest.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ imtest/imtest.c
+@@ -49,7 +49,9 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+@@ -74,6 +76,10 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++
+ #include <sasl/sasl.h>
+ #include <sasl/saslutil.h>
+ 
diff --git a/mail/cyrus-imapd24/patches/patch-ah b/mail/cyrus-imapd24/patches/patch-ah
new file mode 100644
index 00000000000..b9c79ca6f58
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- perl/Makefile.in.orig	2010-10-19 03:08:28.000000000 +0000
++++ perl/Makefile.in
+@@ -86,7 +86,7 @@ all::
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
+ 			fi; \
+ 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
diff --git a/mail/cyrus-imapd24/patches/patch-ai b/mail/cyrus-imapd24/patches/patch-ai
new file mode 100644
index 00000000000..c6b717bfedf
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- perl/sieve/Makefile.in.orig	2010-10-19 03:08:28.000000000 +0000
++++ perl/sieve/Makefile.in
+@@ -86,7 +86,7 @@ all::
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
+ 			fi; \
+ 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
diff --git a/mail/cyrus-imapd24/patches/patch-aj b/mail/cyrus-imapd24/patches/patch-aj
new file mode 100644
index 00000000000..321acb39dc4
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- perl/sieve/lib/request.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ perl/sieve/lib/request.c
+@@ -52,7 +52,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
++#if !defined(__APPLE__)
+ #include <sys/msg.h>
++#endif
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/mail/cyrus-imapd24/patches/patch-ak b/mail/cyrus-imapd24/patches/patch-ak
new file mode 100644
index 00000000000..06a3a75d14d
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- sieve/sievec.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ sieve/sievec.c
+@@ -63,6 +63,10 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
++#ifdef __APPLE__
++struct et_list *_et_list = NULL;
++#endif
++
+ /* config.c stuff */
+ const int config_need_data = 0;
+ 
diff --git a/mail/cyrus-imapd24/patches/patch-al b/mail/cyrus-imapd24/patches/patch-al
new file mode 100644
index 00000000000..4144574e4b4
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- sieve/sieved.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ sieve/sieved.c
+@@ -63,6 +63,10 @@
+ 
+ #include "map.h"
+ 
++#ifdef __APPLE__
++struct et_list *_et_list = NULL;
++#endif
++
+ /* config.c stuff */
+ const int config_need_data = 0;
+ 
diff --git a/mail/cyrus-imapd24/patches/patch-am b/mail/cyrus-imapd24/patches/patch-am
new file mode 100644
index 00000000000..d7500fdf2c4
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-am
@@ -0,0 +1,19 @@
+$NetBSD: patch-am,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- tools/config2header.orig	2010-10-19 03:08:28.000000000 +0000
++++ tools/config2header
+@@ -79,6 +79,14 @@ while ($#ARGV >= 0) {
+ 
+ my $use_gcc_extension = ($CC and $CC eq 'gcc');
+ 
++#
++# Skip any CC options such as -pipe
++# The last two parameters are the .c and .h files
++#
++while ($#ARGV > 1) {
++	shift @ARGV;
++}
++
+ die "wrong number of arguments" if ($#ARGV != 1);
+ my ($cfile, $hfile) = @ARGV;
+ 
diff --git a/mail/cyrus-imapd24/patches/patch-an b/mail/cyrus-imapd24/patches/patch-an
new file mode 100644
index 00000000000..9013b4eb056
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-an
@@ -0,0 +1,22 @@
+$NetBSD: patch-an,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imap/tls.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ imap/tls.c
+@@ -223,7 +223,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
+     return (rsa_tmp);
+ }
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_LACK_BN_CONST)
+ /* Logic copied from OpenSSL apps/s_server.c: give the TLS context
+  * DH params to work with DHE-* cipher suites. Hardcoded fallback
+  * in case no DH params in tls_key_file or tls_cert_file.
+@@ -734,7 +734,7 @@ int     tls_init_serverengine(const char
+     }
+     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_LACK_BN_CONST)
+     /* Load DH params for DHE-* key exchanges */
+     SSL_CTX_set_tmp_dh(s_ctx, load_dh_param(s_key_file, s_cert_file));
+     /* FIXME: Load ECDH params for ECDHE suites when 0.9.9 is released */
diff --git a/mail/cyrus-imapd24/patches/patch-ao b/mail/cyrus-imapd24/patches/patch-ao
new file mode 100644
index 00000000000..13845710810
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imap/imap_err.et.orig	2010-10-19 03:08:28.000000000 +0000
++++ imap/imap_err.et
+@@ -201,10 +201,10 @@ ec IMAP_NO_MSGGONE,
+    "Message %d no longer exists"
+ 
+ ec IMAP_NO_CHECKSEEN,
+-   "Unable to checkpoint \\Seen state"
++   "Unable to checkpoint \\\\Seen state"
+ 
+ ec IMAP_NO_CHECKPRESERVE,
+-   "Unable to preserve \\Seen state"
++   "Unable to preserve \\\\Seen state"
+ 
+ ec IMAP_NO_NOSUCHMSG,
+    "No matching messages"
diff --git a/mail/cyrus-imapd24/patches/patch-ap b/mail/cyrus-imapd24/patches/patch-ap
new file mode 100644
index 00000000000..b157e682681
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ap
@@ -0,0 +1,51 @@
+$NetBSD: patch-ap,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+Fix building with db5.
+
+--- lib/cyrusdb_berkeley.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ lib/cyrusdb_berkeley.c
+@@ -108,7 +108,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
+@@ -163,7 +163,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);
+@@ -281,7 +281,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))
+@@ -289,7 +289,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) {
+@@ -412,7 +412,7 @@ static int myopen(const char *fname, DBT
+     /* xxx set comparator! */
+     if (flags & CYRUSDB_MBOXSORT) db->set_bt_compare(db, mbox_compar);
+ 
+-#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);
diff --git a/mail/cyrus-imapd24/patches/patch-aq b/mail/cyrus-imapd24/patches/patch-aq
new file mode 100644
index 00000000000..e0b0156723f
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- imap/sync_client.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ imap/sync_client.c
+@@ -92,6 +92,10 @@
+ #include "signals.h"
+ #include "cyrusdb.h"
+ 
++#ifndef SOL_TCP
++#define SOL_TCP IPPROTO_TCP
++#endif
++
+ /* signal to config.c */
+ const int config_need_data = 0;  /* YYY */
+ 
diff --git a/mail/cyrus-imapd24/patches/patch-ar b/mail/cyrus-imapd24/patches/patch-ar
new file mode 100644
index 00000000000..08d346dc56b
--- /dev/null
+++ b/mail/cyrus-imapd24/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1.1.1 2010/10/30 12:12:35 obache Exp $
+
+--- master/service.c.orig	2010-10-19 03:08:28.000000000 +0000
++++ master/service.c
+@@ -76,6 +76,10 @@
+ #include "xstrlcat.h"
+ #include "signals.h"
+ 
++#ifndef SOL_TCP
++#define SOL_TCP IPPROTO_TCP
++#endif
++
+ extern int optind, opterr;
+ extern char *optarg;
+