Bump

Package-Manager: portage-2.1.3.16

4 files changed, 229 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 7add0f070e2d..775ae27e2eab 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.119 2007/09/10 15:21:07 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.120 2007/10/29 09:39:01 uberlord Exp $
+
+*dovecot-1.0.6 (29 Oct 2007)
+
+  29 Oct 2007; Roy Marples <uberlord@gentoo.org> +dovecot-1.0.6.ebuild:
+  Bump
 
 *dovecot-1.0.5 (10 Sep 2007)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 185b6ccb6fe3..5fdf32bd0d19 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,6 +4,7 @@ RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878
 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 files/dovecot.init 878
 DIST dovecot-1.0.3.tar.gz 1773226 RMD160 fa3d832799a16212eb9e80b21e60aa6b8c8bfd3d SHA1 85a609b6fe979e76b84850d9ba6355f942360490 SHA256 5f361980448d0d2411bd9ad950ac8aafb95f39cb7c2bc7652df5f624f7d26391
 DIST dovecot-1.0.5.tar.gz 1775898 RMD160 da34fe38101b067644276144f189688e0827e54b SHA1 93782c065dd4962487da9faf3f5f6cb1ae6a101b SHA256 938edb1c767282ec0299fd99e71e4ce1a1f9f119623ef9f8b47776ab6a504024
+DIST dovecot-1.0.6.tar.gz 1783566 RMD160 eb4d76e70820a4ed5f03806ad2fd6bd793a597b5 SHA1 d261d9f7fda1d7436cbb96c678b76702989bf729 SHA256 96d3c20811e269a8ed367a9a420580d2098403182b41b2cb0383b6e56191e5e6
 DIST dovecot-sieve-1.0.2.tar.gz 451753 RMD160 8bed283ae672aafa61271f154f1f58d200bd4f5f SHA1 70b423eae6e47bc38f81faa36503228c1a8a5550 SHA256 9042eaf6d1237577a67ab3aa233953d640f62a296c5ffaaaed75ff25b657642a
 EBUILD dovecot-1.0.3.ebuild 6265 RMD160 589c924113f22f2d9a987bb08cde3d9af51b119d SHA1 c381fe220b91f5777b76046a2dca43e62b0ff823 SHA256 605f498e92b2d8d2bc3c56852cb5823e1c6db7f0aa8c7b7ac185096f400a5493
 MD5 0c0a8621003c8008a7b5a523e6c03d73 dovecot-1.0.3.ebuild 6265
@@ -13,10 +14,14 @@ EBUILD dovecot-1.0.5.ebuild 6271 RMD160 54fe77622e66652b6fa9e63143956b1dfa292831
 MD5 030bdf788f73cc6e14ab7b329cbfd714 dovecot-1.0.5.ebuild 6271
 RMD160 54fe77622e66652b6fa9e63143956b1dfa292831 dovecot-1.0.5.ebuild 6271
 SHA256 1beab48bea043a62c48626dcb4a3874870c22e52e88a53780742623333b28c87 dovecot-1.0.5.ebuild 6271
-MISC ChangeLog 19447 RMD160 1cc92999aa3211b63b7188ca00b4adf79dce4cc2 SHA1 7ef4b1869cd2c9c96fcb5d7d3b7fe03d84dae3e5 SHA256 12333e548272200eb573fa2b7478ad4f213ac1b3b654d5905e849425f8281d03
-MD5 cc68e80010fbd76a26f1c159b42299ca ChangeLog 19447
-RMD160 1cc92999aa3211b63b7188ca00b4adf79dce4cc2 ChangeLog 19447
-SHA256 12333e548272200eb573fa2b7478ad4f213ac1b3b654d5905e849425f8281d03 ChangeLog 19447
+EBUILD dovecot-1.0.6.ebuild 6271 RMD160 d8ba95556078fc4d9016c6d07cd52a6deccd761a SHA1 5db23d6f45b148f3ce4616d9c8d60bb5d17192b6 SHA256 e5e1e53586913f7b8698879b96452a4891684677078af92903a0afcf7b29cf1c
+MD5 08a736d0495e7ba907da8eb85793cc17 dovecot-1.0.6.ebuild 6271
+RMD160 d8ba95556078fc4d9016c6d07cd52a6deccd761a dovecot-1.0.6.ebuild 6271
+SHA256 e5e1e53586913f7b8698879b96452a4891684677078af92903a0afcf7b29cf1c dovecot-1.0.6.ebuild 6271
+MISC ChangeLog 19557 RMD160 87da93b9a4d519af14564af643745a73894c4aee SHA1 24a4283c0123441e0b2f7f85ebb43c6d1b339371 SHA256 0047545e2c64341747d08e3beb0e5502a95d815738f0ca983ca4768bb0b50b13
+MD5 1cf29ca5dc2253d17d77eabb570261f5 ChangeLog 19557
+RMD160 87da93b9a4d519af14564af643745a73894c4aee ChangeLog 19557
+SHA256 0047545e2c64341747d08e3beb0e5502a95d815738f0ca983ca4768bb0b50b13 ChangeLog 19557
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -27,3 +32,6 @@ SHA256 c0f41f955d3002146c6d51bc8f0dcbe0c0f25730e3d0d873bb89e580048faaa4 files/di
 MD5 5be9c19ed8c045c0e77a0831ffb007b4 files/digest-dovecot-1.0.5 503
 RMD160 32c962b31b1aa37d734f3b0169ab7a27171ed876 files/digest-dovecot-1.0.5 503
 SHA256 b3b3239ec33b02b0e0b9bd7063aecbc5a9515d09598332af2981cb9454a9c031 files/digest-dovecot-1.0.5 503
+MD5 1849a8a6ca96e180c663c781f60311f6 files/digest-dovecot-1.0.6 503
+RMD160 1316cd400706758c1e2886740403cef77f6a295b files/digest-dovecot-1.0.6 503
+SHA256 3719cce79cb444971389eba1f7e6a64e41fc316e7c1d2adb8d7dd54adb3b9ee0 files/digest-dovecot-1.0.6 503
diff --git a/net-mail/dovecot/dovecot-1.0.6.ebuild b/net-mail/dovecot/dovecot-1.0.6.ebuild
new file mode 100644
index 000000000000..9790abd26c47
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0.6.ebuild
@@ -0,0 +1,205 @@
+# 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.0.6.ebuild,v 1.1 2007/10/29 09:39:01 uberlord Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.0.2"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+
+SRC_URI="http://dovecot.org/releases/1.0/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://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"
+
+# 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"
+
+pkg_setup() {
+	# 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"
+		emake || die "make failed"
+	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
+	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
+
+	# 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
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6 ; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
+	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
+
+		# 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
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			insinto "${ROOT}"/etc/ssl/dovecot
+			docert server
+			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
+		fi
+	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}"
+		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}"
+		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"
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:0 /var/run/dovecot
+	fperms 0700 /var/run/dovecot
+	keepdir /var/run/dovecot/login
+	fowners root:dovecot /var/run/dovecot/login
+	fperms 0750 /var/run/dovecot/login
+}
+
+get_config_var() {
+	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		/etc/dovecot/dovecot.conf
+}
+
+pkg_postinst() {
+	# Touch ssl certs so that they are modified outisde of src_install
+	# We do this so portage does't unmerge them - silly portage
+	if use ssl ; then
+		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+	fi
+
+	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
+		ewarn
+		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
+	fi
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${basedir:-/var/run/dovecot}"
+	if use ssl \
+		&& [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
+		elog
+		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
+}
+
+pkg_config() {
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${base_dir:-/var/run/dovecot}"
+
+	einfo "Regenerating SSL parameters. This will take some time."
+	/usr/libexec/dovecot/ssl-build-param "${base_dir}/login/ssl-parameters.dat"
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0.6 b/net-mail/dovecot/files/digest-dovecot-1.0.6
new file mode 100644
index 000000000000..2f01d9436f82
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0.6
@@ -0,0 +1,6 @@
+MD5 c8ecdc0379b05cc24d089c11b8122765 dovecot-1.0.6.tar.gz 1783566
+RMD160 eb4d76e70820a4ed5f03806ad2fd6bd793a597b5 dovecot-1.0.6.tar.gz 1783566
+SHA256 96d3c20811e269a8ed367a9a420580d2098403182b41b2cb0383b6e56191e5e6 dovecot-1.0.6.tar.gz 1783566
+MD5 508926fc9ff8e0f6e13506e237d4916b dovecot-sieve-1.0.2.tar.gz 451753
+RMD160 8bed283ae672aafa61271f154f1f58d200bd4f5f dovecot-sieve-1.0.2.tar.gz 451753
+SHA256 9042eaf6d1237577a67ab3aa233953d640f62a296c5ffaaaed75ff25b657642a dovecot-sieve-1.0.2.tar.gz 451753