Version bump

4 files changed, 162 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 4a3f13e34870..049e9dc91c1a 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.9 2004/06/12 14:46:51 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.10 2004/06/24 16:18:36 g2boojum Exp $
+
+*dovecot-0.99.10.6 (24 Jun 2004)
+
+  24 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> +dovecot-0.99.10.6.ebuild:
+  Version bump (Thanks to Andreas Simon, Bug # 54826).
 
 *dovecot-0.99.10.5-r1 (12 Jun 2004)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2fee13e150f5..8ee3f616bcf6 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,7 +1,9 @@
 MD5 a5ab575cb7cd24fc1e7ec634e23737c7 dovecot-0.99.10.4-r1.ebuild 4107
-MD5 5f32b3183b1fc3d9a9d3f4449da33e2a ChangeLog 1976
+MD5 c074293fafc57b4dc3e83b330624b80b dovecot-0.99.10.6.ebuild 4409
+MD5 05712a2c7cf7636dd3a065d7ed8adf9f ChangeLog 2146
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
 MD5 34f16f7a9a13261bf922984b27ba9278 dovecot-0.99.10.5-r1.ebuild 4412
+MD5 d0c98a89b6d8d960ae0312a96256ecb8 files/digest-dovecot-0.99.10.6 69
 MD5 02900826bf90ce0fcbf43a3ebbfa31cf files/digest-dovecot-0.99.10.4-r1 69
 MD5 533a7de1250c369ae33b60c3c53586a1 files/digest-dovecot-0.99.10.5-r1 69
 MD5 55ac3fc8f2caaf3a6492cb5f2a0ccd5a files/dovecot.init 525
diff --git a/net-mail/dovecot/dovecot-0.99.10.6.ebuild b/net-mail/dovecot/dovecot-0.99.10.6.ebuild
new file mode 100644
index 000000000000..328b9616690c
--- /dev/null
+++ b/net-mail/dovecot/dovecot-0.99.10.6.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.10.6.ebuild,v 1.1 2004/06/24 16:18:36 g2boojum Exp $
+
+IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.procontrol.fi/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+
+#PROVIDE="virtual/imapd"
+
+# Note: current dovecot will break on gnutls-1.0.5
+DEPEND=">=sys-libs/db-3.2
+	>=sys-apps/sed-4
+	ldap? ( >=net-nds/openldap-1.2 )
+	pam? ( sys-libs/pam )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	gnutls? ( <=net-libs/gnutls-1.0.4 )
+	postgres? ( dev-db/postgresql )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+
+pkg_preinst() {
+	# Add user and group for login process
+	if ! getent group | grep -q ^dovecot
+	then
+		groupadd dovecot || die "problem adding group dovecot"
+	fi
+	if ! getent passwd | grep -q ^dovecot
+	then
+		useradd -c dovecot -d /usr/libexec/dovecot -g dovecot \
+		-s /bin/false dovecot  || die "problem adding user dovecot"
+	fi
+}
+
+src_compile() {
+	local myconf
+	use debug && myconf="--enable-debug"
+	use ldap && myconf="${myconf} --with-ldap"
+	use ipv6 || myconf="${myconf} --disable-ipv6"
+	use nopop3d && myconf="${myconf} --without-pop3d"
+	use pam || myconf="${myconf} --without-pam"
+	use postgres && myconf="${myconf} --with-pgsql"
+	use sasl && myconf="${myconf} --with-cyrus-sasl2"
+	# prefer gnutls to ssl if both gnutls and ssl are defined
+	use gnutls && myconf="${myconf} --with-ssl=gnutls"
+	use ssl && ! use gnutls && myconf="${myconf} --with-ssl=openssl"
+	! use gnutls && ! use ssl && myconf="${myconf} --without-ssl"
+	use vpopmail || myconf="${myconf} --without-vpopmail"
+
+	./configure \
+	  --prefix=/usr \
+	  --host=${CHOST} \
+	  --mandir=/usr/share/man \
+	  --infodir=/usr/share/info \
+	  --datadir=/usr/share \
+	  --sysconfdir=/etc \
+	  --localstatedir=/var \
+	  ${myconf} || die "configure failed"
+	emake || die
+}
+
+src_install () {
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us, changing the default
+	# mail spool locations to the Gentoo defaults.  
+	if use mbox
+	then
+		# /var/spool/mail/$USER mail spool
+		# The location of the INDEX may be overridden by the user if desired.
+		if [ -z ${DOVECOT_INDEX_PATH} ]
+		then
+			DOVECOT_INDEX_PATH="/var/dovecot/%d/%n"
+			dodir /var/dovecot
+		fi
+		sed -e \
+			"s|#default_mail_env =|#default_mail_env = mbox:/var/spool/mail/%u:INDEX=${DOVECOT_INDEX_PATH}|" \
+			dovecot-example.conf > dovecot.conf
+	else
+		# $HOME/.maildir mail spool.  
+		sed -e \
+			's|#default_mail_env =|default_mail_env = maildir:%h/.maildir|' \
+			dovecot-example.conf > dovecot.conf
+	fi
+	insinto /etc
+	doins dovecot.conf
+
+	make DESTDIR=${D} install || die
+	rm ${D}/etc/dovecot-example.conf
+
+	# Documentation
+	rm -fr ${D}/usr/share/doc/dovecot
+	cd ${S}
+	dodoc AUTHORS COPYING* NEWS README TODO dovecot-example.conf
+	dodoc doc/*.txt doc/*.conf doc/*.cnf
+
+	# per default dovecot wants it ssl cert called dovecot.pem
+	# fix this in mkcert.sh, which we use to generate the ssl certs
+	cd ${S}/doc
+	sed -ie 's/imapd.pem/dovecot.pem/g' mkcert.sh
+	dodoc mkcert.sh
+
+	# rc script
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dovecot.init dovecot
+
+	# PAM
+	if use pam
+	then
+		dodir /etc/pam.d
+		insinto /etc/pam.d
+		newins ${FILESDIR}/dovecot.pam dovecot
+	fi
+
+	# Create SSL certificates
+	if  use ssl || use gnutls
+	then
+		cd ${S}/doc
+		dodir /etc/ssl/certs
+		dodir /etc/ssl/private
+		# Let's not make a new certificate if we already have one
+		[ -e /etc/ssl/certs/dovecot.pem -a -e /etc/ssl/private/dovecot.pem ] \
+			|| SSLDIR=${D}/etc/ssl sh mkcert.sh
+	fi
+
+	dodir /var/run/dovecot
+	fowners root:root /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() {
+	if use pam
+	then
+		ewarn "If you are upgrading from Dovecot prior to 0.99.10, be aware"
+		ewarn "that the PAM profile was changed from 'imap' to 'dovecot'."
+		einfo "Please review /etc/pam.d/dovecot."
+	fi
+	einfo "Please review /etc/dovecot.conf, particularly auth_userdb and auth_passdb."
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.10.6 b/net-mail/dovecot/files/digest-dovecot-0.99.10.6
new file mode 100644
index 000000000000..3efe7506f893
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-0.99.10.6
@@ -0,0 +1 @@
+MD5 4f4f61147dc202a05c673a77535e5a46 dovecot-0.99.10.6.tar.gz 858545