sieve version bump

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

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 35bca75e06638bc2b42b07b207f3a2e323500f2f..db0b175f7dd020d5b5ddcbfb3c20fd4745bcce3e 100644 (file)
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.322 2011/11/18 05:23:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.323 2011/11/20 10:27:35 eras Exp $
+
+*dovecot-2.0.16-r1 (20 Nov 2011)
+
+  20 Nov 2011; Eray Aslan <eras@gentoo.org> +dovecot-2.0.16-r1.ebuild:
+  sieve version bump
 
   18 Nov 2011; Jeroen Roovers <jer@gentoo.org> dovecot-2.0.16.ebuild:
   Stable for HPPA (bug #390887).

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index e58f4e8ba3827273750967d0bee14ecfd20a15bc..7fad53dee8677513a383627e501fbf6ea193b614 100644 (file)
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dovecot-1.2.init 1701 RMD160 89cdc58d6ad9ac41f8946fabf3c80e0b9f4b61ea SHA1 9cbf10e9d1997ad3703ee1ae37edbcfad6f16b79 SHA256 44b308537454362b00f8ab87257c4a0d8eb5a183452ca2e3487f74b642fac8e0
 AUX dovecot-2.0.12-sdbox.patch 545 RMD160 92b9d80e3cd1c2f915d4c4fcc751a8267c9cf619 SHA1 6046b2a8076b478deab2003142b31020f875fb5e SHA256 f4f70d4ff9453e5ec3246b3bef27adf101de84ce2d1dcff50577ff79b22d9441
@@ -11,6 +11,7 @@ DIST dovecot-1.2.17-managesieve-0.11.13.diff.gz 6461 RMD160 f03842bc846395b55d99
 DIST dovecot-1.2.17.tar.gz 2983431 RMD160 59f619dba2aadef3cccd6ceb045a2e75a11700a2 SHA1 457b16791a15e739c6bc8b02bc9c78f9ad794e39 SHA256 6f39f86a06ddbaa8e264d03046c2fc8870f97ea27c1e52eb5bc96c3b754f0bed
 DIST dovecot-2.0-pigeonhole-0.2.3.tar.gz 1213027 RMD160 63898d5b71aee933399e9e76b6a1784b3b31197e SHA1 c8f67304028e21f8ff33163427fd4f47fa738d9d SHA256 5f6f95f8e504e19c574d9d65fce382a2b3f8709ccf2d86beb709b09bf337b113
 DIST dovecot-2.0-pigeonhole-0.2.4.tar.gz 1230408 RMD160 61cf4209210f56d033586d779eca31f7433dbf62 SHA1 43e1ab3f4435765c6ecf14594c8fa41a3a046bb2 SHA256 9a19dc50bb006de6ee0aec9d3c46e6ee5bc904ca823e6dd9636a2eec5378980e
+DIST dovecot-2.0-pigeonhole-0.2.5.tar.gz 1232117 RMD160 6d8e98fccfa7c6c0eca66fd3b7c70854f9fd2950 SHA1 a67388b739172134ae0d5f43cf45b773da1eff37 SHA256 2793eec5384b9136774e1b3929864aa15edc5f057b97cfbee809ec0dfc292b9c
 DIST dovecot-2.0.13.tar.gz 3272542 RMD160 2c0edd03aba7935e6db18af1384a26bf0b5b432e SHA1 31d556bd1659fb10e5edb45bab8951911151bbfb SHA256 2b512263ec05bbd74cde5c697ad12250d9268eba1c8ce4a8144adea69308675d
 DIST dovecot-2.0.14.tar.gz 3300530 RMD160 f138eb0a290089a308aed8aa40f1a69a64f87926 SHA1 47b4010b277f39cfc9afddf8c0a30e40a17da088 SHA256 42eec803c84bc21a7658a0637428ef6d2f4e2ea8e8cce1177783cc4812c3c7fc
 DIST dovecot-2.0.15.tar.gz 3303717 RMD160 2c315bbce2d7173b1e62c96d3a4bda0910a59d0d SHA1 b90f5c1610d8866413fc39cede218534ad6490e8 SHA256 63640303b5deb299a605a94ffd706cac6866d934175b291d2e66f64e95b97e0d
@@ -20,13 +21,24 @@ EBUILD dovecot-2.0.13.ebuild 8928 RMD160 4519a9482f527025f0608c196f4459ce39b5fa2
 EBUILD dovecot-2.0.14-r1.ebuild 8857 RMD160 cd4ac752464f887f6a67d8f200a52ee77cd50710 SHA1 fad9c74dc2bb48f34514c34ddc4543429dea71b1 SHA256 850b199377ca85f4e32cac0dbb6e6502fb6ad689509baa2ca72539dbb8047038
 EBUILD dovecot-2.0.14.ebuild 8854 RMD160 926c22e953d956dc3983fbbb8d7eef43e9700d14 SHA1 184e37be42cdea625a5ccb57be96795ffb3a9281 SHA256 86820859336b7d38e88fea978ba892dc2a57990cb40c10016519e65bada0ccd3
 EBUILD dovecot-2.0.15.ebuild 8852 RMD160 d22cf98e15958acb6d414b6a6a56268e9f36f050 SHA1 ca3e304979825f8da066ffdf97d39e9a0be87d9f SHA256 5451118790e070c118639421aa834d8829e554578af514f1c1eb08a4395e6158
+EBUILD dovecot-2.0.16-r1.ebuild 8768 RMD160 cb6e0ad11a4bfb67967da9c5087a4c3ba6769589 SHA1 28225c5c875424364b5278b2a7f0646f93517777 SHA256 2fdf7edfc2e302e726615c5dc628209741120be7d41a39ef35f67ee38a13d889
 EBUILD dovecot-2.0.16.ebuild 8763 RMD160 3eda5452989a8ef96d1517ad7735fa3d76e75b0f SHA1 fcb6e1b5bccd6d97091052cbbb77a835d4af90d6 SHA256 bc7b697afc22f23eff68efb406a64ed8988386e47e2afa7d85cc98296ff9e5fb
-MISC ChangeLog 50359 RMD160 d894acff7c8b2c8dfc9bf094cb399c6359b83e91 SHA1 3b65f88be8419464eea8ee4259e78cdc2d0e4585 SHA256 ace4fc0f0bb846ec47f1a1f89c35ea5e86832f3ae31a9138128f19995fd79179
+MISC ChangeLog 50487 RMD160 c1dddd0ca4214b01b70a1e70d9a1d12f30e89a81 SHA1 198d42483db05070a435d96970a77d3084b46c6f SHA256 95a76cae361a408332b39cec78aab99c15077a95f2ba41f46c6634a82110e17e
 MISC metadata.xml 703 RMD160 a7a55f21501b09979922b24a931fbf7a5bbf86b1 SHA1 b4c9f2cd2a2fae951e319960ce3aba33d56301cf SHA256 3a897cb8fc88c875563623d2757f7b0ebd08743ba4d4fcbdfe37072d99694c58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7F68kACgkQVWmRsqeSphMeuQCfVox45pXwQicMjL014ADSQtk6
-qksAmwbaEQoKgbksiRtelzs7Z3Za6fyA
-=uaKX
+iQIcBAEBCAAGBQJOyNYnAAoJEHfx8XVYajsfwnoQAKlW4AkXAmXqqSSJhp3bDEPP
+O6ne19OdvhGvHURYTBIk7yS30udxMF3ePy93SjYdb/HePEBu5srzvWSaDQlRQJKs
+3AVoYxwEDOIat7uWA59nCS6yMsiR7PzYCw/V+6UuaLdk6jcBhOuFw1YyOn+fNZBS
+bL38grD5hXK8SJ14Dnr/uATDhpnwXLaN9ytpRh9BKHCvzafnwm0i3gm2Yy/INnPL
+h6veOz7VN/To/xLxvUvyl3JqL9766SO6Y58ToaeIvzYnhCgHFaRC4ey5H1Ywzxfp
+AtzCa896b9MkhJ/XDr3UGuZqluQICrNI5UB1/0JI/6BsZYJkXg8UXkx1YSEIbUDv
+m4/lHmU0OCdMZ70JY8PHy4J6CASzajMkEWef1gO9PdKGcnZ3HVvFoR81q735QyD5
+8thSMYleirQPfYRcDrjsdFHPz2ZB7eltcmUs88PuhJ+OMEtuJS+yHzmdpKSgvjCj
+P5I9j9I/3Cyad+Oqqid6PEVmeTDeQj4f9QgxfsmHqkRJCVkinoboeqLbzYQD6DNk
+6tyV+5MW7aWktVXHNjfBUnjYdxEIeFPg2cWyblfvi5h9CHNIay2XIwIWtuiqDXSH
+AP0CdbD/Qmv3dLjIFpKHKAgETasx3OUQfvbzztefkoCTKCJSB6uriNcjDUHQTX7K
+vR1zev8vRJHSVjXRBjIK
+=vjyP
 -----END PGP SIGNATURE-----

diff --git a/net-mail/dovecot/dovecot-2.0.16-r1.ebuild b/net-mail/dovecot/dovecot-2.0.16-r1.ebuild
new file mode 100644 (file)
index 0000000..814d31b
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0.16-r1.ebuild
@@ -0,0 +1,281 @@
+# 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.16-r1.ebuild,v 1.1 2011/11/20 10:27:35 eras Exp $
+
+EAPI=4
+
+inherit eutils versionator ssl-cert autotools-utils
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_version="0.2.5"
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox
+mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
+
+DEPEND="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_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 ) \
+               $( use_enable static-libs static ) \
+               --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 \
+                       $( use_enable static-libs static ) \
+                       --localstatedir="${EPREFIX}/var" \
+                       --enable-shared \
+                       --with-dovecot="../${MY_P}" \
+                       $( use_with managesieve )
+       fi
+}
+
+src_compile() {
+       emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+
+       if use sieve || use managesieve ; then
+               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+       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
+
+       # 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 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+               fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+       fi
+
+       newinitd "${FILESDIR}"/dovecot.init-r3 dovecot
+
+       rm -rf "${ED}"/usr/share/doc/dovecot
+
+       dodoc AUTHORS NEWS README TODO
+       dodoc doc/*.{txt,cnf,xml,sh}
+       docinto example-config
+       dodoc doc/example-config/*.{conf,ext}
+       docinto example-config/conf.d
+       dodoc doc/example-config/conf.d/*.{conf,ext}
+       docinto wiki
+       dodoc doc/wiki/*
+       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
+       rm -f "${confd}/../README"
+
+       # .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
+               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
+
+       use static-libs || remove_libtool_files
+}
+
+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
+}