New upstream version.

  We can now create DH SSL parameters via emerge --config dovecot.
(Portage version: 2.1_pre4-r1)

4 files changed, 186 insertions, 11 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index b9bc9569f5ec..c5ab5c3d3f90 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.35 2006/02/10 13:05:19 uberlord Exp $
+
+*dovecot-1.0_beta3 (10 Feb 2006)
+
+  10 Feb 2006; Roy Marples <uberlord@gentoo.org> +dovecot-1.0_beta3.ebuild:
+  New upstream version.
+  We can now create DH SSL parameters via emerge --config dovecot.
 
 *dovecot-1.0_beta2 (24 Jan 2006)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 02d1f600565e..3b7ef011e250 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,19 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e1f0631a3cac5e265ea4f7ee5c94c44a ChangeLog 6915
+RMD160 c839b643c53eaae64cc49d56cae7aad525f5ae26 ChangeLog 6915
+SHA256 e1ff3c50d84b8208899e556f477c8103e94999439b410e8ade491468401f00d4 ChangeLog 6915
 MD5 016773a9d3c70b74b98b7fcb8a602a1b dovecot-0.99.14-r1.ebuild 5165
+RMD160 9079b9fc7893ecb777d02ec2b72bc098f090683f dovecot-0.99.14-r1.ebuild 5165
+SHA256 76aedc9947c4efce90840e5046611f1747a6e6544f948aa2ae77f36376760449 dovecot-0.99.14-r1.ebuild 5165
 MD5 cee6414e053a23a17aae383929c47e93 dovecot-1.0_alpha5.ebuild 3720
+RMD160 13e760a3a9beec52f19834389990177be54b8ae8 dovecot-1.0_alpha5.ebuild 3720
+SHA256 ae15ea9e20b1e2d9107519d16df1ce908bb9b2756fdcd9bcb325a87e18e2a089 dovecot-1.0_alpha5.ebuild 3720
 MD5 3095ed47c7635193b8627dd4647c5bc9 dovecot-1.0_beta2.ebuild 3719
+RMD160 3f1b882989fa97ac6422dff3211ae5889276e2b0 dovecot-1.0_beta2.ebuild 3719
+SHA256 2aff469c39319fb4af286fc921b306a2aa917a4e175596f3fe0c53f9cb88b004 dovecot-1.0_beta2.ebuild 3719
+MD5 ae164744d00a473ecedd4dbd8642d02c dovecot-1.0_beta3.ebuild 4539
+RMD160 6e8c5a31f6e026c3812d4becdc07f0b45707efd0 dovecot-1.0_beta3.ebuild 4539
+SHA256 b31128ffa8af262c0178e4517a5762c916d365b29aa675e4ff4bb62e438eabb0 dovecot-1.0_beta3.ebuild 4539
 MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14-r1 67
+RMD160 bef49c59ecd06cab21f39c1d82d2c7699952dc7e files/digest-dovecot-0.99.14-r1 67
+SHA256 e5526bcfe07df3f84790bc082da36c32c5957e560df53ed63fd2a8cce940dbe6 files/digest-dovecot-0.99.14-r1 67
 MD5 649b89c2ee32019d3a25820fbe158f99 files/digest-dovecot-1.0_alpha5 71
+RMD160 126e72108ca5f1d65033cacc143f0da7fa253857 files/digest-dovecot-1.0_alpha5 71
+SHA256 19e5fe15303f514819e71bd6b7bfb0e1c082520920c3ecb7f570422e1b2998e1 files/digest-dovecot-1.0_alpha5 71
 MD5 a97ef7bb1cbec8304adb29ac531f5cea files/digest-dovecot-1.0_beta2 70
+RMD160 1bbcd3318d3cbebd25f80aca314ffa0965fcc862 files/digest-dovecot-1.0_beta2 70
+SHA256 211bea2990f98a7d9df0a14a8eddb150a74d9d390eda662c718274e235879db1 files/digest-dovecot-1.0_beta2 70
+MD5 93fc70606fb193f5ac4aa00d27902be4 files/digest-dovecot-1.0_beta3 256
+RMD160 bfcfbf78ffa9963af31d4c5ba6e2b5925cbc3438 files/digest-dovecot-1.0_beta3 256
+SHA256 7d67abc03ada4a7ece25356f474861e0e48924857aa5bbb33bc24999370c657b files/digest-dovecot-1.0_beta3 256
 MD5 155396035a3ecb1f5171b0432072181b files/dovecot.init 619
+RMD160 b0693a3f1e4aa34f2db5389e29d79b7e669622a8 files/dovecot.init 619
+SHA256 833c2121376e753c0a983cedc3854a855bce9b3765f6479aa15cad9acb23ca43 files/dovecot.init 619
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD1h/2EbVyYKaZ/NERAtC3AJ9Li8ajWI0bTj6IjdvVZgooMhZKCQCdE/K3
-gsK/BUPfrR0CW/NK/12e/5k=
-=6xP7
------END PGP SIGNATURE-----
+RMD160 ac3483d68e92cb16beee7988f212b78ba94bb6af metadata.xml 225
+SHA256 b745d82a37a83bc996e64dc2579616898317e0192e05047ec68b93a59ffdaa95 metadata.xml 225
diff --git a/net-mail/dovecot/dovecot-1.0_beta3.ebuild b/net-mail/dovecot/dovecot-1.0_beta3.ebuild
new file mode 100644
index 000000000000..71ed30adf075
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_beta3.ebuild
@@ -0,0 +1,152 @@
+# 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_beta3.ebuild,v 1.1 2006/02/10 13:05:19 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
+}
+
+get_config_var() {
+	sed -n 's/^[[:space:]]\?base_dir[[:space:]]*="*\([^#"]\+\)"*/\1/p' \
+		/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."
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${basedir:-/var/run/dovecot}"
+	if [[ ! -e "${ROOT}/${base_dir}/login/ssl-parameters.dat" ]] ; then
+		einfo
+		einfo "Dovecot requires DH SSL Parameters if you use SSL connections"
+		einfo "These take some time to make, and dovecot will create them before"
+		einfo "it allows any SSL connections."
+		einfo "You can create them now before starting dovecot like so"
+		einfo "   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_beta3 b/net-mail/dovecot/files/digest-dovecot-1.0_beta3
new file mode 100644
index 000000000000..d8b8d1ab7332
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_beta3
@@ -0,0 +1,3 @@
+MD5 5418f9f7fe99e4f10bb82d9fe504138a dovecot-1.0.beta3.tar.gz 1360574
+RMD160 180e694ee78b73e69995096e1598cca427f6c87d dovecot-1.0.beta3.tar.gz 1360574
+SHA256 c283111cd57c7938356c3f564eec6a8e4ba066f5c448f209e305a1409232520e dovecot-1.0.beta3.tar.gz 1360574