new testing release.

(Portage version: 2.1_pre3-r1)

5 files changed, 334 insertions, 16 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 4c360e1f968a..bd8a7434687c 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imapd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.76 2005/07/20 16:51:52 strerror Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.77 2006/01/10 20:32:55 langthang Exp $
+
+*cyrus-imapd-2.3.1 (10 Jan 2006)
+
+  10 Jan 2006; Tuấn Văn <langthang@gentoo.org>
+  +files/cyrus-imapd-2.3.1-drac.patch, +cyrus-imapd-2.3.1.ebuild:
+  New testing release.
 
 *cyrus-imapd-2.2.12-r3 (20 Jul 2005)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index aa4adbb3c0eb..0a081568040c 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,25 +1,28 @@
+MD5 e6da98cb3c7ab36eb3e1e4270fcf09fb ChangeLog 14832
+MD5 94b7b5a9e866775b5f76d1c0d672a414 cyrus-imapd-2.2.10-r1.ebuild 9134
 MD5 ced6ee910436e03f72d9d0bc72ea1b9b cyrus-imapd-2.2.10.ebuild 8735
 MD5 e0323e25f3fcda3dcc9a991e394db445 cyrus-imapd-2.2.12-r1.ebuild 9369
-MD5 4c0f69e2d9c9b56f51069f98544000e2 cyrus-imapd-2.2.12.ebuild 9132
-MD5 4c88b12181bd8de5b359192607a922e9 cyrus-imapd-2.2.12-r3.ebuild 9246
-MD5 94b7b5a9e866775b5f76d1c0d672a414 cyrus-imapd-2.2.10-r1.ebuild 9134
 MD5 1b657d8264a75acd8c920b267c8857f6 cyrus-imapd-2.2.12-r2.ebuild 9168
-MD5 e6da98cb3c7ab36eb3e1e4270fcf09fb ChangeLog 14832
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 756c504a8b0b90aaa0630c089ae42f50 files/cyrus.rc6 573
+MD5 4c88b12181bd8de5b359192607a922e9 cyrus-imapd-2.2.12-r3.ebuild 9246
+MD5 4c0f69e2d9c9b56f51069f98544000e2 cyrus-imapd-2.2.12.ebuild 9132
+MD5 30a7ec427c78c13eb7f782c19fec7fec cyrus-imapd-2.3.1.ebuild 8264
+MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
+MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
 MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.12-drac.patch 926
+MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.12-libwrap.patch 390
+MD5 0e81f80785347aff06cecae136fda4e5 files/cyrus-imapd-2.3.1-drac.patch 896
 MD5 e76f31d728a283bf2dd2fb5b5a853af8 files/cyrus-imapd-unsupported-8bit.patch 3342
+MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
 MD5 08017debe8d02c695ec456e1165d920d files/cyrus.confd 279
-MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
+MD5 b8da82b13f99b84321a976a8f41d2a49 files/cyrus.pam-include 109
+MD5 756c504a8b0b90aaa0630c089ae42f50 files/cyrus.rc6 573
+MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10 71
 MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10-r1 71
+MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12 71
 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12-r1 71
 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12-r2 71
 MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12-r3 71
+MD5 0b3de6cdb50c6422f35588a9f8a5c5dc files/digest-cyrus-imapd-2.3.1 70
 MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
-MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
-MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10 71
-MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12 71
-MD5 b8da82b13f99b84321a976a8f41d2a49 files/cyrus.pam-include 109
-MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.12-libwrap.patch 390
-MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
-MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
+MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.1.ebuild
new file mode 100644
index 000000000000..a06be78704e6
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2006 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.3.1.ebuild,v 1.1 2006/01/10 20:32:55 langthang Exp $
+
+inherit eutils ssl-cert gnuconfig fixheadtails
+
+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"
+LIBWRAP_PATCH_VER="2.2.10"
+DRAC_PATCH_VER="2.3.1"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~hppa ~ppc64"
+IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
+
+PROVIDE="virtual/imapd"
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( >=net-fs/openafs-1.2.2 )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	kerberos? ( virtual/krb5 )
+	snmp? ( net-analyzer/net-snmp )
+	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"
+
+new_net-snmp_check() {
+	# tcpd USE flag check. Bug #68254.
+	local i
+	for i in net-analyzer/ucd-snmp net-analyzer/net-snmp; do
+		if use tcpd ; then
+			if has_version $i && ! built_with_use $i tcpd ; then
+				eerror "You are emerging this package with USE=\"tcpd\""
+				eerror "but ${i} has been emerged with USE=\"-tcpd\""
+				fail_msg $i
+			fi
+		else
+			if has_version $i && built_with_use $i tcpd ; then
+				eerror "You are emerging this package with USE=\"-tcpd\""
+				eerror "but ${i} has been emerged with USE=\"tcpd\""
+				fail_msg $i
+			fi
+		fi
+	done
+	# DynaLoader check. Bug #67411 
+	if built_with_use net-analyzer/net-snmp minimal ; then
+		eerror "If you want to emerge this package with \"snmp\" USE flag"
+		eerror "reemerge \"net-snmp\" without \"minimal\" USE flag"
+		die "see error message above"
+	fi
+
+	if [ -x "$(type -p net-snmp-config)" ]; then
+		einfo "$(type -p net-snmp-config) is found and executable."
+		NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
+		einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
+		if [ -z "$NSC_AGENTLIBS" ]; then
+			eerror "NSC_AGENTLIBS is null"
+			einfo "please report this to bugs.gentoo.org"
+		fi
+		for i in ${NSC_AGENTLIBS}; do
+			# check for the DynaLoader path.
+			if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
+				DYNALOADER_PATH="$i"
+				einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
+				if [[ ! -f "${DYNALOADER_PATH}" ]]; then
+					eerror "\""${DYNALOADER_PATH}"\" is not found."
+					einfo "Have you upgraded \"perl\" after"
+					einfo "you emerged \"net-snmp\". Please re-emerge"
+					einfo "\"net-snmp\" then try again. Bug #67411."
+					die "\""${DYNALOADER_PATH}"\" is not found."
+				fi
+			fi
+		done
+	else
+		eerror "\"net-snmp-config\" not found or not executable!"
+		die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
+	fi
+}
+
+fail_msg() {
+	local i
+	i=$1
+	eerror "enable "snmp" USE flag for this package requires"
+	eerror "that ${i} and this package both build with"
+	eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
+	die "sanity check failed."
+}
+
+pkg_setup() {
+	if use snmp; then
+		new_net-snmp_check
+	fi
+
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	ht_fix_file ${S}/imap/xversion.sh
+
+	# Add unsupported patch wrt #18706 and #80630
+	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
+
+	# Add drac database support.
+	if use drac ; then
+		# better check for drac. Bug #79442.
+		epatch "${FILESDIR}/${PN}-${DRAC_PATCH_VER}-drac.patch"
+		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_VER}-libwrap.patch"
+	fi
+
+	# DB4 detection and versioned symbols.
+	# The new cyrus-imapd has a new DB detection.
+	# Hopefully we don't need this patch anymore.
+	# 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 -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		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 -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" 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)"
+
+	if use idled; then
+		myconf="${myconf} --with-idle=idled"
+	else
+		myconf="${myconf} --with-idle=poll"
+	fi
+
+	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"
+
+	# needed for parallel make. Bug #72352.
+	cd ${S}/imap
+	emake xversion.h || die "emake xversion.h failed"
+
+	cd ${S}
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib
+	for subdir in master imap imtest timsieved notifyd sieve; 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
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	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,sieve} 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
+
+	enewuser cyrus -1 -1 /usr/cyrus mail
+
+	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.3.1-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.1-drac.patch
new file mode 100644
index 000000000000..33383f2aff1f
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.1-drac.patch
@@ -0,0 +1,31 @@
+--- contrib/drac_auth.patch.org	2005-12-19 07:57:59.000000000 -0800
++++ contrib/drac_auth.patch	2005-12-29 22:54:33.000000000 -0800
+@@ -71,7 +71,7 @@
+ diff -u -r1.268.2.23 configure.in
+ --- configure.in	12 Apr 2005 20:05:20 -0000	1.268.2.23
+ +++ configure.in	19 Dec 2005 15:54:30 -0000
+-@@ -1003,6 +1003,19 @@
++@@ -1003,6 +1003,20 @@
+  SNMP_SUBDIRS=""
+  AC_SUBST(SNMP_SUBDIRS)
+  
+@@ -80,12 +80,13 @@
+ +dnl
+ +DRACLIBS=
+ +AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
+-+	if test -d "$withval"; then
+-+		LDFLAGS="$LDFLAGS -L${withval}"
+-+		AC_CHECK_LIB(drac, dracauth,
+-+			AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
+-+			DRACLIBS="-ldrac")
+-+	fi)
+++	drac="$withval",
+++	drac="no")	
+++if test "$drac" != "no"; then
+++	AC_CHECK_LIB(drac, dracauth,
+++		AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
+++		DRACLIBS="-ldrac")
+++fi
+ +AC_SUBST(DRACLIBS)
+ +
+  CMU_LIBWRAP
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
new file mode 100644
index 000000000000..736ff1ce4b6d
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
@@ -0,0 +1 @@
+MD5 cde15876d5c953bba9ad9f7811aff695 cyrus-imapd-2.3.1.tar.gz 2212999