Bumpage - but with a fix!

  suid USE flag now installs deliver as suid, #172576.
Package-Manager: portage-2.1.2.2

4 files changed, 230 insertions, 5 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 69caf22fa24b..1e7d9f5b0f64 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.94 2007/03/13 20:57:38 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.95 2007/03/28 20:33:07 uberlord Exp $
+
+*dovecot-1.0_rc28 (28 Mar 2007)
+
+  28 Mar 2007; Roy Marples <uberlord@gentoo.org> +dovecot-1.0_rc28.ebuild:
+  Bumpage - but with a fix!
+  suid USE flag now installs deliver as suid, #172576.
 
 *dovecot-1.0_rc27 (13 Mar 2007)
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index b20e164e1e30..ff49ebe0b123 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -9,6 +9,7 @@ DIST dovecot-1.0.rc24.tar.gz 1498585 RMD160 4496e98216cbadd9352da4f898bdf656dfdb
 DIST dovecot-1.0.rc25.tar.gz 1511817 RMD160 f5a631c310ea8958ca5244ce2ba71332e44218af SHA1 ce9023ce1ff42c195586a55983407c019a6ba46d SHA256 2dc307fbbcc431ae680a5d4712853203894635fa2a45e4bd4c39fe92a35b85d8
 DIST dovecot-1.0.rc26.tar.gz 1515108 RMD160 c87f8f7da138187248017f6ff067d340e2969d0e SHA1 5b8f8b2d489479048812667bf65f8cf3c7e368db SHA256 7ddd94fb2638ec368c30ab4de94d01d040a47fccb59fb7ed1f949dbb7e2cb5be
 DIST dovecot-1.0.rc27.tar.gz 1521452 RMD160 b13d0ac5c6760d7646d0c5924943be0d7ce0e480 SHA1 7f026bd63234ae39658bde87a547b8c5001d892c SHA256 b2846c63325b88d1e39b908cb1ee03f2a9057d37600ea5b9c3dc5b923e97d0b0
+DIST dovecot-1.0.rc28.tar.gz 1534090 RMD160 7ea445c844d382115eb4fad651ff00d51dc58e9e SHA1 bf7f98298905f53700b3f2abde8c60f9aa6ba035 SHA256 56dd5221812d66a2fa90437ff3cc50a03236d94f9309cffb5ce48448bd64c2a3
 DIST dovecot-sieve-1.0.tar.gz 442943 RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 SHA1 6d151c4140e0cf89e3d771fb32b5da065dbbed24 SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a
 EBUILD dovecot-1.0_rc15.ebuild 5318 RMD160 78a83e7c4b0016c07df28daedfd5beb0f588df85 SHA1 5cb08423188982d0befab9017e1004f7929cfc8d SHA256 347aacb737d18250e7a209678a94055d0b01c290cd778ad9607559b975665ab2
 MD5 61d0c3649db044745ecb0036357d9ee9 dovecot-1.0_rc15.ebuild 5318
@@ -38,10 +39,14 @@ EBUILD dovecot-1.0_rc27.ebuild 6093 RMD160 4242adda74db83525c368e92a021a381a9c34
 MD5 3652605364e3457143b6028cb58bc8e2 dovecot-1.0_rc27.ebuild 6093
 RMD160 4242adda74db83525c368e92a021a381a9c349bb dovecot-1.0_rc27.ebuild 6093
 SHA256 3f5f5cf9239a0b8d972f507459498b9797ceef15a619b7eb2c67917a99c1ea98 dovecot-1.0_rc27.ebuild 6093
-MISC ChangeLog 15737 RMD160 54e80c28ceea1a9b0c9fa50202c8aafb0f0ad986 SHA1 4af976f1c18ba78bf5a64aebd6924ea4dd0d0249 SHA256 79e15fa4bf9e2290c3eaecf2a7f3c48f27c191e6a6a12d6b55275104c906d018
-MD5 c91e199691b57b8ad7a7b27ce5c48af4 ChangeLog 15737
-RMD160 54e80c28ceea1a9b0c9fa50202c8aafb0f0ad986 ChangeLog 15737
-SHA256 79e15fa4bf9e2290c3eaecf2a7f3c48f27c191e6a6a12d6b55275104c906d018 ChangeLog 15737
+EBUILD dovecot-1.0_rc28.ebuild 6276 RMD160 4a59b2ee6fe0cc301e3b9254bc77619ef9848553 SHA1 a37decac3fca81b3256f8b8d81bf2ba9b0130b9c SHA256 24b54f37a22e19cb5f5cbf94a66b7b7e2089e51cebd1840a90f27b3780de998d
+MD5 41f7a35a4f076c0953dc9d0919993cdd dovecot-1.0_rc28.ebuild 6276
+RMD160 4a59b2ee6fe0cc301e3b9254bc77619ef9848553 dovecot-1.0_rc28.ebuild 6276
+SHA256 24b54f37a22e19cb5f5cbf94a66b7b7e2089e51cebd1840a90f27b3780de998d dovecot-1.0_rc28.ebuild 6276
+MISC ChangeLog 15929 RMD160 449a3dd7081cf766c7b6dbf80cd82217ae80c58d SHA1 1d7191472aa36601c5fa2d4394e188aa259b3bf1 SHA256 9dd62fb081c3d0cf2a6e9fa4a0436e48635421d2e627ef9314906bb4bf52d6b8
+MD5 3da7ce35ccd7dc321958df4e99dbca63 ChangeLog 15929
+RMD160 449a3dd7081cf766c7b6dbf80cd82217ae80c58d ChangeLog 15929
+SHA256 9dd62fb081c3d0cf2a6e9fa4a0436e48635421d2e627ef9314906bb4bf52d6b8 ChangeLog 15929
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -67,3 +72,6 @@ SHA256 9bb53589c69e59dea241c9b3655d644b7b8ab9709b517e9868029123a7ea9374 files/di
 MD5 67d3806eb322dc391bcf287ac8e6973e files/digest-dovecot-1.0_rc27 506
 RMD160 b16c61801f82399e36073e58df8da73264a89fb6 files/digest-dovecot-1.0_rc27 506
 SHA256 54b2f494b8274c12a1e55f0e4ceb28d44a4b5835b85f7f275fa573a9d29b0403 files/digest-dovecot-1.0_rc27 506
+MD5 2570a6f0e68bce05f69c3e0b03df3f88 files/digest-dovecot-1.0_rc28 506
+RMD160 07da79174e587f27f03837aa7854f659f5e92741 files/digest-dovecot-1.0_rc28 506
+SHA256 061f6721564347193859ee1aa0a4eb4a0cfc463edc7d739bc1a264f730f08486 files/digest-dovecot-1.0_rc28 506
diff --git a/net-mail/dovecot/dovecot-1.0_rc28.ebuild b/net-mail/dovecot/dovecot-1.0_rc28.ebuild
new file mode 100644
index 000000000000..56f399f122e9
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_rc28.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-1.0_rc28.ebuild,v 1.1 2007/03/28 20:33:07 uberlord Exp $
+
+inherit autotools eutils ssl-cert
+
+MY_P="${P/_/.}"
+S="${WORKDIR}/${MY_P}"
+SIEVE="dovecot-sieve-1.0"
+SIEVE_S="${WORKDIR}/${SIEVE}"
+
+SRC_URI="http://dovecot.org/releases/${MY_P}.tar.gz
+sieve? ( http://dovecot.org/releases/sieve/${SIEVE}.tar.gz )"
+
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres sieve ssl suid vpopmail"
+
+# Developer documentation, controlled by the doc USE flag
+DEVDOCS="auth-protocol index multiaccess securecoding"
+
+DEPEND=">=sys-apps/sed-4
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql )
+	mysql? ( virtual/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"
+
+		econf --localstatedir=/var --sysconfdir=/etc/dovecot \
+		--enable-header-install \
+		--with-ioloop=best --with-poll=best \
+		$(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"
+
+	if use sieve ; then
+		einfo "Building sieve"
+		cd "${SIEVE_S}"
+		econf --with-dovecot="${S}" || die "configure failed"
+		emake || die "make failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	use suid && fperms +s /usr/libexec/dovecot/deliver
+
+	rm -f "${D}"/etc/dovecot/dovecot-{ldap,sql}-example.conf
+
+	newinitd "${FILESDIR}"/dovecot.init dovecot
+
+	# Documentation
+	rm -rf "${D}"/usr/share/doc/dovecot
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf
+	if use doc ; then
+		dodoc doc/*.txt
+	else
+		local x= n=
+		for x in doc/*.txt ; do
+			n=$(basename "${x}" .txt)
+			[[ " ${DEVDOCS} " != *" ${n} "* ]] && dodoc "${x}"
+		done
+	fi
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${D}/etc/dovecot/dovecot.conf"
+	mv "${D}"/etc/dovecot/dovecot-example.conf "${D}"/etc/dovecot/dovecot.conf
+
+	# .maildir is the Gentoo default, but we need to support mbox to
+	local mail_location="maildir:~/.maildir"
+	if use mbox ; then
+		mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+		keepdir /var/dovecot
+		sed -i -e 's|#mail_extra_groups =|mail_extra_groups = mail|' "${conf}"
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" "${conf}" || die
+
+	# 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 = "\*"|' \
+			"${conf}" || die
+	fi
+
+	# Listen on ipv6 and ipv4
+	if use ipv6 ; then
+		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" || die
+	fi
+
+	# Update ssl cert locations
+	if use ssl ; then
+		sed -i -e 's,^#ssl_cert_file =.*,ssl_cert_file = /etc/ssl/dovecot/server.pem,' \
+			-e 's,^#ssl_key_file =.*,ssl_key_file = /etc/ssl/dovecot/server.key,' \
+			"${conf}" || die
+
+		# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+			-e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			insinto "${ROOT}"/etc/ssl/dovecot
+			docert server
+			fowners dovecot:mail /etc/ssl/dovecot/server.{key,pem}
+		fi
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres ; then
+		cp doc/dovecot-sql-example.conf "${D}"/etc/dovecot/dovecot-sql.conf
+		fperms 600 /etc/dovecot/dovecot-sql.conf
+		sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
+		dodoc doc/dovecot-sql-example.conf
+	fi
+
+	# Install LDAP configuration
+	if use ldap ; then
+		cp doc/dovecot-ldap-example.conf "${D}"/etc/dovecot/dovecot-ldap.conf
+		fperms 600 /etc/dovecot/dovecot-ldap.conf
+		sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
+		dodoc doc/dovecot-ldap-example.conf
+	fi
+
+	# Install sieve plugin
+	if use sieve ; then
+		make -C "${SIEVE_S}" DESTDIR="${D}" install || die "make install failed"
+	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/dovecot.conf
+}
+
+pkg_postinst() {
+	# Touch ssl certs so that they are modified outisde of src_install
+	# We do this so portage does't unmerge them - silly portage
+	if use ssl ; then
+		touch "${ROOT}"/etc/ssl/dovecot/server.{key,pem}
+	fi
+
+	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."
+
+	if [[ -e ${ROOT}etc/dovecot.conf ]] ; then
+		ewarn
+		ewarn "dovecot configuration is now in ${ROOT}etc/dovecot"
+	fi
+
+	local base_dir="$(get_config_var base_dir)"
+	base_dir="${basedir:-/var/run/dovecot}"
+	if use ssl \
+		&& [[ ! -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_rc28 b/net-mail/dovecot/files/digest-dovecot-1.0_rc28
new file mode 100644
index 000000000000..8914884603c4
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc28
@@ -0,0 +1,6 @@
+MD5 e6fd617f3210f914815186c176796881 dovecot-1.0.rc28.tar.gz 1534090
+RMD160 7ea445c844d382115eb4fad651ff00d51dc58e9e dovecot-1.0.rc28.tar.gz 1534090
+SHA256 56dd5221812d66a2fa90437ff3cc50a03236d94f9309cffb5ce48448bd64c2a3 dovecot-1.0.rc28.tar.gz 1534090
+MD5 dabe564d2ef262a008622737ad84579f dovecot-sieve-1.0.tar.gz 442943
+RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 dovecot-sieve-1.0.tar.gz 442943
+SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a dovecot-sieve-1.0.tar.gz 442943