From: Roy Marples Date: Fri, 2 Feb 2007 15:51:39 +0000 (+0000) Subject: New version. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25b805c00ee15f3ec6d03ac64bd89e39a9a14438;p=gentoo.git New version. Package-Manager: portage-2.1.2-r6 --- diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog index 3141fbe3a792..0f7ec3f8fab8 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.86 2007/01/30 18:47:41 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.87 2007/02/02 15:51:39 uberlord Exp $ + +*dovecot-1.0_rc21 (02 Feb 2007) + + 02 Feb 2007; Roy Marples +dovecot-1.0_rc21.ebuild: + New version. 30 Jan 2007; Roy Marples dovecot-1.0_rc19.ebuild: Uncomment ssl_*_file directices with correct path, #163851. diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 2eb458ba8e65..93c675a8a0fb 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -7,6 +7,7 @@ DIST dovecot-1.0.rc15.tar.gz 1463069 RMD160 904ef7d1f0fbfe8055f13d9036f7107f498b DIST dovecot-1.0.rc16.tar.gz 1512299 RMD160 651988039a20cb84f65e3e840d50d8357d9d6216 SHA1 b98095cf13364f44ee5844596652d69699f02408 SHA256 009a8065a1816d0ac6661e4a5775258a4b92d859445c21a8c6973036fa12eaed DIST dovecot-1.0.rc17.tar.gz 1512386 RMD160 de91fe34a837fafb5e8abbb1cc652c7ba849b210 SHA1 f1e6e3c73e2431582919fd174b2c1f64f39dce46 SHA256 fa3ea565758e2426a88ab7912c8afcc0f930bad344c3fba50133ac4513d75b4f DIST dovecot-1.0.rc19.tar.gz 1498105 RMD160 feb9e5927ab2c651273c9aaec1727b894a5a6e17 SHA1 c9c41ed83c775e8eecc40fe13bab135261383b82 SHA256 e8c616f7b41cbe1ee83f6c9027b34daa4c487c9919678a1fed3a66b230f59998 +DIST dovecot-1.0.rc21.tar.gz 1500380 RMD160 58193d387acde95d1bec5fcfa18d4c767c207788 SHA1 efe6c70af07b8792f16a578ee855deb31ecef4d6 SHA256 74a4c73d7500217eb239208ac2f368d223f67251eb9dce9ee0e80efa8d713f93 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 @@ -32,10 +33,14 @@ EBUILD dovecot-1.0_rc19.ebuild 6055 RMD160 cc6ab771fb7c36dde3302b584177d15f4f72f MD5 57e11f9a88f52958c7dbbe26f571e3e5 dovecot-1.0_rc19.ebuild 6055 RMD160 cc6ab771fb7c36dde3302b584177d15f4f72f1a9 dovecot-1.0_rc19.ebuild 6055 SHA256 83aaba495bfc49b59ee970ca43af61209586ac3f934b172beacfc7384884c726 dovecot-1.0_rc19.ebuild 6055 -MISC ChangeLog 14754 RMD160 88de2c471a47dcb89e776de255bdc2acb56c03b5 SHA1 2bdabe652e0b1278a23996768a3e7edec48f59fe SHA256 1f90be1c091c014631aea8a60691d2d14b9d9f3f70a729f392e97f1d3602817d -MD5 8e9562365a7d8ab6700d72bff99a0e2b ChangeLog 14754 -RMD160 88de2c471a47dcb89e776de255bdc2acb56c03b5 ChangeLog 14754 -SHA256 1f90be1c091c014631aea8a60691d2d14b9d9f3f70a729f392e97f1d3602817d ChangeLog 14754 +EBUILD dovecot-1.0_rc21.ebuild 6055 RMD160 49c2b4825f2646460491a4a389850134a182d785 SHA1 3865a0a07fad9616ff9bf1c41b17294b543012ec SHA256 f90429605a20b9072c04a8eebffa58ec20e7d0362a67dbe696525daa5eaf079c +MD5 54d88c351ea4b45b4d749fcc3cc2c82d dovecot-1.0_rc21.ebuild 6055 +RMD160 49c2b4825f2646460491a4a389850134a182d785 dovecot-1.0_rc21.ebuild 6055 +SHA256 f90429605a20b9072c04a8eebffa58ec20e7d0362a67dbe696525daa5eaf079c dovecot-1.0_rc21.ebuild 6055 +MISC ChangeLog 14878 RMD160 01e9e971e7155058d9eaa4c75c1994cc95dc345a SHA1 a43387ff7ad5d7ad1e260ce5e7ef59d5227f79ca SHA256 dd3cdcc3067334c81c3784909d165cc7752b977f838cd49f71e0134a05df1828 +MD5 6d7f6e0fb15349256d2dbfe2c5202172 ChangeLog 14878 +RMD160 01e9e971e7155058d9eaa4c75c1994cc95dc345a ChangeLog 14878 +SHA256 dd3cdcc3067334c81c3784909d165cc7752b977f838cd49f71e0134a05df1828 ChangeLog 14878 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252 @@ -58,3 +63,6 @@ SHA256 a939b254d5fd784412777ec672d65cacb1011203cd08ffd4cfc6be18703f1a1d files/di MD5 161b41890deff42100a67fba74594460 files/digest-dovecot-1.0_rc19 506 RMD160 37117030223d14485ac924262b0c49b591476aee files/digest-dovecot-1.0_rc19 506 SHA256 bd1a48b9c7a49b57824ce0f4aba45759a0a12467e50cdca0310629c25645973f files/digest-dovecot-1.0_rc19 506 +MD5 385655b5094b79178c0e870aaa8912f8 files/digest-dovecot-1.0_rc21 506 +RMD160 8f4111eb8d69bb886bbefe01b5d04f60e134cb95 files/digest-dovecot-1.0_rc21 506 +SHA256 441db93240e31455dafa612c63ea4a338a4e505b0965e9d3d67cdf04f513bfe7 files/digest-dovecot-1.0_rc21 506 diff --git a/net-mail/dovecot/dovecot-1.0_rc21.ebuild b/net-mail/dovecot/dovecot-1.0_rc21.ebuild new file mode 100644 index 000000000000..adc72e81bb99 --- /dev/null +++ b/net-mail/dovecot/dovecot-1.0_rc21.ebuild @@ -0,0 +1,201 @@ +# 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_rc21.ebuild,v 1.1 2007/02/02 15:51:39 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" + +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 + + # 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.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 + + # 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_rc21 b/net-mail/dovecot/files/digest-dovecot-1.0_rc21 new file mode 100644 index 000000000000..56627de127c9 --- /dev/null +++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc21 @@ -0,0 +1,6 @@ +MD5 b42be5947e641909918a863da3249951 dovecot-1.0.rc21.tar.gz 1500380 +RMD160 58193d387acde95d1bec5fcfa18d4c767c207788 dovecot-1.0.rc21.tar.gz 1500380 +SHA256 74a4c73d7500217eb239208ac2f368d223f67251eb9dce9ee0e80efa8d713f93 dovecot-1.0.rc21.tar.gz 1500380 +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