Version bump, thanks to David Pufer (bug # 52371)

4 files changed, 169 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index d7f64ce75dfd..6e504954146a 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,17 @@
 # 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.4 2004/05/10 04:17:24 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.5 2004/05/30 04:58:38 g2boojum Exp $
+
+*dovecot-0.99.10.5 (30 May 2004)
+
+  30 May 2004; Grant Goodyear <g2boojum@gentoo.org> +dovecot-0.99.10.5.ebuild:
+  Version bump (thanks to David Pufer, bug # 52371).  I also did some
+  fairly massive cleaning, so this ebuild could be massively broken
+  (although it does seem to be working just fine for me -- dovecot is the imap
+  server that my family uses).  Also replaced the "maildir" USE flag with 
+  "mbox", since maildir is the Gentoo default and thus should never have
+  been a USE flag, and cleaned up the logic to make gnutls preferred over
+  ssl if both gnutls and ssl are secified in USE.
 
   09 May 2004; Jason Wever <weeve@gentoo.org> dovecot-0.99.10.4.ebuild:
   Added ~sparc keyword.
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ab243fd7db2c..6504d569f7da 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,10 @@
-MD5 75149f06ce0bc445242e0b4ed7b4d5fa ChangeLog 619
 MD5 d139aa43b9cfee91c9a7666c22bc1ce2 dovecot-0.99.10.4.ebuild 4062
+MD5 7b84eea16e05271064c1d8d85ffeb301 .dovecot-0.99.10.4.ebuild.swp 16384
+MD5 71c33cd44dfa6e2cc7823d6a46cdf9ca .dovecot-0.99.10.5.ebuild.swp 20480
+MD5 160bdbc93dca943c614e536a024ae0de dovecot-0.99.10.5.ebuild 4062
+MD5 75149f06ce0bc445242e0b4ed7b4d5fa ChangeLog 619
 MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
 MD5 02900826bf90ce0fcbf43a3ebbfa31cf files/digest-dovecot-0.99.10.4 69
+MD5 533a7de1250c369ae33b60c3c53586a1 files/digest-dovecot-0.99.10.5 69
 MD5 0c6a3de53492ebf8796de67f1a5ecfe6 files/dovecot.init 526
 MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
diff --git a/net-mail/dovecot/dovecot-0.99.10.5.ebuild b/net-mail/dovecot/dovecot-0.99.10.5.ebuild
new file mode 100644
index 000000000000..d2121d5bc8f5
--- /dev/null
+++ b/net-mail/dovecot/dovecot-0.99.10.5.ebuild
@@ -0,0 +1,151 @@
+# 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.5.ebuild,v 1.1 2004/05/30 04:58:38 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"
+
+#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
+}
+
+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.5 b/net-mail/dovecot/files/digest-dovecot-0.99.10.5
new file mode 100644
index 000000000000..71bfb2a284d9
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-0.99.10.5
@@ -0,0 +1 @@
+MD5 acda02c8bdcff5e194a8b9227ccb74b5 dovecot-0.99.10.5.tar.gz 863825