+ + + +

April 7th, 2006

» + KDE Client 2.1.0 Feature Release. +

+ Six months after the last release we are happy to announce that a + new release of the Kolab 2 KDE Client is ready for download. We call it + 2.1.0 as it includes some new features and a lot of bug fixes. +
Take a look at the release notes in the download section + for a detailed view of all applied changes. +

+ Here some of the new features coming with the new release: +

Support for online and offline mailfolders. Choose which + part of your mails escort you to your offline journeys +
Implemented offline support of your LDAP addressbook
Support for displaying Quota information
Improved detection and protection against ghost messages in case of a crash

+ Take a look on the download section to get the new release. +

+ From cvs at intevation.de Fri Apr 7 18:50:42 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 7 Apr 2006 18:50:42 +0200 (CEST) Subject: torsten: doc/www/src index.html.m4,1.80,1.81 Message-ID: <20060407165042.D7FF9101F03@lists.intevation.de> Author: torsten Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv8826 Modified Files: index.html.m4 Log Message: added a new feature to the news of kde client 2.1.0 release Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- index.html.m4 7 Apr 2006 16:34:20 -0000 1.80 +++ index.html.m4 7 Apr 2006 16:50:40 -0000 1.81 @@ -52,8 +52,9 @@

February 10th, 2006

Six months after the last release we are happy to announce that a - new release of the Kolab 2 KDE Client is ready for download. We call it - 2.1.0 as it includes some new features and a lot of bug fixes. + new release of the Kolab 2 KDE Client is ready for download. + We call it 2.1.0 as it includes some new features and a lot of + bug fixes.
Take a look at the release notes in the download section for a detailed view of all applied changes.

@@ -64,6 +65,8 @@

Implemented offline support of your LDAP addressbook

Support for displaying Quota information

Improved detection and protection against ghost messages in case of a crash

Sync with Palm devices in KPilot is significantly improved after resolving + many KPilot bugs. One known problem remains. Please look in the release notes.

Take a look on the download section to get the new release.

From cvs at intevation.de Fri Apr 7 19:38:53 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 7 Apr 2006 19:38:53 +0200 (CEST) Subject: bernhard: doc/www/src about-kolab-clients.html.m4,1.23,1.24 Message-ID: <20060407173853.B63B6101F12@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv9971 Modified Files: about-kolab-clients.html.m4 Log Message: Updated client version numbers. Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- about-kolab-clients.html.m4 8 Jan 2006 11:15:43 -0000 1.23 +++ about-kolab-clients.html.m4 7 Apr 2006 17:38:51 -0000 1.24 @@ -32,7 +32,7 @@ src="images/kontact-logo.png" align="right"> License: Free Software - GNU GPL
-Status: stable 2.0.x +Status: stable 2.1.x

The Kolab Project has developed a KDE Client which @@ -64,7 +64,7 @@ src="images/toltec-logo.png" align="right"> License: proprietary, with gratis 30 day evaluation
-Status: stable release 2.0 for Kolab 2
+Status: stable 2.0.x for Kolab 2

Homepage: www.toltec.co.za @@ -93,7 +93,7 @@ src="images/klogo.png" align="right"> License: proprietary with a gratis 30 day evaluation
-Status: stable release 1.0 for Kolab 2
+Status: stable release 1.1 for Kolab 2
Homepage: www.konsec.com

From cvs at intevation.de Sun Apr 9 20:28:37 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 9 Apr 2006 20:28:37 +0200 (CEST) Subject: martin: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusycache.class.php.in, 1.4, 1.5 Message-ID: <20060409182837.6677B1006D5@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv22990/freebusy Modified Files: freebusycache.class.php.in Log Message: Martin Konold: Making it more robust. (create empty pfbcache.db if missing) Index: freebusycache.class.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- freebusycache.class.php.in 2 Apr 2006 14:53:35 -0000 1.4 +++ freebusycache.class.php.in 9 Apr 2006 18:28:35 -0000 1.5 @@ -28,6 +28,11 @@ function FreeBusyCache( $basedir, $extended = false ) { $this->basedir = $basedir; $this->extended = $extended; + /* make sure that a database really exists before accessing it */ + if( !file_exists( $this->basedir.'/pfbcache.db' ) ) { + $db = dba_open( $this->basedir.'/pfbcache.db', 'cd' ); + dba_close($db); + } } function store( $filename, $fbdata, $acl, $relevance ) { From cvs at intevation.de Sun Apr 9 20:34:56 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 9 Apr 2006 20:34:56 +0200 (CEST) Subject: martin: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.class.php.in, 1.3, 1.4 Message-ID: <20060409183456.8029C1006D5@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv23182 Modified Files: freebusy.class.php.in Log Message: Martin Konold: Applied patch from Marcus HÃ¼we after reviewing (Fixes issue #1205) Index: freebusy.class.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- freebusy.class.php.in 2 Mar 2006 12:51:12 -0000 1.3 +++ freebusy.class.php.in 9 Apr 2006 18:34:54 -0000 1.4 @@ -135,7 +135,11 @@ */ //$vFb->addBusyPeriod( 'BUSY', 0,0, null ); $vCal->addComponent($vFb); - return array($vCal->exportvCalendar(),$vCal->exportvCalendar()); + // return array($vCal->exportvCalendar(),$vCal->exportvCalendar()); +// TODO: check this: + /* we can't return pointers directly - this should work */ + $ret = array($vCal->exportvCalendar(),$vCal->exportvCalendar()); + return $ret; } myLog("Reading messagelist", RM_LOG_DEBUG); $getMessages_start = microtime_float(); From cvs at intevation.de Mon Apr 10 00:49:45 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 10 Apr 2006 00:49:45 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab Kolab.pm.in,1.3,1.4 Message-ID: <20060409224945.15F691006D5@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab In directory doto:/tmp/cvs-serv5187/Kolab Modified Files: Kolab.pm.in Log Message: Fix for Issue1194 (kolabd quota performance) plus a timing fix for the actual LDAP replication client in kolabd Index: Kolab.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Kolab.pm.in 14 Jan 2006 21:21:15 -0000 1.3 +++ Kolab.pm.in 9 Apr 2006 22:49:43 -0000 1.4 @@ -464,9 +464,9 @@ } else { $text = $prefix . ': ' . $text; } - #print STDERR "$text\n"; syslog('info', "$text"); } + #print STDERR "$text\n"; } reloadConfig(); From cvs at intevation.de Mon Apr 10 00:49:45 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 10 Apr 2006 00:49:45 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.2,1.3 Message-ID: <20060409224945.1B9B51006DE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv5187/Kolab-LDAP Modified Files: LDAP.pm.in Log Message: Fix for Issue1194 (kolabd quota performance) plus a timing fix for the actual LDAP replication client in kolabd Index: LDAP.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- LDAP.pm.in 28 Feb 2006 14:39:07 -0000 1.2 +++ LDAP.pm.in 9 Apr 2006 22:49:43 -0000 1.3 @@ -33,7 +33,7 @@ use Kolab::Util; use Kolab::Cyrus; use Kolab::DirServ; -use vars qw(%uid_db %gyard_db %newuid_db %gyard_ts_db); +use vars qw(%uid_db %gyard_db %newuid_db %gyard_ts_db %quota_db); require Exporter; @@ -84,6 +84,13 @@ Kolab::log('L', 'Unable to open graveyard timestamp cache DB', KOLAB_ERROR); exit(1); } + + Kolab::log('L', 'Opening mailbox quota cache DB'); + + if (!dbmopen(%quota_db, "@kolab_statedir@/mailbox-quotacache.db", 0666)) { + Kolab::log('L', 'Unable to open mailbox quota cache DB', KOLAB_ERROR); + exit(1); + } } sub shutdown @@ -92,6 +99,7 @@ dbmclose(%uid_db); dbmclose(%gyard_db); + dbmclose(%quota_db); } sub create @@ -346,7 +354,15 @@ my $quota = $object->get_value($Kolab::config{$p . '_field_quota'}); defined($quota) or ($quota = 0); - Kolab::Cyrus::setQuota($cyrus, $uid, $quota*1024, ($p eq 'sf' ? 1 : 0)); + my $oldquota = $quota_db{$guid} || 0; + if( $quota != $oldquota ) { + Kolab::Cyrus::setQuota($cyrus, $uid, $quota*1024, ($p eq 'sf' ? 1 : 0)); + if( $quota == 0 ) { + delete $quota_db{$guid}; + } else { + $quota_db{$guid} = $quota; + } + } } sub createMasterLDAP { @@ -484,6 +500,7 @@ # system("rm -rf \"$fbdir\"" ); # } delete $uid_db{$guid}; + delete $quota_db{$guid}; return 1; } @@ -513,6 +530,7 @@ $u =~ /user[\/\.]([^\/]*)\/?.*/; $objects{$1} = 1 if ($1); } + undef @mailboxes; my $guid; foreach $guid (keys %newuid_db) { @@ -581,13 +599,12 @@ '*', $Kolab::config{$p . '_field_guid'}, $Kolab::config{$p . '_field_modified'}, - $Kolab::config{$p . '_field_quota'}, $Kolab::config{$p . '_field_deleted'}, ], ); if ( UNIVERSAL::isa( $ldapmesg, 'Net::LDAP::Search') && $ldapmesg->code() <= 0) { - foreach $ldapobject ($ldapmesg->entries) { + while( $ldapobject = $ldapmesg->pop_entry ) { deleteObject($ldap, $cyrus, $ldapobject, 1, $p); } } else { @@ -610,7 +627,7 @@ ); if ( UNIVERSAL::isa( $ldapmesg, 'Net::LDAP::Search') && $ldapmesg->code() <= 0) { - foreach $ldapobject ($ldapmesg->entries) { + while( $ldapobject = $ldapmesg->pop_entry ) { createObject($ldap, $cyrus, $ldapobject, 1, $p, $doacls); } } else { From cvs at intevation.de Mon Apr 10 00:49:45 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 10 Apr 2006 00:49:45 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm.in, 1.1, 1.2 Message-ID: <20060409224945.1D748101EE3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd In directory doto:/tmp/cvs-serv5187/Kolab-LDAP-Backend-slurpd Modified Files: slurpd.pm.in Log Message: Fix for Issue1194 (kolabd quota performance) plus a timing fix for the actual LDAP replication client in kolabd Index: slurpd.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/slurpd.pm.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- slurpd.pm.in 17 Dec 2005 21:45:32 -0000 1.1 +++ slurpd.pm.in 9 Apr 2006 22:49:43 -0000 1.2 @@ -274,19 +274,22 @@ my $ready; my $offset = 0; - if (!($select->can_read(1)) && $changes) { - $changes = 0; - Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed'); - Kolab::LDAP::sync; - Kolab::log('SD', 'Running kolabconf'); - system("@sbindir@/kolabconf") == 0 - or Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR); - Kolab::log('SD', 'Kolabconf complete'); + if (!($select->can_read(0)) && $changes) { + Kolab::log('SD', 'Change detected w/ no pending LDAP messages; waiting a second...'); + if( !($select->can_read(1)) ) { + $changes = 0; + Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed'); + Kolab::LDAP::sync; + Kolab::log('SD', 'Running kolabconf'); + system("@sbindir@/kolabconf") == 0 + or Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR); + Kolab::log('SD', 'Kolabconf complete'); + } } Kolab::log('SD', 'Waiting for LDAP updates'); - for ($ready = 1; $conn && $ready; $ready = $select->can_read(1)) { + for ($ready = 1; $conn && $ready; $ready = $select->can_read(0)) { Kolab::log('SD', 'Reading ASN', KOLAB_DEBUG); my $newoffset = asn_read($conn, $pdu, $offset); if( !$conn->connected() or $offset == $newoffset ) { @@ -296,7 +299,6 @@ } $offset = $newoffset; defined($offset) or $offset = 0; - sleep 1; } if ($pdu) { From cvs at intevation.de Mon Apr 10 05:35:06 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 10 Apr 2006 05:35:06 +0200 (CEST) Subject: martin: server/kolab-resource-handlers/kolab-resource-handlers/resmgr olhacks.php.in, 1.2, 1.3 resmgr.php.in, 1.2, 1.3 Message-ID: <20060410033506.B6F8B1006DE@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv17886/kolab-resource-handlers/resmgr Modified Files: olhacks.php.in resmgr.php.in Log Message: Martin Konold: Initial cleanup of Horde dependencies Index: olhacks.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- olhacks.php.in 5 Feb 2006 20:15:10 -0000 1.2 +++ olhacks.php.in 10 Apr 2006 03:35:04 -0000 1.3 @@ -19,9 +19,7 @@ */ require_once '@kolab_php_module_prefix at kolabfilter/misc.php'; -require_once HORDE_BASE . '/lib/core.php'; require_once 'Horde/iCalendar.php'; -require_once 'Horde/NLS.php'; require_once 'Horde/MIME.php'; require_once 'Horde/MIME/Message.php'; require_once 'Horde/MIME/Headers.php'; Index: resmgr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- resmgr.php.in 5 Feb 2006 20:15:10 -0000 1.2 +++ resmgr.php.in 10 Apr 2006 03:35:04 -0000 1.3 @@ -33,16 +33,13 @@ define('RM_ITIP_TENTATIVE', 3); require_once 'Net/IMAP.php'; -require_once 'Horde/Auth.php'; require_once 'Horde/iCalendar.php'; -require_once 'Horde/NLS.php'; require_once 'Horde/MIME.php'; require_once 'Horde/MIME/Message.php'; require_once 'Horde/MIME/Headers.php'; require_once 'Horde/MIME/Part.php'; require_once 'Horde/MIME/Structure.php'; -//include_once 'Horde/Kolab.php'; -require_once 'Horde/Text.php'; +require_once 'Horde/String.php'; require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php'; // Globals @@ -545,7 +542,7 @@ $vCal->addComponent($itip_reply); //$mime = &new MIME_Part('multipart/alternative'); - //$body = &new MIME_Part('text/plain', Text::wrap($message, 76, "\n")); + //$body = &new MIME_Part('text/plain', String::wrap($message, 76, "\n")); $ics = &new MIME_Part('text/calendar', $vCal->exportvCalendar(), 'UTF-8' ); //$ics->setName('event-reply.ics'); @@ -1203,7 +1200,7 @@ $kolabinfo = 'This is a Kolab Groupware object. To view this object you will need a client that understands the Kolab Groupware format. For a list of such clients please visit http://www.kolab.org/kolab2-clients.html'; - $body = &new MIME_Part('text/plain', Text::wrap($kolabinfo, 76, "\n")); + $body = &new MIME_Part('text/plain', String::wrap($kolabinfo, 76, "\n")); $part = &new MIME_Part('application/x-vnd.kolab.event', $kolab_xml->dump_mem(true)); $part->setName('kolab.event'); @@ -1300,7 +1297,7 @@ } myLog("Sending confirmation of cancelation to $organiser"); - $body = &new MIME_Part('text/plain', Text::wrap($body, 76, "\n")); + $body = &new MIME_Part('text/plain', String::wrap($body, 76, "\n")); $mime = &MIME_Message::convertMimePart($body); $mime->setTransferEncoding('quoted-printable'); $mime->transferEncodeContents(); From cvs at intevation.de Mon Apr 10 15:14:21 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 10 Apr 2006 15:14:21 +0200 (CEST) Subject: martin: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.3, 1.4 Message-ID: <20060410131421.8E6EE101F14@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv9694 Modified Files: resmgr.php.in Log Message: Martin Konold: Commited patch from Pieter for issue #1171 which allows for correct handling of invitation policy settings if date is far in the future. Index: resmgr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- resmgr.php.in 10 Apr 2006 03:35:04 -0000 1.3 +++ resmgr.php.in 10 Apr 2006 13:14:19 -0000 1.4 @@ -706,10 +706,75 @@ // normal user accounts } -function iCalDate2Kolab($ical_date) +// resource error when date is used and no timestring + +function cleanArray($ical_date) +{ + if ( array_key_exists('hour',$ical_date) ) { + $temp['hour'] = array_key_exists('hour',$ical_date) ? $ical_date['hour'] : '00'; + $temp['minute'] = array_key_exists('minute',$ical_date) ? $ical_date['minute'] : '00'; + $temp['second'] = array_key_exists('second',$ical_date) ? $ical_date['second'] : '00'; + $temp['zone'] = array_key_exists('zone',$ical_date) ? $ical_date['zone'] : 'UTC'; + } else { + $temp['DATE'] = '1'; + } + $temp['year'] = array_key_exists('year',$ical_date) ? $ical_date['year'] : '0000'; + $temp['month'] = array_key_exists('month',$ical_date) ? $ical_date['month'] : '00'; + $temp['mday'] = array_key_exists('mday',$ical_date) ? $ical_date['mday'] : '00'; + + return $temp; +} + + + +/* + +An all day event must have a dd--mm-yyyy notation and not a yyyy-dd-mmT00:00:00z notation +Otherwise the event is shown as a 2-day event +--> do not try to convert everything to epoch first !! +*/ + +function iCalDate2Kolab($ical_date,$type= ' ') { + myLog("Converting to kolab format ".print_r($ical_date,true),RM_LOG_DEBUG); // $ical_date should be a timestamp - return gmstrftime('%Y-%m-%dT%H:%M:%SZ', $ical_date); + if (is_array($ical_date)) { + # going to create date again + $temp=cleanArray($ical_date); + if (array_key_exists('DATE',$temp)) { + if ($type == 'ENDDATE') { + # substract a day (86400 seconds) using epochs to take number of days per month into account + $epoch=convert2epoch($temp)-86400; + $date = gmstrftime('%Y-%m-%d', $epoch); + } else { + $date= sprintf('%04d-%02d-%02d',$temp['year'], $temp['month'], $temp['mday']); + } + } else { + $time = sprintf('%02d:%02d:%02d', $temp['hour'], $temp['minute'], $temp['second']); + if ($temp['zone'] == 'UTC') { + $time .= 'Z'; + } + $date= sprintf('%04d-%02d-%02d',$temp['year'], $temp['month'], $temp['mday']). "T".$time; + } + } else { + $date = gmstrftime('%Y-%m-%dT%H:%M:%SZ', $ical_date); + } + myLog("To <$date>",RM_LOG_DEBUG); + return $date; +} + + +function convert2epoch($values) +{ + myLog("Converting to epoch ".print_r($values,true),RM_LOG_DEBUG); + + if (is_array($values)) { + $temp=cleanArray($values); + $epoch=gmmktime($temp['hour'],$temp['minute'],$temp['second'],$temp['month'],$temp['mday'],$temp['year']); + } else { $epoch=$values;} + + myLog("Converted <$epoch>",RM_LOG_DEBUG); + return $epoch; } function &buildKolabEvent(&$itip) @@ -767,8 +832,14 @@ $kolab_node = $kolab_event->append_child($kolab_xml->create_element('end-date')); $kolab_node->append_child($kolab_xml->create_text_node( - iCalDate2Kolab($itip->getAttributeDefault('DTEND', 0)) + iCalDate2Kolab($itip->getAttributeDefault('DTEND', 0),'ENDDATE') )); + + # default is busy, so set free if info is available + if ($itip->getAttributeDefault('TRANSP', 0) == 'TRANSPARENT') { + $kolab_node = $kolab_event->append_child($kolab_xml->create_element('show-time-as')); + $kolab_node->append_child($kolab_xml->create_text_node('free' )); + } // Attendees $attendees = $itip->getAttribute('ATTENDEE'); @@ -851,8 +922,8 @@ $freq = strtolower($rrule['FREQ']); $recur_node->append_child( $kolab_xml->create_attribute( 'cycle', $freq )); $recurrence->setCycletype( $freq ); - $recurrence->setStartdate( $itip->getAttributeDefault('DTSTART', 0) ); - $recurrence->setEnddate( $itip->getAttributeDefault('DTEND', 0) ); + $recurrence->setStartdate( convert2epoch($itip->getAttributeDefault('DTSTART', 0)) ); + $recurrence->setEnddate( convert2epoch($itip->getAttributeDefault('DTEND', 0) )); switch( $freq ) { case 'daily': break; @@ -1089,11 +1160,11 @@ // What is the events summary? $summary = $itip->getAttributeDefault('SUMMARY', ''); - $dtstart = $itip->getAttributeDefault('DTSTART', 0); - $dtend = $itip->getAttributeDefault('DTEND', 0); + $dtstart = convert2epoch ($itip->getAttributeDefault('DTSTART', 0)); + $dtend = convert2epoch ($itip->getAttributeDefault('DTEND', 0)); - myLog('Event starts on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $dtstart) . - ' and ends on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $dtend), RM_LOG_DEBUG); + myLog("Event starts on <$dtstart> " .iCalDate2Kolab($dtstart). + " and ends on <$dtend> " . iCalDate2Kolab($dtend), RM_LOG_DEBUG); if ($params['action'] == RM_ACT_ALWAYS_REJECT) { myLog("Rejecting $method method"); @@ -1146,34 +1217,41 @@ $vfbstart = $vfb->getAttributeDefault('DTSTART', 0); $vfbend = $vfb->getAttributeDefault('DTEND', 0); - myLog('Free/busy info starts on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $vfbstart) . - ' and ends on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $vfbend), RM_LOG_DEBUG); - - // Check whether we are busy or not - $busyperiods = $vfb->getBusyPeriods(); - $extraparams = $vfb->getExtraParams(); - $conflict = false; - if( $recurrence !== false ) { - $recurrence->busyperiods =& $busyperiods; - $recurrence->extraparams =& $extraparams; - $recurrence->ignore = $ignore; - //myLog("Recurrence is ".print_r($recurrence,true), RM_LOG_DEBUG); - $recurrence->expand( $vfbstart, $vfbend ); - $conflict = $recurrence->hasConflict(); - } else { - foreach ($busyperiods as $busyfrom => $busyto) { - myLog('Busy period from ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyfrom) . ' to ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyto), RM_LOG_DEBUG); - if ( in_array(base64_decode($extraparams[$busyfrom]['X-UID']), $ignore) || - in_array(base64_decode($extraparams[$busyfrom]['X-SID']), $ignore) ) { - // Ignore - continue; - } - if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) { - myLog('Request overlaps', RM_LOG_DEBUG); - $conflict = true; - break; - } - } + myLog("Free/busy info starts on <$vfbstart>" .iCalDate2Kolab($vfbstart) . + " and ends on <$fbend>" .iCalDate2Kolab($vfbend), RM_LOG_DEBUG); + + $outofperiod=0; + if ($dtstart > convert2epoch ($vfbend)) { + $outofperiod=1; + } else { + // Check whether we are busy or not + $busyperiods = $vfb->getBusyPeriods(); + myLog("Busyperiods: ".print_r($busyperiods,true),RM_LOG_DEBUG); + $extraparams = $vfb->getExtraParams(); + myLog("Extraparams: ".print_r($extraparams,true),RM_LOG_DEBUG); + $conflict = false; + if( $recurrence !== false ) { + $recurrence->busyperiods =& $busyperiods; + $recurrence->extraparams =& $extraparams; + $recurrence->ignore = $ignore; + myLog("Recurrence is ".print_r($recurrence,true), RM_LOG_DEBUG); + $recurrence->expand( $vfbstart, $vfbend ); + $conflict = $recurrence->hasConflict(); + } else { + foreach ($busyperiods as $busyfrom => $busyto) { + myLog('Busy period from ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyfrom) . ' to ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyto), RM_LOG_DEBUG); + if ( in_array(base64_decode($extraparams[$busyfrom]['X-UID']), $ignore) || + in_array(base64_decode($extraparams[$busyfrom]['X-SID']), $ignore) ) { + // Ignore + continue; + } + if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) { + myLog('Request overlaps', RM_LOG_DEBUG); + $conflict = true; + break; + } + } + } } if ($conflict) { @@ -1257,7 +1335,12 @@ $itip->setAttribute('ATTENDEE', $attendee, $attparams[$i]); } - sendITipReply($cn,$resource,$itip,RM_ITIP_ACCEPT); + if ($outofperiod) { + sendITipReply($cn,$resource,$itip,RM_ITIP_TENTATIVE); + myLog("No freebusy information available", RM_LOG_NOTICE); + } else { + sendITipReply($cn,$resource,$itip,RM_ITIP_ACCEPT); + } // Delete any old events that we updated if( !empty( $updated_messages ) ) { From cvs at intevation.de Mon Apr 10 18:36:56 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 10 Apr 2006 18:36:56 +0200 (CEST) Subject: martin: server/kolabd/kolabd kolab2.schema,1.18,1.19 Message-ID: <20060410163656.8A4531006D6@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv13916 Modified Files: kolab2.schema Log Message: Martin Konold: Some clarifications Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- kolab2.schema 26 Mar 2006 22:39:01 -0000 1.18 +++ kolab2.schema 10 Apr 2006 16:36:54 -0000 1.19 @@ -286,7 +286,9 @@ # comment when creating or deleting a kolab object # a comment might be appropriate. This is most useful # for tracability when users get moved to the graveyard -# instead of being really deleted +# instead of being really deleted. Every entry must be prefixed +# with an ISO 8601 date string e.g 200604301458Z. All times must +# be in zulu timezone. attributetype ( 1.3.6.1.4.1.19419.1.1.1.17 NAME 'kolabComment' DESC 'multi-value comment' @@ -553,9 +555,11 @@ uid $ userPassword ) ) -# shared folders are typically visible to everyone subscribed to +# public folders are typically visible to everyone subscribed to # the server without the need for an extra login. Subfolders are -# defined using the hiarchy seperator '/' e.g. "sf/sub1". +# defined using the hiarchy seperator '/' e.g. "sf/sub1". Please note +# that the term public folder is prefered to shared folder because +# normal user mailboxes can also share folders using acls. objectclass ( 1.3.6.1.4.1.19414.2.2.9 NAME 'kolabSharedFolder' DESC 'Kolab public shared folder' From cvs at intevation.de Thu Apr 13 13:33:51 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 13 Apr 2006 13:33:51 +0200 (CEST) Subject: marcus: server/kolabd/kolabd ChangeLog,1.73,1.74 Message-ID: <20060413113351.3096D1006D3@lists.intevation.de> Author: marcus Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv22116 Modified Files: ChangeLog Log Message: ldapserver-location changes in the dist_conf/suse file Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- ChangeLog 4 Apr 2006 18:54:13 -0000 1.73 +++ ChangeLog 13 Apr 2006 11:33:48 -0000 1.74 @@ -1,3 +1,7 @@ +2006-04-13 Marcus HÃ¼we + * dist_conf/suse: changed the location for the ldapserver_argsfile, + ldapserver_pidfile and ldapserverslurpd_pidfile + 2006-04-04 Richard Bos * templates/httpd.conf.template.in: Without DOCUMENT_ROOT the rewrite engine uses a real /freebusy directory on the filesystem before From cvs at intevation.de Thu Apr 13 13:33:51 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 13 Apr 2006 13:33:51 +0200 (CEST) Subject: marcus: server/kolabd/kolabd/dist_conf suse,1.51,1.52 Message-ID: <20060413113351.327A01006D4@lists.intevation.de> Author: marcus Update of /kolabrepository/server/kolabd/kolabd/dist_conf In directory doto:/tmp/cvs-serv22116/dist_conf Modified Files: suse Log Message: ldapserver-location changes in the dist_conf/suse file Index: suse =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- suse 3 Apr 2006 18:18:39 -0000 1.51 +++ suse 13 Apr 2006 11:33:49 -0000 1.52 @@ -108,10 +108,10 @@ ldapserver_statedir=${localstatedir}/lib/ldap ldapserver_dir=${localstatedir}/lib/ldap ldapserver_replogfile=${sysrundir}/slapd/replog -ldapserver_argsfile=${localstatedir}/log/slapd.args +ldapserver_argsfile=${sysrundir}/slapd/slapd.args ldapserver_logfile=${localstatedir}/log/openldap.log -ldapserver_pidfile=${sysrundir}/slapd.pid -ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid +ldapserver_pidfile=${sysrundir}/slapd/slapd.pid +ldapserverslurpd_pidfile=${sysrundir}/slapd/slurpd.pid ldapserver_schemadir=${sysconfdir}/openldap/schema ldapserver_confdir=${sysconfdir}/openldap ldapserver_usr=ldap From cvs at intevation.de Thu Apr 13 16:17:56 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 13 Apr 2006 16:17:56 +0200 (CEST) Subject: bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.4, 1.5 olhacks.php.in, 1.3, 1.4 Message-ID: <20060413141756.7DFA51006CC@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv30787/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: resmgr.php.in olhacks.php.in Log Message: revert the horde dependecy changes introduced in rev. 1.3 of olhacks.php.in and resmgr.php.in. They don't work with the Horde version included in Kolab at the moment. Index: resmgr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- resmgr.php.in 10 Apr 2006 13:14:19 -0000 1.4 +++ resmgr.php.in 13 Apr 2006 14:17:54 -0000 1.5 @@ -33,13 +33,16 @@ define('RM_ITIP_TENTATIVE', 3); require_once 'Net/IMAP.php'; +require_once 'Horde/Auth.php'; require_once 'Horde/iCalendar.php'; +require_once 'Horde/NLS.php'; require_once 'Horde/MIME.php'; require_once 'Horde/MIME/Message.php'; require_once 'Horde/MIME/Headers.php'; require_once 'Horde/MIME/Part.php'; require_once 'Horde/MIME/Structure.php'; -require_once 'Horde/String.php'; +//include_once 'Horde/Kolab.php'; +require_once 'Horde/Text.php'; require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php'; // Globals @@ -542,7 +545,7 @@ $vCal->addComponent($itip_reply); //$mime = &new MIME_Part('multipart/alternative'); - //$body = &new MIME_Part('text/plain', String::wrap($message, 76, "\n")); + //$body = &new MIME_Part('text/plain', Text::wrap($message, 76, "\n")); $ics = &new MIME_Part('text/calendar', $vCal->exportvCalendar(), 'UTF-8' ); //$ics->setName('event-reply.ics'); @@ -1278,7 +1281,7 @@ $kolabinfo = 'This is a Kolab Groupware object. To view this object you will need a client that understands the Kolab Groupware format. For a list of such clients please visit http://www.kolab.org/kolab2-clients.html'; - $body = &new MIME_Part('text/plain', String::wrap($kolabinfo, 76, "\n")); + $body = &new MIME_Part('text/plain', Text::wrap($kolabinfo, 76, "\n")); $part = &new MIME_Part('application/x-vnd.kolab.event', $kolab_xml->dump_mem(true)); $part->setName('kolab.event'); @@ -1380,7 +1383,7 @@ } myLog("Sending confirmation of cancelation to $organiser"); - $body = &new MIME_Part('text/plain', String::wrap($body, 76, "\n")); + $body = &new MIME_Part('text/plain', Text::wrap($body, 76, "\n")); $mime = &MIME_Message::convertMimePart($body); $mime->setTransferEncoding('quoted-printable'); $mime->transferEncodeContents(); Index: olhacks.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- olhacks.php.in 10 Apr 2006 03:35:04 -0000 1.3 +++ olhacks.php.in 13 Apr 2006 14:17:54 -0000 1.4 @@ -19,7 +19,9 @@ */ require_once '@kolab_php_module_prefix at kolabfilter/misc.php'; +require_once HORDE_BASE . '/lib/core.php'; require_once 'Horde/iCalendar.php'; +require_once 'Horde/NLS.php'; require_once 'Horde/MIME.php'; require_once 'Horde/MIME/Message.php'; require_once 'Horde/MIME/Headers.php'; From cvs at intevation.de Thu Apr 13 17:54:56 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 13 Apr 2006 17:54:56 +0200 (CEST) Subject: marcus: server/kolabd/kolabd ChangeLog,1.74,1.75 Message-ID: <20060413155456.0C7CC1006CC@lists.intevation.de> Author: marcus Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv5467 Modified Files: ChangeLog Log Message: replaced @bindir@/php with @PHP@ in templates/master.cf.template.in Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- ChangeLog 13 Apr 2006 11:33:48 -0000 1.74 +++ ChangeLog 13 Apr 2006 15:54:54 -0000 1.75 @@ -1,4 +1,5 @@ 2006-04-13 Marcus HÃ¼we + * templates/master.cf.template.in: replaced @bindir@/php with @PHP@ * dist_conf/suse: changed the location for the ldapserver_argsfile, ldapserver_pidfile and ldapserverslurpd_pidfile From cvs at intevation.de Thu Apr 13 17:54:56 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 13 Apr 2006 17:54:56 +0200 (CEST) Subject: marcus: server/kolabd/kolabd/templates master.cf.template.in, 1.12, 1.13 Message-ID: <20060413155456.127D21006DD@lists.intevation.de> Author: marcus Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv5467/templates Modified Files: master.cf.template.in Log Message: replaced @bindir@/php with @PHP@ in templates/master.cf.template.in Index: master.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- master.cf.template.in 20 Mar 2006 21:06:50 -0000 1.12 +++ master.cf.template.in 13 Apr 2006 15:54:54 -0000 1.13 @@ -86,7 +86,7 @@ -o smtpd_hard_error_limit=1000 kolabpolicy unix - n n - - spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy -kolabfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php +kolabfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@PHP@ -c @phpini_dir@/php.ini -f @resmgr_scriptsdir@/kolabfilter.php -- @@ -96,7 +96,7 @@ -c ${client_address} -u ${sasl_username} -kolabmailboxfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php +kolabmailboxfilter unix - n n - - pipe user=@emailserver_master_usr@ flags=n argv=@PHP@ -c @phpini_dir@/php.ini -f @resmgr_scriptsdir@/kolabmailboxfilter.php -- From cvs at intevation.de Tue Apr 18 20:23:48 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 18 Apr 2006 20:23:48 +0200 (CEST) Subject: bh: server/kolabd/kolabd kolab_smtpdpolicy.in,1.6,1.7 Message-ID: <20060418182348.ECD7F1006B5@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv11158/kolabd/kolabd Modified Files: kolab_smtpdpolicy.in Log Message: Fix typo Index: kolab_smtpdpolicy.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- kolab_smtpdpolicy.in 28 Nov 2005 04:16:01 -0000 1.6 +++ kolab_smtpdpolicy.in 18 Apr 2006 18:23:46 -0000 1.7 @@ -268,7 +268,7 @@ # Reject anything else from unauthenticated users # if conf_allowunauth is false - return "REJECT Acces denied" if( !$username && !$conf_allowunauth ); + return "REJECT Access denied" if( !$username && !$conf_allowunauth ); eval{ $username = lookup_uid($username) }; return "DEFER_IF_PERMIT $@" if $@; From cvs at intevation.de Thu Apr 20 18:26:30 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 20 Apr 2006 18:26:30 +0200 (CEST) Subject: bh: server release-notes.txt,1.36,1.37 README.1st,1.34,1.35 Message-ID: <20060420162630.5C5711006CA@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv27440 Modified Files: release-notes.txt README.1st Log Message: some more updates for the next beta release Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- release-notes.txt 17 Mar 2006 19:20:02 -0000 1.36 +++ release-notes.txt 20 Apr 2006 16:26:28 -0000 1.37 @@ -22,15 +22,17 @@ Known problems: - - After bootstrapping please stop kolab and start it again, see - Issue1068 (Mailboxes are not created until kolabd restart) and + - Under some circumstance the Kolab server may not update create + users or update the configuration after changes have been made in + the web interface. This happens most often immediately after the + bootstrap. In that case restart the kolabd: + + /kolab/bin/openpkg rc kolabd restart + + See Issue1068 (Mailboxes are not created until kolabd restart) and Issue1098 (Changes in the service tab are not accepted after bootstrap) for details. - - Distribution lists without domain (as created by earlier 2.1 - releases, for instance) break when edited via the web interface, - see Issue1100 for details. - - If modifying or deleting of address book entries doesn't work, restarting openldap can help, see Issue854 for details. Deleting address book entries doesn't automatically remove them @@ -51,6 +53,9 @@ - perl-kolab-5.8.7-20060228 + Resolved: + Issue1194 (kolabd quota performance) + - kolabd-2.0.99-20060228 * amavis now logs to /kolab/var/amavisd/amavisd.log. This is @@ -64,14 +69,16 @@ - kolab-webadmin-2.0.99-20060228 - - kolab-resource-handlers-2.0.99-20060308 - Resolved: - Issue1042 (server modifies email content) - + Issue848 (Modifying address book entry may break distribution list) + - kolab-resource-handlers-2.0.99-20060308 + * create empty pfbcache.db if missing + Resolved: + Issue1042 (server modifies email content) + Issue973 (quoting and rewriting From header) $Id$ Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- README.1st 3 Feb 2006 14:45:22 -0000 1.34 +++ README.1st 20 Apr 2006 16:26:28 -0000 1.35 @@ -165,6 +165,20 @@ Nothing special has to be done for this upgrade. +Upgrade from 2.1-beta-1 +----------------------- + +There was a bug in earlier versions regarding the distribution lists for +administrative emails aliases like postmaster@. They were +created without the domain part. This has been fixed so that they are +created with the correct domains in their names, but admin distribution +lists created by an earlier Kolab server version will not be updated +automatically. The easiest way to do this is by deleting them all and +then to create them again with the services page of the web-interface. + +For more details about the bug, see +https://intevation.de/roundup/kolab/issue1100 + $Id$ From cvs at intevation.de Fri Apr 21 12:31:49 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 21 Apr 2006 12:31:49 +0200 (CEST) Subject: martin: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.3,1.4 Message-ID: <20060421103149.22E3E1006D1@lists.intevation.de> Author: martin Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv13963 Modified Files: LDAP.pm.in Log Message: Martin Konold: Applied patch from Tobias KÃ¶nig for setting foldertype for public folders after slight modification Index: LDAP.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- LDAP.pm.in 9 Apr 2006 22:49:43 -0000 1.3 +++ LDAP.pm.in 21 Apr 2006 10:31:46 -0000 1.4 @@ -320,6 +320,13 @@ # We have a object that we have no previous record of, so create everything if ($sync) { $newuid_db{$guid} = $uid; } else { $uid_db{$guid} = $uid; } Kolab::Cyrus::createMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0)); + if( $p eq 'sf' ){ + my $foldertype = lc($object->get_value('foldertype')); + + if ( $foldertype ne '' ){ + Kolab::Cyrus::setFolderType($cyrus,$uid,1,$foldertype); + } + } if( $p ne 'sf' && !$islocal ) { # Hide user mailboxes on other servers Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rswipcda"]); From cvs at intevation.de Fri Apr 21 12:41:40 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 21 Apr 2006 12:41:40 +0200 (CEST) Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.25, 1.26 Message-ID: <20060421104140.D311E1006D1@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv14511/php/admin/include Modified Files: form.class.php Log Message: Martin Konold: Commited patch from Tobias KÃ¶nig in order to support setting of foldertype for public folders. Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- form.class.php 29 Mar 2006 10:52:14 -0000 1.25 +++ form.class.php 21 Apr 2006 10:41:38 -0000 1.26 @@ -187,6 +187,30 @@ $str .= ''.$value['comment'].''; $str .= ''."\n"; break; + case 'foldertypeselect': + $str .= ''; + $str .= ''.$value['name'].''; + $entries = array ( '' => _('None'), 'mail' => _('Mails'), 'task' => _('Tasks'), 'journal' => _('Journals'), + 'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes')); + if( ereg( 'readonly', $value['attrs'] ) ) { + $str .= '

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

'; + } else { + $str .= ''; + $str .= ''; + } + $str .= ''.$value['comment'].''; + $str .= ''."\n"; + break; case 'aclselect': // Special Kolab entry for ACLs $str .= ''; $str .= ''.$value['name'].''; From cvs at intevation.de Fri Apr 21 12:41:40 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 21 Apr 2006 12:41:40 +0200 (CEST) Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/templates sflistall.tpl, 1.1, 1.2 Message-ID: <20060421104140.DD6461006D8@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv14511/php/admin/templates Modified Files: sflistall.tpl Log Message: Martin Konold: Commited patch from Tobias KÃ¶nig in order to support setting of foldertype for public folders. Index: sflistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/sflistall.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sflistall.tpl 11 Mar 2005 09:59:05 -0000 1.1 +++ sflistall.tpl 21 Apr 2006 10:41:38 -0000 1.2 @@ -10,12 +10,13 @@ - + {section name=id loop=$entries} + {if $entries[id].deleted neq "FALSE"} {else} From cvs at intevation.de Fri Apr 21 12:41:40 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 21 Apr 2006 12:41:40 +0200 (CEST) Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder index.php.in, 1.1, 1.2 sf.php.in, 1.2, 1.3 Message-ID: <20060421104140.DEF261006DB@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder In directory doto:/tmp/cvs-serv14511/www/admin/sharedfolder Modified Files: index.php.in sf.php.in Log Message: Martin Konold: Commited patch from Tobias KÃ¶nig in order to support setting of foldertype for public folders. Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.php.in 5 Feb 2006 20:13:55 -0000 1.1 +++ index.php.in 21 Apr 2006 10:41:38 -0000 1.2 @@ -59,10 +59,16 @@ $cn = $attrs['cn'][0]; $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]]; + $entries[] = array( 'dn' => $dn, 'cn' => $cn, 'kolabhomeserver' => $kolabhomeserver, - 'deleted' => $deleted ); + 'deleted' => $deleted, + 'foldertype' => $folderType ); $entry = ldap_next_entry( $ldap->connection,$entry ); } } Index: sf.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sf.php.in 9 Mar 2006 21:27:22 -0000 1.2 +++ sf.php.in 21 Apr 2006 10:41:38 -0000 1.3 @@ -39,6 +39,11 @@ if (is_array($ldap_object['kolabHomeServer'])) $kolabhomeserver = $ldap_object['kolabHomeServer'][0]; $form->entries['kolabhomeserver']['value'] = $kolabhomeserver; + if (is_array($ldap_object['folderType'])) + $form->entries['foldertype']['value'] = $ldap_object['folderType'][0]; + else + $form->entries['foldertype']['value'] = ''; + $form->entries['action']['value'] = 'save'; //debug("got userquota=$userquota
cn=$cn
"); $aclcount = 0; @@ -125,6 +130,10 @@ 'validation' => 'notempty', 'comment' => ($action=='create')?_('Required, non volatile'):_('Non volatile'), 'value' => $_SESSION['fqdnhostname'] ), + 'foldertype' => array( 'name' => _('Folder Type'), + 'type' => 'foldertypeselect', + 'value' => '' ), + 'cyrus-userquota' => array( 'name' => _('Quota Limit'), 'comment' => _('MBytes (empty for unlimited)') ), 'acl_0' => array( 'name' => _('Permission for UID/GID'), @@ -178,6 +187,10 @@ $cn = str_replace( utf8_decode('ÃŸ'), 'ss', $cn ); debug("cn=$cn"); $ldap_object['cn'] = utf8_encode($cn); + + if (!empty($_POST['foldertype'])) + $ldap_object['folderType'] = $_POST['foldertype']; + foreach ( array( 'cyrus-userquota') as $attr) { $count = 0; $key = $attr; @@ -264,7 +277,11 @@ $form->entries['action']['value'] = 'save'; $form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn ); $form->entries['cn']['attrs'] = 'readonly'; + $form->entries['cn']['comment'] = ''; $form->entries['kolabhomeserver']['attrs'] = 'readonly'; + $form->entries['kolabhomeserver']['comment'] = ''; + $form->entries['foldertype']['attrs'] = 'readonly'; + $form->entries['foldertype']['comment'] = ''; $heading = _('Modify Shared Folder'); $content = $form->outputForm(); } else { @@ -278,6 +295,7 @@ $form->entries['action']['value'] = 'kill'; foreach( $form->entries as $key => $val ) { $form->entries[$key]['attrs'] = 'readonly'; + $form->entries[$key]['comment'] = ''; } $form->submittext = _('Delete'); $heading = _('Delete Shared Folder'); From cvs at intevation.de Thu Apr 27 18:12:12 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 27 Apr 2006 18:12:12 +0200 (CEST) Subject: torsten: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.69.2.1, 1.69.2.2 Message-ID: <20060427161212.85C8C1005DB@lists.intevation.de> Author: torsten Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv12752 Modified Files: Tag: kolab_2_0_branch resmgr.php Log Message: Backported patch for issue1171 from Pieter to 2.0 branch. Patch was tested and causes no trouble here. Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php,v retrieving revision 1.69.2.1 retrieving revision 1.69.2.2 diff -u -d -r1.69.2.1 -r1.69.2.2 --- resmgr.php 30 Aug 2005 19:03:35 -0000 1.69.2.1 +++ resmgr.php 27 Apr 2006 16:12:10 -0000 1.69.2.2 @@ -691,10 +691,75 @@ // normal user accounts } -function iCalDate2Kolab($ical_date) +// resource error when date is used and no timestring + +function cleanArray($ical_date) +{ + if ( array_key_exists('hour',$ical_date) ) { + $temp['hour'] = array_key_exists('hour',$ical_date) ? $ical_date['hour'] : '00'; + $temp['minute'] = array_key_exists('minute',$ical_date) ? $ical_date['minute'] : '00'; + $temp['second'] = array_key_exists('second',$ical_date) ? $ical_date['second'] : '00'; + $temp['zone'] = array_key_exists('zone',$ical_date) ? $ical_date['zone'] : 'UTC'; + } else { + $temp['DATE'] = '1'; + } + $temp['year'] = array_key_exists('year',$ical_date) ? $ical_date['year'] : '0000'; + $temp['month'] = array_key_exists('month',$ical_date) ? $ical_date['month'] : '00'; + $temp['mday'] = array_key_exists('mday',$ical_date) ? $ical_date['mday'] : '00'; + + return $temp; +} + + + +/* + +An all day event must have a dd--mm-yyyy notation and not a yyyy-dd-mmT00:00:00z notation +Otherwise the event is shown as a 2-day event +--> do not try to convert everything to epoch first !! +*/ + +function iCalDate2Kolab($ical_date,$type= ' ') { + myLog("Converting to kolab format ".print_r($ical_date,true),RM_LOG_DEBUG); // $ical_date should be a timestamp - return gmstrftime('%Y-%m-%dT%H:%M:%SZ', $ical_date); + if (is_array($ical_date)) { + # going to create date again + $temp=cleanArray($ical_date); + if (array_key_exists('DATE',$temp)) { + if ($type == 'ENDDATE') { + # substract a day (86400 seconds) using epochs to take number of days per month into account + $epoch=convert2epoch($temp)-86400; + $date = gmstrftime('%Y-%m-%d', $epoch); + } else { + $date= sprintf('%04d-%02d-%02d',$temp['year'], $temp['month'], $temp['mday']); + } + } else { + $time = sprintf('%02d:%02d:%02d', $temp['hour'], $temp['minute'], $temp['second']); + if ($temp['zone'] == 'UTC') { + $time .= 'Z'; + } + $date= sprintf('%04d-%02d-%02d',$temp['year'], $temp['month'], $temp['mday']). "T".$time; + } + } else { + $date = gmstrftime('%Y-%m-%dT%H:%M:%SZ', $ical_date); + } + myLog("To <$date>",RM_LOG_DEBUG); + return $date; +} + + +function convert2epoch($values) +{ + myLog("Converting to epoch ".print_r($values,true),RM_LOG_DEBUG); + + if (is_array($values)) { + $temp=cleanArray($values); + $epoch=gmmktime($temp['hour'],$temp['minute'],$temp['second'],$temp['month'],$temp['mday'],$temp['year']); + } else { $epoch=$values;} + + myLog("Converted <$epoch>",RM_LOG_DEBUG); + return $epoch; } function &buildKolabEvent(&$itip) @@ -752,8 +817,14 @@ $kolab_node = $kolab_event->append_child($kolab_xml->create_element('end-date')); $kolab_node->append_child($kolab_xml->create_text_node( - iCalDate2Kolab($itip->getAttributeDefault('DTEND', 0)) + iCalDate2Kolab($itip->getAttributeDefault('DTEND', 0),'ENDDATE') )); + + # default is busy, so set free if info is available + if ($itip->getAttributeDefault('TRANSP', 0) == 'TRANSPARENT') { + $kolab_node = $kolab_event->append_child($kolab_xml->create_element('show-time-as')); + $kolab_node->append_child($kolab_xml->create_text_node('free' )); + } // Attendees $attendees = $itip->getAttribute('ATTENDEE'); @@ -836,8 +907,8 @@ $freq = strtolower($rrule['FREQ']); $recur_node->append_child( $kolab_xml->create_attribute( 'cycle', $freq )); $recurrence->setCycletype( $freq ); - $recurrence->setStartdate( $itip->getAttributeDefault('DTSTART', 0) ); - $recurrence->setEnddate( $itip->getAttributeDefault('DTEND', 0) ); + $recurrence->setStartdate( convert2epoch($itip->getAttributeDefault('DTSTART', 0)) ); + $recurrence->setEnddate( convert2epoch($itip->getAttributeDefault('DTEND', 0) )); switch( $freq ) { case 'daily': break; @@ -1074,11 +1145,11 @@ // What is the events summary? $summary = $itip->getAttributeDefault('SUMMARY', ''); - $dtstart = $itip->getAttributeDefault('DTSTART', 0); - $dtend = $itip->getAttributeDefault('DTEND', 0); + $dtstart = convert2epoch ($itip->getAttributeDefault('DTSTART', 0)); + $dtend = convert2epoch ($itip->getAttributeDefault('DTEND', 0)); - myLog('Event starts on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $dtstart) . - ' and ends on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $dtend), RM_LOG_DEBUG); + myLog("Event starts on <$dtstart> " .iCalDate2Kolab($dtstart). + " and ends on <$dtend> " . iCalDate2Kolab($dtend), RM_LOG_DEBUG); if ($params['action'] == RM_ACT_ALWAYS_REJECT) { myLog("Rejecting $method method"); @@ -1131,34 +1202,41 @@ $vfbstart = $vfb->getAttributeDefault('DTSTART', 0); $vfbend = $vfb->getAttributeDefault('DTEND', 0); - myLog('Free/busy info starts on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $vfbstart) . - ' and ends on ' . strftime('%a, %d %b %Y %H:%M:%S %z', $vfbend), RM_LOG_DEBUG); - - // Check whether we are busy or not - $busyperiods = $vfb->getBusyPeriods(); - $extraparams = $vfb->getExtraParams(); - $conflict = false; - if( $recurrence !== false ) { - $recurrence->busyperiods =& $busyperiods; - $recurrence->extraparams =& $extraparams; - $recurrence->ignore = $ignore; - //myLog("Recurrence is ".print_r($recurrence,true), RM_LOG_DEBUG); - $recurrence->expand( $vfbstart, $vfbend ); - $conflict = $recurrence->hasConflict(); - } else { - foreach ($busyperiods as $busyfrom => $busyto) { - myLog('Busy period from ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyfrom) . ' to ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyto), RM_LOG_DEBUG); - if ( in_array(base64_decode($extraparams[$busyfrom]['X-UID']), $ignore) || - in_array(base64_decode($extraparams[$busyfrom]['X-SID']), $ignore) ) { - // Ignore - continue; - } - if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) { - myLog('Request overlaps', RM_LOG_DEBUG); - $conflict = true; - break; - } - } + myLog("Free/busy info starts on <$vfbstart>" .iCalDate2Kolab($vfbstart) . + " and ends on <$fbend>" .iCalDate2Kolab($vfbend), RM_LOG_DEBUG); + + $outofperiod=0; + if ($dtstart > convert2epoch ($vfbend)) { + $outofperiod=1; + } else { + // Check whether we are busy or not + $busyperiods = $vfb->getBusyPeriods(); + myLog("Busyperiods: ".print_r($busyperiods,true),RM_LOG_DEBUG); + $extraparams = $vfb->getExtraParams(); + myLog("Extraparams: ".print_r($extraparams,true),RM_LOG_DEBUG); + $conflict = false; + if( $recurrence !== false ) { + $recurrence->busyperiods =& $busyperiods; + $recurrence->extraparams =& $extraparams; + $recurrence->ignore = $ignore; + myLog("Recurrence is ".print_r($recurrence,true), RM_LOG_DEBUG); + $recurrence->expand( $vfbstart, $vfbend ); + $conflict = $recurrence->hasConflict(); + } else { + foreach ($busyperiods as $busyfrom => $busyto) { + myLog('Busy period from ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyfrom) . ' to ' . strftime('%a, %d %b %Y %H:%M:%S %z', $busyto), RM_LOG_DEBUG); + if ( in_array(base64_decode($extraparams[$busyfrom]['X-UID']), $ignore) || + in_array(base64_decode($extraparams[$busyfrom]['X-SID']), $ignore) ) { + // Ignore + continue; + } + if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) { + myLog('Request overlaps', RM_LOG_DEBUG); + $conflict = true; + break; + } + } + } } if ($conflict) { @@ -1242,7 +1320,12 @@ $itip->setAttribute('ATTENDEE', $attendee, $attparams[$i]); } - sendITipReply($cn,$resource,$itip,RM_ITIP_ACCEPT); + if ($outofperiod) { + sendITipReply($cn,$resource,$itip,RM_ITIP_TENTATIVE); + myLog("No freebusy information available", RM_LOG_NOTICE); + } else { + sendITipReply($cn,$resource,$itip,RM_ITIP_ACCEPT); + } // Delete any old events that we updated if( !empty( $updated_messages ) ) { From cvs at intevation.de Sun Apr 30 04:35:49 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 30 Apr 2006 04:35:49 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.5, 1.6 Message-ID: <20060430023549.C3E751006DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv23752/kolab-resource-handlers/resmgr Modified Files: resmgr.php.in Log Message: Fix for Issue966: Wrong CN for resource accounts Index: resmgr.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- resmgr.php.in 13 Apr 2006 14:17:54 -0000 1.5 +++ resmgr.php.in 30 Apr 2006 02:35:47 -0000 1.6 @@ -127,6 +127,17 @@ } } +function actiontostring( $action ) { + switch ($action) { + case RM_ACT_ALWAYS_ACCEPT: return 'ACT_ALWAYS_ACCEPT'; + case RM_ACT_ALWAYS_REJECT: return 'ACT_ALWAYS_REJECT'; + case RM_ACT_REJECT_IF_CONFLICTS: return 'ACT_REJECT_IF_CONFLICTS'; + case RM_ACT_MANUAL_IF_CONFLICTS: return 'ACT_MANUAL_IF_CONFLICTS'; + case RM_ACT_MANUAL: return 'ACT_MANUAL'; + default: return false; + } +}; + function getDN( $ldap, $mail ) { global $params; $filter = "(&(objectClass=kolabInetOrgPerson)(|(mail=$mail)(alias=$mail)))"; @@ -219,17 +230,15 @@ if( array_key_exists( $sender, $policies ) ) { // We have an exact match, stop processing $action = $policies[$sender]; - myLog("Found exact policy match $action for $sender", RM_LOG_DEBUG); + myLog("Found exact policy match ".actiontostring($action)." for $sender", RM_LOG_DEBUG); } else { $action = false; $dn = getDN( $ldap, $sender ); if( $dn ) { // Sender is local, check for groups foreach( $policies as $gid => $policy ) { - list($cn, $domain) = split( '@', $gid ); - if( $domain != $params['email_domain'] ) continue; $result = ldap_search($ldap, $params['base_dn'], - "(&(objectClass=kolabGroupOfNames)(cn=$cn)(member=$dn))", + "(&(objectClass=kolabGroupOfNames)(mail=$gid)(member=$dn))", array('dn')); if (!$result) { myLog('Unable to perform LDAP search: ' . ldap_error($ldap)); @@ -461,6 +470,8 @@ { global $organiser, $uid, $sid, $is_update; + myLog("sendITipReply($cn,$resource,$itip,$type)", RM_LOG_DEBUG); + // Build the reply. $vCal = &new Horde_iCalendar(); $vCal->setAttribute('PRODID', '-//proko2//resmgr 1.0//EN'); @@ -1080,8 +1091,6 @@ } - - //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// @@ -1113,7 +1122,7 @@ $cn = $ldapdata['cn']; $params['action'] = $ldapdata['action']; - myLog("Action for $sender is ".$params['action'], RM_LOG_DEBUG); + myLog("Action for $sender is ".actiontostring($params['action']), RM_LOG_DEBUG); if( !$params['action'] ) { // Manual is the only safe default! $params['action'] = RM_ACT_MANUAL; From cvs at intevation.de Sun Apr 30 04:35:49 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 30 Apr 2006 04:35:49 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.class.php.in, 1.4, 1.5 Message-ID: <20060430023549.C21281005C3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv23752/kolab-resource-handlers/freebusy Modified Files: freebusy.class.php.in Log Message: Fix for Issue966: Wrong CN for resource accounts Index: freebusy.class.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- freebusy.class.php.in 9 Apr 2006 18:34:54 -0000 1.4 +++ freebusy.class.php.in 30 Apr 2006 02:35:47 -0000 1.5 @@ -135,11 +135,8 @@ */ //$vFb->addBusyPeriod( 'BUSY', 0,0, null ); $vCal->addComponent($vFb); - // return array($vCal->exportvCalendar(),$vCal->exportvCalendar()); -// TODO: check this: - /* we can't return pointers directly - this should work */ - $ret = array($vCal->exportvCalendar(),$vCal->exportvCalendar()); - return $ret; + $retval = array($vCal->exportvCalendar(),$vCal->exportvCalendar()); + return $retval; } myLog("Reading messagelist", RM_LOG_DEBUG); $getMessages_start = microtime_float(); From cvs at intevation.de Sun Apr 30 04:37:57 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 30 Apr 2006 04:37:57 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers Makefile, 1.9.2.3, 1.9.2.4 kolab-resource-handlers.spec, 1.126.2.14, 1.126.2.15 Message-ID: <20060430023757.18DA51005C3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv23924 Modified Files: Tag: kolab_2_0_branch Makefile kolab-resource-handlers.spec Log Message: Backport of: Fix for Issue966: Wrong CN for resource accounts Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -u -d -r1.9.2.3 -r1.9.2.4 --- Makefile 8 Mar 2006 20:33:04 -0000 1.9.2.3 +++ Makefile 30 Apr 2006 02:37:55 -0000 1.9.2.4 @@ -4,7 +4,7 @@ PACKAGE=kolab-resource-handlers VERSION = 0.3.9 -RELEASE=20060308 +RELEASE=20060430 PEARVERSION = 1.3 RPM = /kolab/bin/openpkg rpm Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.126.2.14 retrieving revision 1.126.2.15 diff -u -d -r1.126.2.14 -r1.126.2.15 --- kolab-resource-handlers.spec 8 Mar 2006 20:33:04 -0000 1.126.2.14 +++ kolab-resource-handlers.spec 30 Apr 2006 02:37:55 -0000 1.126.2.15 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20060308 +Release: 20060430 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Sun Apr 30 04:37:57 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 30 Apr 2006 04:37:57 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.69.2.2, 1.69.2.3 Message-ID: <20060430023757.1FE671006DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv23924/kolab-resource-handlers/resmgr Modified Files: Tag: kolab_2_0_branch resmgr.php Log Message: Backport of: Fix for Issue966: Wrong CN for resource accounts Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php,v retrieving revision 1.69.2.2 retrieving revision 1.69.2.3 diff -u -d -r1.69.2.2 -r1.69.2.3 --- resmgr.php 27 Apr 2006 16:12:10 -0000 1.69.2.2 +++ resmgr.php 30 Apr 2006 02:37:55 -0000 1.69.2.3 @@ -218,10 +218,10 @@ if( $dn ) { // Sender is local, check for groups foreach( $policies as $gid => $policy ) { - list($cn, $domain) = split( '@', $gid ); + list($gcn, $domain) = split( '@', $gid ); if( $domain != $params['email_domain'] ) continue; $result = ldap_search($ldap, $params['base_dn'], - "(&(objectClass=kolabGroupOfNames)(cn=$cn)(member=$dn))", + "(&(objectClass=kolabGroupOfNames)(cn=$gcn)(member=$dn))", array('dn')); if (!$result) { myLog('Unable to perform LDAP search: ' . ldap_error($ldap)); From cvs at intevation.de Sun Apr 30 07:09:35 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 30 Apr 2006 07:09:35 +0200 (CEST) Subject: steffen: server/perl-kolab Makefile, 1.3.2.2, 1.3.2.3 perl-kolab.spec, 1.91.2.9, 1.91.2.10 Message-ID: <20060430050935.473881005AE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv28205 Modified Files: Tag: kolab_2_0_branch Makefile perl-kolab.spec Log Message: Backport of fix for bad performance on large replogs (Issue1210) Index: Makefile =================================================================== RCS file: /kolabrepository/server/perl-kolab/Attic/Makefile,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -d -r1.3.2.2 -r1.3.2.3 --- Makefile 11 Jan 2006 04:42:40 -0000 1.3.2.2 +++ Makefile 30 Apr 2006 05:09:33 -0000 1.3.2.3 @@ -5,7 +5,7 @@ PACKAGE=perl-kolab VERSION=0.9.2 PERLVERSION=5.8.7 -RELEASE=2.0_20051219 +RELEASE=2.0_20060430 SRCDIR=$(KOLABRPMSRC)/$(PACKAGE) RPM = /kolab/bin/openpkg rpm Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/Attic/perl-kolab.spec,v retrieving revision 1.91.2.9 retrieving revision 1.91.2.10 diff -u -d -r1.91.2.9 -r1.91.2.10 --- perl-kolab.spec 19 Dec 2005 20:20:27 -0000 1.91.2.9 +++ perl-kolab.spec 30 Apr 2006 05:09:33 -0000 1.91.2.10 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 2.0_20051219 +Release: 2.0_20060430 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Sun Apr 30 07:09:35 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 30 Apr 2006 07:09:35 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm, 1.14.2.2, 1.14.2.3 Message-ID: <20060430050935.4C2681005B1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd In directory doto:/tmp/cvs-serv28205/Kolab-LDAP-Backend-slurpd Modified Files: Tag: kolab_2_0_branch slurpd.pm Log Message: Backport of fix for bad performance on large replogs (Issue1210) Index: slurpd.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/Attic/slurpd.pm,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -u -d -r1.14.2.2 -r1.14.2.3 --- slurpd.pm 20 Oct 2005 09:59:31 -0000 1.14.2.2 +++ slurpd.pm 30 Apr 2006 05:09:33 -0000 1.14.2.3 @@ -274,16 +274,23 @@ my $ready; my $offset = 0; - if (!($select->can_read(1)) && $changes) { - $changes = 0; - Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed'); - Kolab::LDAP::sync; - system($Kolab::config{'prefix'} . '/sbin/kolabconf'); - } + + if (!($select->can_read(0)) && $changes) { + Kolab::log('SD', 'Change detected w/ no pending LDAP messages; waiting a second...'); + if( !($select->can_read(1)) ) { + $changes = 0; + Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed'); + Kolab::LDAP::sync; + Kolab::log('SD', 'Running kolabconf'); + system($Kolab::config{'prefix'} ."/sbin/kolabconf") == 0 + or Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR); + Kolab::log('SD', 'Kolabconf complete'); + } + } Kolab::log('SD', 'Waiting for LDAP updates'); - for ($ready = 1; $conn && $ready; $ready = $select->can_read(1)) { + for ($ready = 1; $conn && $ready; $ready = $select->can_read(0)) { Kolab::log('SD', 'Reading ASN', KOLAB_DEBUG); my $newoffset = asn_read($conn, $pdu, $offset); if( !$conn->connected() or $offset == $newoffset ) { @@ -293,7 +300,6 @@ } $offset = $newoffset; defined($offset) or $offset = 0; - sleep 1; } if ($pdu) { From cvs at intevation.de Tue May 2 17:48:38 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 2 May 2006 17:48:38 +0200 (CEST) Subject: torsten: utils/testing cleanvcard.py,NONE,1.1 Message-ID: <20060502154838.A9762100161@lists.intevation.de> Author: torsten Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv21058 Added Files: cleanvcard.py Log Message: Added a small python script for removing CHARSET and ENCODING information from vcards. This is a small and cheap workaround for issue1155 (vcal export cannot be imported: umlauts break). --- NEW FILE: cleanvcard.py --- #!/usr/bin/python """\n This script is a small workaround for importing 2.1 vcards with included umlauts. It will remove all CHARSET and ENCODING information from the vcard. The original file will be stored as Usage: cleanvcard file Options: -h / --help Print this message and exit. """ # 20060403 Torsten Irlaender # # This program is free software under the GNU GPL (>=v2) # Read the file COPYING coming with the software for details. import sys import getopt import shutil import re import os def usage(code, msg=''): print >> sys.stderr, __doc__ if msg: print >> sys.stderr, msg sys.exit(code) def main(): try: opts, args = getopt.getopt(sys.argv[1:], 'h', ['help']) except getopt.error, msg: usage(1, msg) for opt, arg in opts: if opt in ('-h', '--help'): usage(0) if len(args) < 1: usage(1) # open the vcard and make a backupfile filename = args[0] backupfilename = filename+".orig" try: shutil.copyfile(filename,backupfilename) except: print'Could not open file:',filename sys.exit(1) parsefile(filename) def parsefile(filename): # opening the vcard f = open(filename) f2 = open(filename+".tmp","w+") lines = f.readlines() # Parse each line and get rid if charset and encoding for line in lines: line = parseline(line) f2.write(line) f.close() f2.close() # after finishing parsing we move modfied vcard into the original # one os.rename(filename+".tmp",filename) def parseline(line): search = re.compile('(CHARSET=|ENCODING=)') dummy = line.split(':') paras = dummy[0] if(len(dummy)>1): value = dummy[1] tokens = paras.split(';') i=0 line="" for a in tokens: if not re.match(search,a): if (i > 0): line+=";" line += a i+=1 if(len(dummy)>1): line+=(":"+value) return line if __name__ == '__main__': main() From cvs at intevation.de Tue May 2 19:36:30 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 2 May 2006 19:36:30 +0200 (CEST) Subject: bh: doc/www/src index.html.m4,1.81,1.82 Message-ID: <20060502173630.DEC6D100161@lists.intevation.de> Author: bh Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv25667 Modified Files: index.html.m4 Log Message: Add news about LinuxTag presence Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- index.html.m4 7 Apr 2006 16:50:40 -0000 1.81 +++ index.html.m4 2 May 2006 17:36:28 -0000 1.82 @@ -45,6 +45,20 @@

{tr msg="Name"}	{tr msg="Server"}	{tr msg="Action"}		{tr msg="Name"}	{tr msg="Server"}	{tr msg="Type"}	{tr msg="Action"}
{$entries[id].cn\|escape:"html"}	{$entries[id].kolabhomeserver\|escape:"html"}	{$entries[id].foldertype\|escape:"html"}	{tr msg="Folder deleted, awaiting cleanup..."}

+ + +

May 2nd, 2006

» + Kolab at LinuxTag in Wiesbaden, Germany +

+ Kolab Groupware will be present at the LinuxTag Expo and + Conference held in Wiesbaden, Germany, from May 3rd to 6th. You + can find the Kolab-Konsortium at the Intevation Booth (Hall 9, + booth 930) +

+ +

April 7th, 2006 » KDE Client 2.1.0 Feature Release. From cvs at intevation.de Wed May 10 12:32:26 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Wed, 10 May 2006 12:32:26 +0200 (CEST) Subject: bernhard: doc/www/src roadmap.html.m4,1.6,1.7 Message-ID: <20060510103226.ADB081005DA@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv4046 Modified Files: roadmap.html.m4 Log Message: Adjusted roadmap. Server 2.1-beta2 in May. Server 3 development start later. Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- roadmap.html.m4 7 Apr 2006 11:02:18 -0000 1.6 +++ roadmap.html.m4 10 May 2006 10:32:24 -0000 1.7 @@ -51,7 +51,7 @@
Upcoming Server release 2.1beta2
-Expected: April 2006 +Expected: May 2006

Bugfixes. @@ -63,7 +63,7 @@ Actual development has not startet yet.
-Expected: Start of development Q4 2006 +Expected: Start of development Q2 2007

Full multi-email-domain support
From cvs at intevation.de Thu May 11 17:22:32 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 11 May 2006 17:22:32 +0200 (CEST) Subject: till: doc/kde-client/svn-instructions checkout_proko2.sh,1.14,1.15 Message-ID: <20060511152232.4B2DD1006A3@lists.intevation.de> Author: till Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv29681 Modified Files: checkout_proko2.sh Log Message: Add the new ReleaseNotes files. Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- checkout_proko2.sh 27 Jan 2006 20:37:58 -0000 1.14 +++ checkout_proko2.sh 11 May 2006 15:22:30 -0000 1.15 @@ -81,6 +81,7 @@ switch_dir plugins for f in \ + ReleaseNotes \ Makefile.am.in \ kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \ kaddressbook/{searchmanager.{cpp,h},extensionmanager.{cpp,h}} \ From cvs at intevation.de Thu May 11 21:45:01 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 11 May 2006 21:45:01 +0200 (CEST) Subject: till: doc/kde-client/svn-instructions checkout_kde_i18n_proko2.sh, 1.1, 1.2 checkout_proko2.sh, 1.15, 1.16 Message-ID: <20060511194501.F074A1005DB@lists.intevation.de> Author: till Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv4354 Modified Files: checkout_kde_i18n_proko2.sh checkout_proko2.sh Log Message: Checkout the file that is only in proko2, that's better than switching. Index: checkout_kde_i18n_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_kde_i18n_proko2.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- checkout_kde_i18n_proko2.sh 13 May 2005 17:24:45 -0000 1.1 +++ checkout_kde_i18n_proko2.sh 11 May 2006 19:44:59 -0000 1.2 @@ -11,8 +11,8 @@ # Edit those lines or set the env vars out of the script. # SVNPROTOCOL can be either svn+ssh or https. # -#SVNPROTOCOL=https -#SVNUSER= +SVNPROTOCOL=svn+ssh +SVNUSER=tilladam if test -z "$SVNUSER"; then echo "You must set SVNUSER!" Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- checkout_proko2.sh 11 May 2006 15:22:30 -0000 1.15 +++ checkout_proko2.sh 11 May 2006 19:44:59 -0000 1.16 @@ -64,6 +64,14 @@ ( cd $dir && $SVN $USERNAMEOPT checkout "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) } +function checkout_file() { + echo "checking out $1 ..." + file=`basename $1` + dir=`dirname $1` + ( cd $dir && $SVN $USERNAMEOPT checkout "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) +} + + switch_dir certmanager/lib switch_dir kmail switch_dir korganizer @@ -81,7 +89,6 @@ switch_dir plugins for f in \ - ReleaseNotes \ Makefile.am.in \ kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \ kaddressbook/{searchmanager.{cpp,h},extensionmanager.{cpp,h}} \ @@ -102,6 +109,12 @@ libpimldaptools do checkout_dir $f +done + +for f in \ + ReleaseNotes + do + checkout_file $f done ### How to finish the branching of a dir where some files were branched: From cvs at intevation.de Mon May 15 08:59:34 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 15 May 2006 08:59:34 +0200 (CEST) Subject: till: doc/kde-client/svn-instructions checkout_proko2.sh,1.16,1.17 Message-ID: <20060515065934.65B0A1006C9@lists.intevation.de> Author: till Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv2084 Modified Files: checkout_proko2.sh Log Message: Doesn't work anyhow, checking out a single file is ot possible in svn, it turns out. Will have to find another solution. Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- checkout_proko2.sh 11 May 2006 19:44:59 -0000 1.16 +++ checkout_proko2.sh 15 May 2006 06:59:32 -0000 1.17 @@ -7,9 +7,9 @@ # SVNPROTOCOL can be either svn+ssh or https. # SVNPROTOCOL and SVNUSER only need to be set for svn.kde.org, not for anonymous checkout. # -#SVNSERVER=svn.kde.org -#SVNPROTOCOL=https -#SVNUSER= +SVNSERVER=svn.kde.org +SVNPROTOCOL=svn+ssh +SVNUSER=tilladam if test -z "$SVNSERVER"; then echo "You must set SVNSERVER!" @@ -64,14 +64,6 @@ ( cd $dir && $SVN $USERNAMEOPT checkout "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) } -function checkout_file() { - echo "checking out $1 ..." - file=`basename $1` - dir=`dirname $1` - ( cd $dir && $SVN $USERNAMEOPT checkout "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) -} - - switch_dir certmanager/lib switch_dir kmail switch_dir korganizer @@ -89,6 +81,7 @@ switch_dir plugins for f in \ + ReleaseNotes \ Makefile.am.in \ kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \ kaddressbook/{searchmanager.{cpp,h},extensionmanager.{cpp,h}} \ @@ -109,12 +102,6 @@ libpimldaptools do checkout_dir $f -done - -for f in \ - ReleaseNotes - do - checkout_file $f done ### How to finish the branching of a dir where some files were branched: From cvs at intevation.de Mon May 15 20:09:46 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 15 May 2006 20:09:46 +0200 (CEST) Subject: david: doc/kde-client/svn-instructions checkout_kde_i18n_proko2.sh, 1.2, 1.3 checkout_proko2.sh, 1.17, 1.18 Message-ID: <20060515180946.4CE981006D5@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv25375 Modified Files: checkout_kde_i18n_proko2.sh checkout_proko2.sh Log Message: Updated the script for the new branching mechanism - the scripts are not necessary anymore. Index: checkout_kde_i18n_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_kde_i18n_proko2.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- checkout_kde_i18n_proko2.sh 11 May 2006 19:44:59 -0000 1.2 +++ checkout_kde_i18n_proko2.sh 15 May 2006 18:09:44 -0000 1.3 @@ -35,21 +35,3 @@ cd kde-i18n svn up - -# This was the old idea, partial 3.3-branch with proko2 updates on top. -# But it's much simpler to just have a standalone proko2 branch. -#svn up -N templates -#svn up templates/kdepim -#svn up -N templates/docs -#svn up templates/docs/kdepim -#svn up -N de -#svn up -N de/messages -#svn up -N de/docs -#svn up de/messages/kdepim -#svn up de/docs/kdepim -#svn up -N de/messages/docs -#svn up de/messages/docs/kdepim -#svn up de/messages/docs/language -#echo de > subdirs -# to get the admin dir -#svn up Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- checkout_proko2.sh 15 May 2006 06:59:32 -0000 1.17 +++ checkout_proko2.sh 15 May 2006 18:09:44 -0000 1.18 @@ -1,111 +1,2 @@ -# Run this script from the *PARENT* directory of kdepim -# The script can even check out kdepim for you if needed. -# David Faure , LGPL v2. - -# Edit those lines or set the env vars out of the script. -# SVNSERVER can be svn.kde.org or anonsvn.kde.org -# SVNPROTOCOL can be either svn+ssh or https. -# SVNPROTOCOL and SVNUSER only need to be set for svn.kde.org, not for anonymous checkout. -# -SVNSERVER=svn.kde.org -SVNPROTOCOL=svn+ssh -SVNUSER=tilladam - -if test -z "$SVNSERVER"; then - echo "You must set SVNSERVER!" - exit 1 -fi - -if test "$SVNSERVER" = "svn.kde.org"; then - if test -z "$SVNUSER"; then - echo "You must set SVNUSER when using svn.kde.org!" - exit 1 - fi - if test -z "$SVNPROTOCOL"; then - echo "You must set SVNPROTOCOL when using svn.kde.org!" - exit 1 - fi - SVNUSERAT=$SVNUSER@ - USERNAMEOPT="--username $SVNUSER" -else - SVNPROTOCOL=svn - SVNUSER= - SVNUSERAT= - USERNAMEOPT= -fi - -SVN=svn -CDPATH= - -if ! test -d kdepim; then - echo "kdepim not found. Press ENTER to check it out from SVN." - read && \ - $SVN $USERNAMEOPT checkout $SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/KDE/3.3/kdepim || exit 1 -fi - -cd kdepim - -function switch_dir() { - echo "switching $1..." - ( cd $1 && $SVN $USERNAMEOPT switch "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$1" ) -} - -function switch_file() { - echo "switching $1..." - file=`basename $1` - dir=`dirname $1` - ( cd $dir && $SVN $USERNAMEOPT switch "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) -} - -function checkout_dir() { - echo "checking out $1 ..." - file=`basename $1` - dir=`dirname $1` - ( cd $dir && $SVN $USERNAMEOPT checkout "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) -} - -switch_dir certmanager/lib -switch_dir kmail -switch_dir korganizer -switch_dir kontact -switch_dir kpilot -switch_dir kioslaves/imap4 -switch_dir doc/kmail -switch_dir doc/korganizer -switch_dir doc/kaddressbook -switch_dir doc/kleopatra -switch_dir libkdepim -switch_dir mimelib -switch_dir libkcal -switch_dir kresources -switch_dir plugins - -for f in \ - ReleaseNotes \ - Makefile.am.in \ - kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \ - kaddressbook/{searchmanager.{cpp,h},extensionmanager.{cpp,h}} \ - kaddressbook/kaddressbookui.rc \ - kaddressbook/interfaces/{core.h,extensionwidget.h} \ - kaddressbook/features/distributionlistwidget.{cpp,h} \ - kaddressbook/features/resourceselection.{cpp,h} \ - certmanager/{aboutdata.cpp,certificatewizard{.ui,impl.cpp},lib/backends/qgpgme/qgpgmejob.cpp} \ - libkdenetwork/Makefile.am \ - wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \ - kioslaves/Makefile.am - do - switch_file $f -done - -for f in \ - kioslaves/ldap \ - libpimldaptools - do - checkout_dir $f -done - -### How to finish the branching of a dir where some files were branched: -### (use with care, check each intermediate step...) -# ( cd pure-proko2/kdepim/$subdir && ls -1 > /tmp/alreadythere ) -# ( cd kdepim-proko2/kdepim/$subdir && ls -1 | while read a; do if grep -q ^$a$ /tmp/alreadythere; then : ; else echo $a ; fi ; done > /tmp/tocp ) -# ( cd pure-proko2/kdepim/$subdir && cat /tmp/tocp | while read f ; do svn cp $SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done ) +echo "This script doesn't exist anymore. proko2 is now a simple branch, simply check it out with" +echo "svn co your_url_to_the_kde_svn/branches/kdepim/proko2/kdepim" From cvs at intevation.de Tue May 16 19:17:15 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 16 May 2006 19:17:15 +0200 (CEST) Subject: bernhard: doc/www/src index.html.m4,1.82,1.83 Message-ID: <20060516171715.3B6901006A6@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv13116 Modified Files: index.html.m4 Log Message: * Added security/kolab-vendor-notice-09.txt and news. * Frontpage: moved older new out of the LATEST block. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- index.html.m4 2 May 2006 17:36:28 -0000 1.82 +++ index.html.m4 16 May 2006 17:17:13 -0000 1.83 @@ -44,6 +44,22 @@ -->
+ + + + +
May 16th, 2006 » + Security Advisory 09 for Kolab Server (CVE-2006-1989, 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 09 for details. +
+
+

May 2nd, 2006 » @@ -87,6 +103,11 @@
+ + + + +
@@ -136,12 +157,6 @@ updating.
- - - - - -

February 10th, 2006
From cvs at intevation.de Tue May 16 19:17:15 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 16 May 2006 19:17:15 +0200 (CEST) Subject: bernhard: doc/www/src/security kolab-vendor-notice-09.txt,NONE,1.1 Message-ID: <20060516171715.3D0761006A8@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv13116/security Added Files: kolab-vendor-notice-09.txt Log Message: * Added security/kolab-vendor-notice-09.txt and news. * Frontpage: moved older new out of the LATEST block. --- NEW FILE: kolab-vendor-notice-09.txt --- -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Kolab Security Issue 09 20060516 ================================ Package: Kolab Server Vulnerability: buffer overflow, remotely exploitable (CVE-2006-1989) Kolab Specific: no Dependent Packages: none Impact: high Summary ~~~~~~~ The Clam AntiVirus package's freshclam component has a buffer overflow that can be exploited remotely. Freshclam fetches updates via HTTP. A specially prepared HTTP server could be used by an attacker to exploit the buffer overflow. By means of DNS poisoning freshclam could be pointed to such a bogus server. Affected Versions ~~~~~~~~~~~~~~~~~ This affects all servers which have ClamAV 0.80 up to 0.88.1 running. Kolab Servers 2.0.3, Kolab Server 2.1beta1 are vulnerable. Previous releases are affected. Fix ~~~ Upgrade to ClamAV 0.88.2. A new ClamAV RPM is available from the Kolab download mirrors as security-updates/20060616/clamav-0.88.2-20060430.src.rpm In addition a binary RPM for (ix86 Debian GNU/Linux Sarge) is available: Kolab Server 2.0.3 (Sarge) security-updates/clamav-0.88.2-20060430.ix86-debian3.1-kolab.rpm All other Server versions: Please build from the 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 -tzv rsync://rsync.kolab.org/kolab/server/security-updates/20060616/clamav-0.88.2-20060430.src.rpm . MD5 sums: bce57f67d9549087f4f1b88313fcf237 clamav-0.88.2-20060430.src.rpm 8d646b130ed9f166ed16a589776406e4 clamav-0.88.2-20060430.ix86-debian3.1-kolab.rpm The package can be installed on your Kolab Server with # /kolab/bin/openpkg rpm --rebuild clamav-0.88.2-20060430.src.rpm # /kolab/bin/openpkg rpm \ -Uvh /kolab/RPM/PKG/clamav-0.88.2-20060430.--kolab.rpm The installation process will likely 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.2.html ClamAV 0.88.2 release notes Timeline ~~~~~~~~ 20060429 ClamAV security release 0.88.2, announced as "Moderate risk". 20060430 OpenPKG 0.88.2 package release as in section CUR/SRC/PLUS. 20060516 Security assessment for Kolab Server by Martin Konold. 20060516 Kolab Server tests, update and security advisory published. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQFEagcah9ag3dpKERYRAlkuAJ9SuBb5u8II8ggp6bvbpc4mOc45WACeKIWL WETC1uzA/fbs5vTOW/o3SyM= =CkY4 -----END PGP SIGNATURE----- From cvs at intevation.de Thu May 18 00:12:58 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 00:12:58 +0200 (CEST) Subject: steffen: server/kolabd/kolabd/templates session_vars.php.template.in, 1.4, 1.5 Message-ID: <20060517221258.DFC541005DA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv5630 Modified Files: session_vars.php.template.in Log Message: shut up Index: session_vars.php.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- session_vars.php.template.in 5 Feb 2006 17:51:31 -0000 1.4 +++ session_vars.php.template.in 17 May 2006 22:12:56 -0000 1.5 @@ -21,7 +21,7 @@ * since we source this file on every invokation anyway. */ -session_start(); + at session_start(); $_SESSION['fqdnhostname'] = "@@@fqdnhostname@@@"; $_SESSION['ldap_master_uri'] = "@@@ldap_master_uri@@@"; From cvs at intevation.de Thu May 18 01:15:34 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 01:15:34 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include menu.php, 1.14, 1.15 Message-ID: <20060517231534.D7A1A1005DA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv6749/kolab-webadmin/php/admin/include Modified Files: menu.php Log Message: patches from wrobel Index: menu.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- menu.php 24 Jul 2005 21:47:41 -0000 1.14 +++ menu.php 17 May 2006 23:15:32 -0000 1.15 @@ -41,13 +41,16 @@ array( 'name' => _('Vacation'), 'url' => 'vacation.php' ))); } -if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') { +if( $auth->group() == "admin" || $auth->group() == "maintainer") { $menuitems['addressbook'] = array( 'name' => _('Addressbook'), 'url' => $topdir.'/addressbook/', 'title' => _('Manage Address Book'), 'submenu' => array( array( 'name' => _('Create New vCard'), 'url' => 'addr.php?action=create' ))); + +} +if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') { $menuitems['sf'] = array( 'name' => _('Shared Folder'), 'url' => $topdir.'/sharedfolder/', 'title' => _('Manage Shared Folders'), @@ -76,8 +79,6 @@ 'submenu' => array( array( 'name' => _('Create New Domain Maintainer'), 'url' => 'domainmaintainer.php?action=create' ) ) ); -} -if( $auth->group() == 'admin' ) { $menuitems['maintainer'] = array( 'name' => _('Maintainers'), 'url' => $topdir.'/maintainer/', 'title' => _('Manage Maintainers'), @@ -89,8 +90,17 @@ $menuitems['maintainer'] = array( 'name' => _('Maintainers'), 'url' => $topdir.'/maintainer/maintainer.php?action=modify&dn='.urlencode($mdn), 'title' => _('Manage Maintainer') ); + $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'), + 'url' => $topdir.'/domainmaintainer/', + 'title' => _('Manage Domain Maintainers'), + 'submenu' => array( + array( 'name' => _('Create New Domain Maintainer'), + 'url' => 'domainmaintainer.php?action=create' ) ) ); } else if( $auth->group() == 'domain-maintainer' ) { - // Domain maintainer + $mdn = $auth->dn(); + $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'), + 'url' => $topdir.'/domainmaintainer/domainmaintainer.php?action=modify&dn='.urlencode($mdn), + 'title' => _('Manage Domain Maintainer') ); } if( $auth->group() == 'admin' ) { $menuitems['service'] = array( 'name' => _('Services'), From cvs at intevation.de Thu May 18 01:15:34 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 01:15:34 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php.in, 1.2, 1.3 index.php.in, 1.1, 1.2 Message-ID: <20060517231534.E1C861005DE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer In directory doto:/tmp/cvs-serv6749/kolab-webadmin/www/admin/domainmaintainer Modified Files: domainmaintainer.php.in index.php.in Log Message: patches from wrobel Index: domainmaintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- domainmaintainer.php.in 9 Mar 2006 21:27:22 -0000 1.2 +++ domainmaintainer.php.in 17 May 2006 23:15:32 -0000 1.3 @@ -71,6 +71,7 @@ return ''; } function fill_form_for_modify( &$form, &$ldap_object ) { + global $auth; global $ldap; if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0]; else $lastname = $ldap_object['sn']; @@ -91,7 +92,12 @@ $form->entries['password_1']['value'] = ''; $form->entries['uid']['value'] = $uid; $form->entries['uid']['attrs'] = 'readonly'; - $form->entries['domains']['value'] = $ldap->domainsForMaintainerUid($uid); + if( $auth->group() != 'admin' && $auth->group() != 'maintainer' ) { + $form->entries['firstname']['attrs'] = 'readonly'; + $form->entries['lastname']['attrs'] = 'readonly'; + } else { + $form->entries['domains']['value'] = $ldap->domainsForMaintainerUid($uid); + } } /**** Authentication etc. ***/ @@ -114,7 +120,7 @@ if (!empty($_REQUEST['dn'])) $dn = trim(urldecode($_REQUEST['dn'])); // Check auth -if (!$errors && $auth->group() != 'admin' && $auth->group() != 'maintainer' ) { +if (!$errors && $auth->group() != 'admin' && $auth->group() != 'maintainer' && $auth->group() != 'domain-maintainer' ) { array_push($errors, _("Error: You don't have the required Permissions")); } @@ -143,13 +149,16 @@ 'comment' => $comment_password ), 'uid' => array( 'name' => _('Unique User ID'), 'validation' => 'notempty', - 'comment' => $comment_mail_0 ), - 'domains' => array( 'name' => _("Domains"), - 'type' => "checklist", - 'comment' => _("Check domains this domain maintainer should be able to maintain"), - 'options' => $ldap->domains()) + 'comment' => $comment_mail_0 ) ); +if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) { + $entries['domains'] = array( 'name' => _("Domains"), + 'type' => "checklist", + 'comment' => _("Check domains this domain maintainer should be able to maintain"), + 'options' => $ldap->domains()); + } + $entries['action'] = array( 'name' => 'action', 'type' => 'hidden' ); @@ -225,10 +234,12 @@ $errors[] = sprintf( _("LDAP Error: Could not remove old group entry %s: %s"), $dn, ldap_error($ldap->connection)); } - if( !$errors ) { - $domains = $ldap->domainsForMaintainerDn($dn); - $ldap->removeFromDomainGroups( $dn, $domains ); - $ldap->addToDomainGroups( $newdn, $_POST['domains'] ); + if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) { + if( !$errors ) { + $domains = $ldap->domainsForMaintainerDn($dn); + $ldap->removeFromDomainGroups( $dn, $domains ); + $ldap->addToDomainGroups( $newdn, $_POST['domains'] ); + } } } $dn = $newdn; @@ -250,6 +261,11 @@ $heading = _('Modify Domain Maintainer'); $messages[] = _('Maintainer ').$ldap_object['dn']._(' successfully modified'); $form->setValues(); + if( $auth->group() != 'admin' && $auth->group() != 'maintainer' ) { + $form->entries['firstname']['attrs'] = 'readonly'; + $form->entries['lastname']['attrs'] = 'readonly'; + } + $form->entries['uid']['attrs'] = 'readonly'; $form->entries['action']['value'] = 'save'; } else { // firstsave Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/index.php.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.php.in 5 Feb 2006 20:13:55 -0000 1.1 +++ index.php.in 17 May 2006 23:15:32 -0000 1.2 @@ -28,7 +28,7 @@ /**** Authentication etc. ***/ $sidx = 'domain-maintainer'; -if( $auth->group() != 'admin' ) { +if( $auth->group() != 'admin' && $auth->group() != 'maintainer' ) { array_push($errors, _("Error: You don't have Permissions to access this Menu")); } @@ -52,7 +52,7 @@ $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'domain-maintainer' ); - $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))"; + $filter = "(&(cn=*)(objectclass=kolabInetOrgPerson)(!(uid=manager))(sn=*))"; $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' )); if( $result ) { From cvs at intevation.de Thu May 18 01:15:34 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 01:15:34 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer maintainer.php.in, 1.2, 1.3 Message-ID: <20060517231534.E3EB81006A1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer In directory doto:/tmp/cvs-serv6749/kolab-webadmin/www/admin/maintainer Modified Files: maintainer.php.in Log Message: patches from wrobel Index: maintainer.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- maintainer.php.in 9 Mar 2006 21:27:22 -0000 1.2 +++ maintainer.php.in 17 May 2006 23:15:32 -0000 1.3 @@ -71,6 +71,7 @@ return ''; } function fill_form_for_modify( &$form, &$ldap_object ) { + global $auth; if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0]; else $lastname = $ldap_object['sn']; if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0]; @@ -90,7 +91,10 @@ $form->entries['password_1']['value'] = ''; $form->entries['uid']['value'] = $uid; $form->entries['uid']['attrs'] = 'readonly'; - + if( $auth->group() != 'admin' ) { + $form->entries['firstname']['attrs'] = 'readonly'; + $form->entries['lastname']['attrs'] = 'readonly'; + } /* foreach( array( 'title', 'o', 'ou', 'street', 'postOfficeBox', 'postalCode', 'l', 'c', 'telephoneNumber', @@ -259,6 +263,11 @@ $heading = _('Modify Maintainer'); $messages[] = _('Maintainer ').$ldap_object['dn']._(' successfully modified'); $form->setValues(); + if( $auth->group() != 'admin' ) { + $form->entries['firstname']['attrs'] = 'readonly'; + $form->entries['lastname']['attrs'] = 'readonly'; + } + $form->entries['uid']['attrs'] = 'readonly'; $form->entries['action']['value'] = 'save'; $content = $form->outputForm(); break; From cvs at intevation.de Thu May 18 04:44:33 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 04:44:33 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm.in,1.6,1.7 Message-ID: <20060518024433.F24EB1005DA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv19252/Kolab-Conf Modified Files: Conf.pm.in Log Message: Fix for issue1220 (postfix permissions) Index: Conf.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Conf.pm.in 27 Mar 2006 21:07:54 -0000 1.6 +++ Conf.pm.in 18 May 2006 02:44:31 -0000 1.7 @@ -410,7 +410,7 @@ # FIXME: bad way of doing things... #system("chown root:root @emailserver_confdir@/*"); fixup( $cfg, $ownership{$cfg}, $permissions{$cfg}); - system("@sbindir@/postmap @emailserver_confdir@/$map"); + system("@sbindir@/postmap -o @emailserver_confdir@/$map"); if (-f $oldcfg) { my $rc = `diff -q $cfg $oldcfg`; From cvs at intevation.de Thu May 18 04:53:30 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 04:53:30 +0200 (CEST) Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm.in,1.7,1.8 Message-ID: <20060518025330.551911005DA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv19365/Kolab-Conf Modified Files: Conf.pm.in Log Message: patch from wrobel (issue1237) Index: Conf.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Conf.pm.in 18 May 2006 02:44:31 -0000 1.7 +++ Conf.pm.in 18 May 2006 02:53:28 -0000 1.8 @@ -261,7 +261,7 @@ ($skip > 0) && $skip--; s/\@{3}endif\@{3}\n?//; } else { - while (/\@{3}(\S+?)(\|(.+?)$(.*)$)?\@{3}/) { + while (/\@{3}([^\s\@]+?)(\|(.+?)$(.*)$)?\@{3}/) { my $attr = $1; my $fct = $3; my $args = $4; @@ -294,11 +294,11 @@ } } } - s/\@{3}(\S+?)(\|.+?)?\@{3}/$val/; + s/\@{3}([^\s\@]+?)(\|.+?)?\@{3}/$val/; last if ( $val eq "\@\@\@$attr\@\@\@" ); # prevent endless loop } else { Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN); - s/\@{3}(\S+?)\@{3}//; + s/\@{3}([^\s\@]+?)\@{3}//; } } ($skip == 0) && print $config $_; From cvs at intevation.de Thu May 18 05:14:27 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 05:14:27 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.8, 1.9 Message-ID: <20060518031427.024071005DA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv19904/kolab-webadmin/www/admin/user Modified Files: user.php.in Log Message: Fix for Issue1106 (email validation in webgui) Index: user.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- user.php.in 22 Mar 2006 19:34:29 -0000 1.8 +++ user.php.in 18 May 2006 03:14:24 -0000 1.9 @@ -459,7 +459,7 @@ switch( $action ) { case 'firstsave': debug("adding checkuniquemail to validation"); - $form->entries['mail']['validation'] = 'checkuniquemail'; + $form->entries['mail']['validation'] = array( $form->entries['mail']['validation'], 'checkuniquemail'); case 'save': if( $form->isSubmitted() ) { if( !$form->validate() ) { From cvs at intevation.de Thu May 18 13:13:38 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 13:13:38 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26.2.4, 1.26.2.5 Message-ID: <20060518111338.A06BD1006C2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv1633 Modified Files: Tag: kolab_2_0_branch kolabfilter.php Log Message: Fix for Issue1243 (from header rewriting). Port to HEAD still pending Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v retrieving revision 1.26.2.4 retrieving revision 1.26.2.5 diff -u -d -r1.26.2.4 -r1.26.2.5 --- kolabfilter.php 29 Mar 2006 12:46:12 -0000 1.26.2.4 +++ kolabfilter.php 18 May 2006 11:13:36 -0000 1.26.2.5 @@ -90,10 +90,11 @@ $adrs = imap_rfc822_parse_adrlist($addr, $params['email_domain']); foreach ($adrs as $adr) { $adrdom = $adr->host; - foreach( $domains as $dom ) { - if( $dom == $adrdom ) return true; - if( $params['verify_subdomains'] && substr($adrdom, -strlen($dom)-1) == ".$dom" ) return true; - } + if( empty($adrdom) ) continue; + foreach( $domains as $dom ) { + if( $dom == $adrdom ) return true; + if( $params['verify_subdomains'] && substr($adrdom, -strlen($dom)-1) == ".$dom" ) return true; + } } return false; } @@ -184,12 +185,20 @@ $subject = false; $senderok = true; $rewrittenfrom = false; -while (!feof(STDIN) && !$headers_done) { + +define( RM_STATE_READING_HEADER, 1 ); +define( RM_STATE_READING_FROM, 2 ); +define( RM_STATE_READING_SENDER, 3 ); +define( RM_STATE_READING_BODY, 4 ); + +$state = RM_STATE_READING_HEADER; + +while (!feof(STDIN) && $state != RM_STATE_READING_BODY) { $buffer = fgets(STDIN, 8192); $line = rtrim( $buffer, "\r\n"); if( $line == '' ) { // Done with headers - $headers_done = true; + $state = RM_STATE_READING_BODY; if( $from && $params['verify_from_header'] ) { if( !verify_sender( strtolower($sender), strtolower($from), $client_address) ) { myLog("$sender and $from differ!", RM_LOG_DEBUG); @@ -207,15 +216,30 @@ } } } - } else if( !$headers_done && $params['allow_sender_header'] && eregi( '^Sender: (.*)', $line, $regs ) ) { - $from = $regs[1]; - } else if( !$headers_done && !$from && eregi( '^From: (.*)', $line, $regs ) ) { - $from = $regs[1]; - } else if( !$headers_done && eregi( '^Subject: (.*)', $line, $regs ) ) { - $subject = $regs[1]; - } else if( !$headers_done && eregi( '^Content-Type: text/calendar', $line ) ) { - myLog("Found iCal data in message", RM_LOG_DEBUG); - $ical = true; + } else { + if( $line[0] != ' ' && $line[0] != "\t" ) $state = RM_STATE_READING_HEADER; + switch( $state ) { + case RM_STATE_READING_HEADER: + if( $params['allow_sender_header'] && eregi( '^Sender: (.*)', $line, $regs ) ) { + $from = $regs[1]; + $state = RM_STATE_READING_SENDER; + } else if( !$from && eregi( '^From: (.*)', $line, $regs ) ) { + $from = $regs[1]; + $state = RM_STATE_READING_FROM; + } else if( eregi( '^Subject: (.*)', $line, $regs ) ) { + $subject = $regs[1]; + } else if( eregi( '^Content-Type: text/calendar', $line ) ) { + myLog("Found iCal data in message", RM_LOG_DEBUG); + $ical = true; + } + break; + case RM_STATE_READING_FROM: + $from .= $line; + break; + case RM_STATE_READING_SENDER: + $from .= $line; + break; + } } if( fwrite($tmpf, $buffer) === false ) { exit(EX_TEMPFAIL); From cvs at intevation.de Thu May 18 15:49:47 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 15:49:47 +0200 (CEST) Subject: torsten: doc/www/src index.html.m4,1.83,1.84 Message-ID: <20060518134947.356B91006C7@lists.intevation.de> Author: torsten Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv6781/src Modified Files: index.html.m4 Log Message: Added news for proko 2.1.1 KDE client release Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- index.html.m4 16 May 2006 17:17:13 -0000 1.83 +++ index.html.m4 18 May 2006 13:49:44 -0000 1.84 @@ -44,6 +44,30 @@ -->
+
+ + +
May 18th, 2006 » + New version 2.2.1 of proko2 KDE client is available +
+
+ This release is a bugfix release decorated with some nice new + features which are mainly backports from the KDE 3.5 branch. +
Take a look at the release notes in the download section + for a detailed view of all applied changes. +
+ A short excerpt of the included features and bugfixes. +
+
New: Coloring of different calendar ressources
+
New: Speed Improvements on large calenders
+
New: Better support for online/offline working
+
Fixed: Many issues related to groupwarefolders in a + dIMAP/IMAP environment.
+
+ Take a look on the download section to get the new release. +
+
+ From cvs at intevation.de Thu May 18 17:42:27 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 17:42:27 +0200 (CEST) Subject: bernhard: doc/www/src index.html.m4,1.84,1.85 Message-ID: <20060518154227.E21DF1006C5@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv8967 Modified Files: index.html.m4 Log Message: In the last news: Fixed client version number 2.2.1 -> 2.1.1 . Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- index.html.m4 18 May 2006 13:49:44 -0000 1.84 +++ index.html.m4 18 May 2006 15:42:25 -0000 1.85 @@ -47,7 +47,7 @@

May 16th, 2006

May 18th, 2006 » - New version 2.2.1 of proko2 KDE client is available + New version 2.1.1 of proko2 KDE client is available

From cvs at intevation.de Thu May 18 19:46:05 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Thu, 18 May 2006 19:46:05 +0200 (CEST) Subject: bernhard: doc/www/src mirrors.html.m4,1.14,1.15 Message-ID: <20060518174605.EF47E1006BC@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv11949 Modified Files: mirrors.html.m4 Log Message: Added mirror contact email addresses. Index: mirrors.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- mirrors.html.m4 20 Jan 2006 14:44:30 -0000 1.14 +++ mirrors.html.m4 18 May 2006 17:46:03 -0000 1.15 @@ -8,14 +8,18 @@
erfrakon
via http +
Belnet
via http | ftp + +
Linjection (might lack stable server releases)
via http +
How to become a mirror?
From cvs at intevation.de Sun May 21 14:09:20 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 21 May 2006 14:09:20 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers Makefile, 1.9.2.4, 1.9.2.5 kolab-resource-handlers.spec, 1.126.2.15, 1.126.2.16 Message-ID: <20060521120920.A95361005D6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv19623 Modified Files: Tag: kolab_2_0_branch Makefile kolab-resource-handlers.spec Log Message: Fix for Issue1245 (folded headers) Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -u -d -r1.9.2.4 -r1.9.2.5 --- Makefile 30 Apr 2006 02:37:55 -0000 1.9.2.4 +++ Makefile 21 May 2006 12:09:18 -0000 1.9.2.5 @@ -4,7 +4,7 @@ PACKAGE=kolab-resource-handlers VERSION = 0.3.9 -RELEASE=20060430 +RELEASE=20060520 PEARVERSION = 1.3 RPM = /kolab/bin/openpkg rpm Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.126.2.15 retrieving revision 1.126.2.16 diff -u -d -r1.126.2.15 -r1.126.2.16 --- kolab-resource-handlers.spec 30 Apr 2006 02:37:55 -0000 1.126.2.15 +++ kolab-resource-handlers.spec 21 May 2006 12:09:18 -0000 1.126.2.16 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20060430 +Release: 20060520 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Sun May 21 14:09:20 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 21 May 2006 14:09:20 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26.2.5, 1.26.2.6 misc.php, 1.4, 1.4.2.1 Message-ID: <20060521120920.B4C7B1005D7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv19623/kolab-resource-handlers/resmgr Modified Files: Tag: kolab_2_0_branch kolabfilter.php misc.php Log Message: Fix for Issue1245 (folded headers) Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v retrieving revision 1.26.2.5 retrieving revision 1.26.2.6 diff -u -d -r1.26.2.5 -r1.26.2.6 --- kolabfilter.php 18 May 2006 11:13:36 -0000 1.26.2.5 +++ kolabfilter.php 21 May 2006 12:09:18 -0000 1.26.2.6 @@ -71,11 +71,15 @@ // Temp file for storing the message $tmpfname = tempnam( TMPDIR, 'IN.' ); $tmpf = fopen($tmpfname, "w"); +if( !$tmpf ) { + myLog("Error: Could not open $tempfname for writing: ".php_error(), RM_LOG_ERROR); + exit(EX_TEMPFAIL); +} // Cleanup function function cleanup() { global $tmpfname; - file_exists($tmpfname) && unlink($tmpfname); + //file_exists($tmpfname) && unlink($tmpfname); } register_shutdown_function( 'cleanup' ); @@ -131,8 +135,6 @@ $senderdom = substr(strrchr($sender, '@'), 1); foreach( $domains as $domain ) { if( $params['verify_subdomains'] ) { - //myLog( "Checking if ".substr($senderdom, -strlen($domain)-1)." == .$domain", RM_LOG_DEBUG ); - //myLog( "Checking if ".substr($fromdom, -strlen($domain)-1)." == .$domain", RM_LOG_DEBUG ); if( $client_addr != '127.0.0.1' && ($senderdom == $domain || $fromdom == $domain || @@ -179,8 +181,6 @@ .", client_address=$client_address", RM_LOG_DEBUG); $ical = false; -$add_headers = array(); -$headers_done = false; $from = false; $subject = false; $senderok = true; @@ -188,8 +188,9 @@ define( RM_STATE_READING_HEADER, 1 ); define( RM_STATE_READING_FROM, 2 ); -define( RM_STATE_READING_SENDER, 3 ); -define( RM_STATE_READING_BODY, 4 ); +define( RM_STATE_READING_SUBJECT,3 ); +define( RM_STATE_READING_SENDER, 4 ); +define( RM_STATE_READING_BODY, 5 ); $state = RM_STATE_READING_HEADER; @@ -228,6 +229,7 @@ $state = RM_STATE_READING_FROM; } else if( eregi( '^Subject: (.*)', $line, $regs ) ) { $subject = $regs[1]; + $state = RM_STATE_READING_SUBJECT; } else if( eregi( '^Content-Type: text/calendar', $line ) ) { myLog("Found iCal data in message", RM_LOG_DEBUG); $ical = true; @@ -239,6 +241,9 @@ case RM_STATE_READING_SENDER: $from .= $line; break; + case RM_STATE_READING_SUBJECT: + $subject .= $line; + break; } } if( fwrite($tmpf, $buffer) === false ) { @@ -276,6 +281,11 @@ //$outputtime->start(); $tmpf = fopen($tmpfname,"r"); +if( !$tmpf ) { + myLog("Error: Could not open $tempfname for reading: ".php_error(), RM_LOG_ERROR); + exit(EX_TEMPFAIL); +} + $smtp = new KolabSMTP( 'localhost', 10026 ); if( PEAR::isError( $smtp ) ) { fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); @@ -288,30 +298,36 @@ else exit(EX_UNAVAILABLE); } -$headers_done = false; -while (!feof($tmpf) && !$headers_done) { +$state = RM_STATE_READING_HEADER; +while (!feof($tmpf) && $state != RM_STATE_READING_BODY) { $buffer = fgets($tmpf, 8192); - if( !$headers_done && $rewrittenfrom && eregi( '^From: (.*)', $buffer ) ) { - if( PEAR::isError($error = $smtp->data( $rewrittenfrom )) ) { - fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); - if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); - else exit(EX_UNAVAILABLE); - } - continue; - } - if( !$headers_done && rtrim( $buffer, "\r\n" ) == '' ) { - $headers_done = true; - foreach( $add_headers as $h ) { - if( PEAR::isError($error = $smtp->data( "$h\r\n" )) ) { - fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $rewrittenfrom ) { + if( eregi( '^From: (.*)', $buffer ) ) { + if( PEAR::isError($error = $smtp->data( $rewrittenfrom )) ) { + $str = $error->getMessage().", code ".$error->getCode(); + myLog($str,RM_LOG_DEBUG); + fwrite(STDOUT, $str."\n"); if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); else exit(EX_UNAVAILABLE); } + $state = RM_STATE_READING_FROM; + continue; + } else if( $state == RM_STATE_READING_FROM && + ($buffer[0] == ' ' || $buffer[0] == "\t" ) ) { + // Folded From header, ignore + continue; } } - //myLog("Calling smtp->data( ".rtrim($buffer)." )", RM_LOG_DEBUG); + if( $buffer[0] != ' ' && $buffer[0] != "\t" ) { + $state = RM_STATE_READING_HEADER; + } + if( rtrim( $buffer, "\r\n" ) == '' ) { + $state = RM_STATE_READING_BODY; + } if( PEAR::isError($error = $smtp->data( $buffer )) ) { - fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + $str = $error->getMessage().", code ".$error->getCode(); + myLog($str,RM_LOG_DEBUG); + fwrite(STDOUT, $str."\n"); if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); else exit(EX_UNAVAILABLE); } @@ -334,7 +350,6 @@ } }; -//myLog("Calling smtp->end()", RM_LOG_DEBUG); $smtp->end(); //$outputtime->stop(); myLog("Kolabfilter successfully completed", RM_LOG_DEBUG); Index: misc.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- misc.php 2 Apr 2005 02:47:34 -0000 1.4 +++ misc.php 21 May 2006 12:09:18 -0000 1.4.2.1 @@ -187,4 +187,4 @@ return $ret; } -?> \ No newline at end of file +?> From cvs at intevation.de Sun May 21 15:41:21 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 21 May 2006 15:41:21 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26.2.6, 1.26.2.7 Message-ID: <20060521134121.8639F1005D6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv21116 Modified Files: Tag: kolab_2_0_branch kolabfilter.php Log Message: minor fixes for folded header issue(s) Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v retrieving revision 1.26.2.6 retrieving revision 1.26.2.7 diff -u -d -r1.26.2.6 -r1.26.2.7 --- kolabfilter.php 21 May 2006 12:09:18 -0000 1.26.2.6 +++ kolabfilter.php 21 May 2006 13:41:19 -0000 1.26.2.7 @@ -70,7 +70,7 @@ // Temp file for storing the message $tmpfname = tempnam( TMPDIR, 'IN.' ); -$tmpf = fopen($tmpfname, "w"); +$tmpf = @fopen($tmpfname, "w"); if( !$tmpf ) { myLog("Error: Could not open $tempfname for writing: ".php_error(), RM_LOG_ERROR); exit(EX_TEMPFAIL); @@ -79,7 +79,7 @@ // Cleanup function function cleanup() { global $tmpfname; - //file_exists($tmpfname) && unlink($tmpfname); + file_exists($tmpfname) && unlink($tmpfname); } register_shutdown_function( 'cleanup' ); @@ -280,7 +280,7 @@ //$outputtime =& new MyTimer("Output"); //$outputtime->start(); -$tmpf = fopen($tmpfname,"r"); +$tmpf = @fopen($tmpfname,"r"); if( !$tmpf ) { myLog("Error: Could not open $tempfname for reading: ".php_error(), RM_LOG_ERROR); exit(EX_TEMPFAIL); @@ -305,7 +305,7 @@ if( eregi( '^From: (.*)', $buffer ) ) { if( PEAR::isError($error = $smtp->data( $rewrittenfrom )) ) { $str = $error->getMessage().", code ".$error->getCode(); - myLog($str,RM_LOG_DEBUG); + myLog($str,RM_LOG_ERROR); fwrite(STDOUT, $str."\n"); if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); else exit(EX_UNAVAILABLE); @@ -326,7 +326,7 @@ } if( PEAR::isError($error = $smtp->data( $buffer )) ) { $str = $error->getMessage().", code ".$error->getCode(); - myLog($str,RM_LOG_DEBUG); + myLog($str,RM_LOG_ERROR); fwrite(STDOUT, $str."\n"); if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); else exit(EX_UNAVAILABLE); From cvs at intevation.de Sun May 21 15:53:27 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sun, 21 May 2006 15:53:27 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php.in, 1.9, 1.10 kolabmailboxfilter.php.in, 1.6, 1.7 Message-ID: <20060521135327.86FFB1005D6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv21335/kolab-resource-handlers/resmgr Modified Files: kolabfilter.php.in kolabmailboxfilter.php.in Log Message: Forward port of fix for issues 1243/1245 Index: kolabfilter.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- kolabfilter.php.in 29 Mar 2006 12:56:01 -0000 1.9 +++ kolabfilter.php.in 21 May 2006 13:53:25 -0000 1.10 @@ -70,7 +70,11 @@ // Temp file for storing the message $tmpfname = tempnam( TMPDIR, 'IN.' ); -$tmpf = fopen($tmpfname, "w"); +$tmpf = @fopen($tmpfname, "w"); +if( !$tmpf ) { + myLog("Error: Could not open $tempfname for writing: ".php_error(), RM_LOG_ERROR); + exit(EX_TEMPFAIL); +} // Cleanup function function cleanup() { @@ -90,10 +94,11 @@ $adrs = imap_rfc822_parse_adrlist($addr, $params['email_domain']); foreach ($adrs as $adr) { $adrdom = $adr->host; - foreach( $domains as $dom ) { - if( $dom == $adrdom ) return true; - if( $params['verify_subdomains'] && substr($adrdom, -strlen($dom)-1) == ".$dom" ) return true; - } + if( empty($adrdom) ) continue; + foreach( $domains as $dom ) { + if( $dom == $adrdom ) return true; + if( $params['verify_subdomains'] && substr($adrdom, -strlen($dom)-1) == ".$dom" ) return true; + } } return false; } @@ -277,19 +282,24 @@ myLog("Kolabfilter starting up, user=$sasl_username, sender=$sender, recipients=".join(',', $recipients) .", client_address=$client_address", RM_LOG_DEBUG); +define( RM_STATE_READING_HEADER, 1 ); +define( RM_STATE_READING_FROM, 2 ); +define( RM_STATE_READING_SUBJECT,3 ); +define( RM_STATE_READING_SENDER, 4 ); +define( RM_STATE_READING_BODY, 5 ); + $ical = false; -$add_headers = array(); -$headers_done = false; $from = false; $subject = false; $senderok = true; $rewrittenfrom = false; -while (!feof(STDIN) && !$headers_done) { +$state = RM_STATE_READING_HEADER; +while (!feof(STDIN) && $state != RM_STATE_READING_BODY) { $buffer = fgets(STDIN, 8192); $line = rtrim( $buffer, "\r\n"); if( $line == '' ) { // Done with headers - $headers_done = true; + $state = RM_STATE_READING_BODY; if( $from && $params['verify_from_header'] ) { $rc = verify_sender( $sasl_username, $sender, $from, $client_address); if( PEAR::isError($rc) ) { @@ -310,15 +320,34 @@ } } } - } else if( !$headers_done && $params['allow_sender_header'] && eregi( '^Sender: (.*)', $line, $regs ) ) { - $from = $regs[1]; - } else if( !$headers_done && !$from && eregi( '^From: (.*)', $line, $regs ) ) { - $from = $regs[1]; - } else if( !$headers_done && eregi( '^Subject: (.*)', $line, $regs ) ) { - $subject = $regs[1]; - } else if( !$headers_done && eregi( '^Content-Type: text/calendar', $line ) ) { - myLog("Found iCal data in message", RM_LOG_DEBUG); - $ical = true; + } else { + if( $line[0] != ' ' && $line[0] != "\t" ) $state = RM_STATE_READING_HEADER; + switch( $state ) { + case RM_STATE_READING_HEADER: + if( $params['allow_sender_header'] && eregi( '^Sender: (.*)', $line, $regs ) ) { + $from = $regs[1]; + $state = RM_STATE_READING_SENDER; + } else if( !$from && eregi( '^From: (.*)', $line, $regs ) ) { + $from = $regs[1]; + $state = RM_STATE_READING_FROM; + } else if( eregi( '^Subject: (.*)', $line, $regs ) ) { + $subject = $regs[1]; + $state = RM_STATE_READING_SUBJECT; + } else if( eregi( '^Content-Type: text/calendar', $line ) ) { + myLog("Found iCal data in message", RM_LOG_DEBUG); + $ical = true; + } + break; + case RM_STATE_READING_FROM: + $from .= $line; + break; + case RM_STATE_READING_SENDER: + $from .= $line; + break; + case RM_STATE_READING_SUBJECT: + $subject .= $line; + break; + } } if( fwrite($tmpf, $buffer) === false ) { exit(EX_TEMPFAIL); @@ -355,7 +384,12 @@ //$outputtime =& new MyTimer("Output"); //$outputtime->start(); -$tmpf = fopen($tmpfname,"r"); +$tmpf = @fopen($tmpfname,"r"); +if( !$tmpf ) { + myLog("Error: Could not open $tempfname for reading: ".php_error(), RM_LOG_ERROR); + exit(EX_TEMPFAIL); +} + /* TODO: Dont hardcode localhost:10025 */ $smtp = new KolabSMTP( 'localhost', 10025 ); if( PEAR::isError( $smtp ) ) { @@ -369,30 +403,35 @@ else exit(EX_UNAVAILABLE); } -$headers_done = false; -while (!feof($tmpf) && !$headers_done) { +$state = RM_STATE_READING_HEADER; +while (!feof($tmpf) && $state != RM_STATE_READING_BODY) { $buffer = fgets($tmpf, 8192); - if( !$headers_done && $rewrittenfrom && eregi( '^From: (.*)', $buffer ) ) { - if( PEAR::isError($error = $smtp->data( $rewrittenfrom )) ) { - fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); - if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); - else exit(EX_UNAVAILABLE); - } - continue; - } - if( !$headers_done && rtrim( $buffer, "\r\n" ) == '' ) { - $headers_done = true; - foreach( $add_headers as $h ) { - if( PEAR::isError($error = $smtp->data( "$h\r\n" )) ) { - fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); - if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); - else exit(EX_UNAVAILABLE); + if( $rewrittenfrom ) { + if( eregi( '^From: (.*)', $buffer ) ) { + if( PEAR::isError($error = $smtp->data( $rewrittenfrom )) ) { + $str = $error->getMessage().", code ".$error->getCode(); + myLog($str,RM_LOG_ERROR); + fwrite(STDOUT, $str."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } + $state = RM_STATE_READING_FROM; + continue; + } else if( $state == RM_STATE_READING_FROM && + ($buffer[0] == ' ' || $buffer[0] == "\t" ) ) { + // Folded From header, ignore + continue; } } - //myLog("Calling smtp->data( ".rtrim($buffer)." )", RM_LOG_DEBUG); + if( rtrim( $buffer, "\r\n" ) == '' ) { + $state = RM_STATE_READING_BODY; + } else if( $buffer[0] != ' ' && $buffer[0] != "\t" ) { + $state = RM_STATE_READING_HEADER; + } if( PEAR::isError($error = $smtp->data( $buffer )) ) { - fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + $str = $error->getMessage().", code ".$error->getCode(); + myLog($str,RM_LOG_ERROR); + fwrite(STDOUT, $str."\n"); if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); else exit(EX_UNAVAILABLE); } Index: kolabmailboxfilter.php.in =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- kolabmailboxfilter.php.in 28 Feb 2006 21:20:38 -0000 1.6 +++ kolabmailboxfilter.php.in 21 May 2006 13:53:25 -0000 1.7 @@ -39,7 +39,11 @@ // Temp file for storing the message $tmpfname = tempnam( TMPDIR, 'IN.' ); -$tmpf = fopen($tmpfname, "w"); +$tmpf = @fopen($tmpfname, "w"); +if( !$tmpf ) { + myLog("Error: Could not open $tempfname for writing: ".php_error(), RM_LOG_ERROR); + exit(EX_TEMPFAIL); +} // Cleanup function function cleanup() { @@ -76,17 +80,12 @@ $ical = false; $add_headers = array(); $headers_done = false; -$from = false; while (!feof(STDIN) && !$headers_done) { $buffer = fgets(STDIN, 8192); $line = rtrim( $buffer, "\r\n"); if( $line == '' ) { // Done with headers $headers_done = true; - } else if( !$headers_done && $params['allow_sender_header'] && eregi( '^Sender: (.*)', $line, $regs ) ) { - $from = strtolower($regs[1]); - } else if( !$headers_done && !$from && eregi( '^From: (.*)', $line, $regs ) ) { - $from = strtolower($regs[1]); } else if( eregi( '^Content-Type: text/calendar', $line ) ) { myLog("Found iCal data in message", RM_LOG_DEBUG); $ical = true; @@ -124,7 +123,12 @@ // Check if we still have recipients if( empty($recipients) ) exit(0); -$tmpf = fopen($tmpfname,"r"); +$tmpf = @fopen($tmpfname,"r"); +if( !$tmpf ) { + myLog("Error: Could not open $tempfname for writing: ".php_error(), RM_LOG_ERROR); + exit(EX_TEMPFAIL); +} + $lmtp = new KolabLMTP(); if( PEAR::isError( $lmtp ) ) { fwrite(STDOUT, $lmtp->getMessage()."\n"); From cvs at intevation.de Mon May 22 11:19:25 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 22 May 2006 11:19:25 +0200 (CEST) Subject: bernhard: doc/www/src mirrors.html.m4,1.15,1.16 Message-ID: <20060522091925.233D61005A3@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv15273 Modified Files: mirrors.html.m4 Log Message: Removed linjection warning, as Markus M. emailed me, that he has set up a new cronjob to be extra sure that this keeps working. Index: mirrors.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- mirrors.html.m4 18 May 2006 17:46:03 -0000 1.15 +++ mirrors.html.m4 22 May 2006 09:19:22 -0000 1.16 @@ -16,7 +16,7 @@
- Linjection (might lack stable server releases)
+ Linjection
via http From cvs at intevation.de Mon May 22 12:49:31 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 22 May 2006 12:49:31 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, 1.8, 1.9 misc.php, 1.4, 1.5 Message-ID: <20060522104931.4448F1005BD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv16823 Modified Files: kolabmailtransport.php misc.php Log Message: Fix for Issue1195 (error message in bounce) Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- kolabmailtransport.php 8 Mar 2006 20:18:40 -0000 1.8 +++ kolabmailtransport.php 22 May 2006 10:49:29 -0000 1.9 @@ -42,7 +42,8 @@ } if (PEAR::isError($error = $this->transport->mailFrom($sender))) { - return new PEAR_Error('Failed to set sender: ' . $error->getMessage(), $this->transport->_code ); + $resp = $this->transport->getResponse(); + return new PEAR_Error('Failed to set sender: ' . $resp[1], $resp[0] ); } if( !is_array( $recips ) ) $recips = array($recips); @@ -50,9 +51,10 @@ $reciperrors = array(); foreach( $recips as $recip ) { if (PEAR::isError($error = $this->transport->rcptTo($recip))) { - $msg = "Failed to set recipient $recip: " . $error->getMessage(). ", code=".$this->transport->_code;; - myLog($msg, RM_LOG_ERROR); - $reciperrors[] = new PEAR_Error('Failed to set recipient: '.$error->getMessage(), $this->transport->_code); + $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) ) { Index: misc.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- misc.php 2 Apr 2005 02:47:34 -0000 1.4 +++ misc.php 22 May 2006 10:49:29 -0000 1.5 @@ -178,7 +178,7 @@ $i++; } $i--; - if( is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge($ret[$arg[1]] ,$val); + if( array_key_exists($arg[1],$ret) && is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge($ret[$arg[1]] ,$val); else if( count($val) == 1 ) $ret[$arg[1]] = $val[0]; else $ret[$arg[1]] = $val; } @@ -187,4 +187,4 @@ return $ret; } -?> \ No newline at end of file +?> From cvs at intevation.de Mon May 22 13:07:50 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 22 May 2006 13:07:50 +0200 (CEST) Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, 1.3.2.4, 1.3.2.5 misc.php, 1.4.2.1, 1.4.2.2 Message-ID: <20060522110750.68A6D1005A3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv17287 Modified Files: Tag: kolab_2_0_branch kolabmailtransport.php misc.php Log Message: Backport of: Fix for Issue1195 (error message in bounce) Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -d -r1.3.2.4 -r1.3.2.5 --- kolabmailtransport.php 8 Mar 2006 20:19:42 -0000 1.3.2.4 +++ kolabmailtransport.php 22 May 2006 11:07:48 -0000 1.3.2.5 @@ -42,7 +42,8 @@ } if (PEAR::isError($error = $this->transport->mailFrom($sender))) { - return new PEAR_Error('Failed to set sender: ' . $error->getMessage(), $this->transport->_code ); + $resp = $this->transport->getResponse(); + return new PEAR_Error('Failed to set sender: ' . $resp[1], $resp[0] ); } if( !is_array( $recips ) ) $recips = array($recips); @@ -50,9 +51,10 @@ $reciperrors = array(); foreach( $recips as $recip ) { if (PEAR::isError($error = $this->transport->rcptTo($recip))) { - $msg = "Failed to set recipient $recip: " . $error->getMessage(). ", code=".$this->transport->_code;; - myLog($msg, RM_LOG_ERROR); - $reciperrors[] = new PEAR_Error('Failed to set recipient: '.$error->getMessage(), $this->transport->_code); + $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) ) { Index: misc.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -d -r1.4.2.1 -r1.4.2.2 --- misc.php 21 May 2006 12:09:18 -0000 1.4.2.1 +++ misc.php 22 May 2006 11:07:48 -0000 1.4.2.2 @@ -178,7 +178,7 @@ $i++; } $i--; - if( is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge($ret[$arg[1]] ,$val); + if( array_key_exists($arg[1],$ret) && is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge($ret[$arg[1]] ,$val); else if( count($val) == 1 ) $ret[$arg[1]] = $val[0]; else $ret[$arg[1]] = $val; } From cvs at intevation.de Tue May 23 22:11:49 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 23 May 2006 22:11:49 +0200 (CEST) Subject: martin: server/kolabd/kolabd/namespace/libexec adduser.in,1.2,1.3 Message-ID: <20060523201149.879AF1005A3@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/namespace/libexec In directory doto:/tmp/cvs-serv15070/kolabd/namespace/libexec Modified Files: adduser.in Log Message: Martin Konold: good spotting of wrong attribute name for imap quota (THX to Gunnar Wrobel). Solves issue# 1257 Index: adduser.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/adduser.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- adduser.in 13 Dec 2005 21:10:26 -0000 1.2 +++ adduser.in 23 May 2006 20:11:47 -0000 1.3 @@ -107,7 +107,7 @@ LDIF if test "$QUOTA" != ""; then -echo "userquota: $QUOTA" >> $LDIFFILE +echo "cyrus-userquota: $QUOTA" >> $LDIFFILE fi ldapadd -x -D "$BINDDN" -w $BINDPW -h $SERVER -f $LDIFFILE From cvs at intevation.de Sat Jun 3 19:01:49 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sat, 3 Jun 2006 19:01:49 +0200 (CEST) Subject: bernhard: doc/www/src index.html.m4,1.85,1.86 Message-ID: <20060603170149.6CE2D1006B6@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2920 Modified Files: index.html.m4 Log Message: Added news about LWCE booth. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- index.html.m4 18 May 2006 15:42:25 -0000 1.85 +++ index.html.m4 3 Jun 2006 17:01:47 -0000 1.86 @@ -44,6 +44,23 @@ -->
+ + + + +
June 3rd, 2006 » + Kolab at LinuxWorld, Seoul, Korea +
+
+ If you happen to visit Seoul from the 5th to the 7th of June, + drop by the + LWCE + and visit the Kolab booth (H34). On the 7th Bernhard Reiter will + give a talk about Kolab on the afternoon. +
+
+ +

May 18th, 2006 » @@ -84,6 +101,13 @@
+ + + + +
+ +

May 2nd, 2006 » @@ -126,12 +150,6 @@

- - - - - -
From cvs at intevation.de Sat Jun 10 20:47:00 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sat, 10 Jun 2006 20:47:00 +0200 (CEST) Subject: martin: server/imapd README,1.2,1.3 Message-ID: <20060610184700.CBE981005A3@lists.intevation.de> Author: martin Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv5298/imapd Modified Files: README Log Message: Martin Konold: Fix issue #1263 with inconsistent name of attribute kolabFolderType (THX to Gunnar Wrobel!) Index: README =================================================================== RCS file: /kolabrepository/server/imapd/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README 2 Mar 2005 09:27:04 -0000 1.2 +++ README 10 Jun 2006 18:46:58 -0000 1.3 @@ -6,7 +6,7 @@ ======================== imapd.annotate.patch: Allow for custom annotation. -imapd.group2.patch: Patch based on OpenPKG Patch: compare groupnames case insentively +imapd.group2.patch: Patch based on OpenPKG Patch: compare groupnames case insensitively imapd-murder.patch: Patch to the OpenPKG specfile: build with murder kolab-ldap.patch: Patch to support virtdomains: ldap (parse domain from "email" field an LDAP user entry) kolab.patch: Patch to the OpenPKG specfile From cvs at intevation.de Sat Jun 10 20:47:00 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sat, 10 Jun 2006 20:47:00 +0200 (CEST) Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder sf.php.in, 1.3, 1.4 Message-ID: <20060610184700.CE6B21005A5@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder In directory doto:/tmp/cvs-serv5298/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder Modified Files: sf.php.in Log Message: Martin Konold: Fix issue #1263 with inconsistent name of attribute kolabFolderType (THX to Gunnar Wrobel!) Index: sf.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sf.php.in 21 Apr 2006 10:41:38 -0000 1.3 +++ sf.php.in 10 Jun 2006 18:46:58 -0000 1.4 @@ -39,8 +39,8 @@ if (is_array($ldap_object['kolabHomeServer'])) $kolabhomeserver = $ldap_object['kolabHomeServer'][0]; $form->entries['kolabhomeserver']['value'] = $kolabhomeserver; - if (is_array($ldap_object['folderType'])) - $form->entries['foldertype']['value'] = $ldap_object['folderType'][0]; + if (is_array($ldap_object['kolabFolderType'])) + $form->entries['foldertype']['value'] = $ldap_object['kolabFolderType'][0]; else $form->entries['foldertype']['value'] = ''; @@ -189,7 +189,7 @@ $ldap_object['cn'] = utf8_encode($cn); if (!empty($_POST['foldertype'])) - $ldap_object['folderType'] = $_POST['foldertype']; + $ldap_object['kolabFolderType'] = $_POST['foldertype']; foreach ( array( 'cyrus-userquota') as $attr) { $count = 0; From cvs at intevation.de Sat Jun 10 20:47:00 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Sat, 10 Jun 2006 20:47:00 +0200 (CEST) Subject: martin: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.4,1.5 Message-ID: <20060610184700.D000B1005AA@lists.intevation.de> Author: martin Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv5298/perl-kolab/Kolab-LDAP Modified Files: LDAP.pm.in Log Message: Martin Konold: Fix issue #1263 with inconsistent name of attribute kolabFolderType (THX to Gunnar Wrobel!) Index: LDAP.pm.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- LDAP.pm.in 21 Apr 2006 10:31:46 -0000 1.4 +++ LDAP.pm.in 10 Jun 2006 18:46:58 -0000 1.5 @@ -321,7 +321,7 @@ if ($sync) { $newuid_db{$guid} = $uid; } else { $uid_db{$guid} = $uid; } Kolab::Cyrus::createMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0)); if( $p eq 'sf' ){ - my $foldertype = lc($object->get_value('foldertype')); + my $foldertype = lc($object->get_value('kolabfoldertype')); if ( $foldertype ne '' ){ Kolab::Cyrus::setFolderType($cyrus,$uid,1,$foldertype); From cvs at intevation.de Mon Jun 12 18:50:34 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 12 Jun 2006 18:50:34 +0200 (CEST) Subject: bh: server obmtool.conf,1.219,1.220 Message-ID: <20060612165034.9AAE01006A9@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv29091 Modified Files: obmtool.conf Log Message: OpenPKG updates Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.219 retrieving revision 1.220 diff -u -d -r1.219 -r1.220 --- obmtool.conf 8 Mar 2006 20:18:40 -0000 1.219 +++ obmtool.conf 12 Jun 2006 16:50:32 -0000 1.220 @@ -41,7 +41,7 @@ fi # start from scratch or upgrade within 2.0.x - @install ${loc}openpkg-2.5.1-2.5.1 \ + @install ${loc}openpkg-2.5.2-2.5.2 \ --tag="kolab" \ --prefix="${PREFIX}" \ --user="${CMD}" --group="${CMD}" \ @@ -54,7 +54,7 @@ $PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY fi @install ${loc}make-3.80-2.5.0 - @install ${loc}binutils-2.16.1-2.5.0 + @install ${loc}binutils-2.16.1-2.5.1 @install ${loc}gcc-4.0.2-2.5.0 @install ${loc}fsl-1.6.1-2.5.0 @install ${loc}mm-1.4.0-2.5.0 @@ -116,7 +116,7 @@ @install ${loc}patch-2.5.9-2.5.0 @install ${loc}sed-4.1.4-2.5.0 @install ${loc}libxml-2.6.22-2.5.0 - @install ${loc}libxslt-1.1.15-2.5.0 # WARNING: Remove libgcrypt before building! + @install ${loc}libxslt-1.1.15-2.5.1 # WARNING: Remove libgcrypt before building! @install ${altloc}apache-1.3.33-2.5.5_kolab \ --with=mod_auth_ldap \ --with=mod_dav \ @@ -146,7 +146,7 @@ @install ${loc}spamassassin-3.1.0-2.5.0 @install ${plusloc}amavisd-2.3.3-2.5.0 @install ${loc}curl-7.15.0-2.5.1 - @install ${altloc}clamav-0.88-20060110 + @install ${altloc}clamav-0.88.1-20060404 # @install ${loc}vim-6.3.78-2.4.0 # @install ${plusloc}dcron-2.9-2.4.0 @install ${altloc}perl-kolab-5.8.7-20060228 From cvs at intevation.de Mon Jun 12 18:51:14 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 12 Jun 2006 18:51:14 +0200 (CEST) Subject: bh: server release-notes.txt,1.37,1.38 README.1st,1.35,1.36 Message-ID: <20060612165114.A47F21006A9@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv29135 Modified Files: release-notes.txt README.1st Log Message: Updates for the upcoming beta2 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- release-notes.txt 20 Apr 2006 16:26:28 -0000 1.37 +++ release-notes.txt 12 Jun 2006 16:51:12 -0000 1.38 @@ -44,8 +44,18 @@ OpenPKG updates: - - openpkg-registry-0.2.7-20060223 - - php-smarty-2.6.10-20051003 + openpkg-2.5.2-2.5.2 + openpkg-registry-0.2.7-20060223 + libxslt-1.1.15-2.5.1 + php-smarty-2.6.10-20051003 + clamav-0.88.1-20060404 + + binutils-2.16.1-2.5.1 + http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.009-binutils.html + + openldap-2.3.11-2.5.1 + http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.008-openldap.html + Kolab updates: @@ -55,9 +65,15 @@ Resolved: Issue1194 (kolabd quota performance) + Issue1220 (postfix permissions) + issue1237 (Handling of @@@var@@@ in Conf.pm (Gunnar Wrobel)) - kolabd-2.0.99-20060228 + * The default imapd configuration has been changed to enable the + hashimapspool option. This affects the upgrade procedure. + See 1st.README for upgrade instructions. + * amavis now logs to /kolab/var/amavisd/amavisd.log. This is part of the fix for Issue1015 @@ -66,19 +82,30 @@ Issue1089 (enable hashimapspool for imapd to cope with many users) Issue1101 (allowapop: no; disable apop access to imapd by default) Issue1105 (fix compilation of kolabd on FreeBSD) + Issue1257 (wrong attribute name for imap quota) - kolab-webadmin-2.0.99-20060228 + * patch from Tobias König in order to support setting of + foldertype for public folders + Resolved: Issue848 (Modifying address book entry may break distribution list) + Issue1106 (email validation in webgui) + Issue1246 (Permission handling in the webadmin frontend) [Wrobel] + Issue1263 (Bug in the shared folders folder-type code) [Wrobel] - kolab-resource-handlers-2.0.99-20060308 * create empty pfbcache.db if missing Resolved: - Issue1042 (server modifies email content) Issue973 (quoting and rewriting From header) + Issue966 (Wrong CN for resource accounts) + Issue1042 (server modifies email content) + Issue1195 (error message in bounce) + Issue1243 (rewriting fails when "From:" contains quoted printable) + Issue1245 (rewriting problems on folded Header "From:"-line) $Id$ Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- README.1st 20 Apr 2006 16:26:28 -0000 1.35 +++ README.1st 12 Jun 2006 16:51:12 -0000 1.36 @@ -168,6 +168,25 @@ Upgrade from 2.1-beta-1 ----------------------- +1. imapd hashimapspool setting + +The default imapd configuration has been changed to enable the +hashimapspool option. This means that in 2.1-beta-2 the directory +layout of the imapd spool (/kolab/var/imapd/spool/) is different from +the one in beta-1. When you upgrade from beta-1 it's best to keep using +the old structure, so remove or comment out the corresponding line in +/kolab/etc/kolab/templates/imapd.conf.template *before* running +kolabconf. + +For new installations the new default setting is recommended because +it's more efficient especially when you have many mailboxes. + +For some background information about this see the dicussion at +https://intevation.de/roundup/kolab/issue1089 + + +2. distribution lists + There was a bug in earlier versions regarding the distribution lists for administrative emails aliases like postmaster@. They were created without the domain part. This has been fixed so that they are From cvs at intevation.de Mon Jun 12 20:52:53 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 12 Jun 2006 20:52:53 +0200 (CEST) Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php.in, 1.1, 1.2 Message-ID: <20060612185253.EAE561006A9@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv31266/kolab-webadmin/kolab-webadmin/www/admin/distributionlist Modified Files: index.php.in Log Message: Martin Konold: Fixed typo as mentioned by Tobias KÃ¶nig Index: index.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- index.php.in 5 Feb 2006 20:13:55 -0000 1.1 +++ index.php.in 12 Jun 2006 18:52:51 -0000 1.2 @@ -46,7 +46,7 @@ if( !$errors ) { if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn']; else $base_dn = 'k=kolab'; - $filter = "(&(!(cn=domans))(objectclass=kolabGroupOfNames))"; + $filter = "(&(!(cn=domains))(objectclass=kolabGroupOfNames))"; $result = ldap_search($ldap->connection, $base_dn, $filter); if( $result ) { $count = ldap_count_entries($ldap->connection, $result); From cvs at intevation.de Fri Jun 16 16:25:31 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 16 Jun 2006 16:25:31 +0200 (CEST) Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user vacation.php.in, 1.2, 1.3 Message-ID: <20060616142531.724F11005B9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv8668/kolab-webadmin/www/admin/user Modified Files: vacation.php.in Log Message: Fix for issue1214 (vacation days minimum) Index: vacation.php.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vacation.php.in 9 Mar 2006 21:27:22 -0000 1.2 +++ vacation.php.in 16 Jun 2006 14:25:29 -0000 1.3 @@ -38,22 +38,27 @@ $addresses = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_REQUEST['addresses'] ) ), 'strlen') ); $maildomain = trim( $_REQUEST['maildomain'] ); $reacttospam = isset( $_REQUEST['reacttospam'] ); - $script = - "require \"vacation\";\r\n\r\n". - (!empty($maildomain)?"if not address :domain :contains \"From\" \"".$maildomain."\" { keep; stop; }\r\n":""). - ($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":""). - "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ". - $_REQUEST['days']." text:\r\n". - SieveUtils::dotstuff(trim($_REQUEST['text']))."\r\n.\r\n;\r\n\r\n"; - $active = isset($_REQUEST['active']); - - if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) { - $errors[] = $res->getMessage(); - $errors[] = 'Script was:'; - $errors[] = '
'.MySmarty::htmlentities($script).'
'; - } - if( !$active && $sieve->getActive() === $scriptname ) { - $sieve->setActive( '' ); + $days = $_REQUEST['days']; + if( $days < 1 ) { + $errors[] = _('Days must be at least one'); + } else { + $script = + "require \"vacation\";\r\n\r\n". + (!empty($maildomain)?"if not address :domain :contains \"From\" \"".$maildomain."\" { keep; stop; }\r\n":""). + ($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":""). + "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ". + $_REQUEST['days']." text:\r\n". + SieveUtils::dotstuff(trim($_REQUEST['text']))."\r\n.\r\n;\r\n\r\n"; + $active = isset($_REQUEST['active']); + + if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) { + $errors[] = $res->getMessage(); + $errors[] = 'Script was:'; + $errors[] = '
'.MySmarty::htmlentities($script).'
'; + } + if( !$active && $sieve->getActive() === $scriptname ) { + $sieve->setActive( '' ); + } } if( !$errors ) { @@ -77,7 +82,7 @@ $object = $ldap->read( $auth->dn() ); $addresses = array_merge( (array)$object['mail'], (array)$object['alias'] ); } - if( $days === false ) $days = 7; + if( $days === false || $days < 1 ) $days = 7; if( $text === false ) { $date = strftime(_('%x')); $text = sprintf( From cvs at intevation.de Fri Jun 16 16:55:38 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 16 Jun 2006 16:55:38 +0200 (CEST) Subject: bh: server obmtool.conf,1.220,1.221 Message-ID: <20060616145538.68CD71005B9@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9124 Modified Files: obmtool.conf Log Message: There's an even newer clamav available Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.220 retrieving revision 1.221 diff -u -d -r1.220 -r1.221 --- obmtool.conf 12 Jun 2006 16:50:32 -0000 1.220 +++ obmtool.conf 16 Jun 2006 14:55:36 -0000 1.221 @@ -146,7 +146,7 @@ @install ${loc}spamassassin-3.1.0-2.5.0 @install ${plusloc}amavisd-2.3.3-2.5.0 @install ${loc}curl-7.15.0-2.5.1 - @install ${altloc}clamav-0.88.1-20060404 + @install ${altloc}clamav-0.88.2-20060524 # @install ${loc}vim-6.3.78-2.4.0 # @install ${plusloc}dcron-2.9-2.4.0 @install ${altloc}perl-kolab-5.8.7-20060228 From cvs at intevation.de Mon Jun 19 18:49:16 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 19 Jun 2006 18:49:16 +0200 (CEST) Subject: bh: server release-notes.txt,1.38,1.39 Message-ID: <20060619164916.C08C41005B8@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11103 Modified Files: release-notes.txt Log Message: Some more updates for 2.1 beta 2 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- release-notes.txt 12 Jun 2006 16:51:12 -0000 1.38 +++ release-notes.txt 19 Jun 2006 16:49:14 -0000 1.39 @@ -1,5 +1,5 @@ Release notes Kolab2 Server -(Version 2006XXXX, Kolab Server 2.1 beta 2) +(Version 20060619, Kolab Server 2.1 beta 2) This is a development snapshot of the kolab server leading up to a 2.1 release. For upgrading and installation instructions, please refer to @@ -48,7 +48,7 @@ openpkg-registry-0.2.7-20060223 libxslt-1.1.15-2.5.1 php-smarty-2.6.10-20051003 - clamav-0.88.1-20060404 + clamav-0.88.2-20060524 binutils-2.16.1-2.5.1 http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.009-binutils.html @@ -92,7 +92,7 @@ Resolved: Issue848 (Modifying address book entry may break distribution list) Issue1106 (email validation in webgui) - Issue1246 (Permission handling in the webadmin frontend) [Wrobel] + Issue1214 (number of days for vacation messages on webinterface) Issue1263 (Bug in the shared folders folder-type code) [Wrobel] - kolab-resource-handlers-2.0.99-20060308 From cvs at intevation.de Mon Jun 19 19:24:19 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Mon, 19 Jun 2006 19:24:19 +0200 (CEST) Subject: bh: server release-notes.txt,1.39,1.40 obmtool.conf,1.221,1.222 Message-ID: <20060619172419.6E4A01005C9@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv11736 Modified Files: release-notes.txt obmtool.conf Log Message: Update for new kolab packages Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- release-notes.txt 19 Jun 2006 16:49:14 -0000 1.39 +++ release-notes.txt 19 Jun 2006 17:24:17 -0000 1.40 @@ -61,14 +61,14 @@ More distconf changes by Richard Bos and Markus Hüwe. - - perl-kolab-5.8.7-20060228 + - perl-kolab-5.8.7-20060619 Resolved: Issue1194 (kolabd quota performance) Issue1220 (postfix permissions) issue1237 (Handling of @@@var@@@ in Conf.pm (Gunnar Wrobel)) - - kolabd-2.0.99-20060228 + - kolabd-2.0.99-20060619 * The default imapd configuration has been changed to enable the hashimapspool option. This affects the upgrade procedure. @@ -84,7 +84,7 @@ Issue1105 (fix compilation of kolabd on FreeBSD) Issue1257 (wrong attribute name for imap quota) - - kolab-webadmin-2.0.99-20060228 + - kolab-webadmin-2.0.99-20060619 * patch from Tobias König in order to support setting of foldertype for public folders @@ -95,7 +95,7 @@ Issue1214 (number of days for vacation messages on webinterface) Issue1263 (Bug in the shared folders folder-type code) [Wrobel] - - kolab-resource-handlers-2.0.99-20060308 + - kolab-resource-handlers-2.0.99-20060619 * create empty pfbcache.db if missing Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.221 retrieving revision 1.222 diff -u -d -r1.221 -r1.222 --- obmtool.conf 16 Jun 2006 14:55:36 -0000 1.221 +++ obmtool.conf 19 Jun 2006 17:24:17 -0000 1.222 @@ -24,7 +24,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="2.1-snapshot-20060308"; + kolab_version="2.1beta2"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -149,11 +149,11 @@ @install ${altloc}clamav-0.88.2-20060524 # @install ${loc}vim-6.3.78-2.4.0 # @install ${plusloc}dcron-2.9-2.4.0 - @install ${altloc}perl-kolab-5.8.7-20060228 - @install ${altloc}kolabd-2.0.99-20060228 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-2.0.99-20060228 --define kolab_version=$kolab_version + @install ${altloc}perl-kolab-5.8.7-20060619 + @install ${altloc}kolabd-2.0.99-20060619 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-2.0.99-20060619 --define kolab_version=$kolab_version @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-2.0.99-20060308 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-2.0.99-20060619 --define kolab_version=$kolab_version @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version @check From cvs at intevation.de Tue Jun 20 14:28:59 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 20 Jun 2006 14:28:59 +0200 (CEST) Subject: bh: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in, 1.15, 1.16 Message-ID: <20060620122859.9D1E21006AE@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv19818/kolab-webadmin/kolab-webadmin Modified Files: kolab-webadmin.spec.in Log Message: Fix the step that puts the version number of the kolab server into the web-interface's versions.php page Index: kolab-webadmin.spec.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- kolab-webadmin.spec.in 14 Jan 2006 22:16:05 -0000 1.15 +++ kolab-webadmin.spec.in 20 Jun 2006 12:28:57 -0000 1.16 @@ -56,7 +56,7 @@ %prep %setup -q %{l_shtool} subst -e 's;@kolab_version@;%{kolab_version};g' \ - www/admin/kolab/versions.php + www/admin/kolab/versions.php.in %build ./configure -prefix=%{l_prefix} --with-dist=kolab From cvs at intevation.de Tue Jun 20 14:29:31 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 20 Jun 2006 14:29:31 +0200 (CEST) Subject: bh: server obmtool.conf,1.222,1.223 Message-ID: <20060620122931.0A8B11006AE@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19852 Modified Files: obmtool.conf Log Message: New kolab-webadmin package Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.222 retrieving revision 1.223 diff -u -d -r1.222 -r1.223 --- obmtool.conf 19 Jun 2006 17:24:17 -0000 1.222 +++ obmtool.conf 20 Jun 2006 12:29:29 -0000 1.223 @@ -151,7 +151,7 @@ # @install ${plusloc}dcron-2.9-2.4.0 @install ${altloc}perl-kolab-5.8.7-20060619 @install ${altloc}kolabd-2.0.99-20060619 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-2.0.99-20060619 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-2.0.99-20060620 --define kolab_version=$kolab_version @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-2.0.99-20060619 --define kolab_version=$kolab_version @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version From cvs at intevation.de Tue Jun 20 14:44:27 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Tue, 20 Jun 2006 14:44:27 +0200 (CEST) Subject: bh: server release-notes.txt,1.40,1.41 Message-ID: <20060620124427.495521006A5@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20534 Modified Files: release-notes.txt Log Message: adjust date Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- release-notes.txt 19 Jun 2006 17:24:17 -0000 1.40 +++ release-notes.txt 20 Jun 2006 12:44:25 -0000 1.41 @@ -1,5 +1,5 @@ Release notes Kolab2 Server -(Version 20060619, Kolab Server 2.1 beta 2) +(Version 20060620, Kolab Server 2.1 beta 2) This is a development snapshot of the kolab server leading up to a 2.1 release. For upgrading and installation instructions, please refer to From cvs at intevation.de Wed Jun 21 12:49:21 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Wed, 21 Jun 2006 12:49:21 +0200 (CEST) Subject: thomas: server/kolabd/kolabd kolab_smtpdpolicy.in,1.7,1.8 Message-ID: <20060621104921.CE4EB1006C4@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv16280 Modified Files: kolab_smtpdpolicy.in Log Message: Fixed minor copy&paste problem in an error message. Index: kolab_smtpdpolicy.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- kolab_smtpdpolicy.in 18 Apr 2006 18:23:46 -0000 1.7 +++ kolab_smtpdpolicy.in 21 Jun 2006 10:49:19 -0000 1.8 @@ -217,7 +217,7 @@ ldap_connect; goto AGAIN; } else { - die( "LDAP Error looking up uid for sender Â£sender: ".$mesg->error ); + die( "LDAP Error looking up uid for sender: ".$mesg->error ); } } return @result; From cvs at intevation.de Wed Jun 21 13:14:49 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Wed, 21 Jun 2006 13:14:49 +0200 (CEST) Subject: thomas: server/kolabd/kolabd kolab_smtpdpolicy,1.6.2.1,1.6.2.2 Message-ID: <20060621111449.BAB881006C0@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv19399 Modified Files: Tag: kolab_2_0_branch kolab_smtpdpolicy Log Message: kolab_smtpdpolicy didn't authenticate to LDAP as user nobody due to a typo. This made it impossible for internal users to send mail or for other users to be a delegate for internal users, because cn=internal isn't readable for anonymous connections. Index: kolab_smtpdpolicy =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolab_smtpdpolicy,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -d -r1.6.2.1 -r1.6.2.2 --- kolab_smtpdpolicy 16 Sep 2005 12:37:51 -0000 1.6.2.1 +++ kolab_smtpdpolicy 21 Jun 2006 11:14:47 -0000 1.6.2.2 @@ -311,7 +311,7 @@ %conf = readConfig( %conf, "@l_prefix@/etc/kolab/kolab_smtpdpolicy.conf" ); $conf_ldapuri = $conf{'ldap_uri'}; $conf_basedn = $conf{'basedn'}; -$conf_bindn = $conf{'binddn'}; +$conf_binddn = $conf{'binddn'}; $conf_bindpw = $conf{'bindpw'}; $conf_domain = $conf{'domain'}; $conf_allowunauth = 1 if( $conf{'allow_unauth'} ); From cvs at intevation.de Wed Jun 21 14:33:08 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Wed, 21 Jun 2006 14:33:08 +0200 (CEST) Subject: thomas: server release-notes.txt,1.15.2.14,1.15.2.15 Message-ID: <20060621123308.0BABC1006C0@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv24345 Modified Files: Tag: kolab_2_0_branch release-notes.txt Log Message: Started release notes for kolab server 2.0.4 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.15.2.14 retrieving revision 1.15.2.15 diff -u -d -r1.15.2.14 -r1.15.2.15 --- release-notes.txt 11 Jan 2006 16:16:06 -0000 1.15.2.14 +++ release-notes.txt 21 Jun 2006 12:33:06 -0000 1.15.2.15 @@ -1,40 +1,25 @@ Release notes Kolab2 Server -(Version 20060111, Kolab Server 2.0.3) +(Version 2006????, Kolab Server 2.0.4) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. -This release fixes an important bug introduced in 2.0.2 (users couldn't -be deleted) and fixes two security problems (one in clamav and one in -the default configuration of Kolab's postfix). +This release fixes ... Upgrading is recommended. -Changes since 2.0.2: +Changes since 2.0.3: - Security Fixes: - clamav-0.88-20060110 - - - kolabd 1.9.4-20051219 -> 1.9.4-20060111 - - * Fixing: - Issue968 (Postfix logs password for ssl port 465) - - - - kolab-resource-handlers 0.3.9-20050912 -> 0.3.9-20060111 - - * Fixing: - Issue973 (Rewritten from shown inconveniently in kontact) - + clamav-??? - - kolab-webadmin 0.4.0-20051219 -> 0.4.0-20060111 + - kolabd 1.9.4-20060111 -> 1.9.4-2006???? * Fixing: - Issue848 (Deleting user should remove them from distribution lists) - + Issue1274 (Sending mail as internal user doesn't work) From cvs at intevation.de Fri Jun 23 18:14:31 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 23 Jun 2006 18:14:31 +0200 (CEST) Subject: thomas: CVSROOT loginfo,1.5,1.6 Message-ID: <20060623161431.B79AE101F14@lists.intevation.de> Author: thomas Update of /kolabrepository/CVSROOT In directory doto:/tmp/cvs-serv22084 Modified Files: loginfo Log Message: Send commit mails as cvs at kolab.org Index: loginfo =================================================================== RCS file: /kolabrepository/CVSROOT/loginfo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- loginfo 1 Aug 2003 10:15:06 -0000 1.5 +++ loginfo 23 Jun 2006 16:14:29 -0000 1.6 @@ -25,4 +25,4 @@ # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog -DEFAULT /bin/syncmail -u %{sVv} kolab-commits at lists.intevation.de +DEFAULT /bin/syncmail -u -f kolab.org %{sVv} kolab-commits at lists.intevation.de From cvs at intevation.de Fri Jun 23 18:15:20 2006 From: cvs at intevation.de (cvs@intevation.de) Date: Fri, 23 Jun 2006 18:15:20 +0200 (CEST) Subject: thomas: CVSROOT loginfo,1.6,1.7 Message-ID: <20060623161520.CF59F101F1B@lists.intevation.de> Author: thomas Update of /kolabrepository/CVSROOT In directory doto:/tmp/cvs-serv22139 Modified Files: loginfo Log Message: Dummy commit to test loginfo change Index: loginfo =================================================================== RCS file: /kolabrepository/CVSROOT/loginfo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- loginfo 23 Jun 2006 16:14:29 -0000 1.6 +++ loginfo 23 Jun 2006 16:15:18 -0000 1.7 @@ -26,3 +26,4 @@ #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog DEFAULT /bin/syncmail -u -f kolab.org %{sVv} kolab-commits at lists.intevation.de + From cvs at kolab.org Fri Jun 23 18:24:35 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 Jun 2006 18:24:35 +0200 (CEST) Subject: thomas: CVSROOT loginfo,1.7,1.8 Message-ID: <20060623162435.75103101FA3@lists.intevation.de> Author: thomas Update of /kolabrepository/CVSROOT In directory doto:/tmp/cvs-serv22248 Modified Files: loginfo Log Message: Fixed syncmail to accept -f/--fromhost Index: loginfo =================================================================== RCS file: /kolabrepository/CVSROOT/loginfo,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- loginfo 23 Jun 2006 16:15:18 -0000 1.7 +++ loginfo 23 Jun 2006 16:24:33 -0000 1.8 @@ -26,4 +26,3 @@ #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog DEFAULT /bin/syncmail -u -f kolab.org %{sVv} kolab-commits at lists.intevation.de - From cvs at kolab.org Fri Jun 23 18:32:18 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 23 Jun 2006 18:32:18 +0200 (CEST) Subject: thomas: CVSROOT loginfo,1.10,1.11 Message-ID: <20060623163218.32E73101FA7@lists.intevation.de> Author: thomas Update of /kolabrepository/CVSROOT In directory doto:/tmp/cvs-serv22449 Modified Files: loginfo Log Message: another test, now the list address should be kolab-commits at kolab.org Index: loginfo =================================================================== RCS file: /kolabrepository/CVSROOT/loginfo,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- loginfo 23 Jun 2006 16:29:56 -0000 1.10 +++ loginfo 23 Jun 2006 16:32:16 -0000 1.11 @@ -26,3 +26,4 @@ #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog DEFAULT /bin/syncmail -u -f kolab.org %{sVv} kolab-commits at kolab.org + From cvs at kolab.org Mon Jun 26 18:37:29 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 Jun 2006 18:37:29 +0200 (CEST) Subject: thomas: server/kolabd/kolabd/templates master.cf.template, 1.11.2.3, 1.11.2.4 Message-ID: <20060626163729.1F57A1005B8@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv9596 Modified Files: Tag: kolab_2_0_branch master.cf.template Log Message: Added missing relay service (new in Postfix 2.2) to master.cf Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/master.cf.template,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -u -d -r1.11.2.3 -r1.11.2.4 --- master.cf.template 11 Jan 2006 14:23:57 -0000 1.11.2.3 +++ master.cf.template 26 Jun 2006 16:37:26 -0000 1.11.2.4 @@ -21,6 +21,7 @@ verify unix - - n - 1 verify flush unix n - n 1000? 0 flush smtp unix - - n - - smtp +relay unix - - n - - smtp -o fallback_relay= showq unix n - n - - showq error unix - - n - - error local unix - n n - - local From cvs at kolab.org Mon Jun 26 18:39:19 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 Jun 2006 18:39:19 +0200 (CEST) Subject: thomas: server/kolabd/kolabd/templates master.cf.template.in, 1.13, 1.14 Message-ID: <20060626163919.B2EC31005B8@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv9649 Modified Files: master.cf.template.in Log Message: Updated postfix master.cf.template to match master.cf from OpenPKG. Fixes the missing relay service (new in Postfix 2.2), everything else is cleanup or commented out by default. Index: master.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- master.cf.template.in 13 Apr 2006 15:54:54 -0000 1.13 +++ master.cf.template.in 26 Jun 2006 16:39:17 -0000 1.14 @@ -14,18 +14,25 @@ # this file is automatically written by the Kolab config backend # manual additions are lost unless made to the template in the Kolab config directory -25 inet n - n - - smtpd +# ========================================================================== +# service type private unpriv chroot wakeup maxproc command + args +# (yes) (yes) (yes) (never) (100) +# ========================================================================== +smtp inet n - n - - smtpd #628 inet n - n - - qmqpd pickup fifo n - n 60 1 pickup cleanup unix n - n - 0 cleanup qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - n 300 1 nqmgr +tlsmgr unix - - n 1000? 1 tlsmgr rewrite unix - - n - - trivial-rewrite bounce unix - - n - 0 bounce defer unix - - n - 0 bounce +trace unix - - n - 0 bounce verify unix - - n - 1 verify flush unix n - n 1000? 0 flush +proxymap unix - - n - - proxymap smtp unix - - n - - smtp +relay unix - - n - - smtp -o fallback_relay= showq unix n - n - - showq error unix - - n - - error local unix - n n - - local @@ -33,9 +40,7 @@ lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil scache unix - - n - 1 scache -proxymap unix - - n - - proxymap -tlsmgr unix - - n 1000? 1 tlsmgr -#cyrus unix - n n - - pipe flags=R user=cyrus argv=@bindir@/deliver -e -m ${extension} ${user} +#cyrus unix - n n - - pipe user=cyrus argv=@bindir@/cyrdeliver -e -r ${sender} -m ${extension} ${user} #uucp unix - n n - - pipe flags=Fqhu user=uucp argv=@bindir@/uux -r -n -z -a$sender - $nexthop!rmail ($recipient) #ifmail unix - n n - - pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient) #bsmtp unix - n n - - pipe flags=Fq. user=foo argv=@bindir@/bsmtp -f $sender $nexthop $recipient From cvs at kolab.org Mon Jun 26 18:41:18 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Mon, 26 Jun 2006 18:41:18 +0200 (CEST) Subject: thomas: server/kolabd/kolabd ChangeLog,1.75,1.76 Message-ID: <20060626164118.CD6CC1005B8@lists.intevation.de> Author: thomas Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv9703 Modified Files: ChangeLog Log Message: Updated ChangeLog Index: ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- ChangeLog 13 Apr 2006 15:54:54 -0000 1.75 +++ ChangeLog 26 Jun 2006 16:41:16 -0000 1.76 @@ -1,3 +1,10 @@ +2006-06-26 Thomas Arendsen Hein + + * templates/master.cf.template.in: Updated postfix master.cf.template + to match master.cf from OpenPKG. Fixes the missing relay service (new + in Postfix 2.2), everything else is cleanup or commented out by + default. + 2006-04-13 Marcus HÃ¼we * templates/master.cf.template.in: replaced @bindir@/php with @PHP@ * dist_conf/suse: changed the location for the ldapserver_argsfile, From cvs at kolab.org Tue Jun 27 13:48:53 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Tue, 27 Jun 2006 13:48:53 +0200 (CEST) Subject: torsten: doc/www/src index.html.m4,1.86,1.87 Message-ID: <20060627114853.779391006AC@lists.intevation.de> Author: torsten Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv11714 Modified Files: index.html.m4 Log Message: Added news for the new Proko2 KDE client release 2.1.2 Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- index.html.m4 3 Jun 2006 17:01:47 -0000 1.86 +++ index.html.m4 27 Jun 2006 11:48:51 -0000 1.87 @@ -46,6 +46,33 @@

February 10th, 2006
+ + +
June 26th, 2006 » + New version 2.1.2 of proko2 KDE client is available +
+
+ One month after the last release we are happy to announce that a + new Proko2 KDE client is out. This is mainly a bugfix release.
+ Take a look at the release notes in the download section + for a detailed view of all applied changes. +
+ Here is a short overview of the new features and bugfixes. +
+
New: Show quota information in the folder tooltip
+
New: Allow ";" as additional address separator
+
New: Show detailed information about recurrences of events + in the invitation mail
+
Fixed: Ressource colors doesn't disappear when deleting an + event from the calendar.
+
Fixed: Groupwarefolders are now unsubscribed for online imap + after setup with kolabwizard. +
+ Take a look on the download section to get the new release. +
+
+ +

June 3rd, 2006 » Kolab at LinuxWorld, Seoul, Korea From cvs at kolab.org Wed Jun 28 17:10:44 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 28 Jun 2006 17:10:44 +0200 (CEST) Subject: torsten: doc/www/src screenshots.html.m4,1.4,1.5 Message-ID: <20060628151044.5EF78100161@lists.intevation.de> Author: torsten Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv7640 Modified Files: screenshots.html.m4 Log Message: Added screenshots from current 2.1.2 proko2 kontact client and removed outdated screenshots. Index: screenshots.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/screenshots.html.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- screenshots.html.m4 1 Jun 2005 16:39:16 -0000 1.4 +++ screenshots.html.m4 28 Jun 2006 15:10:42 -0000 1.5 @@ -2,17 +2,100 @@ m4_include(header.html.m4)
This page was updated on:
$Date$
-
KDE Kolab2 Client
+
KDE Kolab2 Client 2.1.1 proko2
+ +

+ + +
+
Kontact overview (660x568 55 kByte) +
Kontact provides a nice overview showing all upcoming events, mails, + todos or birthdays. Additional Knotes just poped up a small note. + -

Calendar View (734x479 100 kByte) -
Contributed by M. Hoehnl und M. Feilner + +
+
Mail overview (839x707 67,6 kByte) +
Hierarchly ordered mailsfolders customized by different folder + icons

+ + + + + + +
+ + +
+
Kontact composing (839x707 82 kByte) +
Mail composing in its full beauty :) + + +
+
Calendar overview (874x772 69,1 kByte) +
Kontacts calendar component showin the upcoming events for a + week. Events can be categorized with colors. +
+ + + + + + + +
+ + +
+
Edit calendar event (615x495 24,4 kByte) +
Create a new event. + + +
+
Free-Busy list (735x495 24,1 kByte) +
You can see if attendees of the event are busy or free on this time. +
+ + + + + +
+ + +
+
Contacts overview (755x508 55,4 kByte) +
You can use mutilple contact folders and share them among other users + + +
+
Create contact (758x598 42,3 kByte) +
Create a new contact and store a lot of additional information. +
+ + + + + + +
+ + +
+
Tasks overview(668x406 39,7 kByte) +
Tasks can be hierachly orded by assigning subtasks. +
+
KDE Kolab1 Client (old)
From cvs at kolab.org Wed Jun 28 17:10:44 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Wed, 28 Jun 2006 17:10:44 +0200 (CEST) Subject: torsten: doc/www/src/images calendar_edit1.png, NONE, 1.1 calendar_edit1_small.png, NONE, 1.1 calendar_freebusy1.png, NONE, 1.1 calendar_freebusy1_small.png, NONE, 1.1 calendar_overview1.png, NONE, 1.1 calendar_overview1_small.png, NONE, 1.1 contacts_edit1.png, NONE, 1.1 contacts_edit1_small.png, NONE, 1.1 contacts_overview1.png, NONE, 1.1 contacts_overview1_small.png, NONE, 1.1 mail_overview1.png, NONE, 1.1 mail_overview1_small.png, NONE, 1.1 mail_reply1.png, NONE, 1.1 mail_reply1_small.png, NONE, 1.1 summery1.png, NONE, 1.1 summery1_small.png, NONE, 1.1 tasks_overview1.png, NONE, 1.1 tasks_overview1_small.png, NONE, 1.1 Message-ID: <20060628151044.63AB41006B4@lists.intevation.de> Author: torsten Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv7640/images Added Files: calendar_edit1.png calendar_edit1_small.png calendar_freebusy1.png calendar_freebusy1_small.png calendar_overview1.png calendar_overview1_small.png contacts_edit1.png contacts_edit1_small.png contacts_overview1.png contacts_overview1_small.png mail_overview1.png mail_overview1_small.png mail_reply1.png mail_reply1_small.png summery1.png summery1_small.png tasks_overview1.png tasks_overview1_small.png Log Message: Added screenshots from current 2.1.2 proko2 kontact client and removed outdated screenshots. --- NEW FILE: calendar_edit1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: calendar_edit1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: calendar_freebusy1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: calendar_freebusy1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: calendar_overview1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: calendar_overview1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: contacts_edit1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: contacts_edit1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: contacts_overview1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: contacts_overview1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mail_overview1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mail_overview1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mail_reply1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mail_reply1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: summery1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: summery1_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tasks_overview1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tasks_overview1_small.png --- (This appears to be a binary file; contents omitted.) From cvs at kolab.org Fri Jun 30 16:38:18 2006 From: cvs at kolab.org (cvs@kolab.org) Date: Fri, 30 Jun 2006 16:38:18 +0200 (CEST) Subject: bernhard: doc/www/src roadmap.html.m4,1.7,1.8 Message-ID: <20060630143818.9A0711006C4@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv32247 Modified Files: roadmap.html.m4 Log Message: server 2.1-beta2 is out, expected rc1 in August. Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- roadmap.html.m4 10 May 2006 10:32:24 -0000 1.7 +++ roadmap.html.m4 30 Jun 2006 14:38:16 -0000 1.8 @@ -34,7 +34,6 @@
Upcoming Kolab Server 2.1 release series
-On February the 3rd, a Beta version Server 2.1-beta1 was released.

Simple version of multi-email-domain support
(accept mail for more than one domain and have accounts in different @@ -45,16 +44,14 @@
Code cleanups.
-Further development takes place in HEAD. -Sometimes development releases are made -to help testing the new feature. +On June the 20th, a Beta version Server 2.1-beta2 was released. -
Upcoming Server release 2.1beta2
+
Upcoming Server release 2.1-rc1
-Expected: May 2006 +Expected: August 2006
-
Bugfixes. +
Minor Bugs fixed from beta2.

Upcoming Kolab Server 2.1 release series

Upcoming Server release 2.1beta1

Upcoming Server release 2.1beta2

Future Kolab Server 3.0 release series

Upcoming Server release 2.1beta2

How to become a mirror?

KDE Kolab2 Client

KDE Kolab2 Client 2.1.1 proko2

KDE Kolab1 Client (old)

Upcoming Kolab Server 2.1 release series

Upcoming Server release 2.1beta2

Upcoming Server release 2.1-rc1