version bump of the MANAGESIEVE plugin

Package-Manager: portage-2.1.4

3 files changed, 257 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 35bcc07ec980..e7a9a43f89a5 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.144 2008/02/23 11:43:24 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.145 2008/03/03 19:10:04 wschlich Exp $
+
+*dovecot-1.1_rc1-r1 (03 Mar 2008)
+
+  03 Mar 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +dovecot-1.1_rc1-r1.ebuild:
+  version bump of the MANAGESIEVE plugin
 
 *dovecot-1.1_rc1 (22 Feb 2008)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 5b6d42572504..0c4e656db461 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,6 +3,7 @@ DIST dovecot-1.0.10-MANAGESIEVE-v9.1.diff.gz 103744 RMD160 56162b23726f2069c7b33
 DIST dovecot-1.0.10.tar.gz 1797790 RMD160 6d5120e7173f399590da5d3f5eee3752125faa33 SHA1 7693b5be369e1b3f9ce13ebc29c3cb2ca814087e SHA256 df7aca6e7be748e02148bcc07173a19fcd5f4777b102e3f49b60f491f86b0fd3
 DIST dovecot-1.0.7-MANAGESIEVE-v9.diff.gz 103777 RMD160 6e8557c435b581edf89837d240eb1813bab0bff6 SHA1 d03a2f7ce12c70cbe08b118b0a03b93790c01729 SHA256 575b5a971f759aa5a0b22d0657bfed8d6bba5661e2d7823142f8fec6ed49cb88
 DIST dovecot-1.1-managesieve-0.10.0.tar.gz 385734 RMD160 45ebd2c04a5536184d638ba1b14bd4f70cb425d4 SHA1 4bf5be5a537820ee6c5227711e2e615e9ba83d15 SHA256 8157173a2424766d4978fbc9ec3f1dbb16331ca379a6602e6830cd1c2ae13c64
+DIST dovecot-1.1-managesieve-0.10.1.tar.gz 383509 RMD160 dfd207bb563c4a2f5f529f475c60088ad462883b SHA1 4c5418315d21a560bd1ed0551bb65a24cd3d9c41 SHA256 216c1d0904a881d3143d92ce282a477b68a4e0cf3eaea59bb091f7c664919ee9
 DIST dovecot-1.1.beta15-managesieve-0.10.0.diff.gz 6096 RMD160 f0d18e8eadf90da7949585a088e79ef32a81b996 SHA1 19a776a106a59b662939dda4de443ccf75924dfa SHA256 b8f39eb2cea19984162119852f9b43b4b6bc59fd803cd75bad0c6d4e8888583c
 DIST dovecot-1.1.beta15.tar.gz 2196425 RMD160 8f45c4d5d6722a07c12ab892b2c1b63a27970aa1 SHA1 6979eefbe268eaae38c4cd348d8a7d79846405d0 SHA256 d1d0e3772721dd3225c4bcf5bb5d008a537a8039b16c0da32a1a8dfd8af1c75d
 DIST dovecot-1.1.beta16-managesieve-0.10.0.diff.gz 6094 RMD160 361f240144bafe000a6828242bfaf83c36af4bc4 SHA1 421a5961c9c3154dc851941788b261632cf28c5f SHA256 59e0d3bcd8cf67ce1850836000c683f7805a7bfc08e394460feca608077486aa
@@ -16,6 +17,7 @@ EBUILD dovecot-1.0.10-r1.ebuild 7165 RMD160 23d4aed17402594675bf823447ae9fb7d6d9
 EBUILD dovecot-1.0.10.ebuild 7090 RMD160 14a7da44ccbe1bc70336b6614d84f16301120603 SHA1 5fe85c656cee74d20956ba45620f6367de4ee925 SHA256 8ef38f05f53cb3516696633e6f6efa835d2e1aefb414b167b54dca665736f89a
 EBUILD dovecot-1.1_beta15.ebuild 7739 RMD160 dc446253d10559dbf4a4aadc287d8a3bbd3b3627 SHA1 0f9b6ac6115ae14eb7e01de6edb0eb717bc94e6d SHA256 4eabae756e11be61b65c1dc089db0cc90212668183f9cc841a23962d4d0fa311
 EBUILD dovecot-1.1_beta16.ebuild 7739 RMD160 5b346c4e9499c0f38918fcedd21feb919349d1b6 SHA1 1eb419004f808d2a05c62441f071f9eebf73c270 SHA256 08fa8b85bf753b72980efc4d07db9aa638dc04534aea1697a22b08c14ee84447
+EBUILD dovecot-1.1_rc1-r1.ebuild 7788 RMD160 d3254752aa9747ca9542abdd9cb0d01834c350f8 SHA1 23caf0eb2e251988198873cee5fc466333f7dc10 SHA256 3742503ee019792ab236a67eefbee1b138b4c7f0b9e01ff11b52cefa808577bc
 EBUILD dovecot-1.1_rc1.ebuild 7734 RMD160 8607ad0d3be2e191f4acea986725f267d1081c32 SHA1 de15417370b437e8eab67d4b9f8c673e8e0d00d5 SHA256 681e5e445b8ada2c76e0ce927aa2e0a26f03c9909e9dc456a394ff88d8d04cac
-MISC ChangeLog 22755 RMD160 9a9a54b4c9a8ecc02f384996a171781f2cadc6c3 SHA1 e369a1b30c777443ad5ada91fdaeec269e1d9fe0 SHA256 c44aa9ff48b0507385b258c2b66a0d42a246577c6cce62a6a4c3f6dd7c6b4e2e
+MISC ChangeLog 22915 RMD160 17d4346ace7f8be608548e24d2e06b14cded100c SHA1 461cf6437561e6a93c8f5ffbddacf4c9498e187e SHA256 0974ca4e375198f1f1724ea3e705d9cb9a90b98fad27725c7eac0aa6111d5817
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
diff --git a/net-mail/dovecot/dovecot-1.1_rc1-r1.ebuild b/net-mail/dovecot/dovecot-1.1_rc1-r1.ebuild
new file mode 100644
index 000000000000..82ecc699f3ed
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1_rc1-r1.ebuild
@@ -0,0 +1,247 @@
+# 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_rc1-r1.ebuild,v 1.1 2008/03/03 19:10:04 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.4"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+MANAGESIEVE_PATCH="managesieve-0.10.0"
+MANAGESIEVE="managesieve-0.10.1"
+MANAGESIEVE_S="${WORKDIR}/${PN}-${MY_PV12}-${MANAGESIEVE}"
+
+SRC_URI="http://dovecot.org/releases/${MY_PV12}/rc/${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 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? ( dev-db/postgresql )
+	mysql? ( virtual/mysql )
+	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 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 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_extra_groups =|mail_extra_groups = 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"
+	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
+}