Another day, another dovecot.

Package-Manager: portage-2.1.2.3

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 0b6a7208cbb4609ae15af97ed6ef0ede31fbc1bf..d47bb9b744690ce5e0d1378f2586aab28bb567f4 100644 (file)
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2007/04/12 15:24:31 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.105 2007/04/12 18:00:08 uberlord Exp $
+
+*dovecot-1.0_rc32 (12 Apr 2007)
+
+  12 Apr 2007; Roy Marples <uberlord@gentoo.org> +dovecot-1.0_rc32.ebuild:
+  Another day, another dovecot.
 
 *dovecot-1.0_rc31-r1 (12 Apr 2007)
 

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8c2525ab7d1370dc06ec2b0bd14935189e2fa044..22ecaba1ca4150f5fac5f1f6fc9bdc0b03e3dd46 100644 (file)
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,6 +8,7 @@ RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878
 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 files/dovecot.init 878
 DIST dovecot-1.0.rc29.tar.gz 1670673 RMD160 b09da68a67e951bf019ab077bf17ebbfd7e729a2 SHA1 f090f6ceb22849da4fc255d21e99d303f537c237 SHA256 6b8431e8276c07e235d30c195946e9b09d1f3e12f28aea6f755b6d4c72008dd9
 DIST dovecot-1.0.rc31.tar.gz 1672213 RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d SHA1 cb753f8f2a8557f7481303e1428110004b36f525 SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a
+DIST dovecot-1.0.rc32.tar.gz 1672650 RMD160 0d2acfcf5f33633d182f0a2e2c81b88321de980b SHA1 a8779ef4e98d3799ccab3890448a46b216abe638 SHA256 c7ce6b71892dad8d86c723c854397bb3ed623f04fb2766484648acff7f7ff973
 DIST dovecot-sieve-1.0.tar.gz 442943 RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 SHA1 6d151c4140e0cf89e3d771fb32b5da065dbbed24 SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a
 EBUILD dovecot-1.0_rc29.ebuild 6267 RMD160 1821ef4d73b282a563cdbfa563e4cf140ecdf805 SHA1 8723e796e2287f77cf1cf5f91eb24881c7d9b47f SHA256 1b60cf0e67ba000112b3387368e705f7d6900506ab61a22845abd6931c21c8bf
 MD5 7a4be3f5b04a1abab9f3e65ba036d343 dovecot-1.0_rc29.ebuild 6267
@@ -21,10 +22,14 @@ EBUILD dovecot-1.0_rc31.ebuild 6276 RMD160 518fd345deb4294e9507a24d2c5cfb725b326
 MD5 963ccbe48b87a0f60392a1bb13cd55ec dovecot-1.0_rc31.ebuild 6276
 RMD160 518fd345deb4294e9507a24d2c5cfb725b3267f5 dovecot-1.0_rc31.ebuild 6276
 SHA256 83dc31aa2f89a089fd9e21b4455c058cd651f58ff22baf146b3517a9cedc5c4b dovecot-1.0_rc31.ebuild 6276
-MISC ChangeLog 17234 RMD160 ee04e70b5faab60ceffdf729f642e1da66bc2c0b SHA1 02f37c26a9e8f42a3852b5e8c05d1ef9081da022 SHA256 e30ba9f5528051e102a42aba0c2d484766550a22219e876a58032b8d646ed20f
-MD5 220325a383602adc51233c6e3a664929 ChangeLog 17234
-RMD160 ee04e70b5faab60ceffdf729f642e1da66bc2c0b ChangeLog 17234
-SHA256 e30ba9f5528051e102a42aba0c2d484766550a22219e876a58032b8d646ed20f ChangeLog 17234
+EBUILD dovecot-1.0_rc32.ebuild 6276 RMD160 7218c8afa36adb5cf02c70a67a6954fc496fc306 SHA1 42d0d02c9e89785b05eea008ed9756385b3a25a1 SHA256 6cd821d16e402d8cc1e688faa91399bc7de347d18a1a62a505dc57ccedcc38b8
+MD5 f8850478ec9b713cf9361c88ff9ae9a5 dovecot-1.0_rc32.ebuild 6276
+RMD160 7218c8afa36adb5cf02c70a67a6954fc496fc306 dovecot-1.0_rc32.ebuild 6276
+SHA256 6cd821d16e402d8cc1e688faa91399bc7de347d18a1a62a505dc57ccedcc38b8 dovecot-1.0_rc32.ebuild 6276
+MISC ChangeLog 17375 RMD160 393078812dcd22f3b03699d813f8aa20af0b7658 SHA1 c68915cff989dc5b3fb04139f007ec43dcb6e817 SHA256 44934921d19963689dbd242d0f8cef1fe27ef907b3a169e4a274a5ee71cabeeb
+MD5 20cd3555d2827d6355ad9ab383f758dd ChangeLog 17375
+RMD160 393078812dcd22f3b03699d813f8aa20af0b7658 ChangeLog 17375
+SHA256 44934921d19963689dbd242d0f8cef1fe27ef907b3a169e4a274a5ee71cabeeb ChangeLog 17375
 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66
 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252
 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252
@@ -38,3 +43,6 @@ SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/di
 MD5 e846f87a9516661b9f6b23ba58608d08 files/digest-dovecot-1.0_rc31-r1 506
 RMD160 f7710198d350bf5da2e241adec708b2c9ac3c4e6 files/digest-dovecot-1.0_rc31-r1 506
 SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/digest-dovecot-1.0_rc31-r1 506
+MD5 2a381aaa8c20d05cfebfb40883231e85 files/digest-dovecot-1.0_rc32 506
+RMD160 0a295b8431e2942af57b6ea2b40cb649bfb4261d files/digest-dovecot-1.0_rc32 506
+SHA256 65eb459595be4caa6162cd4828d0111578904f0e9903eb4c82eed0be7b0a7637 files/digest-dovecot-1.0_rc32 506

diff --git a/net-mail/dovecot/dovecot-1.0_rc32.ebuild b/net-mail/dovecot/dovecot-1.0_rc32.ebuild
new file mode 100644 (file)
index 0000000..7060c0c
--- /dev/null
+++ b/net-mail/dovecot/dovecot-1.0_rc32.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_rc32.ebuild,v 1.1 2007/04/12 18:00:08 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_rc32 b/net-mail/dovecot/files/digest-dovecot-1.0_rc32
new file mode 100644 (file)
index 0000000..4baa9c1
--- /dev/null
+++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc32
@@ -0,0 +1,6 @@
+MD5 e74f9ff5d1349c0ee8cfafffbe5d45c7 dovecot-1.0.rc32.tar.gz 1672650
+RMD160 0d2acfcf5f33633d182f0a2e2c81b88321de980b dovecot-1.0.rc32.tar.gz 1672650
+SHA256 c7ce6b71892dad8d86c723c854397bb3ed623f04fb2766484648acff7f7ff973 dovecot-1.0.rc32.tar.gz 1672650
+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