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.

1 files changed, 55 insertions, 0 deletions

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