From: Roy Marples Date: Thu, 1 Mar 2007 13:35:27 +0000 (+0000) Subject: Another day, another RC. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1bf220d031b244d4d270eefe6cc10b664f3da021;p=gentoo.git Another day, another RC. Package-Manager: portage-2.1.2-r12 --- diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog index 3eb6a60994eb..01f41e6418d5 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.91 2007/02/22 19:49:50 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.92 2007/03/01 13:35:27 uberlord Exp $ + +*dovecot-1.0_rc25 (01 Mar 2007) + + 01 Mar 2007; Roy Marples +dovecot-1.0_rc25.ebuild: + Another day, another RC. *dovecot-1.0_rc24 (22 Feb 2007) diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 8005abcb2b13..62d4bd08e1f3 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -6,6 +6,7 @@ DIST dovecot-1.0.rc15.tar.gz 1463069 RMD160 904ef7d1f0fbfe8055f13d9036f7107f498b DIST dovecot-1.0.rc22.tar.gz 1501122 RMD160 e0fdb65d668f5fdaedd10d4359bd2bf3e42728d2 SHA1 966d5f1e251f63f21633666e6a65402e4129fc22 SHA256 ad93b4b1376c24f60eceb790f1ab162a99d1315920a8da802c08b0b73719470f DIST dovecot-1.0.rc23.tar.gz 1496678 RMD160 67c8622f957698bd017828c54bd59341c4a30cc9 SHA1 206a275cc109ab5528cfe3761409b539e762b7e4 SHA256 dbd581d999d8a952b806059a9b0d704fb0386c9a0a5f075df3ca9ca91b3d3e57 DIST dovecot-1.0.rc24.tar.gz 1498585 RMD160 4496e98216cbadd9352da4f898bdf656dfdb047e SHA1 0ecf6357d5d9a602501200eacb3e54dadf8a9793 SHA256 e35d44bf7fcffbbcb5823ab45c77ea7a8c0b6dbe423eecd37430dedab5a87e08 +DIST dovecot-1.0.rc25.tar.gz 1511817 RMD160 f5a631c310ea8958ca5244ce2ba71332e44218af SHA1 ce9023ce1ff42c195586a55983407c019a6ba46d SHA256 2dc307fbbcc431ae680a5d4712853203894635fa2a45e4bd4c39fe92a35b85d8 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 @@ -23,10 +24,14 @@ EBUILD dovecot-1.0_rc24.ebuild 6065 RMD160 cbb747beaa618914fb4312fb29b1fa95d3c33 MD5 577ad659d050697a68a84a378970a921 dovecot-1.0_rc24.ebuild 6065 RMD160 cbb747beaa618914fb4312fb29b1fa95d3c33c7d dovecot-1.0_rc24.ebuild 6065 SHA256 ea2ecdc371c04c8c253176bfce72f53b46d49acaae421fad5faeb0d8d3fc3202 dovecot-1.0_rc24.ebuild 6065 -MISC ChangeLog 15348 RMD160 2b290d3a1a71067f337c3f3ad6b021a4231bde52 SHA1 5919e9368fa6eb03cb4f8a6bb71b4d2d04d0b100 SHA256 b8ea2dbcfa23d97e6300316b5cf892fed5fca8071df01e0353473dc57c17d0ec -MD5 6d4024a7a47ec6e760b19603633cbedd ChangeLog 15348 -RMD160 2b290d3a1a71067f337c3f3ad6b021a4231bde52 ChangeLog 15348 -SHA256 b8ea2dbcfa23d97e6300316b5cf892fed5fca8071df01e0353473dc57c17d0ec ChangeLog 15348 +EBUILD dovecot-1.0_rc25.ebuild 6065 RMD160 ed1b36c4e01358056231d37389a7fb5d1a92cff8 SHA1 bd3f8465e3d32fb13d2362a64be8337d7d128109 SHA256 920fd9db3e4e918b393e02caba44b7f166d90a66001adab4f9c9cd37cb4165ad +MD5 3f963130097dc686824aca2aabf16b9f dovecot-1.0_rc25.ebuild 6065 +RMD160 ed1b36c4e01358056231d37389a7fb5d1a92cff8 dovecot-1.0_rc25.ebuild 6065 +SHA256 920fd9db3e4e918b393e02caba44b7f166d90a66001adab4f9c9cd37cb4165ad dovecot-1.0_rc25.ebuild 6065 +MISC ChangeLog 15484 RMD160 ccbd75c6015453439a3b898abbca1bb03d48efa5 SHA1 724433bf7c4f7a0453bdcdd6faca118ac8c8540d SHA256 b7767ba676681b5bbbd3e9fc2abf6c964ba347a092c68c1a0e27c5fa0318a7a3 +MD5 42a6aab4c489a92795f79976e0ad690a ChangeLog 15484 +RMD160 ccbd75c6015453439a3b898abbca1bb03d48efa5 ChangeLog 15484 +SHA256 b7767ba676681b5bbbd3e9fc2abf6c964ba347a092c68c1a0e27c5fa0318a7a3 ChangeLog 15484 MISC metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 SHA1 57de811cfb02936b35c4bef2108018e6b2697a99 SHA256 419ffa57f459d89a62dd42ee4bb01934f03e6913b470323f5b2b8a7c89e2dc66 MD5 b6ff89c08602229bdd234da83a89df77 metadata.xml 252 RMD160 97c0c41abc4b61586ab48653ced79067cb964aa6 metadata.xml 252 @@ -43,3 +48,6 @@ SHA256 97d2f534cb5d0455fd5dad3b91445ebe0c08f286ba8e459f7e80d093c232116f files/di MD5 3a118e7bb63cfa24e0f54b2236342a24 files/digest-dovecot-1.0_rc24 506 RMD160 9afacd925f4a74b3b016b0177ef002bb65ad854d files/digest-dovecot-1.0_rc24 506 SHA256 0ac1b2d3b89408e6372c0a8256557e1f789f8d90bb6ad10e8a0375a00f70fab1 files/digest-dovecot-1.0_rc24 506 +MD5 8726ea612fc148188026f6f3af8982bb files/digest-dovecot-1.0_rc25 506 +RMD160 65ced29982bfae57bd92aaf3ad5b07cf75782fb9 files/digest-dovecot-1.0_rc25 506 +SHA256 534769796157e34c697c5e8999aa133ebc67fb7e11848e45e3af529829316d5b files/digest-dovecot-1.0_rc25 506 diff --git a/net-mail/dovecot/dovecot-1.0_rc25.ebuild b/net-mail/dovecot/dovecot-1.0_rc25.ebuild new file mode 100644 index 000000000000..deaba02ab032 --- /dev/null +++ b/net-mail/dovecot/dovecot-1.0_rc25.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_rc25.ebuild,v 1.1 2007/03/01 13:35:27 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 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_rc25 b/net-mail/dovecot/files/digest-dovecot-1.0_rc25 new file mode 100644 index 000000000000..c46eb92cdfd8 --- /dev/null +++ b/net-mail/dovecot/files/digest-dovecot-1.0_rc25 @@ -0,0 +1,6 @@ +MD5 14e9981e9828a65526b8e683657434d4 dovecot-1.0.rc25.tar.gz 1511817 +RMD160 f5a631c310ea8958ca5244ce2ba71332e44218af dovecot-1.0.rc25.tar.gz 1511817 +SHA256 2dc307fbbcc431ae680a5d4712853203894635fa2a45e4bd4c39fe92a35b85d8 dovecot-1.0.rc25.tar.gz 1511817 +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