From 5e4ca36ceda96e874ba70398fa95ebc31e6e7ac3 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 6 Apr 2007 12:43:57 +0000 Subject: [PATCH] New version - hopefully the last before v1.0 (but don't hold your breath!) Package-Manager: portage-2.1.2.3 --- net-mail/dovecot/ChangeLog | 7 +- net-mail/dovecot/Manifest | 26 +-- net-mail/dovecot/dovecot-1.0_rc30.ebuild | 205 ++++++++++++++++++ .../dovecot/files/digest-dovecot-1.0_rc30 | 6 + 4 files changed, 229 insertions(+), 15 deletions(-) create mode 100644 net-mail/dovecot/dovecot-1.0_rc30.ebuild create mode 100644 net-mail/dovecot/files/digest-dovecot-1.0_rc30 diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog index 3aad9063ed56..f397c9445f06 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.100 2007/04/03 18:06:09 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.101 2007/04/06 12:43:57 uberlord Exp $ + +*dovecot-1.0_rc30 (06 Apr 2007) + + 06 Apr 2007; Roy Marples +dovecot-1.0_rc30.ebuild: + New version - hopefully the last before v1.0 (but don't hold your breath!) 03 Apr 2007; Gustavo Zacarias dovecot-1.0_rc29.ebuild: diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 3e362f3bf17f..16374d6a2048 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX dovecot.init 878 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab SHA1 f31c1476107dd4ca4919fe3e994ef6cb82f5a8c1 SHA256 1bd24e14af5536828d3e232186d5ae68d3e394da3324c660fa1e658b4ae3b413 MD5 6d3e44da73ef66d20b42a5fad49731f0 files/dovecot.init 878 RMD160 32906bdbf40221017c4f39a7ca0e3fa97070b9ab files/dovecot.init 878 @@ -14,6 +11,7 @@ DIST dovecot-1.0.rc26.tar.gz 1515108 RMD160 c87f8f7da138187248017f6ff067d340e296 DIST dovecot-1.0.rc27.tar.gz 1521452 RMD160 b13d0ac5c6760d7646d0c5924943be0d7ce0e480 SHA1 7f026bd63234ae39658bde87a547b8c5001d892c SHA256 b2846c63325b88d1e39b908cb1ee03f2a9057d37600ea5b9c3dc5b923e97d0b0 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-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 @@ -51,10 +49,14 @@ EBUILD dovecot-1.0_rc29.ebuild 6272 RMD160 ac42736548b6159c4876cdf6457687acd9093 MD5 5eb1d9c0d3c158241518d38f0c4232db dovecot-1.0_rc29.ebuild 6272 RMD160 ac42736548b6159c4876cdf6457687acd90935f5 dovecot-1.0_rc29.ebuild 6272 SHA256 5d57f774edefd50649e287d812842500428ecc2b3efd763cc780f3abc6675fb0 dovecot-1.0_rc29.ebuild 6272 -MISC ChangeLog 16563 RMD160 0ae29e77a59103dc80523b1dc6e63779b877cdf7 SHA1 74fa42c85fee6cba4a72f0199e0a88ff62ee5f15 SHA256 c6aa95bf8619b5c5dfe14b58e06bcfc10c2d4f4b2c06b0b8b1b43a23bd0153e8 -MD5 43a720b29509af162261f2f9443188a6 ChangeLog 16563 -RMD160 0ae29e77a59103dc80523b1dc6e63779b877cdf7 ChangeLog 16563 -SHA256 c6aa95bf8619b5c5dfe14b58e06bcfc10c2d4f4b2c06b0b8b1b43a23bd0153e8 ChangeLog 16563 +EBUILD dovecot-1.0_rc30.ebuild 6276 RMD160 33f959963e3e4b16c6ca630c961bfcdbf2022059 SHA1 b010d71c371dea905c9a6808f01ce8117769247d SHA256 bdc1bab4ee1e6c54e08d41057413e1ae7587dfe5ec2d5fcbd60519ec3af36631 +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 16749 RMD160 f80c32e043def60c1c384a6206f7c3b9a004a226 SHA1 1fca476a8e71b1c23828ef8fdf014511d25a5ab9 SHA256 708cc3c67e784fe9b5cc2ac37ba79139b1463b131f09f0137be47bf2b08c4418 +MD5 5d5fcd35297422020d9dd151dd9f626f ChangeLog 16749 +RMD160 f80c32e043def60c1c384a6206f7c3b9a004a226 ChangeLog 16749 +SHA256 708cc3c67e784fe9b5cc2ac37ba79139b1463b131f09f0137be47bf2b08c4418 ChangeLog 16749 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252 @@ -86,10 +88,6 @@ SHA256 061f6721564347193859ee1aa0a4eb4a0cfc463edc7d739bc1a264f730f08486 files/di MD5 3a2a6879891be58fc76cb6ec2fae1b5b files/digest-dovecot-1.0_rc29 506 RMD160 10b492542da124a42a5ed44384e3bddb1f3a5885 files/digest-dovecot-1.0_rc29 506 SHA256 e105494181591e87387643dd71988f2fb78c143a18d6826139693bb18e8aa438 files/digest-dovecot-1.0_rc29 506 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) - -iD8DBQFGEpebKRy60XGEcJIRAgGYAJ47UIQtmU37bSdNGidWZmzD2aM57QCeIbMl -LHbJ5l3wU0i3X62eO/UPJ8E= -=14zn ------END PGP SIGNATURE----- +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 diff --git a/net-mail/dovecot/dovecot-1.0_rc30.ebuild b/net-mail/dovecot/dovecot-1.0_rc30.ebuild new file mode 100644 index 000000000000..7ba9a96c666a --- /dev/null +++ b/net-mail/dovecot/dovecot-1.0_rc30.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_rc30.ebuild,v 1.1 2007/04/06 12:43:57 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_rc30 b/net-mail/dovecot/files/digest-dovecot-1.0_rc30 new file mode 100644 index 000000000000..978e0fd45f3a --- /dev/null +++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc30 @@ -0,0 +1,6 @@ +MD5 59470fa98d4004e8e9036934c92eaade dovecot-1.0.rc30.tar.gz 1671456 +RMD160 2eb01aa3de5279fe16cef834309f03c6f57f337e dovecot-1.0.rc30.tar.gz 1671456 +SHA256 19f907ec58896eecedb7a4b159c695802a53a1f00850694acbac5ab92dcf7e84 dovecot-1.0.rc30.tar.gz 1671456 +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 -- 2.26.2