version bump

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

3 files changed, 261 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 94999f38db28..31f5e3be7d76 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.177 2008/09/08 09:51:19 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.178 2008/10/06 14:44:17 wschlich Exp $
+
+*dovecot-1.1.4 (06 Oct 2008)
+
+  06 Oct 2008; Wolfram Schlich <wschlich@gentoo.org> +dovecot-1.1.4.ebuild:
+  version bump
 
 *dovecot-1.1.3 (08 Sep 2008)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 5e669d9a8f7d..07004968a17e 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -7,10 +7,13 @@ DIST dovecot-1.1.1-managesieve-0.10.3.diff.gz 6130 RMD160 f71e03c2a25fb6b4cbd56a
 DIST dovecot-1.1.1.tar.gz 2273779 RMD160 be522b080f221dbf655d9afa1f3fb1a786d4c3b2 SHA1 039993d8769237dd7d1c0c3ef277734f7013c66b SHA256 936982d0259035b380315599668d37276cfa5dd26f889126f50ccc03fecf9f5e
 DIST dovecot-1.1.3-managesieve-0.10.3.diff.gz 5837 RMD160 79433e8ae20bd399b764278aad31efcd35530497 SHA1 b4f9e583410b91b67b610129bb4238c7e95933b7 SHA256 045520404c0928e63a7127d9a38b7c12ff68ff74dc423f88f8af9e93f129e756
 DIST dovecot-1.1.3.tar.gz 2306933 RMD160 ef759b01c0e80a3d6d9234189c97d478e9785c10 SHA1 a46a4bdb3d6fb86d74458c1e375cf71ff4503189 SHA256 e07d52e6d61a653672c5173d6d27fe119970c792478cbbd23b87f9fdfc0c13c7
+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-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.15-r1.ebuild 7351 RMD160 cdd0b0b9b824aa1262a0c254410e8f7865fc4d6d SHA1 19c95d9f7a2a9a2c89013e553ce7d536ab227073 SHA256 4a8231ee4099306ccd7a095608a2b483f9fad440f13afec7bb7ec8dd2c4346f7
 EBUILD dovecot-1.1.1-r1.ebuild 7969 RMD160 afd78ee995bab301a5977ab00ec932d4a50a02c8 SHA1 2673ada421bb2b0be7dc2f0014dfb9d3ba4d374d SHA256 811204aea474b148abb9cff72fd80042b90518aec1d62500257c6d99be5bbf1f
 EBUILD dovecot-1.1.3.ebuild 7973 RMD160 10ba452a0dac1579fa514bf10c613c3b1d8bc54e SHA1 d2a81fbdcab108b3608fab0b188f7ef982938566 SHA256 97f4b6deaf7bc468ddd1d01bacdb83fb47fc31efb2c2aa8cf1800835fe7021c3
-MISC ChangeLog 29104 RMD160 0600b6368abc0c83e863b6187c46c870bea68ccd SHA1 7115421ce9e21b9e46a2e491c1919e9b7a48e6a2 SHA256 a2bf5d5692d2a8933015343905bb064ad097278e94fb9f86331bf8bf409936f3
+EBUILD dovecot-1.1.4.ebuild 7973 RMD160 0fe9bbce5d797a62a3fa15accad807c24c3f1432 SHA1 c0b863621cc9ccc0db14961b15c90d339022d6b2 SHA256 2edc1f156d018d6e1eecb79fbca99b121f0289a6abb1bacdd8d82c6c099da68a
+MISC ChangeLog 29226 RMD160 a8c176e3c1cbec8bea2d98436ef8d72b6c1f13e1 SHA1 dfe6c5d026567f1751c7cd134566e586d0ef3d93 SHA256 d6a76e05f4682fb488602d114d162a6190020df03a9a4d434013b79162549448
 MISC metadata.xml 560 RMD160 1d9909ba298f97ddfedc7c37a9a74a8a00f0fc98 SHA1 062f2369f4349513f9e8167b6c781e50c62b95d0 SHA256 2cce3170119fffd0c9e8403f57cee03c128ca1e1d58950f087ced22b04ba75c8
diff --git a/net-mail/dovecot/dovecot-1.1.4.ebuild b/net-mail/dovecot/dovecot-1.1.4.ebuild
new file mode 100644
index 000000000000..bb1cda72d6e9
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1.4.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.4.ebuild,v 1.1 2008/10/06 14:44:17 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
+}