version bump

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 278 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 5d763c78caeb..fdc76a6a7cee 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.202 2009/04/21 14:58:47 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.203 2009/05/25 06:19:05 wschlich Exp $
+
+*dovecot-1.1.15 (24 May 2009)
+
+  24 May 2009; Wolfram Schlich <wschlich@gentoo.org> +dovecot-1.1.15.ebuild:
+  version bump
 
 *dovecot-1.1.14 (20 Apr 2009)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 86ef1da4f3ea..47087d488457 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -11,12 +11,15 @@ DIST dovecot-1.1.11-managesieve-0.10.5.diff.gz 5906 RMD160 27ea3b8d207fa94b25c07
 DIST dovecot-1.1.11.tar.gz 2362415 RMD160 74d233c7995df89a917d49f2f332efe0fe2b1dd3 SHA1 cc7fb44d3a750c656d6c2116b569b5587319d405 SHA256 d37fa251219559841151e12ba000565da6b999f48827db6beee612865f7a5a34
 DIST dovecot-1.1.14-managesieve-0.10.6.diff.gz 6488 RMD160 37f21fb7901107292e774e9d429d370905abb902 SHA1 8dc144defa715e7bba11144be19744931185a8a9 SHA256 c6d0329ab99eb73e0d464fb38b0806b93e444af2ae9603996fadf2ee58788f4f
 DIST dovecot-1.1.14.tar.gz 2372939 RMD160 c39ab75125a224492f36deaada4c8ab73d51db21 SHA1 a508e6cb69710e5f7fe40ef2559d370678352ad5 SHA256 95aa89b65fd89a42484850bbd33d463601039eea21107febc15175d4f3652c4c
+DIST dovecot-1.1.15-managesieve-0.10.6.diff.gz 6180 RMD160 5440420a0c1d3cabfc55ce04267466a8167c6197 SHA1 ef3da402654401756e0cad47b1aff151b7c7b91e SHA256 eb31a517eabaa1577b80332688383846a8108ff4ed863f29d666189ef241d3c3
+DIST dovecot-1.1.15.tar.gz 2383354 RMD160 2ddda6240e8aaed8afdce11196070c3628443083 SHA1 16a638b9d67bcd6c2d8a09a124103a1fc2ea6745 SHA256 d65828787c97919fca3e607369d87a3a29940fde3e5162ebb4444dfda47f7fca
 DIST dovecot-1.1.7-managesieve-0.10.4.diff.gz 5912 RMD160 7d22cd364cb1e95eaf6525b61e93208a3aff39ba SHA1 fad08ecf9a4d5cbfc77e32268af9e11ad0a55431 SHA256 dc13a3c231c7bd29a452e16f3654c941bfc2a89c31e6b392ac76ca47cd897a76
 DIST dovecot-1.1.7.tar.gz 2325617 RMD160 e2a53de356910094f2516b33f4155ded4cf5a6dc SHA1 d8554a1e1f04a84ddf009d1599526c016b36582b SHA256 915cae7684438c6335d0472ff20ec2fe44d620aa61f404ce91fd02a27434cf9f
 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.1.11-r1.ebuild 8775 RMD160 5105024cd60bf033ae9be2ca9813d20edbc1d847 SHA1 a843379eb9f4362b76b0f336f40a11c9cc012a0d SHA256 45704474fc2df8b72d6d9dbfd4a461894d6b44b2b2911e60bc0d7495cdb8d223
 EBUILD dovecot-1.1.14.ebuild 8588 RMD160 71e5701dd1e88da0d1af2ee658790aafa70ff700 SHA1 302f872a9bc1b32bbe41381536c40aa8af9bd490 SHA256 427f9df02621bbacbde67f033da3a488a35e3ee7e63136c792f2c6d997b02dcc
+EBUILD dovecot-1.1.15.ebuild 8588 RMD160 c46d7dace47338273e868520e6b8e04f53a8b057 SHA1 55e004ee1206bbcd0e1c0488309539b672b9c0cc SHA256 20c55c461b51de792db50fe18f72ca6862e40b2cf539ac297b055f0c848b934b
 EBUILD dovecot-1.1.7-r1.ebuild 8584 RMD160 9e0bf8fdbf8ed699fd131273241bdf3d4d3cb6bc SHA1 565e5a6bee35ccd3540682ac5f37a47d988700c0 SHA256 1a39caa28662acb24ee1413de6ef2efbc2dd093c2cfe717008fc3dc08f938a37
-MISC ChangeLog 33096 RMD160 d63f408dd7268883e279001e705b0809130ac885 SHA1 7adb8b792fcd62d65605882b709383a7a6d1541f SHA256 66df834d8c22c994500a5c747afeea31e5336abc4317dd24bd49a9629e8aa20c
+MISC ChangeLog 33220 RMD160 e863edf87bf0e8fa394c1cb4bddc48ac40268fe1 SHA1 79e6fcff23a99ea7c3009f9087e59203f01e2206 SHA256 e35afcbb17cd5906e47384b4f2d11394074ca22b54fa24e7ca63b69a8889e14c
 MISC metadata.xml 560 RMD160 1d9909ba298f97ddfedc7c37a9a74a8a00f0fc98 SHA1 062f2369f4349513f9e8167b6c781e50c62b95d0 SHA256 2cce3170119fffd0c9e8403f57cee03c128ca1e1d58950f087ced22b04ba75c8
diff --git a/net-mail/dovecot/dovecot-1.1.15.ebuild b/net-mail/dovecot/dovecot-1.1.15.ebuild
new file mode 100644
index 000000000000..2167e349c15d
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1.15.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.15.ebuild,v 1.1 2009/05/25 06:19:05 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.6"
+MANAGESIEVE="managesieve-0.10.6"
+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
+}