New upstream version.

  WARNING: beta2 requires DH parameters for SSL/TLS usage now. These will be
  generated the next time dovecot is started and may take some time. It took
  around 10 minutes on my VIA C3-2 1 GigaHertz server. This is a onetime
  operation.
(Portage version: 2.1_pre3-r1)

5 files changed, 145 insertions, 15 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index d8edb0083f74..b9bc9569f5ec 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/dovecot
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.33 2005/12/14 23:32:08 uberlord Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.34 2006/01/24 12:38:53 uberlord Exp $
+
+*dovecot-1.0_beta2 (24 Jan 2006)
+
+  24 Jan 2006; Roy Marples <uberlord@gentoo.org> +dovecot-1.0_beta2.ebuild:
+  New upstream version.
+  WARNING: beta2 requires DH parameters for SSL/TLS usage now. These will be
+  generated the next time dovecot is started and may take some time. It took
+  around 10 minutes on my VIA C3-2 1 GigaHertz server. This is a onetime
+  operation.
 
 *dovecot-1.0_alpha5 (14 Dec 2005)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 0001342c14cc..f29fdbbe88bb 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 75e381613bc7e1f07bd145c5b54e1f94 ChangeLog 6540
+MD5 71afa2b55e93c78d7b5bfc56f1c44426 ChangeLog 6915
 MD5 016773a9d3c70b74b98b7fcb8a602a1b dovecot-0.99.14-r1.ebuild 5165
 MD5 7f33b42e81bf0b1ba370bf13db3830a2 dovecot-1.0_alpha5.ebuild 3720
+MD5 9654fcd9055626da1a88a75032ced448 dovecot-1.0_beta2.ebuild 3720
 MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14-r1 67
 MD5 649b89c2ee32019d3a25820fbe158f99 files/digest-dovecot-1.0_alpha5 71
+MD5 a97ef7bb1cbec8304adb29ac531f5cea files/digest-dovecot-1.0_beta2 70
 MD5 155396035a3ecb1f5171b0432072181b files/dovecot.init 619
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtzBHI1lqEGTUzyQRAjLoAKCvDmiStN2UXX1xEB5gZOZ3xRj7SQCeI5+v
-9fZPWrVjfFT+mW0kZ4PYTaU=
-=vz85
------END PGP SIGNATURE-----
diff --git a/net-mail/dovecot/dovecot-1.0_alpha5.ebuild b/net-mail/dovecot/dovecot-1.0_alpha5.ebuild
index 9e5f4cabf7c3..1902bd97d8a1 100644
--- a/net-mail/dovecot/dovecot-1.0_alpha5.ebuild
+++ b/net-mail/dovecot/dovecot-1.0_alpha5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_alpha5.ebuild,v 1.2 2006/01/01 01:28:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_alpha5.ebuild,v 1.3 2006/01/24 12:38:53 uberlord Exp $
 
 inherit eutils
 
diff --git a/net-mail/dovecot/dovecot-1.0_beta2.ebuild b/net-mail/dovecot/dovecot-1.0_beta2.ebuild
new file mode 100644
index 000000000000..e855412cdde5
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_beta2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_beta2.ebuild,v 1.1 2006/01/24 12:38:53 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="debug ipv6 kerberos ldap mbox mysql pop3d pam postgres ssl vpopmail"
+
+DEPEND=">=sys-libs/db-3.2
+	>=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/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"
+
+#	Enable when linux-headers-2.6.13 hits portage for inotify
+#	or epoll gets more stable.
+#
+#	# Enable Linux only features
+#	if [[ ${KERNEL} == "linux" ]] ; then
+#		# epoll is too unstable
+#		# myconf="${myconf} --with-ioloop=epoll"
+#		if has_version ">=sys-kernel/linux-headers-2.6.13" ; then
+#			myconf="${myconf} --with-notify=inotify"
+#		fi
+#	fi
+
+	econf --localstatedir=/var \
+		$(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"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	mv "${D}"/etc/dovecot-example.conf "${D}"/etc/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mailenv="maildir:%h/.maildir"
+	if use mbox ; then
+		mailenv="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' \
+			"${D}"/etc/dovecot.conf
+	fi
+	sed -i -e \
+		"s|#default_mail_env =|default_mail_env = ${mailenv}|" \
+		"${D}"/etc/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 = "\*"|' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh
+
+	# Create SSL certificates
+	if use ssl ; then
+		dodir /etc/ssl/certs
+		dodir /etc/ssl/private
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e /etc/ssl/certs/dovecot.pem && \
+			-e /etc/ssl/private/dovecot.pem ]]; then
+			einfo "Generating X.509 certificate for SSL"
+			pushd doc >/dev/null && \
+				SSLDIR="${D}"/etc/ssl sh mkcert.sh && \
+				popd >/dev/null
+		fi
+	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
+	fperms 0600 /etc/dovecot.conf
+}
+
+pkg_postinst() {
+	einfo "The dovecot configuration has vastly changed since 0.99."
+	einfo "You are encouraged to start afresh with a new configuration file."
+	einfo "see http://wiki.dovecot.org/ for configuration examples."
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-1.0_beta2 b/net-mail/dovecot/files/digest-dovecot-1.0_beta2
new file mode 100644
index 000000000000..7c8db5c422a8
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_beta2
@@ -0,0 +1 @@
+MD5 a68f623b04876815d6522ac9d7bac869 dovecot-1.0.beta2.tar.gz 1340629