From cvs at kolab.org Thu Jul 6 20:23:36 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 6 Jul 2006 20:23:36 +0200 (CEST) Subject: bernhard: doc/raw-howtos speaking-imap-for-debugging.txt,1.5,1.6 Message-ID: <20060706182336.93266100161@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv10670 Modified Files: speaking-imap-for-debugging.txt Log Message: Adding more examples: selecting a mailbox, getting and setting flags. Index: speaking-imap-for-debugging.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/speaking-imap-for-debugging.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- speaking-imap-for-debugging.txt 15 Feb 2006 17:47:17 -0000 1.5 +++ speaking-imap-for-debugging.txt 6 Jul 2006 18:23:34 -0000 1.6 @@ -35,18 +35,30 @@ 3. Debugging commands - Do not forget to always prefix them with a or ann where nn is a number. + Do not forget to always prefix them with a or ann where nn is a number, + like in a namespace or a004 namespace + + Some more examples: Listing all mailboxes: a list "" * Listing all Kolab annotations: a getannotation "*" "/vendor/kolab/*" "value" - + + Select a mailbox (redo this if you want to see changes by others): + a SELECT "INBOX/seenflagtest" + + Get the flags of a range of messages: + a FETCH 2:4 (FLAGS) + + Add three flags to message number 3: + a STORE 3 +FLAGS (\Seen \Answered \Flagged) + 4. Close session a logout From cvs at kolab.org Tue Jul 11 15:32:34 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 11 Jul 2006 15:32:34 +0200 (CEST) Subject: bh: server/openldap kolab.patch, 1.5.2.1, 1.5.2.2 Makefile, 1.10.2.2, 1.10.2.3 Message-ID: <20060711133234.0ABEA1005DE@lists.intevation.de> Author: bh Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv2135/openldap Modified Files: Tag: kolab_2_0_branch kolab.patch Makefile Log Message: Update for new OpenPKG OpenLDAP RPM Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/openldap/kolab.patch,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- kolab.patch 19 Jul 2005 21:00:59 -0000 1.5.2.1 +++ kolab.patch 11 Jul 2006 13:32:31 -0000 1.5.2.2 @@ -6,8 +6,8 @@ Group: Database License: GPL Version: 2.2.27 --Release: 2.4.0 -+Release: 2.4.0_kolab +-Release: 2.4.1 ++Release: 2.4.1_kolab # package options %option with_fsl yes Index: Makefile =================================================================== RCS file: /kolabrepository/server/openldap/Makefile,v retrieving revision 1.10.2.2 retrieving revision 1.10.2.3 diff -u -d -r1.10.2.2 -r1.10.2.3 --- Makefile 11 Jan 2006 04:42:40 -0000 1.10.2.2 +++ Makefile 11 Jul 2006 13:32:31 -0000 1.10.2.3 @@ -10,8 +10,8 @@ PACKAGE=openldap VERSION=2.2.27 -RELEASE=2.4.0 -KOLABRELEASE=2.4.0_kolab +RELEASE=2.4.1 +KOLABRELEASE=2.4.1_kolab RPM=/kolab/bin/openpkg rpm KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)` From cvs at kolab.org Tue Jul 11 15:37:08 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 11 Jul 2006 15:37:08 +0200 (CEST) Subject: bh: server obmtool.conf,1.174.2.34,1.174.2.35 Message-ID: <20060711133708.C35301005DE@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2231 Modified Files: Tag: kolab_2_0_branch obmtool.conf Log Message: OpenPKG updates Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.174.2.34 retrieving revision 1.174.2.35 diff -u -d -r1.174.2.34 -r1.174.2.35 --- obmtool.conf 8 Mar 2006 20:33:04 -0000 1.174.2.34 +++ obmtool.conf 11 Jul 2006 13:37:06 -0000 1.174.2.35 @@ -49,7 +49,7 @@ @install ${loc}openpkg-registry-0.2.5-20051129 @install ${loc}make-3.80-2.4.0 - @install ${loc}binutils-2.16.1-2.4.0 + @install ${loc}binutils-2.16.1-2.4.1 @install ${loc}gcc-3.4.4-2.4.0 @install ${loc}fsl-1.6.0-2.4.1 @install ${loc}mm-1.3.1-2.4.0 @@ -86,7 +86,7 @@ @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate @trigger ${loc}procmail-3.22-2.4.0 @install ${loc}db-4.2.52.2-2.2.0 - @trigger ${altloc}openldap-2.2.27-2.4.0_kolab + @install ${altloc}openldap-2.2.27-2.4.1_kolab @install ${loc}m4-1.4.3-2.4.0 @install ${loc}bison-2.0-2.4.0 @install ${loc}flex-2.5.31-2.4.0 @@ -139,7 +139,7 @@ @trigger ${loc}spamassassin-3.0.3-2.4.1 @install ${plusloc}amavisd-2.3.1-2.4.0 @install ${loc}curl-7.14.0-2.4.0 - @install ${altloc}clamav-0.88-20060110 + @install ${altloc}clamav-0.88.2-2.20060622 @install ${loc}vim-6.3.78-2.4.0 @install ${plusloc}dcron-2.9-2.4.0 @install ${altloc}perl-kolab-5.8.7-2.0_20051219 From cvs at kolab.org Tue Jul 11 18:02:26 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 11 Jul 2006 18:02:26 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.26, 1.27 Message-ID: <20060711160226.217C31006A4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv4752/kolab-webadmin/php/admin/include Modified Files: form.class.php Log Message: Patch from wrobel + foldertype fixes etc. Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- form.class.php 21 Apr 2006 10:41:38 -0000 1.26 +++ form.class.php 11 Jul 2006 16:02:24 -0000 1.27 @@ -190,8 +190,9 @@ case 'foldertypeselect': $str .= ''; $str .= ''.$value['name'].''; - $entries = array ( '' => _('None'), 'mail' => _('Mails'), 'task' => _('Tasks'), 'journal' => _('Journals'), - 'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes')); + $entries = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'), + 'journal' => _('Journals'), 'event' => _('Events'), + 'contact' => _('Contacts'), 'note' => _('Notes')); if( ereg( 'readonly', $value['attrs'] ) ) { $str .= '

'.MySmarty::htmlentities($entries[$value['value']]). '

'; From cvs at kolab.org Tue Jul 11 18:02:26 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 11 Jul 2006 18:02:26 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder index.php.in, 1.2, 1.3 sf.php.in, 1.4, 1.5 Message-ID: <20060711160226.286341006A5@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder In directory doto:/tmp/cvs-serv4752/kolab-webadmin/www/admin/sharedfolder Modified Files: index.php.in sf.php.in Log Message: Patch from wrobel + foldertype fixes etc. Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- index.php.in 21 Apr 2006 10:41:38 -0000 1.2 +++ index.php.in 11 Jul 2006 16:02:24 -0000 1.3 @@ -34,6 +34,7 @@ } // Get all entries & dynamically split the letters with growing entries +$entries = array(); if( !$errors ) { if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn']; else $base_dn = 'k=kolab'; @@ -60,9 +61,10 @@ $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE"; $kolabhomeserver = $attrs['kolabHomeServer'][0]; - $folderTypeMap = array ( '' => _('None'), 'mail' => _('Mails'), 'task' => _('Tasks'), 'journal' => _('Journals'), - 'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes')); - $folderType = $folderTypeMap[$attrs['folderType'][0]]; + $folderTypeMap = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'), 'journal' => _('Journals'), + 'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes')); + if( in_array('kolabFolderType',$attrs) ) $folderType = $folderTypeMap[$attrs['kolabFolderType'][0]]; + else $folderType = $folderTypeMap['']; $entries[] = array( 'dn' => $dn, 'cn' => $cn, Index: sf.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- sf.php.in 10 Jun 2006 18:46:58 -0000 1.4 +++ sf.php.in 11 Jul 2006 16:02:24 -0000 1.5 @@ -32,18 +32,21 @@ else $cn = $ldap_object['cn']; $form->entries['cn']['value'] = $cn; - if (is_array($ldap_object['cyrus-userquota'])) $userquota = $ldap_object['cyrus-userquota'][0]; - else $userquota = $ldap_object['cyrus-userquota']; + if( in_array('cyrus-userquota',$ldap_object)) { + if (is_array($ldap_object['cyrus-userquota'])) $userquota = $ldap_object['cyrus-userquota'][0]; + else $userquota = $ldap_object['cyrus-userquota']; + } else $userquota = ""; $form->entries['cyrus-userquota']['value'] = $userquota; if (is_array($ldap_object['kolabHomeServer'])) $kolabhomeserver = $ldap_object['kolabHomeServer'][0]; $form->entries['kolabhomeserver']['value'] = $kolabhomeserver; - if (is_array($ldap_object['kolabFolderType'])) - $form->entries['foldertype']['value'] = $ldap_object['kolabFolderType'][0]; - else - $form->entries['foldertype']['value'] = ''; - + if( in_array('kolabFolderType',$ldap_object)) { + if (is_array($ldap_object['kolabFolderType'])) + $form->entries['foldertype']['value'] = $ldap_object['kolabFolderType'][0]; + else + $form->entries['foldertype']['value'] = ''; + } else $form->entries['foldertype']['value'] = ''; $form->entries['action']['value'] = 'save'; //debug("got userquota=$userquota
cn=$cn
"); $aclcount = 0; @@ -87,21 +90,12 @@ return "$mail $perm"; } - $regs = array(); - if( ereg('(.*)@(.*)', $uid, $regs ) ) { - $cn = $regs[1]; - $res = $ldap->search( $_SESSION['base_dn'], '(&(cn='.$ldap->escape($cn).')(objectClass=kolabGroupOfNames))', - array('dn') ); - if( $ldap->count($res) == 1 ) { - $objects = $ldap->getEntries(); - $dcs = array_filter( split(',', $objects[0]['dn']), create_function( '$str', 'return !strncmp( "dc=", $str, 3 );') ); - $dcs = array_map( create_function( '$str', 'return substr($str,3);'), $dcs ); - $domain = join( '.', $dcs ); - if( $domain == $regs[2] ) { - // All OK, we have a group - return "group:$uid $perm"; - } - } + $res = $ldap->search( $_SESSION['base_dn'], '(&(cn='.$ldap->escape($uid).')(objectClass=kolabGroupOfNames))', + array('dn') ); + if( $ldap->count($res) == 1 ) { + // Ok, we have a group + $ldap->freeSearchResult(); + return "group:$uid $perm"; } $errors[] = sprintf(_("No UID or GID %s"), $uid); return false; @@ -236,10 +230,10 @@ } else array_push($errors, sprintf(_("LDAP Error: could not read %s: %s"), $dn, ldap_error($ldap->connection))); } else { - if (!ldap_modify($ldap->connection, $dn, $ldap_object)) + if (!ldap_modify($ldap->connection, $dn, $ldap_object)) { array_push($errors, sprintf(_("LDAP Error: could not modify object %s: %s"), $dn, ldap_error($ldap->connection))); - else $messages[] = _('Shared folder updated'); + } else $messages[] = _('Shared folder updated'); } } } else { From cvs at kolab.org Thu Jul 13 00:58:48 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 13 Jul 2006 00:58:48 +0200 (CEST) Subject: martin: server/kolabd/kolabd/dist_conf common, 1.30, 1.31 kolab, 1.38, 1.39 Message-ID: <20060712225848.BF2481005C9@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv1181/kolabd/kolabd/dist_conf Modified Files: common kolab Log Message: Martin Konold: Add support for sieve based notifications https://intevation.de/roundup/kolab/issue1264 Index: common =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- common 3 Apr 2006 18:18:39 -0000 1.30 +++ common 12 Jul 2006 22:58:46 -0000 1.31 @@ -71,6 +71,7 @@ -e 's,[@]ftpserver_usr[@],$(ftpserver_usr),g' \ -e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \ -e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \ + -e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \ -e 's,[@]imap_confdir[@],$(imap_confdir),g' \ -e 's,[@]imap_confperm[@],$(imap_confperm),g' \ -e 's,[@]imap_grp[@],$(imap_grp),g' \ Index: kolab =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- kolab 3 Apr 2006 18:18:39 -0000 1.38 +++ kolab 12 Jul 2006 22:58:46 -0000 1.39 @@ -64,6 +64,7 @@ # @l_musr@ # @l_rgrp@ + emailscan_usr=kolab-r emailscan_grp=kolab-r @@ -104,7 +105,9 @@ imap_spool=${imap_statedir}/spool imap_sievedir=${imap_statedir}/sieve imap_lmtp=${imap_statedir}/lmtp +imap_notify_socket=${imap_statedir}/socket/notify imap_rpm=imapd + kolab_statedir=${localstatedir}/kolab kolab_logdir=${kolab_statedir}/log From cvs at kolab.org Thu Jul 13 00:58:48 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 13 Jul 2006 00:58:48 +0200 (CEST) Subject: martin: server/kolabd/kolabd/templates cyrus.conf.template.in, 1.1, 1.2 imapd.conf.template.in, 1.6, 1.7 Message-ID: <20060712225848.C21631005CD@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv1181/kolabd/kolabd/templates Modified Files: cyrus.conf.template.in imapd.conf.template.in Log Message: Martin Konold: Add support for sieve based notifications https://intevation.de/roundup/kolab/issue1264 Index: cyrus.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/cyrus.conf.template.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cyrus.conf.template.in 13 Sep 2005 14:38:22 -0000 1.1 +++ cyrus.conf.template.in 12 Jul 2006 22:58:46 -0000 1.2 @@ -41,7 +41,7 @@ lmtp cmd="lmtpd -a" listen="127.0.0.1:2003" # this is only necessary if using notifications - # notify cmd="notifyd" listen="/openpkg/var/imapd/socket/notify" proto="udp" prefork=1 + notify cmd="notifyd" listen="@imap_notify_socket@" proto="udp" prefork=1 } EVENTS { Index: imapd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- imapd.conf.template.in 13 Feb 2006 02:59:43 -0000 1.6 +++ imapd.conf.template.in 12 Jul 2006 22:58:46 -0000 1.7 @@ -73,3 +73,7 @@ userprefix: user sharedprefix: shared +# add support for sieve based notifications +notifysocket: @imap_notify_socket@ +sievenotifier: mailto +mailnotifier: mailto From cvs at kolab.org Fri Jul 14 11:55:56 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 14 Jul 2006 11:55:56 +0200 (CEST) Subject: marcus: server/kolabd/kolabd/dist_conf common, 1.31, 1.32 suse, 1.52, 1.53 Message-ID: <20060714095556.56BBD1005CD@lists.intevation.de> Author: marcus Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv3878/dist_conf Modified Files: common suse Log Message: added imap_notify_socket variable to dist_conf/suse Index: common =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- common 12 Jul 2006 22:58:46 -0000 1.31 +++ common 14 Jul 2006 09:55:54 -0000 1.32 @@ -71,13 +71,13 @@ -e 's,[@]ftpserver_usr[@],$(ftpserver_usr),g' \ -e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \ -e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \ - -e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \ -e 's,[@]imap_confdir[@],$(imap_confdir),g' \ -e 's,[@]imap_confperm[@],$(imap_confperm),g' \ -e 's,[@]imap_grp[@],$(imap_grp),g' \ -e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \ -e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \ -e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \ + -e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \ -e 's,[@]imap_rpm[@],$(imap_rpm),g' \ -e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \ -e 's,[@]imap_spool[@],$(imap_spool),g' \ Index: suse =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- suse 13 Apr 2006 11:33:49 -0000 1.52 +++ suse 14 Jul 2006 09:55:54 -0000 1.53 @@ -84,6 +84,7 @@ imap_spool=${localstatedir}/spool/imap imap_sievedir=${localstatedir}/lib/sieve imap_lmtp=${imap_statedir}/lmtp +imap_notify_socket=${imap_statedir}/socket/notify imap_rpm=cyrus-imapd kolab_statedir=${localstatedir}/lib/kolab From cvs at kolab.org Sat Jul 15 23:21:09 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Sat, 15 Jul 2006 23:21:09 +0200 (CEST) Subject: martin: server/imapd imapd.folderchar.patch, NONE, 1.1 imapd.spec, 1.18, 1.19 Message-ID: <20060715212109.941BF1005AF@lists.intevation.de> Author: martin Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv25220 Modified Files: imapd.spec Added Files: imapd.folderchar.patch Log Message: Martin Konold: Fix hierarchical folder structure if foldersnames contain blank and other non alphanumerical characters like '-' when using skiplist as the database backend for mailboxes.db --- NEW FILE: imapd.folderchar.patch --- diff -Naurp ../cyrus-imapd-2.2.12.orig/lib/bsearch.c ./lib/bsearch.c --- ../cyrus-imapd-2.2.12.orig/lib/bsearch.c 2003-02-13 21:15:39.000000000 +0100 +++ ./lib/bsearch.c 2006-07-15 22:49:05.000000000 +0200 @@ -213,3 +213,22 @@ int bsearch_compare(const char *s1, cons s2++; } } + +int bsearch_ncompare(const char *s1, int l1, const char *s2, int l2) +{ + int min = l1 < l2 ? l1 : l2; + int cmp = 0; + + while (min-- > 0 && (cmp = TOCOMPARE(*s1) - TOCOMPARE(*s2)) == 0) { + s1++; + s2++; + } + if (min >= 0) { + return cmp; + } else { + if (l2 > l1) return -1; + else if (l1 > l2) return 1; + else return 0; + } +} + diff -Naurp ../cyrus-imapd-2.2.12.orig/lib/bsearch.h ./lib/bsearch.h --- ../cyrus-imapd-2.2.12.orig/lib/bsearch.h 2003-02-13 21:15:39.000000000 +0100 +++ ./lib/bsearch.h 2006-07-14 15:06:24.000000000 +0200 @@ -51,4 +51,6 @@ extern int bsearch_mem(const char *word, extern int bsearch_compare(const char *s1, const char *s2); +extern int bsearch_ncompare(const char *s1, int l1, const char *s2, int l2); + #endif /* INCLUDED_BSEARCH_H */ diff -Naurp ../cyrus-imapd-2.2.12.orig/lib/cyrusdb_skiplist.c ./lib/cyrusdb_skiplist.c --- ../cyrus-imapd-2.2.12.orig/lib/cyrusdb_skiplist.c 2004-06-08 21:55:17.000000000 +0200 +++ ./lib/cyrusdb_skiplist.c 2006-07-15 22:51:08.000000000 +0200 @@ -68,6 +68,7 @@ #include "retry.h" #include "util.h" #include "xmalloc.h" +#include "bsearch.h" #define PROB (0.5) @@ -787,24 +788,6 @@ int myclose(struct db *db) return dispose_db(db); } -static int compare(const char *s1, int l1, const char *s2, int l2) -{ - int min = l1 < l2 ? l1 : l2; - int cmp = 0; - - while (min-- > 0 && (cmp = *s1 - *s2) == 0) { - s1++; - s2++; - } - if (min >= 0) { - return cmp; - } else { - if (l1 > l2) return 1; - else if (l2 > l1) return -1; - else return 0; - } -} - /* returns the offset to the node asked for, or the node after it if it doesn't exist. if previous is set, finds the last node < key */ @@ -824,7 +807,7 @@ static const char *find_node(struct db * for (i = db->curlevel - 1; i >= 0; i--) { while ((offset = FORWARD(ptr, i)) && - compare(KEY(db->map_base + offset), KEYLEN(db->map_base + offset), + bsearch_ncompare(KEY(db->map_base + offset), KEYLEN(db->map_base + offset), key, keylen) < 0) { /* move forward at level 'i' */ ptr = db->map_base + offset; @@ -875,7 +858,7 @@ int myfetch(struct db *db, ptr = find_node(db, key, keylen, 0); - if (ptr == db->map_base || compare(KEY(ptr), KEYLEN(ptr), key, keylen)) { + if (ptr == db->map_base || bsearch_ncompare(KEY(ptr), KEYLEN(ptr), key, keylen)) { /* failed to find key/keylen */ r = CYRUSDB_NOTFOUND; } else { @@ -963,7 +946,7 @@ int myforeach(struct db *db, while (ptr != db->map_base) { /* does it match prefix? */ if (KEYLEN(ptr) < (bit32) prefixlen) break; - if (prefixlen && compare(KEY(ptr), prefixlen, prefix, prefixlen)) break; + if (prefixlen && bsearch_ncompare(KEY(ptr), prefixlen, prefix, prefixlen)) break; if (!goodp || goodp(rock, KEY(ptr), KEYLEN(ptr), DATA(ptr), DATALEN(ptr))) { @@ -1116,7 +1099,7 @@ int mystore(struct db *db, newoffset = tp->logend; ptr = find_node(db, key, keylen, updateoffsets); if (ptr != db->map_base && - !compare(KEY(ptr), KEYLEN(ptr), key, keylen)) { + !bsearch_ncompare(KEY(ptr), KEYLEN(ptr), key, keylen)) { if (!overwrite) { myabort(db, tp); /* releases lock */ @@ -1282,7 +1265,7 @@ int mydelete(struct db *db, ptr = find_node(db, key, keylen, updateoffsets); if (ptr == db->map_base || - !compare(KEY(ptr), KEYLEN(ptr), key, keylen)) { + !bsearch_ncompare(KEY(ptr), KEYLEN(ptr), key, keylen)) { /* gotcha */ offset = ptr - db->map_base; @@ -1825,11 +1808,11 @@ static int myconsistent(struct db *db, s const char *q = db->map_base + offset; int cmp; - cmp = compare(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q)); + cmp = bsearch_ncompare(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q)); if (cmp >= 0) { fprintf(stdout, "skiplist inconsistent: %04X: ptr %d is %04X; " - "compare() = %d\n", + "bsearch_ncompare() = %d\n", ptr - db->map_base, i, offset, cmp); @@ -2058,7 +2041,7 @@ static int recovery(struct db *db, int f if (TYPE(ptr) == ADD) { keyptr = find_node(db, KEY(ptr), KEYLEN(ptr), updateoffsets); if (keyptr == db->map_base || - compare(KEY(ptr), KEYLEN(ptr), KEY(keyptr), KEYLEN(keyptr))) { + bsearch_ncompare(KEY(ptr), KEYLEN(ptr), KEY(keyptr), KEYLEN(keyptr))) { /* didn't find exactly this node */ keyptr = NULL; } Index: imapd.spec =================================================================== RCS file: /kolabrepository/server/imapd/imapd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- imapd.spec 2 Sep 2004 06:57:03 -0000 1.18 +++ imapd.spec 15 Jul 2006 21:21:07 -0000 1.19 @@ -57,6 +57,7 @@ Patch1: imapd.patch.group Patch2: imapd.annotate.patch Patch3: kolab-ldap.patch +Patch4: imapd.folderchar.patch # build information Prefix: %{l_prefix} @@ -111,6 +112,9 @@ %endif %if "%{with_ldap}" == "yes" %patch -p0 -P 3 +%endif +%if "%{with_folderchar}" == "yes" + %patch -p0 -P 4 %endif %{l_shtool} subst \ From cvs at kolab.org Mon Jul 17 17:43:58 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 17 Jul 2006 17:43:58 +0200 (CEST) Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates page.tpl.in, 1.2, 1.3 Message-ID: <20060717154358.714931006D4@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv27911/kolab-webadmin/kolab-webadmin/php/admin/templates Modified Files: page.tpl.in Log Message: Corrected typo: Webintefrace -> Webinterface Index: page.tpl.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/page.tpl.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- page.tpl.in 4 Feb 2006 20:59:13 -0000 1.2 +++ page.tpl.in 17 Jul 2006 15:43:56 -0000 1.3 @@ -12,7 +12,7 @@ - + From cvs at kolab.org Wed Jul 19 15:51:06 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 19 Jul 2006 15:51:06 +0200 (CEST) Subject: thomas: server/imapd kolab.patch,1.28,1.29 imapd.spec,1.19,NONE Message-ID: <20060719135106.869D61005A4@lists.intevation.de> Author: thomas Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv29173 Modified Files: kolab.patch Removed Files: imapd.spec Log Message: Removed obsolete imapd.spec and updated kolab.patch to use folderchar patch Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imapd/kolab.patch,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- kolab.patch 9 Dec 2005 15:55:22 -0000 1.28 +++ kolab.patch 19 Jul 2006 13:51:04 -0000 1.29 @@ -1,5 +1,5 @@ ---- imapd.spec.orig Wed Dec 7 13:05:58 2005 -+++ imapd.spec Wed Dec 7 15:06:46 2005 +--- imapd.spec.orig 2006-07-19 15:32:33.867230000 +0200 ++++ imapd.spec 2006-07-19 15:41:21.484428413 +0200 @@ -2,6 +2,9 @@ ## imapd.spec -- OpenPKG RPM Package Specification ## Copyright (c) 2000-2005 OpenPKG Foundation e.V. @@ -10,7 +10,7 @@ ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that -@@ -33,13 +36,17 @@ Class: BASE +@@ -33,13 +36,17 @@ Group: Mail License: BSD Version: 2.2.12 @@ -33,20 +33,21 @@ # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz -@@ -49,6 +56,12 @@ Source3: imapd.conf +@@ -49,6 +56,13 @@ Source4: fsl.imapd Patch0: imapd.patch Patch1: imapd.patch.group +Patch2: imapd.annotate.patch -+Patch3: kolab-ldap.patch -+Patch4: imapd.group2.patch ++Patch3: kolab-ldap.patch ++Patch4: imapd.group2.patch +Patch5: imapd-goodchars.patch +Patch6: cyradm.annotate.patch -+Patch7: imapd.morelogging.patch ++Patch7: imapd.morelogging.patch ++Patch8: imapd.folderchar.patch # build information Prefix: %{l_prefix} -@@ -61,6 +74,10 @@ PreReq: sasl, db >= 4.2.52, openss +@@ -61,6 +75,10 @@ BuildPreReq: fsl >= 1.2.0 PreReq: fsl >= 1.2.0 %endif @@ -57,7 +58,7 @@ AutoReq: no AutoReqProv: no -@@ -91,6 +108,7 @@ AutoReqProv: no +@@ -91,6 +109,7 @@ %{l_shtool} subst \ -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \ lib/auth_unix.c @@ -65,7 +66,7 @@ %endif %if "%{with_drac}" == "yes" %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch -@@ -98,10 +116,24 @@ AutoReqProv: no +@@ -98,10 +117,27 @@ sleep 1 touch configure %endif @@ -82,6 +83,9 @@ +%if "%{with_morelogging}" == "yes" + %patch -p1 -P 7 +%endif ++%if "%{with_folderchar}" == "yes" ++ %patch -p0 -P 8 ++%endif %{l_shtool} subst \ -e 's;-L/usr/local/lib;;g' \ -e 's;-I/usr/local/include;;g' \ @@ -91,15 +95,15 @@ configure # ensure local et/com_err can be found -@@ -161,6 +193,11 @@ AutoReqProv: no - %{l_shtool} subst \ +@@ -162,6 +198,11 @@ -e '/alt_config/s;"deliver";"cyrdeliver";' \ imap/deliver.c -+ + + %{l_shtool} subst \ + -e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \ + -e '/snprintf(buf, sizeof(buf), "%s/s;/quota";/cyrquota";' \ + imap/imapd.c - ++ %build cflags="%{l_cppflags}" + %if "%{with_atvdom}" == "yes" --- imapd.spec DELETED --- From cvs at kolab.org Wed Jul 19 19:52:18 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 19 Jul 2006 19:52:18 +0200 (CEST) Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, 1.3.2.5, 1.3.2.6 Message-ID: <20060719175218.DCB66100159@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv1245 Modified Files: Tag: kolab_2_0_branch kolabmailtransport.php Log Message: Don't add empty lines at the end of mails delivered via LMTP (Fixes Issue1042) Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -u -d -r1.3.2.5 -r1.3.2.6 --- kolabmailtransport.php 22 May 2006 11:07:48 -0000 1.3.2.5 +++ kolabmailtransport.php 19 Jul 2006 17:52:16 -0000 1.3.2.6 @@ -103,8 +103,9 @@ */ if( $this->got_newline && $data[0] == '.' ) $data = '.'.$data; $data = str_replace("\n.", "\n..", $data); - if( $data[count($data)] == "\n" ) $this->got_newline = true; - else $this->got_newline = false; + $len = strlen($data); + if( $len > 0 ) + $this->got_newline = ( $data[$len-1] == "\n" ); } function data( $data) { From cvs at kolab.org Wed Jul 19 19:54:21 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 19 Jul 2006 19:54:21 +0200 (CEST) Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, 1.9, 1.10 Message-ID: <20060719175421.02CA4100159@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv1530 Modified Files: kolabmailtransport.php Log Message: Don't add empty lines at the end of mails delivered via LMTP (Fixes Issue1042) Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- kolabmailtransport.php 22 May 2006 10:49:29 -0000 1.9 +++ kolabmailtransport.php 19 Jul 2006 17:54:18 -0000 1.10 @@ -109,8 +109,8 @@ if( $this->got_newline && $data[0] == '.' ) $data = '.'.$data; $data = str_replace("\n.", "\n..", $data); $len = strlen($data); - if( $len>0 && $data[$len-1] == "\n" ) $this->got_newline = true; - else $this->got_newline = false; + if( $len > 0 ) + $this->got_newline = ( $data[$len-1] == "\n" ); } function data( $data) { From cvs at kolab.org Fri Jul 28 06:44:35 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 28 Jul 2006 06:44:35 +0200 (CEST) Subject: steffen: server/kolabd/kolabd kolab_smtpdpolicy.in,1.8,1.9 Message-ID: <20060728044435.A3A90100161@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv8895 Modified Files: kolab_smtpdpolicy.in Log Message: revive delegate functionality (Issue1273) Index: kolab_smtpdpolicy.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- kolab_smtpdpolicy.in 21 Jun 2006 10:49:19 -0000 1.8 +++ kolab_smtpdpolicy.in 28 Jul 2006 04:44:33 -0000 1.9 @@ -205,12 +205,18 @@ my $mesg = $ldap->search( base=> $conf_basedn, scope=> 'sub', filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$sender)(alias=$sender)))", - attrs => [ 'uid' ]); + attrs => [ 'uid', 'kolabDelegate' ]); if( !$mesg->code && $mesg->count() > 0 ) { mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose; foreach my $entry ( $mesg->entries ) { mylog($syslog_priority, lc($entry->get_value('uid')." is allowed to use ".$sender)) if $verbose; push @result, lc($entry->get_value('uid')); + my $delegate; + for $delegate ($entry->get_value('kolabDelegate')) { + $delegate = lookup_uid($delegate); + mylog($syslog_priority, lc($delegate)." is a delegate of ".$sender) if $verbose; + push @result, lc($delegate); + } } } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT ) { if( $tries++ <= $ldap_max_tries ) { From cvs at kolab.org Sun Jul 30 23:20:45 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 30 Jul 2006 23:20:45 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab Kolab.pm.in,1.4,1.5 Message-ID: <20060730212045.A0BB71005D2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab In directory doto:/tmp/cvs-serv17829/Kolab Modified Files: Kolab.pm.in Log Message: Use LDAP timestamps (Issue1194) Index: Kolab.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Kolab.pm.in 9 Apr 2006 22:49:43 -0000 1.4 +++ Kolab.pm.in 30 Jul 2006 21:20:43 -0000 1.5 @@ -95,6 +95,7 @@ %config = readConfig(\%config, "@sysconfdir@/kolab/kolab.conf"); # $config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'}); + &log('C', 'Reloading configuration'); # Get the UID/GID of the 'kolab' users @@ -307,6 +308,7 @@ $config{'user_field_modified'} = 'modifytimestamp' if (!exists $config{'user_field_modified'}); $config{'user_field_guid'} = 'entryUUID' if (!exists $config{'user_field_guid'}); $config{'user_field_quota'} = 'cyrus-userquota' if (!exists $config{'user_field_quota'}); + } # The `sf_XXX' variables are the shared folder equivalents of the `user_XXX' variables From cvs at kolab.org Sun Jul 30 23:20:45 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Sun, 30 Jul 2006 23:20:45 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.5,1.6 Message-ID: <20060730212045.A6BB11006AE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv17829/Kolab-LDAP Modified Files: LDAP.pm.in Log Message: Use LDAP timestamps (Issue1194) Index: LDAP.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- LDAP.pm.in 10 Jun 2006 18:46:58 -0000 1.5 +++ LDAP.pm.in 30 Jul 2006 21:20:43 -0000 1.6 @@ -25,6 +25,7 @@ use strict; use warnings; use UNIVERSAL; +use Time::Local; use Net::LDAP qw( LDAP_SUCCESS LDAP_PROTOCOL_ERROR LDAP_REFERRAL ); use Net::LDAPS; use Net::LDAP::Util; @@ -62,6 +63,11 @@ our $VERSION = '0.9'; +# Timestamp to keep track of changed objects +our $user_timestamp = ""; +our $sf_timestamp = ""; +our $group_timestamp = ""; + sub startup { Kolab::log('L', 'Starting up'); @@ -522,9 +528,9 @@ } %newuid_db = (); - syncBasic($cyrus, 'user', '', 0); - syncBasic($cyrus, 'sf', '', 1); - syncBasic($cyrus, 'group', '', 0); + $user_timestamp = syncBasic($cyrus, 'user', '', $user_timestamp, 0); + $sf_timestamp = syncBasic($cyrus, 'sf', '', $sf_timestamp, 1); + $group_timestamp = syncBasic($cyrus, 'group', '', $group_timestamp, 0); # Check that all mailboxes correspond to LDAP objects Kolab::log('L', 'Synchronising mailboxes'); @@ -549,7 +555,7 @@ # deletion, i.e. either we missed the deletion notification or there was # an error when iterating through the objects (Lost connection, invalid DNs) foreach $guid (keys %uid_db) { - if (exists $objects{$uid_db{$guid}}) { + if (defined $uid_db{$guid} && exists $objects{$uid_db{$guid}}) { $gyard_db{$guid} = $uid_db{$guid}; $gyard_ts_db{$guid} = time; } @@ -572,11 +578,38 @@ Kolab::log('L', 'Finished synchronisation'); } +# Date::Parse doesn't understand this format +# so we have to hack it ourselves +sub parse_generalized_time +{ + my $ts = shift; + # YYYYMMDDHHMMSSZ + if( $ts =~ /(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)Z/ ) { + my $t = 0; + eval { $t = timegm($6,$5,$4,$3,$2-1,$1); }; + return $t; + } else { + return 0; + } +} + +# Returns the largest of two string-rep. +# of LDAP generalizedTime +sub max_generalized_time +{ + my $ts1 = shift; + my $ts2 = shift; + if( parse_generalized_time($ts1) > + parse_generalized_time($ts2) ) { return $ts1; } + else { return $ts2; } +} + sub syncBasic { my $cyrus = shift; my $p = shift || 'user'; my $add = shift || ($p eq 'user' ? '' : ''); + my $ts = shift || ""; my $doacls = shift || 0; Kolab::log('L', "Synchronising `$p' objects"); @@ -603,7 +636,7 @@ scope => 'sub', filter => '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")$add(" . $Kolab::config{$p . '_field_deleted'} . '='.$Kolab::config{'fqdnhostname'}.'))', attrs => [ - '*', + 'objectClass', $Kolab::config{$p . '_field_guid'}, $Kolab::config{$p . '_field_modified'}, $Kolab::config{$p . '_field_deleted'}, @@ -620,14 +653,22 @@ # Now check that all objects in LDAP have corresponding mailboxes # This also resurrects any missing users, if neccessary + my $filter; + if( $ts eq "" ) { + $filter = '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")$add)", + } else { + $filter = '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")(" + .$Kolab::config{$p.'_field_modified'}.">=$ts)$add)"; + } + Kolab::log('L', "filter is $filter", KOLAB_DEBUG); $ldapmesg = $ldap->search( base => $dn, scope => 'sub', - filter => '(&(objectClass=' . $Kolab::config{$p . '_object_class'} . ")$add)", + filter => $filter, attrs => [ '*', $Kolab::config{$p . '_field_guid'}, - $Kolab::config{$p . '_field_modified'}, + $Kolab::config{$p . '_field_modified'}, $Kolab::config{$p . '_field_quota'}, $Kolab::config{$p . '_field_deleted'}, ], @@ -636,6 +677,7 @@ if ( UNIVERSAL::isa( $ldapmesg, 'Net::LDAP::Search') && $ldapmesg->code() <= 0) { while( $ldapobject = $ldapmesg->pop_entry ) { createObject($ldap, $cyrus, $ldapobject, 1, $p, $doacls); + $ts = max_generalized_time($ts,$ldapobject->get_value($Kolab::config{$p . '_field_modified'})); } } else { Kolab::log('L', "Unable to locate `$p' objects in DN `$dn'", KOLAB_WARN); @@ -647,6 +689,7 @@ &destroy($ldap); Kolab::log('L', "Finished `$p' object synchronisation"); + return $ts; } 1; From cvs at kolab.org Mon Jul 31 04:03:13 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 04:03:13 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates userlisterror.tpl, NONE, 1.1 userlistall.tpl, 1.1, 1.2 Message-ID: <20060731020313.F137D1006B6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv28072/kolab-webadmin/php/admin/templates Modified Files: userlistall.tpl Added Files: userlisterror.tpl Log Message: guard against large number of users --- NEW FILE: userlisterror.tpl --- {* Smarty Template *} {* Local variables: buffer-file-coding-system: utf-8 End: *}

{tr msg="Email Users"}

{tr msg="[ ALL ]"}    [ A-F ]    [ G-L ]    [ M-R ]    [ S-Z ]    {tr msg="[ OTHER ]"}
{tr msg="Filter:"}

Too many users, please narrow down the search.

Index: userlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/userlistall.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- userlistall.tpl 11 Mar 2005 09:59:05 -0000 1.1 +++ userlistall.tpl 31 Jul 2006 02:03:10 -0000 1.2 @@ -6,12 +6,12 @@ *}

{tr msg="Email Users"}

- {tr msg="[ ALL ]"}    - [ A-F ]    - [ G-L ]    - [ M-R ]    - [ S-Z ]    - {tr msg="[ OTHER ]"} + {tr msg="[ ALL ]"}    + [ A-F ]    + [ G-L ]    + [ M-R ]    + [ S-Z ]    + {tr msg="[ OTHER ]"}
From cvs at kolab.org Mon Jul 31 04:03:13 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 04:03:13 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin style.css, 1.7, 1.8 Message-ID: <20060731020313.F14251006B9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin In directory doto:/tmp/cvs-serv28072/kolab-webadmin/www/admin Modified Files: style.css Log Message: guard against large number of users Index: style.css =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- style.css 16 Jun 2005 00:32:10 -0000 1.7 +++ style.css 31 Jul 2006 02:03:10 -0000 1.8 @@ -84,6 +84,11 @@ } .submenuitemselected { } +.alphagroupitem { +} +.alphagroupitemselected { + font-weight:bold +} #logout { color: red; } From cvs at kolab.org Mon Jul 31 04:03:12 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 04:03:12 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin Makefile.am,1.35,1.36 Message-ID: <20060731020312.E334A1005AF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv28072/kolab-webadmin Modified Files: Makefile.am Log Message: guard against large number of users Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Makefile.am 22 Feb 2006 00:36:27 -0000 1.35 +++ Makefile.am 31 Jul 2006 02:03:09 -0000 1.36 @@ -134,6 +134,7 @@ php/admin/templates/distlistall.tpl \ php/admin/templates/kdab.tpl \ php/admin/templates/userlistall.tpl \ + php/admin/templates/userlisterror.tpl \ php/admin/templates/service.tpl \ php/admin/templates/welcome.tpl \ php/admin/templates/systemaliasnagscreen.tpl \ From cvs at kolab.org Mon Jul 31 04:03:13 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 04:03:13 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php.in, 1.3, 1.4 Message-ID: <20060731020313.F14851006BC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv28072/kolab-webadmin/www/admin/user Modified Files: index.php.in Log Message: guard against large number of users Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.php.in 29 Mar 2006 10:52:14 -0000 1.3 +++ index.php.in 31 Jul 2006 02:03:10 -0000 1.4 @@ -78,9 +78,22 @@ } } $alphalimit = ''; - if( isset( $_REQUEST['alphalimit']) ) { + $sublist = ''; + $alphagroup = ''; + // Disabled for now + if( false && isset($_REQUEST['alphalimit']) ) { $ala='sn'; // alpha limit attibute - switch( $_REQUEST['alphalimit'] ) { + $a = $_REQUEST['alphalimit']; + if( $a == "other" ) { + $alphalimit = "(|($ala=æ*)($ala=ø*)($ala=Ã¥*)($ala=ä*)($ala=ö*)($ala=ü*)($ala=0*)($ala=1*)($ala=2*)($ala=3*)($ala=4*)($ala=5*)($ala=6*)($ala=7*)($ala=8*)($ala=9*))"; + } else if( !empty($a)) { + $alphalimit ="($ala=$a*)"; + $sublist = $a[0]; + } + } else if( isset( $_REQUEST['alphagroup']) ) { + $ala='sn'; // alpha limit attibute + $alphagroup = $_REQUEST['alphagroup']; + switch( $_REQUEST['alphagroup'] ) { case 'a': $alphalimit = "(|($ala=a*)($ala=b*)($ala=c*)($ala=d*)($ala=e*)($ala=f*))"; break; case 'g': $alphalimit = "(|($ala=g*)($ala=h*)($ala=i*)($ala=j*)($ala=k*)($ala=l*))"; break; case 'm': $alphalimit = "(|($ala=m*)($ala=n*)($ala=o*)($ala=p*)($ala=q*)($ala=r*))"; break; @@ -101,6 +114,7 @@ $domainfilter= ""; } $filter = "(&($userfilter)$domainfilter$alphalimit(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))"; + debug("filter is \"$filter\""); $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabDeleteflag' )); if( $result ) { @@ -108,9 +122,10 @@ $title = sprintf(_("Manage Email User (%d Users)"), $count); // if there are more than 2000 entries, split in 26 categories for every letter, // or if more than 50, put in groups, or else just show all. - if (false && $count > 2000) { + if ( $count > 2000) { // ... TODO - $template = 'userlistalpha.tpl'; + //$template = 'userlistalpha.tpl'; + $template = 'userlisterror.tpl'; } else if( false && $count > 50 ) { // ... TODO $template = 'userlistgroup.tpl'; @@ -166,7 +181,7 @@ $smarty->assign( 'group', $auth->group() ); $smarty->assign( 'page_title', $menuitems[$sidx]['title'] ); $smarty->assign( 'self_url', $_SERVER['PHP_SELF'] ); - +$smarty->assign( 'alphagroup', $alphagroup ); $smarty->assign( 'filterattrs', array( 'cn' => _('Name'), 'mail' => _('Email'), 'uid' => _('UID') ) ); @@ -178,6 +193,7 @@ $smarty->assign( 'filtertype', $filtertype ); $smarty->assign( 'filtervalue', $filtervalue ); +$smarty->assign( 'sublist', $sublist ); $smarty->assign( 'entries', $entries ); $smarty->assign( 'menuitems', $menuitems ); $smarty->assign( 'submenuitems', From cvs at kolab.org Mon Jul 31 07:28:18 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 07:28:18 +0200 (CEST) Subject: martin: server/kolabd/kolabd/templates slapd.conf.template.in, 1.4, 1.5 Message-ID: <20060731052818.5C7021005D2@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv6494/kolabd/kolabd/templates Modified Files: slapd.conf.template.in Log Message: Martin Konold: Added as proposed by Steffen H. (issue 1194) Index: slapd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- slapd.conf.template.in 9 Dec 2005 16:02:16 -0000 1.4 +++ slapd.conf.template.in 31 Jul 2006 05:28:16 -0000 1.5 @@ -71,6 +71,8 @@ index givenName approx,sub,pres,eq index kolabHomeServer pres,eq index member pres,eq +index kolabDelegate approx,sub,pres,eq +index kolabDeleteflag pres,eq include @ldapserver_confdir@/slapd.access From cvs at kolab.org Mon Jul 31 19:32:34 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 19:32:34 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.69.2.3, 1.69.2.4 Message-ID: <20060731173234.18CCD1006DD@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv325/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: Tag: kolab_2_0_branch resmgr.php Log Message: Further fix for Issue957: Use the correct default value for the TRANSP ical attribute. Otherwise the opacity (free or busy) status of the event is not determined correctly if the attribute is not explicitly given in the ical data (in php, 0 == 'TRANSPARENT' is true). Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php,v retrieving revision 1.69.2.3 retrieving revision 1.69.2.4 diff -u -d -r1.69.2.3 -r1.69.2.4 --- resmgr.php 30 Apr 2006 02:37:55 -0000 1.69.2.3 +++ resmgr.php 31 Jul 2006 17:32:31 -0000 1.69.2.4 @@ -821,7 +821,7 @@ )); # default is busy, so set free if info is available - if ($itip->getAttributeDefault('TRANSP', 0) == 'TRANSPARENT') { + if ($itip->getAttributeDefault('TRANSP', 'OPAQUE') == 'TRANSPARENT') { $kolab_node = $kolab_event->append_child($kolab_xml->create_element('show-time-as')); $kolab_node->append_child($kolab_xml->create_text_node('free' )); } From cvs at kolab.org Mon Jul 31 20:52:33 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 20:52:33 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers ChangeLog, 1.16, 1.17 Message-ID: <20060731185233.016A11006DF@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers In directory doto:/tmp/cvs-serv1889/kolab-resource-handlers/kolab-resource-handlers Modified Files: ChangeLog Log Message: * resmgr/resmgr.php.in: Further fix for Issue957: Use the correct default value for the TRANSP ical attribute. Otherwise the opacity (free or busy) status of the event is not determined correctly if the attribute is not explicitly given in the ical data (in php, 0 == 'TRANSPARENT' is true). Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChangeLog 2 Apr 2006 14:53:35 -0000 1.16 +++ ChangeLog 31 Jul 2006 18:52:30 -0000 1.17 @@ -1,3 +1,11 @@ +2006-07-31 Bernhard Herzog + + * resmgr/resmgr.php.in: Further fix for Issue957: + Use the correct default value for the TRANSP ical attribute. + Otherwise the opacity (free or busy) status of the event is not + determined correctly if the attribute is not explicitly given in + the ical data (in php, 0 == 'TRANSPARENT' is true). + 2006-04-02 Richard Bos Patch by Marcus Hüwe * freebusy/freebusycache.class.php.in: prevent warning: From cvs at kolab.org Mon Jul 31 20:52:32 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 31 Jul 2006 20:52:32 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.6, 1.7 Message-ID: <20060731185232.EC48C1006DD@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv1889/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: resmgr.php.in Log Message: * resmgr/resmgr.php.in: Further fix for Issue957: Use the correct default value for the TRANSP ical attribute. Otherwise the opacity (free or busy) status of the event is not determined correctly if the attribute is not explicitly given in the ical data (in php, 0 == 'TRANSPARENT' is true). Index: resmgr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- resmgr.php.in 30 Apr 2006 02:35:47 -0000 1.6 +++ resmgr.php.in 31 Jul 2006 18:52:30 -0000 1.7 @@ -850,7 +850,7 @@ )); # default is busy, so set free if info is available - if ($itip->getAttributeDefault('TRANSP', 0) == 'TRANSPARENT') { + if ($itip->getAttributeDefault('TRANSP', 'OPAQUE') == 'TRANSPARENT') { $kolab_node = $kolab_event->append_child($kolab_xml->create_element('show-time-as')); $kolab_node->append_child($kolab_xml->create_text_node('free' )); } From cvs at kolab.org Tue Aug 1 18:21:11 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 1 Aug 2006 18:21:11 +0200 (CEST) Subject: bh: doc/architecture server.sgml,1.36,1.37 Message-ID: <20060801162111.6C806101EF8@lists.intevation.de> Author: bh Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv29923/architecture Modified Files: server.sgml Log Message: Fix some typos Index: server.sgml =================================================================== RCS file: /kolabrepository/doc/architecture/server.sgml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- server.sgml 20 Apr 2005 11:10:53 -0000 1.36 +++ server.sgml 1 Aug 2006 16:21:09 -0000 1.37 @@ -63,7 +63,7 @@ Top Level LDAP Structure It is difficult to find a commonly accepted LDAP scheme. -It seems, most real life LDAP installations go for the domain oriented apporach +It seems, most real life LDAP installations go for the domain oriented approach and lay out the structure after an existing domain/subdomain structure. The most widely accepted and standardized object for storing personal data clearly is "inetOrgPerson". @@ -174,7 +174,7 @@ # kolabEncryptedPassword is an asymmetrically (RSA) encrypted copy of the # cleartext password. This is required in order to pass the password from -# the maintainance/administration application to the kolabHomeServer running the +# the maintinance/administration application to the kolabHomeServer running the # resource handler application in a secure maner attributetype ( 1.3.6.1.4.1.19419.2.1.4 NAME 'kolabEncryptedPassword' @@ -1556,7 +1556,7 @@ With Kolab 3.0 we will use Apache mod_rewrite modules in order to have a transparent server side support for legacy Kolab clients. We use this mod_rewrite in order to process the download requests with a php script, fetch the required freebusy list from the appropriate Kolab server and then present the result to the requesting client. - Maintainance of Kolab server + Maintenance of Kolab server Installation of Kolab server @@ -1564,10 +1564,10 @@ Upgrade of Kolab server -It is save to expect that for security reasons, new features or bugfixes a new release of +It is safe to expect that for security reasons, new features or bugfixes a new release of the Kolab server is often desirable. We use the same obmtool for upgrading which is used for installing the Kolab server. -A save method for updating in case a short downfime is acceptable is first to become the superuser of the system and then +A safe method for updating in case a short downfime is acceptable is first to become the superuser of the system and then get the proper shell environment. Afterwards the new kolab rpm packages get installed and compiled if required. The obmtool takes care about downloading further required packages automatically. The intermediate kolabconf which happens to depend on OpenLDAP is sometimes mandatory for doing an update of the From cvs at kolab.org Thu Aug 3 05:12:42 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 3 Aug 2006 05:12:42 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.7, 1.8 Message-ID: <20060803031242.4FF89101EFB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv2303/resmgr Modified Files: resmgr.php.in Log Message: Fix for issue815 (unknown iTip methods) Index: resmgr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- resmgr.php.in 31 Jul 2006 18:52:30 -0000 1.7 +++ resmgr.php.in 3 Aug 2006 03:12:40 -0000 1.8 @@ -1143,6 +1143,7 @@ $iCalendar = &getICal($sender,$resource); if( $iCalendar === false ) { // No iCal in mail + myLog("Could not parse iCalendar data, Passing through to $resource"); return true; } // Get the event details out of the iTip request @@ -1456,10 +1457,8 @@ default: // We either don't currently handle these iTip methods, or they do not // apply to what we're trying to accomplish here - if (!$params['group']) { - myLog("Ignoring $method method"); - return false; - } + myLog("Ignoring $method method and passing message through to $resource"); + return true; } // Pass the message through to the group's mailbox From cvs at kolab.org Tue Aug 8 18:18:34 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 8 Aug 2006 18:18:34 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd kolab2.schema,1.19,1.20 Message-ID: <20060808161834.54C7C10016A@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv9622 Modified Files: kolab2.schema Log Message: Removed doubled attribute cyrus-autocreatequota,thanks to "Marc-Antoine Zizka". Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- kolab2.schema 10 Apr 2006 16:36:54 -0000 1.19 +++ kolab2.schema 8 Aug 2006 16:18:32 -0000 1.20 @@ -534,7 +534,6 @@ postfix-virtual $ postfix-enable-virus-scan $ postfix-allow-unauthenticated $ - cyrus-autocreatequota $ cyrus-quotawarn $ cyrus-autocreatequota $ cyrus-admins $ From cvs at kolab.org Wed Aug 9 14:55:46 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 9 Aug 2006 14:55:46 +0200 (CEST) Subject: bh: doc/architecture server.sgml,1.37,1.38 Message-ID: <20060809125546.0D2BF1006C4@lists.intevation.de> Author: bh Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv11300/architecture Modified Files: server.sgml Log Message: Add section with a description of the ldap changes between versions 2.0 and 2.1 of the Kolab server Index: server.sgml =================================================================== RCS file: /kolabrepository/doc/architecture/server.sgml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- server.sgml 1 Aug 2006 16:21:09 -0000 1.37 +++ server.sgml 9 Aug 2006 12:55:43 -0000 1.38 @@ -685,6 +685,227 @@ Further attributes can be easily added to the object class as the project advances and other requirements are identified. + +LDAP-Changes for Kolab Server 2.1 + + This section describes the changes in the LDAP structure that have + been made between version 2.0 and 2.1 of the Kolab server. The main + difference between the two versions is the support for multiple + email-domains. The implementation of that feature in Kolab is + relatively simple and the LDAP changes to accommodate this feature + have been kept to a minimum. + + + + Multidomainsupport + + Multidomainsupport affects the following places in the LDAP + structure immediately: + + + + + The domains the kolab server is responsible for. + + + All domains are listed in the Kolab configuration object (dn: + k=kolab,<base-dn>) in the attribute postfix-mydestination + postfix-mydestination defines which domains the postfix MTA is + reponsible for. + + + + + + Domain-maintainers + + + Domain-maintainers are internal Accounts which have basically + the same permissions as maintainers, with the exception that + they only have access to a subset of the domains of the Kolab + server. To which domains a domain-maintainer has write access + to is defined by the domain objects. + + + There is one domain object for each domain and is represented + by an LDAP entry under + + dn: cn=domains,cn=internal,<base-dn> + cn: domains + objectClass: top + objectClass: kolabNamedObject + + with the following structure: + + dn: cn=<domain>,cn=domains,cn=internal,<base-dn> + objectClass: top + objectClass: kolabGroupOfNames + cn: <domain> + + + + + The members of this kolabGroupOfNames are the + domain-maintainers who have access to the accounts of this + domain. + + + Since "members" is a MUST attribute of kolabGroupOfNames, at + least one member has to be given. In a standard Kolab + installation this is the manager accout (dn: + cn=manager,cn=internal,<base-dn>). + + + Kolab's web-admin interface creates the domain objects when + the first domain maintainers are defined. + + + Every domain-maintainer is an LDAP-objekt of the form: + + dn: cn=<CN>,cn=internal,<base-dn> + objectClass: top + objectClass: inetOrgPerson + objectClass: kolabInetOrgPerson + sn: <SN> + cn: <CN> + userPassword:: <pwd> + uid: <uid> + + + + Like maintainers and admins, domain-maintainer are members of + a special kolabGroupOfNames: + + dn: cn=domain-maintainer,cn=internal,<base-dn> + cn: domain-maintainer + objectClass: top + objectClass: kolabGroupOfNames + + + + In a stand kolab installation, the only member of this group + is the manager account. + + + Domain-maintainers are only used by kolab's web-admin + interface. Installation that use some other means to + administrate the server may ignore domain-maintainers. + + + Which accounts, distribution lists, etc. belong to which + domain is described in the sections below. + + + + + + Associating Accounts with Domains + + A kolab account belongs to the domain that is used as the domain + of its primary email address, that is, the value of the "mail" + attribute. + + + + Distributionlists + + In Kolab server 2.1, the CN of a distributionlist is its + email-address. In version 2.0 it was only the local part of the + email-address (the part before the @). This was changed in 2.1 to + make it possible to have multiple distribution lists with the same + local names in different domains. + + + A distributionlist belongs to the domain that is used as the + domain in the value of the "mail" attribute. + + + + Resource Manager + + The attribute kolabEncryptedPassword is no longer used in version + 2.1. In Kolab Server 2.0 it was used by the resource manager to + have write access to the calendar folders of resource and group + accounts. In 2.1 the resource manager always uses the calendar + user for this. + + + + Shared Folders + + The object class kolabSharedFolder has two new attributes: + + + kolabFolderType + + + Defines the value of the IMAP annotation "folder-type" as + used for the resource folders of normal kolab accounts. + More details about this attribute can be found in the file + kolab2.schema shipped with Kolab server 2.1. + + + + alias + + + This attribute is not used yet by Kolab. + + + + + + + Furthermore, just as for distributionlists, in Kolab version 2.1 + the domain is now part of the CN aufgenommen. Instead of simply + <foldername> as in 2.0, it's now <foldername>@<domain>. + + + + The domain given in the CN is the domain to which the shared + folder belongs. Note that this is different from to accounts and + distributionlists where the domain is taken from the "mail" + attribute. + + + + Postfix Relayport + + The kolab configuration object (dn: k=kolab,<base-dn>) has a + new attribute, postfix-relayport. This is the port of the + relayhost for the postfix MTA. This attribute is used in + main.cf.template. + + + + Other schema changes + + The object class kolabInetOrgPerson has a new attribute + kolabComment. This is not used yet in Kolab. + + + The following attribute have been explicitly marked as "single + value": + + kolabFreeBusyFuture + kolabFreeBusyPast + kolabHomeMTA + kolabVacationBeginDateTime + kolabVacationEndDateTime + kolabVacationResendInterval + kolabVacationReplyToUCE + kolabForwardKeepCopy + kolabForwardUCE + postfix-enable-virus-scan + postfix-allow-unauthenticated + cyrus-autocreatequota + cyrus-imap + + + + + + Postfix Mail Server From cvs at kolab.org Thu Aug 10 17:50:53 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 17:50:53 +0200 (CEST) Subject: bernhard: doc/www/src/security kolab-vendor-notice-10.txt,NONE,1.1 Message-ID: <20060810155053.3F1F31006D4@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv2808 Added Files: kolab-vendor-notice-10.txt Log Message: Added security notice 10. --- NEW FILE: kolab-vendor-notice-10.txt --- -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Kolab Security Issue 09 20060810 ================================ Package: Kolab Server, ClamAV Vulnerability: buffer overflow, remotely exploitable (CVE-2006-4018) Kolab Specific: no Dependent Packages: none Impact: high Summary ~~~~~~~ The Clam AntiVirus package's freshclam component has a buffer overflow in the handler for compressed UPX files that can be exploited remotely. Affected Versions ~~~~~~~~~~~~~~~~~ This affects all servers which have ClamAV 0.81 up to 0.88.3 running. Kolab Server 2.0.3, Kolab Server 2.1beta2 are vulnerable. Previous releases are affected. Fix ~~~ Upgrade to ClamAV 0.88.4 or to Kolab Server 2.0.4 which includes the new ClamAV. The ClamAV RPM is available from the Kolab download mirrors as security-updates/20060810/clamav-0.88.4-20060809.src.rpm The mirrors are listed on http://kolab.org/mirrors.html While the mirrors are catching up, you can also get the package via rsync: # rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20060810/clamav-0.88.4-20060809.src.rpm . MD5 sums: 943f2f4da69cb949a060e6ba102b4e44 clamav-0.88.4-20060809.src.rpm The package can be installed on your Kolab Server with # /kolab/bin/openpkg rpm --rebuild clamav-0.88.4-20060809.src.rpm # /kolab/bin/openpkg rpm \ -Uvh /kolab/RPM/PKG/clamav-0.88.4-20060809.--kolab.rpm The installation process might leave a freshclam.conf.rpmsave or clamd.conf.rpmsave in /kolab/etc/clamav/. Since freshclam.conf and clamd.conf are generated files, remove the rpmsave files, run kolabconf and make sure clamav starts. E.g. # rm /kolab/etc/clamav/clamd.conf.rpmsave # /kolab/sbin/kolabconf # /kolab/etc/rc clamav start Optionally update the virus signature files manually right away as test: # /kolab/bin/freshclam Details ~~~~~~~ http://www.clamav.net/security/0.88.4.html ClamAV 0.88.4 security advisory. Timeline ~~~~~~~~ 20060807 ClamAV security release 0.88.4. 20060809 OpenPKG 0.88.4 package release in section CUR/SRC/PLUS. 20060810 Kolab Server security advisory published. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFE21Ueh9ag3dpKERYRAlFJAKCuRuN/MJcmQD/lr/R/JxqIM+GWUQCfZe7J TZP9cLH8bbrjTUo9yJJjqXc= =PL5e -----END PGP SIGNATURE----- From cvs at kolab.org Thu Aug 10 17:58:20 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 17:58:20 +0200 (CEST) Subject: bernhard: doc/www/src index.html.m4,1.87,1.88 Message-ID: <20060810155820.BC6671006D5@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2937 Modified Files: index.html.m4 Log Message: Added news for security advisory 10. Moved older news to non-lastest section. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- index.html.m4 27 Jun 2006 11:48:51 -0000 1.87 +++ index.html.m4 10 Aug 2006 15:58:18 -0000 1.88 @@ -46,6 +46,29 @@
+ + +
August 10th, 2006» + Security Advisory 10 for Kolab Server (CVE-2006-4018, ClamAV) +
+
+ The Clam AntiVirus package's freshclam has a buffer overflow defect + that can be exploited remotely. + A new ClamAV RPM with a fix is available. See the + Kolab Security + Advisory 10 for details. +
+

+ + + +

+ + + +
+ +
June 26th, 2006 » New version 2.1.2 of proko2 KDE client is available @@ -128,11 +151,6 @@

- - - - -

From cvs at kolab.org Thu Aug 10 18:33:36 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 18:33:36 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.69.2.4, 1.69.2.5 Message-ID: <20060810163336.69845100161@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv4283/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: Tag: kolab_2_0_branch resmgr.php Log Message: Backport Fix for issue815 (unknown iTip methods) Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php,v retrieving revision 1.69.2.4 retrieving revision 1.69.2.5 diff -u -d -r1.69.2.4 -r1.69.2.5 --- resmgr.php 31 Jul 2006 17:32:31 -0000 1.69.2.4 +++ resmgr.php 10 Aug 2006 16:33:34 -0000 1.69.2.5 @@ -1116,6 +1116,7 @@ $iCalendar = &getICal($sender,$resource); if( $iCalendar === false ) { // No iCal in mail + myLog("Could not parse iCalendar data, Passing through to $resource"); return true; } // Get the event details out of the iTip request @@ -1429,10 +1430,8 @@ default: // We either don't currently handle these iTip methods, or they do not // apply to what we're trying to accomplish here - if (!$params['group']) { - myLog("Ignoring $method method"); - return false; - } + myLog("Ignoring $method method and passing message through to $resource"); + return true; } // Pass the message through to the group's mailbox From cvs at kolab.org Thu Aug 10 18:34:12 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 18:34:12 +0200 (CEST) Subject: bh: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.126.2.16, 1.126.2.17 Makefile, 1.9.2.5, 1.9.2.6 Message-ID: <20060810163412.6C8111005B9@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv4324/kolab-resource-handlers Modified Files: Tag: kolab_2_0_branch kolab-resource-handlers.spec Makefile Log Message: update version numbers Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.126.2.16 retrieving revision 1.126.2.17 diff -u -d -r1.126.2.16 -r1.126.2.17 --- kolab-resource-handlers.spec 21 May 2006 12:09:18 -0000 1.126.2.16 +++ kolab-resource-handlers.spec 10 Aug 2006 16:34:10 -0000 1.126.2.17 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20060520 +Release: 20060809 Class: JUNK License: GPL Group: MAIL Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v retrieving revision 1.9.2.5 retrieving revision 1.9.2.6 diff -u -d -r1.9.2.5 -r1.9.2.6 --- Makefile 21 May 2006 12:09:18 -0000 1.9.2.5 +++ Makefile 10 Aug 2006 16:34:10 -0000 1.9.2.6 @@ -4,7 +4,7 @@ PACKAGE=kolab-resource-handlers VERSION = 0.3.9 -RELEASE=20060520 +RELEASE=20060809 PEARVERSION = 1.3 RPM = /kolab/bin/openpkg rpm From cvs at kolab.org Thu Aug 10 18:36:07 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 18:36:07 +0200 (CEST) Subject: bernhard: doc/www/src/security kolab-vendor-notice-10.txt,1.1,1.2 Message-ID: <20060810163607.A9DC21006DD@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv4405 Modified Files: kolab-vendor-notice-10.txt Log Message: Corrected typo in advisory 10's title: It is actually #10. Index: kolab-vendor-notice-10.txt =================================================================== RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-10.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab-vendor-notice-10.txt 10 Aug 2006 15:50:51 -0000 1.1 +++ kolab-vendor-notice-10.txt 10 Aug 2006 16:36:05 -0000 1.2 @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -Kolab Security Issue 09 20060810 +Kolab Security Issue 10 20060810 ================================ Package: Kolab Server, ClamAV @@ -73,10 +73,11 @@ 20060807 ClamAV security release 0.88.4. 20060809 OpenPKG 0.88.4 package release in section CUR/SRC/PLUS. 20060810 Kolab Server security advisory published. + -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFE21Ueh9ag3dpKERYRAlFJAKCuRuN/MJcmQD/lr/R/JxqIM+GWUQCfZe7J -TZP9cLH8bbrjTUo9yJJjqXc= -=PL5e +iD8DBQFE22A5h9ag3dpKERYRAvlhAKCYyU2u/rqg1TJX5f3NuSdzqAlDcwCfekeT +FaCwW72PLO+awKbqucSZePg= +=okQY -----END PGP SIGNATURE----- From cvs at kolab.org Thu Aug 10 18:36:41 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 18:36:41 +0200 (CEST) Subject: bh: server/kolabd kolabd.spec, 1.57.2.10, 1.57.2.11 Makefile, 1.4.2.2, 1.4.2.3 Message-ID: <20060810163641.909301006DE@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv4626/kolabd Modified Files: Tag: kolab_2_0_branch kolabd.spec Makefile Log Message: update version numbers Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/Attic/kolabd.spec,v retrieving revision 1.57.2.10 retrieving revision 1.57.2.11 diff -u -d -r1.57.2.10 -r1.57.2.11 --- kolabd.spec 11 Jan 2006 16:15:17 -0000 1.57.2.10 +++ kolabd.spec 10 Aug 2006 16:36:39 -0000 1.57.2.11 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20060111 +Release: 20060707 # list of sources Source0: kolabd-1.9.4.tar.gz Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolabd/Makefile,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -d -r1.4.2.2 -r1.4.2.3 --- Makefile 11 Jan 2006 16:15:17 -0000 1.4.2.2 +++ Makefile 10 Aug 2006 16:36:39 -0000 1.4.2.3 @@ -4,7 +4,7 @@ PACKAGE=kolabd VERSION = 1.9.4 -RELEASE=20060111 +RELEASE=20060707 RPM = /kolab/bin/openpkg rpm From cvs at kolab.org Thu Aug 10 18:39:11 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 18:39:11 +0200 (CEST) Subject: bh: server obmtool.conf,1.174.2.35,1.174.2.36 Message-ID: <20060810163911.8C734101EE0@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4699 Modified Files: Tag: kolab_2_0_branch obmtool.conf Log Message: update package versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.174.2.35 retrieving revision 1.174.2.36 diff -u -d -r1.174.2.35 -r1.174.2.36 --- obmtool.conf 11 Jul 2006 13:37:06 -0000 1.174.2.35 +++ obmtool.conf 10 Aug 2006 16:39:09 -0000 1.174.2.36 @@ -139,13 +139,13 @@ @trigger ${loc}spamassassin-3.0.3-2.4.1 @install ${plusloc}amavisd-2.3.1-2.4.0 @install ${loc}curl-7.14.0-2.4.0 - @install ${altloc}clamav-0.88.2-2.20060622 + @install ${altloc}clamav-0.88.4-20060809 @install ${loc}vim-6.3.78-2.4.0 @install ${plusloc}dcron-2.9-2.4.0 - @install ${altloc}perl-kolab-5.8.7-2.0_20051219 - @install ${altloc}kolabd-1.9.4-20060111 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20060111 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20060308 --define kolab_version=$kolab_version + @install ${altloc}perl-kolab-5.8.7-2.0_20060430 + @install ${altloc}kolabd-1.9.4-20060707 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20060707 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20060809 --define kolab_version=$kolab_version @check if test ! -e "/usr/bin/kolab" ; then From cvs at kolab.org Thu Aug 10 18:43:32 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 10 Aug 2006 18:43:32 +0200 (CEST) Subject: bh: server release-notes.txt,1.15.2.15,1.15.2.16 Message-ID: <20060810164332.598CB101EE1@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4811 Modified Files: Tag: kolab_2_0_branch release-notes.txt Log Message: updates for 2.0.4 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.15.2.15 retrieving revision 1.15.2.16 diff -u -d -r1.15.2.15 -r1.15.2.16 --- release-notes.txt 21 Jun 2006 12:33:06 -0000 1.15.2.15 +++ release-notes.txt 10 Aug 2006 16:43:30 -0000 1.15.2.16 @@ -14,13 +14,37 @@ - Security Fixes: - clamav-??? + clamav-0.88.4-20060809 + binutils-2.16.1-2.4.1 + openldap-2.2.27-2.4.1_kolab - - kolabd 1.9.4-20060111 -> 1.9.4-2006???? + Kolab updates: - * Fixing: + - perl-kolab + + Resolved: + Issue1210 (large replog makes kolabd slow) + + - kolabd 1.9.4-20060111 -> 1.9.4-2006???? + + Added missing relay service + + Resolved: Issue1274 (Sending mail as internal user doesn't work) + - kolab-webadmin + + Resolved: + Issue848 (external address in dist. list) + + - kolab-resource-handlers + Resolved: + Issue966 (Wrong CN for resource accounts) + Issue973 (quoting and rewriting From header) + Issue1042 (server modifies email attachment content) + Issue1195 (Better error message when lmtp fails) + Issue1243 (problem when rewriting "quoted printable" from headers) + Issue1245 (problem when rewriting folded from headers) $Id$ From cvs at kolab.org Fri Aug 11 18:01:55 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:01:55 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.69.2.5, 1.69.2.6 Message-ID: <20060811160155.795E51005AF@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv10434/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: Tag: kolab_2_0_branch resmgr.php Log Message: Fix for Issue1352 Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php,v retrieving revision 1.69.2.5 retrieving revision 1.69.2.6 diff -u -d -r1.69.2.5 -r1.69.2.6 --- resmgr.php 10 Aug 2006 16:33:34 -0000 1.69.2.5 +++ resmgr.php 11 Aug 2006 16:01:53 -0000 1.69.2.6 @@ -1038,7 +1038,7 @@ $recurrence->setRange( $rrule['COUNT']); } else if( $rrule['UNTIL'] ) { $range_node->append_child( $kolab_xml->create_attribute( 'type', 'date' )); - $range_node->append_child($kolab_xml->create_text_node($rrule['UNTIL'])); + $range_node->append_child($kolab_xml->create_text_node(gmstrftime('%Y-%m-%d', $itip->_parseDateTime($rrule['UNTIL'])))); $recurrence->setRangetype('date'); $recurrence->setRange( $rrule['UNTIL']); } else { From cvs at kolab.org Fri Aug 11 18:02:58 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:02:58 +0200 (CEST) Subject: bh: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.126.2.17, 1.126.2.18 Makefile, 1.9.2.6, 1.9.2.7 Message-ID: <20060811160258.3540C1005AF@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv10479/kolab-resource-handlers Modified Files: Tag: kolab_2_0_branch kolab-resource-handlers.spec Makefile Log Message: New package version Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.126.2.17 retrieving revision 1.126.2.18 diff -u -d -r1.126.2.17 -r1.126.2.18 --- kolab-resource-handlers.spec 10 Aug 2006 16:34:10 -0000 1.126.2.17 +++ kolab-resource-handlers.spec 11 Aug 2006 16:02:56 -0000 1.126.2.18 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20060809 +Release: 20060811 Class: JUNK License: GPL Group: MAIL Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v retrieving revision 1.9.2.6 retrieving revision 1.9.2.7 diff -u -d -r1.9.2.6 -r1.9.2.7 --- Makefile 10 Aug 2006 16:34:10 -0000 1.9.2.6 +++ Makefile 11 Aug 2006 16:02:56 -0000 1.9.2.7 @@ -4,7 +4,7 @@ PACKAGE=kolab-resource-handlers VERSION = 0.3.9 -RELEASE=20060809 +RELEASE=20060811 PEARVERSION = 1.3 RPM = /kolab/bin/openpkg rpm From cvs at kolab.org Fri Aug 11 18:10:10 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:10:10 +0200 (CEST) Subject: bh: server/apache cve-2006-3747.patch, NONE, 1.1.2.1 kolab.patch, 1.5.2.4, 1.5.2.5 Makefile, 1.16.2.5, 1.16.2.6 Message-ID: <20060811161010.99D341005A5@lists.intevation.de> Author: bh Update of /kolabrepository/server/apache In directory doto:/tmp/cvs-serv10765/apache Modified Files: Tag: kolab_2_0_branch kolab.patch Makefile Added Files: Tag: kolab_2_0_branch cve-2006-3747.patch Log Message: Add a patch with a security fix (CVE-2006-3747). New apache package version --- NEW FILE: cve-2006-3747.patch --- Index: apache_1.3.33/src/modules/standard/mod_rewrite.c --- apache_1.3.33/src/modules/standard/mod_rewrite.c.orig 2004-10-27 16:23:04 +0200 +++ apache_1.3.33/src/modules/standard/mod_rewrite.c 2006-07-27 19:28:17 +0200 @@ -2735,7 +2735,7 @@ int c = 0; token[0] = cp = ap_pstrdup(p, cp); - while (*cp && c < 5) { + while (*cp && c < 4) { if (*cp == '?') { token[++c] = cp + 1; *cp = '\0'; Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/apache/kolab.patch,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -u -d -r1.5.2.4 -r1.5.2.5 --- kolab.patch 6 Jan 2006 14:58:36 -0000 1.5.2.4 +++ kolab.patch 11 Aug 2006 16:10:08 -0000 1.5.2.5 @@ -1,15 +1,15 @@ ---- ../apache.orig/apache.spec 2005-12-03 18:51:46.000000000 +0100 -+++ apache.spec 2005-12-19 13:50:36.000000000 +0100 -@@ -65,7 +65,7 @@ Class: BASE +--- apache.spec.orig 2006-08-11 14:46:27.797248675 +0200 ++++ apache.spec 2006-08-11 14:48:06.187439457 +0200 +@@ -65,7 +65,7 @@ Group: Web License: ASF Version: %{V_apache} -Release: 2.4.5 -+Release: 2.4.5_kolab ++Release: 2.4.5_kolab2 # package options (suexec related) %option with_suexec yes -@@ -215,6 +215,10 @@ Patch2: apache.patch.php +@@ -215,6 +215,11 @@ Patch3: http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz Patch4: apache.patch.modssl Patch5: apache.patch.suphp @@ -17,10 +17,19 @@ +Patch7: php-getacl-backport.patch +Patch8: php-imap-annotation.patch +Patch9: php-imap-status-current.patch ++Patch10: cve-2006-3747.patch # build information Prefix: %{l_prefix} -@@ -529,6 +533,9 @@ AutoReqProv: no +@@ -495,6 +500,7 @@ + # unpack Apache distribution + %setup -q -c + %patch -p0 ++ %patch -p0 -P 10 + %{l_shtool} subst \ + -e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%s"}";g' \ + apache_%{V_apache}/src/os/unix/os.h +@@ -529,6 +535,9 @@ %if "%{with_mod_php_hardened}" == "yes" %patch -p1 -P 3 %endif @@ -30,7 +39,7 @@ ) || exit $? %endif %if "%{with_mod_dav}" == "yes" -@@ -563,6 +570,7 @@ AutoReqProv: no +@@ -563,6 +572,7 @@ %endif %if "%{with_mod_auth_ldap}" == "yes" %setup -q -T -D -a 14 Index: Makefile =================================================================== RCS file: /kolabrepository/server/apache/Makefile,v retrieving revision 1.16.2.5 retrieving revision 1.16.2.6 diff -u -d -r1.16.2.5 -r1.16.2.6 --- Makefile 11 Jan 2006 04:42:40 -0000 1.16.2.5 +++ Makefile 11 Aug 2006 16:10:08 -0000 1.16.2.6 @@ -11,7 +11,7 @@ PACKAGE=apache VERSION=1.3.33 RELEASE=2.4.5 -KOLABRELEASE=2.4.5_kolab +KOLABRELEASE=2.4.5_kolab2 RPM=/kolab/bin/openpkg rpm KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)` @@ -20,6 +20,7 @@ $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm cp $(KOLABCVSDIR)/mod_auth_ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/ + cp $(KOLABCVSDIR)/cve-2006-3747.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/../php/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/../php/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/../php/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/ From cvs at kolab.org Fri Aug 11 18:10:44 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:10:44 +0200 (CEST) Subject: bh: server README.1st,1.23.2.10,1.23.2.11 Message-ID: <20060811161044.858041005A5@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv10799 Modified Files: Tag: kolab_2_0_branch README.1st Log Message: Updates for the 2.0.4 release Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.23.2.10 retrieving revision 1.23.2.11 diff -u -d -r1.23.2.10 -r1.23.2.11 --- README.1st 11 Jan 2006 16:26:34 -0000 1.23.2.10 +++ README.1st 11 Aug 2006 16:10:42 -0000 1.23.2.11 @@ -280,4 +280,10 @@ There's nothing special to be done. +Upgrade from 2.0.3 to 2.0.4 +--------------------------- + +There's nothing special to be done. + + $Id$ From cvs at kolab.org Fri Aug 11 18:24:45 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:24:45 +0200 (CEST) Subject: bh: server release-notes.txt,1.15.2.16,1.15.2.17 Message-ID: <20060811162445.DED971005A5@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv10956 Modified Files: Tag: kolab_2_0_branch release-notes.txt Log Message: Updates for the 2.0.4 release Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.15.2.16 retrieving revision 1.15.2.17 diff -u -d -r1.15.2.16 -r1.15.2.17 --- release-notes.txt 10 Aug 2006 16:43:30 -0000 1.15.2.16 +++ release-notes.txt 11 Aug 2006 16:24:43 -0000 1.15.2.17 @@ -1,11 +1,12 @@ Release notes Kolab2 Server -(Version 2006????, Kolab Server 2.0.4) +(Version 20060811, Kolab Server 2.0.4) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. -This release fixes ... +This release fixes several security problems in apache, clamav, openldap +and binutils. See below for more details. Upgrading is recommended. @@ -14,9 +15,20 @@ - Security Fixes: - clamav-0.88.4-20060809 + apache-1.3.33-2.4.5_kolab2 + http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.015-apache.html + OpenPKG hasn't released a fix for this for OpenPKG 2.4 but this + kolab specific apache RPM now contains a patch with the fix for + his issue. + binutils-2.16.1-2.4.1 + http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.009-binutils.html + openldap-2.2.27-2.4.1_kolab + http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.008-openldap.html + + clamav-0.88.4-20060809 + http://kolab.org/security/kolab-vendor-notice-10.txt Kolab updates: @@ -36,15 +48,18 @@ Resolved: Issue848 (external address in dist. list) - + - kolab-resource-handlers Resolved: + Issue815 (invitation replies vanish in resmgr) Issue966 (Wrong CN for resource accounts) Issue973 (quoting and rewriting From header) Issue1042 (server modifies email attachment content) Issue1195 (Better error message when lmtp fails) Issue1243 (problem when rewriting "quoted printable" from headers) Issue1245 (problem when rewriting folded from headers) + Issue1352 (resmgr can create wrong range dates) + $Id$ From cvs at kolab.org Fri Aug 11 18:26:25 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:26:25 +0200 (CEST) Subject: bh: server/kolab-webadmin/kolab-webadmin/www/admin/kolab versions.php, 1.3, 1.3.2.1 Message-ID: <20060811162625.A8B2C1005A5@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab In directory doto:/tmp/cvs-serv11004/kolab-webadmin/kolab-webadmin/www/admin/kolab Modified Files: Tag: kolab_2_0_branch versions.php Log Message: Fix the list of packages that contain kolab specific changes shown on the versions page. Index: versions.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/Attic/versions.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- versions.php 28 Apr 2005 00:16:59 -0000 1.3 +++ versions.php 11 Aug 2006 16:26:23 -0000 1.3.2.1 @@ -24,7 +24,7 @@ // Remember to keep this list up to date when patching packages! $kolabversions = shell_exec("$kolab_prefix/bin/openpkg rpm -q perl-kolab kolabd kolab-resource-handlers kolab-webadmin" ); -$kolabpatchedversions = shell_exec("$kolab_prefix/bin/openpkg rpm -q amavisd apache imapd postfix" ); +$kolabpatchedversions = shell_exec("$kolab_prefix/bin/openpkg rpm -q apache imap imapd openldap php postfix" ); $openpkgversion = shell_exec("$kolab_prefix/bin/openpkg rpm -q openpkg"); $kolabversion = '@kolab_version@'; From cvs at kolab.org Fri Aug 11 18:28:11 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:28:11 +0200 (CEST) Subject: bh: server obmtool.conf,1.174.2.36,1.174.2.37 Message-ID: <20060811162811.4E2D91005A5@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11026 Modified Files: Tag: kolab_2_0_branch obmtool.conf Log Message: update rpm versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.174.2.36 retrieving revision 1.174.2.37 diff -u -d -r1.174.2.36 -r1.174.2.37 --- obmtool.conf 10 Aug 2006 16:39:09 -0000 1.174.2.36 +++ obmtool.conf 11 Aug 2006 16:28:09 -0000 1.174.2.37 @@ -110,7 +110,7 @@ @install ${loc}sed-4.1.4-2.4.0 @install ${loc}libxml-2.6.19-2.4.0 @install ${loc}libxslt-1.1.14-2.4.0 # WARNING: Remove libgcrypt before building! - @install ${altloc}apache-1.3.33-2.4.5_kolab \ + @install ${altloc}apache-1.3.33-2.4.5_kolab2 \ --with=mod_auth_ldap \ --with=mod_dav \ --with=mod_php \ @@ -144,8 +144,8 @@ @install ${plusloc}dcron-2.9-2.4.0 @install ${altloc}perl-kolab-5.8.7-2.0_20060430 @install ${altloc}kolabd-1.9.4-20060707 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20060707 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20060809 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20060810 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20060811 --define kolab_version=$kolab_version @check if test ! -e "/usr/bin/kolab" ; then From cvs at kolab.org Fri Aug 11 18:28:53 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 18:28:53 +0200 (CEST) Subject: bh: server obmtool.conf,1.174.2.37,1.174.2.38 Message-ID: <20060811162853.7A6731005A5@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11061 Modified Files: Tag: kolab_2_0_branch obmtool.conf Log Message: Update kolab server version Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.174.2.37 retrieving revision 1.174.2.38 diff -u -d -r1.174.2.37 -r1.174.2.38 --- obmtool.conf 11 Aug 2006 16:28:09 -0000 1.174.2.37 +++ obmtool.conf 11 Aug 2006 16:28:51 -0000 1.174.2.38 @@ -23,7 +23,7 @@ done %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="2.0.4-cvs-snapshot-20060308"; + kolab_version="2.0.4"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' From cvs at kolab.org Fri Aug 11 20:09:55 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 11 Aug 2006 20:09:55 +0200 (CEST) Subject: bh: doc/www/src index.html.m4,1.88,1.89 Message-ID: <20060811180955.C0B481005DE@lists.intevation.de> Author: bh Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv12813/www/src Modified Files: index.html.m4 Log Message: Add news item for kolab server 2.0.4 Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- index.html.m4 10 Aug 2006 15:58:18 -0000 1.88 +++ index.html.m4 11 Aug 2006 18:09:53 -0000 1.89 @@ -46,6 +46,20 @@
+ + +
August 11th, 2006» + Stable server 2.0.4 maintenance release. +
+
+ This release contains some security fixes, including the one + for Kolab Security + Advisory 10 and bug fixes, most notably several for the + resource manager. +
+

+ +
August 10th, 2006 » Security Advisory 10 for Kolab Server (CVE-2006-4018, ClamAV) From cvs at kolab.org Mon Aug 14 15:51:59 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 14 Aug 2006 15:51:59 +0200 (CEST) Subject: bh: server release-notes.txt,1.15.2.17,1.15.2.18 Message-ID: <20060814135159.7BD671006C8@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv13976 Modified Files: Tag: kolab_2_0_branch release-notes.txt Log Message: Add package version numbers Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.15.2.17 retrieving revision 1.15.2.18 diff -u -d -r1.15.2.17 -r1.15.2.18 --- release-notes.txt 11 Aug 2006 16:24:43 -0000 1.15.2.17 +++ release-notes.txt 14 Aug 2006 13:51:57 -0000 1.15.2.18 @@ -32,24 +32,24 @@ Kolab updates: - - perl-kolab + - perl-kolab 5.8.7-2.0_20051219 -> 5.8.7-2.0_20060430 Resolved: Issue1210 (large replog makes kolabd slow) - - kolabd 1.9.4-20060111 -> 1.9.4-2006???? + - kolabd 1.9.4-20060111 -> 1.9.4-20060707 Added missing relay service Resolved: Issue1274 (Sending mail as internal user doesn't work) - - kolab-webadmin + - kolab-webadmin 0.4.0-20060111 -> 0.4.0-20060810 Resolved: Issue848 (external address in dist. list) - - kolab-resource-handlers + - kolab-resource-handlers 0.3.9-20060111 -> 0.3.9-20060811 Resolved: Issue815 (invitation replies vanish in resmgr) From cvs at kolab.org Mon Aug 14 15:57:42 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 14 Aug 2006 15:57:42 +0200 (CEST) Subject: bh: doc/www/src index.html.m4,1.89,1.90 Message-ID: <20060814135742.B48D31006C8@lists.intevation.de> Author: bh Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv14089/www/src Modified Files: index.html.m4 Log Message: Remove the link to Kolab Security Advisory 10 from the server 2.0.4 announcement because it confuses users. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- index.html.m4 11 Aug 2006 18:09:53 -0000 1.89 +++ index.html.m4 14 Aug 2006 13:57:40 -0000 1.90 @@ -52,10 +52,9 @@

- This release contains some security fixes, including the one - for Kolab Security - Advisory 10 and bug fixes, most notably several for the - resource manager. + This release contains some security fixes, including the one for + Kolab Security Advisory 10 and bug fixes, most notably several + for the resource manager.

From cvs at kolab.org Fri Aug 18 13:07:19 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 18 Aug 2006 13:07:19 +0200 (CEST) Subject: bh: doc/www/src index.html.m4,1.90,1.91 Message-ID: <20060818110719.70D441006B7@lists.intevation.de> Author: bh Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv26582/www/src Modified Files: index.html.m4 Log Message: Add a news item about the 2.1.3 kde client release Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- index.html.m4 14 Aug 2006 13:57:40 -0000 1.90 +++ index.html.m4 18 Aug 2006 11:07:17 -0000 1.91 @@ -46,6 +46,19 @@

+ + +
August 18th, 2006» + New version 2.1.3 of proko2 KDE client is available +
+
+ This release contains a few new features and several bug fixes. + A detailed list of the changes can be found in the download + section. +
+

+ +
August 11th, 2006 » Stable server 2.0.4 maintenance release. From cvs at kolab.org Mon Aug 21 15:16:59 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 21 Aug 2006 15:16:59 +0200 (CEST) Subject: bernhard: doc/www/src webclient.html.m4,1.6,1.7 Message-ID: <20060821131659.8B3EB10015A@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv18731 Modified Files: webclient.html.m4 Log Message: Removed outdated horde installation instructions and pointed to two wiki pages. Index: webclient.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/webclient.html.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- webclient.html.m4 18 Jul 2005 07:35:36 -0000 1.6 +++ webclient.html.m4 21 Aug 2006 13:16:57 -0000 1.7 @@ -2,464 +2,32 @@ m4_include(header.html.m4)
This page was updated on:
$Date$
-

Please direct any comments and suggestions about this guide to -Stuart Bingë

-
+

+  +

-NOTE: The webclient is considered EXPERIMENTAL and as such should NOT be -used in production. However, if you're feeling brave and want to help out +NOTE: The Horde webclient is considered EXPERIMENTAL +and as such should NOT be used in production. +However, if you're feeling brave and want to help out with testing & identifying problems with the webclient, your help would be greatly appreciated. You may discuss any issues that you have on the -kolab-devel mailing list. All bugs -should be reported on the Horde bug +kolab-devel mailing list. +All bugs should be reported on the Horde bug tracker.
-
-

Credits and thanks must also go out to the -Horde project, on which the Kolab Webclient -is based. The Kolab Webclient is essentially a composition of several Horde -applications (namely the Horde framework, IMP, Turba, Mnemo, Nag and Kronolith), -with additional code allowing these applications to use a Kolab server as a -groupware backend.

- -

You may also find additional information about the webclient installation -on the Kolab Wiki - if you encounter -problems when installing the webclient be sure to visit the wiki. It is updated -more frequently than this guide and as such will probably contain additional -information to help you out. Specifically, be sure to take a look at the -Kolab2 Installation - Horde -page.

- -

Before you begin with this guide, it is recommended that you put the -following in the ~/.cvsrc file of the user who will be checking -out and installing the webclient code from CVS: -

-cvs -z4 -q
-update -dP
-checkout -P
-diff -u3 -p
-

-
- -
- -

Table of Contents

 -
    - -
  1. Installation -
      -
    1. SQL
      2. -
    2. PEAR
      3. -
    3. Horde
      4. -
    -
    2. - -
  2. Configuration -
      -
    1. LDAP
      2. -
    2. SQL
      3. -
    3. Horde
      4. -
    -
    3. - -
  3. Optional -
      -
    1. PHP Accelerator
      2. -
    2. OPA Script
      3. -
    -
    4. - -
- -
- -
↑ contents
-

1. Installation

 - -
↑ contents
-

1.1. SQL

 - -
-

Horde requires a SQL server to store various server and user data. Several -SQL servers are supported, however only two are covered here (as they are part -of OpenPKG and as such are easy to install alongside Kolab): -MySQL -and -PostgreSQL. -

- -

Select the SQL server that you wish to use above and install the necessary -RPM. With either selection, you will need to recompile your Apache and PHP RPMs -with additional flags in order to allow PHP to support your chosen SQL variant. -For MySQL you'll need: -

---with=mod_php_mysql        # for your apache rpm
---with=mysql                # for your php rpm
-
-and for PostgreSQL you'll need: -
---with=mod_php_pgsql        # for your apache rpm
---with=pgsql                # for your php rpm
-
-in addition to the existing --with flags for both packages, -of course.

- -

For those of you who are interested: the dependency on a SQL server can be -dropped if a LDAP driver is written for the Horde Datatree system, in which case -the same data that would be stored in SQL will be stored in LDAP. This has not -yet been attempted, so for the moment SQL is still needed.

-
- -
↑ contents
-

1.2. PEAR

 - -
-

The Apache package that Kolab 2 uses includes recent versions of several -PEAR packages, however there are a couple of additional packages that you will -need to obtain in order for Horde to operate properly: - -

-# /kolab/bin/pear install -f Net_IMAP Log Mail_Mime File Date
-

- -

If you receive errors about being unable to modify files and directories -because of safe_mode being in effect, then you'll have to modify your -/kolab/etc/php/php.ini file and disable safe mode. The line in -question should look like the following after modification: - -

-safe_mode = off  ; Enable Safe Mode (file UID comparisons)
-

-
- -
↑ contents
-

1.3. Horde

 - -
-

Horde is installed by checking out code from CVS. You'll need to install a -CVS client if you don't already have one, or else you can check out the code -on another machine and simply copy the files across. -Snapshots are also -available via HTTP, so if you do not have access to CVS you can fall back to -these. Installation via CVS is preferred, as updating your Horde installation -is much simpler this way than performing the same operation using snapshot -tarballs. Also note that the HEAD branch of each horde module is required.

- -

Check out the necessary Horde modules from Horde's CVS (instructions from -http://www.horde.org/source/using.php): -

-# cd /kolab/var/kolab/www
-# cvs -d :pserver:cvsread at anoncvs.horde.org:/repository login
-
-(When asked for a password, use 'horde'). -
-# cvs -d :pserver:cvsread at anoncvs.horde.org:/repository checkout horde
-# cd horde
-# cvs -d :pserver:cvsread at anoncvs.horde.org:/repository checkout framework imp kronolith mnemo nag passwd turba ingo
-
-You now need to install the Horde Framework (this must be run within the Kolab -OpenPKG environment, e.g. by using the opa script): -
-# cd framework
-# /kolab/bin/php install-packages.php
-

-

At any time after this point you can update your Horde instance to the latest -available code by simply performing the following commands: -

-# cd /kolab/var/kolab/www/horde
-# cvs update
-
-Be sure to repeat the process to install the Horde Framework when updating CVS, -otherwise you may encounter critical errors when using the webclient. -

- -

Finally, create a data directory that Horde can use: -

-# mkdir -p /kolab/var/horde/vfs
-# chown -R kolab-n:kolab-n /kolab/var/horde
-
-

- -

Most of the following instructions can also be found in the -/kolab/var/kolab/www/horde/docs/INSTALL file, which goes into far -more detail about the installation process than what is presented here. It is -recommended that you read this file to gain a greater understanding of the -Horde installation process - this install guide glosses over many details, only -presenting the major steps that are required to set up Horde specifically for -use as a Kolab 2 client.

-
- -
- -
↑ contents
-

2. Configuration

 - -
↑ contents
-

2.1. LDAP

 - -
-

Horde requires an additional schema file to be installed in order to use -LDAP as a preference backend. Add the following to your -/kolab/etc/kolab/templates/slapd.conf.template after -the existing schema include lines: -

-include /kolab/var/kolab/www/horde/scripts/ldap/horde.schema
-
-Save the template and run /kolab/sbin/kolabconf to regenerate the -configuration file and restart OpenLDAP.

-
- -
↑ contents
-

2.2. SQL

 - -
-

Horde requires its own table within your SQL server to store various -configuration data. You can find instructions on how to configure your database -in the following file: -/kolab/var/kolab/www/horde/scripts/sql/README. Be sure to change -the Horde user's password when setting up the tables, as well as the password of -your database's root user (if applicable).

-
- -
↑ contents
-

2.3. Horde

 - -
-

Firstly you need to install the distribution default configuration files, -present in the config subdirectory within each Horde application -(including the base Horde library itself): -

-# for a in . mnemo nag turba imp ingo kronolith passwd; do cd /kolab/var/kolab/www/horde/$a/config; for f in *.dist; do cp $f `basename $f .dist`; done; done
-
-and then set the correct file permissions: -
-# cd /kolab/var/kolab/www
-# chown -R kolab-n:kolab-n horde
-# chmod -R o-rwx horde
-

- -

Some Horde configuration files need to be edited by hand; the rest can be -auto-generated through the Horde Admin interface. The files you need to edit, -and what needs to be done in each file, is as follows:

- -
-
imp/config/servers.php
-
Delete all the $servers['XXX'] blocks except the -$servers['kolab'] definition (should be right at the end -of the file).
- -
ingo/config/backends.php
-
Delete all the $backends['XXX'] blocks except the -$backends['kolab'] definition (should be right at the end -of the file).
- -
passwd/config/backends.php
-
Delete all the $backends['XXX'] blocks except the -$backends['kolab'] definition (should be right at the end -of the file).
- -
turba/config/sources.php
-
Delete all the $cfgSources['XXX'] blocks except the -$backends['kolab_global'] and $backends['kolab_local'] -definitions (should both be the last two entries in the file).
-
-

- -

You now need to configure all the Horde applications. Log in to your Horde -installation, at http://your.kolab.server/horde/. Once you're in, -click on the Administration link on the sidebar, then the -Setup sub-option. You should see a list of available Horde -applications in the main frame - you now need to go through this list and -configure each Horde application as you please. Click on an entry in this list; -you should be brought to a configuration screen. Go through each tab within -this screen (if there are multiple tabs; otherwise there will just be a single -page) and change any settings as you see fit (although the default options -are usually sufficient if you don't feel comfortable editing all the available -variables). Once you have finished configuring an application, click on the -Generate XXX Configuration button at the bottom of the page to -auto-generate the relevant conf.php file for the specific -application. Repeat this process for every application in the -Configuration page.

- -

To enable Horde to inter-operate with your Kolab server the following -configuration options should be adhered to for each application:

- -
-
Address Book (turba)
-
The default configuration should prove sufficient.
- -
Calendar (kronolith)
-
Select the Kolab driver for both the Calendar -and Free/Busy sections.
- -
Filters (ingo)
-
The default configuration should prove sufficient.
+

+The Horde webclient is discussed on the +Kolab Wiki. +Specifically sections: -

Horde (horde)
-
  • In the Database tab, select the database that you are -using in the top select box. You must also set the password field -to whatever you specified for the horde user when setting up the database.
    • -
  • In the Authentication tab, select Kolab (Cyrus IMAP) -authentication as the authentication backend (should be the last entry -in the drop-down list). You will also need to specify a Kolab account in the -Administrators field in order to re-configure Horde at a later -stage (as well as to complete configuration of the remaining applications!). -It is recommended that you create a Kolab account such as -horde-admin at my.kolab.domain for this purpose.
    • -
  • In the Logging tab, change the Path to the log -file field to /kolab/var/horde/horde.log.
    • -
  • In the Preference System tab, select Kolab (LDAP) -as the preferences driver (again, should be the last entry in the drop-down -list).
    • -
  • In the DataTree System tab, select SQL Database -as the DataTree backend storage. Make sure the Driver configuration -is also set to Horde defaults.
    • -
  • In the Mailer tab, select Use a SMTP server as -the method for sending mail.
    • -
  • In the Virtual File Storage, leave the VFS backend selection -as File on the local system; in the Where on the real -filesystem should Horde use as root of the virtual filesystem? field, -enter /kolab/var/horde/vfs.
    • -
  • Finally, in the Kolab Groupware Server tab, change the -Horde/Kolab integration status field to enabled and -set each field in the resulting screen to the values pertaining to your -specific kolab installation. The most important of these correspond to those -in your /kolab/etc/kolab/kolab.conf file.
    • + -
- -
Mail (imp)
-
You may want to specify the location of the -ispell or aspell binary, if you have one of these -installed, in the External Utilities and Menu tab in order to -allow users to spellcheck their email. There is also the option of using a -gpg binary to provide encryption support to the mail -application.
- -
Notes (mnemo)
-
Select the Kolab driver under the Storage System -section.
- -
Password (passwd)
-
Uncheck the option entitled Should we allow the user to specify the -username?.
- -
Tasks (nag)
-
Select the Kolab driver under the Storage System -section.
-
-

- -
- -
- -
↑ contents
-

3. Optional

 - -
↑ contents
-

3.1. PHP Accelerator

 - -
-

This step is not needed in order for Horde to operate, however it is highly -recommended if you are concerned about the operating speed of the webclient. -This guide instructs on how to install the -ionCube PHP Accelerator, as it -is simple to set up and provides a noticeable performance boost. If you prefer -other accelerators and are able to get them to work with Kolab then please send -instructions on how to install them and we'll add them here.

- -

Download the relevant package for your platform and PHP version from the -ionCube Downloads -Page. As of time of writing for PHP version 4.3.0 running on x86 Linux, -this would be -1.3.3r2. -You should read the INSTALL and CONFIGURATION files -that are distributed with PHPA for details on how to fine-tune performance. -If you just want to quickly set up an accelerated environment for use with -Horde then the following commands should be suitable:

- -
-# cd /tmp
-# gzip -dc php_accelerator*.tgz | tar -xvf -
-# mv php_accelerator*/php_accelerator*.so /kolab/lib
-# chown kolab:kolab /kolab/lib/php_accelerator*.so
-
- -

Add the following to /kolab/etc/kolab/templates/php.ini.template: -

-; PHP Accelerator extension
-zend_extension="/kolab/lib/php_accelerator_1.3.3r2.so"
-
-; This should be as large as you can spare. The default is 8, which is not
-; optimal for a project as large as Horde.
-phpa.shm_size = 16
-
-

- -

It is also recommended that you increase the value of -memory_limit in the same template file to 12M or even -16M, for optimal use with Horde.

- -

Save /kolab/etc/kolab/templates/php.ini.template and run -/kolab/sbin/kolabconf to re-generate PHP's configuration file and -restart Apache. You can test to see if the extension is operational by viewing -the following script through your Kolab web server: -

-<?php phpinfo(); ?>
-
-

- -

You should see something similar to the following after the initial -version information: -

-This program makes use of the Zend Scripting Language Engine:
-Zend Engine v1.3.0, Copyright (c) 1998-2003 Zend Technologies
-with the ionCube PHP Accelerator v1.3.3r2, Copyright (c) 2001-2002,
-by Nick Lindridge
-
-

-
- -
↑ contents
-

3.2. OPA Script

 - -
-

The OPA script is a small shell script used to place the current session in -the Kolab (or indeed any OpenPKG) environment. This is generally needed when -working with the Kolab server; otherwise you run the risk of your base systems' -utilities handling commands instead of the corresponding Kolab programs.

- -

To place yourself in the Kolab environment using the OPA script, you simply -type the following (assuming your kolab hierarchy is stored in the -/kolab directory): -

-# opa /kolab
-

- -

Place this script in your ~/.bashrc file, or other similar such -shell startup file. -

-opa () {
-    root="$1"
-    if [ ! -d $root ]; then
-        echo "opa:ERROR: OpenPKG root directory $root not found"
-        return 1
-    fi
-    if [ ! -f "$root/etc/rc" ]; then
-        echo "opa:ERROR: does not contain OpenPKG hierarchy"
-        return 1
-    fi
-    eval `$root/etc/rc --eval all env`
-}
-
-

- -
m4_include(footer.html.m4) From cvs at kolab.org Tue Aug 22 15:20:36 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 22 Aug 2006 15:20:36 +0200 (CEST) Subject: bh: doc/www/src index.html.m4,1.91,1.92 Message-ID: <20060822132036.739C31006B5@lists.intevation.de> Author: bh Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv892/www/src Modified Files: index.html.m4 Log Message: Add news for KDE Client 2.1.4 Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- index.html.m4 18 Aug 2006 11:07:17 -0000 1.91 +++ index.html.m4 22 Aug 2006 13:20:34 -0000 1.92 @@ -46,6 +46,19 @@
+ + +
August 22th, 2006» + New version 2.1.4 of proko2 KDE client is available +
+
+ This release contains a fix for a bug introduced in 2.1.3. The + bug makes kontact much harder to use when accessing the same + kolab account from multiple machines. +
+

+ +
August 18th, 2006 » New version 2.1.3 of proko2 KDE client is available From cvs at kolab.org Wed Aug 23 19:09:00 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 23 Aug 2006 19:09:00 +0200 (CEST) Subject: bernhard: doc/www/src footer.html.m4,1.35,1.36 Message-ID: <20060823170900.7436B1005DA@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22006 Modified Files: footer.html.m4 Log Message: added a "www" in https://www.intevation.de/roundup/kolab/ this seems to be better for some people (though I do not know why). Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- footer.html.m4 8 Jan 2006 11:13:04 -0000 1.35 +++ footer.html.m4 23 Aug 2006 17:08:58 -0000 1.36 @@ -62,7 +62,7 @@ Archive | Subscribe/Manage

-Bug/Wish Tracker

LINK(`howtos.html', `HOWTOs') From cvs at kolab.org Thu Aug 24 16:39:27 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 24 Aug 2006 16:39:27 +0200 (CEST) Subject: bernhard: doc/www/src roadmap.html.m4,1.8,1.9 Message-ID: <20060824143927.2C8F81006CA@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv30594 Modified Files: roadmap.html.m4 Log Message: 2.0.4 is current. Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- roadmap.html.m4 30 Jun 2006 14:38:16 -0000 1.8 +++ roadmap.html.m4 24 Aug 2006 14:39:25 -0000 1.9 @@ -20,13 +20,12 @@

Kolab Server 2.0 release series

-Current release is: 2.0.3. +Current release is: 2.0.4 (20060811)

Further Server 2.0.x releases

-The maintenance of the 2.0-branch includes security fixes and -possible upgrades of OpenPKG if necessary until Server 2.1.x -are released and offer an upgrade path. +The maintenance of the 2.0-branch will include security or +other important fixes.

Other fixes and some feature improvemtents (perhaps backports from From cvs at kolab.org Fri Aug 25 11:00:07 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 25 Aug 2006 11:00:07 +0200 (CEST) Subject: bernhard: doc/www/src download.html.m4,1.10,1.11 Message-ID: <20060825090007.262C8100160@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv29278 Modified Files: download.html.m4 Log Message: * Mentioned KK directly for server as well. * Added link to the ReleaseNotes (History) for the KDE Proko2 client. Index: download.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/download.html.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- download.html.m4 6 Dec 2005 12:05:30 -0000 1.10 +++ download.html.m4 25 Aug 2006 09:00:04 -0000 1.11 @@ -77,7 +77,8 @@

Uptodate, tested and supported packages for specific distributions -are available by Klarälvdalens Datakonsult AB and Intevation GmbH. +can be order from the +Kolab Konsortium.

KDE Client for Kolab Server 2.0

@@ -101,6 +102,12 @@ From time to time, releases and packages are made available of this branch. See the "kde-client" section on the download servers. +The +ReleaseNote History shows when specific problems were fixed and features +added. + + These are collateral results of the following commercial activities:

From cvs at kolab.org Fri Aug 25 18:51:25 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 25 Aug 2006 18:51:25 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers ChangeLog, 1.17, 1.18 Message-ID: <20060825165125.611D01005A4@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers In directory doto:/tmp/cvs-serv18431/kolab-resource-handlers/kolab-resource-handlers Modified Files: ChangeLog Log Message: Apply patch to fix Issue1352. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChangeLog 31 Jul 2006 18:52:30 -0000 1.17 +++ ChangeLog 25 Aug 2006 16:51:23 -0000 1.18 @@ -1,3 +1,7 @@ +2006-08-25 Bernhard Herzog + + * resmgr/resmgr.php.in: Apply patch to fix Issue1352. + 2006-07-31 Bernhard Herzog * resmgr/resmgr.php.in: Further fix for Issue957: From cvs at kolab.org Fri Aug 25 18:51:25 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 25 Aug 2006 18:51:25 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.8, 1.9 Message-ID: <20060825165125.57723100160@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv18431/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: resmgr.php.in Log Message: Apply patch to fix Issue1352. Index: resmgr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- resmgr.php.in 3 Aug 2006 03:12:40 -0000 1.8 +++ resmgr.php.in 25 Aug 2006 16:51:23 -0000 1.9 @@ -1067,7 +1067,7 @@ $recurrence->setRange( $rrule['COUNT']); } else if( $rrule['UNTIL'] ) { $range_node->append_child( $kolab_xml->create_attribute( 'type', 'date' )); - $range_node->append_child($kolab_xml->create_text_node($rrule['UNTIL'])); + $range_node->append_child($kolab_xml->create_text_node(gmstrftime('%Y-%m-%d', $itip->_parseDateTime($rrule['UNTIL'])))); $recurrence->setRangetype('date'); $recurrence->setRange( $rrule['UNTIL']); } else { From cvs at kolab.org Mon Aug 28 13:03:04 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Aug 2006 13:03:04 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd/templates main.cf.template, 1.15.2.5, 1.15.2.6 Message-ID: <20060828110304.C6DFA1005AD@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv23383 Modified Files: Tag: kolab_2_0_branch main.cf.template Log Message: Made email masquerading more predictable which might prevent loss of email when addressed to some at machine.example.org. Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/main.cf.template,v retrieving revision 1.15.2.5 retrieving revision 1.15.2.6 diff -u -d -r1.15.2.5 -r1.15.2.6 --- main.cf.template 11 Jan 2006 14:23:57 -0000 1.15.2.5 +++ main.cf.template 28 Aug 2006 11:03:02 -0000 1.15.2.6 @@ -32,7 +32,10 @@ # masquerade_domains = $mydomain -masquerade_exceptions = root +# Kolab Server does _not_ want to forward to local machines by default, +# so we can add "envelope_recipient" to masquerade_classes: +masquerade_classes = envelope_sender, envelope_recipient, + header_sender, header_recipient # smtp daemon #smtpd_banner = $myhostname ESMTP $mail_name From cvs at kolab.org Mon Aug 28 13:08:11 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Aug 2006 13:08:11 +0200 (CEST) Subject: bernhard: server release-notes.txt,1.15.2.18,1.15.2.19 Message-ID: <20060828110811.8B25A1005B6@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23686 Modified Files: Tag: kolab_2_0_branch release-notes.txt Log Message: Releasenote entry for main.cf change. Typo fix for kolabd/kolabd/doc/README.webgui. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.15.2.18 retrieving revision 1.15.2.19 diff -u -d -r1.15.2.18 -r1.15.2.19 --- release-notes.txt 14 Aug 2006 13:51:57 -0000 1.15.2.18 +++ release-notes.txt 28 Aug 2006 11:08:09 -0000 1.15.2.19 @@ -1,6 +1,15 @@ Release notes Kolab2 Server -(Version 20060811, Kolab Server 2.0.4) +(Version CVS, Kolab Server 2.0.x) + +Changes since 2.0.4: + - kolabd + + Changed main.cf email masquerading defaults + so that email to usera at machine.example.org + that reaches the server machine is actually delivered. + +(Version 20060811, Kolab Server 2.0.4) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. From cvs at kolab.org Mon Aug 28 13:08:11 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Aug 2006 13:08:11 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd/doc README.webgui,1.1,1.1.2.1 Message-ID: <20060828110811.A5EA91005C0@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/doc In directory doto:/tmp/cvs-serv23686/kolabd/kolabd/doc Modified Files: Tag: kolab_2_0_branch README.webgui Log Message: Releasenote entry for main.cf change. Typo fix for kolabd/kolabd/doc/README.webgui. Index: README.webgui =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/doc/Attic/README.webgui,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- README.webgui 11 Apr 2005 01:05:16 -0000 1.1 +++ README.webgui 28 Aug 2006 11:08:09 -0000 1.1.2.1 @@ -34,7 +34,7 @@ 2) Controlling access for regular users to the LDAP attributes of the -user's account object. If it possible to change which LDAP attributes +user's account object. It is possible to change which LDAP attributes are shown to users on the user page. For each attribute in the user form, an entry in the array $params['attribute_access'] in @l_prefix@/etc/kolab/templates/session_vars.php can be made. The key @@ -57,4 +57,4 @@ $param['attribute_access'] = array( 'title' => 'ro', 'telephoneNumber' => 'ro', - 'c' => 'hidden' ); \ No newline at end of file + 'c' => 'hidden' ); From cvs at kolab.org Mon Aug 28 13:15:13 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Aug 2006 13:15:13 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd/doc README.webgui.in,1.4,1.5 Message-ID: <20060828111513.4A43C1005C0@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/doc In directory doto:/tmp/cvs-serv23803/doc Modified Files: README.webgui.in Log Message: * templates/master.cf.template.in: added envelope_recipient to masquerade_classes. According to Postfix' documention it was missing to allow for delivery to local machines, which we do not want to do in a standard Kolab Server setup. Removed the masquerade_exceptions = root line, as we can get the information where an email to root at machine came from also from the connection itself and it is good to be closer to the default. * Resolved conflict in doc/README.webgui.in. Index: README.webgui.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.webgui.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README.webgui.in 25 Jan 2006 21:55:22 -0000 1.4 +++ README.webgui.in 28 Aug 2006 11:15:10 -0000 1.5 @@ -34,7 +34,7 @@ 2) Controlling access for regular users to the LDAP attributes of the -user's account object. It it possible to change which LDAP attributes +user's account object. It is possible to change which LDAP attributes are shown to users on the user page. For each attribute in the user form, an entry in the array $params['attribute_access'] in @sysconfdir@/kolab/templates/session_vars.php can be made. The key From cvs at kolab.org Mon Aug 28 13:15:13 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Aug 2006 13:15:13 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd ChangeLog,1.76,1.77 Message-ID: <20060828111513.198121005B6@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv23803 Modified Files: ChangeLog Log Message: * templates/master.cf.template.in: added envelope_recipient to masquerade_classes. According to Postfix' documention it was missing to allow for delivery to local machines, which we do not want to do in a standard Kolab Server setup. Removed the masquerade_exceptions = root line, as we can get the information where an email to root at machine came from also from the connection itself and it is good to be closer to the default. * Resolved conflict in doc/README.webgui.in. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- ChangeLog 26 Jun 2006 16:41:16 -0000 1.76 +++ ChangeLog 28 Aug 2006 11:15:10 -0000 1.77 @@ -1,3 +1,13 @@ +2006-08-28 Bernhard Reiter + + * templates/master.cf.template.in: added envelope_recipient + to masquerade_classes. According to Postfix' documention it was + missing to allow for delivery to local machines, which we do + not want to do in a standard Kolab Server setup. + Removed the masquerade_exceptions = root line, as we can get + the information where an email to root at machine came from also + from the connection itself and it is good to be closer to the default. + 2006-06-26 Thomas Arendsen Hein * templates/master.cf.template.in: Updated postfix master.cf.template From cvs at kolab.org Mon Aug 28 13:15:13 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 28 Aug 2006 13:15:13 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd/templates main.cf.template.in, 1.9, 1.10 Message-ID: <20060828111513.4BE731005C5@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv23803/templates Modified Files: main.cf.template.in Log Message: * templates/master.cf.template.in: added envelope_recipient to masquerade_classes. According to Postfix' documention it was missing to allow for delivery to local machines, which we do not want to do in a standard Kolab Server setup. Removed the masquerade_exceptions = root line, as we can get the information where an email to root at machine came from also from the connection itself and it is good to be closer to the default. * Resolved conflict in doc/README.webgui.in. Index: main.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- main.cf.template.in 26 Mar 2006 18:47:02 -0000 1.9 +++ main.cf.template.in 28 Aug 2006 11:15:11 -0000 1.10 @@ -47,7 +47,10 @@ # masquerade_domains = $mydomain -masquerade_exceptions = root +# Kolab Server does _not_ want to forward to local machines by default, +# so we can add "envelope_recipient" to masquerade_classes: +masquerade_classes = envelope_sender, envelope_recipient, + header_sender, header_recipient # smtp daemon #smtpd_banner = $myhostname ESMTP $mail_name From cvs at kolab.org Wed Aug 30 17:22:49 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 30 Aug 2006 17:22:49 +0200 (CEST) Subject: wilde: utils/admin skiplistsafe.sh, NONE, 1.1 skiplistsafe.conf, NONE, 1.1 skiplistsafe.README, NONE, 1.1 save-annotations.README, 1.2, 1.3 Message-ID: <20060830152249.8633E1005C0@lists.intevation.de> Author: wilde Update of /kolabrepository/utils/admin In directory doto:/tmp/cvs-serv31159 Modified Files: save-annotations.README Added Files: skiplistsafe.sh skiplistsafe.conf skiplistsafe.README Log Message: Added skiplistsafe, a more generic replacement for save-annotations. This can be used to backup/validate any skiplist db files (annotations.db and mailboxes.db in case of Kolab). save-annotations is now deprecated. --- NEW FILE: skiplistsafe.sh --- #!/bin/bash # ------------------------------------------------------------------- # Copyright (C) 2006 by Intevation GmbH # Author(s): # Sascha Wilde # This program is free software under the GNU GPL (>=v2) # Read the file COPYING coming with the software for details. # ------------------------------------------------------------------- # $Id: skiplistsafe.sh,v 1.1 2006/08/30 15:22:47 wilde Exp $ # Description: # Backup and check skiplist db files. # The checks are done using validate-skiplist # As the kolab/cyrus-imap skiplist files (especially annotations.db) # tends to break on a regular basis, this script should be setup as a # cronjob to backup them. # This script: # - backups the given skiplist file # - checks if the backup file is a valid skiplist db # - informs the admin if it isn't # - removes old backups if everything worked fine # Usage: # skiplistsafe FILENAME # For more details and hints on configuration please consult # skiplistsafe.README # Configuration can be done in /kolab/etc/imapd/skiplistsafe.conf # Don't change anything in this script! # ------------------------------------------------------------------- if [ ! $# -eq 1 ] ; then echo "Usage: $0 FILENAME" exit 1 fi DBFILE="$1" CONF_DIR=/kolab/etc/imapd CONF_GENERIC="${CONF_DIR}/skiplistsafe.conf" CONF_PERFILE="${CONF_DIR}/skiplistsafe-`basename $DBFILE`.conf" # BEGIN default values: ADMIN_MAIL=root at localhost ERROR_SENDER=postmaster@`hostname -f` SKIPLIST_DIR=/kolab/var/imapd BACKUP_DIR=/tmp/backuptest BACKUP_LIVESPAN=7 USER=kolab-r CHECK_CYRUSDB=/kolab/bin/validate-skiplist COPY="/usr/bin/rsync" COMPRESS="/bin/gzip -9" SENDMAIL=/kolab/sbin/sendmail # END default values # Read configuration files [ -r "$CONF_GENERIC" ] && . "$CONF_GENERIC" [ -r "$CONF_PERFILE" ] && . "$CONF_PERFILE" # Setup absolute filenames [ "${DBFILE:0:1}" != "/" ] && DBFILE="${SKIPLIST_DIR}/${DBFILE}" BACKUP_FILE="${BACKUP_DIR}/`basename $DBFILE`-`date +%Y%m%d-%H%M%S`" # Change identity if necessary if [ `whoami` != "$USER" ] ; then if [ $UID -eq 0 ] ; then exec su -p - $USER "$0" "$1" else echo >&2 "$0 must be run as $USER or root!" exit 1 fi fi # Error handling functions: reporterr() { $SENDMAIL $ADMIN_MAIL \ < To: <${ADMIN_MAIL}> Subject: Skiplistsafe Error X-Skiplistsave-Error: generated on $HOSTNAME $0 reported error: $1 EOF } fatal() { reporterr "$1" exit 1 } # Worker functions: backup-skiplist() { [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR" $COPY >/dev/null 2>&1 "$DBFILE" "$BACKUP_FILE" || \ fatal "FATAL: \"$COPY $DBFILE $BACKUP_FILE\" failed with returncode $?" } check-backup() { $CHECK_CYRUSDB "$BACKUP_FILE" >/dev/null 2>&1 } compress-backup() { if [ "$COMPRESS" ] ; then $COMPRESS >/dev/null 2>&1 "$BACKUP_FILE" || \ reporterr "Compression failed: \"$COMPRESS $BACKUP_FILE\" returened $?" fi } expunge-old-backups() { find "$BACKUP_DIR" \ -type f -name "`basename $DBFILE`-*.gz" \! -mtime -$BACKUP_LIVESPAN \ -exec rm \{\} \; } # ------------------------------------------------------------------- # Main routine: if [ -f "$DBFILE" ] ; then backup-skiplist check-backup check_success=$? if [ ! $check_success -eq 0 ] ; then reporterr "BROKEN DB: check of $BACKUP_FILE failed. Kolab most likely stoped working!" mv "$BACKUP_FILE" "${BACKUP_FILE}_CORRUPT" BACKUP_FILE="${BACKUP_FILE}_CORRUPT" fi compress-backup [ $check_success -eq 0 ] && \ expunge-old-backups else fatal "FATAL: File \"$DBFILE\" does not exist." fi --- NEW FILE: skiplistsafe.conf --- # -------------------------------------------------------------------- # skiplistsafe exsample configuration file # # $Id: skiplistsafe.conf,v 1.1 2006/08/30 15:22:47 wilde Exp $ # ------------------------------------------------------------------- # Copyright (C) 2006 by Intevation GmbH # Author(s): # Sascha Wilde # This program is free software under the GNU GPL (>=v2) # Read the file COPYING coming with the software for details. # ------------------------------------------------------------------- # -------------------------------------------------------------------- # Copy this file to /kolab/etc/imapd/skiplistsafe.conf # And set variables acording to your needs. # IMPORTAINT NOTE: # This is a shell script which is sourced everytime skiplistsafe is run! # -------------------------------------------------------------------- # Error-reports will be send to this address: # (Default: root at localhost) ADMIN_MAIL=root at localhost # Error-reports will have this from address: # (Default: postmaster@`hostname -f`) ERROR_SENDER=postmaster@`hostname -f` # Default directory holding the skiplist files, # if no absolute filename is given as argument to skiplistsafe # this directory is searched: # (Default: /kolab/var/imapd) SKIPLIST_DIR=/kolab/var/imapd # Directory of the backups: # This must be writeable for $USER (see below) # (Default: /tmp/backuptest) BACKUP_DIR=/tmp/backuptest # Keep backup files for N days: # (DEFAULT: 7) BACKUP_LIVESPAN=7 # Run this script as user: # The user must be able to read $ANNOTATIONSDB and to write to $BACKUP_DIR # (Default: kolab-r) USER=kolab-r # Commands used: # - to validate skiplist # (Default: /kolab/bin/validate-skiplist) CHECK_CYRUSDB=/kolab/bin/validate-skiplist # - to copy annotations.db to backup # (Default: "/usr/bin/rsync") COPY="/usr/bin/rsync" # - to compress file, for no compression leave empty # (Default: "/bin/gzip -9") COMPRESS="/bin/gzip -9" # sendmail used to send error-reports # THIS HAS TO BE CORRECT OR ANY ERROR-REPORTING WILL FAIL!!! # (Default: /kolab/sbin/sendmail) SENDMAIL=/kolab/sbin/sendmail --- NEW FILE: skiplistsafe.README --- ====================================================================== skiplistsafe.sh ====================================================================== Backup skiplist db file and check if it's broken. The cyrus imap skiplist db files (especially annotations.db) are known to get corrupted easily and to be hard to recover . Therefor skiplistsafe was created to be installed on an kolab-server as a cronjob. It can backup skiplist files (annotations.db, mailboxes.db in case of a kolab standard installation) and warn the administrator if the current skiplist file is broken. The warning will be sent by email, so make sure you can read your mails even when the kolab-server fails! Usage ----- skiplistsafe.sh FILENAME where FILENAME is the name of the skiplist db file which should be backuped and validated. FILENAME can be a absolute filename or only the files base name (for example "annotations.db"), in which case skiplistsafe uses the configured SKIPLIST_DIR to find it (defaults to /kolab/var/imapd). Prerequisites ------------- validate-skiplist must be installed: - Build it from the included source file: gcc -O2 validate-skiplist.c -o validate-skiplist - Copy (as root) validate-skiplist anywhere you like. The default configuration of save-annotations.sh expects it in /kolab/bin: cp validate-skiplist /kolab/bin Installation ------------ - Copy skiplistsafe.conf to /kolab/etc/imapd/skiplistsafe.conf and edit it according to your needs: read the comments and set the variables in the script to meaningful values. Most defaults should be sensible for a standard kolab installation. In addition you can make extra configurations per skiplist db you want to backup (for example if you want to backup annotations.db and mailboxes.db in different directories). To do this create a file /kolab/etc/imapd/skiplistsafe-DBFILE.conf where DBFILE is the name of the skiplist db you want to backup. Put the settings specific for this backup into that file. Example: You have set BACKUP_DIR=/backup/kolab-imapd but want the backups for the annotations.db (and only them) to go to /backup/annotations, so you put the line "BACKUP_DIR=/backup/annotations" in /kolab/etc/imapd/skiplistsafe-annotations.db.conf and you are done. - Make skiplistsafe.sh executable if it isn't: chmod 755 skiplistsafe.sh - Copy (as root) skiplistsafe.sh anywhere you like, eg: cp skiplistsafe.sh /kolab/sbin - Make an entry in /etc/crontab to run skiplistsafe.sh on a regular basis for all skiplist dbs wou want to backup. If the last working update is not up to date, recovering the lost information will be difficult and painful, so more often is better. This example runs skiplistsafe every hour on annotations.db and mailboxes.db: 0 * * * * kolab-r /kolab/sbin/skiplistsafe.sh annotations.db 0 * * * * kolab-r /kolab/sbin/skiplistsafe.sh mailboxes.db Now: read your mails, and if for example the annotations.db gets corrupted put the last working backup in place: zcat PATH/TO/BACKUP/annotations.db-20060124-08:01:01.gz >/kolab/var/imapd/annotations.db Index: save-annotations.README =================================================================== RCS file: /kolabrepository/utils/admin/save-annotations.README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- save-annotations.README 29 Mar 2006 11:29:02 -0000 1.2 +++ save-annotations.README 30 Aug 2006 15:22:47 -0000 1.3 @@ -1,3 +1,8 @@ +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + THE save-annotations SCRIPT IS DEPRECATED + PLEASE USE skiplistsafe INSTEAD! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + save-annotations ================ From cvs at kolab.org Thu Aug 31 12:19:22 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 31 Aug 2006 12:19:22 +0200 (CEST) Subject: steffen: server/imapd Makefile,1.27,1.28 Message-ID: <20060831101922.B3D8C1006CB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv6185 Modified Files: Makefile Log Message: updated broken Makefile Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Makefile 20 Dec 2005 09:18:50 -0000 1.27 +++ Makefile 31 Aug 2006 10:19:20 -0000 1.28 @@ -25,6 +25,7 @@ cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for imapd.spec cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for case insensitive group match cp $(KOLABCVSDIR)/imapd-goodchars.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for allowing special chars in mailbox names + cp $(KOLABCVSDIR)/imapd.folderchar.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/ cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes' --define 'with_goodchars yes' --define 'with_morelogging yes' From cvs at kolab.org Thu Aug 31 15:02:54 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 31 Aug 2006 15:02:54 +0200 (CEST) Subject: steffen: server Makefile,1.9,1.10 Message-ID: <20060831130254.C245F1006D3@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv15786 Modified Files: Makefile Log Message: it seems someone changed the clamav version without updating this Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 8 Mar 2006 20:18:40 -0000 1.9 +++ Makefile 31 Aug 2006 13:02:52 -0000 1.10 @@ -14,5 +14,5 @@ cd kolab-resource-handlers && make dist cd php-smarty && make dist cd kolab-webadmin && make dist - cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060110.src.rpm` + cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060524.src.rpm` cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo "Remember to update obmtool.conf!" From cvs at kolab.org Thu Aug 31 16:24:57 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 31 Aug 2006 16:24:57 +0200 (CEST) Subject: steffen: server Makefile,1.10,1.11 Message-ID: <20060831142457.2E95D1006DD@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv18063 Modified Files: Makefile Log Message: package seems to have gone... Index: Makefile =================================================================== RCS file: /kolabrepository/server/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 31 Aug 2006 13:02:52 -0000 1.10 +++ Makefile 31 Aug 2006 14:24:55 -0000 1.11 @@ -14,5 +14,5 @@ cd kolab-resource-handlers && make dist cd php-smarty && make dist cd kolab-webadmin && make dist - cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060524.src.rpm` + #cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060524.src.rpm` cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo "Remember to update obmtool.conf!" From cvs at kolab.org Thu Sep 7 17:58:17 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 7 Sep 2006 17:58:17 +0200 (CEST) Subject: wilde: utils/admin skiplistsafe.README,1.1,1.2 Message-ID: <20060907155817.BC0961006A1@lists.intevation.de> Author: wilde Update of /kolabrepository/utils/admin In directory doto:/tmp/cvs-serv10230 Modified Files: skiplistsafe.README Log Message: Added note on file permissions for the configuration files. Index: skiplistsafe.README =================================================================== RCS file: /kolabrepository/utils/admin/skiplistsafe.README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- skiplistsafe.README 30 Aug 2006 15:22:47 -0000 1.1 +++ skiplistsafe.README 7 Sep 2006 15:58:15 -0000 1.2 @@ -63,6 +63,9 @@ "BACKUP_DIR=/backup/annotations" in /kolab/etc/imapd/skiplistsafe-annotations.db.conf and you are done. +- The configuration files must be readable for the user running + skiplistsafe.sh (the USER set in skiplistsafe.conf). + - Make skiplistsafe.sh executable if it isn't: chmod 755 skiplistsafe.sh From cvs at kolab.org Wed Sep 13 04:55:25 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 13 Sep 2006 04:55:25 +0200 (CEST) Subject: martin: server/kolabd/kolabd/templates DB_CONFIG.slapd.template.in, 1.2, 1.3 slapd.conf.template.in, 1.5, 1.6 Message-ID: <20060913025525.F0E491006B4@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv15158/kolabd/kolabd/templates Modified Files: DB_CONFIG.slapd.template.in slapd.conf.template.in Log Message: MArtin Konold: Fix issue Index: DB_CONFIG.slapd.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/DB_CONFIG.slapd.template.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- DB_CONFIG.slapd.template.in 16 Sep 2005 12:50:54 -0000 1.2 +++ DB_CONFIG.slapd.template.in 13 Sep 2006 02:55:23 -0000 1.3 @@ -14,3 +14,5 @@ set_cachesize 0 26214400 1 set_tmp_dir /dev/shm + +set lk_detect DB_LOCK_DEFAULT Index: slapd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- slapd.conf.template.in 31 Jul 2006 05:28:16 -0000 1.5 +++ slapd.conf.template.in 13 Sep 2006 02:55:23 -0000 1.6 @@ -46,11 +46,12 @@ database bdb suffix "@@@base_dn@@@" -cachesize 2000 -checkpoint 512 10 +cachesize 10000 +checkpoint 512 5 idlcachesize 10000 idletimeout 80 # The value can be increased if some clients develop problems. # Please report to kolab-devel at kolab.org if you encounter such a client. +dirtyread directory @ldapserver_dir@ From cvs at kolab.org Thu Sep 14 20:34:16 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 14 Sep 2006 20:34:16 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.69.2.6, 1.69.2.7 Message-ID: <20060914183416.F0363100160@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv3684/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: Tag: kolab_2_0_branch resmgr.php Log Message: Fix for kolab issue1387: when the policy is ACT_ALWAYS_REJECT, only send replies if the itip method is REQUEST Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php,v retrieving revision 1.69.2.6 retrieving revision 1.69.2.7 diff -u -d -r1.69.2.6 -r1.69.2.7 --- resmgr.php 11 Aug 2006 16:01:53 -0000 1.69.2.6 +++ resmgr.php 14 Sep 2006 18:34:14 -0000 1.69.2.7 @@ -1153,9 +1153,14 @@ " and ends on <$dtend> " . iCalDate2Kolab($dtend), RM_LOG_DEBUG); if ($params['action'] == RM_ACT_ALWAYS_REJECT) { - myLog("Rejecting $method method"); - sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE); - return false;//shutdown(0); + if ($method == 'REQUEST') { + myLog("Rejecting $method method"); + sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE); + return false;//shutdown(0); + } else { + myLog("Passing through $method method for ACT_ALWAYS_REJECT policy"); + return true; + } } $is_update = false; From cvs at kolab.org Tue Sep 19 18:06:24 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Sep 2006 18:06:24 +0200 (CEST) Subject: bernhard: doc/www/src footer.html.m4, 1.36, 1.37 kolabsearch.htm, 1.3, 1.4 Message-ID: <20060919160624.356251005CE@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv27788 Modified Files: footer.html.m4 kolabsearch.htm Log Message: Removing beta from the search engine form link. Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- footer.html.m4 23 Aug 2006 17:08:58 -0000 1.36 +++ footer.html.m4 19 Sep 2006 16:06:22 -0000 1.37 @@ -20,7 +20,7 @@

Search kolab.org
- + Index: kolabsearch.htm =================================================================== RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolabsearch.htm 11 Aug 2005 16:52:04 -0000 1.3 +++ kolabsearch.htm 19 Sep 2006 16:06:22 -0000 1.4 @@ -505,7 +505,7 @@
Search kolab.org
- + From cvs at kolab.org Tue Sep 19 18:08:29 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Sep 2006 18:08:29 +0200 (CEST) Subject: bernhard: doc/www/src footer.html.m4, 1.37, 1.38 kolabsearch.htm, 1.4, 1.5 Message-ID: <20060919160829.BA9111006AC@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv27854 Modified Files: footer.html.m4 kolabsearch.htm Log Message: Commenting out link to www.eforum.de as discussed on Kolab-devel. Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- footer.html.m4 19 Sep 2006 16:06:22 -0000 1.37 +++ footer.html.m4 19 Sep 2006 16:08:27 -0000 1.38 @@ -43,7 +43,7 @@ LINK(`documentation.html', `Documentation') LINK(`i18n.html',`Languages/Localisation') LINK(`http://wiki.kolab.org/',`Wiki') -Support Forums
+ Kolab-Konsortium
Index: kolabsearch.htm =================================================================== RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- kolabsearch.htm 19 Sep 2006 16:06:22 -0000 1.4 +++ kolabsearch.htm 19 Sep 2006 16:08:27 -0000 1.5 @@ -526,7 +526,7 @@
Documentation
Wiki
-Support Forums
+Support Forums
--> Kolab-Konsortium
From cvs at kolab.org Tue Sep 19 18:17:38 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 19 Sep 2006 18:17:38 +0200 (CEST) Subject: bernhard: doc/www/src footer.html.m4,1.38,1.39 Message-ID: <20060919161738.61C421006AC@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv28016 Modified Files: footer.html.m4 Log Message: Shortned Discussion from "User Discussions Mailinglist" Added the hint that the kroupware exit leads to kolab1 history. Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- footer.html.m4 19 Sep 2006 16:08:27 -0000 1.38 +++ footer.html.m4 19 Sep 2006 16:17:36 -0000 1.39 @@ -44,14 +44,14 @@ LINK(`i18n.html',`Languages/Localisation') LINK(`http://wiki.kolab.org/',`Wiki') -Kolab-Konsortium
+Commercial: Kolab-Konsortium
Users
-User Discussions Mailinglist: +Users Mailinglist:
Archive (old) | @@ -97,7 +97,7 @@
Exits
-Kroupware +Kolab1 History: Kroupware
From cvs at kolab.org Thu Sep 21 15:10:40 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Sep 2006 15:10:40 +0200 (CEST) Subject: bernhard: doc/architecture concept.sgml,1.18,1.19 Message-ID: <20060921131040.38CD21005D5@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv31747 Modified Files: concept.sgml Log Message: Added changelog entry that ldap changes have been added. Index: concept.sgml =================================================================== RCS file: /kolabrepository/doc/architecture/concept.sgml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- concept.sgml 24 Nov 2005 22:24:38 -0000 1.18 +++ concept.sgml 21 Sep 2006 13:10:38 -0000 1.19 @@ -113,6 +113,9 @@ CVS $Revision$ $Date$ + +Added changes in ldap structure between Server 2.0 and 2.1. + From cvs at kolab.org Thu Sep 21 15:13:18 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Thu, 21 Sep 2006 15:13:18 +0200 (CEST) Subject: bernhard: doc/www/src documentation.html.m4,1.26,1.27 Message-ID: <20060921131318.1138C1005D5@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv31840 Modified Files: documentation.html.m4 Log Message: Added new concept-draft pdf. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- documentation.html.m4 8 Mar 2006 16:19:31 -0000 1.26 +++ documentation.html.m4 21 Sep 2006 13:13:16 -0000 1.27 @@ -51,6 +51,10 @@

Kolab2 Architecture Draft

  • + Version Draft cvs20060921 + Download pdf + (contains changes in the ldap structure from server 2.0 to 2.1, pages 36-39) +
  • Version Draft cvs20051124 Download pdf
  • From cvs at kolab.org Fri Sep 22 13:49:00 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Sep 2006 13:49:00 +0200 (CEST) Subject: steffen: server/kolabd/kolabd/templates slapd.conf.template.in, 1.6, 1.7 Message-ID: <20060922114900.82E4710015B@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv15124/kolabd/templates Modified Files: slapd.conf.template.in Log Message: indexes for delegate and delete Index: slapd.conf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- slapd.conf.template.in 13 Sep 2006 02:55:23 -0000 1.6 +++ slapd.conf.template.in 22 Sep 2006 11:48:58 -0000 1.7 @@ -70,7 +70,9 @@ index cn approx,sub,pres,eq index sn approx,sub,pres,eq index givenName approx,sub,pres,eq +index kolabDelegate approx,sub,pres,eq index kolabHomeServer pres,eq +index kolabDeleteflag pres,eq index member pres,eq index kolabDelegate approx,sub,pres,eq index kolabDeleteflag pres,eq From cvs at kolab.org Fri Sep 22 14:25:13 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Sep 2006 14:25:13 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, 1.10, 1.11 Message-ID: <20060922122513.BAD3910015B@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv15976 Modified Files: kolabmailtransport.php Log Message: formatting Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- kolabmailtransport.php 19 Jul 2006 17:54:18 -0000 1.10 +++ kolabmailtransport.php 22 Sep 2006 12:25:11 -0000 1.11 @@ -51,43 +51,44 @@ $reciperrors = array(); foreach( $recips as $recip ) { if (PEAR::isError($error = $this->transport->rcptTo($recip))) { - $resp = $this->transport->getResponse(); - $msg = "Failed to set recipient $recip: " .$resp[1]. ", code=".$resp[0]; - myLog($msg, RM_LOG_ERROR); - $reciperrors[] = new PEAR_Error('Failed to set recipient: '.$resp[1], $resp[0]); + $resp = $this->transport->getResponse(); + $msg = "Failed to set recipient $recip: " .$resp[1]. ", code=".$resp[0]; + myLog($msg, RM_LOG_ERROR); + $reciperrors[] = new PEAR_Error('Failed to set recipient: '.$resp[1], $resp[0]); } } - if( count($reciperrors) == count($recips) ) { - // OK, all failed, just give up - if( count($reciperrors) == 1 ) { - // Only one failure, just return that - return $reciperrors[0]; - } - // Multiple errors - return $this->createErrorObject( $reciperrors, 'Delivery to all recipients failed' ); - } + if( count($reciperrors) == count($recips) ) { + // OK, all failed, just give up + if( count($reciperrors) == 1 ) { + // Only one failure, just return that + return $reciperrors[0]; + } + // Multiple errors + return $this->createErrorObject( $reciperrors, 'Delivery to all recipients failed' ); + } + if (PEAR::isError($error = $this->transport->_put('DATA'))) { return $error; } if (PEAR::isError($error = $this->transport->_parseResponse(354))) { return $error; } - if( !empty($reciperrors) ) { - return $this->createErrorObject( $reciperrors, 'Delivery to some recipients failed' ); - } + if( !empty($reciperrors) ) { + return $this->createErrorObject( $reciperrors, 'Delivery to some recipients failed' ); + } return true; } // Encapsulate multiple errors in one function createErrorObject( $reciperrors, $msg = null ) { - // Return the lowest errorcode to not bounce more - // than we have to - if($msg == null) $msg = 'Delivery to recipients failed.'; - $code = 1000; - foreach( $reciperrors as $err ) { - if( $err->code < $code ) $code = $err->code; - } - return new PEAR_Error( $msg, $code, null, null, $reciperrors); + // Return the lowest errorcode to not bounce more + // than we have to + if($msg == null) $msg = 'Delivery to recipients failed.'; + $code = 1000; + foreach( $reciperrors as $err ) { + if( $err->code < $code ) $code = $err->code; + } + return new PEAR_Error( $msg, $code, null, null, $reciperrors); } /* Modified implementation from Net_SMTP that supports @@ -123,9 +124,9 @@ function end() { if ($this->got_newline) - $dot = ".\r\n"; + $dot = ".\r\n"; else - $dot = "\r\n.\r\n"; + $dot = "\r\n.\r\n"; if (PEAR::isError($this->transport->_send($dot))) { return new PEAR_Error('write to socket failed'); From cvs at kolab.org Fri Sep 22 14:25:33 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 22 Sep 2006 14:25:33 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, 1.3.2.6, 1.3.2.7 Message-ID: <20060922122533.768271005B4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv16019 Modified Files: Tag: kolab_2_0_branch kolabmailtransport.php Log Message: synced with HEAD Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -u -d -r1.3.2.6 -r1.3.2.7 --- kolabmailtransport.php 19 Jul 2006 17:52:16 -0000 1.3.2.6 +++ kolabmailtransport.php 22 Sep 2006 12:25:31 -0000 1.3.2.7 @@ -51,21 +51,21 @@ $reciperrors = array(); foreach( $recips as $recip ) { if (PEAR::isError($error = $this->transport->rcptTo($recip))) { - $resp = $this->transport->getResponse(); - $msg = "Failed to set recipient $recip: " .$resp[1]. ", code=".$resp[0]; + $resp = $this->transport->getResponse(); + $msg = "Failed to set recipient $recip: " .$resp[1]. ", code=".$resp[0]; myLog($msg, RM_LOG_ERROR); $reciperrors[] = new PEAR_Error('Failed to set recipient: '.$resp[1], $resp[0]); } } - if( count($reciperrors) == count($recips) ) { - // OK, all failed, just give up - if( count($reciperrors) == 1 ) { - // Only one failure, just return that - return $reciperrors[0]; - } - // Multiple errors - return $this->createErrorObject( $reciperrors, 'Delivery to all recipients failed' ); - } + if( count($reciperrors) == count($recips) ) { + // OK, all failed, just give up + if( count($reciperrors) == 1 ) { + // Only one failure, just return that + return $reciperrors[0]; + } + // Multiple errors + return $this->createErrorObject( $reciperrors, 'Delivery to all recipients failed' ); + } if (PEAR::isError($error = $this->transport->_put('DATA'))) { return $error; @@ -73,19 +73,22 @@ if (PEAR::isError($error = $this->transport->_parseResponse(354))) { return $error; } + if( !empty($reciperrors) ) { + return $this->createErrorObject( $reciperrors, 'Delivery to some recipients failed' ); + } return true; } // Encapsulate multiple errors in one function createErrorObject( $reciperrors, $msg = null ) { - // Return the lowest errorcode to not bounce more - // than we have to - if($msg == null) $msg = 'Delivery to recipients failed.'; - $code = 1000; - foreach( $reciperrors as $err ) { - if( $err->code < $code ) $code = $err->code; - } - return new PEAR_Error( $msg, $code, null, null, $reciperrors); + // Return the lowest errorcode to not bounce more + // than we have to + if($msg == null) $msg = 'Delivery to recipients failed.'; + $code = 1000; + foreach( $reciperrors as $err ) { + if( $err->code < $code ) $code = $err->code; + } + return new PEAR_Error( $msg, $code, null, null, $reciperrors); } /* Modified implementation from Net_SMTP that supports @@ -118,9 +121,9 @@ function end() { if ($this->got_newline) - $dot = ".\r\n"; + $dot = ".\r\n"; else - $dot = "\r\n.\r\n"; + $dot = "\r\n.\r\n"; if (PEAR::isError($this->transport->_send($dot))) { return new PEAR_Error('write to socket failed'); From cvs at kolab.org Mon Sep 25 21:01:51 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 25 Sep 2006 21:01:51 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd/templates main.cf.template.in, 1.10, 1.11 Message-ID: <20060925190151.D9EFD1006AC@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv5391/templates Modified Files: main.cf.template.in Log Message: * templates/main.cf.template.in: Moved recipient_delimiter = + up because it also influences canonical, virtual and more. Changed to directly use kolabmailboxfilter from local_transport without local(8). This fixes kolab/issue824 and seems better because local(8) will take aliases and .forward files into account. This change was made in rev. 1.16 main.cf.template and got lost during autoconfiscation. Added example for an alternative fix of issue824 keeping local(8). Index: main.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- main.cf.template.in 28 Aug 2006 11:15:11 -0000 1.10 +++ main.cf.template.in 25 Sep 2006 19:01:49 -0000 1.11 @@ -64,6 +64,9 @@ # check_client_access hash:@emailserver_confdir@/access, # check_relay_domains + +recipient_delimiter = + + # maps canonical_maps = hash:@emailserver_confdir@/canonical virtual_maps = hash:@emailserver_confdir@/virtual, @@ -76,10 +79,11 @@ #virtual_mailbox_maps = $virtual_maps local_recipient_maps = $virtual_maps, $alias_maps -# local delivery -recipient_delimiter = + -#mailbox_transport = lmtp:unix:@emailserver_socket@ -mailbox_transport = kolabmailboxfilter +# local delivery, not using postfix local(8) +local_transport = kolabmailboxfilter +# alternatively with local(8), something like +# mailbox_transport = kolabmailboxfilter +# local_destination_recipient_limit = 20 #TLS settings smtpd_use_tls = yes From cvs at kolab.org Mon Sep 25 21:01:51 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 25 Sep 2006 21:01:51 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd ChangeLog,1.77,1.78 Message-ID: <20060925190151.D84301006A9@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv5391 Modified Files: ChangeLog Log Message: * templates/main.cf.template.in: Moved recipient_delimiter = + up because it also influences canonical, virtual and more. Changed to directly use kolabmailboxfilter from local_transport without local(8). This fixes kolab/issue824 and seems better because local(8) will take aliases and .forward files into account. This change was made in rev. 1.16 main.cf.template and got lost during autoconfiscation. Added example for an alternative fix of issue824 keeping local(8). Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- ChangeLog 28 Aug 2006 11:15:10 -0000 1.77 +++ ChangeLog 25 Sep 2006 19:01:49 -0000 1.78 @@ -1,3 +1,15 @@ +2006-09-25 Bernhard Reiter + + * templates/main.cf.template.in: Moved recipient_delimiter = + + up because it also influences canonical, virtual and more. + + Changed to directly use kolabmailboxfilter from local_transport + without local(8). This fixes kolab/issue824 and seems better + because local(8) will take aliases and .forward files into account. + This change was made in rev. 1.16 main.cf.template and got + lost during autoconfiscation. Added example for an alternative + fix of issue824 keeping local(8). + 2006-08-28 Bernhard Reiter * templates/master.cf.template.in: added envelope_recipient From cvs at kolab.org Tue Sep 26 20:22:44 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 26 Sep 2006 20:22:44 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd ChangeLog,1.78,1.79 Message-ID: <20060926182244.5F0F51005DB@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv24414 Modified Files: ChangeLog Log Message: * templates/main.cf.template.in: activated limit on local delivery recipients again, with hint to remove it if issue825 is fixed. Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- ChangeLog 25 Sep 2006 19:01:49 -0000 1.78 +++ ChangeLog 26 Sep 2006 18:22:42 -0000 1.79 @@ -1,3 +1,9 @@ +2006-09-26 Bernhard Reiter + + * templates/main.cf.template.in: activated limit on + local delivery recipients again, with hint to remove it if issue825 + is fixed. + 2006-09-25 Bernhard Reiter * templates/main.cf.template.in: Moved recipient_delimiter = + From cvs at kolab.org Tue Sep 26 20:22:44 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 26 Sep 2006 20:22:44 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd/templates main.cf.template.in, 1.11, 1.12 Message-ID: <20060926182244.619431006B9@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv24414/templates Modified Files: main.cf.template.in Log Message: * templates/main.cf.template.in: activated limit on local delivery recipients again, with hint to remove it if issue825 is fixed. Index: main.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- main.cf.template.in 25 Sep 2006 19:01:49 -0000 1.11 +++ main.cf.template.in 26 Sep 2006 18:22:42 -0000 1.12 @@ -79,10 +79,11 @@ #virtual_mailbox_maps = $virtual_maps local_recipient_maps = $virtual_maps, $alias_maps +## only use local_transport or a higher recipent_limit if issue825 is fixed # local delivery, not using postfix local(8) -local_transport = kolabmailboxfilter +#local_transport = kolabmailboxfilter # alternatively with local(8), something like -# mailbox_transport = kolabmailboxfilter +mailbox_transport = kolabmailboxfilter # local_destination_recipient_limit = 20 #TLS settings From cvs at kolab.org Wed Sep 27 18:48:32 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 27 Sep 2006 18:48:32 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd ChangeLog,1.79,1.80 Message-ID: <20060927164832.37B271005DB@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv25484 Modified Files: ChangeLog Log Message: * DB_CONFIG.slapd.template.in: Fixing set_lk_detect setting, also adding the meaning from the documentation. Thanks to Gunnar Wrobel for spotting. Resolves: kolab/issue1428 (Last commit on DB_CONFIG.slapd.template.in breaks the LDAP db) Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- ChangeLog 26 Sep 2006 18:22:42 -0000 1.79 +++ ChangeLog 27 Sep 2006 16:48:30 -0000 1.80 @@ -1,3 +1,10 @@ +2006-09-27 Bernhard Reiter + * DB_CONFIG.slapd.template.in: Fixing set_lk_detect setting, + also adding the meaning from the documentation. Thanks + to Gunnar Wrobel for spotting. + Resolves: kolab/issue1428 (Last commit on DB_CONFIG.slapd.template.in + breaks the LDAP db) + 2006-09-26 Bernhard Reiter * templates/main.cf.template.in: activated limit on From cvs at kolab.org Wed Sep 27 18:48:32 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 27 Sep 2006 18:48:32 +0200 (CEST) Subject: bernhard: server/kolabd/kolabd/templates DB_CONFIG.slapd.template.in, 1.3, 1.4 Message-ID: <20060927164832.3A1301006C1@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv25484/templates Modified Files: DB_CONFIG.slapd.template.in Log Message: * DB_CONFIG.slapd.template.in: Fixing set_lk_detect setting, also adding the meaning from the documentation. Thanks to Gunnar Wrobel for spotting. Resolves: kolab/issue1428 (Last commit on DB_CONFIG.slapd.template.in breaks the LDAP db) Index: DB_CONFIG.slapd.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/DB_CONFIG.slapd.template.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- DB_CONFIG.slapd.template.in 13 Sep 2006 02:55:23 -0000 1.3 +++ DB_CONFIG.slapd.template.in 27 Sep 2006 16:48:30 -0000 1.4 @@ -15,4 +15,12 @@ set_cachesize 0 26214400 1 set_tmp_dir /dev/shm -set lk_detect DB_LOCK_DEFAULT +#http://www.sleepycat.com/docs/api_c/env_set_lk_detect.html +#Set if the deadlock detector is to be run whenever +#a lock conflict occurs, and specify what lock request(s) should be rejected. +# +# DB_LOCK_DEFAULT +# Use whatever lock policy was specified when the database environment +# was created. If no lock policy has yet been specified, +# set the lock policy to DB_LOCK_RANDOM. +set_lk_detect DB_LOCK_DEFAULT