Add sieve support, #141743. Thanks to Brian G. Peterson and the others on the

bug.
Package-Manager: portage-2.1.2_rc2-r5

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index de9a39dc03e869fd26bb7cdb966a315e85d339f7..fb2e3bbd3fbc70de8b787c32bca6076dd1823888 100644 (file)
--- 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.80 2006/12/05 10:59:12 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.81 2006/12/05 15:05:51 uberlord Exp $
+
+*dovecot-1.0_rc15-r1 (05 Dec 2006)
+
+  05 Dec 2006; Roy Marples <uberlord@gentoo.org>
+  +dovecot-1.0_rc15-r1.ebuild:
+  Add sieve support, #141743. Thanks to Brian G. Peterson and the others on the
+  bug.
 
   05 Dec 2006; Roy Marples <uberlord@gentoo.org> files/dovecot.init:
   Add a reload function to the init script, #157139 thanks to Marshal Newrock.

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index bf28c3fe3d1cbecd40795fe11442f9fdfb0fc6a4..568c6995a8254fd96cc9724afc7c7389102eb5bd 100644 (file)
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -4,18 +4,23 @@ RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878
 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 files/dovecot.init 878
 DIST dovecot-1.0.beta8.tar.gz 1392106 RMD160 101a7011467691ba5f4a6f48e21d6d1dc5626c16 SHA1 fedd38c29a2bc396df386636ed5d8b65ecab0ff6 SHA256 b43bb6ea5426b0d78ae260b53be035d1b5371b76a342870b2d56a6aba1ad82d2
 DIST dovecot-1.0.rc15.tar.gz 1463069 RMD160 904ef7d1f0fbfe8055f13d9036f7107f498b522e SHA1 9b618d0c1562aa64bd1e055ffa9fe5f2412514af SHA256 e1e42e5c808301c5a709d54c5949cd8c1d3c43861e4e918548ded5841865487f
+DIST dovecot-sieve-1.0.tar.gz 442943 RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 SHA1 6d151c4140e0cf89e3d771fb32b5da065dbbed24 SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a
 EBUILD dovecot-1.0_beta8.ebuild 4639 RMD160 3e1f5b8b75852f638cbc42e20b2ff0026863d2bd SHA1 56114bbef706eaa2fd0c963fb1243b8e4ef23e1d SHA256 4e5e3c289bae8a357a7e4a3d28e66366fd826930c267fa0886e55349c92d5ca5
 MD5 1b880922f7ce43f9760259d90da652df dovecot-1.0_beta8.ebuild 4639
 RMD160 3e1f5b8b75852f638cbc42e20b2ff0026863d2bd dovecot-1.0_beta8.ebuild 4639
 SHA256 4e5e3c289bae8a357a7e4a3d28e66366fd826930c267fa0886e55349c92d5ca5 dovecot-1.0_beta8.ebuild 4639
+EBUILD dovecot-1.0_rc15-r1.ebuild 5692 RMD160 58a16487eb02506709b1866c6d11f99bccce070d SHA1 b19324b96d1fa18d4d5af7dbb307e6af076f547a SHA256 611435d26dfd5f7ae66d2c2cc6d95a2ddd85ae72bdf734bfa1213297b0a7a43b
+MD5 233824764e858435ddaa2806f4dbcd7a dovecot-1.0_rc15-r1.ebuild 5692
+RMD160 58a16487eb02506709b1866c6d11f99bccce070d dovecot-1.0_rc15-r1.ebuild 5692
+SHA256 611435d26dfd5f7ae66d2c2cc6d95a2ddd85ae72bdf734bfa1213297b0a7a43b dovecot-1.0_rc15-r1.ebuild 5692
 EBUILD dovecot-1.0_rc15.ebuild 5318 RMD160 78a83e7c4b0016c07df28daedfd5beb0f588df85 SHA1 5cb08423188982d0befab9017e1004f7929cfc8d SHA256 347aacb737d18250e7a209678a94055d0b01c290cd778ad9607559b975665ab2
 MD5 61d0c3649db044745ecb0036357d9ee9 dovecot-1.0_rc15.ebuild 5318
 RMD160 78a83e7c4b0016c07df28daedfd5beb0f588df85 dovecot-1.0_rc15.ebuild 5318
 SHA256 347aacb737d18250e7a209678a94055d0b01c290cd778ad9607559b975665ab2 dovecot-1.0_rc15.ebuild 5318
-MISC ChangeLog 13822 RMD160 47d1c1960db1f901057f1a68581ffc02a206446c SHA1 b3fce99a3e91442352d41560cbbfbd27cacdb240 SHA256 40483f13caf0356aac7558595ff4b960e857cfe4d3584bb5ab5d514a3b5dd3ce
-MD5 2962f2c2573ce82a5cb1f56d46f5d625 ChangeLog 13822
-RMD160 47d1c1960db1f901057f1a68581ffc02a206446c ChangeLog 13822
-SHA256 40483f13caf0356aac7558595ff4b960e857cfe4d3584bb5ab5d514a3b5dd3ce ChangeLog 13822
+MISC ChangeLog 14026 RMD160 9db681a76b8ec0c1b60cc1cd0d0669ec4cabddce SHA1 20c413c7ef7a091159f0abfe9baf22eca802f732 SHA256 9b92572fc580b4e3141b31bdeb95b514a85077542036e037f84edcc1f1117587
+MD5 4730344a310d27c571851fa06199ab53 ChangeLog 14026
+RMD160 9db681a76b8ec0c1b60cc1cd0d0669ec4cabddce ChangeLog 14026
+SHA256 9b92572fc580b4e3141b31bdeb95b514a85077542036e037f84edcc1f1117587 ChangeLog 14026
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -26,3 +31,6 @@ SHA256 bdeba92a3fd4e386e383101a09a3b9ce315a5dd235e5b8008e10c2f54b74dc3d files/di
 MD5 2c27eb8bc7a2d4ac15db038e2c32f3dd files/digest-dovecot-1.0_rc15 253
 RMD160 0c75375b63a906552c7c31aabe46cf07c93492f0 files/digest-dovecot-1.0_rc15 253
 SHA256 0c0d306c2bac1ed1f287123160612db5f9c959afa54dac80c9db3794a258c197 files/digest-dovecot-1.0_rc15 253
+MD5 dfd530d267f0d2c0549038677ae6e206 files/digest-dovecot-1.0_rc15-r1 506
+RMD160 752dfdf30b526838d25c0984ba31e7db0ee78571 files/digest-dovecot-1.0_rc15-r1 506
+SHA256 2c37e8ac92eef87c3566ef0edb1fd771f8eeba68397b80e2833982c887344f61 files/digest-dovecot-1.0_rc15-r1 506

diff --git a/net-mail/dovecot/dovecot-1.0_rc15-r1.ebuild b/net-mail/dovecot/dovecot-1.0_rc15-r1.ebuild
new file mode 100644 (file)
index 0000000..a1fe433
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_rc15-r1.ebuild
@@ -0,0 +1,194 @@
+# 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_rc15-r1.ebuild,v 1.1 2006/12/05 15:05:51 uberlord Exp $
+
+inherit autotools eutils
+
+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"
+
+IUSE="debug doc ipv6 kerberos ldap mbox mysql pop3d pam postgres sieve ssl 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 \
+               --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"
+
+       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
+
+       # Install SQL configuration
+       if use mysql || use postgres ; then
+               cp doc/dovecot-sql.conf "${D}"/etc/dovecot
+               fperms 600 /etc/dovecot/dovecot-sql.conf
+               sed -i -e '/db sql/,/args/ s|=|= /etc/dovecot-sql.conf|' "${conf}"
+               dodoc doc/dovecot-sql.conf
+       fi
+
+       # Install LDAP configuration
+       if use ldap ; then
+               cp doc/dovecot-ldap.conf "${D}"/etc/dovecot
+               fperms 600 /etc/dovecot/dovecot-ldap.conf
+               sed -i -e '/db ldap/,/args/ s|=|= /etc/dovecot-ldap.conf|' "${conf}"
+               dodoc doc/dovecot-ldap.conf
+       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
+               dodoc doc/*.cnf doc/mkcert.sh
+       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() {
+       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_rc15-r1 b/net-mail/dovecot/files/digest-dovecot-1.0_rc15-r1
new file mode 100644 (file)
index 0000000..bb95af3
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc15-r1
@@ -0,0 +1,6 @@
+MD5 26f3d2b075856b1b1d180146363819e6 dovecot-1.0.rc15.tar.gz 1463069
+RMD160 904ef7d1f0fbfe8055f13d9036f7107f498b522e dovecot-1.0.rc15.tar.gz 1463069
+SHA256 e1e42e5c808301c5a709d54c5949cd8c1d3c43861e4e918548ded5841865487f dovecot-1.0.rc15.tar.gz 1463069
+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