version bump

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 194 insertions, 15 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 975127985e89..75f5eb30b969 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.173 2011/06/22 10:50:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.174 2011/06/22 10:53:39 eras Exp $
+
+*cyrus-imapd-2.4.9 (22 Jun 2011)
+
+  22 Jun 2011; Eray Aslan <eras@gentoo.org> +cyrus-imapd-2.4.9.ebuild:
+  Version bump
 
   22 Jun 2011; Eray Aslan <eras@gentoo.org>
   -files/cyrus-imapd-2.2-libwrap.patch,
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 7d225b92b02a..3f898c9148c6 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -7,23 +7,25 @@ AUX cyrus.pam-include 109 RMD160 24f82d0496f0ff94f9c1ee4cef14124909d361e5 SHA1 1
 AUX cyrus.rc6 568 RMD160 0494dc278b3c93f49018392694a809f1ec395459 SHA1 22e6f03d9365d0fef4af9236d9cd01ae0b94a67f SHA256 f2f796f1ab208bcd5641a1610b07673f92069e6f5b2370f453e3a24014ab2c6c
 AUX imapd.conf 1587 RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b SHA1 e4f189cb59fe499a42adffe3ffe382dcb9d7c546 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f
 DIST cyrus-imapd-2.4.8.tar.gz 2424151 RMD160 72f9afbf7893b3449a1a76b7050ea6d7c9b003c9 SHA1 4dfc328aff482c9ebb4efdce4b140f69564880e8 SHA256 7a1ff733928276d0e42dccfb85f17e6d6d63cdc11c03e93aea19e7de798da030
+DIST cyrus-imapd-2.4.9.tar.gz 2425065 RMD160 37727502f8b080a1e3205360c048abd47e76e878 SHA1 3cc8cf54d43baeda6822f84efec6ab95f3d1c49f SHA256 d757bc95ca891acad3768a888a5022ab96ba72d49445aa12e26b5929822e4156
 EBUILD cyrus-imapd-2.4.8.ebuild 4519 RMD160 d9b2a7936145628977ee23061b6d0ea7d591358f SHA1 6b64b524b15913bd9a2b46111e839a543383ec7a SHA256 a8d7bb8e0a3da6249f1f5856fdbfaac0d3ccc88d13031edd44618c977ffc9143
-MISC ChangeLog 33050 RMD160 22c856f6e0c9de2561a6f249ca6f2bbab73d2810 SHA1 28936410b57bab6752d40f9f8d869183ef3fa905 SHA256 1fe9c09692cdc069ec2cf5b1189fafe9e347e6a4fa691b3d345c45ff07c4fd71
+EBUILD cyrus-imapd-2.4.9.ebuild 4565 RMD160 04ac59aac4bc6e067c44bd48b431e1dcfeafa1b8 SHA1 d739d1364870b9fc6b54e2dc61c692d90ce03c79 SHA256 606f67202e096724ee580bdc2be4a18e9d6a9dd01033edd6add70359ad9d9a70
+MISC ChangeLog 33171 RMD160 f12e0799259f7d3a79a4c5ad2da11b5d04cd9177 SHA1 d990316d0a4ce2413721e35858660d3c823f9b37 SHA256 caeff1fadb5011709f43df735b7b48ce83606f3891bbaab70d6a8e199fd69343
 MISC metadata.xml 313 RMD160 7fb6badef50f7b7a65a3336f742a748d7f9265d0 SHA1 d2eebc6334f742a084829659803295d444e47c35 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOAckEAAoJEHfx8XVYajsf/toP/0eRu1Alu2GjnVQtDkhv/tRs
-w2fxdD8wIJV1kuFo5clTCY+/pwL+fWM2WR2XE8Czjk/fmG3l2BAqcJK1+t0iqEaD
-+CCq9UY0oJeoYe3kdsiC0NPu4xnOu76PalKK13nGugBiclphA3Z8ZwDAGzf5Z8ki
-YbLVvCW/VLXWgVC1/pYoWsFYlXyQ3r22q/s0l2WgIsl8cBOvbqKTbkW8LKAXA4FU
-Kt6UkBpruFk2h5Qu3cj/3sjrNohLrNUr5P/RBTwaIotYDbN2VI3dNaYgrp6IZG/0
-sY+/UKJfUDd7qxS/VXO408a8Ze1cbzoAHGW6FQIyyK4KrRC3qp97l5Y6AapapyOT
-hmG9bOOvxOC0Lk/JdutJQburM32R5i5kgDDZEhX6NrDf5FtptHwFiEJla0YYzmoB
-xDcGfqkWrWPg/Svjsu5mtMVPSL1nwwUF0GWtotFBuYEu9n+2NUnb5ahJjivzxwDb
-oCI+772/xNQqEwadP3h+9ogn3CYemaFoFs93EDuAALBtZaoFwFthrc/vFqUu+qJ+
-fmCybIPnTWj3coPatuMyZQYA3JLkUgGFo+B2eRgTUqrYXYoE67LvDuj5ju0R5bhV
-H0wbKWZm08RlHGTbaWN+Rz1Z52Miav3P5nQZe6jI1guk/M4gbAUJaDlfcW10H/lM
-JGyczHkJxLscn6t8MebI
-=RNuR
+iQIcBAEBCAAGBQJOAcm4AAoJEHfx8XVYajsfmH8P/3sXAFh7rji27JE+pRCGFmos
+HgiwboQ3c22i9yw0EGRRic+W2tL8sFi350QjS0VICqQPRqRdhEQyAQlrF+eVICtW
+Wpj269Vh8VzjDMFNUeMAWylt+l2bcLHbhr8XEeawdT1fYbdCSIf+J9O8+4BdHPdd
+TDY9nU0FWoXhqBd8//Oy6NjzxowEcW1YZw6qdsk+2j9kojvE30NL17iUMX5rldE5
+CG9yDV/221EyWJSfJ15AVix1mRbw8aWY+ztSTe/P/JobaAF1RgQKLAZ2+kaq/bCc
+xZm0KD6sRqHYKIMf782Thl06fwNDF/zqKTXz20yBF+UVA5TudCnzz0zLiJrM28iM
+KgVVqVZaKM0GOwTPy2A1zv/rbwdfsQts3kg4F8yHqxExkPtk+w2e7uFz8o8tJ1md
+vKYaQoACr45L8IKADzQAskma2n9c7+4LuM4kipdXUHjmj55gEHCIymQJBpUcqPCc
+glKWDvH44iGMcxY1o+mEAekcDW/MkDo32j8iJ9vGxAARFS/eviZ4UqeXE7lme2et
+yV+aFJNnuNA9cDooMXcZGIby2xPHY38d2FXOHliX4KsH5i1L37IHJZ4rd3jx7VCk
+87gLTnM8nQQKPruNw9TI3OAuigVmWjuUvsunbPtEepjT4TSsa6z4ydxqnwwDfbg6
+JuCn0e5qY3v7HG9RPvno
+=KqQm
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.9.ebuild
new file mode 100644
index 000000000000..3fbbedb56aba
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.9.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 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.4.9.ebuild,v 1.1 2011/06/22 10:53:39 eras Exp $
+
+EAPI=4
+
+inherit db-use eutils ssl-cert pam multilib
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Cyrus IMAP Server."
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs berkdb kerberos mysql nntp pam postgres replication +sieve snmp sqlite ssl tcpd"
+
+RDEPEND="sys-libs/zlib
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( net-fs/openafs )
+	berkdb? ( >=sys-libs/db-3.2 )
+	kerberos? ( virtual/krb5 )
+	mysql? ( virtual/mysql )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	postgres? ( dev-db/postgresql-base )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
+
+DEPEND="$RDEPEND"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap"
+
+REQUIRED_USE="afs? ( kerberos )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+}
+
+src_prepare() {
+	# 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"
+
+	# do not strip
+	sed -i -e '/(INSTALL/s/-s //' "${S}"/imtest/Makefile.in
+
+	# correct afs include and liblwp.a directory
+	sed -i -e '/I${with_afs_incdir/s/\/include//' \
+		-e '/liblwp/s/liblwp/afs\/liblwp/' \
+		"${S}"/configure{,.in}
+}
+
+src_configure() {
+	local myconf
+	if use mysql ; then
+		myconf=$(mysql_config --include)
+		myconf="--with-mysql-incdir=${myconf#-I}"
+	fi
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	if use berkdb ; then
+		myconf+="--with-bdb-incdir=$(db_includedir)"
+	fi
+	econf \
+		--enable-murder \
+		--enable-netscapehack \
+		--enable-idled \
+		--with-service-path=/usr/$(get_libdir)/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-sasl \
+		--without-perl \
+		--without-krb \
+		--without-krbdes \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_with berkdb bdb) \
+		$(use_enable nntp) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable sieve) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_with snmp) \
+		$(use_with tcpd libwrap) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# file collision - bug #368245
+	if ! use nntp ; then
+		rm "${D}"/usr/share/man/man8/fetchnews.8*
+	fi
+
+	dodoc README*
+	dohtml doc/*.html doc/murder.png
+	docinto text
+	dodoc doc/text/*
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	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 exist.
+	if use ssl ; then
+		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
+	fi
+
+	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"
+}