From: Roy Marples Date: Tue, 10 Apr 2007 07:43:55 +0000 (+0000) Subject: Boing. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b23103ddf49bc63559f289e7e2c0b41e0940b72a;p=gentoo.git Boing. Package-Manager: portage-2.1.2.3 --- diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog index b8155ee9bf30..9ad3bc043b9f 100644 --- 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.102 2007/04/07 06:17:26 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.103 2007/04/10 07:43:55 uberlord Exp $ + +*dovecot-1.0_rc31 (10 Apr 2007) + + 10 Apr 2007; Roy Marples +dovecot-1.0_rc31.ebuild: + Boing. 07 Apr 2007; Peter Weller dovecot-1.0_rc29.ebuild: Stable on amd64 wrt bug 172795 diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index e21dd5a5b063..6610009ec655 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -12,6 +12,7 @@ DIST dovecot-1.0.rc27.tar.gz 1521452 RMD160 b13d0ac5c6760d7646d0c5924943be0d7ce0 DIST dovecot-1.0.rc28.tar.gz 1534090 RMD160 7ea445c844d382115eb4fad651ff00d51dc58e9e SHA1 bf7f98298905f53700b3f2abde8c60f9aa6ba035 SHA256 56dd5221812d66a2fa90437ff3cc50a03236d94f9309cffb5ce48448bd64c2a3 DIST dovecot-1.0.rc29.tar.gz 1670673 RMD160 b09da68a67e951bf019ab077bf17ebbfd7e729a2 SHA1 f090f6ceb22849da4fc255d21e99d303f537c237 SHA256 6b8431e8276c07e235d30c195946e9b09d1f3e12f28aea6f755b6d4c72008dd9 DIST dovecot-1.0.rc30.tar.gz 1671456 RMD160 2eb01aa3de5279fe16cef834309f03c6f57f337e SHA1 b3eb963cd577d2de0331415e76f33feff90e7077 SHA256 19f907ec58896eecedb7a4b159c695802a53a1f00850694acbac5ab92dcf7e84 +DIST dovecot-1.0.rc31.tar.gz 1672213 RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d SHA1 cb753f8f2a8557f7481303e1428110004b36f525 SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a DIST dovecot-sieve-1.0.tar.gz 442943 RMD160 b56f5a7391607125184755b9bbcbe749e79e26d4 SHA1 6d151c4140e0cf89e3d771fb32b5da065dbbed24 SHA256 c1ce887c1c6e09d9d1b4af6825db5c50befb10c1fed742a6666a12ac9492d98a EBUILD dovecot-1.0_rc15.ebuild 5318 RMD160 78a83e7c4b0016c07df28daedfd5beb0f588df85 SHA1 5cb08423188982d0befab9017e1004f7929cfc8d SHA256 347aacb737d18250e7a209678a94055d0b01c290cd778ad9607559b975665ab2 MD5 61d0c3649db044745ecb0036357d9ee9 dovecot-1.0_rc15.ebuild 5318 @@ -53,10 +54,14 @@ EBUILD dovecot-1.0_rc30.ebuild 6276 RMD160 33f959963e3e4b16c6ca630c961bfcdbf2022 MD5 78c6d1a37f885bff6ccab4121713d54f dovecot-1.0_rc30.ebuild 6276 RMD160 33f959963e3e4b16c6ca630c961bfcdbf2022059 dovecot-1.0_rc30.ebuild 6276 SHA256 bdc1bab4ee1e6c54e08d41057413e1ae7587dfe5ec2d5fcbd60519ec3af36631 dovecot-1.0_rc30.ebuild 6276 -MISC ChangeLog 16850 RMD160 88066f2505620a6c0818c3788666935f8da75920 SHA1 754819befe8377732973120f7688861265ee0976 SHA256 34f91a5865d6b5304ad7b91625f3ce0b3cb2b24763271671e4a99e5c76baeedd -MD5 1f26b806551e0522ded063399821dbb1 ChangeLog 16850 -RMD160 88066f2505620a6c0818c3788666935f8da75920 ChangeLog 16850 -SHA256 34f91a5865d6b5304ad7b91625f3ce0b3cb2b24763271671e4a99e5c76baeedd ChangeLog 16850 +EBUILD dovecot-1.0_rc31.ebuild 6276 RMD160 518fd345deb4294e9507a24d2c5cfb725b3267f5 SHA1 8b2f88a4dbb9028f7d0bcdc70ecce51798325ce6 SHA256 83dc31aa2f89a089fd9e21b4455c058cd651f58ff22baf146b3517a9cedc5c4b +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 16972 RMD160 5d8a41f9107e55e188bd486c65d45383ed37c0a0 SHA1 c8f31a273ba996c2fdd836c0a0ebdd4e75eeeb69 SHA256 b6dbb064674facb0977a47d74eca4cecbcce3bc2188c5d6ed312b9fd0a731ec8 +MD5 d226740da0aef3c8dacdd8cf650470d7 ChangeLog 16972 +RMD160 5d8a41f9107e55e188bd486c65d45383ed37c0a0 ChangeLog 16972 +SHA256 b6dbb064674facb0977a47d74eca4cecbcce3bc2188c5d6ed312b9fd0a731ec8 ChangeLog 16972 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252 @@ -91,3 +96,6 @@ SHA256 e105494181591e87387643dd71988f2fb78c143a18d6826139693bb18e8aa438 files/di MD5 dfcf424af73a44f2952fe53840042f2d files/digest-dovecot-1.0_rc30 506 RMD160 262bcb43a5b70f04f0e7008473b5aad040d236f4 files/digest-dovecot-1.0_rc30 506 SHA256 c3508b6b77b6dccf07446005e8a5f0e751420457188d4891573920a77e262a26 files/digest-dovecot-1.0_rc30 506 +MD5 e846f87a9516661b9f6b23ba58608d08 files/digest-dovecot-1.0_rc31 506 +RMD160 f7710198d350bf5da2e241adec708b2c9ac3c4e6 files/digest-dovecot-1.0_rc31 506 +SHA256 cb93de608a72203adb454f274c996d804e4ce0f035b04d02f40c88398d4b8ad0 files/digest-dovecot-1.0_rc31 506 diff --git a/net-mail/dovecot/dovecot-1.0_rc31.ebuild b/net-mail/dovecot/dovecot-1.0_rc31.ebuild new file mode 100644 index 000000000000..585eb1efb7c6 --- /dev/null +++ b/net-mail/dovecot/dovecot-1.0_rc31.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_rc31.ebuild,v 1.1 2007/04/10 07:43:55 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_rc31 b/net-mail/dovecot/files/digest-dovecot-1.0_rc31 new file mode 100644 index 000000000000..8938b85ddd51 --- /dev/null +++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc31 @@ -0,0 +1,6 @@ +MD5 246b74f72bc710b3348307955de29292 dovecot-1.0.rc31.tar.gz 1672213 +RMD160 c4d3f1d3df231de8bea1bd2c148dbe7be154099d dovecot-1.0.rc31.tar.gz 1672213 +SHA256 69161740558b13d388e97ab6ca4730b6ff420e51bdb9086d438b27e6119d094a dovecot-1.0.rc31.tar.gz 1672213 +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