version bump

Package-Manager: portage-2.1.4_rc11

4 files changed, 252 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 45295a53817b..7c4f5268c833 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.133 2007/12/29 16:39:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.134 2007/12/30 14:16:38 wschlich Exp $
+
+*dovecot-1.1_beta13 (30 Dec 2007)
+
+  30 Dec 2007; Wolfram Schlich <wschlich@gentoo.org>
+  +dovecot-1.1_beta13.ebuild:
+  version bump
 
 *dovecot-1.1_beta12 (29 Dec 2007)
 *dovecot-1.0.10 (29 Dec 2007)
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 1c6f1d57d85e..2b6df5f2f8ae 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -12,6 +12,7 @@ DIST dovecot-1.0.8.tar.gz 1793784 RMD160 d892f958b0531b13519c03c32f74138f97b2709
 DIST dovecot-1.0.9.tar.gz 1796543 RMD160 535cf4c9672c8e44e751f5ffad911440707fc7d4 SHA1 87d89ff79d967c95ab8e59a1c1b3f710caffc290 SHA256 a1861f42954a5497dc27eb6549e980524f75a50a03f58ac184e1770cff8a881d
 DIST dovecot-1.1.beta11.tar.gz 2191702 RMD160 8e12488e4d1c7023d6a95f5e49963898861b7ade SHA1 ca20b8c15f98014413212b1ded32fb0cd024552b SHA256 273b06a5b69873f7b29c0e67809cf4b1a9e41f14194089f65718739fe7e99509
 DIST dovecot-1.1.beta12.tar.gz 2185627 RMD160 19dc6477fd6f0a9415f883e97c546e7dbbb382a6 SHA1 6cafc03f479f7a1929047eba117106391e26c45c SHA256 d9b769139f9c3b644bd2be6c1b5e01d930dac956aa7940c106ec0b6fe9b9d4a9
+DIST dovecot-1.1.beta13.tar.gz 2201572 RMD160 d9b64206ebe7ba5a8d6a4abf419e5eb5ce6855da SHA1 2ebaeb47db1fcc7dd9223901a1ddd91b08b08a14 SHA256 767b149ba3e9f964e1de78f24090feab8750fc9b6b359be83ad2341c3a60178b
 DIST dovecot-sieve-1.0.2.tar.gz 451753 RMD160 8bed283ae672aafa61271f154f1f58d200bd4f5f SHA1 70b423eae6e47bc38f81faa36503228c1a8a5550 SHA256 9042eaf6d1237577a67ab3aa233953d640f62a296c5ffaaaed75ff25b657642a
 DIST dovecot-sieve-1.1.2.tar.gz 464909 RMD160 69ed0d7cdbc4a1299ff0483748d968a761acd794 SHA1 81e317b4d5a58a180253d08fb32713d5c861d934 SHA256 fb531f1ccee182b53af4473bff80fefc59899068b5eca8a037e9d1cc719c75ef
 EBUILD dovecot-1.0.10.ebuild 7099 RMD160 d4c668b2d6f27bb85e3d5a5e6a27e33f7d30ea1c SHA1 df432583dc282988c08a60ca7a06ab3ef4ace82a SHA256 747a3e3de44d8a8516cd6a44f75c6420b0b50fac3d7c10cbf1a10aabd3eb6754
@@ -50,10 +51,14 @@ EBUILD dovecot-1.1_beta12.ebuild 7123 RMD160 b239ab7e4e45fee062b6e8a48be5342cb4f
 MD5 0cc31934526872250e9d9c0fa75f5353 dovecot-1.1_beta12.ebuild 7123
 RMD160 b239ab7e4e45fee062b6e8a48be5342cb4f6b3dd dovecot-1.1_beta12.ebuild 7123
 SHA256 23dab5e4bbb03325db3184d5e6078b5047384f0065e8af8f6bae5b6ed8ab13d8 dovecot-1.1_beta12.ebuild 7123
-MISC ChangeLog 21147 RMD160 c2850e770162bbbd0ef8823ac81e68f6b547ce9b SHA1 8c65c7d7cb1c2e57f9d40076f9e121cd94794bb7 SHA256 5250c08be3314217cb3d3a1db41e65a39ba731fe1bbba0ca4a9f8ae04404dd16
-MD5 3dced2260e6f7d28b1ff64f699cfef44 ChangeLog 21147
-RMD160 c2850e770162bbbd0ef8823ac81e68f6b547ce9b ChangeLog 21147
-SHA256 5250c08be3314217cb3d3a1db41e65a39ba731fe1bbba0ca4a9f8ae04404dd16 ChangeLog 21147
+EBUILD dovecot-1.1_beta13.ebuild 7123 RMD160 ebae67eaf96bdae573171e075bf39c6720f436e2 SHA1 6e37b24b17d92160d3a2fbe60d985ac9558c27a8 SHA256 288009c14f4511fb8042fa5c3333a48155dd600a1a6251b3b401ccc68c93dbd7
+MD5 088a5adce6db1d4b3f0414bd0ebd8a64 dovecot-1.1_beta13.ebuild 7123
+RMD160 ebae67eaf96bdae573171e075bf39c6720f436e2 dovecot-1.1_beta13.ebuild 7123
+SHA256 288009c14f4511fb8042fa5c3333a48155dd600a1a6251b3b401ccc68c93dbd7 dovecot-1.1_beta13.ebuild 7123
+MISC ChangeLog 21281 RMD160 962dde632c0b1826346b4f2d9ad5ca2dad2ba4de SHA1 9ea7c270a5c6c4e4fc0ec986d640ee1d2fb1bc56 SHA256 accce18eb2f8bec59d5b3988eb2381bc84db4581edce7141be33fe3104b2fef6
+MD5 e97fe44eb23dd8c2fdb883ccbfed5c45 ChangeLog 21281
+RMD160 962dde632c0b1826346b4f2d9ad5ca2dad2ba4de ChangeLog 21281
+SHA256 accce18eb2f8bec59d5b3988eb2381bc84db4581edce7141be33fe3104b2fef6 ChangeLog 21281
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 MD5 2169405288c432c981b23bc7965d15c9 metadata.xml 162
 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 metadata.xml 162
@@ -85,3 +90,6 @@ SHA256 094dda670e323aebad52e3dd1bb7319d6c3aeeabac7736b60e4fc6a3e812760a files/di
 MD5 ab06dfda6af39cd5d238b82949998773 files/digest-dovecot-1.1_beta12 518
 RMD160 ace02a6539780b849adcfd6927b42d9b87444b2f files/digest-dovecot-1.1_beta12 518
 SHA256 8290f48c613f34aef55c95cc12a57231a0c4da817dc8576993123dd635624742 files/digest-dovecot-1.1_beta12 518
+MD5 d89a1e510506b4d56744e6d18ce9e9c9 files/digest-dovecot-1.1_beta13 518
+RMD160 0bee50cb53f1e6c6472fc7b02a60a0b303918f08 files/digest-dovecot-1.1_beta13 518
+SHA256 04a533f41c5d3e5da3c6f1462758a8ff98ce8eeef95f3e79408606aa21ebcdbf files/digest-dovecot-1.1_beta13 518
diff --git a/net-mail/dovecot/dovecot-1.1_beta13.ebuild b/net-mail/dovecot/dovecot-1.1_beta13.ebuild
new file mode 100644
index 000000000000..3101b4a3a2d0
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.1_beta13.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.1_beta13.ebuild,v 1.1 2007/12/30 14:16:38 wschlich Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.1.2"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+#MANAGESIEVE="dovecot-1.0.7-MANAGESIEVE-v9"
+
+SRC_URI="http://dovecot.org/releases/1.1/beta/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+#managesieve? ( http://sinas.rename-it.nl/~sirius/${MANAGESIEVE}.diff.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 mbox mysql pop3d pam postgres sieve ssl suid vpopmail" # managesieve
+
+# 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}"
+#	use managesieve && epatch "${DISTDIR}"/${MANAGESIEVE}.diff.gz
+}
+
+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() {
+#	use managesieve && eautoreconf
+	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
+}
+
+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 && dodoc 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
+
+	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
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.1_beta13 b/net-mail/dovecot/files/digest-dovecot-1.1_beta13
new file mode 100644
index 000000000000..1e7e38664f12
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.1_beta13
@@ -0,0 +1,6 @@
+MD5 ca676483a6a3705288f6d67b1be92e29 dovecot-1.1.beta13.tar.gz 2201572
+RMD160 d9b64206ebe7ba5a8d6a4abf419e5eb5ce6855da dovecot-1.1.beta13.tar.gz 2201572
+SHA256 767b149ba3e9f964e1de78f24090feab8750fc9b6b359be83ad2341c3a60178b dovecot-1.1.beta13.tar.gz 2201572
+MD5 39a078ca358dbc3f2b70e5f32e480d21 dovecot-sieve-1.1.2.tar.gz 464909
+RMD160 69ed0d7cdbc4a1299ff0483748d968a761acd794 dovecot-sieve-1.1.2.tar.gz 464909
+SHA256 fb531f1ccee182b53af4473bff80fefc59899068b5eca8a037e9d1cc719c75ef dovecot-sieve-1.1.2.tar.gz 464909