version bump - security bug #385729. Add back sieve USE flag - bug #382389

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

3 files changed, 207 insertions, 9 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index c9c306a9ddbd..784fbfcbd09e 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.183 2011/09/27 18:09:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.184 2011/10/06 11:14:55 eras Exp $
+
+*cyrus-imapd-2.4.12 (06 Oct 2011)
+
+  06 Oct 2011; Eray Aslan <eras@gentoo.org> +cyrus-imapd-2.4.12.ebuild:
+  version bump - security bug #385729. Add back sieve USE flag - bug #382389
 
   27 Sep 2011; Kacper Kowalik <xarthisius@gentoo.org>
   cyrus-imapd-2.4.11.ebuild:
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index e629c1a04531..a5dddad343e1 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cyrus.conf 1354 RMD160 b2d6f470b7097036a5c64bc59f147f78fdbc16d5 SHA1 efc4d14807391be53018a81c4f4277cd8d6ce5f8 SHA256 23189674bb5c2f021f35027cfe22cfe56e022ce5e03da67f5c4913473bec1292
 AUX cyrus.confd 279 RMD160 da79ff4128869a045b432abc9cea6667b65ee69a SHA1 6d2d3417b678c77336a4b89db3507314302fe4eb SHA256 3e786c28ffc44a222214b22d8849728360edc37f4b3f7d7c1473a23ab58c28a9
@@ -8,20 +8,30 @@ AUX cyrus.rc6 568 RMD160 0494dc278b3c93f49018392694a809f1ec395459 SHA1 22e6f03d9
 AUX imapd.conf 1587 RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b SHA1 e4f189cb59fe499a42adffe3ffe382dcb9d7c546 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f
 DIST cyrus-imapd-2.4.10.tar.gz 2430196 RMD160 d7ffe3ad56b9e565dc7e1b764d4bb0a597ce9696 SHA1 b6cb51d67f2b49536ba92daae471d7817929c482 SHA256 2f5b5c6e524df9005df4a700c958bb99a21c4450485374e38a3d18010bc87317
 DIST cyrus-imapd-2.4.11.tar.gz 2446611 RMD160 0bb30f7d8c655a03366a8ce59f5a708c30d34ec1 SHA1 24fdaf0e57d5c3bdb63b7dcca29fe6df535c6102 SHA256 fe6bbcfd7abe459a0aa88922ef81e41a98dc93b0cf2408b7086356b3ee4c7f70
+DIST cyrus-imapd-2.4.12.tar.gz 2450099 RMD160 5c481d5ce295667eed1c90bc1d0572946caaae29 SHA1 c7a1e1dee9f32891c64499945915e8c4e99ce183 SHA256 b33c348d4d8c0b4d7dd4cd114d2cc53dde6c49be359e9dfd6ce0069cc536366f
 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.10.ebuild 4791 RMD160 91c6db22c3d52122888bdaf5f6f65160b2296d79 SHA1 b3ba3ad270941747e0c0c078565c4df08c53e55a SHA256 f61b1e88f4674a460ea56412743ac3abc6b54b2652cff6ff994c7ddb1d0a13b8
 EBUILD cyrus-imapd-2.4.11.ebuild 4779 RMD160 80e78566243ff261970708eea37b9f8c0444b7ec SHA1 bc5bcddcfbe154659a540e1008ff422be5867c8e SHA256 6d67814d852d1af82f9c9e11b77d8c424c8ff3f108655f4c176851993d4a33ed
+EBUILD cyrus-imapd-2.4.12.ebuild 4909 RMD160 6f139259957d802209e970c1368efe5039ca1a37 SHA1 0a836579f68ac0381cdabc4e4b60e57cedce0ac3 SHA256 a5476b030f06af0d5054c1e7ced334fd2e59511763a7a67c0c626e2b392082ff
 EBUILD cyrus-imapd-2.4.8.ebuild 4519 RMD160 d9b2a7936145628977ee23061b6d0ea7d591358f SHA1 6b64b524b15913bd9a2b46111e839a543383ec7a SHA256 a8d7bb8e0a3da6249f1f5856fdbfaac0d3ccc88d13031edd44618c977ffc9143
 EBUILD cyrus-imapd-2.4.9.ebuild 4790 RMD160 d8910f5165bc5fe8d756526e96985334076964d9 SHA1 45245e0fdd6db18a56b4c5f39a605b297d401334 SHA256 415e0bf765a1e786d5330829b27f6ef80e245706978b3d8d5dd36d75c3c9b34e
-MISC ChangeLog 34184 RMD160 6d4dae304e08a7bf5d6d28f8843c78f91fb29958 SHA1 718cf17d927aad034cc0f8a3a32e2ab6fb7fba99 SHA256 7e83ea15cace3bea343b1d3b191c0645238329dad781b8f5b9fa810f9d357294
+MISC ChangeLog 34363 RMD160 463cf9aaf08ecaf97a45d765fc8585e63e2ae730 SHA1 3a70bd543cb4413a7f1f4ffc17742ab6a873bb39 SHA256 927dd847a3f9ae6a6a82b20ad1fb435bbe086651a8bfac9621707a187ba97986
 MISC metadata.xml 313 RMD160 7fb6badef50f7b7a65a3336f742a748d7f9265d0 SHA1 d2eebc6334f742a084829659803295d444e47c35 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk6CEXsACgkQIiMqcbOVdxSeWQP+NQG5ax+ZrXRb5Bcv9vLpHFLv
-kbIZjq4CcAytGTk17u9U7nnh1/jJrOWBiBoFxfcbZ18PmRJvcHiTXCOaICxDonz1
-VabLi8xUorJWN3PaSQ56wcoyh4GALbI/QggsOo212YhSCDYVTbbgcj4FX0bW+rJj
-G0fqRRnqym7BnDZW+VI=
-=5lar
+iQIcBAEBCAAGBQJOjY3FAAoJEHfx8XVYajsf4eMP/1c1lCDIlIqT93A1zOF6EUVJ
+wl7fbFXf40h/ahuwlGJIvdmNuForuKHRbqa7Xky4CTpzY+f2UYUUQCVCGXVFtAif
+K3BAkhAxbVnibk/QxAwcTT7ogJCYUrjSmBv6MUw8nviMqTSvY2mbXYg6JX9TEI7+
+UyW3Y27J+IAPNzUCfKc05NnCOYmnzbkTGgfy/Nx2e0qzD79Vg1SiDk+tLXqvEgTg
+QtKz6AieebvG3F6P3YkyoIYf722vvBgd4Il6hm8Bh2dXBPGVwSh/zp4qnvcGsk30
+T71W4X2Nhp5+3K8OHOhZRPEWUK+KV2bNye2qm4q3V0V/DVTg9IcSGsEeS4M+ryPK
+KkolO+NkGiQnoL5ZbQGiaMVpPyrgcdHKu/mleGBdw8o9dBlmrdpdEsIKUcqi9xDG
+dkqNa7hI/6L/ZCctDlHldeUPG245aG/fAypFXsf+RLDH+JYwPBZanvzToW3h19b0
+PWn2xtToQEVFvpCxgV8hdu4RLNz5b05/JpwPxzeVz8u1MFonm3718MZLTP7Ph5zq
+3d1Qz2Z5OlStftk0USOs+ufQPSUmsbuzVWWqqkiDSo0m51ooVWM9/T3q+2ANg5gU
+18fpzrm2okt5XVS9p1U1qy1cDeYmfcWmF9VqEmGuUkfWNIEDWYEFtUJMhl/+plHF
+L9kSYAWTj057T56FrFrL
+=ad4x
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.12.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.12.ebuild
new file mode 100644
index 000000000000..2753f33278d7
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.12.ebuild
@@ -0,0 +1,183 @@
+# 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.12.ebuild,v 1.1 2011/10/06 11:14:55 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} || die
+	# same with lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+	# libcom_err.a to libafscom_err.a
+	sed -i -e '/afs\/libcom_err.a/s:libcom_err.a:libafscom_err.a:' \
+		configure{,.in} || die
+}
+
+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_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable sieve) \
+		$(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"
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	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"
+}