From f7e5c19450f12868f23e8ee99507ffa9ec3a110b Mon Sep 17 00:00:00 2001
From: Eray Aslan <eras@gentoo.org>
Date: Fri, 9 Sep 2011 07:18:10 +0000
Subject: [PATCH] version bump - security bug #382349

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64
---
 net-mail/cyrus-imapd/ChangeLog                |   7 +-
 net-mail/cyrus-imapd/Manifest                 |  30 +--
 .../cyrus-imapd/cyrus-imapd-2.4.11.ebuild     | 178 ++++++++++++++++++
 3 files changed, 200 insertions(+), 15 deletions(-)
 create mode 100644 net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index e5b5e057a7de..12be944cf53e 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.176 2011/07/06 14:39:36 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.177 2011/09/09 07:18:10 eras Exp $
+
+*cyrus-imapd-2.4.11 (09 Sep 2011)
+
+  09 Sep 2011; Eray Aslan <eras@gentoo.org> +cyrus-imapd-2.4.11.ebuild:
+  version bump - security bug #382349
 
 *cyrus-imapd-2.4.10 (06 Jul 2011)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index bd2e999d2bde..079450532d90 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -7,27 +7,29 @@ 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.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.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 4791 RMD160 63066abb777d143fff8330454cc5513bc29871f7 SHA1 3c9602c0b928c3711f36c31adad7dc10398f5c75 SHA256 acf5c614caa9d02e9efdd20c519cf498a36b4bd517afdef8d372d2773d0f3d78
 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 33431 RMD160 16877a50e88278ce80d349e61eaecfdd62f045e1 SHA1 513462a7c0f8c898f2ea54fb12b96b77f6600079 SHA256 fe33db3c55bb3e879ee2c45be088ec9104d5738b91751436697c297511003d20
+MISC ChangeLog 33577 RMD160 454ff572441e49a7463f2ec0289e26b3afe69028 SHA1 9b2ebc10ec7c1eabc99ea0be8f4c620f9e35e4e5 SHA256 2fbccc1b4a2cc483bc91059bede820cd2882753cb792e836d4f9fc0f8af6761c
 MISC metadata.xml 313 RMD160 7fb6badef50f7b7a65a3336f742a748d7f9265d0 SHA1 d2eebc6334f742a084829659803295d444e47c35 SHA256 4fc55c30d8af0d3b7555b4c0d5fa85ccc60232dc786d56a25c5482079a367ecd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOFHO2AAoJEHfx8XVYajsfecQP/2RHjZq2/zxOOA8Ochv9lHcq
-kf7sH9vhROz5N2vcCQ6V4GD6Fpr3LqT0Y77LWiUd00ogUnNs9c1o9VFPevgQXcyC
-fM97d+AZFYgOFAn0S1kGLqrv7/XxCtnXHY33T7GAYTScznddgv3OqNX/KUD+Kh7G
-rPOYJcqqRtMbZU5WeveFFbfAIenCXC7X5gqlh2MlQlXQFyIqN3s1YsS+qVY+u2Ub
-C9d+adqRhXA4nZqohDb+CpdmCRryi0nPhLqe90/gcnL6ZTCVoEp2+dFMkxkK2ggv
-G11Q8SjGLg0K8WWXsuFmbzPGal4wb3qZHSOHDAWBeB4vOYgV9S6Z8yiY7CdkcUAu
-0YVNk7GElEXQdBuuA5iqzNr/H1T4iRO3QBH+m9nI4mNtLCIjc+dSZQPlEKY52UIf
-43BhZjkqiIoDAd0EeH5HZ6yOmCLSWn+gDKUDoNabrfWdOBc3agZPAjmp+eK3y6jc
-Jllb0gEvgqDwDylqIN8JqyeO4ipMowj9a6yPBHJn/7qkYVXxqpGEk6mYrMHYA+Su
-7Wm5E6QEm2SIG5ppI7RaRFoEnLko391jHNrPJFAMXwyhflqft2/84tanCGi7TO8I
-X3jrBoqgDzRmLjaBJ7MrP2+QM/s5P64Osp2Ik0RogJhguXAGWgyw1sPUFrsKudKH
-VlFn9neY7/8G9b4Jw50K
-=SJej
+iQIcBAEBCAAGBQJOab3BAAoJEHfx8XVYajsfvTwQAJslcSEguJeZgonNPSbWmkXO
+h+3nlPPQrdGzLgY0ibxH81ydoEpm7xoH4u98of405loHiHAHvvH3lwykuqg0CDMU
+QwC8LRh4H4SJA3+wCMiHnviwYy/uYBvaLK9JRwTDF9F0VXEmS0m/SLXfKPgP7af6
+Cgy84B3tTXpYwNaGPRjVRwZaia9siLVK8e0znR8hSR/QIQZeZqtQGyYQkZzNQKri
+zrx5IWItjeC0axUm/0N762FuKJVbIGUFjDWKwHZJj2m/5GSffiaVa4AtjZ+YEi61
+7QmzlfbLMM1KIotAVHytoPOL6dheARea/EQS2XGEKSW4AQYAFCaAXO9/vr8jHS0/
+kiQmeKBJo8t85IR7vpPM+mUUPujMeKyZmRurmr426SARQP3/MAjqMBK8SB0iY3IG
+OLO6HaBPk1qTTe3U4P5DlTNpg8HqQqomQ9dvQB8ze+hEHhVWqmK8kK7Yz9og0heb
+qkP/joM4eEjEvoNKWvQLG2fdxb2kU12mbw/QygOjMJwyYXjuJmF8r2gHyyDPQwJc
+TsP/9HhV5/8RIyzAWijkL1XzNjkMCNpFFTQuPJNSsOmHagbTtQJU57hx8Djwz5To
+bCws/IuUUJJWmV/trBwW2xMOsaWB16P0np2+fnU4mx0gCwsexKnP/1mMRCQSQLXW
+qk1J2ru4fNTUEWNKb+s8
+=e/qB
 -----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild
new file mode 100644
index 000000000000..a4c9d031f6e9
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.11.ebuild
@@ -0,0 +1,178 @@
+# 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.11.ebuild,v 1.1 2011/09/09 07:18:10 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_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"
+}
-- 
2.26.2