version bump

Package-Manager: portage-2.1.5.6

3 files changed, 261 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 8fa2d10213ef..83078fa46f30 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.171 2008/07/16 16:25:54 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.172 2008/07/28 00:23:30 wschlich Exp $
+
+*dovecot-1.1.2 (28 Jul 2008)
+
+  28 Jul 2008; Wolfram Schlich <wschlich@gentoo.org> +dovecot-1.1.2.ebuild:
+  version bump
 
   16 Jul 2008; Luca Longinotti <chtekk@gentoo.org> dovecot-1.0.13-r1.ebuild,
   dovecot-1.0.15-r1.ebuild, dovecot-1.1.1-r1.ebuild:
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index c2ed9a4f38f9..9ecc256e509b 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,11 +8,14 @@ DIST dovecot-1.0.15.tar.gz 1783347 RMD160 d882e3dbed60cbcbacdcb6023d0c12213a0d35
 DIST dovecot-1.1-managesieve-0.10.3.tar.gz 395123 RMD160 bc8cc1be276d15d574e6a49ee4de67504b159399 SHA1 3f4764da34e7416cd280a6ab801e2a20b970b30c SHA256 ac70ee48cdec2d472c14cb93bc9f3339a30763e418a579ddea0b9b18befac5ac
 DIST dovecot-1.1.1-managesieve-0.10.3.diff.gz 6130 RMD160 f71e03c2a25fb6b4cbd56a1e8ce15a7e221adf51 SHA1 0dfd2f9b249b716f866e4c631c6ed92982d8d4f2 SHA256 923115908647a5177d2a45c2b36d265c739760a4ec69a95dd76c196a20bed97c
 DIST dovecot-1.1.1.tar.gz 2273779 RMD160 be522b080f221dbf655d9afa1f3fb1a786d4c3b2 SHA1 039993d8769237dd7d1c0c3ef277734f7013c66b SHA256 936982d0259035b380315599668d37276cfa5dd26f889126f50ccc03fecf9f5e
+DIST dovecot-1.1.2-managesieve-0.10.3.diff.gz 6117 RMD160 e29a8044a62d73b397b42af9f9c0ef4dd3d8d035 SHA1 010bb76955b22fa8e3575183a840876f2074826a SHA256 67a2b7ca49d5dc96e57b534008593c9702cecd768801aaba2f588087e5fe5980
+DIST dovecot-1.1.2.tar.gz 2300564 RMD160 50c8e0a18994332a91c2fe7fc512db858e5f6e76 SHA1 7363e86a87369a3464637d8d097e22e2b40df3d1 SHA256 693981dbaa3bfda0796a88995b42c17f8c48d3cc8630a4762557db01170ca91e
 DIST dovecot-sieve-1.0.2.tar.gz 451753 RMD160 8bed283ae672aafa61271f154f1f58d200bd4f5f SHA1 70b423eae6e47bc38f81faa36503228c1a8a5550 SHA256 9042eaf6d1237577a67ab3aa233953d640f62a296c5ffaaaed75ff25b657642a
 DIST dovecot-sieve-1.0.3.tar.gz 455806 RMD160 b575a1181fb2389a47db4cdd2815a47a2fe30b91 SHA1 48f67c33c08689c50a254bc6faeecba407d12294 SHA256 3f9e23abc64e7ae70343144b9a20f8da50aa102e3d9b85774ddd8ac0d1480fe1
 DIST dovecot-sieve-1.1.5.tar.gz 468913 RMD160 825a8ec07d49527d8551cb5f3f86b638fddbafbd SHA1 672adf0a2f1627d96f97fc63fecaf024dd9f7a42 SHA256 ec1ea94311d5fb6cb5dd7e451728784afb39521a6a580f640b4d2115505a5ddf
 EBUILD dovecot-1.0.13-r1.ebuild 7264 RMD160 425e44c901f892c18dd2937b9f68f5e7c275d869 SHA1 067aad2e0bc8144ccf77a4b26fc2b7b277d95ff0 SHA256 c3fcfd5d1c0f1b65229804ca3c8432a89dd65134a5ce75c8614c3f295efa087e
 EBUILD dovecot-1.0.15-r1.ebuild 7356 RMD160 d2f7648d0fbfed72a732f04732cc83334e108c44 SHA1 6c4562dcebd24f1e813b45440f92b4677a8a8d35 SHA256 78b7c9190078213245b50537b2f8e48bbd4c780426d8a7276d4828888a9bc3dc
 EBUILD dovecot-1.1.1-r1.ebuild 7974 RMD160 985528486d5504dce410e34b4c1b767f07c5b238 SHA1 516e11d86a679f4651c47a4f743e7fad6bcb0fe6 SHA256 563080b1e5c1523c586c0c56628099f3b0f697ed55fe5ae23fbc4901b3f21b8f
-MISC ChangeLog 28218 RMD160 8028865a0bffd0c40341aaec4e0e72b7fbb2ccb9 SHA1 5555e1af27f57fced0ed40d2e8a8d9c2f0bc49be SHA256 0cacf800a9674799ebad11fd4f103b639b9713f88911c16f6ae91426ced0f727
+EBUILD dovecot-1.1.2.ebuild 7973 RMD160 9c646fe5c78104149298c003d2c87be05a07f26e SHA1 4cde9b4ce1e02ab8606c97a542f5c161a3e0d6aa SHA256 046a93a20c622345a11660a8a0f638bf8b6a1a01e7fc05d305d36501508901c8
+MISC ChangeLog 28342 RMD160 f4e0e14a621085db0a77fef68317dac44909fed3 SHA1 19d5fc1b5c297394b443cd42b6862960c48cd446 SHA256 0d2ba4997abe90fca9d4610401dea6397a82309dfe193f9152b6f3ae7201b214
 MISC metadata.xml 307 RMD160 ed31b92a1f8c8c5c1cc6166bc0136dd03299bb9b SHA1 ac1cb79f5d3340ed9a9d3117531c1c7fa2af8edf SHA256 180d5598a7d709bf7969219969218d54d7283af53b238bf74c3f7223ca2190ef
diff --git a/net-mail/dovecot/dovecot-1.1.2.ebuild b/net-mail/dovecot/dovecot-1.1.2.ebuild
new file mode 100644
index 000000000000..3bbf11683eda
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1.2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1.2.ebuild,v 1.1 2008/07/28 00:23:30 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.5"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+MANAGESIEVE_PATCH="managesieve-0.10.3"
+MANAGESIEVE="managesieve-0.10.3"
+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="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
+	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_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-r1 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
+}
+
+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
+}