Version bump.

4 files changed, 235 insertions, 27 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 9386035141eb..42e8d5f3cb58 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,39 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f63c1c0c6c6c39c25c44dbb32c0f93d8 ChangeLog 9308
-MD5 cd65423d236df0ea84d39c68c735d674 cyrus-imapd-2.1.12.ebuild 6860
 MD5 e5bb7e5821f9b2b9ecb24998f731a007 cyrus-imapd-2.1.13.ebuild 6868
-MD5 790311e06d810db05f12e0a9783e760f cyrus-imapd-2.1.14.ebuild 6999
-MD5 99e75457cd862847a84466ddf5ad9f3c cyrus-imapd-2.1.15-r1.ebuild 7036
 MD5 10c1bb9bddc6970c1bb557721ddc5e66 cyrus-imapd-2.1.15.ebuild 6980
+MD5 cd65423d236df0ea84d39c68c735d674 cyrus-imapd-2.1.12.ebuild 6860
+MD5 99e75457cd862847a84466ddf5ad9f3c cyrus-imapd-2.1.15-r1.ebuild 7036
+MD5 790311e06d810db05f12e0a9783e760f cyrus-imapd-2.1.14.ebuild 6999
+MD5 445289d7d364dddaca96b63c210b06e6 cyrus-imapd-2.2.8.ebuild 5288
 MD5 bdc2f0c872314dabaaafe5891dcdf73b cyrus-imapd-2.2.3.ebuild 5237
+MD5 f63c1c0c6c6c39c25c44dbb32c0f93d8 ChangeLog 9308
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 c6c0c19a7fdab57bee419fac05f20f36 files/cyrus-imapd-2.1.14-db4.patch 2756
-MD5 75e1eaf365d192b2992bac8d61595a79 files/cyrus-imapd-2.1.15-db4.patch 2759
 MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
-MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
-MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
 MD5 375e343e1080fa924b085d5495e13588 files/cyrus.rc6 556
-MD5 a2bcd5a2f5919eb602240b429c764d3a files/cyrus.rc6_2 614
 MD5 bc1ec4f1a5502b3381283e7d2765896e files/cyrus_2.conf 1345
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
-MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
-MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imapd-2.1.14 155
-MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15 155
+MD5 75e1eaf365d192b2992bac8d61595a79 files/cyrus-imapd-2.1.15-db4.patch 2759
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15-r1 155
-MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imapd-2.2.3 70
+MD5 fb335e67152d5b24e1405c01a24f0978 files/imapd.conf 875
+MD5 a2bcd5a2f5919eb602240b429c764d3a files/cyrus.rc6_2 614
+MD5 c6c0c19a7fdab57bee419fac05f20f36 files/cyrus-imapd-2.1.14-db4.patch 2756
 MD5 7780b2b09779674f551f030be3cdb34d files/gentestcrt.sh 8804
 MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
-MD5 fb335e67152d5b24e1405c01a24f0978 files/imapd.conf 875
-MD5 c46d8460abec45aa38562cebc6edb434 files/imapd_2.conf 770
 MD5 959399de17330ea5f52ef56cb6c5ffcd files/master.8.diff 1280
+MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.8-db4.patch 1604
+MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imapd-2.2.3 70
+MD5 6453c70342b78c99a073a06292b7e757 files/digest-cyrus-imapd-2.2.8 70
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
+MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
+MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imapd-2.1.14 155
+MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15 155
 MD5 dc1f65f55fac1a36aadf276f5c716f2f files/pam.d-imap 214
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+fgUmdTrptrqvGERApPAAKCKxfL3zQw+HgYYN04JbpavC9ZfDQCcClGB
-WJ4/j61Ig2uGFKFZHjQmJh4=
-=FSaj
------END PGP SIGNATURE-----
+MD5 c46d8460abec45aa38562cebc6edb434 files/imapd_2.conf 770
+MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
+MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild
new file mode 100644
index 000000000000..8111671edf18
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.8.ebuild,v 1.1 2004/08/21 23:46:24 langthang Exp $
+
+inherit eutils ssl-cert gnuconfig
+
+DESCRIPTION="The Cyrus IMAP Server."
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE="afs drac kerberos pam snmp ssl tcpd"
+
+PROVIDE="virtual/imapd"
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( >=net-fs/openafs-1.2.2 )
+	pam? ( >=sys-libs/pam-0.75 )
+	kerberos? ( virtual/krb5 )
+	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	drac? ( >=mail-client/drac-1.12-r1 )"
+
+DEPEND="$RDEPEND
+	sys-devel/libtool
+	>=sys-devel/autoconf-2.58
+	sys-devel/automake
+	>=sys-apps/sed-4"
+
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Add drac database support.
+	if use drac ; then
+		epatch "${S}/contrib/drac_auth.patch"
+	fi
+
+	# Add libwrap defines as we don't have a dynamicly linked library.
+	if use tcpd ; then
+		epatch "${FILESDIR}/${PN}-libwrap.patch"
+	fi
+
+	# DB4 detection and versioned symbols.
+	epatch "${FILESDIR}/${P}-db4.patch"
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			-i "${i}" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8
+	sed -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		-i man/cyrusmaster.8 || die "sed failed"
+
+	# Recreate configure.
+	export WANT_AUTOCONF="2.5"
+	gnuconfig_update
+	rm -rf configure config.h.in autom4te.cache || die
+	ebegin "Recreating configure"
+	sh SMakefile &>/dev/null || die "SMakefile failed"
+	eend $?
+
+	# When linking with rpm, you need to link with more libraries.
+	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} `use_with afs`"
+	myconf="${myconf} `use_with drac`"
+	myconf="${myconf} `use_with ssl openssl`"
+	myconf="${myconf} `use_with snmp ucdsnmp`"
+	myconf="${myconf} `use_with tcpd libwrap`"
+	myconf="${myconf} `use_enable kerberos gssapi`"
+
+	econf \
+		--enable-murder \
+		--enable-listext \
+		--enable-netscapehack \
+		--with-extraident=Gentoo \
+		--with-service-path=/usr/lib/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-auth=unix \
+		--without-perl \
+		--disable-cyradm \
+		${myconf} || die "econf failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib
+	for subdir in master imap imtest timsieved notifyd ; do
+		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
+	done
+
+	# Link master to cyrusmaster (postfix has a master too)
+	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
+
+	doman man/*.[0-8]
+	dodoc COPYRIGHT README*
+	dohtml doc/*.html doc/murder.png
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
+
+	insinto /etc
+	newins "${FILESDIR}/imapd.conf" imapd.conf
+	newins "${FILESDIR}/cyrus.conf" cyrus.conf
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/cyrus.rc6" cyrus
+
+	if use pam ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/imap.pam" imap
+	fi
+
+	if use ssl ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
+		insinto /etc/ssl/cyrus
+		docert server
+		fowners cyrus:mail /etc/ssl/cyrus/server.{key,pem}
+	fi
+
+	for subdir in imap/{,db,log,msg,proc,socket} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	ewarn "*****NOTE*****"
+	ewarn "If you're upgrading from versions prior to 2.2.2_BETA"
+	ewarn "be sure to read the following thoroughly:"
+	ewarn "http://asg.web.cmu.edu/cyrus/download/imapd/install-upgrade.html"
+	ewarn "*****NOTE*****"
+	echo
+
+	ewarn "If you change the fs-type of /var/imap or"
+	ewarn "/var/spool/imap you should read step 9 of"
+	ewarn "/usr/share/doc/${P}/html/install-configure.html."
+	echo
+
+	if df -T /var/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
+		chattr +S /var/imap/{user,quota}{,/*}
+		eend $?
+	fi
+
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/spool/imap/* synchronous."
+		chattr +S /var/spool/imap{,/*}
+		eend $?
+	fi
+
+	ewarn "If the queue directory of the mail daemon resides on an ext2"
+	ewarn "or ext3 filesystem you need to set it manually to update"
+	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
+	echo
+
+	einfo "For correct logging add the following to /etc/syslog.conf:"
+	einfo "    local6.*         /var/log/imapd.log"
+	einfo "    auth.debug       /var/log/auth.log"
+	echo
+
+	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
+	ewarn "    saslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.8-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.8-db4.patch
new file mode 100644
index 000000000000..ace2f28ea8e1
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.8-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/digest-cyrus-imapd-2.2.8 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.8
new file mode 100644
index 000000000000..71e992ff60ac
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.8
@@ -0,0 +1 @@
+MD5 7e6cb571e1d9b648725aa579077f6f8d cyrus-imapd-2.2.8.tar.gz 1937828