Add upstream patch to fix #136781 a whole load better.

(Portage version: 2.1)

4 files changed, 199 insertions, 1 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 11e19eea9cf2..61946fe31a19 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.54 2006/06/16 08:42:06 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.55 2006/06/16 11:28:55 uberlord Exp $
+
+*dovecot-1.0_beta9-r2 (16 Jun 2006)
+
+  16 Jun 2006; Roy Marples <uberlord@gentoo.org>
+  +files/dovecot-1.0_beta9-ssl_listen.patch, +dovecot-1.0_beta9-r2.ebuild:
+  Add upstream patch to fix #136781 a whole load better.
 
 *dovecot-1.0_beta9-r1 (16 Jun 2006)
 
diff --git a/net-mail/dovecot/dovecot-1.0_beta9-r2.ebuild b/net-mail/dovecot/dovecot-1.0_beta9-r2.ebuild
new file mode 100644
index 000000000000..89c70f697ca7
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_beta9-r2.ebuild
@@ -0,0 +1,176 @@
+# 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_beta9-r2.ebuild,v 1.1 2006/06/16 11:28:55 uberlord Exp $
+
+inherit autotools 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 doc 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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix ssl_listen
+	epatch "${FILESDIR}/${P}"-ssl_listen.patch
+
+	# Get dovecot to autodetect nice kernel features such as inotify and kqueue
+	epatch "${FILESDIR}/${P}"-configure.patch
+	eautoconf
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf
+	use ssl && myconf="${myconf} --with-ssl=openssl" \
+		|| myconf="${myconf} --without-ssl"
+
+	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
+		cp 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
+		cp 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
+	if use doc ; then
+		dodoc AUTHORS NEWS README TODO dovecot-example.conf
+		dodoc doc/*.txt doc/*.conf doc/*.cnf doc/mkcert.sh
+	fi
+
+	# 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_beta9-r2 b/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r2
new file mode 100644
index 000000000000..5e22728901a3
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_beta9-r2
@@ -0,0 +1,3 @@
+MD5 5c19a21afb8a02c95f3f62fa37d8e1ed dovecot-1.0.beta9.tar.gz 1245601
+RMD160 30d423b9fd2056fd8d898bc4bc630d3806cc64c4 dovecot-1.0.beta9.tar.gz 1245601
+SHA256 1bc44e2ab23ac8863aea42ce4ea5045d5f6ee2375804e432d8e7f918c14379b8 dovecot-1.0.beta9.tar.gz 1245601
diff --git a/net-mail/dovecot/files/dovecot-1.0_beta9-ssl_listen.patch b/net-mail/dovecot/files/dovecot-1.0_beta9-ssl_listen.patch
new file mode 100644
index 000000000000..2bd88229800e
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-1.0_beta9-ssl_listen.patch
@@ -0,0 +1,13 @@
+--- src/master/main.c.orig	2006-06-16 12:07:06.000000000 +0100
++++ src/master/main.c	2006-06-16 12:08:01.000000000 +0100
+@@ -355,7 +355,9 @@
+ 	resolve_ip(set->listen, &set->listen_ip, &set->listen_port);
+ 	resolve_ip(set->ssl_listen, &set->ssl_listen_ip, &set->ssl_listen_port);
+ 
+-	if (set->ssl_listen_ip.family == 0 && set->ssl_listen == NULL)
++	/* if ssl_listen wasn't explicitly set in the config file,
++	   use the non-ssl IP settings for the ssl listener, too. */
++	if (set->ssl_listen_ip.family == 0 && *set->ssl_listen == '\0')
+ 		set->ssl_listen_ip = set->listen_ip;
+ 
+ 	/* register wanted protocols */