From a3b947fa15216493403696997f9c3ccbafc549aa Mon Sep 17 00:00:00 2001 From: Max Kalika Date: Tue, 20 Jan 2004 18:00:43 +0000 Subject: Bump version to 2.2.3. Major cleanup/rewrite: quote variables where possible; whitespace consistancy use more ebuild semantics (use_with, use_enable); drop creation of cyrus user; move all binaries to /usr/lib/cyrus from /usr/cyrus; make tcpd support optional, based on tcpd USE flag; add optional DRAC support, based on local drac USE flag; vastly simplified install procedure; move ssl files to /etc/ssl/cyrus from /etc/cyrusimapd; IMAP spool hashing fixes; startup script fixes; make PAM optional. Generate server.pem along with server.key and server.crt if USE=ssl. Depend on sed-4. Migrate to ssl-cert.eclass. --- net-mail/cyrus-imapd/files/2.1.14-db4.patch | 55 ---------------------- net-mail/cyrus-imapd/files/2.1.15-db4.patch | 55 ---------------------- .../files/cyrus-imapd-2.1.12-libwrap.patch | 14 ------ .../cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch | 55 ++++++++++++++++++++++ .../cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch | 55 ++++++++++++++++++++++ .../cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch | 28 +++++++++++ .../cyrus-imapd/files/cyrus-imapd-libwrap.patch | 14 ++++++ net-mail/cyrus-imapd/files/cyrus.conf | 28 ++++++----- net-mail/cyrus-imapd/files/cyrus.rc6 | 23 +++++++++ .../cyrus-imapd/files/digest-cyrus-imapd-2.2.3 | 1 + net-mail/cyrus-imapd/files/imap.pam | 6 +++ net-mail/cyrus-imapd/files/imapd.conf | 29 ++++++++++++ 12 files changed, 226 insertions(+), 137 deletions(-) delete mode 100644 net-mail/cyrus-imapd/files/2.1.14-db4.patch delete mode 100644 net-mail/cyrus-imapd/files/2.1.15-db4.patch delete mode 100644 net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-libwrap.patch create mode 100644 net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch create mode 100644 net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch create mode 100644 net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch create mode 100644 net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch create mode 100644 net-mail/cyrus-imapd/files/cyrus.rc6 create mode 100644 net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3 create mode 100644 net-mail/cyrus-imapd/files/imap.pam create mode 100644 net-mail/cyrus-imapd/files/imapd.conf (limited to 'net-mail/cyrus-imapd/files') diff --git a/net-mail/cyrus-imapd/files/2.1.14-db4.patch b/net-mail/cyrus-imapd/files/2.1.14-db4.patch deleted file mode 100644 index 78578f3a0969..000000000000 --- a/net-mail/cyrus-imapd/files/2.1.14-db4.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 ---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500 -+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500 -@@ -211,12 +211,20 @@ - BDB_LIBADD="" - fi - -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db - do -- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -- dblib="berkeley"; break, dblib="no") -+ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, dblib="no")) - done - if test "$dblib" = "no"; then -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db -+ do -+ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, dblib="no") -+ done -+ fi -+ if test "$dblib" = "no"; then - AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb"; - dblib="berkeley"; dbname=db, - dblib="no") -diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4 ---- cyrus-sasl-2.1.14/cmulocal/sasl2.m4 2003-05-14 13:36:41.000000000 -0500 -+++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4 2003-07-09 03:18:31.000000000 -0500 -@@ -25,8 +25,9 @@ - dnl - dnl The choice is reflected in GSSAPIBASE_LIBS - dnl we might need libdb -- AC_CHECK_LIB(db, db_open) -- -+ AC_CHECK_LIB(db, db_open,, -+ AC_CHECK_LIB(db, db_open_4001,, -+ AC_CHECK_LIB(db, db_open_4000))) - gss_impl="mit"; - AC_CHECK_LIB(resolv,res_search) - if test -d ${gssapi}; then -diff -urN cyrus-imapd-2.1.15/lib/cyrusdb_db3.c cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c ---- cyrus-imapd-2.1.15/lib/cyrusdb_db3.c 2003-08-12 20:51:31.000000000 +0200 -+++ cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c 2003-08-12 20:56:41.000000000 +0200 -@@ -80,6 +80,9 @@ - #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4) - #define txn_id(xx1) (xx1)->id(xx1) - #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3) -+#define txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4) -+#define txn_abort(xx1) (xx1)->abort(xx1) -+#define txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2) - #elif DB_VERSION_MINOR == 3 - #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3) - #endif diff --git a/net-mail/cyrus-imapd/files/2.1.15-db4.patch b/net-mail/cyrus-imapd/files/2.1.15-db4.patch deleted file mode 100644 index 9ad444fa985c..000000000000 --- a/net-mail/cyrus-imapd/files/2.1.15-db4.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 ---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500 -+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500 -@@ -211,12 +211,20 @@ - BDB_LIBADD="" - fi - -- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db - do -- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -- dblib="berkeley"; break, dblib="no") -+ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, dblib="no")) - done - if test "$dblib" = "no"; then -+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db -+ do -+ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; -+ dblib="berkeley"; break, dblib="no") -+ done -+ fi -+ if test "$dblib" = "no"; then - AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb"; - dblib="berkeley"; dbname=db, - dblib="no") -diff -urN cyrus-imapd-2.1.15/cmulocal/sasl2.m4 cyrus-imapd-2.1.15-modified/cmulocal/sasl2.m4 ---- cyrus-imapd-2.1.15/cmulocal/sasl2.m4 2003-05-15 13:36:41.000000000 -0500 -+++ cyrus-imapd-2.1.15-modified/cmulocal/sasl2.m4 2003-07-09 03:18:31.000000000 -0500 -@@ -26,8 +26,9 @@ - dnl - dnl The choice is reflected in GSSAPIBASE_LIBS - dnl we might need libdb -- AC_CHECK_LIB(db, db_open) -- -+ AC_CHECK_LIB(db, db_open,, -+ AC_CHECK_LIB(db, db_open_4001,, -+ AC_CHECK_LIB(db, db_open_4000))) - gss_impl="no"; - AC_CHECK_LIB(resolv,res_search) - if test -d ${gssapi}; then -diff -urN cyrus-imapd-2.1.15/lib/cyrusdb_db3.c cyrus-imapd-2.2.15-modified/lib/cyrusdb_db3.c ---- cyrus-imapd-2.1.15/lib/cyrusdb_db3.c 2003-08-12 20:51:31.000000000 +0200 -+++ cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c 2003-08-12 20:56:41.000000000 +0200 -@@ -80,6 +80,9 @@ - #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4) - #define txn_id(xx1) (xx1)->id(xx1) - #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3) -+#define txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4) -+#define txn_abort(xx1) (xx1)->abort(xx1) -+#define txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2) - #elif DB_VERSION_MINOR == 3 - #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3) - #endif diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-libwrap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-libwrap.patch deleted file mode 100644 index ee800779f5e4..000000000000 --- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-libwrap.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN cyrus-imapd-2.1.11/master/master.c cyrus-imapd-2.1.11-modified/master/master.c ---- cyrus-imapd-2.1.11/master/master.c 2002-11-01 10:44:33.000000000 -0600 -+++ cyrus-imapd-2.1.11-modified/master/master.c 2002-12-07 18:21:41.000000000 -0600 -@@ -103,6 +103,10 @@ - static int verbose = 0; - static int listen_queue_backlog = 32; - -+int allow_severity = LOG_DEBUG; -+int deny_severity = LOG_ERR; -+int hosts_ctl; -+ - struct service *Services = NULL; - int allocservices = 0; - int nservices = 0; diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch new file mode 100644 index 000000000000..78578f3a0969 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch @@ -0,0 +1,55 @@ +diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 +--- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500 ++++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500 +@@ -211,12 +211,20 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db + do +- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; +- dblib="berkeley"; break, dblib="no") ++ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no")) + done + if test "$dblib" = "no"; then ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ do ++ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no") ++ done ++ fi ++ if test "$dblib" = "no"; then + AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb"; + dblib="berkeley"; dbname=db, + dblib="no") +diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4 +--- cyrus-sasl-2.1.14/cmulocal/sasl2.m4 2003-05-14 13:36:41.000000000 -0500 ++++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4 2003-07-09 03:18:31.000000000 -0500 +@@ -25,8 +25,9 @@ + dnl + dnl The choice is reflected in GSSAPIBASE_LIBS + dnl we might need libdb +- AC_CHECK_LIB(db, db_open) +- ++ AC_CHECK_LIB(db, db_open,, ++ AC_CHECK_LIB(db, db_open_4001,, ++ AC_CHECK_LIB(db, db_open_4000))) + gss_impl="mit"; + AC_CHECK_LIB(resolv,res_search) + if test -d ${gssapi}; then +diff -urN cyrus-imapd-2.1.15/lib/cyrusdb_db3.c cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c +--- cyrus-imapd-2.1.15/lib/cyrusdb_db3.c 2003-08-12 20:51:31.000000000 +0200 ++++ cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c 2003-08-12 20:56:41.000000000 +0200 +@@ -80,6 +80,9 @@ + #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4) + #define txn_id(xx1) (xx1)->id(xx1) + #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3) ++#define txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4) ++#define txn_abort(xx1) (xx1)->abort(xx1) ++#define txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2) + #elif DB_VERSION_MINOR == 3 + #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3) + #endif diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch new file mode 100644 index 000000000000..9ad444fa985c --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch @@ -0,0 +1,55 @@ +diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 +--- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500 ++++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500 +@@ -211,12 +211,20 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db + do +- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; +- dblib="berkeley"; break, dblib="no") ++ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no")) + done + if test "$dblib" = "no"; then ++ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ do ++ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no") ++ done ++ fi ++ if test "$dblib" = "no"; then + AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb"; + dblib="berkeley"; dbname=db, + dblib="no") +diff -urN cyrus-imapd-2.1.15/cmulocal/sasl2.m4 cyrus-imapd-2.1.15-modified/cmulocal/sasl2.m4 +--- cyrus-imapd-2.1.15/cmulocal/sasl2.m4 2003-05-15 13:36:41.000000000 -0500 ++++ cyrus-imapd-2.1.15-modified/cmulocal/sasl2.m4 2003-07-09 03:18:31.000000000 -0500 +@@ -26,8 +26,9 @@ + dnl + dnl The choice is reflected in GSSAPIBASE_LIBS + dnl we might need libdb +- AC_CHECK_LIB(db, db_open) +- ++ AC_CHECK_LIB(db, db_open,, ++ AC_CHECK_LIB(db, db_open_4001,, ++ AC_CHECK_LIB(db, db_open_4000))) + gss_impl="no"; + AC_CHECK_LIB(resolv,res_search) + if test -d ${gssapi}; then +diff -urN cyrus-imapd-2.1.15/lib/cyrusdb_db3.c cyrus-imapd-2.2.15-modified/lib/cyrusdb_db3.c +--- cyrus-imapd-2.1.15/lib/cyrusdb_db3.c 2003-08-12 20:51:31.000000000 +0200 ++++ cyrus-imapd-2.1.15-modified/lib/cyrusdb_db3.c 2003-08-12 20:56:41.000000000 +0200 +@@ -80,6 +80,9 @@ + #define txn_checkpoint(xx1,xx2,xx3,xx4) (xx1)->txn_checkpoint(xx1,xx2,xx3,xx4) + #define txn_id(xx1) (xx1)->id(xx1) + #define log_archive(xx1,xx2,xx3,xx4) (xx1)->log_archive(xx1,xx2,xx3) ++#define txn_begin(xx1,xx2,xx3,xx4) (xx1)->txn_begin(xx1,xx2,xx3,xx4) ++#define txn_abort(xx1) (xx1)->abort(xx1) ++#define txn_commit(xx1,xx2) (xx1)->commit(xx1,xx2) + #elif DB_VERSION_MINOR == 3 + #define log_archive(xx1,xx2,xx3,xx4) log_archive(xx1,xx2,xx3) + #endif diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch new file mode 100644 index 000000000000..ace2f28ea8e1 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch @@ -0,0 +1,28 @@ +diff -urN cyrus-imapd-2.2.3/cmulocal/berkdb.m4 cyrus-imapd-2.2.3/cmulocal/berkdb.m4 +--- cyrus-imapd-2.2.3/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500 ++++ cyrus-imapd-2.2.3/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500 +@@ -211,12 +211,21 @@ + BDB_LIBADD="" + fi + +- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db + do +- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; +- dblib="berkeley"; break, dblib="no") ++ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no"))) + done + if test "$dblib" = "no"; then ++ for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db ++ do ++ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname"; ++ dblib="berkeley"; break, dblib="no") ++ done ++ fi ++ if test "$dblib" = "no"; then + AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb"; + dblib="berkeley"; dbname=db, + dblib="no") diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch new file mode 100644 index 000000000000..ee800779f5e4 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch @@ -0,0 +1,14 @@ +diff -urN cyrus-imapd-2.1.11/master/master.c cyrus-imapd-2.1.11-modified/master/master.c +--- cyrus-imapd-2.1.11/master/master.c 2002-11-01 10:44:33.000000000 -0600 ++++ cyrus-imapd-2.1.11-modified/master/master.c 2002-12-07 18:21:41.000000000 -0600 +@@ -103,6 +103,10 @@ + static int verbose = 0; + static int listen_queue_backlog = 32; + ++int allow_severity = LOG_DEBUG; ++int deny_severity = LOG_ERR; ++int hosts_ctl; ++ + struct service *Services = NULL; + int allocservices = 0; + int nservices = 0; diff --git a/net-mail/cyrus-imapd/files/cyrus.conf b/net-mail/cyrus-imapd/files/cyrus.conf index d4fd6dd5f2d8..d795322c8d2f 100644 --- a/net-mail/cyrus-imapd/files/cyrus.conf +++ b/net-mail/cyrus-imapd/files/cyrus.conf @@ -1,41 +1,43 @@ -# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.conf,v 1.2 2002/09/23 17:29:34 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.conf,v 1.3 2004/01/20 18:00:43 max Exp $ -# standard standalone server implementation +# Standard standalone server configuration. START { - # do not delete this entry! + # Do not delete this entry! recover cmd="ctl_cyrusdb -r" - # this is only necessary if using idled for IMAP IDLE -# idled cmd="idled" + # This is only necessary if using idled for IMAP IDLE. + #idled cmd="idled" } -# UNIX sockets start with a slash and are put into /var/imap/socket +# UNIX sockets start with a slash and are put into /var/imap/socket. SERVICES { - # add or remove based on preferences + # Add or remove based on preferences. imap cmd="imapd" listen="imap2" prefork=0 pop3 cmd="pop3d" listen="pop-3" prefork=0 + # Don't forget to generate the needed keys for SSL or TLS - # (see doc/html/install-configure.html) + # (see doc/html/install-configure.html). #imaps cmd="imapd -s" listen="imaps" prefork=0 #pop3s cmd="pop3d -s" listen="pop3s" prefork=0 + sieve cmd="timsieved" listen="sieve" prefork=0 # at least one LMTP is required for delivery -# lmtp cmd="lmtpd" listen="lmtp" prefork=0 + #lmtp cmd="lmtpd" listen="lmtp" prefork=0 lmtpunix cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0 # this is only necessary if using notifications -# notify cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1 + #notify cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1 } EVENTS { - # this is required + # This is required. checkpoint cmd="ctl_cyrusdb -c" period=30 - # this is only necessary if using duplicate delivery suppression + # This is only necessary if using duplicate delivery suppression. delprune cmd="ctl_deliver -E 3" period=1440 - # this is only necessary if caching TLS sessions + # This is only necessary if caching TLS sessions. tlsprune cmd="tls_prune" period=1440 } diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6 b/net-mail/cyrus-imapd/files/cyrus.rc6 new file mode 100644 index 000000000000..3599b91e7aa7 --- /dev/null +++ b/net-mail/cyrus-imapd/files/cyrus.rc6 @@ -0,0 +1,23 @@ +#!/sbin/runscript +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.rc6,v 1.4 2004/01/20 18:00:43 max Exp $ + +depend() { + need net + use dns logger + after drac saslauthd +} + +start() { + ebegin "Starting cyrus imapd" + start-stop-daemon --start --quiet --background \ + --exec /usr/lib/cyrus/master + eend $? +} + +stop() { + ebegin "Stopping cyrus imapd" + start-stop-daemon --stop --quiet --pidfile /var/run/cyrus-master.pid + eend $? +} diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3 new file mode 100644 index 000000000000..68980bd5b063 --- /dev/null +++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3 @@ -0,0 +1 @@ +MD5 32888c5120edeb2867d6283fedbdb7d5 cyrus-imapd-2.2.3.tar.gz 1887717 diff --git a/net-mail/cyrus-imapd/files/imap.pam b/net-mail/cyrus-imapd/files/imap.pam new file mode 100644 index 000000000000..17ddb9f466d0 --- /dev/null +++ b/net-mail/cyrus-imapd/files/imap.pam @@ -0,0 +1,6 @@ +#%PAM-1.0 + +auth required /lib/security/pam_nologin.so +auth required /lib/security/pam_stack.so service=system-auth + +account required /lib/security/pam_stack.so service=system-auth diff --git a/net-mail/cyrus-imapd/files/imapd.conf b/net-mail/cyrus-imapd/files/imapd.conf new file mode 100644 index 000000000000..334f3cfaf05a --- /dev/null +++ b/net-mail/cyrus-imapd/files/imapd.conf @@ -0,0 +1,29 @@ +# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/imapd.conf,v 1.3 2004/01/20 18:00:43 max Exp $ + +# Don't forget to use chattr +S (if you are using ext[23]) +# when you change these directories (read the docs). +configdirectory: /var/imap +partition-default: /var/spool/imap +sievedir: /var/imap/sieve + +tls_ca_path: /etc/ssl/certs +tls_cert_file: /etc/ssl/cyrus/server.crt +tls_key_file: /etc/ssl/cyrus/server.key + +# Don't use an everyday user as admin. +admins: cyrus + +hashimapspool: yes +allowanonymouslogin: no +allowplaintext: no + +# Allow renaming of top-level mailboxes. +#allowusermoves: yes + +# Use this if sieve-scripts could be in ~user/.sieve. +#sieveusehomedir: yes + +# Use saslauthd if you want to use pam for imap. +# But be warned: login with DIGEST-MD5 or CRAM-MD5 +# is not possible using pam. +#sasl_pwcheck_method: saslauthd -- cgit v1.2.3-65-gdbad