Changes to '2.3-stable'

[Jeroen van Meeuwen]

New branch '2.3-stable' available with the following commits:
commit 6d34adb5141d41e08025c9a8e25d65a9b8375a2b
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Dec 13 02:08:05 2010 +0100

    Bump version numbers to 2.3

commit 554527b8cdd664040009477802eabf906ea20454
Merge: 78495725a49e5669e4959239bc9a222e8dcc4a69 36f8ad7d46c67c66676d138c1ae6a516206e4a8f
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 11:58:04 2010 +0200

    remerge refactor-kolabd (including recorded renames)

commit 36f8ad7d46c67c66676d138c1ae6a516206e4a8f
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 78495725a49e5669e4959239bc9a222e8dcc4a69
Merge: b349b6f289f2ae2c13ef5ca123dd58e7e1f276bc bf485919e17ab119c597450da739d87242abf95e
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Oct 11 10:54:30 2010 +0200

    merge heads

commit b349b6f289f2ae2c13ef5ca123dd58e7e1f276bc
Merge: c013d9d6c09e7b3c6ac879958988c8c4689a6794 017390d672fa8ecc7fee72d873920cf0c23860ed
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 bf485919e17ab119c597450da739d87242abf95e
Merge: e54a024e6197032c132a2f17ea9dcd5ed7c5be66 ebf40d61e1f6adb9b6af3e50fd1149c85e63fc41
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Sep 23 20:26:45 2010 +0200

    Merged refactor-kolabd.

commit e54a024e6197032c132a2f17ea9dcd5ed7c5be66
Merge: ebf40d61e1f6adb9b6af3e50fd1149c85e63fc41 0ae2c41c13cda794138834f16bee84c731292d92
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Sep 23 20:26:26 2010 +0200

    Merged refactor-kolab-webadmin.

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

    Merge with remote fix.

commit 8411e5d0590ca5fd5fd51a3acb09842920372b05
Merge: c013d9d6c09e7b3c6ac879958988c8c4689a6794 0ae2c41c13cda794138834f16bee84c731292d92
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 11:34:38 2010 +0200

    Merged branch 'default'

commit 0ae2c41c13cda794138834f16bee84c731292d92
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Sep 13 10:55:04 2010 +0200

    Merge

commit c013d9d6c09e7b3c6ac879958988c8c4689a6794
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sat Jul 17 15:43:09 2010 +0200

            kolab/issue977  (Kolab suppresses ldap error messages)
            kolab/issue978  (incorrect ->abandon; call)

commit 65b98aa89c9c7b55d4178f07341be1f07b3d04f9
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Jun 28 11:04:25 2010 +0200

    Bump perl-kolab version.

commit 31f88b2f82f6ef7edd06092591976f19a765c9e0
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Jun 28 10:54:22 2010 +0200

    Remove the hack for kolab/issue3472 (web client user prefs not deleted when user gets deleted)

commit f86ad0481ba3147e55bb1e7d0b13a3b60d1302ee
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sun Jun 27 08:53:57 2010 +0200

    Fix hook execution, update release notes.

commit 08aea6f0137411e9ef84a7e4d18f8e2094076c56
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Sun Jun 27 08:17:18 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 eaa499070691f5c5037f9a2004a6af83c195a740
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 facc3143d1c920e1935c6a79ad090a1c59508c6a
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Mar 30 11:26:44 2010 +0200

    kolab/issue4275 (LDAP.pm quota error)

commit 5acf7990487c4641081c17149b4c89980c0b4b82
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Mar 30 08:41:50 2010 +0200

    Do not interpret every folder as calendar. kolab/issue4237 (additional event.default folder created by kolabd (rt#6038))

commit a3e6cedc9867833cd2ca6bfb4e75a14b5879447f
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Mar 23 19:02:11 2010 +0100

    kolab/issue4237 (additional event.default folder created by kolabd (rt#6038))

commit d6c7a513dde893bba0b5057c29ce58c5218960aa
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Mar 11 13:23:12 2010 +0100

    Also fix kolabpasswd.
    
    kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558))

commit af807cb58a7e70b55d3db26487f1d72e8829123d
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Fri Mar 5 00:37:27 2010 +0100

    kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558))

commit 8be8f2ec46773abf9c28ab7653bdf94a501b3d68
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 65e3577316a7ea4819d5730d4bfe6ecb79a90efe
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Feb 11 21:06:10 2010 +0100

    solve kolab/issue4024 (Lots of tmp files in kolab's configuration
    directory), introduced 2009-12-13.

commit 7050420b847f00e31d841ad235c6d670a7a10275
Author: Richard Bos <richard at radoeka.nl>
Date:   Sun Jan 17 11:26:40 2010 +0100

    Formatting lines like the rest of file

commit 4ced2406d803db915697cd93f7af69e31f299dfd
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Jan 5 19:37:38 2010 +0100

    MFB: kolab/issue1340 (RFC: restrict users to sending mail only to internal recipients)

commit 80ca23645c43540445606d5042c6411b24bb9120
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Jan 5 19:26:39 2010 +0100

    MFB: kolab/issue1448 (Users might add an account on the nonHome Server and write emails in there.)

commit 1bb2d31911e2c2a51a1511542f66bea57ced2efe
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Tue Jan 5 18:46:00 2010 +0100

    MFB: kolab/issue919  (kolab server has problems with some characters in passwords). While the patches actually did not solve the problem they also did not make it worse. They simply inverted the problem and you get double encoded UTF-8 characters in passwords now when using UTF-8 only. So this was merged from the kolab_2_2_branch to have the same state in both branches.

commit 56e09d65e314eee4185b591a5ec7cdb7d416c8b6
Author: Richard Bos <richard at radoeka.nl>
Date:   Fri Jan 1 22:53:25 2010 +0100

    solve kolab/issue4009: kolab_bootstrap contains dangerous code, could remove
    wrong files

commit f4e6c3f25e809e8ab58f978a12e1806c97f3e24f
Author: Richard Bos <richard at radoeka.nl>
Date:   Wed Dec 30 20:22:20 2009 +0100

    Assign the variable lab::config{"is_master"} to prevent warnings
    during the execution of kolabconf.  Verify if files that are to
    be moved or chown'ed exist.  If not skip the operation.

commit 114987ba0f53eb97cbba045a3ff2c4230a28c63b
Author: Richard Bos <richard at radoeka.nl>
Date:   Mon Dec 28 22:14:22 2009 +0100

    removed the suffix ".in" in the call to Kolab::Conf::rebuildTemplates

commit 67b47e2428fbe7afc214e225a72f88fbd7753dcd
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Wed Dec 16 17:08:55 2009 +0100

    Adjusted comment in change for kolab/issue3940

commit dc7cbfc9bb9702cedfd5be2e895e52707dab3c35
Author: Sascha Wilde <wilde at intevation.de>
Date:   Wed Dec 16 16:42:11 2009 +0100

    kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

commit 9be5a0899889d4cb76876c29b9748dd384b54f30
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 13 20:48:26 2009 +0100

        Added arguments to rebuildTemplates(): dorunonchange and templates.
        Use those in kolab_bootstrap (in replacement of bootstrapConfig()).

commit c2a016601ca62d9ed13e7aa96ae93aa378b17d95
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 13 19:27:08 2009 +0100

    Correct indentation: tab -> 4 spaces

commit 59825e388ee4799b86c4519b71e092fb8a1a43b3
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 13 18:54:23 2009 +0100

        Touch configuration only when there is a change. This avoid postfix
        complaining about "database X.db is older than source file X".

commit 3c07ee6a746b3b094008edaa5774a19950c143ad
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 13 17:05:38 2009 +0100

    $Kolab::do_reload is now an argument to Kolab::Conf::rebuildTemplates().

commit 82b88f3b213aa5cb26760aa538a2b1df2010ac34
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 e4ccdc80f078f713070d0c7f6326fba9a82cfd91
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Dec 10 18:43:37 2009 +0100

    Reindent and remove old comments

commit cbc8f5541635438aec8dfcf06add6996397cabde
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Fri Dec 4 12:09:38 2009 +0100

    kolab/issue3952 (Version in kolabconf is not replaced in the build process)

commit e9972cf6c8c5ae046aed51c98e450f18f3cc6216
Author: Richard Bos <richard at radoeka.nl>
Date:   Tue Nov 24 19:44:58 2009 +0100

    Renamed variable do_reload to $Kolab::do_reload, to make it a global variable.
    This is needed to solve kolab/issue3951: kolabconf -n (noreload) restarts
    services if RUNONCHANGE is used

commit c632bea10e378a1f7177998198b0f7e7c293abbe
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Mon Nov 23 23:47:05 2009 +0100

    MFB:         kolab/issue919 (kolab server has problems with some characters in
            passwords)

commit f5ddb51331f387cdf1b0e8141ee8a9c5d7c07bce
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Fri Jul 17 16:52:24 2009 +0200

    kolab_bootstrap: Read bind_pw_hash from Kolab master server,
    fixes kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves,
    causes OpenLDAP restarts)
    (and some version bumps)

commit ae459b87406fb4d4d232d8beb286719afc2a00c6
Author: Richard Bos <richard at radoeka.nl>
Date:   Thu May 7 20:42:37 2009 +0200

    Change $Kolab::config{'LDAPD'} to just openldap, see kolab/issue3604
    kolabsrv (kolabd dist_conf/kolabsrv.in) will take care for the
    conversion, from an openpkg service name to the correct service name
    for other distributions

commit 979691e26b95b3d110cd6cb94f8226c09dd7169f
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 226d4c184916533fa4fa512d804e79046f170fc3
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue May 5 15:05:49 2009 +0200

    Execute duplicate RUNONCHANGE commands only once.
    
    Part of kolab/issue1679 ([kolabconf] Update template META mechanism to
    support service restarts)

commit 6a2717cbfb6d3d8cd7d865afd4a6d5c2df963cfd
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Apr 16 10:56:26 2009 +0200

    Update ChangeLog

commit c2e52f7d9ade935c84405249fe1d6ec801a2c914
Author: Gunnar Wrobel <wrobel at pardus.de>
Date:   Thu Apr 16 10:55:18 2009 +0200

    MFB: kolab/issue3472 (web client user prefs not deleted when user gets deleted)
    cvs diff -u -d -r1.11.2.1 -r1.11.2.2 perl-kolab/lib/Kolab/LDAP.pm
    cvs diff -u -d -r1.398.2.10 -r1.398.2.11 release-notes.txt

commit c61273f97f643f07e4f4bd09d5cb91ec0524ef62
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 8c1e8b1c6045d8c0e027b780f35dbfd621aef67c
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Tue Mar 17 15:12:56 2009 +0100

    Expand $map in debug message.

commit 2c80512db5de7f09cc7566bcc64d0d29168a8dc3
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 2611b7678432cd9d11c91b7ddb2284c4db4d78f8
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 c66d20869019008796d729a3cda5946dcf878f80
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Mon Mar 16 18:57:15 2009 +0100

    Creating the Calendar folder caused an KOLAB_ERROR to be logged,
    changed to KOLAB_DEBUG.

commit 0af8aa6851634d07afd6e30083f805fd493a46b4
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.