version bump

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.24-gentoo-r5-1 i686

3 files changed, 279 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index bf4f84971c58..892cd4fe79f4 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.195 2009/01/13 18:01:25 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.196 2009/01/27 14:10:35 wschlich Exp $
+
+*dovecot-1.1.10 (27 Jan 2009)
+
+  27 Jan 2009; Wolfram Schlich <wschlich@gentoo.org> +dovecot-1.1.10.ebuild:
+  version bump
 
 *dovecot-1.1.8 (13 Jan 2009)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index bbbf137a2829..8a7521452737 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,6 +8,9 @@ DIST dovecot-1.0.15-MANAGESIEVE-v9.3.diff.gz 105361 RMD160 30cba9148d657cc986e2f
 DIST dovecot-1.0.15.tar.gz 1783347 RMD160 d882e3dbed60cbcbacdcb6023d0c12213a0d35ac SHA1 4e1f40e37461f848459df9dde809097fef46c376 SHA256 2b4d8720d5f5868d57df294350ee0f5a8d2723e9937dab1eea2084478ace9597
 DIST dovecot-1.1-managesieve-0.10.3.tar.gz 395123 RMD160 bc8cc1be276d15d574e6a49ee4de67504b159399 SHA1 3f4764da34e7416cd280a6ab801e2a20b970b30c SHA256 ac70ee48cdec2d472c14cb93bc9f3339a30763e418a579ddea0b9b18befac5ac
 DIST dovecot-1.1-managesieve-0.10.4.tar.gz 397332 RMD160 4da8129ead0de9d807e7311849a1b660c7f0509a SHA1 70a84beb5477738ff03024c4ce18a678b90fa1df SHA256 3a66a9dcad5b3a291cd87364fbb961725aa1473cf9c7ce7fa675ba71fe9313ae
+DIST dovecot-1.1-managesieve-0.10.5.tar.gz 397879 RMD160 4696a0546aafffc2cef8fa010f615d488eaa7f8b SHA1 8606758af27cacc3ed06089d0e693d34f740dcd1 SHA256 651a952db0816f1ff876d32098c50932cbcae49f862c43a5f45aba5c0dc04da0
+DIST dovecot-1.1.10-managesieve-0.10.5.diff.gz 5915 RMD160 b2f6198b88e2ae205bc5b9c737ba986e9b05a979 SHA1 b38c19908bdc4dab33ada2c76548048f84c4ffe1 SHA256 5b00e6cbf65a82d4012e4b5216367d2f169eb88b168494ac916cf4284ea5bd0d
+DIST dovecot-1.1.10.tar.gz 2360885 RMD160 b5cbd15d03407cad78846e59c4ca22a3713d21af SHA1 7b509975e52473e86c4fdf13bd6f464144837f02 SHA256 07a714066a513cb845567405ce942a0b82d65f7bc6ac311e9cfd0bd59924da31
 DIST dovecot-1.1.4-managesieve-0.10.3.diff.gz 5827 RMD160 445db07bf8e3521cf5a568fd473388cfa15829ba SHA1 5d6366a4291c08c5c2339fb2ffd364de3f3bce6c SHA256 a7a1ea40ad1c025dfd8f0b0dde5cd37ab86520d046193bf641d57a3b4702b54b
 DIST dovecot-1.1.4.tar.gz 2314155 RMD160 1990d1276454f6a376c7fe0681f0969d6ba57a29 SHA1 576d0d1323b77e7820f284fae788a98d174098f8 SHA256 37edb0f7f790879a3cc9a6ad9fb89bf12cc59fd5b1d39173fa34f004daf6a12e
 DIST dovecot-1.1.6-managesieve-0.10.3.diff.gz 5912 RMD160 7284b3d81887e10cb174c64a0c7b3652e19e5272 SHA1 fff11aacf7df7f3d12d3163b36ca39f9681111fd SHA256 4a9612f788796d1c18653bc0aa5cc9269b3365d4a0358b3f6bf05cda206c139f
@@ -20,11 +23,12 @@ DIST dovecot-sieve-1.0.3.tar.gz 455806 RMD160 b575a1181fb2389a47db4cdd2815a47a2f
 DIST dovecot-sieve-1.1.5.tar.gz 468913 RMD160 825a8ec07d49527d8551cb5f3f86b638fddbafbd SHA1 672adf0a2f1627d96f97fc63fecaf024dd9f7a42 SHA256 ec1ea94311d5fb6cb5dd7e451728784afb39521a6a580f640b4d2115505a5ddf
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.0.15-r1.ebuild 7351 RMD160 cdd0b0b9b824aa1262a0c254410e8f7865fc4d6d SHA1 19c95d9f7a2a9a2c89013e553ce7d536ab227073 SHA256 4a8231ee4099306ccd7a095608a2b483f9fad440f13afec7bb7ec8dd2c4346f7
+EBUILD dovecot-1.1.10.ebuild 8588 RMD160 2a31388241f17bdbdb8432ab58439b9e95c75a76 SHA1 71909e4fb02da02bc51de77b3985b6ec9f75aaac SHA256 2f5c4b448244712f09fb82c1478c83b464fe94836795098908fcc8296905cde7
 EBUILD dovecot-1.1.4-r1.ebuild 8010 RMD160 c01c7452d28fbe5d5dc8826bc705bc1eefeef2cd SHA1 378c5c715177fdcef7d8c76a4e1fb2d76aa4a4c4 SHA256 93956a4240deb10d9d4573c6837fedc91c7a1645481fd734dd9ac6743b2de77e
 EBUILD dovecot-1.1.6-r1.ebuild 8027 RMD160 531f79cd36afb83e35dc751c154b6c26fe18aff3 SHA1 067310f31ad356cee89bc30dfbcf4a464a5b2b59 SHA256 02c1094f2e7cbb216cb9eb9844bcc64512b99ef1d8bd09b6e544cbd814e2ee43
 EBUILD dovecot-1.1.6.ebuild 7967 RMD160 8f533c55e0f774765b6b7c37858d3a2f6a842473 SHA1 e2ef8901e3ee2f3973152d701949a4b15d98b5a5 SHA256 8a39abf135d06973b7b0dc0bc2e7d2392c650b73f155b4dcbf51b405535f47b4
 EBUILD dovecot-1.1.7-r1.ebuild 8584 RMD160 9e0bf8fdbf8ed699fd131273241bdf3d4d3cb6bc SHA1 565e5a6bee35ccd3540682ac5f37a47d988700c0 SHA256 1a39caa28662acb24ee1413de6ef2efbc2dd093c2cfe717008fc3dc08f938a37
 EBUILD dovecot-1.1.7.ebuild 8164 RMD160 0f84b1a3463505fe4d273724644813f3a4e55000 SHA1 00e9e1d1ddfeca741a511b3cb9ad398c82ecab1e SHA256 24707562541b9a126118fa71f154ea3f0f148b7df2aa1f89279458ad386071d4
 EBUILD dovecot-1.1.8.ebuild 8679 RMD160 a216fd48d8e0df49d67ebfdcab8ca4b155c3fa84 SHA1 26137bfbac21d2f6e0800cc97d907b61994e5e60 SHA256 3bd72a45689e620a2e6a4587f7711439cb4b4efcf8bbece799d9a4d6957574ff
-MISC ChangeLog 31533 RMD160 142609c74cb1ff2cd11d1229bb52039eff0759f4 SHA1 b8a7be5f964cbb929b089bb048ce5baf075e6aa5 SHA256 e58199c36aa5565e7c3c643724ff81730a2f35992cb07f9526bde40908405e1f
+MISC ChangeLog 31657 RMD160 6a1d77295a89f4ba7a45eda4e6745a74e7defdf3 SHA1 d729d541e31e0d11bda8ba9874e9d8abe4169174 SHA256 418efe3bb9ae3a05d157433a24faec5bbcd7bde5ff83339d3a182097d49fd3b2
 MISC metadata.xml 560 RMD160 1d9909ba298f97ddfedc7c37a9a74a8a00f0fc98 SHA1 062f2369f4349513f9e8167b6c781e50c62b95d0 SHA256 2cce3170119fffd0c9e8403f57cee03c128ca1e1d58950f087ced22b04ba75c8
diff --git a/net-mail/dovecot/dovecot-1.1.10.ebuild b/net-mail/dovecot/dovecot-1.1.10.ebuild
new file mode 100644
index 000000000000..5b8efe1cf5a2
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1.10.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.10.ebuild,v 1.1 2009/01/27 14:10:35 wschlich Exp $
+
+inherit autotools eutils ssl-cert versionator
+
+MY_P="${P/_/.}"
+MY_PV12=$(get_version_component_range 1-2 ${PV})
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.1.6"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+MANAGESIEVE_PATCH="managesieve-0.10.5"
+MANAGESIEVE="managesieve-0.10.5"
+MANAGESIEVE_S="${WORKDIR}/${PN}-${MY_PV12}-${MANAGESIEVE}"
+
+SRC_URI="http://dovecot.org/releases/${MY_PV12}/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )
+managesieve? ( http://www.rename-it.nl/${PN}/${MY_PV12}/${MY_P}-${MANAGESIEVE_PATCH}.diff.gz
+http://www.rename-it.nl/${PN}/${MY_PV12}/${PN}-${MY_PV12}-${MANAGESIEVE}.tar.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="berkdb debug doc ipv6 kerberos ldap managesieve mbox mysql pop3d pam postgres sieve sqlite3 ssl suid vpopmail"
+
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
+DEPEND=">=sys-apps/sed-4
+	sys-libs/libcap
+	berkdb? ( >=sys-libs/db-4.2 )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( virtual/postgresql-base )
+	mysql? ( virtual/mysql )
+	sqlite3? ( =dev-db/sqlite-3* )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if use managesieve; then
+		epatch "${WORKDIR}"/${MY_P}-${MANAGESIEVE_PATCH}.diff
+		eautoreconf
+	fi
+}
+
+pkg_setup() {
+	if ! use sieve && use managesieve; then
+		eerror "managesieve USE flag selected but sieve USE flag unselected"
+		die "USE flag problem"
+	fi
+	# Add user and group for login process (same as for fedora/redhat)
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+}
+
+src_compile() {
+	local myconf=
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+	econf \
+		--localstatedir=/var \
+		--sysconfdir=/etc/dovecot \
+		--enable-header-install \
+		--with-ioloop=best \
+		--with-poll=best \
+		$(use_with berkdb db) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with pam) \
+		$(use_with pop3d) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite3 sqlite) \
+		$(use_with vpopmail) \
+		${myconf} \
+		|| die "configure failed"
+	emake || die "make failed"
+
+	if use sieve; then
+		einfo "Building sieve"
+		cd "${SIEVE_S}"
+		econf --with-dovecot="${S}" || die "configure failed (sieve)"
+		emake || die "make failed (sieve)"
+	fi
+
+	if use managesieve; then
+		einfo "Building managesieve"
+		cd "${MANAGESIEVE_S}"
+		econf --with-dovecot="${S}" --with-dovecot-sieve="${SIEVE_S}" \
+			|| die "configure failed (managesieve)"
+		emake || die "make failed (managesieve)"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	use suid && fperms u+s /usr/libexec/dovecot/deliver
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	use managesieve && newdoc ${MANAGESIEVE_S}/README README.managesieve
+	if use doc; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${D}/etc/dovecot/dovecot.conf"
+	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mail_location="maildir:~/.maildir"
+	if use mbox; then
+		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' "${conf}"
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" \
+		|| die "failed to update mail location settings in dovecot.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/passdb pam/, /^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${conf}" || die "failed to update PAM settings in dovecot.conf"
+		# mailbase does not provide a managesieve pam file
+		use managesieve && dosym imap /etc/pam.d/managesieve
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
+			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
+			"${conf}" || die "failed to update SSL settings in dovecot.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}" \
+			|| die "failed to update SQL settings in dovecot-sql.conf"
+		dodoc doc/dovecot-sql-example.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}" \
+			|| die "failed to update LDAP settings in dovecot-ldap.conf"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install \
+			|| die "make install failed (sieve)"
+	fi
+
+	# Install managesieve
+	if use managesieve; then
+		make -C "${MANAGESIEVE_S}" DESTDIR="${D}" install \
+			|| die "make install failed (managesieve)"
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0755 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+}
+
+get_config_var() {
+	local varname=${1}
+	if [[ -z ${varname} ]]; then
+		die "${FUNCNAME}: variable name missing"
+	fi
+	sed -n 's/^[[:space:]]\?'"${varname}"'[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		"${ROOT}"/etc/dovecot/dovecot.conf
+}
+
+pkg_postinst() {
+	elog "The Dovecot configuration has vastly changed since 0.99."
+	elog "You are encouraged to start afresh with a new configuration file."
+	elog "see http://wiki.dovecot.org/ for configuration examples."
+
+	if [[ -e "${ROOT}"/etc/dovecot.conf ]]; then
+		echo
+		ewarn "The Dovecot configuration now resides in ${ROOT}/etc/dovecot"
+	fi
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+	if use ssl; then
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+			-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+			einfo "Creating SSL certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+			chown dovecot:mail "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+		fi
+		if [[ ! -e "${ROOT}${base_dir}/login/ssl-parameters.dat" ]]; then
+			echo
+			elog "Dovecot requires DH SSL Parameters if you use SSL connections"
+			elog "These take some time to make, and dovecot will create them before"
+			elog "it allows any SSL connections."
+			elog "You can create them now before starting dovecot like so"
+			elog "   emerge --config =${PF}"
+		fi
+	fi
+
+	if grep -q '^ssl_key_password' "${ROOT}"/etc/dovecot/dovecot.conf; then
+		echo
+		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
+		ewarn
+		ewarn "You have set ssl_key_password in dovecot.conf!"
+		ewarn "You are URGED to read the advice in the current"
+		ewarn "dovecot-example.conf regarding sensible handling"
+		ewarn "of that password, as it might be readable by any"
+		ewarn "user on your system who can access that file!"
+		ewarn
+		ewarn "*** ATTENTION ATTENTION ATTENTION ATTENTION ATTENTION ***"
+		echo
+	fi
+}
+
+pkg_config() {
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+
+	if use ssl; then
+		einfo "Regenerating SSL parameters. This will take some time."
+		"${ROOT}"/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
+	fi
+}