Make sieve support optional (though enabled per default), #110218

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 289 insertions, 3 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 0632d7fa7b98..6a5003a01119 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.126 2008/10/27 19:02:43 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.127 2008/12/29 18:02:16 dertobi123 Exp $
+
+*cyrus-imapd-2.3.13-r1 (29 Dec 2008)
+
+  29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +cyrus-imapd-2.3.13-r1.ebuild:
+  Make sieve support optional (though enabled per default), #110218
 
 *cyrus-imapd-2.3.13 (27 Oct 2008)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 8e2a9b68d17a..5bad532f8f1e 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -31,7 +31,8 @@ DIST cyrus-imapd-2.3.9-uoa.tbz2 17935 RMD160 1e46f17972552ed94496d1dfee867133284
 DIST cyrus-imapd-2.3.9.tar.gz 2272004 RMD160 c9aae3476108c0face06dfe304a136015370b166 SHA1 b95e1de87ff2c7a42d4bec87c839fe439452a79c SHA256 27e6476789788b7c72f09711103f7c4bd0136dbd33ceadd0ae2dc776a17ab437
 EBUILD cyrus-imapd-2.3.11.ebuild 8017 RMD160 d6b3b1a841e5b644560060971fec4d0ceaa21016 SHA1 de105a65d441cd6a02a497f53045748f00cc171a SHA256 c82ad3605451cc496036142e363d74023ba72364579ca6d823679f4cdc16e218
 EBUILD cyrus-imapd-2.3.12_p2.ebuild 7870 RMD160 135119576c0587808e25f11a49a83655848cb0b1 SHA1 8102e66dfdc4ffbcc1728ecb466a38c40e8d530c SHA256 9b8ae2fcee71578f078c697e814f44fbdfd58c90213d2e8aa11d21cf7fcceb08
+EBUILD cyrus-imapd-2.3.13-r1.ebuild 8067 RMD160 2c74b29f23aadc69b0bf5106815bb805de9cc2d4 SHA1 ec1a438f80d050f64abf3953922f2b81dfdc9e77 SHA256 f9f9d009538bceb066679f667ec6c248126c2125f684d068c294ec1b2abf90db
 EBUILD cyrus-imapd-2.3.13.ebuild 7948 RMD160 44821ab804a9c901fb8dc06ba1a758382ec98568 SHA1 5eb55c51ffb3e33b96512a3d408fe5846a0ca358 SHA256 86fb7c1869b73911a488f1661db72bcecb641725772055e9ed4a94d4b83431ee
 EBUILD cyrus-imapd-2.3.9-r1.ebuild 7908 RMD160 39b4b354fab0d4f304c65c290bfcac39a7f5e27b SHA1 ba4ccfe7c28b2a66bdc01ec9ad3e3a6be88c8f67 SHA256 0209fb6f7a2c3f9a6ec509b512f643c294ea8c62faff8f4d3031c011ad0846b3
-MISC ChangeLog 25189 RMD160 acdb9c46c0012ec39ff85b221ffbfebc6df90bf1 SHA1 ecdb78b201674cf0c8aa80c4b9279f0d311adb42 SHA256 6757fbb5bb0686b2ac4f85df94b5cb2e23d769de8394353d58c301d4eb716288
-MISC metadata.xml 790 RMD160 eee7d37d6a4bd8173fde9af56d92e5c16146a4a1 SHA1 01a8bc1a70113280c5a9428fdadd0095f638ea96 SHA256 307114d0c32c4e24884164791bfcdf4a139093a68cce23b3ba2743853e8eb63b
+MISC ChangeLog 25385 RMD160 69cc6ca2d02fba4dbadc42580df5fc6b01dcb83b SHA1 c59b22d03f3c0fe04b2187a5c9b280f594e83645 SHA256 33cddda4c568b7e1a081c6648ac328899d87b6de094a07ffbf6a105c13d33bea
+MISC metadata.xml 838 RMD160 af162a4aa32cd0118c4ad8b909014cf4177990c7 SHA1 9496e5833a9bc00dfd7ddec58b71699fee8de981 SHA256 eea9e2262b3a7da1661f5fd7f8c0011afd262044524b0080c61e16c55c1809d0
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild
new file mode 100644
index 000000000000..391f3d4ef665
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.13-r1.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2008 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.13-r1.ebuild,v 1.1 2008/12/29 18:02:16 dertobi123 Exp $
+
+EAPI=1
+
+inherit autotools eutils ssl-cert fixheadtails pam
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server."
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${MY_P}.tar.gz"
+LIBWRAP_PATCH_VER="2.2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="drac idled kerberos kolab nntp pam replication +sieve snmp ssl tcpd"
+
+PROVIDE="virtual/imapd"
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.13
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	kerberos? ( virtual/krb5 )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	drac? ( >=mail-client/drac-1.12-r1 )
+	nntp? ( !net-nntp/leafnode )
+	kolab? ( net-nds/openldap )"
+
+DEPEND="$RDEPEND
+	sys-devel/libtool
+	>=sys-devel/autoconf-2.58
+	sys-devel/automake"
+
+RDEPEND="$RDEPEND
+	!virtual/imapd"
+
+new_net-snmp_check() {
+	# tcpd USE flag check. Bug #68254.
+	if use tcpd ; then
+		if has_version net-analyzer/net-snmp && ! built_with_use net-analyzer/net-snmp tcpd ; then
+			eerror "You are emerging this package with USE=\"tcpd\""
+			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"-tcpd\""
+			fail_msg
+		fi
+	else
+		if has_version net-analyzer/net-snmp && built_with_use net-analyzer/net-snmp tcpd ; then
+			eerror "You are emerging this package with USE=\"-tcpd\""
+			eerror "but \"net-analyzer/net-snmp\" has been emerged with USE=\"tcpd\""
+			fail_msg
+		fi
+	fi
+	# DynaLoader check. Bug #67411
+
+	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() {
+	eerror "enable "snmp" USE flag for this package requires"
+	eerror "that net-analyzer/net-snmp and this package both build with"
+	eerror "\"tcpd\" or \"-tcpd\". Bug #68254"
+	die "sanity check failed."
+}
+
+pkg_setup() {
+	use snmp && new_net-snmp_check
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	ht_fix_file "${S}"/imap/xversion.sh
+
+	# Fix prestripped binaries
+	epatch "${FILESDIR}/${PN}-strip.patch"
+
+	if use drac ; then
+			 epatch "${S}/contrib/drac_auth.patch"
+	fi
+
+	# KOLAB support
+	if use kolab ; then
+		EPATCH_SOURCE="${FILESDIR}/kolab/${PV}" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
+		# These files are being created automatically and need to be updated
+		# # after the patches used above
+		rm -f lib/imapopts.h lib/imapopts.c
+	fi
+
+	# Add libwrap defines as we don't have a dynamicly linked library.
+	use tcpd && epatch "${FILESDIR}/${PN}-${LIBWRAP_PATCH_VER}-libwrap.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.
+	WANT_AUTOCONF="2.5"
+	AT_M4DIR="cmulocal" eautoreconf
+
+	# When linking with rpm, you need to link with more libraries.
+	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
+
+	if use kolab ; then
+		sed -i -e "s/{LIB_SASL}/{LIB_SASL} -lldap -llber /" configure || die "sed failed"
+	fi
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} $(use_with ssl openssl)"
+	myconf="${myconf} $(use_with snmp ucdsnmp)"
+	myconf="${myconf} $(use_with tcpd libwrap)"
+	myconf="${myconf} $(use_enable kerberos gssapi) $(use_enable kerberos krb5afspts)"
+	myconf="${myconf} $(use_enable idled)"
+	myconf="${myconf} $(use_enable nntp nntp)"
+	myconf="${myconf} $(use_enable replication)"
+
+	if use drac; then
+		myconf="${myconf} --with-drac=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --without-drac"
+	fi
+
+	if use kerberos; then
+		myconf="${myconf} --with-auth=krb5"
+	else
+		myconf="${myconf} --with-auth=unix"
+	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 \
+		--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"
+
+	# -j1 for #222529
+	cd "${S}"
+	emake -j1 || die "compile problem"
+}
+
+src_install() {
+	local SUBDIRS
+
+	if use sieve; then
+		SUBDIRS="master imap imtest timsieved notifyd sieve"
+	else
+		SUBDIRS="master imap imtest"
+	fi
+
+	dodir /usr/bin /usr/lib
+	for subdir in ${SUBDIRS}; 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
+
+	if ! use nntp ; then
+		rm man/fetchnews.8 man/syncnews.8 man/nntpd.8 man/nntptest.1
+		rm "${D}"/usr/bin/nntptest
+	fi
+
+	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
+
+	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() {
+	# do not install server.{key,pem) if they are exist.
+	use ssl && {
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+	fi
+	}
+
+	if df -T /var/imap | grep -q ' ext2 ' ; 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 ' ext2 ' ; 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 "filesystem you need to set it manually to update"
+	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
+	echo
+
+	elog "For correct logging add the following to /etc/syslog.conf:"
+	elog "    local6.*         /var/log/imapd.log"
+	elog "    auth.debug       /var/log/auth.log"
+	echo
+
+	elog "You have to add user cyrus to the sasldb2. Do this with:"
+	elog "    saslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index e0852585bf32..208e8ed53cc2 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -11,5 +11,6 @@
 	<flag name="drac">Enable dynamic relay support in the cyrus imap server</flag>
 	<flag name="idled">Enable idled vs poll IMAP IDLE method</flag>
 	<flag name="replication">Enable replication support in the cyrus imap server</flag>
+	<flag name="sieve">Enable sieve support</flag>
   </use>
 </pkgmetadata>