Install sample LDAP and/or SQL config files based on USE flags.

Package-Manager: portage-2.1_rc3-r2

4 files changed, 195 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 0fa4bcd5329a..e082d740bdd8 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2006/05/14 16:53:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.48 2006/05/30 14:45:08 uberlord Exp $
+
+*dovecot-1.0_beta8-r1 (30 May 2006)
+
+  30 May 2006; Roy Marples <uberlord@gentoo.org>
+  +dovecot-1.0_beta8-r1.ebuild:
+  Install sample LDAP and/or SQL config files based on USE flags.
+  Fixes #123049 thanks to Max Lorenz.
 
   14 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   dovecot-1.0_beta8.ebuild:
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b2394b56a968..65d43952cd0f 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,14 +3,18 @@ MD5 155396035a3ecb1f5171b0432072181b files/dovecot.init 619
 RMD160 b0693a3f1e4aa34f2db5389e29d79b7e669622a8 files/dovecot.init 619
 SHA256 833c2121376e753c0a983cedc3854a855bce9b3765f6479aa15cad9acb23ca43 files/dovecot.init 619
 DIST dovecot-1.0.beta8.tar.gz 1392106 RMD160 101a7011467691ba5f4a6f48e21d6d1dc5626c16 SHA256 b43bb6ea5426b0d78ae260b53be035d1b5371b76a342870b2d56a6aba1ad82d2
+EBUILD dovecot-1.0_beta8-r1.ebuild 5100 RMD160 608dbd81e3c5ebc24abad536974ff7ca60611c8a SHA1 21e9b6d559577d1aae657dbe31aea53c0be31540 SHA256 67bee8f42755585c60f7275209afd0fee8617a3e08907a7137809ffcf993d6d0
+MD5 c8e12405afe4d510d1018b3e12cd602e dovecot-1.0_beta8-r1.ebuild 5100
+RMD160 608dbd81e3c5ebc24abad536974ff7ca60611c8a dovecot-1.0_beta8-r1.ebuild 5100
+SHA256 67bee8f42755585c60f7275209afd0fee8617a3e08907a7137809ffcf993d6d0 dovecot-1.0_beta8-r1.ebuild 5100
 EBUILD dovecot-1.0_beta8.ebuild 4645 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d SHA1 060efcf3110e6ef0015e3087cce46780943243e6 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6
 MD5 9394fb4f53cb69bb777019adf947d2e7 dovecot-1.0_beta8.ebuild 4645
 RMD160 4792da7ed1922b0c11caa5710f2f073d8fa7a92d dovecot-1.0_beta8.ebuild 4645
 SHA256 6d68b17728695ef6d79dd229c74847ef1e0d106d46215d82df694f48c6e129a6 dovecot-1.0_beta8.ebuild 4645
-MISC ChangeLog 8740 RMD160 c69ac5ec3a9de8e4bfa28a49d517edfee84c6fe3 SHA1 a17f765d7e16ffeadf222135ddb7f64542b631a5 SHA256 e5a71100c93c80ab2cf4b344ce071b0f0645d5c1dd3bc1224fb907f11204943b
-MD5 f366f62cd0d8df1015c09f5643a8ec0f ChangeLog 8740
-RMD160 c69ac5ec3a9de8e4bfa28a49d517edfee84c6fe3 ChangeLog 8740
-SHA256 e5a71100c93c80ab2cf4b344ce071b0f0645d5c1dd3bc1224fb907f11204943b ChangeLog 8740
+MISC ChangeLog 8961 RMD160 67d419db3c7775ad54111d1081877afda5a3abbb SHA1 e9d0c99f53674a437da785831863f78b34d18644 SHA256 c71ce4097cedb97c3626a92b0e8c1bc2e2bf99d5ec882c0aa1706c07bce6876d
+MD5 7000d3f9f14866c221ecc4ee48047a42 ChangeLog 8961
+RMD160 67d419db3c7775ad54111d1081877afda5a3abbb ChangeLog 8961
+SHA256 c71ce4097cedb97c3626a92b0e8c1bc2e2bf99d5ec882c0aa1706c07bce6876d ChangeLog 8961
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -18,3 +22,6 @@ SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 metadata
 MD5 630ceba3b8cb8ecda31605cf8682ea3c files/digest-dovecot-1.0_beta8 256
 RMD160 5c835e169f576f6c5f68d9aff62dfc34c3a9fc81 files/digest-dovecot-1.0_beta8 256
 SHA256 bdeba92a3fd4e386e383101a09a3b9ce315a5dd235e5b8008e10c2f54b74dc3d files/digest-dovecot-1.0_beta8 256
+MD5 630ceba3b8cb8ecda31605cf8682ea3c files/digest-dovecot-1.0_beta8-r1 256
+RMD160 5c835e169f576f6c5f68d9aff62dfc34c3a9fc81 files/digest-dovecot-1.0_beta8-r1 256
+SHA256 bdeba92a3fd4e386e383101a09a3b9ce315a5dd235e5b8008e10c2f54b74dc3d files/digest-dovecot-1.0_beta8-r1 256
diff --git a/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild b/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild
new file mode 100644
index 000000000000..4e99e50ba02b
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_beta8-r1.ebuild
@@ -0,0 +1,173 @@
+# 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_beta8-r1.ebuild,v 1.1 2006/05/30 14:45:08 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-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
+	fperms 0600 /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
+
+	# Listen on ipv6 and ipv4
+	if use ipv6 ; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres ; then
+		mv doc/dovecot-sql.conf "${D}"/etc
+		fperms 600 /etc/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' \
+			"${D}"/etc/dovecot.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap ; then
+		mv doc/dovecot-ldap.conf "${D}"/etc
+		fperms 600 /etc/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' \
+			"${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
+}
+
+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_beta8-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_beta8-r1
new file mode 100644
index 000000000000..32a641b1dce8
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_beta8-r1
@@ -0,0 +1,3 @@
+MD5 6a87718a86ee1ae2334c75843dd9a7df dovecot-1.0.beta8.tar.gz 1392106
+RMD160 101a7011467691ba5f4a6f48e21d6d1dc5626c16 dovecot-1.0.beta8.tar.gz 1392106
+SHA256 b43bb6ea5426b0d78ae260b53be035d1b5371b76a342870b2d56a6aba1ad82d2 dovecot-1.0.beta8.tar.gz 1392106