diff options
author | Eray Aslan <eras@gentoo.org> | 2011-04-30 20:48:43 +0000 |
---|---|---|
committer | Eray Aslan <eras@gentoo.org> | 2011-04-30 20:48:43 +0000 |
commit | fe1ac9fa56337cc2d110bb8cd8cc49c7fc961302 (patch) | |
tree | 59deccb64efb9d390d502af77e16825e62dbde9a /net-mail | |
parent | Version bump (diff) | |
download | gentoo-2-fe1ac9fa56337cc2d110bb8cd8cc49c7fc961302.tar.gz gentoo-2-fe1ac9fa56337cc2d110bb8cd8cc49c7fc961302.tar.bz2 gentoo-2-fe1ac9fa56337cc2d110bb8cd8cc49c7fc961302.zip |
Backport sdbox patch - bug #365445. Thanks to Kerin Millar.
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/dovecot/ChangeLog | 8 | ||||
-rw-r--r-- | net-mail/dovecot/dovecot-2.0.12-r2.ebuild | 282 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-2.0.12-sdbox.patch | 17 |
3 files changed, 306 insertions, 1 deletions
diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog index 82a6daeca445..30f2d40c7ff2 100644 --- a/net-mail/dovecot/ChangeLog +++ b/net-mail/dovecot/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/dovecot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.293 2011/04/15 21:52:46 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.294 2011/04/30 20:48:43 eras Exp $ + +*dovecot-2.0.12-r2 (30 Apr 2011) + + 30 Apr 2011; Eray Aslan <eras@gentoo.org> +dovecot-2.0.12-r2.ebuild, + +files/dovecot-2.0.12-sdbox.patch: + Backport sdbox patch - bug #365445. Thanks to Kerin Millar. *dovecot-2.0.12-r1 (15 Apr 2011) diff --git a/net-mail/dovecot/dovecot-2.0.12-r2.ebuild b/net-mail/dovecot/dovecot-2.0.12-r2.ebuild new file mode 100644 index 000000000000..d251fe104187 --- /dev/null +++ b/net-mail/dovecot/dovecot-2.0.12-r2.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.12-r2.ebuild,v 1.1 2011/04/30 20:48:43 eras Exp $ + +EAPI="3" + +inherit eutils versionator ssl-cert + +MY_P="${P/_/.}" +major_minor="$( get_version_component_range 1-2 )" +sieve_version="0.2.3" +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 ~x86-fbsd" + +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 ) + virtual/libiconv" + +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_prepare() { + epatch "${FILESDIR}/${P}-sdbox.patch" +} + +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 \ + --without-systemdsystemunitdir \ + ${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 + + 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 "\nDo NOT {re}start dovecot without checking your conf files" + ewarn "and making the necessary changes.\n" + 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 +} diff --git a/net-mail/dovecot/files/dovecot-2.0.12-sdbox.patch b/net-mail/dovecot/files/dovecot-2.0.12-sdbox.patch new file mode 100644 index 000000000000..ad16cf3496b8 --- /dev/null +++ b/net-mail/dovecot/files/dovecot-2.0.12-sdbox.patch @@ -0,0 +1,17 @@ + +diff -r d4945c93c33b -r 663528c5c799 src/lib-storage/index/dbox-single/sdbox-storage.c +--- a/src/lib-storage/index/dbox-single/sdbox-storage.c Tue Apr 12 18:38:50 2011 +0300 ++++ b/src/lib-storage/index/dbox-single/sdbox-storage.c Sat Apr 30 15:55:08 2011 +0300 +@@ -118,6 +118,8 @@ + mail_index_update_header_ext(trans, mbox->hdr_ext_id, 0, + &new_hdr, sizeof(new_hdr)); + } ++ memcpy(mbox->mailbox_guid, new_hdr.mailbox_guid, ++ sizeof(mbox->mailbox_guid)); + } + + static int sdbox_mailbox_create_indexes(struct mailbox *box, + + + + |