Changes to '2.3-stable'

[Jeroen van Meeuwen]

New branch '2.3-stable' available with the following commits:
commit 6c7d200da10ad4be2f94ebab04f674b4b2ccb3d8
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Jun 1 01:38:29 2011 +0200

    kolabd: Fix syncML problems due to missing imapd annotation (bugzilla.kolabsys.com #104)

commit 549a2e24e6bd9e43b1cbd6aa7a3fed53d04f1bba
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Feb 22 12:50:10 2011 +0000

    perl-Kolab does not handle nested if/else/endif very well, either causing the template to be terminated at 'moduleload' or to incorrectly include the TLS configuration during bootstrap.
    
    Fixes issue4708, bug #49.

commit 4ddb31a335753dcdfaf7e05ae4512b31c0bd4f30
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Dec 20 10:24:14 2010 +0100

    kolabd: do not load php5_module twice, it is already loaded through apache-php.conf now that kolab/issue2366 is fixed

commit c44eeabe545d23ac04773f733d8a674cb0f9df13
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Dec 13 00:40:48 2010 +0100

    kolab/issue2366 kolab/issue2366 (kolab break the openpkg apache.d/*.conf configuration scheme) - more fixes to follow

commit fa9be87a22170a7d4e3dd3af7e2fe24b33ad91ab
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Dec 13 00:04:43 2010 +0100

    Add mail function to php.ini.template (needed for kolab-z-push)

commit f661ecc2cdcfdb03d00ce9f88aa2572b858acdd2
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Dec 7 17:23:53 2010 +0100

    Make permissions of apache.conf more restrictive

commit e28dd68b353256039ab26151c1ce9f30f6452db3
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Oct 19 12:00:37 2010 +0200

           kolab/issue2869 (Can login to imapd with localpart of primary email address)
    
            Reopens kolab/issue1126 (ldap_simple_bind() failed and Domain/Realm not available)

commit b976b97b38564a95e6871e036bfb88c645595360
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Oct 12 00:34:27 2010 +0200

    Remove needless alias 'icons'

commit 7d13151d1a756937546e906630a5fb3c7aed0b11
Merge: 38c38c28d9e962f66bef5d8bc576e7488c3d0e06 83cb4e47210c122cbae0ea27839bccb0c3789a93
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:58:04 2010 +0200

    remerge refactor-kolabd (including recorded renames)

commit 83cb4e47210c122cbae0ea27839bccb0c3789a93
Merge: caaef267ba664696c729db53fee2b9d209638fe8 035b6ca3011aa11fe857cf9009f5c065692349e6
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:56:23 2010 +0200

    merge refactor-kolabd (including recorded renames) with old branch

commit caaef267ba664696c729db53fee2b9d209638fe8
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:49:33 2010 +0200

    replay 58b090a6a973 with renames recorded

commit 4d62214af8073925638bcfbaccf54ef678be2c9a
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:48:46 2010 +0200

    replay c45d6c8fa116 with renames recorded

commit c35b07e287d144b668d1472130a66a9628a39aef
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:47:28 2010 +0200

    replay af1d8f0d4d4b with renames recorded

commit 6bcd48724f14354ff355541613c467da042f5cf3
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:42:09 2010 +0200

    replay c59df6afb4c9 with renames recorded

commit 38c38c28d9e962f66bef5d8bc576e7488c3d0e06
Merge: 678c7ddf8ab506b192a3bc69eb76cb86aa8c722a c68ce9513b8b5b07338f79c17563df06bf3f8146
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 10:54:30 2010 +0200

    merge heads

commit 678c7ddf8ab506b192a3bc69eb76cb86aa8c722a
Merge: af261b276cbc0bad1fac07fa33770aad5ed89939 58b8fd880c03bf6a2e10306af2a146e67110fd10
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 10:52:49 2010 +0200

    Dummy merge: Mark 2.2-stable as merged into default up to point of migration
    
    Development in the Mercurial repository started after b291c29ca994 (for
    default) and 82733a4020a0 (for 2.2-stable). There are still some changesets
    in the 2.2-stable branch that need to be ported to default, this can be
    determined by comparing release-notes.txt.

commit c68ce9513b8b5b07338f79c17563df06bf3f8146
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Oct 9 21:26:48 2010 +0200

    Correct tls_ca_file path

commit 6dc4282d713959bac22195b57e9c2a762a9aae5a
Merge: c163cac78554baa27bc0a9209332ceb4f23c97c4 035b6ca3011aa11fe857cf9009f5c065692349e6
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Sep 23 20:26:45 2010 +0200

    Merged refactor-kolabd.

commit c163cac78554baa27bc0a9209332ceb4f23c97c4
Merge: c05e231f1b48138ba84290811a3bc0a8ed8ba783 862dd378ae5b696b03117351f6791afd197901d2
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Sep 23 20:26:26 2010 +0200

    Merged refactor-kolab-webadmin.

commit 035b6ca3011aa11fe857cf9009f5c065692349e6
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Sep 21 08:01:09 2010 +0200

    Cleaned all templates of the dist_conf approach.

commit d8cfb63eda23f3893f9230ce2c7f375c5c89bde4
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Sep 21 06:32:11 2010 +0200

    Remove dist_conf from the postfix and cyrus templates.

commit 5dc97f6bbaf18a75273c7f66e0ad6792eabe072c
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Sep 21 05:48:08 2010 +0200

    Remove dist_conf from the clamav and the simple postfix templates.

commit 5dae11720767c5955683c03b430e89c0b9b20315
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Wed Sep 15 16:30:14 2010 +0200

    Start the process of removing the dist_conf approach from the templates.

commit c05e231f1b48138ba84290811a3bc0a8ed8ba783
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Sep 14 16:14:07 2010 +0200

    Merge with remote fix.

commit ae0e972db2f9387e9b81372e5b3aa32955b8c8a6
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 16:32:28 2010 +0200

    Removed the last of the dist_conf calls.
    
    page.tpl and the version information get displayed configuration based now.

commit 9d14cf4766d12d06247d8c2850c03dd1a2f2890e
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 15:02:42 2010 +0200

    Remove dist_conf from page.tpl and logout.php.

commit 687c5ad6d8f9a117e98a72073b825413ed7892e8
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 14:30:56 2010 +0200

    Avoid the use of two include directories.
    
    This is the major change in order to get rid of the dist_conf approach for the web admin:
    This moves all includes into the KolabAdmin/include directory. The top directory
    KolabAdmin needs to be in the include path. Should be a sane setup for all distributions.

commit eec7665396ad2455ba8b9f2a1e939933510cfafc
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 12:01:47 2010 +0200

    Move the smarty handling into the config file. Having a configuration based inclusion path is still bad but smarty still seems to have different install paths on the different distributions.

commit d9c6d0511ff49f28665c55a42513288fee77ccca
Merge: 467cb6d6d9098e0b06ec8e2ede553e536d27e60b 862dd378ae5b696b03117351f6791afd197901d2
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 11:34:38 2010 +0200

    Merged branch 'default'

commit 862dd378ae5b696b03117351f6791afd197901d2
Merge: af261b276cbc0bad1fac07fa33770aad5ed89939 7b630d30c46ce3ac6e1edf38f75830dbb29608ce
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 10:55:04 2010 +0200

    Merge

commit 467cb6d6d9098e0b06ec8e2ede553e536d27e60b
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 10:22:28 2010 +0200

    Started the process of removing the dist_conf based build process from kolab-webadmin. Two includes (auth.class.php and ldap.class.php) modified to use the configuration file.

commit 7b630d30c46ce3ac6e1edf38f75830dbb29608ce
Author: math.parent at gmail.com <math.parent at gmail.com>
Date:   Thu Sep 9 23:15:10 2010 +0200

    perl-kolab: correct kolabconf manpage

commit af261b276cbc0bad1fac07fa33770aad5ed89939
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Aug 23 16:10:06 2010 +0200

    kolab/issue4512 (Allow to hide the admin mail settings in the web admin)

commit 44cc2ba690078b831226222dae9ae151c1356ca6
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Wed Jul 21 19:44:38 2010 +0200

    kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs.

commit ee92bd945f6c1228efc289ae7e0456c4ad2f4ea0
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sun Jul 18 21:51:33 2010 +0200

    Remove useless comment as pointed out by Mathieu

commit 74b3093613f9a4bd69b5f07e018447d527d03021
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sat Jul 17 15:59:27 2010 +0200

    kolab/issue3245 (Remove horde.schema and rfc2739.schema from kolab-server/slapd.conf.template)

commit 8ec42e51f4957136cb76f6d05a1a7802d6a4b76d
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Fri Jul 16 22:49:20 2010 +0200

    This is available from the Kolab_FreeBusy package.

commit c346cc11b185da30eebe7e1df5e09207ce8725cf
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Fri Jul 16 00:01:26 2010 +0200

    Reduced amount of logging in the Kolab_Filter package.

commit 3f71c83b1767f7ef23ead27b4884ce0080b25b84
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Jun 28 10:43:29 2010 +0200

    Add a configuration variable with the webclient data root path.

commit 48a5170dbdf789d14aa49e8ca7ab95a129f34435
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sun Jun 27 09:04:40 2010 +0200

    Support a hooks directory that allows to extend the deletion of users.
    kolab/issue3472 (web client user prefs not deleted when user gets deleted)
    kolab/issue3470 (Free/Busy cache not deleted when user gets deleted)

commit 5be5c174036914427fb97675b875903d833182bf
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Jun 17 20:48:58 2010 +0200

    Cyrus user and group is cyrus:mail on Debian
    
    (http://bugs.debian.org/581757).

commit facefcc5acc94c03c3d22a01ef18d7bf0d1ea3f1
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Wed Jun 9 22:07:02 2010 +0200

    Add a small header indicating that this file should not be modified.

commit 436b3afd9a427d458a7ab98f73d597b85c9a9e46
Author: Richard Bos <richard at radoeka.nl>
Date:   Sun May 16 21:18:05 2010 +0200

    Added redhar services

commit 9c0d3944a37c97ba807cdeca8759cb210194837f
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sun May 16 11:08:31 2010 +0200

            Adapt port policy.
            kolab/issue4311 (Activate port 587 for email submission)

commit f5ea3d5c9baa19b6d82605b2e158ba39285ced7d
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sun May 16 08:58:53 2010 +0200

    freebusy.conf.template.in moved to the Kolab_FreeBusy package.

commit 2c3ca22fd5d29d6bbb3ce3f97a7cf3cf16fe75c7
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sun May 16 08:41:01 2010 +0200

    Prepare moving the template into the corresponding package (the dist_conf rewriting is not necessary anymore).

commit 689fbee0d205408064b31e8fad2db34548d3a4ea
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue May 4 16:10:42 2010 +0200

    Added annotation for activesync configuration (z-push)

commit 2521684315d848cdfa15e34a8ab04d31a25da532
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue Apr 27 13:04:37 2010 +0200

    kolab/issue4311 (Activate port 587 for email submission)

commit 72f4430e64dafe814d9de8cd09a47c7d236a77c9
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Thu Apr 22 15:25:20 2010 +0200

    additional fixes for kolab/issue2244 (SpamAssassin uses DNS blacklists)

commit 16302771d9c3bff779b9df2cb45b85754fd141ea
Author: Richard Bos <richard at radoeka.nl>
Date:   Tue Apr 20 20:16:52 2010 +0200

    Corrected the location of imap_sievedir

commit 604c8afdecbd21e75268b2f0a8755c327e4adcd8
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Apr 15 16:45:38 2010 +0200

    kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

commit 0708845988da7f780f7f9b7c7a4958f1a445de8a
Author: Richard Bos <richard at radoeka.nl>
Date:   Tue Apr 13 21:41:23 2010 +0200

    Removed perllib defination, it's not longer needed.

commit 389af46533fddb925c85bd9f41ce02c2a79ee119
Author: Richard Bos <richard at radoeka.nl>
Date:   Mon Apr 12 21:04:47 2010 +0200

    Updated on Request of Thomas S.

commit 470aae9954d5f0b763481b706233d8f95e979d4d
Author: Karl-Heinz Ruskowski <khruskowski at intevation.de>
Date:   Wed Mar 31 16:27:54 2010 +0200

    Removed required_score from local.cf template. kolab/issue2571

commit 197a02dcb3bf25649a1ca21a9f368e86ba063078
Author: Richard Bos <richard at radoeka.nl>
Date:   Sun Mar 28 17:51:25 2010 +0200

    On Request of Thomas Sp.: committing his currently almost working
    dist_conf file

commit c93664e0feed6e86c1a6161fb241fc5d28c49575
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Feb 22 09:10:48 2010 +0100

    MFB: Disable FH_DATE_PAST_20XX spamassassin test, which is broken
            for 2010 and later...

commit 824e69b7a29252f0af18605808dafa61f3e9afbf
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Feb 22 08:12:46 2010 +0100

    Alias for the anonymous iCal export (merged from suc_branch).

commit 7682d1a5b09c17777888e461ae4a8089b28cd0f8
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Feb 22 07:36:39 2010 +0100

            * templates/freebusy.conf.template.in: Added ability to map
            arbitrary ldap attributes to those expected by kolab.
            (Merged from suc branch)
    
            * templates/resmgr.conf.template.in: Added ability to map
            arbitrary ldap attributes to those expected by kolab.
            (Merged from suc branch)

commit bb251be985729d40d291f50893bb817a9415d76e
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Feb 16 09:35:48 2010 +0100

    Removed deprecated php.ini settings.

commit bd8827de0caabad80fea0df3ad00a582ac0b720d
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Feb 16 06:33:42 2010 +0100

    Move the perl-kolab sources into their own subdirectory.

commit 0d40793d40799a17b3976a2abe1693ccd8353114
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Feb 11 21:30:18 2010 +0100

    Correct passwd_confdir variable for debian

commit d022c6aefc75f1fe569977e26f9654e7e87669a9
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Feb 9 10:42:21 2010 +0100

    Added passwd_confdir variable which indicates the path of the configuration directory for the Horde passwd application. This corrects the previous path correction as the configuration files need to end up in client/passwd/config.

commit 32609687db9f5cfbbdf9038991f01a6a0ee589aa
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Jan 21 20:58:34 2010 +0100

    Make sure we don't end up with thousands of deprecated notices in the PHP log. Our apps are not yet ready for that.

commit 8c6c884e13506d9a0f924dd16c677c92915088e7
Author: Richard Bos <richard at radoeka.nl>
Date:   Sun Jan 17 11:20:19 2010 +0100

    Changed @@@ldapserver_modulepath@@@ to @ldapserver_modulepath@ as this
    variable is populated during the  build and not by kolabconf.

commit ce84b3007c48ef9d8b63774cc5991ee66f3f30b6
Author: Richard Bos <richard at radoeka.nl>
Date:   Sat Jan 16 20:33:43 2010 +0100

    Added mandriva to the system definitions, patch by  Thomas Spuhler

commit 1ffbfe16eb85fd0a1458727925652e293c857100
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Jan 11 14:13:05 2010 +0100

    MFB: kolab/issue973  (Rewritten from shown inconveniently in kontact)

commit 147cf4a28bdedd8943c25676b92f5dae19c70fa7
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Jan 11 11:29:22 2010 +0100

    MFB: Support configurable attribute mapping.

commit c04b35c1a3a3ae7414f7531bc6c6700cdc64adec
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sat Jan 9 00:38:58 2010 +0100

    Added a dirty hack that adds a fixed timezone setting in php.ini. This needs somewhat more elaborate fixing as it is probably required to put the choice of the timezone into the bootstrapping.

commit 20f0cb3b71f3fad25e4f9a5e74aefc7d2214b407
Author: Sascha Wilde <wilde at intevation.de>
Date:   Thu Dec 17 12:17:37 2009 +0100

    Changed default format for imapd databses back to skiplist. (kolab/issue840)

commit 2b3bd8afcc0d43036b4b9d0ccd2613ecd672c65c
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 13 19:04:37 2009 +0100

    kolab/issue1671 (Improving the warning about kolab templates within
                     configuration files)

commit ddba461968fe691734193eefc808aa8a32e2670f
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 13 16:19:23 2009 +0100

    perl-kolab:
        new @@@print@@@ macro available for: getLDAPReplicas(), getLDAPAccess(),
        getCyrusGroups(), getPostfixMap(map). This removed the use of
       %special_templates, %haschanged, Kolab::Conf::reload().
    
    kolabd:
    
        kolab/issue1740 (fully generate slapd.access, slapd.replicas, transport,
                        virtual and imapd.groups by templates) using the new
                        @@@print@@@ macro (perl-kolab) and RUNONCHANGE.

commit 0b3fec6b9fa29f4142dec064d605d2adccd0bbed
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Dec 2 19:10:31 2009 +0100

    dist_conf'iguration for safe_mode_include_dir. End with slash as recommended
    in http://php.net/ini.sect.safe-mode

commit 183d49b7cb82ba367793bcad392171665c738dfc
Author: Sascha Wilde <wilde at intevation.de>
Date:   Fri Nov 27 18:43:31 2009 +0100

    kolab/issue3895 (Openldap: loglevel should be set to none in slapd.conf)

commit 06408b8ee59965ffc1e9750473f92c57c952bd7b
Author: Sascha Wilde <wilde at intevation.de>
Date:   Thu Nov 26 16:01:18 2009 +0100

    Disallow NUL in mails. kolab/issue3594

commit 6492fbc683cd667ea3a9a2a11df57adb7bf81d3f
Author: Richard Bos <richard at radoeka.nl>
Date:   Tue Nov 24 21:34:33 2009 +0100

    Modify the hardcoded location /kolab/etc/spamassassin/local.cf to one that is
    updated by the build process.  kolab/issue3953: use spamassassin_confdir in
    local.cf.template comment

commit f4538f14262e041e16d5dcb74fc55c759790cf92
Author: Richard Bos <richard at radoeka.nl>
Date:   Mon Nov 23 23:47:08 2009 +0100

    - re-arrange the execution order of the services
    - make it possible to skip the services freshclam and clamd used on
      Debian

commit 0a08a8ba04c8554e42c407b5a9d7af395fabc9df
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Nov 23 23:42:15 2009 +0100

    MFB:         kolab/issue919 (kolab server has problems with some characters in
            passwords)
    
            kolab/issue1880 (Poor handling of apostrophes in ldap and admin
            webpages)
    
            kolab/issue3654 (Special character issue in Kolab web
            interface (e.g. vacation message))
    
            kolab/issue3499 (creating/modifying users with special characters
            in name confuses web admin)

commit 1fe5923a755af253f7e7b7ba5785cd0e44cbe414
Author: Richard Bos <richard at radoeka.nl>
Date:   Mon Nov 23 22:55:21 2009 +0100

    - remove spamd as service, for more info refer to
      https://issues.kolab.org/issue3953
    - services can be listed in execution and alphabetical order
    - changed the method to determine a distribution

commit bcb3d2e54418843b42b47cece3d186858fd18266
Author: Richard Bos <richard at radoeka.nl>
Date:   Sat Nov 21 10:50:07 2009 +0100

    Renamed the argument list to status, and made the output alphanumeric.
    
    The argument list now displays the list of related kolab processes.

commit 5c77c6f675d597c1e2d9ba5656a4f899b01a2146
Author: Richard Bos <richard at radoeka.nl>
Date:   Tue Nov 10 23:14:06 2009 +0100

    add resmgr_localedir, for kolab/issue2499

commit bd07a91585c08140f3b3d9ddf2c76cd77253ea18
Author: Richard Bos <richard at radoeka.nl>
Date:   Sun Nov 8 14:55:24 2009 +0100

    added list option, to show the involved distribution related service,
    and whether they are active or no.

commit b02045665efbdf7f602472d91d2c35a14b540471
Author: Richard Bos <richard at radoeka.nl>
Date:   Mon Oct 12 17:43:51 2009 +0200

    replace a bracket by a curly bracket

commit 9ebea40bf063db85fae817c85b36afa509fadf0a
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Aug 27 23:13:18 2009 +0200

    kolab/issue3765 (dist_conf'iguration for openldap module loading)

commit 6837302deff0723014788771a4f38ad039b7a78a
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Jul 18 00:19:04 2009 +0200

    templates/DB_CONFIG.slapd.template.in:
     change ownership from kolab to openldap

commit 3ff92040ea7b4df648c8c4781de0aabcf34a3727
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Wed Jul 8 12:26:41 2009 +0200

    Configuration for openldap 2.4.* -> switch to syncrepl.

commit c41655378e018d04c0cb7ce5dab037e1d847e3fb
Author: Martin Konold <martin.konold at erfrakon.de>
Date:   Mon Jun 15 23:16:46 2009 +0200

    Martin Konold: avoid match for non kolabInetOrgPerson objects

commit b77220c212ddc35eace60095d105f911a80d53b7
Author: Richard Bos <richard at radoeka.nl>
Date:   Fri Jun 5 14:54:02 2009 +0200

    Include pid in kolabfilter log file. See kolab/issue3661

commit fa59df4141a993d2a3278243a0b4b48075f4a1f8
Author: Richard Bos <richard at radoeka.nl>
Date:   Wed May 27 21:35:58 2009 +0200

    Changed the user from kolab to wwwrun, adapted some log file location,
    due to the change mentioned before.

commit 3b7bac888da7709862f8a063f089aaabb04cd6bb
Author: Richard Bos <richard at radoeka.nl>
Date:   Fri May 22 21:10:28 2009 +0200

    Change relative redirect from /horde to /client into a
    full path redirect (https://@@@fqdnhostname@@@/client).
    See, kolab/issue3602

commit 1a425bf3ec9749da11229e63cdacdb6b2dac3781
Author: Richard Bos <richard at radoeka.nl>
Date:   Fri May 22 10:42:10 2009 +0200

    add variable resmgr_tmpdir, but leave it undefined

commit 1808139439bc79980504726bf0d223c31dc0dde4
Author: Richard Bos <richard at radoeka.nl>
Date:   Thu May 21 10:51:33 2009 +0200

    added resmgr_locksdir

commit 47e76b6c888591947cfea4e5779d84c88f818f88
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Thu May 14 12:58:33 2009 +0200

    Fix kolab/issue3549 (append_dot_mydomain allows circumventing kolabfilter-verify-from-header)

commit e04e13c77a8ee936741838def14bd62cd31c93aa
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Wed May 13 13:11:51 2009 +0200

    Updated kolabd templates for clamav-0.95.1-20090409
    
    kolab/issue3513 (Clamav - new upstream version 0.95.1)

commit 92cc1ffe2966a59c5375ae3ef4cbeac6fcd0053d
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Thu May 7 18:13:33 2009 +0200

    Use RUNONCHANGE mechanism to restart or reload imapd:
    
    cyrus.conf.template: openpkg rc imapd reload (see man cyrmaster)
    imapd.conf.template: openpkg rc imapd restart (reload and reconnect was not
     enough when I tested changing unixhierarchysep and annotation_definitions)
    imapd.annotation_definitions.template: openpkg rc imapd restart (reload and
     reconnect was not enough)
    imapd.group.template: nothing (a simple reconnect was enough, this is the old
     behaviour and changing this to restart to force new permissions would be
     overkill since then all users would be disconnected)

commit bce93bafa8ad8894b76b085e52860819cd1a7c85
Author: Richard Bos <richard at radoeka.nl>
Date:   Sun May 3 23:31:36 2009 +0200

    remove resmgr_filterdir as it is not used anymore (2007/11/22), see update 1.41 for the file dist_conf/common

commit d6771553612b3a3ccc444ada767fd2e8024b9db3
Author: Richard Bos <richard at radoeka.nl>
Date:   Sun May 3 21:40:14 2009 +0200

    Change @LDAPD@ to just openldap, kolab/issue3604

commit 372b0302b364022eba17eefc02d3e9e7e3b447f7
Author: Richard Bos <richard at radoeka.nl>
Date:   Thu Apr 30 21:22:04 2009 +0200

    Prepare kolabd for additional webclient configuration templates.

commit 330539e0320ffaaabfb1f4d668d96293d8068f70
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Apr 26 10:57:01 2009 +0200

    dist_conf/debian: Prepare kolabd for additional webclient
    configuration templates.

commit 486467d1a775581bcef9c3fe0040992cb58b7fb2
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Fri Apr 24 07:01:23 2009 +0200

    Merge from branch
    (Prepare kolabd for  kolab/issue3420 (web client prefs and hooks should be configurable via templates)
    
    cvs diff -u -d -r1.234 -r1.234.2.1 ChangeLog | patch ChangeLog
    cvs diff -u -d -r1.22 -r1.22.2.1 kolab.globals.in | patch kolab.globals.in
    cvs diff -u -d -r1.53 -r1.53.2.1 dist_conf/common | patch dist_conf/common
    cvs diff -u -d -r1.70 -r1.70.2.1 dist_conf/kolab | patch dist_conf/kolab)

commit 5b3dd54008faf62a9ef8cdf4d741907bc6071224
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Apr 20 18:25:47 2009 +0200

    slapd.conf.template.in: Make kolabAllowSMTPRecipient readable for the nobody user,
    needed for kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)
    
    (ported from kolab_2_2_branch)

commit 3a86e3450fc43954ea55c092ad4f79f392542ccd
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue Apr 7 15:31:16 2009 +0200

    kolabd: Disable quarantine of mails with bad headers in amavisd template
    since they are passed through by default.

commit 23c0de117ce6fb0c62e740dbea09da4a0b156b7f
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Fri Mar 27 13:09:27 2009 +0100

    Fix kolab/issue3096 (Address book aliases shouldn't redirect outgoing mails)

commit 89c915ab17d4d27b7c82c76002d42ddc2ab57d25
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Thu Mar 26 17:17:15 2009 +0100

    Update to clamav-0.95-20090323 (including templates)
    
    The templates are not required, but include commented settings for
    enabling new features.

commit 5789094193372c48db15e5bc8cd6110f8b43ba53
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Mar 17 23:16:48 2009 +0100

    dist_conf/kolabsrv.in: add debian flavour

commit be6ef76623778c85c85a062152ac1295d6cd10ba
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Mar 17 23:11:41 2009 +0100

    Added LDAPD to dist_conf/debian

commit da6c575583b4297e0ac3bff1250493ffccae4b7d
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue Mar 17 17:46:31 2009 +0100

    Use RUNONCHANGE mechanism for postfix reload and postmap.
    
    Adding entries to virtual.template and transport.template from LDAP ist the
    remaining postfix handling in kolabconf.
    
    header_checks.template, ldapdistlist.cf.template and ldapvirtual.cf.template.in
    need no RUNONCHANGE, because
    - regexp or ldap tables do not need postmap
    - they are used by the short-living cleanup, no postfix reload needed

commit 40ac02617097436c6968b52ef69661308e55d748
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue Mar 17 14:15:16 2009 +0100

    Use RUNONCHANGE mechanism to restart or reload apache, amavisd and clamav.
    
    This finishes the transition of all easy targets to RUNONCHANGE as mentioned in
    kolab/issue1679 ([kolabconf] Update template META mechanism to support service
    restarts)

commit 7c9bd6a38bc377a3c904d079f8738fdfd319a09d
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Mar 17 13:31:29 2009 +0100

    dist_conf/debian: sync with dist_conf/kolab (resmgr_locksdir and
    resmgr_localedir)

commit d09a05f259679352b46f8d621923989d1074fb36
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue Mar 17 12:20:57 2009 +0100

    Use RUNONCHANGE mechanism to restart sasl after config changes.
    
    For this special handling of saslauthd in perl-kolab had to be removed,
    which was broken anyway.

commit bda89df7222f1348f3d00e3b148264bf7362249c
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Mar 16 18:17:35 2009 +0100

    Select random imap partition when creating new user mailboxes.
    
    The behavior can be modified by setting a different imappartitions_script in
    kolab.conf or disabled by setting imappartitions_script to an empty value.

commit 11861f38eeb93ef98e5f9cacd02ab3bc5694ad27
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Mar 7 17:20:37 2009 +0100

    * dist_conf/debian: corrected a syntax error in dist_conf/debian
    * dist_conf/common: allow commas in dist_conf

commit dfc26b8b1c42988dd952b4f811b27b21dd7cdc65
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Fri Mar 6 09:40:56 2009 +0100

    Prepare kolabd for kolab/issue1382 (resmgr accepts concurrent overlapping invitations) and kolab/issue2499 (Notification messages by the resource manager sould be localized)