Use PAM profiles provided by net-mail/mailbase.

(Portage version: 2.0.51.16)

4 files changed, 178 insertions, 6 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 84c8df7de346..c6c0ada5567e 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2005/02/19 02:51:32 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.21 2005/02/25 16:28:09 ticho Exp $
+
+*dovecot-0.99.14-r1 (25 Feb 2005)
+
+  25 Feb 2005; Andrej Kacian <ticho@gentoo.org> +dovecot-0.99.14-r1.ebuild:
+  Use common PAM profiles provided by >=net-mail/mailbase-0.00-r8 if pam USE
+  flag is set. This only means changing auth_passdb setting in installed
+  config file to "pam *".
 
 *dovecot-0.99.14 (18 Feb 2005)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 36723e8eacf1..0361a46ae334 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,10 +1,12 @@
-MD5 848227fbad722c88c1c43009e3e0b449 dovecot-0.99.11-r1.ebuild 4767
-MD5 26d0ab53d83413a7802fc63f0b0c2c0f dovecot-0.99.14.ebuild 4765
 MD5 9434562dc9638638684fe67cc4080601 ChangeLog 4330
-MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
 MD5 6a34fea4097fc6dc6bbadbb7879a3ebd dovecot-0.99.13.ebuild 4764
-MD5 07b795b2b49257dee3743d5698d0d919 files/dovecot.init 517
+MD5 61e0d05b1306513aede2838fa81b05b5 metadata.xml 225
+MD5 26d0ab53d83413a7802fc63f0b0c2c0f dovecot-0.99.14.ebuild 4765
+MD5 9b0809bffe209bdc57b464efd932330b dovecot-0.99.14-r1.ebuild 4737
+MD5 848227fbad722c88c1c43009e3e0b449 dovecot-0.99.11-r1.ebuild 4767
 MD5 d7a52bb7835818feb1f4acd85eba3d57 files/digest-dovecot-0.99.13 67
+MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
 MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14 67
+MD5 07b795b2b49257dee3743d5698d0d919 files/dovecot.init 517
+MD5 2a50200054849ca5e0173cb709ef649d files/digest-dovecot-0.99.14-r1 67
 MD5 3d6d703cf014f2defc8fed34b50849a9 files/digest-dovecot-0.99.11-r1 67
-MD5 1c0a9ca75cadf12377e70c2ef725ba0e files/dovecot.pam 220
diff --git a/net-mail/dovecot/dovecot-0.99.14-r1.ebuild b/net-mail/dovecot/dovecot-0.99.14-r1.ebuild
new file mode 100644
index 000000000000..bdc2f209fea4
--- /dev/null
+++ b/net-mail/dovecot/dovecot-0.99.14-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-0.99.14-r1.ebuild,v 1.1 2005/02/25 16:28:09 ticho Exp $
+
+IUSE="debug ipv6 ldap mbox pam postgres sasl ssl gnutls vpopmail nopop3d mysql"
+inherit eutils
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+SRC_URI="http://dovecot.org/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+
+#PROVIDE="virtual/imapd"
+
+# Note: current dovecot will break on gnutls
+# http://www.dovecot.org/list/dovecot/2004-November/005169.html
+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 )
+	postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/mysql )
+	vpopmail? ( net-mail/vpopmail )"
+	#gnutls? ( <=net-libs/gnutls-1.0.4 )
+
+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 /bin/false /dev/null dovecot
+}
+
+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 mysql && myconf="${myconf} --with-mysql"
+	use sasl && myconf="${myconf} --with-cyrus-sasl2"
+	# gnutls support no longer working
+	# (http://www.dovecot.org/list/dovecot/2004-November/005169.html)
+	use ssl && myconf="${myconf} --with-ssl=openssl"
+	if use gnutls; then
+		eerror 'GNUTLS support no longer available, see'
+		eerror 'http://www.dovecot.org/list/dovecot/2004-November/005169.html'
+		eerror
+		eerror 'Please set USE="-gnutls ssl" if you want TLS support.'
+		die
+	fi
+	# 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
+	# We're using pam files (imap and pop3) provided by mailbase-0.00-r8
+	if use pam
+	then
+		sed -ie 's/auth_passdb = pam/auth_passdb = pam */' ${D}/etc/dovecot.conf
+	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.14-r1. be aware that the PAM"
+		ewarn "profile usage was changed. Dovecot's services now use distinctive profiles,"
+		ewarn "i.e. IMAP uses profile 'imap', POP3S uses profile 'pop3s', etc..."
+		echo
+		einfo "The above applies for default configuration (\"auth_passdb = pam *\")."
+		einfo "These PAM profiles are provided by net-mail/mailbase ebuild."
+	fi
+	echo
+	einfo "Please review /etc/dovecot.conf, particularly auth_userdb and auth_passdb."
+}
diff --git a/net-mail/dovecot/files/digest-dovecot-0.99.14-r1 b/net-mail/dovecot/files/digest-dovecot-0.99.14-r1
new file mode 100644
index 000000000000..780363b9c5d1
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-0.99.14-r1
@@ -0,0 +1 @@
+MD5 a12e26fd378a46c31ec3a81ab7b55b5b dovecot-0.99.14.tar.gz 871285