Version bump, bug 342151 by Eray Aslan

Package-Manager: portage-2.1.9.12/cvs/Linux x86_64

3 files changed, 288 insertions, 2 deletions

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 191a23094d3b..e47ffb9b9191 100644
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.271 2010/10/15 14:51:09 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.272 2010/10/27 03:31:33 darkside Exp $
+
+*dovecot-2.0.6 (27 Oct 2010)
+
+  27 Oct 2010; Jeremy Olexa <darkside@gentoo.org> +dovecot-2.0.6.ebuild:
+  Version bump, bug 342151 by Eray Aslan
 
   15 Oct 2010; Markus Meier <maekke@gentoo.org> dovecot-1.2.15.ebuild:
   arm stable, bug #339776
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 82054da99fd3..9182f5cd9a55 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -11,9 +11,11 @@ DIST dovecot-1.2.15-managesieve-0.11.12.diff.gz 6469 RMD160 82e7ce791d232f0312db
 DIST dovecot-1.2.15.tar.gz 2948856 RMD160 4b4def7a959729b9e01184565db90f0a7ee41f9e SHA1 828a4bd8822c2d1c53ee56247201b96b827b04ee SHA256 927845ba0a3de1da2d0ecefc27e835dd23a413cdf05fd044442bffb5e901442f
 DIST dovecot-2.0-pigeonhole-0.2.1.tar.gz 1195090 RMD160 a3cd58c13c3de33e6941c94633c580af4406ad85 SHA1 ef06d157302576a9276c8f1181a3c5de018e2f36 SHA256 8249421cb69ca299e2830da8b635ca0a5ab692ab29456c188ba8078d7672ccda
 DIST dovecot-2.0.5.tar.gz 3109651 RMD160 f282fc026e9c709fe52ac661bf5eb9a89aed1014 SHA1 ff5d1c29887e390bc3345fa3fcfd4787fd6cc25c SHA256 974c269a53cba72dfcddad286767d446d903b2a94d48b598a41836e40a3d71fb
+DIST dovecot-2.0.6.tar.gz 3155389 RMD160 a41f0b774f3f11a28587f6f9e6a134cc4dd958a6 SHA1 70b4f58d00f6c5e6e0a129544119c88c13db62d5 SHA256 a1fe5ebc2926538f3c9b1b6e289739f83980bdb5a921157d713457e35a467753
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.19.ebuild 8556 RMD160 31b66b06d538fb7a6719daeb19639633e1d7b5cb SHA1 524599a50ce525bc5deff63b24bb17b1446d06c5 SHA256 45610fede6f0f6d9b07ba2d3b38f8cb0e6f5292f3c4705c3b55327bb61307e8e
 EBUILD dovecot-1.2.15.ebuild 8826 RMD160 015d945f24dcd9fb73b6635ee624be0056893502 SHA1 7d3323f4eb086b1f3b9ddaaa8c8a911a77323751 SHA256 7e830fa0dcd0fcb91abb6dc66af1b7bff14dc17782fa9d9cc2dca20aa4bb06ff
 EBUILD dovecot-2.0.5.ebuild 8943 RMD160 e0eda8790dc479a522e0107d6e8d1d8e1e8bf426 SHA1 22faa963345df58da56d11e40c7dd6d2e8236009 SHA256 b36ce191da33ea68f0e88fe2c38d7e234f207b88524ababf61904cdb36286383
-MISC ChangeLog 43829 RMD160 d3008e73a30b195c4a528b5ce9a2fb41e5968207 SHA1 a3b8717ebcc6033787438d9a28e5cf8d44bcc346 SHA256 beba78591b6a7b0d5773f583a8cccc703cb36370a6fc93d71d37f135db4b2d79
+EBUILD dovecot-2.0.6.ebuild 8943 RMD160 aa6aa35148a3f97a0989d1374965c80e32defbac SHA1 62c48161d513b040f2c289074eabed99c18ff7ee SHA256 e0f24e0780e4a7a1e0caae7c95ba99f6530644b8cd5f1613b160b1b7d6715509
+MISC ChangeLog 43974 RMD160 b7ce17302150ed997f14298b8ce5951c0d2b31ea SHA1 70fa5a823e427ec9da6b006fd93332ad84d693d2 SHA256 c165cb0dd8c366f9db43cc249c3b783a1748d725bf1d0f30308bd7eeffe966e2
 MISC metadata.xml 919 RMD160 1e3a625fb64bee092b52fe671c7b51cbbc0cea80 SHA1 d4c9aa0299f149d3d552a10971d3efcc84809a1d SHA256 872564b7c2a02f4c2e042ea7b64e5ef14b0e1b63ddf8f04af36db9aa0efab372
diff --git a/net-mail/dovecot/dovecot-2.0.6.ebuild b/net-mail/dovecot/dovecot-2.0.6.ebuild
new file mode 100644
index 000000000000..53c75e124bb9
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0.6.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.6.ebuild,v 1.1 2010/10/27 03:31:33 darkside Exp $
+
+EAPI="3"
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.2.1"
+SRC_URI="http://dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
+	sieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="berkdb bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox mdbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
+
+DEPEND="berkdb? ( sys-libs/db )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite )
+	ssl? ( dev-libs/openssl )
+	vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00-r8"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+
+	# Add user and group for login process (same as for fedora/redhat)
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	local storages=""
+	for storage in cydir sdbox mdbox maildir mbox; do
+		use ${storage} && storages="${storage} ${storages}"
+	done
+	[ "${storages}" ] || storages="maildir"
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with ssl ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		--with-storages="${storages}" \
+		--disable-rpath \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config || die "emake dovecot-config failed"
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="../${MY_P}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
+	fi
+}
+
+src_test() {
+	default_src_test
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default_src_test
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${ED}" install || die "make install failed"
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${ED}"/usr/libexec/dovecot/deliver
+		fperms 4750 "${ED}"/usr/libexec/dovecot/deliver
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+	rm -rf "${ED}"/usr/share/aclocal
+
+	dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
+	dodoc doc/*.{txt,cnf,xml,sh} || die "dodoc doc failed"
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext} || die "dodoc example failed"
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext} || die "dodoc conf.d failed"
+	docinto wiki
+	dodoc doc/wiki/* || die "dodoc wiki failed"
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
+	"${confd}/../README" || die "sed failed"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	if ! use maildir; then
+		if use mbox; then
+			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+			keepdir /var/dovecot
+			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+			"${confd}/10-mail.conf" || die "sed failed"
+		elif use sdbox ; then
+			mail_location="sdbox:~/.sdbox"
+		elif use mdbox ; then
+			mail_location="mdbox:~/.mdbox"
+		fi
+	fi
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	if use ssl; then
+		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+	fi
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install || die "make install failed (sieve)"
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		dodoc doc/*.txt
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		doman doc/man/*.{1,7}
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-2" ; then
+		elog "There are a lot of changes in configuration files in dovecot-2.0."
+		elog "Please read http://wiki.dovecot.org/Upgrading and"
+		elog "check the conf files in ${ROOT}etc/dovecot."
+		elog "You can also run doveconf -n before running etc-update or"
+		elog "dispatch-conf to get an idea about what needs to be changed."
+		ewarn ""
+		ewarn "Do NOT {re}start dovecot without checking your conf files"
+		ewarn "and making the necessary changes."
+		ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# 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
+			einfo "Creating SSL	certificate"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+			install_cert /etc/ssl/dovecot/server
+		fi
+	fi
+}