Bump of 2.0beta, thanks to Eray Aslan

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-mail/dovecot/ChangeLog b/net-mail/dovecot/ChangeLog
index 5c50b24d5b499390086b5f3f9a78ce1927cd229c..b070356706c8fe5cb963bd12fdaeed6f88eb6112 100644 (file)
--- a/net-mail/dovecot/ChangeLog
+++ b/net-mail/dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/dovecot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.240 2010/05/07 18:21:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/ChangeLog,v 1.241 2010/05/19 13:26:56 patrick Exp $
+
+*dovecot-2.0_beta5 (19 May 2010)
+
+  19 May 2010; Patrick Lauer <patrick@gentoo.org> +dovecot-2.0_beta5.ebuild,
+  files/dovecot.init-r2:
+  Bump of 2.0beta, thanks to Eray Aslan
 
   07 May 2010; Raúl Porcel <armin76@gentoo.org> dovecot-1.2.11-r1.ebuild:
   alpha/sparc stable wrt #314533

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 4a075a03eef3ed0973c2c5578a6966e8e5b9251d..a357e08a4ea5652dc9828f4f76736065f94984af 100644 (file)
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,8 +3,9 @@ AUX dovecot-1.1.11-4736327a8740.patch 861 RMD160 801e2df279a74a57ff5b697520a3826
 AUX dovecot-1.1.11-bdc5391e52df.patch 1610 RMD160 eaf49900f1473781618e5401f36d0390be3035e5 SHA1 c7becfb34fc497cec2c6c3d8a4cdc98a1203a231 SHA256 75f583dc2d90cd2256da978f8a620b6af9c07a220faf7575430ed648a45dd2ad
 AUX dovecot-1.1.11-c08c602ca0dc.patch 1110 RMD160 dbb1908ce6959c6efe1bb43e3155736448f0b754 SHA1 f35724cc45159cc8b7faa5f850f06cd1b3100407 SHA256 07b5b10e8a105e2ca962f37fa425699a42b9fa6d565167191f3b55f1703eb912
 AUX dovecot.init 874 RMD160 aa899b69d42946dcf2262c38731319474e759041 SHA1 4f0a95cf6ba9e86bd9008694ea927dc97703b24d SHA256 145d68382d757110aa86f58b2567fb25648fa0ca62788e3461f2b45fc5999c80
-AUX dovecot.init-r2 1710 RMD160 551a543f862c9df078737d71ef89fc1199bea588 SHA1 87354c61ee68a162e8bb1ec5e0f3778eb706566d SHA256 778621d07e168b549e761bd2df2d3decb492a3e9567c1490693369e466b685e9
+AUX dovecot.init-r2 1618 RMD160 5b5c88847c096282f5ab94b82db7fab5c9e42aa3 SHA1 d9f61ac897a6e377dc8cf2c6da4952a4ff7918e9 SHA256 6ad0d1fc09c41ba390e717667e4dad3838f669ef7b227e3cbdb60c499758a901
 DIST 2cb08c188b6a.tar.gz 659713 RMD160 62af3e681e6383c7dd4f7fb260ee0d621a20ffdd SHA1 114b28098fdbdd16c34e331173d580e699703b2d SHA256 73173159e1ddef016fa178ebd91bdf938597ae8c4c33bef7294f37599401fdcd
+DIST b8dbef9ec43b.tar.gz 663065 RMD160 6a071c68f972a14f783eb8b4ce85af205e5e2022 SHA1 72ce2c45c0729ef419e5e87a7a06e268290e45f9 SHA256 d2c919987d5862762a8640f107b586d064f2959cd8cd0a12d26be15fcb88e1d9
 DIST dovecot-1.1-managesieve-0.10.4.tar.gz 397332 RMD160 4da8129ead0de9d807e7311849a1b660c7f0509a SHA1 70a84beb5477738ff03024c4ce18a678b90fa1df SHA256 3a66a9dcad5b3a291cd87364fbb961725aa1473cf9c7ce7fa675ba71fe9313ae
 DIST dovecot-1.1-managesieve-0.10.6.tar.gz 395642 RMD160 a4c0b123e2a3b93805d264703426dbdf97b369da SHA1 8644426936bc85c90e3dfdc7a72645c635063149 SHA256 72f8c0fdc7da85321b75e3893c17aa540a915511b474ade5ff3c936cec10879b
 DIST dovecot-1.1-managesieve-0.10.7.tar.gz 358166 RMD160 a8ca467e4a61b916a68a8252e6c3e8adc211472c SHA1 88d7b88dfc1cb4cc4dfac4de6aa3601a5272d345 SHA256 122deb67237714601223112846604942fe70c4d52edc8142851de0be502d8c23
@@ -33,6 +34,7 @@ DIST dovecot-1.2.8.tar.gz 2702887 RMD160 b685d002224435f372364b7e69d550c136630ce
 DIST dovecot-1.2.9-managesieve-0.11.10.diff.gz 6456 RMD160 5e9692bf733d2100c5af7c066765c1383c43d346 SHA1 f817137163eb4b1cf9e310753f49569dde3f038b SHA256 07a292f37924332bb4ce6c27be5317afa6caa60ecac52e248110e7e1e9d434d5
 DIST dovecot-1.2.9.tar.gz 2889394 RMD160 fa17bafabdd6fab69c22d617deff368a4bc165d1 SHA1 7c1013a1bc856a4366f76ac1f40e856185695e20 SHA256 b4661e2e839ec2dde27e74c596d1157530b80c767ce42566c894553cb16a6887
 DIST dovecot-2.0.beta4.tar.gz 3315148 RMD160 cf155d09d13679b75b77849345f5369f5b3ddcd4 SHA1 9e919df0d4dac0d696e2abfc0c00aa96401f7c92 SHA256 7630510f2f2806190b419dd6c51eeca5f45d7030f1b260692bb59aa57988d14c
+DIST dovecot-2.0.beta5.tar.gz 3409443 RMD160 35c3b09f938edd79f14674744a58c2a64c3703ac SHA1 cbd9a4677f09d91db09e84ee6a07a7474847e0e2 SHA256 89077a43bd09747d41619fa0c56e50005684e80a5d92ddbf1f4f22413e09455c
 DIST dovecot-sieve-1.1.5.tar.gz 468913 RMD160 825a8ec07d49527d8551cb5f3f86b638fddbafbd SHA1 672adf0a2f1627d96f97fc63fecaf024dd9f7a42 SHA256 ec1ea94311d5fb6cb5dd7e451728784afb39521a6a580f640b4d2115505a5ddf
 DIST dovecot-sieve-1.1.6.tar.gz 470071 RMD160 ed6f75dc1ffdb0ec51ecf3786aa71092851289f5 SHA1 c109ee8ab1c7ffece7940fb2e37104baf784440e SHA256 a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
 EBUILD dovecot-1.1.16.ebuild 8588 RMD160 aa2eec6ca31112c8b1ed97f48e75f80e06d13c38 SHA1 c6dcd325eadd926aa1344bf82875674d9fc098e6 SHA256 b5ab1b69eca6f157bc9807e6debe0b18fefcae9060588a4ac75936dfdc0da42f
@@ -47,5 +49,6 @@ EBUILD dovecot-1.2.7.ebuild 7461 RMD160 20f4b1374d21b530d01b4cfa049ac3e67749a41e
 EBUILD dovecot-1.2.8.ebuild 7747 RMD160 67b002a4c7212e1814df5486e6b2b36a6032fab5 SHA1 18f499c5dcae89e4b9b12dd7f59c964702fb2d23 SHA256 29b9e85bcfc835c961a904c18cb2c6a6f55328ea444c9e268c8516bd8f4284e6
 EBUILD dovecot-1.2.9-r1.ebuild 7747 RMD160 fcdbc597a4216903eefce47a3ae592eaaa2848eb SHA1 4be5713548a7306a2c1251bb638a55afb67c11c9 SHA256 20ae2b450ae344c21ddec63c8ae1d2d2b6c060f3baaf4a035cbd985f0d4a0c0c
 EBUILD dovecot-2.0_beta4.ebuild 9979 RMD160 b47e5d5e66d253136cf24f2c67ae8993f3c767cc SHA1 1f69a0357253c2f90c3bc3a48eb250462804940f SHA256 cf09f38bdf87c559b55d2b02b3db1b8eb962cfba5b3e87f3c45b6f5db0df3991
-MISC ChangeLog 38319 RMD160 778c5b7f1513489d11270cc56e612ed3d870b568 SHA1 70f74ff154aab077cf1ba29d85e90bdf3eae95df SHA256 4f5baa884dec24420190d9826691269485695bfc641bac1034063d6390644385
+EBUILD dovecot-2.0_beta5.ebuild 10401 RMD160 e7d3b485966e6e077f0e3f9237b1f910b3686c9a SHA1 294ebed11c05bdba54a883d0cbd01a029528617c SHA256 d6513706d69e3a12b2faa55a8c63ca2a1aeb3106262606adc1bf57fa905eee0b
+MISC ChangeLog 38496 RMD160 d0c21c80d20c53b53661d78e806cfb023e62c103 SHA1 cad436173546c2754ebca04ce993abcc42b298bb SHA256 5f58096bd3de984063ebca67985236425d4ab4cbab4bfb082aace33aa70ce1e6
 MISC metadata.xml 805 RMD160 5463fdc136060ba785d5d1394774f7bb6c76bdb5 SHA1 a309cf7dcbd283d70f7d418ca1a198400023dabe SHA256 f4edba91969b56d55fed13f18f0f49b81325377e1786a3d129feeb8de6086ee2

diff --git a/net-mail/dovecot/dovecot-2.0_beta5.ebuild b/net-mail/dovecot/dovecot-2.0_beta5.ebuild
new file mode 100644 (file)
index 0000000..19a23f1
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.0_beta5.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0_beta5.ebuild,v 1.1 2010/05/19 13:26:56 patrick Exp $
+
+EAPI="2"
+
+inherit eutils versionator ssl-cert
+
+MY_P="${P/_/.}"
+major_minor="$( get_version_component_range 1-2 )"
+sieve_snapshot="b8dbef9ec43b"
+SRC_URI="http://dovecot.org/releases/${major_minor}/beta/${MY_P}.tar.gz
+       sieve? (
+       http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/${sieve_snapshot}.tar.gz
+       ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1" # MIT too?
+KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86"
+
+IUSE="berkdb bzip2 caps cydir dbox doc ipv6 kerberos ldap +maildir managesieve mbox mysql pam postgres sieve sqlite +ssl suid vpopmail zlib"
+
+DEPEND="berkdb? ( sys-libs/db )
+       caps? ( sys-libs/libcap )
+       kerberos? ( virtual/krb5 )
+       ldap? ( net-nds/openldap )
+       mysql? ( virtual/mysql )
+       pam? ( virtual/pam )
+       postgres? ( virtual/postgresql-base )
+       sqlite? ( dev-db/sqlite )
+       ssl? ( dev-libs/openssl )
+       vpopmail? ( net-mail/vpopmail )"
+
+RDEPEND="${DEPEND}
+       >=net-mail/mailbase-0.00-r8"
+
+pkg_setup() {
+       if use managesieve && ! use sieve; then
+               eerror "managesieve USE flag selected but sieve USE flag unselected"
+               die "USE flag problem"
+       fi
+
+       if use dbox && ! use maildir; then
+               eerror "dbox USE flag needs maildir USE flag enabled"
+               die "USE flag problem"
+       fi
+
+       # Add user and group for login process (same as for fedora/redhat)
+       # default internal user
+       enewgroup dovecot 97
+       enewuser dovecot 97 -1 /dev/null dovecot
+       # add "mail" group for suid'ing. Better security isolation.
+       if use suid; then
+               enewgroup mail
+       fi
+       # default login user
+       enewuser dovenull -1 -1 /dev/null
+}
+
+src_configure() {
+       local conf=""
+
+       if use postgres || use mysql || use sqlite; then
+               conf="${conf} --with-sql"
+       fi
+
+       local storages=""
+       for storage in cydir dbox maildir mbox; do
+               use ${storage} && storages="${storage} ${storages}"
+       done
+       [ "${storages}" ] || storages="maildir"
+
+       cd ${MY_P}
+       econf \
+               --localstatedir=/var \
+               --with-moduledir="/usr/$( get_libdir )/dovecot" \
+               $( use_with bzip2 bzlib ) \
+               $( use_with caps libcap ) \
+               $( use_with kerberos gssapi ) \
+               $( use_with ldap ) \
+               $( use_with mysql ) \
+               $( use_with pam ) \
+               $( use_with postgres pgsql ) \
+               $( use_with sqlite ) \
+               $( use_with ssl ) \
+               $( use_with vpopmail ) \
+               $( use_with zlib ) \
+               --with-storages="${storages}" \
+               --with-pic \
+               --disable-rpath \
+               ${conf}
+
+       if use sieve; then
+               # The sieve plugin needs this file to be build to determine the plugin
+               # directory and the list of libraries to link to.
+               emake dovecot-config || die "emake dovecot-config failed"
+
+               # snapshot. should not be necessary for 2.0 release
+               cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+               ./autogen.sh || die "autogen failed"
+
+               econf \
+                       --localstatedir=/var \
+                       --enable-shared \
+                       --with-pic \
+                       --with-dovecot="../${MY_P}" \
+                       $( use_with managesieve )
+       fi
+}
+
+src_compile() {
+       cd "${MY_P}"
+       emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
+
+       if use sieve; then
+               cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "make sieve failed"
+       fi
+}
+
+src_install () {
+       cd "${MY_P}"
+       emake DESTDIR="${D}" install || die "make install failed"
+
+       # insecure:
+       # use suid && fperms u+s /usr/libexec/dovecot/deliver
+       # better:
+       if use suid;then
+               einfo "Changing perms to allow deliver to be suided"
+               fowners root:mail "${D}"/usr/libexec/dovecot/deliver
+               fperms 4750 "${D}"/usr/libexec/dovecot/deliver
+       fi
+
+       newinitd "${FILESDIR}"/dovecot.init-r2 dovecot
+
+       rm -rf "${D}"/usr/share/doc/dovecot
+       rm -rf "${D}"/usr/share/aclocal
+
+       dodoc AUTHORS NEWS README TODO || die "basic dodoc failed"
+       rm -f doc/Makefile*
+       dodoc doc/* || die "dodoc doc failed"
+       docinto example-config
+       dodoc doc/example-config/*.{conf,ext} || die "dodoc example failed"
+       docinto example-config/conf.d
+       dodoc doc/example-config/conf.d/*.{conf,ext} || die "dodoc conf.d failed"
+       docinto wiki
+       dodoc doc/wiki/* || die "dodoc wiki failed"
+
+       # 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"
+       local confd="${D}/etc/dovecot/conf.d"
+
+       insinto /etc/dovecot
+       doins doc/example-config/*.{conf,ext}
+       insinto /etc/dovecot/conf.d
+       doins doc/example-config/conf.d/*.{conf,ext}
+       fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+       sed -i -e "s:/usr/share/doc/dovecot/:/usr/share/doc/${PF}/:" \
+       "${confd}/../README" || die "sed failed"
+
+       # .maildir is the Gentoo default, but we need to support mbox too
+       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_privileged_group =|mail_privileged_group = mail|' \
+               "${confd}/10-mail.conf" || die "sed failed"
+       fi
+       sed -i -e \
+               "s|#mail_location =|mail_location = ${mail_location}|" \
+               "${confd}/10-mail.conf" \
+               || die "failed to update mail location settings in 10-mail.conf"
+
+       # We're using pam files (imap and pop3) provided by mailbase
+       if use pam; then
+               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+                       "${confd}/auth-system.conf.ext" \
+                       || die "failed to update PAM settings in auth-system.conf.ext"
+               # mailbase does not provide a managesieve pam file
+               use managesieve && dosym imap /etc/pam.d/managesieve
+               sed -i -e \
+                       's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+                       "${confd}/10-auth.conf" \
+                       || die "failed to update PAM settings in 10-auth.conf"
+       fi
+
+       # Disable ipv6 if necessary
+       if ! use ipv6; then
+               sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+                       || die "failed to update listen settings in dovecot.conf"
+       fi
+
+       # Update ssl cert locations
+       if use ssl; then
+               sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+               || die "ssl conf failed"
+               sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+                       -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+                       "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+       fi
+
+       # Install SQL configuration
+       if use mysql || use postgres; then
+               sed -i -e \
+                       's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+                       "${confd}/10-auth.conf" || die "failed to update SQL settings in \
+                       10-auth.conf"
+       fi
+
+       # Install LDAP configuration
+       if use ldap; then
+               sed -i -e \
+                       's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+                       "${confd}/10-auth.conf" \
+                       || die "failed to update ldap settings in 10-auth.conf"
+       fi
+
+       if use vpopmail; then
+               sed -i -e \
+                       's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+                       "${confd}/10-auth.conf" \
+                       || die "failed to update vpopmail settings in 10-auth.conf"
+       fi
+
+       if use sieve; then
+               cd "$(find ../ -type d -name dovecot-2-0-pigeonhole*)" || die "cd failed"
+               emake DESTDIR="${D}" install || die "make install failed (sieve)"
+               sed -i -e \
+                       's/^[[:space:]]*#mail_plugins =/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+                       || die "failed to update sieve settings in 15-lda.conf"
+               rm -rf "${D}"/usr/share/doc/dovecot
+               dodoc doc/*.txt
+               docinto example-config/conf.d
+               dodoc doc/example-config/conf.d/*.conf
+               insinto /etc/dovecot/conf.d
+               doins doc/example-config/conf.d/90-sieve.conf
+               use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+               docinto sieve/rfc
+               dodoc doc/rfc/*.txt
+               docinto sieve/devel
+               dodoc doc/devel/DESIGN
+       fi
+
+}
+
+pkg_preinst() {
+
+       has_version =${CATEGORY}/${PN}-0*
+       dovecot_upgrade_from_0_x=$?
+
+       has_version =${CATEGORY}/${PN}-1*
+       dovecot_upgrade_from_1_x=$?
+
+       if [[ $dovecot_upgrade_from_0_x = 0 ]] ; then
+               einfo
+               elog "There are a lot of changes in configuration files.  Please read"
+               elog "http://wiki.dovecot.org/Upgrading and edit the conf files"
+               elog "in ${ROOT}etc/dovecot"
+               einfo
+       elif [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
+               # might want to automate upgrade from 1.x when 2.0 is out
+               einfo
+               elog "There are a lot of changes in configuration files in dovecot-2.0."
+               #elog "run \"emerge --config =${CATEGORY}/${PF}\" or"
+               elog "Please check the conf files in ${ROOT}etc/dovecot"
+               elog "You can run dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf before"
+               elog "running etc-update or dispatch-conf to get an idea about"
+               elog "what needs to be changed."
+               ewarn "Do not {re}start dovecot without checking your conf files"
+               ewarn "and making the necessary changes."
+               einfo
+       fi
+
+}
+
+pkg_postinst() {
+
+       if use ssl; then
+       # 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
+                       einfo "Creating SSL     certificate"
+                       SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+                       install_cert /etc/ssl/dovecot/server
+               fi
+       fi
+
+       if use mysql || use postgres || use sqlite ; then
+               if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
+               then
+                       einfo
+                       elog "Please edit ${ROOT}etc/dovecot/dovecot-sql.conf.ext"
+                       elog "before starting dovecot"
+               fi
+       fi
+
+       if use ldap ; then
+               if [[ $dovecot_upgrade_from_0_x = 0 || $dovecot_upgrade_from_1_x = 0 ]];
+               then
+                       einfo
+                       elog "Please edit ${ROOT}etc/dovecot/dovecot-ldap.conf.ext"
+                       elog "before starting dovecot"
+               fi
+       fi
+
+}
+
+pkg_config() {
+
+       # return for now
+       return
+
+       if [[ -x "${ROOT}"usr/sbin/dovecot ]] ; then
+               if [[ ! -e "${ROOT}"etc/dovecot/dovecot.conf ]] ;  then
+                       eerror "Hmm, cannot find dovecot.conf.  Please edit"
+                       eerror "conf files by hand"
+                       die
+               else
+                       if [[ $dovecot_upgrade_from_1_x = 0 ]] ; then
+                               cp "${ROOT}"etc/dovecot/dovecot.conf \
+                               "${ROOT}"etc/dovecot/dovecot.conf.old || die "cp failed"
+                               if "$(${ROOT}usr/sbin/dovecot -n -c ${ROOT}etc/dovecot/dovecot.conf)";
+                               then
+                                       einfo
+                                       elog "Old config file is saved as \
+                                       ${ROOT}etc/dovecot/dovecot.conf.old"
+                                       elog "Please review the new conf files before starting dovecot"
+                               fi
+                       else
+                               eerror "Cannot convert old configuration file."
+                               eerror "Please check your conf files in ${ROOT}etc/dovecot"
+                               die
+                       fi
+               fi
+       else
+               eerror "Cannot find dovecot binary.  You might want to check that"
+               eerror "${CATEGORY}/${PN} was installed successfully."
+               die
+       fi
+
+}

diff --git a/net-mail/dovecot/files/dovecot.init-r2 b/net-mail/dovecot/files/dovecot.init-r2
index 549c9ff65f82e98baecb334c844ace94068b8ae2..458f4296e6743ce737e9d57c391609826dede945 100644 (file)
--- a/net-mail/dovecot/files/dovecot.init-r2
+++ b/net-mail/dovecot/files/dovecot.init-r2
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r2,v 1.2 2009/09/10 17:24:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r2,v 1.3 2010/05/19 13:26:56 patrick Exp $
 
-opts="reload"
+opts="${opts} reload"
 
 depend() {
        need localmount net
@@ -23,14 +23,14 @@ checkconfig() {
                eerror "You will need an ${DOVECOT_CONF} first"
                return 1
        fi
-       DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | sed -ne '/^base_dir/{s#^base_dir:[[:space:]]*\(.*[^/]\)/\?$#\1#;p}')
+       if [ -x /usr/sbin/dovecot ]; then
+               DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | grep '^base_dir = ' | sed 's/^base_dir = //')
+       else
+               eerror "dovecot not executable"
+               return 1
+       fi
        DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/var/run/dovecot}
        DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid
-       if [ ! -d "${DOVECOT_BASEDIR}" ]; then
-               ebegin "Creating missing base_dir ${DOVECOT_BASEDIR}"
-               install -d -o root -g root -m 0755 "${DOVECOT_BASEDIR}"
-               eend $?
-       fi
 }
 
 start() {