From cvs at intevation.de Sat Apr 2 04:47:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Apr 2 04:47:38 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.17, 1.18 misc.php, 1.3, 1.4 resmgr.php, 1.66, 1.67 smtp.php, 1.3, 1.4 Message-ID: <20050402024736.D27B7101EFF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv7549 Modified Files: kolabfilter.php misc.php resmgr.php smtp.php Log Message: support for multiple recipients Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- kolabfilter.php 9 Mar 2005 02:49:35 -0000 1.17 +++ kolabfilter.php 2 Apr 2005 02:47:34 -0000 1.18 @@ -89,7 +89,7 @@ return true; } -$options = getopt("s:r:c:h:"); +$options = parse_args( array( 's', 'r', 'c', 'h' ), $_SERVER['argv']); //getopt("s:r:c:h:"); if (!array_key_exists('r', $options) || !array_key_exists('s', $options)) { fwrite(STDOUT, "Usage is $argv[0] -s sender@domain -r recip@domain\n"); @@ -97,11 +97,22 @@ } $sender = strtolower($options['s']); -$recipient = strtolower($options['r']); +$recipients = $options['r']; $client_address = $options['c']; $fqhostname = strtolower($options['h']); -myLog("Kolabfilter starting up, sender=$sender, recipient=$recipient, client_address=$client_address", RM_LOG_DEBUG); +// make sure recipients is an array +if( !is_array($recipients) ) { + $recipients = array( $recipients ); +} + +// make recipients lowercase +for( $i = 0; $i < count($recipients); $i++ ) { + $recipients[$i] = strtolower($recipients[$i]); +} + +myLog("Kolabfilter starting up, sender=$sender, recipients=".join(',', $recipients) + .", client_address=$client_address", RM_LOG_DEBUG); $ical = false; $add_headers = array(); @@ -135,12 +146,18 @@ fclose($tmpf); if( $ical ) { require_once 'kolabfilter/resmgr.php'; - myLog("Calling resmgr_filter( $sender, $recipient, $tmpfname )", RM_LOG_DEBUG); - $rc = resmgr_filter( $fqhostname, $sender, $recipient, $tmpfname ); - if( PEAR::isError( $rc ) ) { - fwrite(STDOUT,"Filter failed: ".$rc->getMessage()."\n"); - exit(EX_TEMPFAIL); + $newrecips = array(); + foreach( $recipients as $recip ) { + myLog("Calling resmgr_filter( $sender, $recip, $tmpfname )", RM_LOG_DEBUG); + $rc = resmgr_filter( $fqhostname, $sender, $recip, $tmpfname ); + if( PEAR::isError( $rc ) ) { + fwrite(STDOUT,"Filter failed: ".$rc->getMessage()."\n"); + exit(EX_TEMPFAIL); + } else if( $rc === true ) { + $newrecips[] = $recip; + } } + $recipients = $newrecips; $add_headers[] = "X-Kolab-Scheduling-Message: TRUE"; } else { $add_headers[] = "X-Kolab-Scheduling-Message: FALSE"; @@ -152,7 +169,7 @@ fwrite(STDOUT, $smtp->getMessage()."\n"); exit(EX_TEMPFAIL); } //myLog("Calling smtp->start( $sender, $recipient, $tmpfname )", RM_LOG_DEBUG); -if( PEAR::isError( $error = $smtp->start($sender,$recipient) ) ) { +if( PEAR::isError( $error = $smtp->start($sender,$recipients) ) ) { fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } Index: misc.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- misc.php 21 Dec 2004 13:30:46 -0000 1.3 +++ misc.php 2 Apr 2005 02:47:34 -0000 1.4 @@ -151,4 +151,40 @@ $_SERVER['REMOTE_HOST'] = $params['server']; } } + +/* Since getopt() in php can't parse the options the way + * postfix gives them to us, we write our own option + * handling: + * + * Inputs: + * $opts: array('a','b','c'), a list of wanted options + * $args: the argv list + * Output: + * array of options and values. For example, the input + * "-a foo -b bar baz" would result in + * array( 'a' => 'foo', 'b' => array('bar','baz') ) + */ +function parse_args( $opts, $args ) +{ + $ret = array(); + for( $i = 0; $i < count($args); ++$i ) { + $arg = $args[$i]; + if( $arg[0] == '-' ) { + if( in_array( $arg[1], $opts ) ) { + $val = array(); + $i++; + while( $i < count($args) && $args[$i][0] != '-' ) { + $val[] = $args[$i]; + $i++; + } + $i--; + if( 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; + } + } + } + return $ret; +} + ?> Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- resmgr.php 10 Mar 2005 15:49:41 -0000 1.66 +++ resmgr.php 2 Apr 2005 02:47:34 -0000 1.67 @@ -1077,7 +1077,7 @@ if ($params['action'] == RM_ACT_ALWAYS_REJECT) { myLog("Rejecting $method method"); sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE); - shutdown(0); + return false;//shutdown(0); } $is_update = false; @@ -1120,7 +1120,7 @@ $vfb = &getFreeBusy($resource); if (!$vfb) { - shutdown(1, "Error building free/busy list"); + return new PEAR_Error("Error building free/busy list"); } $vfbstart = $vfb->getAttributeDefault('DTSTART', 0); @@ -1164,7 +1164,7 @@ } else if ($params['action'] == RM_ACT_REJECT_IF_CONFLICTS) { myLog("Conflict detected; rejecting"); sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE); - shutdown(0); + return false;//shutdown(0); } } } @@ -1251,7 +1251,7 @@ if( !triggerFreeBusy($resource,false) ) { myLog("Error updating fblist", RM_LOG_SUPER ); } - shutdown(0); + return false;//shutdown(0); case 'CANCEL': myLog("Removing event $sid"); @@ -1316,7 +1316,7 @@ //$status = $mime->send($organiser, $msg_headers); if (is_a($status, 'PEAR_Error')) { myLog("Unable to send cancellation reply: " . $status->getMessage(), RM_LOG_ERROR); - shutdown(1, "Unable to send cancellation reply: " . $status->getMessage()); + return new PEAR_Error("Unable to send cancellation reply: " . $status->getMessage()); } else { myLog("Successfully sent cancellation reply"); } @@ -1335,14 +1335,14 @@ if( !triggerFreeBusy($resource,false) ) { myLog("Error updating fblist", RM_LOG_SUPER ); } - shutdown(0); + return false;; default: // We either don't currently handle these iTip methods, or they do not // apply to what we're trying to accomplish here if (!$params['group']) { myLog("Ignoring $method method"); - shutdown(0); + return false; } } Index: smtp.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/smtp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- smtp.php 11 Jan 2005 12:43:49 -0000 1.3 +++ smtp.php 2 Apr 2005 02:47:34 -0000 1.4 @@ -25,7 +25,7 @@ $this->smtp = false; } - function start($sender,$recip) { + function start($sender,$recips) { require_once 'Net/SMTP.php'; $this->smtp = &new Net_SMTP($this->host, $this->port); @@ -40,10 +40,14 @@ return new PEAR_Error('Failed to set sender: ' . $error->getMessage()); } - if (PEAR::isError($error = $this->smtp->rcptTo($recip))) { - $msg = 'Failed to set recipient: ' . $error->getMessage(); - myLog($msg, RM_LOG_ERROR); - return false; + if( !is_array( $recips ) ) $recips = array($recips); + + foreach( $recips as $recip ) { + if (PEAR::isError($error = $this->smtp->rcptTo($recip))) { + $msg = 'Failed to set recipient: ' . $error->getMessage(); + myLog($msg, RM_LOG_ERROR); + return false; + } } if (PEAR::isError($error = $this->smtp->_put('DATA'))) { From cvs at intevation.de Sat Apr 2 04:49:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Apr 2 04:49:48 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.5, 1.6 master.cf.template, 1.4, 1.5 Message-ID: <20050402024947.7C547101EFF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv7685 Modified Files: main.cf.template master.cf.template Log Message: no need for kolabfilter_destination_recipient_limit Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- main.cf.template 26 Jan 2005 14:37:48 -0000 1.5 +++ main.cf.template 2 Apr 2005 02:49:45 -0000 1.6 @@ -56,8 +56,6 @@ alias_database = hash:@l_prefix@/etc/postfix/aliases local_recipient_maps = -kolabfilter_destination_recipient_limit = 1 - # local delivery recipient_delimiter = + mailbox_transport = lmtp:unix:@l_prefix@/var/kolab/lmtp Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- master.cf.template 21 Feb 2005 10:00:48 -0000 1.4 +++ master.cf.template 2 Apr 2005 02:49:45 -0000 1.5 @@ -89,4 +89,5 @@ -h @@@fqdnhostname@@@ -s ${sender} -r ${recipient} - -c ${client_address} \ No newline at end of file + -c ${client_address} + From cvs at intevation.de Sat Apr 2 05:08:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Apr 2 05:08:34 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.109, 1.110 Message-ID: <20050402030832.D7B26101EFF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv8092/kolab-resource-handlers Modified Files: kolab-resource-handlers.spec Log Message: versions Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- kolab-resource-handlers.spec 18 Mar 2005 12:37:25 -0000 1.109 +++ kolab-resource-handlers.spec 2 Apr 2005 03:08:30 -0000 1.110 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050318 +Release: 20050401 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Sat Apr 2 05:08:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Apr 2 05:08:34 2005 Subject: steffen: server/kolabd kolabd.spec,1.30,1.31 Message-ID: <20050402030832.E43C7101F09@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv8092/kolabd Modified Files: kolabd.spec Log Message: versions Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- kolabd.spec 24 Mar 2005 10:13:34 -0000 1.30 +++ kolabd.spec 2 Apr 2005 03:08:30 -0000 1.31 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050324 +Release: 20050401 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Mon Apr 4 01:14:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 4 01:14:14 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailboxfilter.php, NONE, 1.1 lmtp.php, NONE, 1.1 olhacks.php, NONE, 1.1 kolabfilter.php, 1.18, 1.19 smtp.php, 1.4, 1.5 Message-ID: <20050403231412.9E0C31005A8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv29528 Modified Files: kolabfilter.php smtp.php Added Files: kolabmailboxfilter.php lmtp.php olhacks.php Log Message: split filter into two and added Outlook invitation forwarding hack --- NEW FILE: kolabmailboxfilter.php --- #!@l_prefix@/bin/php * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You can view the GNU General Public License, online, at the GNU * Project's homepage; see . */ /* Fix include_path to pick up our modified Horde classes */ $include_path = ini_get('include_path'); ini_set( 'include_path', '.:@l_prefix@/var/kolab/php:@l_prefix@/var/kolab/php/pear:'.$include_path); require_once 'PEAR.php'; require_once 'kolabfilter/misc.php'; require_once 'kolabfilter/lmtp.php'; // Load our configuration file $params = array(); require_once '@l_prefix@/etc/resmgr/resmgr.conf'; init(); define( 'TMPDIR', '@l_prefix@/var/resmgr/filter' ); define( 'EX_TEMPFAIL', 75 ); define( 'EX_UNAVAILABLE', 69 ); // Temp file for storing the message $tmpfname = tempnam( TMPDIR, 'IN.' ); $tmpf = fopen($tmpfname, "w"); // Cleanup function function cleanup() { global $tmpfname; file_exists($tmpfname) && unlink($tmpfname); } register_shutdown_function( 'cleanup' ); $options = parse_args( array( 's', 'r', 'c', 'h' ), $_SERVER['argv']); //getopt("s:r:c:h:"); if (!array_key_exists('r', $options) || !array_key_exists('s', $options)) { fwrite(STDOUT, "Usage is $argv[0] -s sender@domain -r recip@domain\n"); exit(EX_TEMPFAIL); } $sender = strtolower($options['s']); $recipients = $options['r']; $client_address = $options['c']; $fqhostname = strtolower($options['h']); // make sure recipients is an array if( !is_array($recipients) ) { $recipients = array( $recipients ); } // make recipients lowercase for( $i = 0; $i < count($recipients); $i++ ) { $recipients[$i] = strtolower($recipients[$i]); } myLog("Kolabfilter starting up, sender=$sender, recipients=".join(',', $recipients) .", client_address=$client_address", RM_LOG_DEBUG); $ical = false; $add_headers = array(); $headers_done = false; $from = false; while (!feof(STDIN)) { $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; } if( fwrite($tmpf, $buffer) === false ) { exit(EX_TEMPFAIL); } } fclose($tmpf); if( $ical ) { require_once 'kolabfilter/resmgr.php'; $newrecips = array(); foreach( $recipients as $recip ) { myLog("Calling resmgr_filter( $sender, $recip, $tmpfname )", RM_LOG_DEBUG); $rc = resmgr_filter( $fqhostname, $sender, $recip, $tmpfname ); if( PEAR::isError( $rc ) ) { fwrite(STDOUT,"Filter failed: ".$rc->getMessage()."\n"); exit(EX_TEMPFAIL); } else if( $rc === true ) { $newrecips[] = $recip; } } $recipients = $newrecips; $add_headers[] = "X-Kolab-Scheduling-Message: TRUE"; } else { $add_headers[] = "X-Kolab-Scheduling-Message: FALSE"; } // Check if we still have recipients if( empty($recipients) ) exit(0); $tmpf = fopen($tmpfname,"r"); $lmtp = new KolabLMTP(); if( PEAR::isError( $lmtp ) ) { fwrite(STDOUT, $lmtp->getMessage()."\n"); exit(EX_TEMPFAIL); } if( PEAR::isError( $error = $lmtp->start($sender,$recipients) ) ) { fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } $headers_done = false; while (!feof($tmpf)) { $buffer = fgets($tmpf, 8192); if( !$headers_done && rtrim( $buffer, "\r\n" ) == '' ) { $headers_done = true; foreach( $add_headers as $h ) { if( PEAR::isError($error = $lmtp->data( "$h\r\n" )) ) { fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } } } //myLog("Calling smtp->data( ".rtrim($buffer)." )", RM_LOG_DEBUG); if( PEAR::isError($error = $lmtp->data( $buffer )) ) { fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } } //myLog("Calling smtp->end()", RM_LOG_DEBUG); $lmtp->end(); myLog("Kolabfilter successfully completed", RM_LOG_DEBUG); exit(0); ?> --- NEW FILE: lmtp.php --- * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You can view the GNU General Public License, online, at the GNU * Project's homepage; see . */ /* TODO(steffen): Refactor -- this is almost exactly like KolabSMTP */ class KolabLMTP { function KolabLMTP( $host = '127.0.0.1', $port = 2003 ) { $this->host = $host; $this->port = $port; $this->lmtp = false; } function start($sender,$recips) { require_once 'Net/LMTP.php'; $this->lmtp = &new Net_LMTP($this->host, $this->port); if (!$this->lmtp) { return new PEAR_Error('Failed to connect to LMTP: ' . $error->getMessage()); } if (PEAR::isError($error = $this->lmtp->connect())) { return new PEAR_Error('Failed to connect to LMTP: ' . $error->getMessage()); } if (PEAR::isError($error = $this->lmtp->mailFrom($sender))) { return new PEAR_Error('Failed to set sender: ' . $error->getMessage()); } if( !is_array( $recips ) ) $recips = array($recips); foreach( $recips as $recip ) { if (PEAR::isError($error = $this->lmtp->rcptTo($recip))) { $msg = 'Failed to set recipient: ' . $error->getMessage(); myLog($msg, RM_LOG_ERROR); return false; } } if (PEAR::isError($error = $this->lmtp->_put('DATA'))) { return $error; } if (PEAR::isError($error = $this->lmtp->_parseResponse(354))) { return $error; } return true; } /* Modified implementation from Net_SMTP that supports * dotstuffing even when getting the mail line-by line */ function quotedataline(&$data) { /* * Change Unix (\n) and Mac (\r) linefeeds into Internet-standard CRLF * (\r\n) linefeeds. */ $data = preg_replace("/([^\r]{1})\n/", "\\1\r\n", $data); $data = preg_replace("/\n\n/", "\n\r\n", $data); /* * Because a single leading period (.) signifies an end to the data, * legitimate leading periods need to be "doubled" (e.g. '..'). */ if( $data[0] == '.' ) $data = '.'.$data; $data = str_replace("\n.", "\n..", $data); } function data( $data) { $this->quotedataline($data); if (PEAR::isError($this->lmtp->_send($data))) { return new PEAR_Error('write to socket failed'); } return true; } function end() { if (PEAR::isError($this->lmtp->_send("\r\n.\r\n"))) { return new PEAR_Error('write to socket failed'); } if (PEAR::isError($error = $this->lmtp->_parseResponse(250))) { return $error; } $this->lmtp->disconnect(); $this->lmtp = false; return true; } var $host; var $port; var $lmtp; }; ?> --- NEW FILE: olhacks.php --- * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You can view the GNU General Public License, online, at the GNU * Project's homepage; see . */ require_once 'kolabfilter/misc.php'; require_once HORDE_BASE . '/lib/core.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'; $forwardtext = "This is an invitation forwarded by outlook and\n". "was rectified by the Kolab server.\n\n". "Diese Einladung wurde von Outlook weitergeleitet\n". "und vom Kolab-Server in gute Form gebracht.\n"; function olhacks_embedical( $fqhostname, $sender, $recipients, $tmpfname ) { global $forwardtext; // Read in message text $requestText = ''; $handle = @fopen( $tmpfname, "r" ); if( $handle === false ) { myLog("Error opening $tmpfname", RM_LOG_ERROR); return false; } while (!feof($handle)) { $requestText .= fread($handle, 8192); } fclose($handle); // Construct new MIME message with original message attached $toppart = &new MIME_Message(); $textpart = &new MIME_Part('text/plain', $forwardtext, 'UTF-8' ); $msgpart = &new MIME_Part('message/rfc822', $requestText ); $toppart->addPart($textpart); $toppart->addPart($msgpart); // Build the reply headers. $msg_headers = &new MIME_Headers(); $msg_headers->addReceivedHeader(); $msg_headers->addMessageIdHeader(); $msg_headers->addHeader('Date', date('r')); $msg_headers->addHeader('From', "$sender"); foreach( $recipients as $recip ) { $msg_headers->addHeader('To', $recip); } $msg_headers->addHeader('Subject', 'Kolab forwarded message' ); $msg_headers->addMIMEHeaders($toppart); if (is_object($msg_headers)) { $headerArray = $toppart->encode($msg_headers->toArray(), $toppart->getCharset()); } else { $headerArray = $toppart->encode($msg_headers, $toppart->getCharset()); } // Inject message back into postfix require_once 'Mail.php'; $mailer = &Mail::factory('SMTP', array('auth' => false, 'port' => 10026 )); $msg = $toppart->toString(); /* Make sure the message has a trailing newline. */ if (substr($msg, -1) != "\n") { $msg .= "\n"; } $error = $mailer->send($recipients, $headerArray, $msg); if( PEAR::isError($error) ) { fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } return true; } ?> Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- kolabfilter.php 2 Apr 2005 02:47:34 -0000 1.18 +++ kolabfilter.php 3 Apr 2005 23:14:10 -0000 1.19 @@ -118,6 +118,7 @@ $add_headers = array(); $headers_done = false; $from = false; +$senderok = true; while (!feof(STDIN)) { $buffer = fgets(STDIN, 8192); $line = rtrim( $buffer, "\r\n"); @@ -126,9 +127,7 @@ $headers_done = true; if( $from && $params['verify_from_header'] ) { if( !verify_sender( $sender, $from, $client_address) ) { - myLog("Invalid From: header. $from does not match envelope $sender\n", RM_LOG_DEBUG); - fwrite(STDOUT,"Invalid From: header. $from does not match envelope $sender\n"); - exit(EX_UNAVAILABLE); + $senderok = false; } } } else if( !$headers_done && $params['allow_sender_header'] && eregi( '^Sender:(.*)', $line, $regs ) ) { @@ -144,23 +143,22 @@ } } fclose($tmpf); -if( $ical ) { - require_once 'kolabfilter/resmgr.php'; - $newrecips = array(); - foreach( $recipients as $recip ) { - myLog("Calling resmgr_filter( $sender, $recip, $tmpfname )", RM_LOG_DEBUG); - $rc = resmgr_filter( $fqhostname, $sender, $recip, $tmpfname ); + +if( !$senderok ) { + if( $ical ) { + require_once('kolabfilter/olhacks.php'); + $rc = olhacks_embedical( $fqhostname, $sender, $recipients, $tmpfname ); if( PEAR::isError( $rc ) ) { fwrite(STDOUT,"Filter failed: ".$rc->getMessage()."\n"); exit(EX_TEMPFAIL); } else if( $rc === true ) { - $newrecips[] = $recip; + exit(0); } + } else { + myLog("Invalid From: header. $from does not match envelope $sender\n", RM_LOG_DEBUG); + fwrite(STDOUT,"Invalid From: header. $from does not match envelope $sender\n"); + exit(EX_UNAVAILABLE); } - $recipients = $newrecips; - $add_headers[] = "X-Kolab-Scheduling-Message: TRUE"; -} else { - $add_headers[] = "X-Kolab-Scheduling-Message: FALSE"; } $tmpf = fopen($tmpfname,"r"); @@ -168,7 +166,6 @@ if( PEAR::isError( $smtp ) ) { fwrite(STDOUT, $smtp->getMessage()."\n"); exit(EX_TEMPFAIL); } -//myLog("Calling smtp->start( $sender, $recipient, $tmpfname )", RM_LOG_DEBUG); if( PEAR::isError( $error = $smtp->start($sender,$recipients) ) ) { fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } Index: smtp.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/smtp.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- smtp.php 2 Apr 2005 02:47:34 -0000 1.4 +++ smtp.php 3 Apr 2005 23:14:10 -0000 1.5 @@ -18,6 +18,8 @@ * Project's homepage; see . */ + /* TODO(steffen): Refactor -- this is almost exactly like KolabLMTP */ + class KolabSMTP { function KolabSMTP( $host, $port ) { $this->host = $host; From cvs at intevation.de Mon Apr 4 01:17:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 4 01:17:37 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.110, 1.111 Message-ID: <20050403231736.476691005A8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv29591 Modified Files: kolab-resource-handlers.spec Log Message: conf + added files to spec Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- kolab-resource-handlers.spec 2 Apr 2005 03:08:30 -0000 1.110 +++ kolab-resource-handlers.spec 3 Apr 2005 23:17:34 -0000 1.111 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050401 +Release: 20050403 Class: JUNK License: GPL Group: MAIL @@ -73,9 +73,11 @@ %{l_shtool} install -c -m 755 %{l_value -s -a} \ resmgr/kolabfilter.php \ + resmgr/kolabmailboxfilter.php \ $RPM_BUILD_ROOT%{l_prefix}/etc/resmgr/ %{l_shtool} install -c -m 644 %{l_value -s -a} \ - resmgr/smtp.php resmgr/misc.php resmgr/resmgr.php \ + resmgr/smtp.php resmgr/lmtp.php resmgr/misc.php resmgr/resmgr.php \ + resmgr/olhacks.php \ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/php/kolabfilter cp -r fbview/fbview $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www From cvs at intevation.de Mon Apr 4 01:17:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 4 01:17:37 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.19, 1.20 olhacks.php, 1.1, 1.2 resmgr.conf, 1.5, 1.6 Message-ID: <20050403231736.4F8C31005A9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv29591/kolab-resource-handlers/resmgr Modified Files: kolabfilter.php olhacks.php resmgr.conf Log Message: conf + added files to spec Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- kolabfilter.php 3 Apr 2005 23:14:10 -0000 1.19 +++ kolabfilter.php 3 Apr 2005 23:17:34 -0000 1.20 @@ -145,7 +145,7 @@ fclose($tmpf); if( !$senderok ) { - if( $ical ) { + if( $ical && $params['allow_outlook_ical_forward'] ) { require_once('kolabfilter/olhacks.php'); $rc = olhacks_embedical( $fqhostname, $sender, $recipients, $tmpfname ); if( PEAR::isError( $rc ) ) { Index: olhacks.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- olhacks.php 3 Apr 2005 23:14:10 -0000 1.1 +++ olhacks.php 3 Apr 2005 23:17:34 -0000 1.2 @@ -61,6 +61,7 @@ foreach( $recipients as $recip ) { $msg_headers->addHeader('To', $recip); } + // TODO(steffen): Use subject from original message $msg_headers->addHeader('Subject', 'Kolab forwarded message' ); $msg_headers->addMIMEHeaders($toppart); Index: resmgr.conf =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- resmgr.conf 9 Mar 2005 02:49:35 -0000 1.5 +++ resmgr.conf 3 Apr 2005 23:17:34 -0000 1.6 @@ -25,6 +25,10 @@ // Should the Sender: header be used over From: if present? $params['allow_sender_header'] = true; +// Should we allow forwarded ical messages from Outlook +// by encapsulating them in a MIME multipart +$params['allow_outlook_ical_forward'] = true; + // Should we perform this check on mail from our // subdomains too? $params['verify_subdomains'] = true; From cvs at intevation.de Mon Apr 4 01:18:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 4 01:18:13 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.111, 1.112 Message-ID: <20050403231811.EB1131005A8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv29654 Modified Files: kolab-resource-handlers.spec Log Message: versions Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- kolab-resource-handlers.spec 3 Apr 2005 23:17:34 -0000 1.111 +++ kolab-resource-handlers.spec 3 Apr 2005 23:18:09 -0000 1.112 @@ -22,7 +22,7 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: apache, php, php::with_pear = yes -PreReq: kolabd >= 1.9.4-20050309, apache, php, php::with_pear = yes +PreReq: kolabd >= 1.9.4-20050403, apache, php, php::with_pear = yes AutoReq: no AutoReqProv: no #BuildArch: noarch From cvs at intevation.de Mon Apr 4 01:22:14 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 4 01:22:15 2005 Subject: steffen: server/kolabd kolabd.spec,1.31,1.32 Message-ID: <20050403232214.6313E1005A8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv29710 Modified Files: kolabd.spec Log Message: support for split filter + ol hack Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- kolabd.spec 2 Apr 2005 03:08:30 -0000 1.31 +++ kolabd.spec 3 Apr 2005 23:22:12 -0000 1.32 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050401 +Release: 20050403 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Mon Apr 4 01:22:14 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 4 01:22:15 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.6, 1.7 master.cf.template, 1.5, 1.6 resmgr.conf.template, 1.3, 1.4 Message-ID: <20050403232214.67F8E1005A9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv29710/kolabd/templates Modified Files: main.cf.template master.cf.template resmgr.conf.template Log Message: support for split filter + ol hack Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- main.cf.template 2 Apr 2005 02:49:45 -0000 1.6 +++ main.cf.template 3 Apr 2005 23:22:12 -0000 1.7 @@ -58,7 +58,8 @@ # local delivery recipient_delimiter = + -mailbox_transport = lmtp:unix:@l_prefix@/var/kolab/lmtp +#mailbox_transport = lmtp:unix:@l_prefix@/var/kolab/lmtp +mailbox_transport = kolabmailboxfilter #TLS settings smtpd_use_tls = yes Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- master.cf.template 2 Apr 2005 02:49:45 -0000 1.5 +++ master.cf.template 3 Apr 2005 23:22:12 -0000 1.6 @@ -91,3 +91,12 @@ -r ${recipient} -c ${client_address} +kolabmailboxfilter unix - n n - 1 pipe user=@l_nusr@ flags= argv=@l_prefix@/bin/php + -c @l_prefix@/etc/apache/php.ini + -f @l_prefix@/etc/resmgr/kolabmailboxfilter.php + -- + -h @@@fqdnhostname@@@ + -s ${sender} + -r ${recipient} + -c ${client_address} + Index: resmgr.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- resmgr.conf.template 11 Mar 2005 13:40:27 -0000 1.3 +++ resmgr.conf.template 3 Apr 2005 23:22:12 -0000 1.4 @@ -24,6 +24,10 @@ // Should the Sender: header be used over From: if present? $params['allow_sender_header'] = false; +// Should we allow forwarded ical messages from Outlook +// by encapsulating them in a MIME multipart +$params['allow_outlook_ical_forward'] = true; + // Should we perform this check on mail from our // subdomains too? $params['verify_subdomains'] = true; From cvs at intevation.de Mon Apr 4 01:46:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 4 01:46:11 2005 Subject: steffen: server obmtool.conf,1.150,1.151 Message-ID: <20050403234611.31A3E1005A8@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv29981 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 --- obmtool.conf 18 Mar 2005 12:37:25 -0000 1.150 +++ obmtool.conf 3 Apr 2005 23:46:09 -0000 1.151 @@ -131,9 +131,9 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050318 --without=genuine + @install ${altloc}kolabd-1.9.4-20050403 --without=genuine @install ${altloc}kolab-webadmin-0.4.0-20050318 - @install ${altloc}kolab-resource-handlers-0.3.9-20050318 + @install ${altloc}kolab-resource-handlers-0.3.9-20050403 @check %dump From cvs at intevation.de Tue Apr 5 16:27:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 5 16:28:00 2005 Subject: bernhard: server/kolabd/kolabd/templates main.cf.template,1.7,1.8 Message-ID: <20050405142758.E26001005B3@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv22047 Modified Files: main.cf.template Log Message: A better fix for Issue609 (distribution lists swallow outgoing mail not intended for the list) which also allows to make mailsplits in virtual. Details: It is better to expand distributions lists in virtual and not in alias because some of the resulting addresses might be external and can then choose their best transport. For the mailsplit this is crucial as the transport for $mydestination then needs to depend on another ldap request. The new domain parameter to the ldapdistlist prevents that outgoing email is affected and only distribution lists are matched. Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- main.cf.template 3 Apr 2005 23:22:12 -0000 1.7 +++ main.cf.template 5 Apr 2005 14:27:56 -0000 1.8 @@ -48,11 +48,10 @@ # maps canonical_maps = hash:@l_prefix@/etc/postfix/canonical -virtual_maps = ldap:ldapvirtual -# virtual_maps = hash:@l_prefix@/etc/postfix/virtual +virtual_maps = hash:@l_prefix@/etc/postfix/virtual, ldap:ldapdistlist, ldap:ldapvirtual relocated_maps = hash:@l_prefix@/etc/postfix/relocated transport_maps = ldap:ldaptransport, hash:@l_prefix@/etc/postfix/transport -alias_maps = ldap:ldapdistlist, hash:@l_prefix@/etc/postfix/aliases +alias_maps = hash:@l_prefix@/etc/postfix/aliases alias_database = hash:@l_prefix@/etc/postfix/aliases local_recipient_maps = @@ -152,6 +151,7 @@ ldapdistlist_server_host = @@@ldap_uri@@@ ldapdistlist_search_base = @@@user_dn_list@@@ +ldapdistlist_domain = $mydestination ldapdistlist_query_filter = (cn=%u) ldapdistlist_special_result_attribute = member ldapdistlist_result_attribute = mail From cvs at intevation.de Tue Apr 5 22:10:31 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 5 22:10:32 2005 Subject: bernhard: server README.1st,1.6,1.7 Message-ID: <20050405201031.EA6041005AA@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv28957 Modified Files: README.1st Log Message: Added information to run slapindex twice when in trouble updating from beta3. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- README.1st 18 Mar 2005 14:21:50 -0000 1.6 +++ README.1st 5 Apr 2005 20:10:29 -0000 1.7 @@ -115,6 +115,8 @@ /kolab/sbin/slapindex /kolab/bin/openpkg rc openldap start +If your manager is only getting the role "user" run slapindex once again, +with a fully stopped server. For more information on Kolab, see http://www.kolab.org From cvs at intevation.de Tue Apr 5 22:17:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 5 22:17:48 2005 Subject: steffen: server/kolabd kolabd.spec,1.32,1.33 Message-ID: <20050405201746.921B51005AA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv29167 Modified Files: kolabd.spec Log Message: bootstrap script was broken for some reason... Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- kolabd.spec 3 Apr 2005 23:22:12 -0000 1.32 +++ kolabd.spec 5 Apr 2005 20:17:44 -0000 1.33 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050403 +Release: 20050405 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Tue Apr 5 22:17:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 5 22:17:48 2005 Subject: steffen: server/kolabd/kolabd kolab_bootstrap,1.11,1.12 Message-ID: <20050405201746.9592D1006B3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv29167/kolabd Modified Files: kolab_bootstrap Log Message: bootstrap script was broken for some reason... Index: kolab_bootstrap =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- kolab_bootstrap 29 Mar 2005 00:02:44 -0000 1.11 +++ kolab_bootstrap 5 Apr 2005 20:17:44 -0000 1.12 @@ -41,10 +41,10 @@ chomp $host; close( HOSTNAME ); } - if( open( hostname, '/etc/hostname' ) ) { - $host = ; + if( open( HOSTNAME, '/etc/hostname' ) ) { + $host = ; chomp $host; - close( hostname ); + close( HOSTNAME ); } if( $host eq '' ) { $host = `hostname`; @@ -62,7 +62,7 @@ my $paddr = sockaddr_in($port, $iaddr); my $proto = getprotobyname('tcp'); socket(SOCK, PF_INET, SOCK_STREAM, $proto) || die "socket: $!"; - my $retval = connect(SOCK, $paddr); + my $retval = connect(SOCK, $paddr) || 0; close( SOCK ); return $retval; } @@ -284,7 +284,7 @@ $domain = getUserInput("Please enter your Maildomain - if you do not know your mail domain use the fqdn from above", $domain); print "proceeding with Maildomain $domain\n"; - print "Kolab primary email addresses will be of the type user@$domain \n"; + print "Kolab primary email addresses will be of the type user\@$domain \n"; if ( $opt_f || $base_dn =~ /\@\@\@/ || $bind_dn =~ /\@\@\@/ || $bind_pw =~ /\@\@\@/ ) { @@ -687,7 +687,7 @@ print "Calendar object not found, please check your input\n"; goto SLAVESTART; } - my $entry = $mesg->entry(0); + $entry = $mesg->entry(0); $calendar_pw = $entry->get_value( 'userPassword' ); $mesg = $ldap->search(base=> "k=kolab,$base_dn", scope=> 'exact', From cvs at intevation.de Tue Apr 5 22:30:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 5 22:30:15 2005 Subject: bernhard: server/kolabd/kolabd/templates amavisd.conf.template, 1.3, 1.4 Message-ID: <20050405203015.4573D1006B6@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv29476 Modified Files: amavisd.conf.template Log Message: Probably corrected MYHOME default documentation in example line, because my /kolab/sbin/amavisd had /kolab/var/amavisd (with the "d").^ Index: amavisd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- amavisd.conf.template 18 Mar 2005 12:29:09 -0000 1.3 +++ amavisd.conf.template 5 Apr 2005 20:30:13 -0000 1.4 @@ -55,7 +55,7 @@ # $MYHOME serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. # $MYHOME is not used directly by the program. No trailing slash! -#$MYHOME = '/var/lib/amavis'; # (default is '@l_prefix@/var/amavis') +#$MYHOME = '/var/lib/amavis'; # (default is '@l_prefix@/var/amavisd') # $mydomain serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. From cvs at intevation.de Wed Apr 6 18:47:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 6 18:47:47 2005 Subject: bernhard: doc/www/src index.html.m4,1.45,1.46 Message-ID: <20050406164746.C312D1005A3@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv17222 Modified Files: index.html.m4 Log Message: Added news: Kolab Sync 0.4.0. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- index.html.m4 26 Mar 2005 18:03:13 -0000 1.45 +++ index.html.m4 6 Apr 2005 16:47:44 -0000 1.46 @@ -37,7 +37,28 @@
- + + +
26th, March 2005
April 6th, 2005» +Sync Kolab beta 0.4.0 for Thunderbird +
+
+Today the 0.4.0 beta version of +Sync Kolab +for was announced. This Thunderbird plugin is compatible with the old Kolab1 +storage format and allows to sync contacts, events and tasks. +The author Niko Berger is seeking feedback on the Kolab-users list +and currently works on a Kolab2 version of Sync Kolab. +
+

+ +

+ + +
+ + + @@ -52,10 +73,6 @@

- - - -

From cvs at intevation.de Thu Apr 7 02:09:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 7 02:09:19 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.112, 1.113 Message-ID: <20050407000918.BFDA4100160@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv23991 Modified Files: kolab-resource-handlers.spec Log Message: Issue665 (Outlook iCal forwarding) Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- kolab-resource-handlers.spec 3 Apr 2005 23:18:09 -0000 1.112 +++ kolab-resource-handlers.spec 7 Apr 2005 00:09:16 -0000 1.113 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050403 +Release: 20050406 Class: JUNK License: GPL Group: MAIL @@ -76,7 +76,7 @@ resmgr/kolabmailboxfilter.php \ $RPM_BUILD_ROOT%{l_prefix}/etc/resmgr/ %{l_shtool} install -c -m 644 %{l_value -s -a} \ - resmgr/smtp.php resmgr/lmtp.php resmgr/misc.php resmgr/resmgr.php \ + resmgr/kolabmailtransport.php resmgr/misc.php resmgr/resmgr.php \ resmgr/olhacks.php \ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/php/kolabfilter From cvs at intevation.de Thu Apr 7 02:09:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 7 02:09:19 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, NONE, 1.1 kolabfilter.php, 1.20, 1.21 kolabmailboxfilter.php, 1.1, 1.2 olhacks.php, 1.2, 1.3 lmtp.php, 1.1, NONE smtp.php, 1.5, NONE Message-ID: <20050407000918.CEBD3100167@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv23991/kolab-resource-handlers/resmgr Modified Files: kolabfilter.php kolabmailboxfilter.php olhacks.php Added Files: kolabmailtransport.php Removed Files: lmtp.php smtp.php Log Message: Issue665 (Outlook iCal forwarding) --- NEW FILE: kolabmailtransport.php --- * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You can view the GNU General Public License, online, at the GNU * Project's homepage; see . */ class KolabMailTransport { function KolabMailTransport( $host = '127.0.0.1', $port = 2003 ) { $this->host = $host; $this->port = $port; $this->transport = false; } /*abstract*/ function createTransport() { myLog("Abstract method KolabMailTransport::createTransport() called!", RM_LOG_ERROR); } function start($sender,$recips) { $this->createTransport(); $myclass = get_class($this->transport); if (!$this->transport) { return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage()); } if (PEAR::isError($error = $this->transport->connect())) { return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage()); } if (PEAR::isError($error = $this->transport->mailFrom($sender))) { return new PEAR_Error('Failed to set sender: ' . $error->getMessage()); } if( !is_array( $recips ) ) $recips = array($recips); foreach( $recips as $recip ) { if (PEAR::isError($error = $this->transport->rcptTo($recip))) { $msg = 'Failed to set recipient: ' . $error->getMessage(); myLog($msg, RM_LOG_ERROR); return false; } } if (PEAR::isError($error = $this->transport->_put('DATA'))) { return $error; } if (PEAR::isError($error = $this->transport->_parseResponse(354))) { return $error; } return true; } /* Modified implementation from Net_SMTP that supports * dotstuffing even when getting the mail line-by line */ function quotedataline(&$data) { /* * Change Unix (\n) and Mac (\r) linefeeds into Internet-standard CRLF * (\r\n) linefeeds. */ $data = preg_replace("/([^\r]{1})\n/", "\\1\r\n", $data); $data = preg_replace("/\n\n/", "\n\r\n", $data); /* * Because a single leading period (.) signifies an end to the data, * legitimate leading periods need to be "doubled" (e.g. '..'). */ if( $data[0] == '.' ) $data = '.'.$data; $data = str_replace("\n.", "\n..", $data); } function data( $data) { $this->quotedataline($data); if (PEAR::isError($this->transport->_send($data))) { return new PEAR_Error('write to socket failed'); } return true; } function end() { if (PEAR::isError($this->transport->_send("\r\n.\r\n"))) { return new PEAR_Error('write to socket failed'); } if (PEAR::isError($error = $this->transport->_parseResponse(250))) { return $error; } $this->transport->disconnect(); $this->transport = false; return true; } var $host; var $port; var $transport; }; class KolabLMTP extends KolabMailTransport { function KolabLMTP( $host = '127.0.0.1', $port = 2003 ) { $this->KolabMailTransport($host,$port); } function createTransport() { require_once 'Net/LMTP.php'; $this->transport = &new Net_LMTP($this->host, $this->port); } }; class KolabSMTP extends KolabMailTransport { function KolabSMTP( $host = '127.0.0.1', $port = 25 ) { $this->KolabMailTransport($host,$port); } function createTransport() { require_once 'Net/SMTP.php'; $this->transport = &new Net_SMTP($this->host, $this->port); } }; ?> Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- kolabfilter.php 3 Apr 2005 23:17:34 -0000 1.20 +++ kolabfilter.php 7 Apr 2005 00:09:16 -0000 1.21 @@ -26,7 +26,7 @@ require_once 'PEAR.php'; require_once 'kolabfilter/misc.php'; -require_once 'kolabfilter/smtp.php'; +require_once 'kolabfilter/kolabmailtransport.php'; // Load our configuration file $params = array(); @@ -118,6 +118,7 @@ $add_headers = array(); $headers_done = false; $from = false; +$subject = false; $senderok = true; while (!feof(STDIN)) { $buffer = fgets(STDIN, 8192); @@ -126,16 +127,18 @@ // Done with headers $headers_done = true; if( $from && $params['verify_from_header'] ) { - if( !verify_sender( $sender, $from, $client_address) ) { + if( !verify_sender( strtolower($sender), strtolower($from), $client_address) ) { $senderok = false; } } - } 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); + } 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; } if( fwrite($tmpf, $buffer) === false ) { @@ -147,7 +150,7 @@ if( !$senderok ) { if( $ical && $params['allow_outlook_ical_forward'] ) { require_once('kolabfilter/olhacks.php'); - $rc = olhacks_embedical( $fqhostname, $sender, $recipients, $tmpfname ); + $rc = olhacks_embedical( $fqhostname, $sender, $recipients, $from, $subject, $tmpfname ); if( PEAR::isError( $rc ) ) { fwrite(STDOUT,"Filter failed: ".$rc->getMessage()."\n"); exit(EX_TEMPFAIL); @@ -190,4 +193,4 @@ $smtp->end(); myLog("Kolabfilter successfully completed", RM_LOG_DEBUG); exit(0); -?> \ No newline at end of file +?> Index: kolabmailboxfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolabmailboxfilter.php 3 Apr 2005 23:14:10 -0000 1.1 +++ kolabmailboxfilter.php 7 Apr 2005 00:09:16 -0000 1.2 @@ -26,7 +26,7 @@ require_once 'PEAR.php'; require_once 'kolabfilter/misc.php'; -require_once 'kolabfilter/lmtp.php'; +require_once 'kolabfilter/kolabmailtransport.php'; // Load our configuration file $params = array(); @@ -70,7 +70,7 @@ $recipients[$i] = strtolower($recipients[$i]); } -myLog("Kolabfilter starting up, sender=$sender, recipients=".join(',', $recipients) +myLog("Kolabmailboxfilter starting up, sender=$sender, recipients=".join(',', $recipients) .", client_address=$client_address", RM_LOG_DEBUG); $ical = false; @@ -83,9 +83,9 @@ if( $line == '' ) { // Done with headers $headers_done = true; - } else if( !$headers_done && $params['allow_sender_header'] && eregi( '^Sender:(.*)', $line, $regs ) ) { + } 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 ) ) { + } 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); @@ -145,6 +145,6 @@ } //myLog("Calling smtp->end()", RM_LOG_DEBUG); $lmtp->end(); -myLog("Kolabfilter successfully completed", RM_LOG_DEBUG); +myLog("Kolabmailboxfilter successfully completed", RM_LOG_DEBUG); exit(0); -?> \ No newline at end of file +?> Index: olhacks.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- olhacks.php 3 Apr 2005 23:17:34 -0000 1.2 +++ olhacks.php 7 Apr 2005 00:09:16 -0000 1.3 @@ -27,11 +27,14 @@ require_once 'Horde/MIME/Structure.php'; $forwardtext = "This is an invitation forwarded by outlook and\n". - "was rectified by the Kolab server.\n\n". + "was rectified by the Kolab server.\n". + "The invitation was originally sent by\n%s.\n\n". "Diese Einladung wurde von Outlook weitergeleitet\n". - "und vom Kolab-Server in gute Form gebracht.\n"; + "und vom Kolab-Server in gute Form gebracht.\n". + "Die Einladung wurde urspünglich von\n%s geschikt.\n"; -function olhacks_embedical( $fqhostname, $sender, $recipients, $tmpfname ) { +function olhacks_embedical( $fqhostname, $sender, $recipients, $origfrom, $subject, $tmpfname ) { + myLog("Encapsulating iCal message forwarded by $sender", RM_LOG_DEBUG); global $forwardtext; // Read in message text $requestText = ''; @@ -45,10 +48,21 @@ } fclose($handle); + // Parse existing message + $mime = &MIME_Structure::parseTextMIMEMessage($requestText); + $parts = $mime->contentTypeMap(); + if( count($parts) != 1 || $parts[1] != 'text/calendar' ) { + myLog("Message does not contain exactly one toplevel text/calendar part, passing through", + RM_LOG_DEBUG); + return false; + } + $basepart = $mime->getBasePart(); + // Construct new MIME message with original message attached $toppart = &new MIME_Message(); - $textpart = &new MIME_Part('text/plain', $forwardtext, 'UTF-8' ); - $msgpart = &new MIME_Part('message/rfc822', $requestText ); + $textpart = &new MIME_Part('text/plain', sprintf($forwardtext,$origfrom,$origfrom), 'UTF-8' ); + $msgpart = &new MIME_Part($basepart->getType(), $basepart->toString(), + $basepart->getCharset() ); $toppart->addPart($textpart); $toppart->addPart($msgpart); @@ -58,11 +72,10 @@ $msg_headers->addMessageIdHeader(); $msg_headers->addHeader('Date', date('r')); $msg_headers->addHeader('From', "$sender"); + if( $subject !== false ) $msg_headers->addHeader('Subject', $subject ); foreach( $recipients as $recip ) { $msg_headers->addHeader('To', $recip); } - // TODO(steffen): Use subject from original message - $msg_headers->addHeader('Subject', 'Kolab forwarded message' ); $msg_headers->addMIMEHeaders($toppart); if (is_object($msg_headers)) { --- lmtp.php DELETED --- --- smtp.php DELETED --- From cvs at intevation.de Thu Apr 7 08:56:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 7 08:56:25 2005 Subject: steffen: server/kolabd kolabd.spec,1.33,1.34 Message-ID: <20050407065624.6A890100160@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv1323 Modified Files: kolabd.spec Log Message: Issue708 (session storage) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- kolabd.spec 5 Apr 2005 20:17:44 -0000 1.33 +++ kolabd.spec 7 Apr 2005 06:56:22 -0000 1.34 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050405 +Release: 20050407 # list of sources Source0: kolabd-1.9.4.tar.gz @@ -103,6 +103,8 @@ %{l_shtool} mkdir -p -m 777 \ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks + %{l_shtool} mkdir -p -m 700 \ + $RPM_BUILD_ROOT%{l_prefix}/var/kolab/httpd_sessions %{l_shtool} install -c -m 755 %{l_value -s -a} \ kolab_sslcert.sh kolab_ca.sh kolab kolab_bootstrap workaround.sh \ @@ -174,6 +176,7 @@ # generate file list %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ + %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \ '%config %{l_prefix}/etc/kolab/*.pem' \ '%config %{l_prefix}/etc/kolab/*.schema' \ '%config %{l_prefix}/etc/kolab/kolab.conf' \ From cvs at intevation.de Thu Apr 7 08:56:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 7 08:56:25 2005 Subject: steffen: server/kolabd/kolabd/templates httpd.conf.template, 1.4, 1.5 php.ini.template, 1.1.1.1, 1.2 Message-ID: <20050407065624.70DA51005A2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv1323/kolabd/templates Modified Files: httpd.conf.template php.ini.template Log Message: Issue708 (session storage) Index: httpd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- httpd.conf.template 8 Jan 2005 03:24:07 -0000 1.4 +++ httpd.conf.template 7 Apr 2005 06:56:22 -0000 1.5 @@ -21,8 +21,8 @@ # FreeBusy list handling RewriteEngine On -RewriteLog "/tmp/rewrite.log" -RewriteLogLevel 9 +#RewriteLog "/tmp/rewrite.log" +#RewriteLogLevel 9 RewriteRule ^/freebusy/([^/]+)\.ifb /freebusy/freebusy.php?uid=$1 RewriteRule ^/freebusy/([^/]+)\.vfb /freebusy/freebusy.php?uid=$1 RewriteRule ^/freebusy/([^/]+)\.xfb /freebusy/freebusy.php?uid=$1&extended=1 Index: php.ini.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- php.ini.template 23 Nov 2004 20:26:48 -0000 1.1.1.1 +++ php.ini.template 7 Apr 2005 06:56:22 -0000 1.2 @@ -702,7 +702,7 @@ ; Argument passed to save_handler. In the case of files, this is the path ; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. -session.save_path = /tmp +session.save_path = @l_prefix@/var/kolab/httpd_sessions ; Whether to use cookies. session.use_cookies = 1 From cvs at intevation.de Thu Apr 7 10:36:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 7 10:36:12 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include debug.php, 1.7, 1.8 sieveutils.class.php, 1.7, 1.8 Message-ID: <20050407083610.3F56E100160@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv3037/kolab-webadmin/php/admin/include Modified Files: debug.php sieveutils.class.php Log Message: Issue700 and Issue701 (vacation issues) Index: debug.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/debug.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- debug.php 10 Feb 2005 14:41:47 -0000 1.7 +++ debug.php 7 Apr 2005 08:36:08 -0000 1.8 @@ -23,7 +23,7 @@ return ((float)$usec + (float)$sec); } function debug($str) { - #print $str.'
'; + print $str.'
'; } function debug_var_dump($var) { #print '
';

Index: sieveutils.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/sieveutils.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sieveutils.class.php	9 Mar 2005 13:34:02 -0000	1.7
+++ sieveutils.class.php	7 Apr 2005 08:36:08 -0000	1.8
@@ -59,7 +59,7 @@
   
   /*static*/ function getReactToSpam( $script ) {
 	$spam = false;
-	if( preg_match('/if header :contains "X-Spam-Flag" "YES" {/', $script ) ) {
+	if( preg_match('/if header :contains "X-Spam-Flag" "YES" { keep; stop; }/', $script ) ) {
 	  $spam = true;
 	}
 	return $spam;


From cvs at intevation.de  Thu Apr  7 10:36:10 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Apr  7 10:36:12 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	vacation.tpl, 1.1, 1.2 
Message-ID: <20050407083610.480A61005A2@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv3037/kolab-webadmin/php/admin/templates

Modified Files:
	vacation.tpl 
Log Message:
Issue700 and Issue701 (vacation issues)

Index: vacation.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/vacation.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vacation.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ vacation.tpl	7 Apr 2005 08:36:08 -0000	1.2
@@ -17,7 +17,7 @@
 {/section}
 

 {tr msg="(one address per line)"}

- {tr msg="React to spam"}

+ {tr msg="Do not send vacation replies to spam messages"}

 {tr msg="Only react to mail coming from domain"}  {tr msg="(leave empty for all domains)"}

 

 


From cvs at intevation.de  Thu Apr  7 10:36:10 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Apr  7 10:36:12 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	vacation.php, 1.12, 1.13 
Message-ID: <20050407083610.49AC41005A3@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv3037/kolab-webadmin/www/admin/user

Modified Files:
	vacation.php 
Log Message:
Issue700 and Issue701 (vacation issues)

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- vacation.php	11 Mar 2005 09:11:15 -0000	1.12
+++ vacation.php	7 Apr 2005 08:36:08 -0000	1.13
@@ -68,7 +68,8 @@
   if( in_array( $scriptname, $scripts ) ) {
 	$script = $sieve->getScript($scriptname);
 	$maildomain = SieveUtils::getMailDomain( $script );
-	$recttospam = SieveUtils::getReactToSpam( $script );
+	$reacttospam = SieveUtils::getReactToSpam( $script );
+	debug("reacttospam=".($reacttospam?"true":"false"));
 	$addresses = SieveUtils::getVacationAddresses( $script );
 	$days = SieveUtils::getVacationDays( $script );
 	$text = SieveUtils::getVacationText( $script );


From cvs at intevation.de  Thu Apr  7 10:36:38 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Apr  7 10:36:39 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	debug.php, 1.8, 1.9 
Message-ID: <20050407083638.395F41005A2@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv3124/kolab-webadmin/php/admin/include

Modified Files:
	debug.php 
Log Message:
ups

Index: debug.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/debug.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debug.php	7 Apr 2005 08:36:08 -0000	1.8
+++ debug.php	7 Apr 2005 08:36:36 -0000	1.9
@@ -23,7 +23,7 @@
     return ((float)$usec + (float)$sec); 
 }
 function debug($str) {
-    print $str.'
';
+    #print $str.'
';
 }
 function debug_var_dump($var) {
     #print '
';


From cvs at intevation.de  Thu Apr  7 20:56:54 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Apr  7 20:56:56 2005
Subject: david: doc/kde-client/cvs-instructions checkout_proko2.sh, 1.56,
	1.57 
Message-ID: <20050407185654.CE82810015D@lists.intevation.de>

Author: david

Update of /kolabrepository/doc/kde-client/cvs-instructions
In directory doto:/tmp/cvs-serv12289

Modified Files:
	checkout_proko2.sh 
Log Message:
kpilot has been proko2-branched now (from KDE_3_4_BRANCH)


Index: checkout_proko2.sh
===================================================================
RCS file: /kolabrepository/doc/kde-client/cvs-instructions/checkout_proko2.sh,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- checkout_proko2.sh	29 Mar 2005 20:31:15 -0000	1.56
+++ checkout_proko2.sh	7 Apr 2005 18:56:52 -0000	1.57
@@ -41,6 +41,8 @@
                 plugins/kmail/bodypartformatter/text_calendar.cpp \
                 wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg}
 
+cvs up -rproko2 -dP kpilot
+
 # Those are not branched anymore
 cvs up -rKDE_3_3_BRANCH korganizer/{resourceview.cpp,resourceview.h}
 


From cvs at intevation.de  Sat Apr  9 03:11:05 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 03:11:06 2005
Subject: steffen: server/kolabd/kolabd/templates amavisd.conf.template, 1.4,
	1.5 
Message-ID: <20050409011105.8718B1005BC@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv6358/kolabd/templates

Modified Files:
	amavisd.conf.template 
Log Message:
Fix for issue682 (amavis internal/external bounce/notification)

Index: amavisd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- amavisd.conf.template	5 Apr 2005 20:30:13 -0000	1.4
+++ amavisd.conf.template	9 Apr 2005 01:11:03 -0000	1.5
@@ -281,7 +281,7 @@
 # 3: server, client
 # 4: decompose parts
 # 5: more debug details
-$log_level = 2;		  # (defaults to 0)
+#$log_level = 5;		  # (defaults to 0)
 
 # Customizable template for the most interesting log file entry (e.g. with
 # $log_level=0) (take care to properly quote Perl special characters like '\')
@@ -440,17 +440,21 @@
 # not standardized, so virus names may need to be adjusted.
 # See README.lookups for syntax, check also README.policy-on-notifications
 #
-$viruses_that_fake_sender_re = new_RE(
-  qr'nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer|palyh|peido|holar'i,
-  qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i,
-  qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i,
-  qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i,
-  qr'@mm|@MM',    # mass mailing viruses as labeled by f-prot and @l_prefix@/bin/uvscan
-  qr'Worm'i,      # worms as labeled by ClamAV, Kaspersky, etc
-  [qr'^(EICAR|Joke\.|Junk\.)'i         => 0],
-  [qr'^(WM97|OF97|W95/CIH-|JS/Fort)'i  => 0],
-  [qr/.*/ => 1],  # true by default  (remove or comment-out if undesired)
-);
+# $viruses_that_fake_sender_re = new_RE(
+#   qr'nimda|hybris|klez|bugbear|yaha|braid|sobig|fizzer|palyh|peido|holar'i,
+#   qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i,
+#   qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i,
+#   qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i,
+#   qr'@mm|@MM',    # mass mailing viruses as labeled by f-prot and @l_prefix@/bin/uvscan
+#   qr'Worm'i,      # worms as labeled by ClamAV, Kaspersky, etc
+#   [qr'^(EICAR|Joke\.|Junk\.)'i         => 0],
+#   [qr'^(WM97|OF97|W95/CIH-|JS/Fort)'i  => 0],
+#   [qr/.*/ => 1],  # true by default  (remove or comment-out if undesired)
+# );
+# Since we only bounce to internal users with trusted addresses,
+# we'll leave this empty
+$viruses_that_fake_sender_re = new_RE();
+@viruses_that_fake_sender_maps = ();
 
 
 # where to send ADMIN VIRUS NOTIFICATIONS (should be a fully qualified address)
@@ -1495,11 +1499,17 @@
 # local sender addresses can be trusted -- for example by requireing
 # authentication before letting the users send with their local address.
 
+@mynetworks = qw( @@@postfix-mynetworks@@@ );
+
 $policy_bank{'MYUSERS'} = {  # mail from authenticated users on this system
   # Bounce only to local users
   final_virus_destiny      => D_BOUNCE,
   final_banned_destiny     => D_BOUNCE,
-  viruses_that_fake_sender_re => 0,
+  warnvirusrecip_maps => undef,	# (defaults to false (undef))
+  warnbannedrecip_maps => undef,# (defaults to false (undef))
+  warnvirussender => 1,
+  warnbannedsender => 1,
+  mynetworks => qw(0.0.0.0/0),
 };
 
 


From cvs at intevation.de  Sat Apr  9 03:13:58 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 03:13:59 2005
Subject: steffen: server/perl-kolab perl-kolab.spec,1.83,1.84 
Message-ID: <20050409011358.7BDAE1005C8@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv6413

Modified Files:
	perl-kolab.spec 
Log Message:
version

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- perl-kolab.spec	24 Mar 2005 10:12:39 -0000	1.83
+++ perl-kolab.spec	9 Apr 2005 01:13:56 -0000	1.84
@@ -48,7 +48,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20050324
+Release:      20050407
 
 #   list of sources
 Source0:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz


From cvs at intevation.de  Sat Apr  9 03:14:57 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 03:14:59 2005
Subject: steffen: server/kolabd kolabd.spec,1.34,1.35 
Message-ID: <20050409011457.3C97E1005CD@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv6453

Modified Files:
	kolabd.spec 
Log Message:
version

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- kolabd.spec	7 Apr 2005 06:56:22 -0000	1.34
+++ kolabd.spec	9 Apr 2005 01:14:55 -0000	1.35
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050407
+Release:      20050408
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz


From cvs at intevation.de  Sat Apr  9 03:16:56 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 03:16:57 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.113, 1.114 
Message-ID: <20050409011656.933B21005A3@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv6484

Modified Files:
	kolab-resource-handlers.spec 
Log Message:
version

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- kolab-resource-handlers.spec	7 Apr 2005 00:09:16 -0000	1.113
+++ kolab-resource-handlers.spec	9 Apr 2005 01:16:54 -0000	1.114
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050406
+Release:	20050408
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Sat Apr  9 03:45:59 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 03:46:01 2005
Subject: steffen: server obmtool.conf,1.151,1.152 
Message-ID: <20050409014559.7C1CF1005B9@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv6899

Modified Files:
	obmtool.conf 
Log Message:
versions

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- obmtool.conf	3 Apr 2005 23:46:09 -0000	1.151
+++ obmtool.conf	9 Apr 2005 01:45:57 -0000	1.152
@@ -84,7 +84,7 @@
     @install ${altloc}postfix-2.1.5-2.2.0_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.5-2.2.0
     @install ${loc}perl-db-5.8.5-2.2.0
-    @install ${altloc}perl-kolab-5.8.5-20050318
+    @install ${altloc}perl-kolab-5.8.5-20050407
     @install ${altloc}imapd-2.2.12-2.3.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist
     @install ${loc}m4-1.4.2-2.2.0
     @install ${loc}bison-1.35-2.2.0
@@ -131,9 +131,9 @@
     @install ${plusloc}clamav-0.83-2.3.0
     @install ${loc}vim-6.3.30-2.2.1
     @install ${plusloc}dcron-2.9-2.2.0
-    @install ${altloc}kolabd-1.9.4-20050403 --without=genuine
-    @install ${altloc}kolab-webadmin-0.4.0-20050318
-    @install ${altloc}kolab-resource-handlers-0.3.9-20050403
+    @install ${altloc}kolabd-1.9.4-20050408 --without=genuine
+    @install ${altloc}kolab-webadmin-0.4.0-20050409
+    @install ${altloc}kolab-resource-handlers-0.3.9-20050408
     @check
 
 %dump


From cvs at intevation.de  Sat Apr  9 10:54:46 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 10:54:48 2005
Subject: steffen: server/kolabd kolabd.spec,1.35,1.36 
Message-ID: <20050409085446.7C8461005B9@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv15060

Modified Files:
	kolabd.spec 
Log Message:
config for allowing/denying access to the webgui

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- kolabd.spec	9 Apr 2005 01:14:55 -0000	1.35
+++ kolabd.spec	9 Apr 2005 08:54:44 -0000	1.36
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050408
+Release:      20050409
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz


From cvs at intevation.de  Sat Apr  9 10:54:46 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 10:54:48 2005
Subject: steffen: server/kolabd/kolabd/templates session_vars.php.template,
	1.2, 1.3 
Message-ID: <20050409085446.7F70A1005BC@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv15060/kolabd/templates

Modified Files:
	session_vars.php.template 
Log Message:
config for allowing/denying access to the webgui

Index: session_vars.php.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- session_vars.php.template	18 Mar 2005 08:57:28 -0000	1.2
+++ session_vars.php.template	9 Apr 2005 08:54:44 -0000	1.3
@@ -1,11 +1,21 @@
 
 # (c) 2003 Tassilo Erlewein 
 # (c) 2003 Martin Konold 
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
 
 */
+
+/*
+ * Session variables fetched from LDAP
+ *
+ * TODO(steffen): Make those variables non-session variables.
+ * We dont really need to store those in the session,
+ * since we source this file on every invokation anyway.
+ */
+
 session_start();
 
 $_SESSION['fqdnhostname'] = "@@@fqdnhostname@@@";
@@ -14,6 +24,19 @@
 $_SESSION['php_dn'] = "@@@php_dn@@@";
 $_SESSION['php_pw'] = "@@@php_pw@@@";
 
+
+/***********************************************************************
+ * Global config
+ */
+
+$params = array();
+
+/*
+ * Which user classes can log in to the webgui?
+ * Currently 4 user classes exist: user, admin, maintainer and manager
+ */
+$params['allow_user_classes'] = array( 'user', 'admin', 'maintainer', 'manager' );
+
 /*
  * Array to configure visibility/access of LDAP attributes to user's account object
  *
@@ -31,7 +54,7 @@
  * TODO(steffen): Make form and LDAP attributes the same.
  */
 
-$attributeaccess = array(
+$params['attribute_access'] = array(
 			 /*
                          // Examples
 			 'firstname'  => 'ro',


From cvs at intevation.de  Sat Apr  9 10:55:04 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 10:55:06 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin
	kolab-webadmin.spec.in, 1.10, 1.11 
Message-ID: <20050409085504.A3CBD1005B9@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv15118/kolab-webadmin

Modified Files:
	kolab-webadmin.spec.in 
Log Message:
config for allowing/denying access to the webgui

Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab-webadmin.spec.in	18 Mar 2005 08:59:00 -0000	1.10
+++ kolab-webadmin.spec.in	9 Apr 2005 08:55:02 -0000	1.11
@@ -42,7 +42,7 @@
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 2.0.0
-PreReq:       OpenPKG, openpkg >= 2.2.0, kolabd >= 1.9.4-20050221
+PreReq:       OpenPKG, openpkg >= 2.2.0, kolabd >= 1.9.4-20050409
 PreReq:       apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes
 PreReq:	      php-smarty >= 2.6.3
 AutoReq:      no


From cvs at intevation.de  Sat Apr  9 10:55:04 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 10:55:06 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	auth.class.php, 1.9, 1.10 authenticate.php, 1.2, 1.3 
Message-ID: <20050409085504.B59761005BC@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv15118/kolab-webadmin/php/admin/include

Modified Files:
	auth.class.php authenticate.php 
Log Message:
config for allowing/denying access to the webgui

Index: auth.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- auth.class.php	10 Mar 2005 21:58:19 -0000	1.9
+++ auth.class.php	9 Apr 2005 08:55:02 -0000	1.10
@@ -24,7 +24,8 @@
 require_once('locale.php');
 
 class KolabAuth {
-	function KolabAuth( $do_auth = true ) {
+    function KolabAuth( $do_auth = true, $params = array() ) {
+	    $this->params = $params;
 		if( isset( $_GET['logout'] ) || isset( $_POST['logout'] ) ) {
 			$this->logout();
 		} else if( $do_auth ) {
@@ -63,13 +64,19 @@
 				}
 				if( $dn ) {
 					$auth_user = $ldap->uidForDn( $dn );
+					$auth_group = $ldap->groupForUid( $auth_user );
+					$tmp_group = ($auth_user=='manager')?'manager':$auth_group;
+					if( !in_array( $tmp_group, $this->params['allow_user_classes'] ) ) {
+						$this->error_string = _("User class '$tmp_group' is denied access");
+						$this->gotoLoginPage();					  
+					}
 					$bind_result = $ldap->bind( $dn, $_POST['password'] );
 					if( $bind_result ) {
 						// All OK!
 						$_SESSION['auth_dn'] = $dn;
 						$_SESSION['auth_user'] = $auth_user;
 						$_SESSION['auth_pw'] = $_POST['password'];
-						$_SESSION['auth_group'] = $ldap->groupForUid( $auth_user );
+						$_SESSION['auth_group'] = $auth_group;
 						$_SESSION['remote_ip'] = $_SERVER['REMOTE_ADDR'];
 						return true;
 					} else {
@@ -155,6 +162,7 @@
 	}
 
 	var $error_string = false;
+	var $params;
 };
 /*
   Local variables:

Index: authenticate.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/authenticate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- authenticate.php	16 Dec 2004 21:03:29 -0000	1.2
+++ authenticate.php	9 Apr 2005 08:55:02 -0000	1.3
@@ -20,8 +20,9 @@
 
 require_once('auth.class.php');
 global $auth;
+global $params;
 if( !isset($auth) ) {
-	$auth =& new KolabAuth;
+  $auth =& new KolabAuth(true,$params);
 }
 /*
   Local variables:


From cvs at intevation.de  Sat Apr  9 10:55:04 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 10:55:06 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php, 1.57, 1.58 
Message-ID: <20050409085504.B67211006A4@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv15118/kolab-webadmin/www/admin/user

Modified Files:
	user.php 
Log Message:
config for allowing/denying access to the webgui

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- user.php	22 Mar 2005 15:50:16 -0000	1.57
+++ user.php	9 Apr 2005 08:55:02 -0000	1.58
@@ -166,7 +166,8 @@
 }
 
 function apply_attributeaccess( &$entries ) {
-  global $attributeaccess;
+  global $params;
+  $attributeaccess =& $params['attribute_access'];
   foreach( $entries as $key=>$value ) {
 	if( ereg( '(.*)_[0-9]', $key, $regs ) ) {
 	  $akey = $regs[1];


From cvs at intevation.de  Sat Apr  9 23:26:50 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 23:26:51 2005
Subject: steffen: server/kolabd/kolabd/doc - New directory 
Message-ID: <20050409212650.9B7E81005B8@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/doc
In directory doto:/tmp/cvs-serv22880/doc

Log Message:
Directory /kolabrepository/server/kolabd/kolabd/doc added to the repository



From cvs at intevation.de  Sat Apr  9 23:42:20 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 23:42:22 2005
Subject: steffen: server/kolabd kolabd.spec,1.36,1.37 
Message-ID: <20050409214220.C02FA1005B8@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv23029

Modified Files:
	kolabd.spec 
Log Message:
a bit of explanation of the virus-filter setup

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- kolabd.spec	9 Apr 2005 08:54:44 -0000	1.36
+++ kolabd.spec	9 Apr 2005 21:42:18 -0000	1.37
@@ -99,7 +99,8 @@
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/icons \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
-        $RPM_BUILD_ROOT%{l_prefix}/bin
+        $RPM_BUILD_ROOT%{l_prefix}/bin \
+	$RPM_BUILD_ROOT%{l_prefix}/share/kolab/doc
 
     %{l_shtool} mkdir -p -m 777 \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks
@@ -166,6 +167,10 @@
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         kolab2.schema rfc2739.schema \
         $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema/
+
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        doc/README.* \
+        $RPM_BUILD_ROOT%{l_prefix}/share/kolab/doc/
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \


From cvs at intevation.de  Sat Apr  9 23:42:20 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Apr  9 23:42:22 2005
Subject: steffen: server/kolabd/kolabd/doc README.amavisd,NONE,1.1 
Message-ID: <20050409214220.C607A1005DD@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/doc
In directory doto:/tmp/cvs-serv23029/kolabd/doc

Added Files:
	README.amavisd 
Log Message:
a bit of explanation of the virus-filter setup

--- NEW FILE: README.amavisd ---
Virus- and spam-filter setup for Kolab
======================================

Last edited: $Id: README.amavisd,v 1.1 2005/04/09 21:42:18 steffen Exp $

Introduction
------------

The Kolab server uses amavisd[1] in conjunction with clamav[2] and
spamassassin[3] to filter email for spam and virus. The clamav and
spamassassin versions are unpatched, but amavisd requires the
amavisd.MYUSERS.patch found in the Kolab cvs[4] to work with
Kolab. The patch adds functionality to amavisd to allow for different
configurations for local and non-local users[5].

Goal
----

To have a virus-filter that, if a virus is found, notifies the sender
of the virus if and only if the sender is a local user. 

To prevent "backscatter" the Kolab server should never send such
notifications to non-local users. If a virus is blocked by the filter
and originates from a non-local user, a notification should be sent to
the local user who would have been the recipient of the email
containing the virus if it had not been infected.

Any infected email that is blocked from reaching it's recipient is
archived to @l_prefix@/var/amavisd/virusmails on the server.

Spam-handling is different: Spam is not blocked by the filter, but
instead email potentially is spam is marked with the

X-Spam-Status: Yes, 
X-Spam-Flag: YES

headers to allow for easy server- and/or client-side filtering of
spam.

Configuration
-------------

The relevant parts of the amavisd.conf.template that apply to all
users are:

$final_virus_destiny      = D_DISCARD;  # (defaults to D_BOUNCE)
$final_banned_destiny     = D_DISCARD;  # (defaults to D_BOUNCE)
$final_spam_destiny       = D_PASS;  # (defaults to D_REJECT)
$viruses_that_fake_sender_re = new_RE();
@viruses_that_fake_sender_maps = ();
$warnvirusrecip = 1;    # (defaults to false (undef))
$warnbannedrecip = 1;   # (defaults to false (undef))
$QUARANTINEDIR = '@l_prefix@/var/amavisd/virusmails';
$virus_quarantine_to  = 'virus-quarantine';
@mynetworks = qw( @@@postfix-mynetworks@@@ );

In addition to that, a policy bank is defined that overrides some of
the above configuration in the case where the sender is a a local user
who is using his legitimate address:

$policy_bank{'MYUSERS'} = {  # mail from authenticated users on this system
  # Bounce only to local users
  final_virus_destiny      => D_BOUNCE,
  final_banned_destiny     => D_BOUNCE,
  warnvirusrecip_maps => undef, # (defaults to false (undef))
  warnbannedrecip_maps => undef,# (defaults to false (undef))
  warnvirussender => 1,
  warnbannedsender => 1,
  mynetworks => qw(0.0.0.0/0),
};

So, in the default case, all virus mail is discarded from the mail
system (but still archived in the quarantine) and the recipient is
notified about the problem.

In the case where the sender is local, the recipient is not notified,
but instead the sender get a notification (a bounce with an
error-message) from the mail server.

Any local additions or changes to the configuration can of course also
make use of this destinction between local and non-local users by
adding to either the global part of the configuration and/or to the
MYUSERS policy bank.

Notes
-----

[1] http://www.ijs.si/software/amavisd/
[2] http://www.clamav.net/
[3] http://spamassassin.apache.org/
[4] See http://www.kolab.org/
[5] A "local user" is a user with an email-account on the kolab
server, a "non-local user" is everyone else.

From cvs at intevation.de  Mon Apr 11 03:05:18 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Apr 11 03:05:20 2005
Subject: steffen: server/kolabd/kolabd/doc README.webgui,NONE,1.1 
Message-ID: <20050411010518.E834E1005AD@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/doc
In directory doto:/tmp/cvs-serv17342

Added Files:
	README.webgui 
Log Message:
documentation for new webgui features (access control)

--- NEW FILE: README.webgui ---
Web admin interface for Kolab
=============================

Last edited: $Id: README.webgui,v 1.1 2005/04/11 01:05:16 steffen Exp $

Requirements
------------

This feature requires the kolab-webadmin package to be installed.

Configuration
-------------

There are only two aspects of the webgui that can be configured currently:

1) Access control based on user class. Each kolab user is member of one of the
user classes

 "user": Any regular kolab user.
 "maintainer": A user that can create/modify/delete user accounts,
        addressbook entries and distribution lists.
 "admin": Same as "maintainer" but with the additional rights to
        change services configuration and manage maintainers.
 "manager": The "manager" class contains only one user -- the manager
        user. The right are the same as "admin".

By default all classes can use the webgui. By changing
@l_prefix@/etc/kolab/templates/session_vars.php this can be
configured. The user-classes that shold have access to the webgui
are listed in the $params['allow_user_classes'] array:

$params['allow_user_classes'] = 
        array( 'user', 'admin', 'maintainer', 'manager' );


2) Controlling access for regular users to the LDAP attributes of the
user's account object. If it possible to change which LDAP attributes
are shown to users on the user page. For each attribute in the user
form, an entry in the array $params['attribute_access'] in
@l_prefix@/etc/kolab/templates/session_vars.php can be made. The key
of the entry is the attribute's name and the value is one of 

  "ro": Readonly.
  "rw": Read/write.
  "hidden": Attribute will not be shown.
  "mandatory": Attribute must not be empty when edited.

The names of the attributes visible to regular users are:

  givenname, sn, password, mail, uid, kolabhomeserver, accttype,
  kolabinvitationpolicy, title, alias, kolabdelegate, o, ou,
  roomNumber, street, postOfficeBox, postalCode, l, c, telephoneNumber,
  facsimileTelephoneNumber, kolabFreeBusyFuture.

An example showing how to make title and telephoneNumber readonly and
hide the c (country) attribute:

$param['attribute_access'] = array( 'title' => 'ro',
                                    'telephoneNumber' => 'ro',
                                    'c' => 'hidden' );

From cvs at intevation.de  Mon Apr 11 15:01:14 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Apr 11 15:01:16 2005
Subject: michel: doc/proko2-doc doc3.sxw,1.30,1.31 
Message-ID: <20050411130114.A91EE100159@lists.intevation.de>

Author: michel

Update of /kolabrepository/doc/proko2-doc
In directory doto:/tmp/cvs-serv3943

Modified Files:
	doc3.sxw 
Log Message:
added example Freebusy search URL for OL to make it clear as reported by Henning Holtschneider on the kolab-devel list

Index: doc3.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc3.sxw,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
Binary files /tmp/cvsDT4tdV and /tmp/cvs2chpQG differ


From cvs at intevation.de  Tue Apr 12 09:03:38 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 09:03:39 2005
Subject: michel: doc/proko2-doc vacationnotification.png, NONE, 1.1 doc2.sxw,
	1.61, 1.62 
Message-ID: <20050412070338.6855D100159@lists.intevation.de>

Author: michel

Update of /kolabrepository/doc/proko2-doc
In directory doto:/tmp/cvs-serv6555

Modified Files:
	doc2.sxw 
Added Files:
	vacationnotification.png 
Log Message:
updated screen shot and added a note concerning the vacation notification do not send vacation replies to spam messages feature - vacation notification settings web interface

--- NEW FILE: vacationnotification.png ---
(This appears to be a binary file; contents omitted.)

Index: doc2.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
Binary files /tmp/cvsliBXFB and /tmp/cvsUSWFM5 differ


From cvs at intevation.de  Tue Apr 12 11:58:51 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 11:58:52 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.114, 1.115 
Message-ID: <20050412095851.3D3B21005BB@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv11628

Modified Files:
	kolab-resource-handlers.spec 
Log Message:
Issue665

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- kolab-resource-handlers.spec	9 Apr 2005 01:16:54 -0000	1.114
+++ kolab-resource-handlers.spec	12 Apr 2005 09:58:48 -0000	1.115
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050408
+Release:	20050411
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Tue Apr 12 11:58:51 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 11:58:54 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	olhacks.php, 1.3, 1.4 
Message-ID: <20050412095851.466B11006AC@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv11628/kolab-resource-handlers/resmgr

Modified Files:
	olhacks.php 
Log Message:
Issue665

Index: olhacks.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- olhacks.php	7 Apr 2005 00:09:16 -0000	1.3
+++ olhacks.php	12 Apr 2005 09:58:49 -0000	1.4
@@ -20,6 +20,7 @@
 
 require_once 'kolabfilter/misc.php';
 require_once HORDE_BASE . '/lib/core.php';
+require_once 'Horde/NLS.php';
 require_once 'Horde/MIME.php';
 require_once 'Horde/MIME/Message.php';
 require_once 'Horde/MIME/Headers.php';
@@ -31,8 +32,43 @@
   "The invitation was originally sent by\n%s.\n\n".
   "Diese Einladung wurde von Outlook weitergeleitet\n".
   "und vom Kolab-Server in gute Form gebracht.\n".
-  "Die Einladung wurde urspünglich von\n%s geschikt.\n";
+  "Die Einladung wurde ursprünglich von\n%s geschickt.\n";
+
+/*static*/ function olhacks_mime_parse( &$text ) {
+  /* Taken from Horde's MIME/Structure.php */
+  require_once 'Mail/mimeDecode.php';
+
+  /* Set up the options for the mimeDecode class. */
+  $decode_args = array();
+  $decode_args['include_bodies'] = true;
+  $decode_args['decode_bodies'] = false;
+  $decode_args['decode_headers'] = false;
+  
+  $mimeDecode = &new Mail_mimeDecode($text, MIME_PART_EOL);
+  if (!($structure = $mimeDecode->decode($decode_args))) {
+    return false;
+  }
+  
+  /* Put the object into imap_parsestructure() form. */
+  MIME_Structure::_convertMimeDecodeData($structure);
+  
+  return array($structure->headers, $ret = &MIME_Structure::parse($structure));
+}
+
+/* static */ function copy_header( $name, &$msg_headers, &$headerarray ) {
+  $lname = strtolower($name);
+  if( array_key_exists($lname, $headerarray)) {
+    if( is_array( $headerarray[$lname] ) ) {
+      foreach( $headerarray[$lname] as $h ) {
+	$msg_headers->addHeader($name, $h );	
+      }
+    } else {
+      $msg_headers->addHeader($name, $headerarray[$lname] );
+    }
+  }
+}
 
+/* main entry point */
 function olhacks_embedical( $fqhostname, $sender, $recipients, $origfrom, $subject, $tmpfname ) {
   myLog("Encapsulating iCal message forwarded by $sender", RM_LOG_DEBUG);
   global $forwardtext;
@@ -49,7 +85,7 @@
   fclose($handle);
 
   // Parse existing message
-  $mime = &MIME_Structure::parseTextMIMEMessage($requestText);
+  list( $headers, $mime) = olhacks_mime_parse($requestText);
   $parts = $mime->contentTypeMap();
   if( count($parts) != 1 || $parts[1] != 'text/calendar' ) {
     myLog("Message does not contain exactly one toplevel text/calendar part, passing through", 
@@ -60,23 +96,29 @@
 
   // Construct new MIME message with original message attached
   $toppart = &new MIME_Message();
-  $textpart = &new MIME_Part('text/plain', sprintf($forwardtext,$origfrom,$origfrom), 'UTF-8' );
-  $msgpart = &new MIME_Part($basepart->getType(), $basepart->toString(), 
+  $dorigfrom = Mail_mimeDecode::_decodeHeader($origfrom);
+  $textpart = &new MIME_Part('text/plain', sprintf($forwardtext,$dorigfrom,$dorigfrom), 'UTF-8' );
+  $msgpart = &new MIME_Part($basepart->getType(), $basepart->transferDecode(), 
 			    $basepart->getCharset() );
   $toppart->addPart($textpart);
   $toppart->addPart($msgpart);
   
   // Build the reply headers.
   $msg_headers = &new MIME_Headers();
-  $msg_headers->addReceivedHeader();
+  copy_header( 'Received', $msg_headers, $headers );
+  //$msg_headers->addReceivedHeader();
   $msg_headers->addMessageIdHeader();
-  $msg_headers->addHeader('Date', date('r'));
-  $msg_headers->addHeader('From', "$sender");
-  if( $subject !== false ) $msg_headers->addHeader('Subject', $subject );
+  //myLog("Headers=".print_r($headers,true), RM_LOG_DEBUG);
+  copy_header( 'Date', $msg_headers, $headers );
+  copy_header( 'Resent-Date', $msg_headers, $headers );
+  copy_header( 'Subject', $msg_headers, $headers );
+  $msg_headers->addHeader('From', $sender);
   foreach( $recipients as $recip ) {
     $msg_headers->addHeader('To', $recip);
   }
+  $msg_headers->addHeader('X-Kolab-Forwarded', 'TRUE');
   $msg_headers->addMIMEHeaders($toppart);
+  copy_header( 'Content-Transfer-Encoding', $msg_headers, $headers );
 
   if (is_object($msg_headers)) {
     $headerArray = $toppart->encode($msg_headers->toArray(), $toppart->getCharset());


From cvs at intevation.de  Tue Apr 12 12:50:19 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 12:50:21 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	sieveutils.class.php, 1.8, 1.9 
Message-ID: <20050412105019.CF3CF1005BB@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv16438/kolab-webadmin/php/admin/include

Modified Files:
	sieveutils.class.php 
Log Message:
Issue712 (vacation compatibility with kmail)

Index: sieveutils.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/sieveutils.class.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sieveutils.class.php	7 Apr 2005 08:36:08 -0000	1.8
+++ sieveutils.class.php	12 Apr 2005 10:50:17 -0000	1.9
@@ -51,7 +51,7 @@
 
   /*static*/ function getMailDomain( $script ) {
 	$maildomain = false;
-	if( preg_match( '/if not address :contains :domain "From" "(.*)" { keep; stop; }/', $script, $regs ) ) {
+	if( preg_match( '/if not address :domain :contains "From" "(.*)" { keep; stop; }/i', $script, $regs ) ) {
 	  $maildomain = $regs[1];
 	}
 	return $maildomain;
@@ -59,7 +59,7 @@
   
   /*static*/ function getReactToSpam( $script ) {
 	$spam = false;
-	if( preg_match('/if header :contains "X-Spam-Flag" "YES" { keep; stop; }/', $script ) ) {
+	if( preg_match('/if header :contains "X-Spam-Flag" "YES" { keep; stop; }/i', $script ) ) {
 	  $spam = true;
 	}
 	return $spam;


From cvs at intevation.de  Tue Apr 12 12:50:19 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 12:50:21 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	vacation.php, 1.13, 1.14 
Message-ID: <20050412105019.D515C1006AA@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv16438/kolab-webadmin/www/admin/user

Modified Files:
	vacation.php 
Log Message:
Issue712 (vacation compatibility with kmail)

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- vacation.php	7 Apr 2005 08:36:08 -0000	1.13
+++ vacation.php	12 Apr 2005 10:50:17 -0000	1.14
@@ -40,8 +40,7 @@
 	$reacttospam = isset( $_REQUEST['reacttospam'] );
 	$script = 
 	  "require \"vacation\";\r\n\r\n".
-	  "require \"fileinto\";\r\n\r\n".
-	  (!empty($maildomain)?"if not address :contains :domain \"From\" \"".$maildomain."\" { keep; stop; }\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".


From cvs at intevation.de  Tue Apr 12 14:12:58 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 14:12:59 2005
Subject: steffen: server/kolabd/kolabd kolab_bootstrap,1.12,1.13 
Message-ID: <20050412121258.45AEB1005BE@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv24191/kolabd

Modified Files:
	kolab_bootstrap 
Log Message:
fix for Issue681 (nobody/calendar password for slave)

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab_bootstrap	5 Apr 2005 20:17:44 -0000	1.12
+++ kolab_bootstrap	12 Apr 2005 12:12:56 -0000	1.13
@@ -678,8 +678,8 @@
     print "Nobody object not found, please check your input\n";
     goto SLAVESTART;
   }
-  my $entry = $mesg->entry(0);
-  $php_pw = $entry->get_value( 'userPassword' );
+  #my $entry = $mesg->entry(0);
+  #$php_pw = $entry->get_value( 'userPassword' );
 
   $calendar_dn = "cn=calendar,cn=internal,$base_dn";
   $mesg = $ldap->search(base=> $php_dn, scope=> 'exact', filter=> "(objectclass=*)");
@@ -687,8 +687,8 @@
     print "Calendar object not found, please check your input\n";
     goto SLAVESTART;
   }
-  $entry = $mesg->entry(0);
-  $calendar_pw = $entry->get_value( 'userPassword' );
+  #$entry = $mesg->entry(0);
+  #$calendar_pw = $entry->get_value( 'userPassword' );
 
   $mesg = $ldap->search(base=> "k=kolab,$base_dn", scope=> 'exact',
 			filter=> "(objectClass=*)");
@@ -699,16 +699,28 @@
   my $kolabhosts = $mesg->entry(0)->get_value( 'kolabhost', asref => 1 );
   foreach(@$kolabhosts) {
     if( lc($_) eq lc($fqdn) ) {
-      goto SLAVEOK;
+	goto SLAVEOK;
     }
   }
   print "$fqdn is not listed on the master, please correct that and try again\n";
   goto SLAVESTART;
-
  SLAVEOK:
 
   my $master_host = $ldapuri->host();
 
+  print "Reading nobody and calendar passwords from master, please type in master's root-password when asked\n";
+  open( CONF, "ssh -C $master_host 'cat $kolab_prefix/etc/kolab/kolab.conf'|");
+  my $conf;
+  $conf .= $_ while();
+  close(CONF);
+  $conf =~ /php_pw : (.*)/;
+  $php_pw = $1;
+  $conf =~ /calendar_pw : (.*)/;
+  $calendar_pw = $1;
+
+  (print "Error reading nobody password" && goto SLAVESTART) unless( $php_pw );
+  (print "Error reading calendar password" && goto SLAVESTART) unless( $calendar_pw );
+
   $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";
   print $fd "fqdnhostname : $fqdn\n";
   print $fd "is_master : $is_master\n";
@@ -819,6 +831,8 @@
   print $fd "ldap_master_uri : $ldap_uri\n";
   print $fd "php_dn : $php_dn\n";
   print $fd "php_pw : $php_pw\n";
+  print $fd "calendar_dn : $calendar_dn\n";
+  print $fd "calendar_pw : $calendar_pw\n";
   undef $fd;
   print "done modifying $kolab_config\n\n";
   chmod 0600, $kolab_config;


From cvs at intevation.de  Tue Apr 12 14:12:58 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 14:13:00 2005
Subject: steffen: server/kolabd kolabd.spec,1.37,1.38 
Message-ID: <20050412121258.4A81A1006AA@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv24191

Modified Files:
	kolabd.spec 
Log Message:
fix for Issue681 (nobody/calendar password for slave)

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolabd.spec	9 Apr 2005 21:42:18 -0000	1.37
+++ kolabd.spec	12 Apr 2005 12:12:56 -0000	1.38
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050409
+Release:      20050412
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz


From cvs at intevation.de  Tue Apr 12 14:20:47 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 14:20:48 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.115, 1.116 
Message-ID: <20050412122047.C60981006AC@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv24556

Modified Files:
	kolab-resource-handlers.spec 
Log Message:
version

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- kolab-resource-handlers.spec	12 Apr 2005 09:58:48 -0000	1.115
+++ kolab-resource-handlers.spec	12 Apr 2005 12:20:45 -0000	1.116
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050411
+Release:	20050412
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Tue Apr 12 14:32:35 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 12 14:32:37 2005
Subject: steffen: server obmtool.conf,1.152,1.153 
Message-ID: <20050412123235.7A22A1006AB@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv25141

Modified Files:
	obmtool.conf 
Log Message:
versions

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- obmtool.conf	9 Apr 2005 01:45:57 -0000	1.152
+++ obmtool.conf	12 Apr 2005 12:32:33 -0000	1.153
@@ -131,9 +131,9 @@
     @install ${plusloc}clamav-0.83-2.3.0
     @install ${loc}vim-6.3.30-2.2.1
     @install ${plusloc}dcron-2.9-2.2.0
-    @install ${altloc}kolabd-1.9.4-20050408 --without=genuine
-    @install ${altloc}kolab-webadmin-0.4.0-20050409
-    @install ${altloc}kolab-resource-handlers-0.3.9-20050408
+    @install ${altloc}kolabd-1.9.4-20050412 --without=genuine
+    @install ${altloc}kolab-webadmin-0.4.0-20050412
+    @install ${altloc}kolab-resource-handlers-0.3.9-20050412
     @check
 
 %dump


From cvs at intevation.de  Thu Apr 14 17:45:33 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Apr 14 17:45:34 2005
Subject: jan: doc/www/src download.html.m4,1.3,1.4 
Message-ID: <20050414154533.6A3351005A2@lists.intevation.de>

Author: jan

Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv10845

Modified Files:
	download.html.m4 
Log Message:
directly link the mirrors page where the information is to be found.


Index: download.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/download.html.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- download.html.m4	24 Mar 2005 16:20:00 -0000	1.3
+++ download.html.m4	14 Apr 2005 15:45:31 -0000	1.4
@@ -50,7 +50,7 @@
 
 
 You will find 4 main sections beneath the directory "server"
-on our download servers:
+on our download servers:
 
 
    
 
  • stable: Stable releases of Kolab Server.


From cvs at intevation.de  Mon Apr 18 15:57:40 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Apr 18 15:57:42 2005
Subject: jan: doc/raw-howtos kolab2-on-sles9.txt,NONE,1.1 
Message-ID: <20050418135740.F16E0100179@lists.intevation.de>

Author: jan

Update of /kolabrepository/doc/raw-howtos
In directory doto:/tmp/cvs-serv1454

Added Files:
	kolab2-on-sles9.txt 
Log Message:
raw help on howto get Kolab-2 running on a sles9.


--- NEW FILE: kolab2-on-sles9.txt ---
Getting started with Kolab-2 Server on a SUSE Linux Enterprise Server 9 (SLES 9)
--------------------------------------------------------------------------------

$Id: kolab2-on-sles9.txt,v 1.1 2005/04/18 13:57:38 jan Exp $

Status:
 - based on Kolab-2 beta 4
 - only addressing a fresh Kolab-2 installation on a fresh SLES9


First login to SLES9 as root, then follow the instructions
below. You may adapt the steps on your own needs and expertise.


1. Get the packages

# mkdir /tmp/kolab-download
# cd /tmp/kolab-download

Get all files in the directory
	kolab/server/beta/kolab-server-2.0-beta-4/ix86-suse9-kolab
from one of the Kolab mirrors listed here:
	http://kolab.org/mirrors.html


2. Check the signature of Kolab-Konsortium

In case you do not yet have the packaging key of
Kolab Konsortium, you can download it from this address:
	http://www.kolab-konsortium.de/kolab-konsortium-package.key.asc
(It has also been send to subkeys.pgp.net)

# gpg  --verify md5sums.txt.gpg
# md5sum * | grep -v md5sum  > /tmp/md5sums
# diff /tmp/md5sums md5sums.txt


3. Prepare SLES9

# mv /usr/bin/libgcrypt-config /usr/bin/libgcrypt-config.moved_out_of_way
# /etc/init.d/postfix stop
# insserv -r /etc/init.d/postfix
# rpm -e openldap2


4. Install Kolab Server

# ./obmtool kolab
# /kolab/etc/kolab/kolab_bootstrap -b
# /kolab/bin/openpkg rc all start


5. Configure Kolab Server

German users: Im Web-Interface einmal auf englisch und zurück
auf deutsch schalten - dann ist auch alles in deutsch.

Go to the web interface, then:

- admin-mails as Internal User Account:
  User/New User, there use an email address like
  admin-mails@kolab-test.tld,
  leave UID empty and set the account type to
  Internal User Account.

- set admin-mails account for adminsitrative emails:
  Go back to the main page (i.e. click the Kolab Logo)
  and click "here".
  Enter the above email address into the field
  "Email address of account that should receive administrative mail"
  and press "Create Distribution Lists".

Now you may add more users and do any other arbitrary configuration.


From cvs at intevation.de  Mon Apr 18 20:30:59 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Apr 18 20:31:01 2005
Subject: bh: utils/testing create_ldap_users.py,NONE,1.1 
Message-ID: <20050418183059.D53801006A2@lists.intevation.de>

Author: bh

Update of /kolabrepository/utils/testing
In directory doto:/tmp/cvs-serv6163

Added Files:
	create_ldap_users.py 
Log Message:
new script to create many ldap users in one go


--- NEW FILE: create_ldap_users.py ---
#!/bin/env python
"""Create some few kolab users in ldap"""

# requires the python-ldap module from
# http://python-ldap.sourceforge.net/
# on debian woody it's packaged as python-ldap

import ldap
import ldap.modlist
import getpass

# adjust these values to match your setup
# TODO: read some of these automatically from ldap
mail_domain = "example.com"
base_dn = "dc=example,dc=com"
admin_dn_part = "cn=some admin,cn=internal"
hostname = "kolabserver.example.com"

# number of users to create.  All users have email addresses of the form
# autotest%d@mail_domain where %d will be replaced by a number in
# range(num_users)
num_users = 10

def add_user():
    conn = ldap.open(hostname)
    pwd = getpass.getpass("ldap bind password:")
    conn.simple_bind_s(admin_dn_part + "," + base_dn, pwd)

    common_attrs = {
        'objectClass': ['top', 'inetOrgPerson', 'kolabInetOrgPerson'],
        'kolabHomeServer': ['neso.test.hq'],
        'kolabInvitationPolicy': ['ACT_MANUAL'],
        }

    users =  [("test%d" % n, "auto", "autotest%d" % n)
              for n in range(num_users)]
    for sn, givenName, mailuid in users:
        descr = common_attrs.copy()
        cn = givenName + " " + sn
        descr["cn"] = [cn]
        descr["givenName"] = [givenName]
        descr["sn"] = [sn]
        descr["mail"] = descr["uid"] = [mailuid + "@" + mail_domain]
        dn = "cn=" + cn + "," + base_dn
        print dn, descr
        print conn.add_s(dn, ldap.modlist.addModlist(descr))


add_user()


From cvs at intevation.de  Mon Apr 18 22:46:46 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Apr 18 22:46:48 2005
Subject: steffen: server/kolabd kolabd.spec,1.38,1.39 
Message-ID: <20050418204646.B9E6D1006C6@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd
In directory doto:/tmp/cvs-serv7907

Modified Files:
	kolabd.spec 
Log Message:
fix for Issue706 (kolabpassword for calendar and nobody broken)

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- kolabd.spec	12 Apr 2005 12:12:56 -0000	1.38
+++ kolabd.spec	18 Apr 2005 20:46:44 -0000	1.39
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050412
+Release:      20050418
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz


From cvs at intevation.de  Mon Apr 18 22:46:46 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Apr 18 22:46:48 2005
Subject: steffen: server/kolabd/kolabd kolabpasswd,1.6,1.7 
Message-ID: <20050418204646.BC9651006C8@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv7907/kolabd

Modified Files:
	kolabpasswd 
Log Message:
fix for Issue706 (kolabpassword for calendar and nobody broken)

Index: kolabpasswd
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabpasswd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabpasswd	23 Dec 2004 20:34:08 -0000	1.6
+++ kolabpasswd	18 Apr 2005 20:46:44 -0000	1.7
@@ -93,6 +93,7 @@
 my $tmp = new File::Temp( TEMPLATE => 'tempXXXXX', DIR => $kolab_prefix.'/etc/kolab', UNLINK => 0, SUFFIX => '.conf')
      || die "Error: could not create temporary file under ".$kolab_prefix."/etc/kolab";
 $tmpfilename = $tmp->filename;
+$bind_pw_hash = hashPassword($new_password);
 
 # copy and replace old config to temporary file
 foreach ($kolabconf->getlines()) {
@@ -101,7 +102,6 @@
 	    print $tmp $1.$new_password."\n";
 	} else {
 	    if (/^(bind_pw_hash\s:\s).*$/) {
-		$bind_pw_hash = hashPassword($new_password);
 		print $tmp $1.$bind_pw_hash."\n"; 
 	    } else {
 		print $tmp $_;


From cvs at intevation.de  Tue Apr 19 09:36:30 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Apr 19 09:36:31 2005
Subject: bernhard: doc/www/src index.html.m4,1.46,1.47 
Message-ID: <20050419073630.B8B9C1006DD@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/www/src
In directory doto:/tmp/cvs-serv23577

Modified Files:
	index.html.m4 
Log Message:
Added news for German installation tutorial by activemedia.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- index.html.m4	6 Apr 2005 16:47:44 -0000	1.46
+++ index.html.m4	19 Apr 2005 07:36:28 -0000	1.47
@@ -37,6 +37,22 @@
March 26th, 2005 » Kolab 2 Server beta 4 available
+ + +
Aprill 19th, 2005» +German Install Tutorial contributed +
+
+For German readers the new +Kolab2 Installationsanleitung +describes how to setup the server and clients +and has many screenshots. +It was contributed by Giovanni Baroni from activmedia. +
+

+ +
April 6th, 2005 » Sync Kolab beta 0.4.0 for Thunderbird @@ -44,7 +60,7 @@

Today the 0.4.0 beta version of -Sync Kolab +Sync Kolab for was announced. This Thunderbird plugin is compatible with the old Kolab1 storage format and allows to sync contacts, events and tasks. The author Niko Berger is seeking feedback on the Kolab-users list From cvs at intevation.de Tue Apr 19 12:59:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 19 12:59:25 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.84,1.85 Message-ID: <20050419105924.5D8F01006B8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv28174 Modified Files: perl-kolab.spec Log Message: prevent endless loop if subst. value is @@@attr@@@ Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- perl-kolab.spec 9 Apr 2005 01:13:56 -0000 1.84 +++ perl-kolab.spec 19 Apr 2005 10:59:22 -0000 1.85 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 20050407 +Release: 20050419 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Tue Apr 19 12:59:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 19 12:59:25 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.49,1.50 Message-ID: <20050419105924.6264F1006BC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv28174/Kolab-Conf Modified Files: Conf.pm Log Message: prevent endless loop if subst. value is @@@attr@@@ Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- Conf.pm 20 Jan 2005 22:33:48 -0000 1.49 +++ Conf.pm 19 Apr 2005 10:59:22 -0000 1.50 @@ -168,6 +168,7 @@ $val = $Kolab::config{$attr}; } 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}//; From cvs at intevation.de Wed Apr 20 10:43:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 20 10:43:23 2005 Subject: bernhard: doc/www/src about-kolab-clients.html.m4,1.6,1.7 Message-ID: <20050420084321.D1E5D101EEE@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv19288 Modified Files: about-kolab-clients.html.m4 Log Message: Update: Toltec status. Minor text improvements. Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- about-kolab-clients.html.m4 15 Mar 2005 08:59:09 -0000 1.6 +++ about-kolab-clients.html.m4 20 Apr 2005 08:43:19 -0000 1.7 @@ -29,9 +29,9 @@

Clients for Kolab-2

-These are clients compatible with Kolab-2 where the Kolab -developers are directly involved or where a close cooperation -with the Kolab developers happens. +The following software fulfills the client criteria of Kolab-2. +In addition people from the Kolab project are directly involved +or there is a close cooperation.

KDE Client for Kolab-2

@@ -44,7 +44,7 @@ Status: Beta

-The Kolab Groupware Project is working on a KDE Client which +The Kolab Project is working on a KDE Client which is based on Kontact and its components. All developments are contributed to the KDE project. Our improvements find their way into the main developments at the pace of the KDE project. @@ -69,7 +69,7 @@ src="images/toltec-logo.png" align="right"> License: proprietary
-Status: Beta +Status: Release Candidate

The Toltec Connector 2
@@ -79,8 +79,8 @@ in cooperation with the Toltec developers.

-The upcoming Version 2 supports the Kolab-XML Storage format and -has been tested to be compatible with the CryptoEx Plugin for S/MIME. +Toltec versions 2 support the Kolab-XML Storage format and +have seen tests to be compatible with the CryptoEx Plugin for S/MIME.

Horde Webmail

From cvs at intevation.de Wed Apr 20 10:48:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 20 10:48:23 2005 Subject: bernhard: doc/www/src about-kolab-clients.html.m4,1.7,1.8 Message-ID: <20050420084823.2119D101EF1@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv19414 Modified Files: about-kolab-clients.html.m4 Log Message: Added: Sync Kolab Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- about-kolab-clients.html.m4 20 Apr 2005 08:43:19 -0000 1.7 +++ about-kolab-clients.html.m4 20 Apr 2005 08:48:21 -0000 1.8 @@ -18,6 +18,7 @@

Other Kolab-related Clients
+  Thunderbird Plugin: Sync Kolab
  Outlook Plugin: Konsec Konnektor
  Aethera
  Outlook Plugin: Bynari v2
@@ -168,6 +169,16 @@ These are products not tested by the Kolab developers. + + +

Thunderbird Plugin: Sync Kolab

+ + +License: Same as Thunderbird
+Status: In Development +Homepage: http://www.gargan.org/extensions/synckolab.html +

Outlook Plugin: Konsec Konnektor

From cvs at intevation.de Wed Apr 20 12:51:29 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 20 12:51:30 2005 Subject: bernhard: doc/architecture server.sgml,1.34,1.35 Message-ID: <20050420105129.D1FAA101EFF@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv21571 Modified Files: server.sgml Log Message: Fixed SGML bugs that Martin had introduced in rev 1.34. Index: server.sgml =================================================================== RCS file: /kolabrepository/doc/architecture/server.sgml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- server.sgml 18 Mar 2005 02:07:03 -0000 1.34 +++ server.sgml 20 Apr 2005 10:51:27 -0000 1.35 @@ -1467,7 +1467,13 @@ - The reconstruct program can be used to recover from corruption in mailbox directories. If reconstruct can find existing header and index files, it attempts to preserve any data in them that is not derivable from the message files themselves. The state reconstruct attempts to preserve includes the flag names, flag state, and internal date. Reconstruct derives all other information from the message files. + The reconstruct program can be used to recover from +corruption in mailbox directories. If reconstruct can +find existing header and index files, it attempts to preserve any data in them +that is not derivable from the message files themselves. The state +reconstruct attempts to preserve includes the flag names, +flag state, and internal date. It derives all other information from the +message files. An administrator may recover from a damaged disk by restoring message files from a backup and then running reconstruct to regenerate what it can of the other files. @@ -1495,7 +1501,7 @@ The LDIF file obtained from slapcat can be easily added to an otherwise empty LDAP server using slapadd. -Please note that the LDIF file generated by slapcat is suitable for use with slapadd but not ldapadd. As the entries are in database order, not superior first order, they cannot be loaded with ldapadd without first being reordered. +Please note that the LDIF file generated by slapcat is suitable for use with slapadd but not ldapadd. As the entries are in database order, not superior first order, they cannot be loaded with ldapadd without first being reordered. In case uninterrupted operation of the directory server is required you can simply replicate the directory server to a slave server setup. It is then save to stop the slave during the backup operation without interrupting the main LDAP directory service. From cvs at intevation.de Wed Apr 20 13:10:56 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 20 13:10:57 2005 Subject: bernhard: doc/architecture server.sgml,1.35,1.36 Message-ID: <20050420111056.04B611005BA@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv21949 Modified Files: server.sgml Log Message: Added information that kolabpasswd can change calendar and nobody users, too. Index: server.sgml =================================================================== RCS file: /kolabrepository/doc/architecture/server.sgml,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- server.sgml 20 Apr 2005 10:51:27 -0000 1.35 +++ server.sgml 20 Apr 2005 11:10:53 -0000 1.36 @@ -1588,15 +1588,27 @@ services not to start... - Changing Manager password + Changing Manager/calendar/nobody password -The manager password on a Kolab server can be changed using the kolabpasswd command. +The manager password on a Kolab server can be changed +using the kolabpasswd command like this. - -#kolabpasswd - + +#/kolab/bin/kolabpasswd + -Please note that in a Kolab multi-location setup the manager password must be changed on each individual node seperately. +The system passwords for calendar and nobody are internal only, +so they are rarely changed. Nevertheless kolabpassword is also able +to change these with: + + +#/kolab/bin/kolabpasswd calendar +#/kolab/bin/kolabpasswd nobody + + + +Please note that in a Kolab multi-location setup the passwords +must be changed on each individual node seperately. From cvs at intevation.de Wed Apr 20 19:20:09 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 20 19:20:10 2005 Subject: bernhard: doc/proko2-doc doc2.sxw,1.62,1.63 Message-ID: <20050420172009.0E1A41005AD@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/proko2-doc In directory doto:/tmp/cvs-serv9367 Modified Files: doc2.sxw Log Message: Added: Description of vacation optione: react to email from one maildomain. Index: doc2.sxw =================================================================== RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 Binary files /tmp/cvsuOFOOk and /tmp/cvsDOpFxo differ From cvs at intevation.de Thu Apr 21 00:13:34 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 21 00:13:35 2005 Subject: steffen: server/kolabd/kolabd kolab.globals,1.1.1.1,1.2 Message-ID: <20050420221334.9E19B1005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv18666/kolabd Modified Files: kolab.globals Log Message: make interface kolabd is listening to configurable -- warning, use non-default values with caution Index: kolab.globals =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- kolab.globals 23 Nov 2004 20:26:47 -0000 1.1.1.1 +++ kolab.globals 20 Apr 2005 22:13:32 -0000 1.2 @@ -18,6 +18,8 @@ sf_field_modified : modifytimestamp sf_field_quota : cyrus-userquota sf_object_class : kolabsharedfolder +slurpd_addr : 127.0.0.1 +slurpd_accept_addr : 127.0.0.1 slurpd_port : 9999 uid : freebusy userPassword : freebusy From cvs at intevation.de Thu Apr 21 00:13:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 21 00:13:55 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend Backend.pm,1.2,1.3 Message-ID: <20050420221353.BE24C1005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend In directory doto:/tmp/cvs-serv18716/Kolab-LDAP-Backend Modified Files: Backend.pm Log Message: make interface kolabd is listening to configurable -- warning, use non-default values with caution Index: Backend.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend/Backend.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Backend.pm 18 Mar 2005 07:58:53 -0000 1.2 +++ Backend.pm 20 Apr 2005 22:13:51 -0000 1.3 @@ -68,7 +68,8 @@ Kolab::log('B', "Loading backend `$backend'"); unless (eval "require Kolab::LDAP::Backend::$backend") { - Kolab::log('B', "Backend `$backend' does not exist, exiting", KOLAB_ERROR); + Kolab::log('B', "Error is: $@", KOLAB_ERROR) if $@; + Kolab::log('B', "Backend `$backend' does not exist or has errors, exiting", KOLAB_ERROR); exit(1); } From cvs at intevation.de Thu Apr 21 00:13:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 21 00:13:55 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm, 1.12, 1.13 Message-ID: <20050420221353.C571D1006B3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd In directory doto:/tmp/cvs-serv18716/Kolab-LDAP-Backend-slurpd Modified Files: slurpd.pm Log Message: make interface kolabd is listening to configurable -- warning, use non-default values with caution Index: slurpd.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/slurpd.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- slurpd.pm 7 Nov 2004 23:07:27 -0000 1.12 +++ slurpd.pm 20 Apr 2005 22:13:51 -0000 1.13 @@ -3,7 +3,7 @@ ## ## Copyright (c) 2003 Code Fusion cc ## -## Writen by Stuart Bingë +## Writen by Stuart Bing? ## Portions based on work by the following people: ## ## (c) 2003 Tassilo Erlewein @@ -233,19 +233,20 @@ my $pdu; my $changes = 0; - my $port = $Kolab::config{'slurpd_port'}; + my $listenport = $Kolab::config{'slurpd_port'}; + my $listenaddr = $Kolab::config{'slurpd_addr'} || "127.0.0.1"; TRYCONNECT: - Kolab::log('SD', "Opening listen server on port $port"); + Kolab::log('SD', "Opening listen server on $listenaddr:$listenport"); $server = IO::Socket::INET->new( - LocalPort => $port, + LocalPort => $listenport, Proto => "tcp", ReuseAddr => 1, Type => SOCK_STREAM, - LocalAddr => "127.0.0.1", + LocalAddr => $listenaddr, Listen => 10 ); if (!$server) { - Kolab::log('SD', "Unable to open TCP listen server on port $port, Error = $@", KOLAB_ERROR); + Kolab::log('SD', "Unable to open TCP listen server on $listenaddr:$listenport, Error = $@", KOLAB_ERROR); sleep 1; goto TRYCONNECT; } @@ -253,9 +254,17 @@ Kolab::log('SD', 'Listen server opened, waiting for incoming connections'); while ($conn = $server->accept()) { - # PENDING: Only accept connections from localhost and + # PENDING: Only accept connections from localhost and # hosts listed in the kolabhost attribute - Kolab::log('SD', 'Incoming connection accepted'); + + my($peerport, $peeraddr) = sockaddr_in($conn->peername); + $peeraddr = inet_ntoa( $peeraddr ); + Kolab::log('SD', "Incoming connection accepted, peer=$peeraddr"); + if( $Kolab::config{'slurpd_accept_addr'} && $peeraddr ne $Kolab::config{'slurpd_accept_addr'} ) { + Kolab::log('SD', "Unauthorized connection from $peeraddr, closing connection", KOLAB_WARN); + $conn->close; + undef $conn; + } my $select = IO::Select->new($conn); @@ -290,7 +299,7 @@ $request = $LDAPRequest->decode($pdu); if (!$request) { Kolab::log('SD', "Unable to decode slurpd request, Error = `" . $LDAPRequest->error . "'", KOLAB_ERROR); - $conn->close; + $conn->close if $conn; undef $conn; undef $pdu; } else { @@ -347,7 +356,7 @@ =head1 AUTHOR -Stuart Bingë, Es.binge@codefusion.co.zaE +Stuart Bing묠Es.binge@codefusion.co.zaE =head1 COPYRIGHT AND LICENSE From cvs at intevation.de Thu Apr 21 00:40:50 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 21 00:40:51 2005 Subject: steffen: server/imapd imapd-goodchars.diff,NONE,1.1 Message-ID: <20050420224050.236181005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv19340 Added Files: imapd-goodchars.diff Log Message: "GOODCHAR" patch from Wesley Craig in for testing (issue571) --- NEW FILE: imapd-goodchars.diff --- --- cyrus-imapd-2.2.10/imap/imapd.c 2004-11-17 17:29:03.000000000 -0500 +++ cyrus-imapd-2.2.10p0/imap/imapd.c 2004-12-06 15:23:59.000000000 -0500 @@ -3920,10 +3920,12 @@ } } +#ifdef notdef /* verify that the mailbox doesn't have a wildcard in it */ for (p = oldmailboxname; !r && *p; p++) { if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME; } +#endif /* attempt to rename the base mailbox */ if (!r) { --- cyrus-imapd-2.2.10/imap/mboxlist.c 2004-07-26 14:08:03.000000000 -0400 +++ cyrus-imapd-2.2.10p0/imap/mboxlist.c 2004-12-06 15:23:59.000000000 -0500 @@ -476,10 +476,12 @@ free(acl); return IMAP_PERMISSION_DENIED; } +#ifdef notdef /* disallow wildcards in userids with inboxes. */ if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) { return IMAP_MAILBOX_BADNAME; } +#endif /* * Users by default have all access to their personal mailbox(es), --- cyrus-imapd-2.2.10/imap/mboxname.c 2004-07-13 11:02:08.000000000 -0400 +++ cyrus-imapd-2.2.10p0/imap/mboxname.c 2004-12-06 15:23:59.000000000 -0500 @@ -624,8 +624,13 @@ /* * Apply site policy restrictions on mailbox names. * Restrictions are hardwired for now. - */ + + * original definition #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~" + */ + +#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~" + int mboxname_policycheck(char *name) { unsigned i; From cvs at intevation.de Thu Apr 21 01:09:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 21 01:09:38 2005 Subject: steffen: server/imapd imapd-goodchars.patch, NONE, 1.1 Makefile, 1.21, 1.22 kolab.patch, 1.18, 1.19 imapd-goodchars.diff, 1.1, NONE Message-ID: <20050420230937.B8F141005D2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv20103 Modified Files: Makefile kolab.patch Added Files: imapd-goodchars.patch Removed Files: imapd-goodchars.diff Log Message: "GOODCHAR" patch adapted and integrated --- NEW FILE: imapd-goodchars.patch --- diff -upr ../cyrus-imapd-2.2.12.orig/imap/imapd.c ./imap/imapd.c --- ../cyrus-imapd-2.2.12.orig/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100 +++ ./imap/imapd.c 2005-04-21 00:59:50.865255448 +0200 @@ -3923,10 +3923,12 @@ void cmd_rename(const char *tag, } } +#ifdef notdef /* verify that the mailbox doesn't have a wildcard in it */ for (p = oldmailboxname; !r && *p; p++) { if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME; } +#endif /* attempt to rename the base mailbox */ if (!r) { Kun i ./imap: imapd.c.orig diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c ./imap/mboxlist.c --- ../cyrus-imapd-2.2.12.orig/imap/mboxlist.c 2004-07-26 20:08:03.000000000 +0200 +++ ./imap/mboxlist.c 2005-04-21 00:59:50.874254080 +0200 @@ -476,10 +476,12 @@ mboxlist_mycreatemailboxcheck(char *name free(acl); return IMAP_PERMISSION_DENIED; } +#ifdef notdef /* disallow wildcards in userids with inboxes. */ if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) { return IMAP_MAILBOX_BADNAME; } +#endif /* * Users by default have all access to their personal mailbox(es), diff -upr ../cyrus-imapd-2.2.12.orig/imap/mboxname.c ./imap/mboxname.c --- ../cyrus-imapd-2.2.12.orig/imap/mboxname.c 2005-02-14 07:39:57.000000000 +0100 +++ ./imap/mboxname.c 2005-04-21 00:59:50.879253320 +0200 @@ -649,8 +649,13 @@ int mboxname_netnewscheck(char *name) /* * Apply site policy restrictions on mailbox names. * Restrictions are hardwired for now. - */ + + * original definition #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~" + */ + +#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~" + int mboxname_policycheck(char *name) { unsigned i; Kun i ./imap: mboxname.c.orig Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile 4 Mar 2005 10:41:04 -0000 1.21 +++ Makefile 20 Apr 2005 23:09:35 -0000 1.22 @@ -20,9 +20,11 @@ cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for imapd.spec cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for case insensitive group match + cp $(KOLABCVSDIR)/imapd-goodchars.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for allowing special chars in mailbox names cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/ + - cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes' + cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes' --define 'with_goodchars yes' imapd-$(VERSION)-$(RELEASE).src.rpm: wget -c $(KOLABPKGURI)/imapd-$(VERSION)-$(RELEASE).src.rpm Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imapd/kolab.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- kolab.patch 4 Mar 2005 10:42:21 -0000 1.18 +++ kolab.patch 20 Apr 2005 23:09:35 -0000 1.19 @@ -1,5 +1,5 @@ ---- ../imapd.orig/imapd.spec 2004-07-02 17:17:54.000000000 +0200 -+++ imapd.spec 2004-10-09 00:34:37.000000000 +0200 +--- ../imapd.orig/imapd.spec 2005-02-21 18:02:27.000000000 +0100 ++++ imapd.spec 2005-04-21 00:51:04.705243928 +0200 @@ -3,6 +3,9 @@ ## Copyright (c) 2000-2005 The OpenPKG Project ## Copyright (c) 2000-2005 Ralf S. Engelschall @@ -10,7 +10,7 @@ ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that -@@ -34,13 +37,15 @@ Class: BASE +@@ -34,13 +37,16 @@ Class: BASE Group: Mail License: BSD Version: 2.2.12 @@ -28,20 +28,22 @@ +%option with_drac no +%option with_annotate no +%option with_ldap no ++%option with_goodchars no # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz -@@ -50,6 +55,9 @@ Source3: imapd.conf +@@ -50,6 +56,10 @@ Source3: imapd.conf Source4: fsl.imapd Patch0: imapd.patch Patch1: imapd.patch.group +Patch2: imapd.annotate.patch +Patch3: kolab-ldap.patch +Patch4: imapd.group2.patch ++Patch5: imapd-goodchars.patch # build information Prefix: %{l_prefix} -@@ -62,6 +70,10 @@ PreReq: sasl, db >= 4.1.24, openss +@@ -62,6 +72,10 @@ PreReq: sasl, db >= 4.2.52, openss BuildPreReq: fsl >= 1.2.0 PreReq: fsl >= 1.2.0 %endif @@ -52,7 +54,7 @@ AutoReq: no AutoReqProv: no -@@ -88,6 +100,7 @@ AutoReqProv: no +@@ -88,6 +102,7 @@ AutoReqProv: no %{l_shtool} subst \ -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \ lib/auth_unix.c @@ -60,7 +62,7 @@ %endif %if "%{with_drac}" == "yes" %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch -@@ -95,6 +108,13 @@ AutoReqProv: no +@@ -95,6 +110,16 @@ AutoReqProv: no sleep 1 touch configure %endif @@ -69,6 +71,9 @@ +%endif +%if "%{with_ldap}" == "yes" + %patch -p0 -P 3 ++%endif ++%if "%{with_goodchars}" == "yes" ++ %patch -p1 -P 5 +%endif + %{l_shtool} subst \ --- imapd-goodchars.diff DELETED --- From cvs at intevation.de Fri Apr 22 03:34:54 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 03:34:56 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php, 1.11, 1.12 Message-ID: <20050422013454.AC4941005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv27784/kolab-webadmin/www/admin/user Modified Files: index.php Log Message: we really only care about kolabusers Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- index.php 11 Mar 2005 09:11:15 -0000 1.11 +++ index.php 22 Apr 2005 01:34:52 -0000 1.12 @@ -1,5 +1,6 @@ @@ -86,7 +87,7 @@ default: $alphalimit = ''; } } - $filter = "(&($userfilter)$alphalimit(objectclass=inetOrgPerson)(uid=*)(mail=*)(sn=*))"; + $filter = "(&($userfilter)$alphalimit(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))"; $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabDeleteflag' )); if( $result ) { From cvs at intevation.de Fri Apr 22 03:37:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 03:37:19 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.85,1.86 Message-ID: <20050422013718.AD1C91005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv27831 Modified Files: perl-kolab.spec Log Message: new feature Issue721 Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- perl-kolab.spec 19 Apr 2005 10:59:22 -0000 1.85 +++ perl-kolab.spec 22 Apr 2005 01:37:16 -0000 1.86 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 20050419 +Release: 20050421 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Fri Apr 22 03:37:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 03:37:20 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.27,1.28 Message-ID: <20050422013718.B27DC1006B0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv27831/Kolab-LDAP Modified Files: LDAP.pm Log Message: new feature Issue721 Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- LDAP.pm 23 Mar 2005 11:53:21 -0000 1.27 +++ LDAP.pm 22 Apr 2005 01:37:16 -0000 1.28 @@ -1,9 +1,11 @@ package Kolab::LDAP; ## +## Copyright (c) 2005 Klaralvdalens Datakonsult AB ## Copyright (c) 2003 Code Fusion cc ## -## Writen by Stuart Bing? +## Writen by Stuart Bingë +## Steffen Hansen ## ## This program is free software; you can redistribute it and/or ## modify it under the terms of the GNU General Public License as @@ -380,12 +382,50 @@ return 0; } if( lc ($Kolab::config{'is_master'}) eq 'true' && ref($del) eq 'ARRAY' && scalar(@$del) == 1 ) { - # Ok we are the last one and the master - Kolab::log('L', "Removing DN `$dn'"); - my $mesg = $masterldap->delete($dn); - if ($mesg && $mesg->code ) { - Kolab::log('L', "Unable to remove DN `$dn': ".$mesg->error, KOLAB_WARN); - } + # Ok we are the last one and the master + if( $Kolab::config{'kolab_remove_objectclass'} ) { + # Remove the kolab-related objectClasses + # Some people find it useful to integrate Kolab + # with an existing LDAP database and when a Kolab + # object is to be deleted, it should just remove + # the Kolab stuff and leave the rest of the object + # in the database. + # + # This is what we do here. + # Warning: All attributes in the kolab-related + # objectclasses will be deleted! + # + # PENDING(steffen): Only remove attributes that _have_ to + # be removed. + Kolab::log('L', "Removing Kolab objectClasses from DN `$dn'"); + my $schema = $masterldap->schema( $dn ); + foreach my $c qw(kolabInetOrgPerson kolabGroupOfNames) { + my @may = map $_->{name}, $schema->may($c); + my @must = map $_->{name}, $schema->must($c); + foreach my $attr (@must,@may,split(' ',$Kolab::config{'kolab_remove_attributes'})) { + # Remove attributes + Kolab::log('L', "Removing attribute $attr", KOLAB_WARN); + my $mesg = $masterldap->modify( $dn, + delete => $attr ); + if ($mesg && $mesg->code ) { + Kolab::log('L', "Unable to remove attribute $attr from DN `$dn': ".$mesg->error, KOLAB_WARN); + } + } + # Remove objectClass + my $mesg = $masterldap->modify( $dn, + delete => { 'objectClass' => $c } ); + if ($mesg && $mesg->code ) { + Kolab::log('L', "Unable to remove Kolab objectClas $_ from DN `$dn': ".$mesg->error, KOLAB_WARN); + } + } + } else { + # Default behaviour, delete the object + Kolab::log('L', "Removing DN `$dn'"); + my $mesg = $masterldap->delete($dn); + if ($mesg && $mesg->code ) { + Kolab::log('L', "Unable to remove DN `$dn': ".$mesg->error, KOLAB_WARN); + } + } } elsif( lc ($Kolab::config{'is_master'}) eq 'false' ) { # Just remove us from the kolabdeleteflag # master does not perform this step as it should From cvs at intevation.de Fri Apr 22 03:45:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 03:45:36 2005 Subject: steffen: server/kolabd kolabd.spec,1.39,1.40 Message-ID: <20050422014535.12C201005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv27956 Modified Files: kolabd.spec Log Message: new feature Issue721 Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- kolabd.spec 18 Apr 2005 20:46:44 -0000 1.39 +++ kolabd.spec 22 Apr 2005 01:45:33 -0000 1.40 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050418 +Release: 20050421 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Fri Apr 22 03:45:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 03:45:36 2005 Subject: steffen: server/kolabd/kolabd kolabdcachetool,1.1.1.1,1.2 Message-ID: <20050422014535.189D41006B0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv27956/kolabd Modified Files: kolabdcachetool Log Message: new feature Issue721 Index: kolabdcachetool =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabdcachetool,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- kolabdcachetool 23 Nov 2004 20:26:47 -0000 1.1.1.1 +++ kolabdcachetool 22 Apr 2005 01:45:33 -0000 1.2 @@ -37,7 +37,7 @@ my ($guid, $ts); foreach $guid (keys %db) { - $sorted{ + #$sorted{ $ts = ""; $ts = ", deleted " . strftime("%F %T", localtime($db2{$guid})) if exists($db2{$guid}); print "GUID: `$guid', mailbox: `" . $db{$guid} . "'$ts\n"; From cvs at intevation.de Fri Apr 22 03:45:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 03:45:37 2005 Subject: steffen: server/kolabd/kolabd/doc README.ldapdelete,NONE,1.1 Message-ID: <20050422014535.1D1011006B1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/doc In directory doto:/tmp/cvs-serv27956/kolabd/doc Added Files: README.ldapdelete Log Message: new feature Issue721 --- NEW FILE: README.ldapdelete --- Removal of LDAP objects ======================= Last edited $Id: README.ldapdelete,v 1.1 2005/04/22 01:45:33 steffen Exp $ Normally, kolabd will remove an account object from the LDAP database that has been marked for deletion after kolabd has performed a cleanup-phase (like deleting the corresponding imap account etc.). If this is not desired, kolabd can instead only remove the Kolab-related objectClasses from a deleted object and leave in non-Kolab-related part of the object in the database after cleanup. This feature can be enabled by setting kolab_remove_objectclass : 1 in kolab.conf. If additional attributes should be removed, they can be listed separated by spaces in kolab_remove_attributes, like for example: kolab_remove_attributes : mail ou Word of warning: Currently, the logic for weeding out the Kolab-parts of an object is quite simplistic -- _all_ attributes in the Kolab-related objectClass are removed. From cvs at intevation.de Fri Apr 22 03:50:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 03:50:22 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.28,1.29 Message-ID: <20050422015021.45DE31005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv28078/Kolab-LDAP Modified Files: LDAP.pm Log Message: new feature Issue721 Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- LDAP.pm 22 Apr 2005 01:37:16 -0000 1.28 +++ LDAP.pm 22 Apr 2005 01:50:19 -0000 1.29 @@ -399,6 +399,7 @@ # be removed. Kolab::log('L', "Removing Kolab objectClasses from DN `$dn'"); my $schema = $masterldap->schema( $dn ); + # PENDING(steffen): Dont hardcode objectClasses foreach my $c qw(kolabInetOrgPerson kolabGroupOfNames) { my @may = map $_->{name}, $schema->may($c); my @must = map $_->{name}, $schema->must($c); From cvs at intevation.de Fri Apr 22 04:01:38 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 04:01:39 2005 Subject: steffen: server/imapd kolab.patch,1.19,1.20 Message-ID: <20050422020138.0552E1005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv28208 Modified Files: kolab.patch Log Message: version Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imapd/kolab.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- kolab.patch 20 Apr 2005 23:09:35 -0000 1.19 +++ kolab.patch 22 Apr 2005 02:01:35 -0000 1.20 @@ -15,7 +15,7 @@ License: BSD Version: 2.2.12 -Release: 2.3.0 -+Release: 2.3.0_kolab ++Release: 2.3.0_kolab2 # package options -%option with_fsl yes From cvs at intevation.de Fri Apr 22 04:03:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 04:03:50 2005 Subject: steffen: server obmtool.conf,1.153,1.154 Message-ID: <20050422020348.D9A811005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv28256 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.153 retrieving revision 1.154 diff -u -d -r1.153 -r1.154 --- obmtool.conf 12 Apr 2005 12:32:33 -0000 1.153 +++ obmtool.conf 22 Apr 2005 02:03:46 -0000 1.154 @@ -73,9 +73,9 @@ @install ${loc}perl-www-5.8.5-2.2.0 @install ${loc}imap-2004a-2.2.0 @install ${loc}procmail-3.22-2.2.0 - @install ${loc}pth-2.0.2-2.2.0 + @install ${loc}pth-2.0.4-2.3.0 @install ${loc}db-4.2.52.2-2.2.0 - @install ${loc}openldap-2.2.17-2.2.0 + @install ${loc}openldap-2.2.23-2.3.0 @install ${loc}sasl-2.1.19-2.2.1 --with=ldap --with=login @install ${loc}getopt-20030307-2.2.0 @install ${loc}proftpd-1.2.10-2.2.0 --with=ldap @@ -84,8 +84,8 @@ @install ${altloc}postfix-2.1.5-2.2.0_kolab --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 - @install ${altloc}perl-kolab-5.8.5-20050407 - @install ${altloc}imapd-2.2.12-2.3.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist + @install ${altloc}perl-kolab-5.8.5-20050421 + @install ${altloc}imapd-2.2.12-2.3.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars @install ${loc}m4-1.4.2-2.2.0 @install ${loc}bison-1.35-2.2.0 @install ${loc}flex-2.5.4a-2.2.0 @@ -131,8 +131,8 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050412 --without=genuine - @install ${altloc}kolab-webadmin-0.4.0-20050412 + @install ${altloc}kolabd-1.9.4-20050421 --without=genuine + @install ${altloc}kolab-webadmin-0.4.0-20050422 @install ${altloc}kolab-resource-handlers-0.3.9-20050412 @check From cvs at intevation.de Fri Apr 22 08:58:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 08:58:23 2005 Subject: jan: doc/raw-howtos kolab2-on-sles9.txt,1.1,1.2 Message-ID: <20050422065822.CFFD7101FA4@lists.intevation.de> Author: jan Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv1477 Modified Files: kolab2-on-sles9.txt Log Message: Added keyserver details. Index: kolab2-on-sles9.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/kolab2-on-sles9.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab2-on-sles9.txt 18 Apr 2005 13:57:38 -0000 1.1 +++ kolab2-on-sles9.txt 22 Apr 2005 06:58:20 -0000 1.2 @@ -28,7 +28,8 @@ In case you do not yet have the packaging key of Kolab Konsortium, you can download it from this address: http://www.kolab-konsortium.de/kolab-konsortium-package.key.asc -(It has also been send to subkeys.pgp.net) +or from a key-server: + # gpg --keyserver subkeys.pgp.net --recv-keys 133a8928 # gpg --verify md5sums.txt.gpg # md5sum * | grep -v md5sum > /tmp/md5sums From cvs at intevation.de Fri Apr 22 09:42:34 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 09:42:35 2005 Subject: jan: doc/raw-howtos kolab-kde-client-on-suse91p.txt,NONE,1.1 Message-ID: <20050422074234.2D15C101FA5@lists.intevation.de> Author: jan Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv3055 Added Files: kolab-kde-client-on-suse91p.txt Log Message: Getting started with Kolab KDE Client on a SUSE 9.1 Professional. --- NEW FILE: kolab-kde-client-on-suse91p.txt --- Getting started with Kolab KDE Client on a SUSE 9.1 Professional ---------------------------------------------------------------- $Id: kolab-kde-client-on-suse91p.txt,v 1.1 2005/04/22 07:42:32 jan Exp $ Status: - description on how to install the prepared package set "kolab2.0-kdepim3.3-aegypten2.0-client" version 1.0.0. It covers the kdepim poko2 branch client for Kolab-2 and all Ägypten-2 components for SMIME/Sphinx email-encryption. Also included are the german translations. - tested as a initial installation on a fresh SUSE 9.1P with online-updates as of 20050420. - some steps are in german First login to SUSE 9.1P as root, then follow the instructions below. You may adapt the steps on your own needs and expertise. 1. Get the packages (In case you want to install multiple sytems you should maintain a local copy somewhere in your network.) # mkdir /tmp/kolab-download # cd /tmp/kolab-download Get all files in the directory kde-client/ix86-suse91p/kolab2.0-kdepim3.3-aegypten2.0-client/ (This directory is a symbolic link to the current version.) from one of the Kolab mirrors listed here: http://kolab.org/mirrors.html Just for a installation you need only what is in i586 and noarch. 2. Check the signature of Kolab-Konsortium In case you do not yet have the packaging key of Kolab Konsortium, you can download it from this address: http://www.kolab-konsortium.de/kolab-konsortium-package.key.asc or from a key-server: # gpg --keyserver subkeys.pgp.net --recv-keys 133a8928 For each directory of i586, noarch, srpms: # gpg --verify md5sums.txt.gpg # md5sum * | grep -v md5sum > /tmp/md5sums # diff /tmp/md5sums md5sums.txt (For those who wonder why we did not sign the rpm packages directly: SUSEs genIS_PLAINcache can't handle this) 4. Install Kolab KDE Client # cd /tmp/kolab-download # rpm -U noarch/kde3-i18n-de-3.2.1.proko2.0.beta2-0.noarch.rpm (SUSEs genIS_PLAINcache can't handle noarch) # yast Installation steps within yast only in german available: Bei yast unter "Software->Installationquelle wechseln" »···ein neues Software-Quellmedium (lokales Dateisystem) hinzufügen und aktivieren: /tmp/kolab-download/i586 »···Anschliessend den Status dieses neuen Eintrages aktualisieren. »···In yast unter "Sofware->Installieren oder löschen" das »···Paket "kolab2.0-kdepim3.3-aegypten2.0-client" selektieren »···und installieren. 5. Configuration New users should run "kolabwizard" first. Ask you Kolab Server administrator on what to enter. Note: If you started kmail already at least once you should now enter "kcontrol" and perform the following changes: KDE-Komponenten/KDE-Ressourcen: Remove the resources not related to Kolab in each tab. Then run "kontact" and make a sync. All folders will be created for you now. 6. Known issues of version 1.0.0: - Icons for Kleopatra, KolabWizard and Kontact are missing in the menu. These tools have to execute from a shell window or personal icons have to be created. - KMail icon in toobar not yet starting kontact. - Ägypten-2 creates debug files in the directory from where kontact or kmail is started (dbgmd-000*). - A more sensible pre-definition of the certificate status within Kleopatra. - Some already fixed bugs in Ägypten-2 (especially keyIdentifier support). From cvs at intevation.de Fri Apr 22 11:11:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 11:11:12 2005 Subject: bernhard: doc/raw-howtos kolab-kde-client-on-suse91p.txt,1.1,1.2 Message-ID: <20050422091111.4F7E9101FAA@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv5128 Modified Files: kolab-kde-client-on-suse91p.txt Log Message: Added the latest keyserver recommendation and fixed a few formatting and language problem by the way. Index: kolab-kde-client-on-suse91p.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/kolab-kde-client-on-suse91p.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab-kde-client-on-suse91p.txt 22 Apr 2005 07:42:32 -0000 1.1 +++ kolab-kde-client-on-suse91p.txt 22 Apr 2005 09:11:09 -0000 1.2 @@ -6,12 +6,12 @@ Status: - description on how to install the prepared package set "kolab2.0-kdepim3.3-aegypten2.0-client" version 1.0.0. - It covers the kdepim poko2 branch client for Kolab-2 and all - Ägypten-2 components for SMIME/Sphinx email-encryption. - Also included are the german translations. + It covers the KDEPIM proko2 branch client for Kolab-2 and all + Ägypten-2 components for SMIME/Sphinx email-encryption. + The German localisation is included. - tested as a initial installation on a fresh SUSE 9.1P with online-updates as of 20050420. - - some steps are in german + - some steps are in German First login to SUSE 9.1P as root, then follow the instructions @@ -41,7 +41,7 @@ Kolab Konsortium, you can download it from this address: http://www.kolab-konsortium.de/kolab-konsortium-package.key.asc or from a key-server: - # gpg --keyserver subkeys.pgp.net --recv-keys 133a8928 + # gpg --keyserver random.sks.keyserver.penguin.de --recv-keys 133a8928 For each directory of i586, noarch, srpms: @@ -63,39 +63,39 @@ Installation steps within yast only in german available: Bei yast unter "Software->Installationquelle wechseln" -»···ein neues Software-Quellmedium (lokales Dateisystem) + ein neues Software-Quellmedium (lokales Dateisystem) hinzufügen und aktivieren: /tmp/kolab-download/i586 -»···Anschliessend den Status dieses neuen Eintrages aktualisieren. + Anschliessend den Status dieses neuen Eintrages aktualisieren. -»···In yast unter "Sofware->Installieren oder löschen" das -»···Paket "kolab2.0-kdepim3.3-aegypten2.0-client" selektieren -»···und installieren. + In yast unter "Sofware->Installieren oder löschen" das + Paket "kolab2.0-kdepim3.3-aegypten2.0-client" selektieren + und installieren. 5. Configuration -New users should run "kolabwizard" first. Ask you Kolab Server -administrator on what to enter. +New users should run "kolabwizard" first. +Ask the administration of your Kolab Server about what to enter. -Note: If you started kmail already at least once you should +Note: If you have started KMail or Kontact before, at least once you should now enter "kcontrol" and perform the following changes: KDE-Komponenten/KDE-Ressourcen: Remove the resources not related to Kolab in each tab. -Then run "kontact" and make a sync. All folders will be created -for you now. +Then run "kontact" and make a sync. +All folders will be created for you now. 6. Known issues of version 1.0.0: - Icons for Kleopatra, KolabWizard and Kontact are missing in the menu. - These tools have to execute from a shell window or personal - icons have to be created. -- KMail icon in toobar not yet starting kontact. + These tools can be executed from a shell or a user can create + personal menu items for them. +- The KMail icon in toolbar does not yet start Kontact. - Ägypten-2 creates debug files in the directory from where kontact or kmail is started (dbgmd-000*). - A more sensible pre-definition of the certificate status - within Kleopatra. + within Kleopatra is missing. - Some already fixed bugs in Ägypten-2 (especially keyIdentifier - support). + support) need to be incoporated in the packages. From cvs at intevation.de Fri Apr 22 18:29:03 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 18:29:05 2005 Subject: bh: server release-notes.txt,1.3,1.4 Message-ID: <20050422162903.DECA21005DB@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv14183 Modified Files: release-notes.txt Log Message: Update for upcoming beta5 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- release-notes.txt 26 Mar 2005 17:43:49 -0000 1.3 +++ release-notes.txt 22 Apr 2005 16:29:01 -0000 1.4 @@ -1,55 +1,74 @@ Release notes Kolab2 Server -(Version 20050324, Kolab server 2.0 beta 4) +(Version 20050422, Kolab server 2.0 beta 5) For upgrading and installation instructions, please refer to the README.1st file in the source directory. -Changes since Beta 3, 20050309: +Changes since Beta 4, 20050324: - updated obmtool. It's now rev. 1.42 from OpenPKG. + - updated openpkg packages: + openldap-2.2.23-2.3.0 + pth-2.0.4-2.3.0 - - kolabd 20050221 -> 20050318 - Add support for EQUALITY and SUBSTRING to kolab2.schema + - kolabd 20050318 -> 20050421 - Better indexing for OpenLDAP: added pres to ldap db indices. - See README.1st for how this affects an upgrade. + amavisd configuration: A kolab user sending Spam/Virus mails gets + a bounce notification. Mail sent from outside to a kolab user + will, as before, still be held in quarantine and the recipient + will get a notification. + Added support for using a non-kolab ldap server instead of kolab's + own server as master. This includes: + - kolabd can listen to connections from other slurpds + - deletion of ldap objects can be adapted to such setups. - - kolab-resource-handlers 20050221 -> 20050318 + Added some documentation about the amavisd, web-admin and + ldap-deletion configuration options in kolab. - kolab_smtpdpolicy grew an option to check Sender: it if exists - instead of From:. This is turned off by default as it allows - to send emails "on behalf of" without being email-delegate. + Some more ldap indices were added. * Fixing: - Issue648 (resmgr generates empty PFBs for normal users) + Issue647 (Message "perl: No worthy mechs found" fills up logs) + Issue681 (nobody/calendar password for slave) + Issue708 (session storage) + Issue706 (kolabpassword for calendar and nobody broken) - - kolab-webadmin 20050222 -> 20050318 + - kolab-resource-handlers 20050318 -> 20050412 - The web interface is internationalized now. Languages currently - supported are English and German. + Better handling of mails with multiple recipients - Attribute access by normal users is now configurable. - Attributes can be made e.g. read-only, mandatory or invisible. + Main part of a fix for Issue665 (outlook appointment forwarding + not possible with email spoof protection) - Some more vacation settings: - - whether to react to spam - - restrict vacation messages to a specific domain - Updated some texts, email addresses and URLs. + - kolab-webadmin 20050318 -> 20050422 + + It is now configurable which account types can log in to the + web-admin interface. E.g. login can be limited to normal users if + administration is not to be done with the admin interface. + + Some more options for vacation notifications: + - whether to send notifications for messages classified as + spam or virus + - limit notifications to certain domains. * Fixing: - Issue672 (added virusalert@domain.tld and MAILER-DAEMON@domain.tld) - Issue646 (non-ascii chars in names of global folders) + Issue660 (primary email addresses with incorrect maildomain) - - perl-kolab 20050221 -> 20050318 + - perl-kolab 20050318 -> 20050421 * Fixing: + Issue647 (Message "perl: No worthy mechs found" fills up logs) + Issue698 (LDAP Sync can cause mailbox deletion) + + + - imapd imapd-2.2.12-2.3.0_kolab > 2.2.12-2.3.0_kolab2 + + * Fixing: + Issue571 (allow more characters in mailbox names) - Issue656 (re-added a right to shared folder all access) - Issue687 (deletion logic) From cvs at intevation.de Fri Apr 22 18:34:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 18:34:52 2005 Subject: bh: server README.1st,1.7,1.8 Message-ID: <20050422163451.335601005DB@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv14479 Modified Files: README.1st Log Message: Update for upcoming beta5 Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- README.1st 5 Apr 2005 20:10:29 -0000 1.7 +++ README.1st 22 Apr 2005 16:34:49 -0000 1.8 @@ -119,6 +119,14 @@ with a fully stopped server. +Upgrade from Beta4 +------------------ + +Between Beta4 and Beta5 some more openldap indices were added, so the +slapindex call described in "Upgrade from Beta3" has to be repeated. + + + For more information on Kolab, see http://www.kolab.org $Id$ From cvs at intevation.de Fri Apr 22 19:15:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 19:15:02 2005 Subject: bernhard: server release-notes.txt,1.4,1.5 Message-ID: <20050422171501.15ACB1005DB@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv15717 Modified Files: release-notes.txt Log Message: Added cvs id to the bottom. Added issue721 number to feature. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- release-notes.txt 22 Apr 2005 16:29:01 -0000 1.4 +++ release-notes.txt 22 Apr 2005 17:14:59 -0000 1.5 @@ -23,7 +23,7 @@ Added support for using a non-kolab ldap server instead of kolab's own server as master. This includes: - kolabd can listen to connections from other slurpds - - deletion of ldap objects can be adapted to such setups. + - deletion of ldap objects can be adapted to such setups (issue721). Added some documentation about the amavisd, web-admin and ldap-deletion configuration options in kolab. @@ -72,3 +72,4 @@ * Fixing: Issue571 (allow more characters in mailbox names) +$Id$ From cvs at intevation.de Fri Apr 22 19:51:19 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Apr 22 19:51:20 2005 Subject: bh: server README.1st,1.8,1.9 Message-ID: <20050422175119.995411005DB@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv16393 Modified Files: README.1st Log Message: Add some more openldap instructions Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- README.1st 22 Apr 2005 16:34:49 -0000 1.8 +++ README.1st 22 Apr 2005 17:51:17 -0000 1.9 @@ -122,8 +122,17 @@ Upgrade from Beta4 ------------------ -Between Beta4 and Beta5 some more openldap indices were added, so the -slapindex call described in "Upgrade from Beta3" has to be repeated. +Beta5 has a new openldap package. Installing this will replace one of +its configuration files, /kolab/etc/openldap/slapd.conf, with a default +version from the rpm. openldap cannot be started with that version! +Replace the new version with the backup created by rpm: + + mv /kolab/etc/openldap/slapd.conf.rpmsave \ + /kolab/etc/openldap/slapd.conf + +One more ldap change: between Beta4 and Beta5 some more openldap indices +were added, so the slapindex call described in "Upgrade from Beta3" has +to be repeated. From cvs at intevation.de Mon Apr 25 15:46:13 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 25 15:46:15 2005 Subject: bernhard: server/kolabd/kolabd kolab2.schema,1.5,1.6 Message-ID: <20050425134613.F34381006AB@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv12515 Modified Files: kolab2.schema Log Message: Improved the description for kolabDelegate. Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- kolab2.schema 18 Mar 2005 00:29:24 -0000 1.5 +++ kolab2.schema 25 Apr 2005 13:46:11 -0000 1.6 @@ -106,9 +106,10 @@ EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) -# allow delegates to act in your name (vacation/secretary boss use case) -# we use the syntax of rfc822 email addresses in order identify -# users allow to act in the name of others +# Specifies the email delegates. +# An email delegate can send email on behalf on the account +# which means using the "from" of the account. +# Delegates are specified by the syntax of rfc822 email addresses. attributetype ( 1.3.6.1.4.1.19419.1.1.1.3 NAME 'kolabDelegate' DESC 'Kolab user allowed to act as delegates - RFC822 Mailbox/Alias' From cvs at intevation.de Mon Apr 25 15:49:14 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 25 15:49:16 2005 Subject: bernhard: server/kolabd/kolabd kolab2.schema,1.6,1.7 Message-ID: <20050425134914.8A2AA1006AB@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv12580 Modified Files: kolab2.schema Log Message: Typo fixed. Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- kolab2.schema 25 Apr 2005 13:46:11 -0000 1.6 +++ kolab2.schema 25 Apr 2005 13:49:12 -0000 1.7 @@ -107,7 +107,7 @@ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) # Specifies the email delegates. -# An email delegate can send email on behalf on the account +# An email delegate can send email on behalf of the account # which means using the "from" of the account. # Delegates are specified by the syntax of rfc822 email addresses. attributetype ( 1.3.6.1.4.1.19419.1.1.1.3 From cvs at intevation.de Mon Apr 25 18:01:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Apr 25 18:01:06 2005 Subject: bernhard: doc/www/src index.html.m4,1.47,1.48 Message-ID: <20050425160104.649F0100179@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv14848 Modified Files: index.html.m4 Log Message: Added news item about kolab-server-2.0-beta5. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- index.html.m4 19 Apr 2005 07:36:28 -0000 1.47 +++ index.html.m4 25 Apr 2005 16:01:02 -0000 1.48 @@ -37,6 +37,17 @@
+ + +
April 25th, 2005» +Kolab 2 Server beta 5 published. +
+
+The fith beta of Kolab 2 Server comes with minor fixes and improvements. +
+

+ +
Aprill 19th, 2005 » German Install Tutorial contributed From cvs at intevation.de Tue Apr 26 11:52:05 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 26 11:52:06 2005 Subject: bh: server release-notes.txt,1.5,1.6 Message-ID: <20050426095205.8D77E1005A2@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv1035 Modified Files: release-notes.txt Log Message: README.1st is now called 1st.README on the server (not renamed in CVS yet) Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- release-notes.txt 22 Apr 2005 17:14:59 -0000 1.5 +++ release-notes.txt 26 Apr 2005 09:52:03 -0000 1.6 @@ -2,8 +2,8 @@ (Version 20050422, Kolab server 2.0 beta 5) -For upgrading and installation instructions, please refer to the -README.1st file in the source directory. +For upgrading and installation instructions, please refer to the +1st.README file in the source directory. Changes since Beta 4, 20050324: From cvs at intevation.de Tue Apr 26 22:56:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Apr 26 22:56:37 2005 Subject: steffen: server/kolabd/kolabd/doc README.sieve,NONE,1.1 Message-ID: <20050426205635.691061006A4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/doc In directory doto:/tmp/cvs-serv12863 Added Files: README.sieve Log Message: Kolab sieve scripts description --- NEW FILE: README.sieve --- Kolab use of Sieve scripts ========================== Last edited: $Id: README.sieve,v 1.1 2005/04/26 20:56:33 steffen Exp $ Compatibility ------------- The Kolab webgui uses up to 3 sieve scripts with specific name per user: kolab-deliver.siv kolab-forward.siv kolab-vacation.siv Only one script can be active at the time. If the user wants to install a custom sieve script, a name not conflicting with the kolab scripts must be chosen. Each of the 3 scripts must strictly follow the template wrt. linebreaks etc. to be parsable by the kolab webgui and the kolab clients (kontact) as described below: kolab-deliver.siv: ------------------ This script allows the user to deliver all non-scheduling mail to a folder of his choice. require "fileinto"; if header :contains ["X-Kolab-Scheduling-Message"] ["FALSE"] { fileinto ""; } where is the name of the IMAP folder mail should be delivered to. kolab-forward.siv ----------------- This script allows the user to forward his mail to a different mailbox, optionally keep a copy of each message on the server. Without "keep copy on server": redirect ""; With "keep copy on server": redirect "steffen@klaralvdalens-datakonsult.se"; keep; kolab-vacation.siv ------------------ require "vacation"; if not address :domain :contains "From" "" { keep; stop; } if header :contains "X-Spam-Flag" "YES" { keep; stop; } vacation :addresses [ ] :days text: . ; is the vacation message sent out, the number of days to wait before a vacation message can be send to the same recipient again, is a comma-separated list of "-quoted email addresses that the vacation script will answer for, and is a domain name in case the option "Only react to mail coming from domain" is enabled. If this option is not enabled, this entire line of the script should be missing. Similar for the line with "X-Spam-Flag" in it -- it should only be in the script if the user has enabled the option "Do not send vacation replies to spam messages" is enabled. From cvs at intevation.de Wed Apr 27 14:12:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 14:12:47 2005 Subject: david: doc/kde-client/cvs-instructions checkout_kde_i18n_proko2.sh, 1.12, 1.13 Message-ID: <20050427121246.E189C1005DE@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/cvs-instructions In directory doto:/tmp/cvs-serv30226 Modified Files: checkout_kde_i18n_proko2.sh Log Message: kpilot.po/pot branched Index: checkout_kde_i18n_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/cvs-instructions/checkout_kde_i18n_proko2.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- checkout_kde_i18n_proko2.sh 18 Nov 2004 15:14:13 -0000 1.12 +++ checkout_kde_i18n_proko2.sh 27 Apr 2005 12:12:44 -0000 1.13 @@ -5,8 +5,8 @@ cvs up templates/kdepim templates/docs/kdepim de/docs/kdepim de/messages/kdepim de/messages/docs/kdepim -cvs up -rproko2 de/messages/kdepim/{kdepimwizards,kmail,kres_kolab,kio_newimap4,kleopatra,korganizer,libkleopatra,libkdepim,kmail_text_calendar_plugin,kaddressbook,kontact,libkcal}.po -cvs up -rproko2 templates/kdepim/{kdepimwizards,kmail,kres_kolab,kio_newimap4,kleopatra,korganizer,libkleopatra,libkdepim,kmail_text_calendar_plugin,kaddressbook,kontact,libkcal}.pot +cvs up -rproko2 de/messages/kdepim/{kdepimwizards,kmail,kres_kolab,kio_newimap4,kleopatra,korganizer,libkleopatra,libkdepim,kmail_text_calendar_plugin,kaddressbook,kontact,libkcal,kpilot}.po +cvs up -rproko2 templates/kdepim/{kdepimwizards,kmail,kres_kolab,kio_newimap4,kleopatra,korganizer,libkleopatra,libkdepim,kmail_text_calendar_plugin,kaddressbook,kontact,libkcal,kpilot}.pot cvs up -rproko2 templates/docs/kdepim cvs up -rproko2 de/messages/docs/kdepim cvs up -rproko2 de/docs/kdepim/{kmail,kaddressbook,korganizer} From cvs at intevation.de Wed Apr 27 16:25:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 16:25:11 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.116, 1.117 Message-ID: <20050427142510.3EF921005DE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv32169 Modified Files: kolab-resource-handlers.spec Log Message: even more Outlook hacks :-/ (Issue665) Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- kolab-resource-handlers.spec 12 Apr 2005 12:20:45 -0000 1.116 +++ kolab-resource-handlers.spec 27 Apr 2005 14:25:08 -0000 1.117 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050412 +Release: 20050427 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Wed Apr 27 16:25:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 16:25:11 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr olhacks.php, 1.4, 1.5 Message-ID: <20050427142510.4101A1006B4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv32169/kolab-resource-handlers/resmgr Modified Files: olhacks.php Log Message: even more Outlook hacks :-/ (Issue665) Index: olhacks.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- olhacks.php 12 Apr 2005 09:58:49 -0000 1.4 +++ olhacks.php 27 Apr 2005 14:25:08 -0000 1.5 @@ -68,6 +68,32 @@ } } +/* Yet another Outlook problem: Outlook seems to be incapable + * of handling non-ascii characters in forwarded iCal messages. + * As a solution, we encode common characters as humanreadable + * two-letter ascii. + */ +/* static */ function olhacks_recode_to_ascii( $text ) { + myLog("recoding \"$text\"", RM_LOG_DEBUG); + $text = str_replace( ('æ'), 'ae', $text ); + $text = str_replace( ('ø'), 'oe', $text ); + $text = str_replace( ('Ã¥'), 'aa', $text ); + $text = str_replace( ('ä'), 'ae', $text ); + $text = str_replace( ('ö'), 'oe', $text ); + $text = str_replace( ('ü'), 'ue', $text ); + $text = str_replace( ('ß'), 'ss', $text ); + + $text = str_replace( ('Æ'), 'Ae', $text ); + $text = str_replace( ('Ø'), 'Oe', $text ); + $text = str_replace( ('Ã…'), 'Aa', $text ); + $text = str_replace( ('Ä'), 'Ae', $text ); + $text = str_replace( ('Ö'), 'Oe', $text ); + $text = str_replace( ('Ãœ'), 'Ue', $text ); + myLog("recoded to \"$text\"", RM_LOG_DEBUG); + + return $text; +} + /* main entry point */ function olhacks_embedical( $fqhostname, $sender, $recipients, $origfrom, $subject, $tmpfname ) { myLog("Encapsulating iCal message forwarded by $sender", RM_LOG_DEBUG); @@ -98,8 +124,9 @@ $toppart = &new MIME_Message(); $dorigfrom = Mail_mimeDecode::_decodeHeader($origfrom); $textpart = &new MIME_Part('text/plain', sprintf($forwardtext,$dorigfrom,$dorigfrom), 'UTF-8' ); - $msgpart = &new MIME_Part($basepart->getType(), $basepart->transferDecode(), + $msgpart = &new MIME_Part($basepart->getType(), olhacks_recode_to_ascii($basepart->transferDecode()), $basepart->getCharset() ); + $toppart->addPart($textpart); $toppart->addPart($msgpart); From cvs at intevation.de Wed Apr 27 21:47:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 21:47:53 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.15, 1.16 Message-ID: <20050427194751.6808F1005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv8847/kolab-webadmin/kolab-webadmin/www/admin/distributionlist Modified Files: list.php Log Message: mail attribute for kolabGroupOfNames -- its not used for _anything_ internally (Issue533) Index: list.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- list.php 11 Mar 2005 09:11:15 -0000 1.15 +++ list.php 27 Apr 2005 19:47:49 -0000 1.16 @@ -52,6 +52,13 @@ return ''; } +function mail_domain() +{ + global $ldap; + $kolab = $ldap->read( 'k=kolab,'.$_SESSION['base_dn'] ); + return $kolab['postfix-mydomain'][0]; +} + function checkuniquemail( $form, $key, $value ) { global $ldap; if( $key == 'cn' ) { @@ -164,8 +171,11 @@ $ldap_object = array('objectClass' => 'kolabGroupOfNames'); $cn = strtolower(trim($_POST['cn'])); + + // Keep cn and mail in sync $ldap_object['cn'] = $cn; - + $ldap_object['mail'] = $cn.'@'.mail_domain(); + $ldap_object['member'] = array(); $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', trim($_POST['members']) ) ), 'strlen') ); foreach( $lst as $a ) { From cvs at intevation.de Wed Apr 27 21:47:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 21:47:54 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.18, 1.19 Message-ID: <20050427194751.6B375101EF8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service In directory doto:/tmp/cvs-serv8847/kolab-webadmin/kolab-webadmin/www/admin/service Modified Files: index.php Log Message: mail attribute for kolabGroupOfNames -- its not used for _anything_ internally (Issue533) Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- index.php 11 Mar 2005 09:11:15 -0000 1.18 +++ index.php 27 Apr 2005 19:47:49 -0000 1.19 @@ -41,6 +41,7 @@ global $amavis; global $quotawarn; global $freebusypast; + global $postfixmydomain; global $postfixmynetworks; global $postfixallowunauth; global $postfixrelayhost; @@ -62,6 +63,7 @@ $amavis = $attrs['postfix-enable-virus-scan'][0]; $quotawarn = $attrs['cyrus-quotawarn'][0]; $freebusypast = $attrs['kolabFreeBusyPast'][0]; + $postfixmydomain = $attrs['postfix-mydomain'][0]; $postfixmynetworks = $attrs['postfix-mynetworks'][0]; $postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0]; $postfixrelayhost = $attrs['postfix-relayhost'][0]; @@ -94,6 +96,7 @@ foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) { $attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ), 'cn' => $group, + 'mail' => $group.'@'.$postfixmydomain, 'member' => $dn ); if( !ldap_add( $ldap->connection, "cn=$group,".$_SESSION['base_dn'], $attrs ) ) { $errors[] = _("LDAP Error: Failed to add distribution list $group: ").$ldap->error(); From cvs at intevation.de Wed Apr 27 21:47:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 21:47:54 2005 Subject: steffen: server/kolabd kolabd.spec,1.40,1.41 Message-ID: <20050427194751.6FD38101EF9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv8847/kolabd Modified Files: kolabd.spec Log Message: mail attribute for kolabGroupOfNames -- its not used for _anything_ internally (Issue533) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- kolabd.spec 22 Apr 2005 01:45:33 -0000 1.40 +++ kolabd.spec 27 Apr 2005 19:47:49 -0000 1.41 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050421 +Release: 20050427 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Wed Apr 27 21:47:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 21:47:55 2005 Subject: steffen: server/kolabd/kolabd kolab2.schema,1.7,1.8 Message-ID: <20050427194751.76BE5101EFC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv8847/kolabd/kolabd Modified Files: kolab2.schema Log Message: mail attribute for kolabGroupOfNames -- its not used for _anything_ internally (Issue533) Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- kolab2.schema 25 Apr 2005 13:49:12 -0000 1.7 +++ kolab2.schema 27 Apr 2005 19:47:49 -0000 1.8 @@ -416,9 +416,13 @@ kolabDeleteflag $ alias ) ) -# kolab groupOfNames with extra kolabDeleteflag -objectclass ( 1.3.6.1.4.1.19414.3.2.5 - NAME 'kolabGroupOfNames' - DESC 'Kolab group of names (DNs) derived from RFC2256' - SUP groupOfNames STRUCTURAL - MAY kolabDeleteflag ) +# kolab groupOfNames with extra kolabDeleteflag and the required attribute mail. +# The mail attribute for kolab objects of the type kolabGroupOfNames is not arbitrary but +# MUST be a single attribute of the form cn@kolabdomain (e.g. employees@mydomain.com). The +# mail attribute MUST be worldwide unique. +objectclass ( 1.3.6.1.4.1.19414.3.2.5 + NAME 'kolabGroupOfNames' + DESC 'Kolab group of names (DNs) derived from RFC2256' + SUP groupOfNames STRUCTURAL + MAY ( mail $ + kolabDeleteflag ) ) \ No newline at end of file From cvs at intevation.de Wed Apr 27 23:40:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Apr 27 23:40:02 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.58, 1.59 Message-ID: <20050427214001.846BA101EF8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv10265/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: Prevent deletion of accounts when they are the last member of a dist. list (Issue607) Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- user.php 9 Apr 2005 08:55:02 -0000 1.58 +++ user.php 27 Apr 2005 21:39:59 -0000 1.59 @@ -718,6 +718,19 @@ if (!$dn) array_push($errors, _("Error: need dn for delete operation")); elseif ($auth->group() != "maintainer" && $auth->group() != "admin") array_push($errors, _("Error: you need administrative permissions to delete users")); + + // Check for distribution lists with only this user as member + $ldap->search( $_SESSION['base_dn'], + '(&(objectClass=kolabGroupOfNames)(member='.$ldap->escape($dn).'))', + array( 'dn', 'cn', 'member' ) ); + $distlists = $ldap->getEntries(); + foreach( $distlists as $distlist ) { + if( $distlist['member']['count'] == 1 ) { + $dlcn = $distlist['cn'][0]; + $errors[] = _("Account could not be deleted, distribution list '$dlcn' depends on it."); + } + } + if( !$errors ) { if (!$ldap->deleteObject($dn)) { array_push($errors, _("LDAP Error: could not mark '$dn' for deletion: ").$ldap->error()); @@ -726,6 +739,19 @@ $contenttemplate = 'userdeleted.tpl'; } } + + if( $errors ) { + $heading = _('Delete User'); + foreach( $form->entries as $k => $v ) { + if( $v['type'] != 'hidden' ) { + $form->entries[$k]['attrs'] = 'readonly'; + } + } + fill_form_for_modify( $form, $dn, $ldap_object ); + $form->entries['action']['value'] = 'kill'; + $form->submittext = _('Delete'); + $content = $form->outputForm(); + } break; } From cvs at intevation.de Thu Apr 28 02:17:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 02:17:04 2005 Subject: steffen: server obmtool.conf,1.154,1.155 Message-ID: <20050428001701.5A1291005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12418 Modified Files: obmtool.conf Log Message: version stuff (Issue591) Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 --- obmtool.conf 22 Apr 2005 02:03:46 -0000 1.154 +++ obmtool.conf 28 Apr 2005 00:16:59 -0000 1.155 @@ -15,6 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" + kolab_version="2.0-beta5"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -131,9 +132,9 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050421 --without=genuine - @install ${altloc}kolab-webadmin-0.4.0-20050422 - @install ${altloc}kolab-resource-handlers-0.3.9-20050412 + @install ${altloc}kolabd-1.9.4-20050427 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050428 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050427 --define kolab_version=$kolab_version @check %dump From cvs at intevation.de Thu Apr 28 02:17:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 02:17:04 2005 Subject: steffen: server/kolab-webadmin Makefile,1.6,1.7 Message-ID: <20050428001701.5EFB21006A3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin In directory doto:/tmp/cvs-serv12418/kolab-webadmin Modified Files: Makefile Log Message: version stuff (Issue591) Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 23 Jun 2004 10:26:51 -0000 1.6 +++ Makefile 28 Apr 2005 00:16:59 -0000 1.7 @@ -12,7 +12,7 @@ cd $(RPMNAME) && ./bootstrap && ./configure --prefix=/kolab \ && make dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME) cp $(RPMNAME)/$(RPMNAME).spec $(KOLABRPMSRC)/$(RPMNAME)/ - cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec + cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec --define 'kolab_version CVS' binary: $(RPM) -bB $(RPMNAME).spec From cvs at intevation.de Thu Apr 28 02:17:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 02:17:05 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in, 1.11, 1.12 Message-ID: <20050428001701.63BAC101EF8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv12418/kolab-webadmin/kolab-webadmin Modified Files: kolab-webadmin.spec.in Log Message: version stuff (Issue591) Index: kolab-webadmin.spec.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- kolab-webadmin.spec.in 9 Apr 2005 08:55:02 -0000 1.11 +++ kolab-webadmin.spec.in 28 Apr 2005 00:16:59 -0000 1.12 @@ -48,11 +48,15 @@ AutoReq: no AutoReqProv: no +%option kolab_version snapshot + %description Web based administration interface for The Kolab Groupware Server %prep %setup -q + %{l_shtool} subst -e 's;@kolab_version@;%{kolab_version};g' \ + www/admin/kolab/versions.php %build ./configure -prefix=%{l_prefix} From cvs at intevation.de Thu Apr 28 02:17:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 02:17:05 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates versions.tpl, 1.1, 1.2 Message-ID: <20050428001701.649CA101EF9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv12418/kolab-webadmin/kolab-webadmin/php/admin/templates Modified Files: versions.tpl Log Message: version stuff (Issue591) Index: versions.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/versions.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- versions.tpl 11 Mar 2005 09:59:05 -0000 1.1 +++ versions.tpl 28 Apr 2005 00:16:59 -0000 1.2 @@ -5,7 +5,9 @@ End: *}
-

{tr msg="Kolab2 Groupware Server Versions"}

+

{tr msg="Kolab2 Groupware Server Version"}

+
{$kolabversion}
+

{tr msg="Kolab2 Groupware Server Component Versions"}

{$kolabversions}

{tr msg="Kolab2 Patched OpenPKG Package Versions"}

{$kolabpatchedversions}
From cvs at intevation.de Thu Apr 28 02:17:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 02:17:06 2005 Subject: steffen: server/kolabd Makefile,1.3,1.4 kolabd.spec,1.41,1.42 Message-ID: <20050428001701.709B7101EFD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv12418/kolabd Modified Files: Makefile kolabd.spec Log Message: version stuff (Issue591) Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolabd/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 13 Dec 2004 22:35:06 -0000 1.3 +++ Makefile 28 Apr 2005 00:16:59 -0000 1.4 @@ -9,7 +9,7 @@ test -d $(KOLABRPMSRC)/kolabd || mkdir $(KOLABRPMSRC)/kolabd cd kolabd && tar -cvz --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/kolabd/kolabd-$(VERSION).tar.gz * cp rc.kolabd kolabd.spec $(KOLABRPMSRC)/kolabd/ - cd $(KOLABRPMSRC)/kolabd && $(RPM) -ba kolabd.spec + cd $(KOLABRPMSRC)/kolabd && $(RPM) -ba kolabd.spec --define 'kolab_version CVS' binary: $(RPM) -bB kolabd.spec Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- kolabd.spec 27 Apr 2005 19:47:49 -0000 1.41 +++ kolabd.spec 28 Apr 2005 00:16:59 -0000 1.42 @@ -63,6 +63,8 @@ AutoReq: no AutoReqProv: no +%option kolab_version snapshot + %description Kolab is the KDE Groupware Server that provides full groupware features to either KDE Kolab clients or Microsoft Outlook[tm] @@ -157,6 +159,7 @@ $RPM_BUILD_ROOT%{l_prefix}/libexec/kolab/ %{l_shtool} install -c -m 744 %{l_value -s -a} \ + -e 's;@kolab_version@;%{kolab_version};g' \ kolabd kolabconf kolabcheckperm \ $RPM_BUILD_ROOT%{l_prefix}/sbin/ From cvs at intevation.de Thu Apr 28 02:17:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 02:17:06 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/kolab versions.php, 1.2, 1.3 Message-ID: <20050428001701.6AD86101EFC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab In directory doto:/tmp/cvs-serv12418/kolab-webadmin/kolab-webadmin/www/admin/kolab Modified Files: versions.php Log Message: version stuff (Issue591) Index: versions.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- versions.php 11 Mar 2005 09:11:15 -0000 1.2 +++ versions.php 28 Apr 2005 00:16:59 -0000 1.3 @@ -27,6 +27,12 @@ $kolabpatchedversions = shell_exec("$kolab_prefix/bin/openpkg rpm -q amavisd apache imapd postfix" ); $openpkgversion = shell_exec("$kolab_prefix/bin/openpkg rpm -q openpkg"); +$kolabversion = '@kolab_version@'; +if( $kolabversion[0] == '@' ) { + // Unofficial/non-openpkg package + $kolabversion = '2.0-unofficial'; +} + /**** Insert into template and output ***/ $smarty = new MySmarty(); $smarty->assign( 'topdir', $topdir ); @@ -35,6 +41,7 @@ $smarty->assign( 'page_title', $menuitems[$sidx]['title'] ); $smarty->assign( 'menuitems', $menuitems ); $smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] ); +$smarty->assign( 'kolabversion', $kolabversion ); $smarty->assign( 'kolabversions', $kolabversions ); $smarty->assign( 'kolabpatchedversions', $kolabpatchedversions ); $smarty->assign( 'openpkgversion', $openpkgversion ); From cvs at intevation.de Thu Apr 28 02:17:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 02:17:07 2005 Subject: steffen: server/kolabd/kolabd kolabconf,1.1.1.1,1.2 Message-ID: <20050428001701.754E5101EFF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv12418/kolabd/kolabd Modified Files: kolabconf Log Message: version stuff (Issue591) Index: kolabconf =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabconf,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- kolabconf 23 Nov 2004 20:26:47 -0000 1.1.1.1 +++ kolabconf 28 Apr 2005 00:16:59 -0000 1.2 @@ -63,6 +63,8 @@ print 'kolabconf - Kolab Configuration Generator + Version: @kolab_version@ + Copyright (c) 2004 Klaraelvdalens Datakonsult AB Copyright (c) 2003 Code Fusion cc Copyright (c) 2003 Tassilo Erlewein, Martin Konold, Achim Frank, erfrakon From cvs at intevation.de Thu Apr 28 11:08:43 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 11:08:45 2005 Subject: bernhard: server/kolab-resource-handlers/kolab-resource-handlers/resmgr olhacks.php, 1.5, 1.6 Message-ID: <20050428090843.8546C101F0C@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv30919 Modified Files: olhacks.php Log Message: Tried to clarify the outlook bug in attachments further. Index: olhacks.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- olhacks.php 27 Apr 2005 14:25:08 -0000 1.5 +++ olhacks.php 28 Apr 2005 09:08:41 -0000 1.6 @@ -68,8 +68,9 @@ } } -/* Yet another Outlook problem: Outlook seems to be incapable - * of handling non-ascii characters in forwarded iCal messages. +/* Yet another Outlook problem: Some versions of Outlook seems to be incapable + * of handling non-ascii characters properly in text/calendar parts of + * a multi-part/mixed mail which we use for forwarding. * As a solution, we encode common characters as humanreadable * two-letter ascii. */ @@ -171,4 +172,4 @@ return true; } -?> \ No newline at end of file +?> From cvs at intevation.de Thu Apr 28 12:47:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Apr 28 12:47:13 2005 Subject: bh: server README.1st,1.9,1.10 Message-ID: <20050428104712.8866C101FA0@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv518 Modified Files: README.1st Log Message: add note about running kolabconf Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- README.1st 22 Apr 2005 17:51:17 -0000 1.9 +++ README.1st 28 Apr 2005 10:47:10 -0000 1.10 @@ -41,6 +41,9 @@ suggest that you back up your IMAP store, install Kolab2 and manually recreate user accounts and then restore the IMAP data from the backup. +After an upgrade, always run /kolab/sbin/kolabconf to make sure the +configuration files are regenerated from your templates. + Upgrade from versions older than Beta 1 --------------------------------------- @@ -134,6 +137,8 @@ were added, so the slapindex call described in "Upgrade from Beta3" has to be repeated. +Make sure to run kolabconf as described above. Otherwise you may not be +able to log in to the web-admin interface. For more information on Kolab, see http://www.kolab.org From cvs at intevation.de Mon May 2 14:50:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 2 14:50:26 2005 Subject: bh: server README.1st,1.10,1.11 Message-ID: <20050502125025.5B5DC1005D6@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23610 Modified Files: README.1st Log Message: rephrase the download instructions a bit. The previous wording could be read as "downloaded the files into /kolab". Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- README.1st 28 Apr 2005 10:47:10 -0000 1.10 +++ README.1st 2 May 2005 12:50:23 -0000 1.11 @@ -21,8 +21,9 @@ Make sure that the following names are not in /etc/passwd or /etc/groups, as openpkg will want to create them: "kolab" "kolab-r" "kolab-n" -To install the Kolab2 server, you need to download the files in this -directory, then as root, run +To install the Kolab2 server, you need to download the files from the +directory containing this file (1st.README) to some local directory, +then as root, chdir into that local directory and run # ./obmtool kolab From cvs at intevation.de Tue May 3 04:11:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:11:29 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.117, 1.118 Message-ID: <20050503021127.9F3211006D1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv2944 Modified Files: kolab-resource-handlers.spec Log Message: Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- kolab-resource-handlers.spec 27 Apr 2005 14:25:08 -0000 1.117 +++ kolab-resource-handlers.spec 3 May 2005 02:11:25 -0000 1.118 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050427 +Release: 20050502 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Tue May 3 04:11:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:11:30 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/locale/de_DE/LC_MESSAGES kronolith.mo, 1.1.1.1, 1.2 Message-ID: <20050503021127.A62291006D3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/locale/de_DE/LC_MESSAGES In directory doto:/tmp/cvs-serv2944/kolab-resource-handlers/fbview/fbview/kronolith/locale/de_DE/LC_MESSAGES Modified Files: kronolith.mo Log Message: Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter Index: kronolith.mo =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/locale/de_DE/LC_MESSAGES/kronolith.mo,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 Binary files /tmp/cvs1W0u7R and /tmp/cvse9uCxA differ From cvs at intevation.de Tue May 3 04:11:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:11:31 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/locale/de_DE/LC_MESSAGES horde.mo, 1.1.1.1, 1.2 Message-ID: <20050503021127.B1A151006D7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/locale/de_DE/LC_MESSAGES In directory doto:/tmp/cvs-serv2944/kolab-resource-handlers/fbview/fbview/locale/de_DE/LC_MESSAGES Modified Files: horde.mo Log Message: Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter Index: horde.mo =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/locale/de_DE/LC_MESSAGES/horde.mo,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsn8UyaX and /tmp/cvsqznR8H differ From cvs at intevation.de Tue May 3 04:11:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:11:31 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/po de_DE.po, 1.1.1.1, 1.2 kronolith.pot, 1.1.1.1, 1.2 Message-ID: <20050503021127.A9F3F1006D4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/po In directory doto:/tmp/cvs-serv2944/kolab-resource-handlers/fbview/fbview/kronolith/po Modified Files: de_DE.po kronolith.pot Log Message: Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter Index: de_DE.po =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/po/de_DE.po,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- de_DE.po 11 Jun 2004 10:52:06 -0000 1.1.1.1 +++ de_DE.po 3 May 2005 02:11:25 -0000 1.2 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Kronolith 2.0-cvs\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2004-05-18 11:52+0200\n" +"POT-Creation-Date: 2005-05-03 03:04+0200\n" "PO-Revision-Date: 2004-04-30 00:02+0200\n" "Last-Translator: Jan Schneider \n" "Language-Team: German \n" @@ -14,22 +14,12 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" [...1703 lines suppressed...] +#: config/prefs.php.dist:107 msgid "week" msgstr "Woche" -#: templates/view/view.inc:134 templates/edit/edit.inc:349 +#: templates/view/view.inc:132 msgid "week(s) on:" msgstr "Woche(n) am:" -#: config/prefs.php.dist:116 config/prefs.php.dist:117 -#: config/prefs.php.dist:118 +#: config/prefs.php.dist:108 config/prefs.php.dist:109 +#: config/prefs.php.dist:110 msgid "weeks" msgstr "Wochen" -#: templates/view/view.inc:140 templates/edit/edit.inc:374 +#: templates/view/view.inc:138 msgid "year(s)" msgstr "Jahr(e)" Index: kronolith.pot =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/po/kronolith.pot,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- kronolith.pot 11 Jun 2004 10:52:07 -0000 1.1.1.1 +++ kronolith.pot 3 May 2005 02:11:25 -0000 1.2 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2004-04-29 21:24+0200\n" +"POT-Creation-Date: 2005-05-03 03:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,22 +16,12 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" [...1657 lines suppressed...] +#: config/prefs.php.dist:107 msgid "week" msgstr "" -#: templates/view/view.inc:134 templates/edit/edit.inc:335 +#: templates/view/view.inc:132 msgid "week(s) on:" msgstr "" -#: config/prefs.php.dist:116 config/prefs.php.dist:117 -#: config/prefs.php.dist:118 +#: config/prefs.php.dist:108 config/prefs.php.dist:109 +#: config/prefs.php.dist:110 msgid "weeks" msgstr "" -#: templates/view/view.inc:140 templates/edit/edit.inc:360 +#: templates/view/view.inc:138 msgid "year(s)" msgstr "" From cvs at intevation.de Tue May 3 04:11:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:11:32 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.21, 1.22 kolabmailboxfilter.php, 1.2, 1.3 Message-ID: <20050503021127.B8BA91006D8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv2944/kolab-resource-handlers/resmgr Modified Files: kolabfilter.php kolabmailboxfilter.php Log Message: Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- kolabfilter.php 7 Apr 2005 00:09:16 -0000 1.21 +++ kolabfilter.php 3 May 2005 02:11:25 -0000 1.22 @@ -120,7 +120,7 @@ $from = false; $subject = false; $senderok = true; -while (!feof(STDIN)) { +while (!feof(STDIN) && !$headers_done) { $buffer = fgets(STDIN, 8192); $line = rtrim( $buffer, "\r\n"); if( $line == '' ) { @@ -145,6 +145,12 @@ exit(EX_TEMPFAIL); } } +while (!feof(STDIN)) { + $buffer = fread( STDIN, 8192 ); + if( fwrite($tmpf, $buffer) === false ) { + exit(EX_TEMPFAIL); + } +} fclose($tmpf); if( !$senderok ) { @@ -174,7 +180,7 @@ } $headers_done = false; -while (!feof($tmpf)) { +while (!feof($tmpf) && !$headers_done) { $buffer = fgets($tmpf, 8192); if( !$headers_done && rtrim( $buffer, "\r\n" ) == '' ) { $headers_done = true; @@ -189,6 +195,13 @@ fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } } +while (!feof($tmpf) ) { + $buffer = fread($tmpf, 8192); + if( PEAR::isError($error = $smtp->data( $buffer )) ) { + fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + } +}; + //myLog("Calling smtp->end()", RM_LOG_DEBUG); $smtp->end(); myLog("Kolabfilter successfully completed", RM_LOG_DEBUG); Index: kolabmailboxfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolabmailboxfilter.php 7 Apr 2005 00:09:16 -0000 1.2 +++ kolabmailboxfilter.php 3 May 2005 02:11:25 -0000 1.3 @@ -128,7 +128,7 @@ } $headers_done = false; -while (!feof($tmpf)) { +while (!feof($tmpf) && !$headers_done) { $buffer = fgets($tmpf, 8192); if( !$headers_done && rtrim( $buffer, "\r\n" ) == '' ) { $headers_done = true; @@ -143,6 +143,12 @@ fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); } } +while (!feof($tmpf) ) { + $buffer = fread($tmpf, 8192); + if( PEAR::isError($error = $lmtp->data( $buffer )) ) { + fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + } +}; //myLog("Calling smtp->end()", RM_LOG_DEBUG); $lmtp->end(); myLog("Kolabmailboxfilter successfully completed", RM_LOG_DEBUG); From cvs at intevation.de Tue May 3 04:11:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:11:32 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/turba/po de_DE.po, 1.1.1.1, 1.2 turba.pot, 1.1.1.1, 1.2 Message-ID: <20050503021127.BB5741006D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/turba/po In directory doto:/tmp/cvs-serv2944/kolab-resource-handlers/fbview/fbview/turba/po Modified Files: de_DE.po turba.pot Log Message: Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter Index: de_DE.po =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/turba/po/de_DE.po,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- de_DE.po 11 Jun 2004 10:51:35 -0000 1.1.1.1 +++ de_DE.po 3 May 2005 02:11:25 -0000 1.2 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Turba 2.0-cvs\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2004-05-18 11:52+0200\n" +"POT-Creation-Date: 2005-05-03 03:04+0200\n" "PO-Revision-Date: 2004-05-18 15:03+0200\n" "Last-Translator: Jan Schneider \n" "Language-Team: German \n" @@ -22,22 +22,12 @@ msgid "\"Lastname, Firstname\" (ie. Doe, John)" msgstr "\"Nachname, Vorname\" (z.B. Mustermann, Max)" -#: add.php:96 -#, php-format -msgid "%s added." -msgstr "%s hinzugefügt." - -#: data.php:170 -#, php-format -msgid "%s file successfully imported" -msgstr "Die %s-Datei wurde erfolgreich importiert" - #: templates/browse/footer.inc:10 #, php-format msgid "%s to %s of %s" msgstr "%s bis %s von %s" -#: lib/Block/minisearch.php:45 +#: lib/Block/minisearch.php:42 msgid "A browser that supports iFrames is required" msgstr "Ein Browser, der IFrames unterstützt, wird benötigt" @@ -66,16 +56,12 @@ msgid "Address Book Listing" msgstr "Adressbuchliste" -#: add.php:95 -msgid "Address book entry" -msgstr "Adressbucheintrag" - -#: lib/Source.php:391 lib/api.php:207 lib/api.php:382 lib/api.php:484 -#: lib/api.php:704 +#: lib/Source.php:391 lib/api.php:198 lib/api.php:373 lib/api.php:475 +#: lib/api.php:695 msgid "Address book is read-only." msgstr "Das Adressbuch kann nur gelesen werden." -#: lib/api.php:712 +#: lib/api.php:703 msgid "Address not in addressbook." msgstr "Adresse nicht im Adressbuch." @@ -141,10 +127,6 @@ msgid "Business Category" msgstr "Geschäftskategorie" -#: data.php:30 -msgid "CSV" -msgstr "CSV" - #: templates/browse/actions.inc:52 msgid "C_lear Search" msgstr "Suche _zurücksetzen" @@ -165,10 +147,6 @@ "Legen Sie das Standardverzeichnis für Ihr persönliches Adressbuch, die " "Kontaktlisten und die Suche fest." -#: add.php:54 -msgid "Choose an address book" -msgstr "Wählen Sie ein Adressbuch" - #: templates/prefs/columnselect.inc:229 msgid "Choose the order of the columns to display in the address list." msgstr "Legen Sie die Reihenfolge der Spalten in der Adressenliste fest." @@ -201,7 +179,7 @@ msgid "Contact List" msgstr "Kontaktliste" -#: lib/api.php:916 +#: lib/api.php:907 msgid "Contact not found." msgstr "Kontakt nicht gefunden." @@ -259,11 +237,7 @@ msgid "Delete failed: (%s) %s" msgstr "Löschen fehlgeschlagen: (%s) %s" -#: delete.php:35 -msgid "Deletion failed" -msgstr "Löschen ist fehlgeschlagen" - -#: config/attributes.php.dist:190 +#: config/attributes.php.dist:188 msgid "Department" msgstr "Abteilung" @@ -302,29 +276,24 @@ msgid "Edit '%s'" msgstr "'%s' bearbeiten" -#: edit.php:54 edit.php:81 -#, php-format -msgid "Edit entry for %s" -msgstr "Eintrag von %s bearbeiten" - #: config/attributes.php.dist:57 msgid "Email" msgstr "Email" -#: lib/api.php:780 +#: lib/api.php:771 msgid "Empty key" msgstr "Leerer Schlüssel." -#: lib/api.php:784 +#: lib/api.php:775 msgid "Empty source" msgstr "Leere Quelle" -#: edit.php:80 lib/api.php:678 +#: lib/api.php:669 #, php-format msgid "Entry for %s updated." msgstr "Eintrag von %s aktualisiert." -#: lib/api.php:490 lib/api.php:494 lib/api.php:498 lib/api.php:512 +#: lib/api.php:481 lib/api.php:485 lib/api.php:489 lib/api.php:503 msgid "Error while searching directory." msgstr "Beim Suchen in dem Verzeichnis ist ein Fehler aufgetreten." @@ -363,8 +332,8 @@ msgid "Failed to change name: (%s) %s, %s" msgstr "Name konnte nicht geändert werden: (%s) %s, %s" -#: data.php:72 data.php:156 add.php:72 search.php:53 lib/api.php:265 -#: lib/api.php:794 lib/api.php:826 lib/api.php:869 +#: search.php:53 lib/api.php:256 lib/api.php:785 lib/api.php:817 +#: lib/api.php:860 msgid "Failed to connect to the specified directory." msgstr "" "Zu dem angegeben Verzeichnis konnte keine Verbindung hergestellt werden." @@ -375,12 +344,12 @@ msgstr "" "Das Objekt, das hinzugefügt werden sollte, konnte nicht gefunden werden: %s" -#: data.php:75 search.php:87 +#: search.php:87 #, php-format msgid "Failed to search the directory: %s" msgstr "Das Verzeichnis %s konnte nicht durchsucht werden." -#: lib/api.php:837 +#: lib/api.php:828 msgid "Failed to search the specified directory." msgstr "Das angegebene Verzeichnis konnte nicht durchsucht werden." @@ -449,24 +418,20 @@ msgid "Import Address Book, Step %d" msgstr "Adressbuch importieren, Schritt %d" -#: data.php:188 -msgid "Import/Export Address Books" -msgstr "Adressbücher Import/Export" - -#: lib/api.php:201 lib/api.php:368 lib/api.php:420 lib/api.php:466 -#: lib/api.php:694 +#: lib/api.php:192 lib/api.php:359 lib/api.php:411 lib/api.php:457 +#: lib/api.php:685 msgid "Invalid address book." msgstr "Ungültiges Adressbuch." -#: lib/api.php:376 lib/api.php:470 +#: lib/api.php:367 lib/api.php:461 msgid "Invalid e-mail address." msgstr "Ungültige Email-Adresse." -#: lib/api.php:535 lib/api.php:854 +#: lib/api.php:526 lib/api.php:845 msgid "Invalid email." msgstr "Ungültige Email-Adresse." -#: lib/api.php:478 +#: lib/api.php:469 msgid "Invalid entry." msgstr "Ungültiger Eintrag." @@ -474,11 +439,11 @@ msgid "Invalid key specified." msgstr "Ungültiger Schlüssel angegeben." -#: lib/api.php:698 +#: lib/api.php:689 msgid "Invalid key." msgstr "Ungültiger Schlüssel." -#: lib/api.php:372 lib/api.php:474 +#: lib/api.php:363 lib/api.php:465 msgid "Invalid name." msgstr "Ungültiger Name." @@ -513,15 +478,11 @@ msgid "Maximum number of pages" msgstr "Maximale Seitenzahl" -#: lib/api.php:189 -msgid "Mini Search" -msgstr "Minisuche" - #: lib/Driver/ldap.php:350 msgid "Missing DN in LDAP source configuration." msgstr "DN fehlt in der LDAP-Konfiguration." -#: lib/api.php:900 lib/api.php:908 +#: lib/api.php:891 lib/api.php:899 msgid "Missing information" msgstr "Fehlende Informationen" @@ -534,7 +495,7 @@ msgid "Modify failed: (%s) %s" msgstr "Änderung fehlgeschlagen: (%s) %s" -#: lib/api.php:566 lib/api.php:874 +#: lib/api.php:557 lib/api.php:865 msgid "More than 1 entry returned." msgstr "Mehr als 1 Eintrag zurückgeliefert." @@ -550,11 +511,11 @@ msgid "Move right" msgstr "Nach rechts" -#: data.php:33 templates/data/import.inc:21 +#: templates/data/import.inc:21 msgid "Mulberry Address Book" msgstr "Mulberry-Adressbuch" -#: lib/api.php:507 +#: lib/api.php:498 #, php-format msgid "" "Multiple persons with address [%s], but none with name [%s] in address book." @@ -578,7 +539,7 @@ msgid "Netcenter Member Directory" msgstr "Netcenter Mitgliederverzeichnis" -#: add.php:46 lib/Block/minisearch.php:24 +#: lib/Block/minisearch.php:24 msgid "New Contact" msgstr "Neuer Kontakt" @@ -590,11 +551,11 @@ msgid "Next" msgstr "Weiter" -#: config/attributes.php.dist:195 +#: config/attributes.php.dist:193 msgid "Nickname" msgstr "Spitzname" -#: lib/api.php:568 lib/api.php:801 lib/api.php:881 +#: lib/api.php:559 lib/api.php:792 lib/api.php:872 #, php-format msgid "No %s entry found for %s." msgstr "Es wurde kein %s Eintrag für %s gefunden." @@ -615,7 +576,7 @@ msgid "Number of items per page" msgstr "Anzahl der Einträge pro Seite" -#: config/attributes.php.dist:200 +#: config/attributes.php.dist:198 msgid "Office" msgstr "Büro" @@ -627,7 +588,7 @@ msgid "PGP Public Key" msgstr "Öffentlicher PGP-Schlüssel" -#: data.php:34 templates/data/import.inc:22 +#: templates/data/import.inc:22 msgid "Pine Address Book" msgstr "Pine-Adressbuch" @@ -685,7 +646,7 @@ msgid "S/MIME Public Certificate" msgstr "Öffentliches S/MIME-Zertifikat" -#: edit.php:58 display.php:35 add.php:47 +#: display.php:35 msgid "Save" msgstr "Speichern" @@ -760,11 +721,6 @@ msgid "Selected Columns:" msgstr "Ausgewählte Spalten:" -#: add.php:60 -#, php-format -msgid "Selected address book '%s'." -msgstr "Adressbuch '%s' ausgewählt." - #: config/sources.php.dist:223 msgid "Shared Directory" msgstr "Gemeinsames Verzeichnis" @@ -802,7 +758,7 @@ msgid "Sort Direction" msgstr "Sortierrichtung" -#: lib/api.php:159 +#: lib/api.php:155 msgid "Sources" msgstr "Quellen" @@ -816,23 +772,19 @@ msgid "Successfully added %s to %s" msgstr "%s wurde erfolgreich zu %s hinzugefügt" -#: data.php:31 -msgid "TSV" -msgstr "TSV" - #: templates/data/import.inc:19 templates/data/export.inc:17 msgid "Tab separated values" msgstr "Tabgetrennte Werte" -#: edit.php:25 vcard.php:23 display.php:26 +#: vcard.php:23 display.php:26 msgid "The contact you requested does not exist." msgstr "Der ausgewählte Kontakt existiert nicht." -#: lib/api.php:661 +#: lib/api.php:652 msgid "The object you requested does not exist." msgstr "Das ausgewählte Objekt existiert nicht." -#: lib/api.php:641 +#: lib/api.php:632 msgid "The source you requested does not exist." msgstr "Die Quelle, die Sie ausgewählt haben, existiert nicht." @@ -840,25 +792,6 @@ msgid "There are no browseable address books." msgstr "Es gibt keine Adressbücher, die durchblättert werden können." -#: add.php:39 -msgid "" -"There are no writeable address books. None of the available address books " -"are configured to allow you to add new entries to them. If you believe this " -"is an error, please contact your system administrator." -msgstr "" -"Es gibt keine beschreibbaren Adressbücher. Keines der verfügbaren " -"Adressbücher erlaubt Ihnen, neue Adressen hinzuzufügen. Wenn Sie meinen, " -"dass es sich dabei um einen Fehler handelt, wenden Sie sich bitte an Ihren " -"System-Administrator." - -#: add.php:107 -msgid "" -"There was an error adding the new contact. Contact your system administrator " -"for further help." -msgstr "" -"Beim Hinzufügen dieses Kontakts ist ein Fehler aufgetreten. Bitte wenden Sie " -"sich an Ihren Systemadministrator für weitere Hilfe." - #: browse.php:204 msgid "There was an error creating a new list." msgstr "Beim Erstellen einer neuen Liste ist ein Fehler aufgetreten." @@ -868,15 +801,7 @@ msgid "There was an error deleting %s from the source address book." msgstr "Beim Löschen von %s aus dem Adressbuch ist ein Fehler aufgetreten." -#: delete.php:33 -msgid "" -"There was an error deleting this contact. Ask your system administrator for " -"further help." -msgstr "" -"Beim Löschen dieses Kontakts ist ein Fehler aufgetreten. Bitte wenden Sie " -"sich an Ihren Systemadministrator für weitere Hilfe." - -#: lib/api.php:716 +#: lib/api.php:707 msgid "There was an error deleting this entry." msgstr "Beim Löschen dieses Eintrags ist ein Fehler aufgetreten." @@ -888,12 +813,7 @@ msgid "There was an error displaying the select List" msgstr "Beim Anzeigen der ausgewählten Liste ist ein Fehler aufgetreten" -#: data.php:163 -#, php-format -msgid "There was an error importing the data: %s" -msgstr "Beim Importieren der Daten ist ein Fehler aufgetreten: %s" - -#: lib/api.php:212 lib/api.php:235 +#: lib/api.php:203 lib/api.php:226 msgid "There was an error importing the vCard data." msgstr "Beim Importieren der vCard-Daten ist ein Fehler aufgetreten." @@ -901,30 +821,17 @@ msgid "There was an error removing this object." msgstr "Beim Löschen dieses Objektes ist ein Fehler aufgetreten." -#: edit.php:85 -#, php-format -msgid "There was an error updating this entry: %s" -msgstr "Beim Aktualisieren dieses Eintrags ist ein Fehler aufgetreten: %s" - -#: lib/api.php:680 +#: lib/api.php:671 #, php-format msgid "There was an error updating this entry: %s." msgstr "Beim Bearbeiten dieses Eintrags ist ein Fehler aufgetreten: %s." -#: data.php:101 -msgid "There were no addresses to export." -msgstr "Es konnten keine Adressen zum Exportieren gefunden werden." - -#: data.php:139 -msgid "This file format is not supported." -msgstr "Dieses Dateiformat wird nicht unterstützt." - -#: lib/api.php:500 lib/api.php:514 +#: lib/api.php:491 lib/api.php:505 #, php-format msgid "This person already has a %s entry in the address book." msgstr "Diese Person hat bereits einen %s-Eintrag in Ihrem Adressbuch." -#: lib/api.php:223 lib/api.php:388 +#: lib/api.php:214 lib/api.php:379 msgid "This person is already in your address book." msgstr "Diese Person befindet sich bereits in Ihrem Adressbuch." @@ -937,11 +844,11 @@ msgid "Unable to load the definition of %s." msgstr "Der %s-Treiber konnte nicht geladen werden." -#: lib/api.php:788 +#: lib/api.php:779 msgid "Unknown source" msgstr "Unbekannte Quelle" -#: lib/api.php:228 +#: lib/api.php:219 msgid "Unnamed Contact" msgstr "Unbenannter Kontakt" @@ -962,7 +869,7 @@ msgid "View to display by default:" msgstr "Standardansicht:" -#: config/attributes.php.dist:185 +#: config/attributes.php.dist:183 msgid "Website URL" msgstr "Website-URL" @@ -994,11 +901,11 @@ msgid "You are creating a distribution list." msgstr "Sie erzeugen eine Adressliste." -#: lib/api.php:669 +#: lib/api.php:660 msgid "You do not have permission to edit this object." msgstr "Sie haben nicht genügend Rechte, um diesen Eintrag zu bearbeiten." -#: edit.php:45 display.php:52 +#: display.php:52 msgid "You do not have permission to view this contact." msgstr "Sie haben nicht genügend Rechte, um diesen Kontakt zu sehen." @@ -1022,10 +929,6 @@ msgid "You must select at least one entry first." msgstr "Sie müssen erst mindestens einen Eintrag auswählen." -#: edit.php:49 -msgid "You only have permission to view this contact." -msgstr "Sie haben nur das Recht, diesen Kontakt anzusehen." - #: templates/menu/menu.inc:7 msgid "_Add" msgstr "Hi_nzufügen" @@ -1062,14 +965,10 @@ msgid "contact.vcf" msgstr "adresse.vcf" -#: data.php:108 templates/data/export.inc:1 +#: templates/data/export.inc:1 msgid "contacts.csv" msgstr "adressen.csv" -#: data.php:112 -msgid "contacts.tsv" -msgstr "adressen.tsv" - #: templates/addlink/contacts.inc:80 msgid "from" msgstr "von" @@ -1078,7 +977,7 @@ msgid "to Selected Address Book" msgstr "zum ausgewählten Adressbuch" -#: data.php:32 templates/browse/column_headers.inc:9 -#: templates/data/import.inc:20 templates/data/export.inc:19 +#: templates/browse/column_headers.inc:9 templates/data/import.inc:20 +#: templates/data/export.inc:19 msgid "vCard" msgstr "vCard" Index: turba.pot =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/turba/po/turba.pot,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- turba.pot 11 Jun 2004 10:51:35 -0000 1.1.1.1 +++ turba.pot 3 May 2005 02:11:25 -0000 1.2 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2004-04-29 21:24+0200\n" +"POT-Creation-Date: 2005-05-03 03:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,22 +24,12 @@ msgid "\"Lastname, Firstname\" (ie. Doe, John)" msgstr "" -#: add.php:96 -#, php-format -msgid "%s added." -msgstr "" - -#: data.php:170 -#, php-format -msgid "%s file successfully imported" -msgstr "" - #: templates/browse/footer.inc:10 #, php-format msgid "%s to %s of %s" msgstr "" -#: lib/Block/minisearch.php:45 +#: lib/Block/minisearch.php:42 msgid "A browser that supports iFrames is required" msgstr "" @@ -47,8 +37,8 @@ msgid "Above search form" msgstr "" -#: templates/menu/menu.inc:7 -msgid "Add" +#: templates/browse/search.inc:64 +msgid "Ad_vanced Search" msgstr "" #: templates/prefs/columnselect.inc:239 @@ -68,21 +58,17 @@ msgid "Address Book Listing" msgstr "" -#: add.php:95 -msgid "Address book entry" -msgstr "" - -#: lib/Source.php:391 lib/api.php:207 lib/api.php:382 lib/api.php:484 -#: lib/api.php:704 +#: lib/Source.php:391 lib/api.php:198 lib/api.php:373 lib/api.php:475 +#: lib/api.php:695 msgid "Address book is read-only." msgstr "" -#: lib/api.php:712 +#: lib/api.php:703 msgid "Address not in addressbook." msgstr "" -#: search.php:96 templates/browse/search.inc:65 templates/browse/search.inc:69 -#: templates/browse/search.inc:121 +#: search.php:96 templates/browse/search.inc:64 +#: templates/browse/search.inc:112 msgid "Advanced Search" msgstr "" @@ -113,11 +99,20 @@ #: templates/browse/actions.inc:48 #, php-format +msgid "Ba_ck to %s" +msgstr "" + +#: templates/browse/actions.inc:48 +#, php-format msgid "Back to %s" msgstr "" -#: search.php:93 templates/browse/search.inc:62 templates/browse/search.inc:72 -#: templates/browse/search.inc:124 +#: templates/browse/search.inc:115 +msgid "Basi_c Search" +msgstr "" + +#: search.php:93 templates/browse/search.inc:61 +#: templates/browse/search.inc:115 msgid "Basic Search" msgstr "" @@ -130,16 +125,12 @@ msgid "Bind failed: (%s) %s" msgstr "" -#: templates/menu/menu.inc:6 -msgid "Browse" -msgstr "" - #: config/attributes.php.dist:155 msgid "Business Category" msgstr "" -#: data.php:30 -msgid "CSV" +#: templates/browse/actions.inc:52 +msgid "C_lear Search" msgstr "" #: templates/addlink/contacts.inc:127 @@ -156,10 +147,6 @@ "searches." msgstr "" -#: add.php:54 -msgid "Choose an address book" -msgstr "" - #: templates/prefs/columnselect.inc:229 msgid "Choose the order of the columns to display in the address list." msgstr "" @@ -192,7 +179,7 @@ msgid "Contact List" msgstr "" -#: lib/api.php:916 +#: lib/api.php:907 msgid "Contact not found." msgstr "" @@ -248,11 +235,7 @@ msgid "Delete failed: (%s) %s" msgstr "" -#: delete.php:35 -msgid "Deletion failed" -msgstr "" - -#: config/attributes.php.dist:190 +#: config/attributes.php.dist:188 msgid "Department" msgstr "" @@ -260,7 +243,7 @@ msgid "Descending" msgstr "" -#: templates/browse/search.inc:138 +#: templates/browse/search.inc:129 msgid "Directory" msgstr "" @@ -291,29 +274,24 @@ msgid "Edit '%s'" msgstr "" -#: edit.php:54 edit.php:81 -#, php-format -msgid "Edit entry for %s" -msgstr "" - #: config/attributes.php.dist:57 msgid "Email" msgstr "" -#: lib/api.php:780 +#: lib/api.php:771 msgid "Empty key" msgstr "" -#: lib/api.php:784 +#: lib/api.php:775 msgid "Empty source" msgstr "" -#: edit.php:80 lib/api.php:678 +#: lib/api.php:669 #, php-format msgid "Entry for %s updated." msgstr "" -#: lib/api.php:490 lib/api.php:494 lib/api.php:498 lib/api.php:512 +#: lib/api.php:481 lib/api.php:485 lib/api.php:489 lib/api.php:503 msgid "Error while searching directory." msgstr "" @@ -352,8 +330,8 @@ msgid "Failed to change name: (%s) %s, %s" msgstr "" -#: data.php:72 data.php:156 add.php:72 search.php:53 lib/api.php:265 -#: lib/api.php:794 lib/api.php:826 lib/api.php:869 +#: search.php:53 lib/api.php:256 lib/api.php:785 lib/api.php:817 +#: lib/api.php:860 msgid "Failed to connect to the specified directory." msgstr "" @@ -362,12 +340,12 @@ msgid "Failed to find object to be added: %s" msgstr "" -#: data.php:75 search.php:87 +#: search.php:87 #, php-format msgid "Failed to search the directory: %s" msgstr "" -#: lib/api.php:837 +#: lib/api.php:828 msgid "Failed to search the specified directory." msgstr "" @@ -375,7 +353,7 @@ msgid "Fax" msgstr "" -#: templates/addlink/contacts.inc:77 templates/browse/search.inc:80 +#: templates/addlink/contacts.inc:77 templates/browse/search.inc:71 msgid "Find" msgstr "" @@ -387,7 +365,7 @@ msgid "Freebusy URL" msgstr "" -#: templates/browse/search.inc:93 +#: templates/browse/search.inc:84 msgid "From" msgstr "" @@ -400,7 +378,6 @@ msgstr "" #: templates/addlink/menu.inc:10 templates/addlink/contacts.inc:129 -#: templates/menu/menu.inc:25 msgid "Help" msgstr "" @@ -437,28 +414,20 @@ msgid "Import Address Book, Step %d" msgstr "" -#: templates/menu/menu.inc:12 -msgid "Import/Export" -msgstr "" - -#: data.php:188 -msgid "Import/Export Address Books" -msgstr "" - -#: lib/api.php:201 lib/api.php:368 lib/api.php:420 lib/api.php:466 -#: lib/api.php:694 +#: lib/api.php:192 lib/api.php:359 lib/api.php:411 lib/api.php:457 +#: lib/api.php:685 msgid "Invalid address book." msgstr "" -#: lib/api.php:376 lib/api.php:470 +#: lib/api.php:367 lib/api.php:461 msgid "Invalid e-mail address." msgstr "" -#: lib/api.php:535 lib/api.php:854 +#: lib/api.php:526 lib/api.php:845 msgid "Invalid email." msgstr "" -#: lib/api.php:478 +#: lib/api.php:469 msgid "Invalid entry." msgstr "" @@ -466,11 +435,11 @@ msgid "Invalid key specified." msgstr "" -#: lib/api.php:698 +#: lib/api.php:689 msgid "Invalid key." msgstr "" -#: lib/api.php:372 lib/api.php:474 +#: lib/api.php:363 lib/api.php:465 msgid "Invalid name." msgstr "" @@ -495,7 +464,7 @@ msgid "Link canceled." msgstr "" -#: templates/browse/search.inc:87 +#: templates/browse/search.inc:78 msgid "Matching" msgstr "" @@ -503,15 +472,11 @@ msgid "Maximum number of pages" msgstr "" -#: lib/api.php:189 -msgid "Mini Search" -msgstr "" - #: lib/Driver/ldap.php:350 msgid "Missing DN in LDAP source configuration." msgstr "" -#: lib/api.php:900 lib/api.php:908 +#: lib/api.php:891 lib/api.php:899 msgid "Missing information" msgstr "" @@ -524,7 +489,7 @@ msgid "Modify failed: (%s) %s" msgstr "" -#: lib/api.php:566 lib/api.php:874 +#: lib/api.php:557 lib/api.php:865 msgid "More than 1 entry returned." msgstr "" @@ -540,11 +505,11 @@ msgid "Move right" msgstr "" -#: data.php:33 templates/data/import.inc:21 +#: templates/data/import.inc:21 msgid "Mulberry Address Book" msgstr "" -#: lib/api.php:507 +#: lib/api.php:498 #, php-format msgid "" "Multiple persons with address [%s], but none with name [%s] in address book." @@ -566,7 +531,7 @@ msgid "Netcenter Member Directory" msgstr "" -#: add.php:46 lib/Block/minisearch.php:24 +#: lib/Block/minisearch.php:24 msgid "New Contact" msgstr "" @@ -578,11 +543,11 @@ msgid "Next" msgstr "" -#: config/attributes.php.dist:195 +#: config/attributes.php.dist:193 msgid "Nickname" msgstr "" -#: lib/api.php:568 lib/api.php:801 lib/api.php:881 +#: lib/api.php:559 lib/api.php:792 lib/api.php:872 #, php-format msgid "No %s entry found for %s." msgstr "" @@ -603,14 +568,10 @@ msgid "Number of items per page" msgstr "" -#: config/attributes.php.dist:200 +#: config/attributes.php.dist:198 msgid "Office" msgstr "" -#: templates/menu/menu.inc:17 -msgid "Options" -msgstr "" - #: config/prefs.php.dist:34 msgid "Other Options" msgstr "" @@ -619,7 +580,7 @@ msgid "PGP Public Key" msgstr "" -#: data.php:34 templates/data/import.inc:22 +#: templates/data/import.inc:22 msgid "Pine Address Book" msgstr "" @@ -669,7 +630,7 @@ msgid "Requested object not found." msgstr "" -#: templates/browse/search.inc:134 +#: templates/browse/search.inc:125 msgid "Reset" msgstr "" @@ -677,13 +638,13 @@ msgid "S/MIME Public Certificate" msgstr "" -#: edit.php:58 display.php:35 add.php:47 +#: display.php:35 msgid "Save" msgstr "" -#: templates/addlink/contacts.inc:89 templates/browse/search.inc:106 -#: templates/browse/search.inc:133 templates/block/minisearch.inc:49 -#: templates/menu/menu.inc:8 config/prefs.php.dist:100 +#: templates/addlink/contacts.inc:89 templates/browse/search.inc:97 +#: templates/browse/search.inc:124 templates/block/minisearch.inc:49 +#: config/prefs.php.dist:100 msgid "Search" msgstr "" @@ -751,15 +712,14 @@ msgid "Selected Columns:" msgstr "" -#: add.php:60 -#, php-format -msgid "Selected address book '%s'." -msgstr "" - #: config/sources.php.dist:223 msgid "Shared Directory" msgstr "" +#: templates/browse/actions.inc:46 +msgid "Sho_w All" +msgstr "" + #: templates/browse/select.inc:11 msgid "Show" msgstr "" @@ -776,12 +736,20 @@ msgid "Show Lists" msgstr "" +#: templates/browse/actions.inc:45 +msgid "Show _Contacts" +msgstr "" + +#: templates/browse/actions.inc:44 +msgid "Show _Lists" +msgstr "" + #: templates/browse/column_headers.inc:12 #: templates/browse/column_headers.inc:17 msgid "Sort Direction" msgstr "" -#: lib/api.php:159 +#: lib/api.php:155 msgid "Sources" msgstr "" @@ -794,23 +762,19 @@ msgid "Successfully added %s to %s" msgstr "" -#: data.php:31 -msgid "TSV" -msgstr "" - #: templates/data/import.inc:19 templates/data/export.inc:17 msgid "Tab separated values" msgstr "" -#: edit.php:25 vcard.php:23 display.php:26 +#: vcard.php:23 display.php:26 msgid "The contact you requested does not exist." msgstr "" -#: lib/api.php:661 +#: lib/api.php:652 msgid "The object you requested does not exist." msgstr "" -#: lib/api.php:641 +#: lib/api.php:632 msgid "The source you requested does not exist." msgstr "" @@ -818,19 +782,6 @@ msgid "There are no browseable address books." msgstr "" -#: add.php:39 -msgid "" -"There are no writeable address books. None of the available address books " -"are configured to allow you to add new entries to them. If you believe this " -"is an error, please contact your system administrator." -msgstr "" - -#: add.php:107 -msgid "" -"There was an error adding the new contact. Contact your system administrator " -"for further help." -msgstr "" - #: browse.php:204 msgid "There was an error creating a new list." msgstr "" @@ -840,13 +791,7 @@ msgid "There was an error deleting %s from the source address book." msgstr "" -#: delete.php:33 -msgid "" -"There was an error deleting this contact. Ask your system administrator for " -"further help." -msgstr "" - -#: lib/api.php:716 +#: lib/api.php:707 msgid "There was an error deleting this entry." msgstr "" @@ -858,12 +803,7 @@ msgid "There was an error displaying the select List" msgstr "" -#: data.php:163 -#, php-format -msgid "There was an error importing the data: %s" -msgstr "" - -#: lib/api.php:212 lib/api.php:235 +#: lib/api.php:203 lib/api.php:226 msgid "There was an error importing the vCard data." msgstr "" @@ -871,30 +811,17 @@ msgid "There was an error removing this object." msgstr "" -#: edit.php:85 -#, php-format -msgid "There was an error updating this entry: %s" -msgstr "" - -#: lib/api.php:680 +#: lib/api.php:671 #, php-format msgid "There was an error updating this entry: %s." msgstr "" -#: data.php:101 -msgid "There were no addresses to export." -msgstr "" - -#: data.php:139 -msgid "This file format is not supported." -msgstr "" - -#: lib/api.php:500 lib/api.php:514 +#: lib/api.php:491 lib/api.php:505 #, php-format msgid "This person already has a %s entry in the address book." msgstr "" -#: lib/api.php:223 lib/api.php:388 +#: lib/api.php:214 lib/api.php:379 msgid "This person is already in your address book." msgstr "" @@ -907,11 +834,11 @@ msgid "Unable to load the definition of %s." msgstr "" -#: lib/api.php:788 +#: lib/api.php:779 msgid "Unknown source" msgstr "" -#: lib/api.php:228 +#: lib/api.php:219 msgid "Unnamed Contact" msgstr "" @@ -932,7 +859,7 @@ msgid "View to display by default:" msgstr "" -#: config/attributes.php.dist:185 +#: config/attributes.php.dist:183 msgid "Website URL" msgstr "" @@ -964,11 +891,11 @@ msgid "You are creating a distribution list." msgstr "" -#: lib/api.php:669 +#: lib/api.php:660 msgid "You do not have permission to edit this object." msgstr "" -#: edit.php:45 display.php:52 +#: display.php:52 msgid "You do not have permission to view this contact." msgstr "" @@ -992,22 +919,46 @@ msgid "You must select at least one entry first." msgstr "" -#: edit.php:49 -msgid "You only have permission to view this contact." +#: templates/menu/menu.inc:7 +msgid "_Add" +msgstr "" + +#: templates/menu/menu.inc:6 +msgid "_Browse" +msgstr "" + +#: templates/browse/actions.inc:5 +msgid "_Delete" +msgstr "" + +#: templates/menu/menu.inc:25 +msgid "_Help" +msgstr "" + +#: templates/menu/menu.inc:12 +msgid "_Import/Export" +msgstr "" + +#: templates/menu/menu.inc:17 +msgid "_Options" +msgstr "" + +#: templates/browse/actions.inc:5 +msgid "_Remove from this list" +msgstr "" + +#: templates/menu/menu.inc:8 +msgid "_Search" msgstr "" #: vcard.php:68 msgid "contact.vcf" msgstr "" -#: data.php:108 templates/data/export.inc:1 +#: templates/data/export.inc:1 msgid "contacts.csv" msgstr "" -#: data.php:112 -msgid "contacts.tsv" -msgstr "" - #: templates/addlink/contacts.inc:80 msgid "from" msgstr "" @@ -1016,7 +967,7 @@ msgid "to Selected Address Book" msgstr "" -#: data.php:32 templates/browse/column_headers.inc:9 -#: templates/data/import.inc:20 templates/data/export.inc:19 +#: templates/browse/column_headers.inc:9 templates/data/import.inc:20 +#: templates/data/export.inc:19 msgid "vCard" msgstr "" From cvs at intevation.de Tue May 3 04:11:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:11:33 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/po de_DE.po, 1.1.1.1, 1.2 horde.pot, 1.1.1.1, 1.2 translation.php, 1.2, 1.3 Message-ID: <20050503021127.E48601006DA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/po In directory doto:/tmp/cvs-serv2944/kolab-resource-handlers/fbview/fbview/po Modified Files: de_DE.po horde.pot translation.php Log Message: Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter Index: de_DE.po =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/po/de_DE.po,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- de_DE.po 11 Jun 2004 10:51:00 -0000 1.1.1.1 +++ de_DE.po 3 May 2005 02:11:25 -0000 1.2 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Horde 3.0-cvs\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2004-05-18 11:52+0200\n" +"POT-Creation-Date: 2005-05-03 03:04+0200\n" "PO-Revision-Date: 2004-05-18 13:05+0200\n" "Last-Translator: Jan Schneider \n" "Language-Team: German \n" @@ -14,14 +14,14 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" [...4282 lines suppressed...] msgid "unnamed" msgstr "unbenannt" -#: po/translation.php:355 +#: po/translation.php:361 msgid "updated" msgstr "aktualisiert" @@ -7533,10 +7560,6 @@ msgid "vCard" msgstr "vCard" -#: framework/UI/UI/VarRenderer/html.php:193 +#: framework/UI/UI/VarRenderer/html.php:211 msgid "w:" msgstr "b:" - -#: config/registry.php.dist:627 -msgid "weather.com" -msgstr "weather.com" Index: horde.pot =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/po/horde.pot,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- horde.pot 11 Jun 2004 10:51:05 -0000 1.1.1.1 +++ horde.pot 3 May 2005 02:11:25 -0000 1.2 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2004-04-29 21:23+0200\n" +"POT-Creation-Date: 2005-05-03 03:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,151 +16,151 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" [...5149 lines suppressed...] msgid "unnamed" msgstr "" -#: po/translation.php:355 +#: po/translation.php:361 msgid "updated" msgstr "" @@ -7232,10 +7312,6 @@ msgid "vCard" msgstr "" -#: framework/UI/UI/VarRenderer/html.php:193 +#: framework/UI/UI/VarRenderer/html.php:211 msgid "w:" -msgstr "" - -#: config/registry.php.dist:618 -msgid "weather.com" msgstr "" Index: translation.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/po/translation.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- translation.php 12 Oct 2004 11:52:38 -0000 1.2 +++ translation.php 3 May 2005 02:11:25 -0000 1.3 @@ -1,4 +1,4 @@ -#!/kolab/bin/php -q +#!/kolab/bin/php -c /kolab/etc/apache/php.ini Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv3072 Modified Files: master.cf.template Log Message: no need to run only one instance of filter Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- master.cf.template 3 Apr 2005 23:22:12 -0000 1.6 +++ master.cf.template 3 May 2005 02:12:50 -0000 1.7 @@ -82,7 +82,7 @@ @@@endif@@@ -permithosts @@@kolabhost|join,@@@ -kolabfilter unix - n n - 1 pipe user=@l_nusr@ flags= argv=@l_prefix@/bin/php +kolabfilter unix - n n - - pipe user=@l_nusr@ flags= argv=@l_prefix@/bin/php -c @l_prefix@/etc/apache/php.ini -f @l_prefix@/etc/resmgr/kolabfilter.php -- @@ -91,7 +91,7 @@ -r ${recipient} -c ${client_address} -kolabmailboxfilter unix - n n - 1 pipe user=@l_nusr@ flags= argv=@l_prefix@/bin/php +kolabmailboxfilter unix - n n - - pipe user=@l_nusr@ flags= argv=@l_prefix@/bin/php -c @l_prefix@/etc/apache/php.ini -f @l_prefix@/etc/resmgr/kolabmailboxfilter.php -- From cvs at intevation.de Tue May 3 04:26:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:26:12 2005 Subject: steffen: server obmtool.conf,1.155,1.156 Message-ID: <20050503022611.4852F1006D1@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3326 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 --- obmtool.conf 28 Apr 2005 00:16:59 -0000 1.155 +++ obmtool.conf 3 May 2005 02:26:09 -0000 1.156 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="2.0-beta5"; + kolab_version="2.0-snapshot"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -132,9 +132,9 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050427 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050502 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-0.4.0-20050428 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20050427 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050502 --define kolab_version=$kolab_version @check %dump From cvs at intevation.de Tue May 3 04:26:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 04:26:13 2005 Subject: steffen: server/kolabd kolabd.spec,1.42,1.43 Message-ID: <20050503022611.4E2741006D3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv3326/kolabd Modified Files: kolabd.spec Log Message: versions Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- kolabd.spec 28 Apr 2005 00:16:59 -0000 1.42 +++ kolabd.spec 3 May 2005 02:26:09 -0000 1.43 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050427 +Release: 20050502 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Tue May 3 12:53:33 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 12:53:35 2005 Subject: david: doc/kolab-formats commonfields.sgml,1.20,1.21 Message-ID: <20050503105333.90B3E1006AF@lists.intevation.de> Author: david Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv5637 Modified Files: commonfields.sgml Log Message: Mention scheduling-id Index: commonfields.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/commonfields.sgml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- commonfields.sgml 11 Mar 2005 11:37:07 -0000 1.20 +++ commonfields.sgml 3 May 2005 10:53:31 -0000 1.21 @@ -53,6 +53,7 @@ (string, default empty) (string, default empty) + (string, default not present) (string, default empty) (string, default empty) @@ -79,6 +80,15 @@ (string, default required) } ]]> + +The scheduling ID is usually not set (meaning that it's identical to the UID). +The only case where it's set, is when the event comes from accepting an incidence. +In that case, the scheduling ID is the same as the UID of the initial invitation, +and this incidence has a different UID. The scheduling ID is used for all +scheduling purposes, in particular for matching replies with invitations. +The reason for not using the same UID in both incidences is that they would +conflict if they are stored in different calendar folders. + The start-date is optional for tasks. For events, it is required. If they are there, they can either have a date or a datetime as the From cvs at intevation.de Tue May 3 12:53:33 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 12:53:36 2005 Subject: david: doc/kolab-formats/validation/tests event6.xml,1.4,1.5 Message-ID: <20050503105333.A4843101EE9@lists.intevation.de> Author: david Update of /kolabrepository/doc/kolab-formats/validation/tests In directory doto:/tmp/cvs-serv5637/validation/tests Modified Files: event6.xml Log Message: Mention scheduling-id Index: event6.xml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event6.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- event6.xml 11 Oct 2004 12:08:14 -0000 1.4 +++ event6.xml 3 May 2005 10:53:31 -0000 1.5 @@ -3,6 +3,7 @@ 2004-06-15T14:45:00 2004-06-15T14:45:00 208sf"P£(*$ + 20812398747 2004-06-15T14:45:00 David Faure's secretary From cvs at intevation.de Tue May 3 12:53:33 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 12:53:37 2005 Subject: david: doc/kolab-formats/validation kolab-storage.rng,1.15,1.16 Message-ID: <20050503105333.ADAE3101EF9@lists.intevation.de> Author: david Update of /kolabrepository/doc/kolab-formats/validation In directory doto:/tmp/cvs-serv5637/validation Modified Files: kolab-storage.rng Log Message: Mention scheduling-id Index: kolab-storage.rng =================================================================== RCS file: /kolabrepository/doc/kolab-formats/validation/kolab-storage.rng,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- kolab-storage.rng 20 Oct 2004 11:36:02 -0000 1.15 +++ kolab-storage.rng 3 May 2005 10:53:31 -0000 1.16 @@ -137,6 +137,11 @@ + + + + + From cvs at intevation.de Tue May 3 13:25:14 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:25:16 2005 Subject: bernhard: doc/kolab-formats kolabformat.sgml,1.9,1.10 Message-ID: <20050503112514.BA9C2101EE1@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv6424 Modified Files: kolabformat.sgml Log Message: Authornames: sorted. Added David. Repared publication as 1.0rc1. Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- kolabformat.sgml 20 Oct 2004 11:36:02 -0000 1.9 +++ kolabformat.sgml 3 May 2005 11:25:12 -0000 1.10 @@ -15,18 +15,20 @@ The Kolab Storage Format -Draft CVS +1.0rc1 Bo Thorsen, bo@sonofthor.dk + David Faure, dfaure@klaralvdalens-datakonsult.se Joon Radley, joon@radleys.co.za + Martin Konold, martin.konold@erfrakon.de Stephan Buys, s.buys@codefusion.co.za Stuart Binge, s.binge@codefusion.co.za - Martin Konold, martin.konold@erfrakon.de www.kolab.org -CVS $Date$ $Revision$ + +May 3rd, 2005 This documentation was written in SGML using the DocBook DTD. HTML and Postscript output is generated automatically and depends on the @@ -101,17 +103,20 @@ -cvs20041010 -October 10th 2004 +1.0rc1 +May 3rd, 2005 -Added version attribute. +Added version attribute, "yearly weekday" recurrence, scheduling-id; +Changed date to daynumber. + From cvs at intevation.de Tue May 3 13:27:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:27:47 2005 Subject: bernhard: doc/kolab-formats kolabformat.sgml,1.10,1.11 Message-ID: <20050503112747.09112101EE1@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv6508 Modified Files: kolabformat.sgml Log Message: Marked as CVS version again. Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- kolabformat.sgml 3 May 2005 11:25:12 -0000 1.10 +++ kolabformat.sgml 3 May 2005 11:27:45 -0000 1.11 @@ -15,7 +15,7 @@ The Kolab Storage Format -1.0rc1 +Draft CVS Bo Thorsen, bo@sonofthor.dk @@ -27,8 +27,8 @@ www.kolab.org - -May 3rd, 2005 +CVS $Date$ $Revision$ + This documentation was written in SGML using the DocBook DTD. HTML and Postscript output is generated automatically and depends on the @@ -111,12 +111,10 @@ - From cvs at intevation.de Tue May 3 13:35:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:35:08 2005 Subject: bernhard: doc/kolab-formats kolab-file-format.lyx,1.6,NONE Message-ID: <20050503113507.11480101F12@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv6719 Removed Files: kolab-file-format.lyx Log Message: Removing outdated draft from HEAD. --- kolab-file-format.lyx DELETED --- From cvs at intevation.de Tue May 3 13:38:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:38:23 2005 Subject: bernhard: doc/kolab-formats/kolab2 Contacts,1.4,NONE Message-ID: <20050503113823.10A7E101F12@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats/kolab2 In directory doto:/tmp/cvs-serv6824 Removed Files: Contacts Log Message: Removing drafts that we did not use. --- Contacts DELETED --- From cvs at intevation.de Tue May 3 13:55:44 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:55:45 2005 Subject: steffen: server/kolabd kolabd.spec,1.43,1.44 Message-ID: <20050503115544.9E7381006C0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv7118/kolabd Modified Files: kolabd.spec Log Message: added DB_CONFIG (Issue707) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- kolabd.spec 3 May 2005 02:26:09 -0000 1.43 +++ kolabd.spec 3 May 2005 11:55:42 -0000 1.44 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050502 +Release: 20050503 # list of sources Source0: kolabd-1.9.4.tar.gz @@ -57,7 +57,7 @@ PreReq: postfix >= 2.1.5-2.2.0, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes -PreReq: perl-kolab >= 5.8.5-20050309, perl-db +PreReq: perl-kolab >= 5.8.5-20050503, perl-db PreReq: amavisd >= 2.1.2-2.2.0_kolab PreReq: clamav AutoReq: no From cvs at intevation.de Tue May 3 13:55:44 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:55:46 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.86,1.87 Message-ID: <20050503115544.A7DF9101F0B@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv7118/perl-kolab Modified Files: perl-kolab.spec Log Message: added DB_CONFIG (Issue707) Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- perl-kolab.spec 22 Apr 2005 01:37:16 -0000 1.86 +++ perl-kolab.spec 3 May 2005 11:55:42 -0000 1.87 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 20050421 +Release: 20050503 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Tue May 3 13:55:44 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:55:47 2005 Subject: steffen: server/kolabd/kolabd/templates DB_CONFIG.slapd.template, NONE, 1.1 slapd.conf.template, 1.7, 1.8 Message-ID: <20050503115544.A868E1006DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv7118/kolabd/kolabd/templates Modified Files: slapd.conf.template Added Files: DB_CONFIG.slapd.template Log Message: added DB_CONFIG (Issue707) --- NEW FILE: DB_CONFIG.slapd.template --- # (c) 2005 Klaraelvdalens Datakonsult AB # Written by Steffen Hansen # # This program is Free Software under the GNU General Public License (>=v2). # Read the file COPYING that comes with this packages for details. # this file is automatically written by the Kolab config backend and should have the # file mode 0640 set_cachesize 0 26214400 1 set_tmp_dir /dev/shm Index: slapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- slapd.conf.template 28 Mar 2005 23:52:48 -0000 1.7 +++ slapd.conf.template 3 May 2005 11:55:42 -0000 1.8 @@ -52,7 +52,7 @@ bindmethod=simple credentials=secret -index objectClass eq +index objectClass pres,eq index uid approx,sub,pres,eq index mail approx,sub,pres,eq index alias approx,sub,pres,eq @@ -61,7 +61,7 @@ index kolabHomeServer pres,eq index member pres,eq - +idlcachesize 2000 access to attr=userPassword by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" =wx From cvs at intevation.de Tue May 3 13:55:44 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 13:55:47 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.50,1.51 Message-ID: <20050503115544.ADA90101F0C@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv7118/perl-kolab/Kolab-Conf Modified Files: Conf.pm Log Message: added DB_CONFIG (Issue707) Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- Conf.pm 19 Apr 2005 10:59:22 -0000 1.50 +++ Conf.pm 3 May 2005 11:55:42 -0000 1.51 @@ -575,6 +575,7 @@ "$templatedir/proftpd.conf.template" => "$prefix/etc/proftpd/proftpd.conf", "$templatedir/ldap.conf.template" => "$prefix/etc/openldap/ldap.conf", "$templatedir/slapd.conf.template" => "$prefix/etc/openldap/slapd.conf", + "$templatedir/DB_CONFIG.slapd.template" => "$prefix/var/openldap/openldap-data/DB_CONFIG", "$templatedir/freebusy.conf.template" => "$prefix/etc/resmgr/freebusy.conf", "$templatedir/fbview.conf.template" => "$prefix/etc/resmgr/fbview.conf", "$templatedir/resmgr.conf.template" => "$prefix/etc/resmgr/resmgr.conf" @@ -599,6 +600,7 @@ "$prefix/etc/apache/php.ini" => 0640, "$prefix/etc/proftpd/proftpd.conf" => 0640, "$prefix/etc/openldap/slapd.conf" => 0640, + "$prefix/var/openldap/openldap-data/DB_CONFIG" => 0640, "$prefix/etc/openldap/ldap.conf" => 0644, "$prefix/etc/postfix/transport" => 0640, "$prefix/etc/imapd/cyrus.conf" => 0640, @@ -624,6 +626,7 @@ "$prefix/etc/proftpd/proftpd.conf" => "kolab:kolab-n", "$prefix/etc/openldap/ldap.conf" => "kolab:kolab", "$prefix/etc/openldap/slapd.conf" => "kolab:kolab", + "$prefix/var/openldap/openldap-data/DB_CONFIG" => "kolab:kolab", "$prefix/etc/postfix/transport" => "root:kolab", "$prefix/etc/imapd/cyrus.conf" => "kolab:kolab", "$prefix/etc/imapd/imapd.group" => "kolab:kolab-r"); From cvs at intevation.de Tue May 3 14:12:08 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 14:12:08 2005 Subject: steffen: server/kolabd/kolabd/doc README.outlook,NONE,1.1 Message-ID: <20050503121208.14994101F0C@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/doc In directory doto:/tmp/cvs-serv7599 Added Files: README.outlook Log Message: Description of the Outlook forwarding problem/solution --- NEW FILE: README.outlook --- Outlook specific issues ======================= Last edited $Id: README.outlook,v 1.1 2005/05/03 12:12:06 steffen Exp $ Microsoft Outlook acts a little peculiar when forwarding iCal invitation messages. Such messages are just passed on to the new recipient without having headers modified. This causes such messages to be rejected by the Kolab server. As a solution to this problem the mail filter on the server can capture such messages and embed them as an attachment to an email message with valid headers and a short description that the message is forwarded. Additionally, some versions of Outlook are incapable of recognizing non-ascii charaters in such forwarded messages, so the filter rewrites common non-ascii characters to ascii (for example ö => oe). resmgr.conf.template has an option for allowing or disallowing "Outlook forwarding". Set $params['allow_outlook_ical_forward'] = true; to enable (default) or $params['allow_outlook_ical_forward'] = false; to disable. From cvs at intevation.de Tue May 3 14:15:20 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 14:15:22 2005 Subject: steffen: server/kolabd/kolabd/doc README.outlook,1.1,1.2 Message-ID: <20050503121520.7FEBF101F0C@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/doc In directory doto:/tmp/cvs-serv7707 Modified Files: README.outlook Log Message: Description of the Outlook forwarding problem/solution Index: README.outlook =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.outlook,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README.outlook 3 May 2005 12:12:06 -0000 1.1 +++ README.outlook 3 May 2005 12:15:18 -0000 1.2 @@ -3,6 +3,9 @@ Last edited $Id$ +Invitation Forwarding +--------------------- + Microsoft Outlook acts a little peculiar when forwarding iCal invitation messages. Such messages are just passed on to the new recipient without having headers modified. This causes such messages @@ -15,7 +18,7 @@ Additionally, some versions of Outlook are incapable of recognizing non-ascii charaters in such forwarded messages, so the filter rewrites -common non-ascii characters to ascii (for example ö => oe). +common non-ascii characters to ascii (for example ? oe). resmgr.conf.template has an option for allowing or disallowing "Outlook forwarding". Set From cvs at intevation.de Tue May 3 16:53:49 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 16:53:50 2005 Subject: bernhard: doc/kolab-formats kolabformat.sgml,1.11,1.12 Message-ID: <20050503145349.CF1C1101F0F@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv11280 Modified Files: kolabformat.sgml Log Message: Changed numbering of this document to 2.0rc, this reflects the fact better, that this is the storage format of Kolab2. Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- kolabformat.sgml 3 May 2005 11:27:45 -0000 1.11 +++ kolabformat.sgml 3 May 2005 14:53:47 -0000 1.12 @@ -15,7 +15,8 @@ The Kolab Storage Format -Draft CVS +2.0rc1 + Bo Thorsen, bo@sonofthor.dk @@ -27,8 +28,8 @@ www.kolab.org -CVS $Date$ $Revision$ - +May 3rd, 2005 + This documentation was written in SGML using the DocBook DTD. HTML and Postscript output is generated automatically and depends on the @@ -103,7 +104,7 @@ -1.0rc1 +2.0rc1 May 3rd, 2005 Added version attribute, "yearly weekday" recurrence, scheduling-id; @@ -111,10 +112,12 @@ + From cvs at intevation.de Tue May 3 17:15:54 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 17:15:55 2005 Subject: bernhard: doc/www/src documentation.html.m4,1.11,1.12 Message-ID: <20050503151554.1923E101F0F@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv11701 Modified Files: documentation.html.m4 Log Message: Added format 2.0rc1. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- documentation.html.m4 11 Oct 2004 16:03:31 -0000 1.11 +++ documentation.html.m4 3 May 2005 15:15:52 -0000 1.12 @@ -2,10 +2,15 @@ m4_include(header.html.m4)
This page was updated on:
$Date$
-

(upcoming) Kolab2

+

Kolab2

-

Kolab2 Storage Format Specification Draft

+

Kolab2 Storage Format Specification

    +
  • + Version Release Candidate 2.0rc1   + Browse Online + | + Download pdf
  • Version Draft cvs20041007 Download pdf From cvs at intevation.de Tue May 3 17:15:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 3 17:15:59 2005 Subject: michel: doc/proko2-doc doc2.sxw,1.63,1.64 Message-ID: <20050503151558.2D03C101F14@lists.intevation.de> Author: michel Update of /kolabrepository/doc/proko2-doc In directory doto:/tmp/cvs-serv11697 Modified Files: doc2.sxw Log Message: added moving folders tiny project documentation - thx till - i did not find any issue for that - Bernhard could you check if it is written as you want it to be Index: doc2.sxw =================================================================== RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 Binary files /tmp/cvssAT7ei and /tmp/cvs4Qu2jv differ From cvs at intevation.de Wed May 4 01:25:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 4 01:25:47 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.29,1.30 Message-ID: <20050503232546.7D891101F1D@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv24825/Kolab-LDAP Modified Files: LDAP.pm Log Message: no more "c" permissions for public folders (Issue222) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- LDAP.pm 22 Apr 2005 01:50:19 -0000 1.29 +++ LDAP.pm 3 May 2005 23:25:44 -0000 1.30 @@ -212,8 +212,8 @@ elsif( lc $perm eq 'read anon' ) { $_ = "$uid lr"; } elsif( lc $perm eq 'read hidden' ) { $_ = "$uid rs"; } elsif( lc $perm eq 'append' ) { $_ = "$uid lrsip"; } - elsif( lc $perm eq 'write' ) { $_ = "$uid lrsiwcdp"; } - elsif( lc $perm eq 'all' ) { if( $sf ) { $_ = "$uid lrsiwcdap"; } else { $_ = "$uid lrsiwcdap"; } } + elsif( lc $perm eq 'write' ) { if( $sf ) { $_ = "$uid lrsiwdp"; } else { $_ = "$uid lrsiwcdp"; } } + elsif( lc $perm eq 'all' ) { if( $sf ) { $_ = "$uid lrsiwdap"; } else { $_ = "$uid lrsiwcdap"; } } else { $_ = "$uid $perm"; } # passthrough if( $post ) { $_ .= 'p'; } Kolab::log('L', "Kolab::LDAP::mapAcls() acl=$_", KOLAB_DEBUG); From cvs at intevation.de Wed May 4 13:12:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 4 13:12:23 2005 Subject: bernhard: doc/www/src index.html.m4, 1.48, 1.49 newsarchive.html.m4, 1.4, 1.5 Message-ID: <20050504111221.C06E91006AC@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv5757 Modified Files: index.html.m4 newsarchive.html.m4 Log Message: Added news: client rc1 release. Archived old news. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- index.html.m4 25 Apr 2005 16:01:02 -0000 1.48 +++ index.html.m4 4 May 2005 11:12:19 -0000 1.49 @@ -37,6 +37,26 @@
    + + +
    May 4th, 2005» + Kolab2 Clients out of beta. +
    +
    +The KDE Kolab2 client has been published as +"release candidate 1" tarball based on KDE 3.3. +A logical consequence of good experiences with this software +within the last months. +Get it from the download servers along with the release notes. +The release comes so late, because: +KDE packagers tend to build from stable CVS branches +and often do not rely on tarballs anyway. +

    +On a related note: Toltec 2.0 release candidate 2 is also available. +

    +

    + +
    April 25th, 2005 » Kolab 2 Server beta 5 published. @@ -47,8 +67,15 @@

    + + + + +

    + + - + @@ -79,57 +106,6 @@

    - - - -

    - -
    Aprill 19th, 2005
    April 19th, 2005 » German Install Tutorial contributed
    - - -
    March 26th, 2005» - Kolab 2 Server beta 4 available -
    -
    - The forth beta of the Kolab 2 Server now also offers a German - admin interface. The team welcomes additional translations. - Some minor improvements were made and, as always: The mirrors - are your friends. - Thanks to Belnet at this point for providing another mirror for Kolab. -
    -

    - - - - - - - - -
    March 10th, 2005» - Kolab 2 Server beta 3 released. -
    -

    - The third beta of the Kolab 2 server implementation - is out on the mirrors. - It fixes security issues - and a few bugs. Details can be found in the release notes. -
    -

    - - - - -
    March 9th, 2005» - Kolab demonstrated at CeBIT 2005 -
    -

    - If you happen to attend CeBIT - you can peek a look at Kolab 2 in the KDE booth - in Hall 6, LinuxPark. CeBIT is the worlds largest trade show - and runs from March 10th to 16th 2005 in Hannover, Germany. -
    -

    Index: newsarchive.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- newsarchive.html.m4 26 Mar 2005 18:03:13 -0000 1.4 +++ newsarchive.html.m4 4 May 2005 11:12:19 -0000 1.5 @@ -12,6 +12,53 @@
    + + +
    March 26th, 2005» + Kolab 2 Server beta 4 available +
    +
    + The forth beta of the Kolab 2 Server now also offers a German + admin interface. The team welcomes additional translations. + Some minor improvements were made and, as always: The mirrors + are your friends. + Thanks to Belnet at this point for providing another mirror for Kolab. +
    +

    + + + + + + + + +
    March 10th, 2005» + Kolab 2 Server beta 3 released. +
    +

    + The third beta of the Kolab 2 server implementation + is out on the mirrors. + It fixes security issues + and a few bugs. Details can be found in the release notes. +
    +

    + + + + +
    March 9th, 2005» + Kolab demonstrated at CeBIT 2005 +
    +

    + If you happen to attend CeBIT + you can peek a look at Kolab 2 in the KDE booth + in Hall 6, LinuxPark. CeBIT is the worlds largest trade show + and runs from March 10th to 16th 2005 in Hannover, Germany. +
    +

    + +
    February 9th, 2005 » Security Advisory for Kolab Server From cvs at intevation.de Wed May 4 16:32:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 4 16:32:47 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.118, 1.119 Message-ID: <20050504143246.EB8491006DB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv8955 Modified Files: kolab-resource-handlers.spec Log Message: Hacked missing ORGANIZER into the iCal for Outlook (Issue665) Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- kolab-resource-handlers.spec 3 May 2005 02:11:25 -0000 1.118 +++ kolab-resource-handlers.spec 4 May 2005 14:32:44 -0000 1.119 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050502 +Release: 20050504 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Wed May 4 16:32:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 4 16:32:48 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.22, 1.23 olhacks.php, 1.6, 1.7 Message-ID: <20050504143247.0A510101EE1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv8955/kolab-resource-handlers/resmgr Modified Files: kolabfilter.php olhacks.php Log Message: Hacked missing ORGANIZER into the iCal for Outlook (Issue665) Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- kolabfilter.php 3 May 2005 02:11:25 -0000 1.22 +++ kolabfilter.php 4 May 2005 14:32:44 -0000 1.23 @@ -28,6 +28,34 @@ require_once 'kolabfilter/misc.php'; require_once 'kolabfilter/kolabmailtransport.php'; +// Profiling code +/* +function mymtime(){ + $tmp=explode(' ',microtime()); + $rt=$tmp[0]+$tmp[1]; + return $rt; +} + +class MyTimer { + function MyTimer( $name ) { + $this->name = $name; + } + function start() { + $this->time = mymtime(); + } + function stop() { + $time = 100*(mymtime()-$this->time); + myLog("Section ".$this->name." took $time msecs", RM_LOG_DEBUG); + } + + var $name; + var $time; +}; + +$totaltime =& new MyTimer("Total"); +$totaltime->start(); +*/ + // Load our configuration file $params = array(); require_once '@l_prefix@/etc/resmgr/resmgr.conf'; @@ -37,6 +65,9 @@ define( 'EX_TEMPFAIL', 75 ); define( 'EX_UNAVAILABLE', 69 ); +//$inputtime =& new MyTimer("Input"); +//$inputtime->start(); + // Temp file for storing the message $tmpfname = tempnam( TMPDIR, 'IN.' ); $tmpf = fopen($tmpfname, "w"); @@ -153,6 +184,8 @@ } fclose($tmpf); +//$inputtime->stop(); + if( !$senderok ) { if( $ical && $params['allow_outlook_ical_forward'] ) { require_once('kolabfilter/olhacks.php'); @@ -170,6 +203,9 @@ } } +//$outputtime =& new MyTimer("Output"); +//$outputtime->start(); + $tmpf = fopen($tmpfname,"r"); $smtp = new KolabSMTP( 'localhost', 10026 ); if( PEAR::isError( $smtp ) ) { @@ -204,6 +240,8 @@ //myLog("Calling smtp->end()", RM_LOG_DEBUG); $smtp->end(); +//$outputtime->stop(); myLog("Kolabfilter successfully completed", RM_LOG_DEBUG); +//$totaltime->stop(); exit(0); ?> Index: olhacks.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- olhacks.php 28 Apr 2005 09:08:41 -0000 1.6 +++ olhacks.php 4 May 2005 14:32:44 -0000 1.7 @@ -20,6 +20,7 @@ require_once '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'; @@ -68,6 +69,35 @@ } } +/* + * Yet another problem: Outlook seems to remove the organizer + * from the iCal when forwarding -- we put the original sender + * back in as organizer. + */ +/* static */ function add_organizer( &$icaltxt, $from ) { + global $params; + $iCal = &new Horde_iCalendar(); + $iCal->parsevCalendar($icaltxt); + $vevent =& $iCal->findComponent('VEVENT'); + if( $vevent ) { + #myLog("Successfully parsed vevent", RM_LOG_DEBUG); + if( !$vevent->organizerName() ) { + #myLog("event has no organizer, adding $from", RM_LOG_DEBUG); + $adrs = imap_rfc822_parse_adrlist($from, $params['email_domain']); + if( count($adrs) > 0 ) { + $org_email = $adrs[0]->mailbox.'@'.$adrs[0]->host; + $org_name = $adrs[0]->personal; + if( $org_name ) $vevent->setAttribute( 'ORGANIZER', $org_email, + array( 'CN' => $org_name), false ); + else $vevent->setAttribute( 'ORGANIZER', $org_email, + array(), false ); + myLog("Adding missing organizer '$org_name <$org_email>' to iCal", RM_LOG_DEBUG); + $icaltxt = $iCal->exportvCalendar(); + } + } + } +} + /* Yet another Outlook problem: Some versions of Outlook seems to be incapable * of handling non-ascii characters properly in text/calendar parts of * a multi-part/mixed mail which we use for forwarding. @@ -75,7 +105,7 @@ * two-letter ascii. */ /* static */ function olhacks_recode_to_ascii( $text ) { - myLog("recoding \"$text\"", RM_LOG_DEBUG); + #myLog("recoding \"$text\"", RM_LOG_DEBUG); $text = str_replace( ('æ'), 'ae', $text ); $text = str_replace( ('ø'), 'oe', $text ); $text = str_replace( ('Ã¥'), 'aa', $text ); @@ -90,7 +120,7 @@ $text = str_replace( ('Ä'), 'Ae', $text ); $text = str_replace( ('Ö'), 'Oe', $text ); $text = str_replace( ('Ãœ'), 'Ue', $text ); - myLog("recoded to \"$text\"", RM_LOG_DEBUG); + #myLog("recoded to \"$text\"", RM_LOG_DEBUG); return $text; } @@ -125,7 +155,9 @@ $toppart = &new MIME_Message(); $dorigfrom = Mail_mimeDecode::_decodeHeader($origfrom); $textpart = &new MIME_Part('text/plain', sprintf($forwardtext,$dorigfrom,$dorigfrom), 'UTF-8' ); - $msgpart = &new MIME_Part($basepart->getType(), olhacks_recode_to_ascii($basepart->transferDecode()), + $ical_txt = $basepart->transferDecode(); + add_organizer($ical_txt, $dorigfrom); + $msgpart = &new MIME_Part($basepart->getType(), olhacks_recode_to_ascii($ical_txt), $basepart->getCharset() ); $toppart->addPart($textpart); From cvs at intevation.de Wed May 4 16:50:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 4 16:50:43 2005 Subject: steffen: server obmtool.conf,1.156,1.157 Message-ID: <20050504145042.530C41006D8@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9376 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- obmtool.conf 3 May 2005 02:26:09 -0000 1.156 +++ obmtool.conf 4 May 2005 14:50:40 -0000 1.157 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="2.0-snapshot"; + kolab_version="pre-2.0-snapshot"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -85,7 +85,7 @@ @install ${altloc}postfix-2.1.5-2.2.0_kolab --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 - @install ${altloc}perl-kolab-5.8.5-20050421 + @install ${altloc}perl-kolab-5.8.5-20050503 @install ${altloc}imapd-2.2.12-2.3.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars @install ${loc}m4-1.4.2-2.2.0 @install ${loc}bison-1.35-2.2.0 @@ -132,9 +132,9 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050502 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050503 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-0.4.0-20050428 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20050502 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050504 --define kolab_version=$kolab_version @check %dump From cvs at intevation.de Wed May 4 16:50:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 4 16:50:44 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder sf.php, 1.19, 1.20 Message-ID: <20050504145042.5A01E1006DF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder In directory doto:/tmp/cvs-serv9376/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder Modified Files: sf.php Log Message: versions Index: sf.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- sf.php 18 Mar 2005 09:15:45 -0000 1.19 +++ sf.php 4 May 2005 14:50:40 -0000 1.20 @@ -1,9 +1,10 @@ =v2). - Read the file COPYING that comes with this packages for details. + * (c) 2004 Klarälvdalens Datakonsult AB + * Written by Steffen Hansen + * + * This program is Free Software under the GNU General Public License (>=v2). + * Read the file COPYING that comes with this packages for details. */ require_once('admin/include/mysmarty.php'); From cvs at intevation.de Fri May 6 12:45:14 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 6 12:45:15 2005 Subject: bh: server release-notes.txt,1.6,1.7 README.1st,1.11,1.12 Message-ID: <20050506104514.182CB1005B1@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20860 Modified Files: release-notes.txt README.1st Log Message: update for RC 1 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- release-notes.txt 26 Apr 2005 09:52:03 -0000 1.6 +++ release-notes.txt 6 May 2005 10:45:11 -0000 1.7 @@ -1,75 +1,48 @@ Release notes Kolab2 Server -(Version 20050422, Kolab server 2.0 beta 5) +(Version 20050506, Kolab server 2.0 RC 1) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. -Changes since Beta 4, 20050324: +Changes since Beta 5, 20050422: - - updated openpkg packages: - openldap-2.2.23-2.3.0 - pth-2.0.4-2.3.0 + - kolabd 20050421 -> 20050503 + Run more than one instance of the kolabfilter to improve mail + performance - - kolabd 20050318 -> 20050421 + Add DB_CONFIG for openldap's database. Part of Issue707. - amavisd configuration: A kolab user sending Spam/Virus mails gets - a bounce notification. Mail sent from outside to a kolab user - will, as before, still be held in quarantine and the recipient - will get a notification. + Some more documentation: + - how Kolab uses sieve + - solution for invitations forwarded by Outlook - Added support for using a non-kolab ldap server instead of kolab's - own server as master. This includes: - - kolabd can listen to connections from other slurpds - - deletion of ldap objects can be adapted to such setups (issue721). + * Fixing: + Issue591 (show Kolab version) - Added some documentation about the amavisd, web-admin and - ldap-deletion configuration options in kolab. + - kolab-resource-handlers 20050412 -> 20050504 - Some more ldap indices were added. + some performance improvements * Fixing: - Issue647 (Message "perl: No worthy mechs found" fills up logs) - Issue681 (nobody/calendar password for slave) - Issue708 (session storage) - Issue706 (kolabpassword for calendar and nobody broken) - - - - kolab-resource-handlers 20050318 -> 20050412 - - Better handling of mails with multiple recipients - - Main part of a fix for Issue665 (outlook appointment forwarding - not possible with email spoof protection) - - - - kolab-webadmin 20050318 -> 20050422 - - It is now configurable which account types can log in to the - web-admin interface. E.g. login can be limited to normal users if - administration is not to be done with the admin interface. + Issue231 (german text in fbview) + Issue665 (problems with appointments forwarded by outlook) - Some more options for vacation notifications: - - whether to send notifications for messages classified as - spam or virus - - limit notifications to certain domains. + - kolab-webadmin 20050422 -> 20050428 * Fixing: - Issue660 (primary email addresses with incorrect maildomain) - - - - perl-kolab 20050318 -> 20050421 + Issue533 (add mail attribute to distribution lists) + Issue607 (do not remove users if they're single members of dlists) + Issue591 (Kolab version in "About Kolab" page) - * Fixing: - Issue647 (Message "perl: No worthy mechs found" fills up logs) - Issue698 (LDAP Sync can cause mailbox deletion) + - perl-kolab 20050421 -> 20050503 + Add DB_CONFIG for openldap's database. Part of Issue707. - - imapd imapd-2.2.12-2.3.0_kolab > 2.2.12-2.3.0_kolab2 + * Fixing: + Issue222 (no more "c" permissions for public folders) - * Fixing: - Issue571 (allow more characters in mailbox names) $Id$ Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- README.1st 2 May 2005 12:50:23 -0000 1.11 +++ README.1st 6 May 2005 10:45:11 -0000 1.12 @@ -142,6 +142,14 @@ able to log in to the web-admin interface. +Upgrade from Beta5 +------------------ + +Again, the openldap configuration has changed a bit. It should be +enough to run kolabconf and restart openldap. + + + For more information on Kolab, see http://www.kolab.org $Id$ From cvs at intevation.de Mon May 9 18:07:09 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 9 18:07:11 2005 Subject: david: doc/kde-client/svn-instructions - New directory Message-ID: <20050509160709.8A3DB100160@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv688/svn-instructions Log Message: Directory /kolabrepository/doc/kde-client/svn-instructions added to the repository From cvs at intevation.de Mon May 9 18:10:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 9 18:10:59 2005 Subject: david: doc/kde-client/svn-instructions checkout_proko2.sh, NONE, 1.1 Message-ID: <20050509161058.64C9D100160@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv756 Added Files: checkout_proko2.sh Log Message: first version, but a few files are still missing it seems --- NEW FILE: checkout_proko2.sh --- # 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. PROTOCOL can be either svn+ssh or https PROTOCOL=https SVNUSER= if test -z "$SVNUSER"; then echo "you must set SVNUSER in the script!" exit 1 fi if ! test -d kdepim; then echo "kdepim not found. Press ENTER to check it out from SVN." read && \ svn checkout $PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim || exit 1 fi cd kdepim function switch_dir() { ( cd $1 && svn switch "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$1" ) } function new_dir() { ( cd $1 && svn checkout "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$1/$2" ) } function update() { file=`basename $1` dir=`dirname $1` ( cd $dir && svn checkout "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" ) } function switch_file() { file=`basename $1` dir=`dirname $1` ( cd $dir && svn switch "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) } switch_dir certmanager/lib switch_dir kmail switch_dir kontact/plugins/summary switch_dir kresources/imap switch_dir kpilot switch_dir kioslaves/imap4 switch_dir doc/kmail switch_dir doc/korganizer switch_dir doc/kaddressbook switch_dir libkdepim switch_dir libkcal new_dir kresources kolab new_dir kontact data for f 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} \ kontact/Makefile.am kontact/src/{main.cpp,Makefile.am} \ korganizer/{freebusymanager.cpp,version.h,actionmanager.cpp} \ korganizer/{kodialogmanager.cpp,koagenda.cpp} \ korganizer/{kogroupware.{cpp,h},calendarview.{cpp,h}} \ korganizer/{koeventeditor.{cpp,h},koeditordetails.{cpp,h}} \ kresources/Makefile.am \ libkdenetwork/Makefile.am \ plugins/kmail/bodypartformatter/text_calendar.cpp \ wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \ ; do switch_file $f ; done From cvs at intevation.de Mon May 9 19:39:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 9 19:39:44 2005 Subject: bernhard: server/kolabd/kolabd/doc README.outlook,1.2,1.3 Message-ID: <20050509173942.ED4D71006BC@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd/doc In directory doto:/tmp/cvs-serv2131 Modified Files: README.outlook Log Message: Added description of adding Organizer (issue665 fix). Index: README.outlook =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/doc/README.outlook,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README.outlook 3 May 2005 12:15:18 -0000 1.2 +++ README.outlook 9 May 2005 17:39:40 -0000 1.3 @@ -16,6 +16,11 @@ message with valid headers and a short description that the message is forwarded. +Because some Outlook versions delete the Organizer attribute, +this attribute will be added again with the value from the "from" value +that Outlook had passed unmodified and thus should contain the email +of the event's organizer. + Additionally, some versions of Outlook are incapable of recognizing non-ascii charaters in such forwarded messages, so the filter rewrites common non-ascii characters to ascii (for example ? oe). @@ -29,4 +34,4 @@ $params['allow_outlook_ical_forward'] = false; -to disable. \ No newline at end of file +to disable. From cvs at intevation.de Mon May 9 19:47:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 9 19:47:59 2005 Subject: bernhard: doc/www/src index.html.m4,1.49,1.50 Message-ID: <20050509174758.1FDEA1006BE@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2314 Modified Files: index.html.m4 Log Message: Moved old server beta5 news down. Added server rc1 news. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- index.html.m4 4 May 2005 11:12:19 -0000 1.49 +++ index.html.m4 9 May 2005 17:47:56 -0000 1.50 @@ -37,6 +37,19 @@
    + + +
    May 9th, 2005» +Kolab 2 Server RC 1 published. +
    +
    +The first release candidate for Kolab 2 Server is public. +Like the couple of last betas +there are only a few minor fixes and improvements in this release. +
    +

    + +
    May 4th, 2005 » Kolab2 Clients out of beta. @@ -56,6 +69,13 @@

    + + + + + +

    +
    April 25th, 2005 » @@ -66,12 +86,6 @@ The fith beta of Kolab 2 Server comes with minor fixes and improvements.

    - - - - - -

    From cvs at intevation.de Mon May 9 22:19:31 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 9 22:19:32 2005 Subject: david: doc/kde-client/svn-instructions checkout_proko2.sh,1.1,1.2 Message-ID: <20050509201931.0E39B1005D9@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv5646 Modified Files: checkout_proko2.sh Log Message: Final version? :) Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- checkout_proko2.sh 9 May 2005 16:10:56 -0000 1.1 +++ checkout_proko2.sh 9 May 2005 20:19:29 -0000 1.2 @@ -2,38 +2,45 @@ # The script can even check out kdepim for you if needed. # David Faure , LGPL v2. -# Edit those lines. PROTOCOL can be either svn+ssh or https -PROTOCOL=https -SVNUSER= +# Edit those lines or set the env vars out of the script. +# SVNPROTOCOL can be either svn+ssh or https. +# +#SVNPROTOCOL=https +#SVNUSER= if test -z "$SVNUSER"; then - echo "you must set SVNUSER in the script!" + echo "You must set SVNUSER!" + exit 1 +fi + +if test -z "$SVNPROTOCOL"; then + echo "You must set SVNPROTOCOL!" exit 1 fi +SVN=svn + if ! test -d kdepim; then echo "kdepim not found. Press ENTER to check it out from SVN." read && \ - svn checkout $PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim || exit 1 + $SVN --username $SVNUSER checkout $SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim || exit 1 fi cd kdepim function switch_dir() { - ( cd $1 && svn switch "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$1" ) -} -function new_dir() { - ( cd $1 && svn checkout "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$1/$2" ) + ( cd $1 && $SVN --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$1" ) } + function update() { file=`basename $1` dir=`dirname $1` - ( cd $dir && svn checkout "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" ) + ( cd $dir && $SVN --username $SVNUSER checkout "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" ) } function switch_file() { file=`basename $1` dir=`dirname $1` - ( cd $dir && svn switch "$PROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) + ( cd $dir && $SVN --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) } switch_dir certmanager/lib @@ -47,8 +54,15 @@ switch_dir doc/kaddressbook switch_dir libkdepim switch_dir libkcal -new_dir kresources kolab -new_dir kontact data +switch_dir kontact/src + +# The downside of checking out a subdir is that "svn up" won't update it... +# Hence the major hack: replacing imap with kolab in .svn/entries +( cd kresources && + $SVN --username $SVNUSER checkout "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/kresources/kolab" && + perl -pi -e 's/imap/kolab/' .svn/entries && + rm -rf imap +) for f in \ kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \ @@ -58,7 +72,7 @@ kaddressbook/features/distributionlistwidget.{cpp,h} \ kaddressbook/features/resourceselection.{cpp,h} \ certmanager/{aboutdata.cpp,certificatewizard{.ui,impl.cpp},lib/backends/qgpgme/qgpgmejob.cpp} \ - kontact/Makefile.am kontact/src/{main.cpp,Makefile.am} \ + kontact/Makefile.am \ korganizer/{freebusymanager.cpp,version.h,actionmanager.cpp} \ korganizer/{kodialogmanager.cpp,koagenda.cpp} \ korganizer/{kogroupware.{cpp,h},calendarview.{cpp,h}} \ @@ -68,3 +82,8 @@ plugins/kmail/bodypartformatter/text_calendar.cpp \ wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \ ; do switch_file $f ; done + +### How to finish the branching of a dir where some files were branched: +# ( 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://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done From cvs at intevation.de Mon May 9 23:02:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 9 23:02:25 2005 Subject: david: doc/kde-client/svn-instructions checkout_proko2.sh,1.2,1.3 Message-ID: <20050509210223.A79BF10015D@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv6234/svn-instructions Modified Files: checkout_proko2.sh Log Message: Branched kresources completely, for less hacks here. proko2 should be fine now. Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- checkout_proko2.sh 9 May 2005 20:19:29 -0000 1.2 +++ checkout_proko2.sh 9 May 2005 21:02:21 -0000 1.3 @@ -19,6 +19,7 @@ fi SVN=svn +CDPATH= if ! test -d kdepim; then echo "kdepim not found. Press ENTER to check it out from SVN." @@ -29,15 +30,12 @@ cd kdepim function switch_dir() { + echo "switching $1..." ( cd $1 && $SVN --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$1" ) } -function update() { - file=`basename $1` - dir=`dirname $1` - ( cd $dir && $SVN --username $SVNUSER checkout "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" ) -} function switch_file() { + echo "switching $1..." file=`basename $1` dir=`dirname $1` ( cd $dir && $SVN --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) @@ -46,7 +44,6 @@ switch_dir certmanager/lib switch_dir kmail switch_dir kontact/plugins/summary -switch_dir kresources/imap switch_dir kpilot switch_dir kioslaves/imap4 switch_dir doc/kmail @@ -55,14 +52,7 @@ switch_dir libkdepim switch_dir libkcal switch_dir kontact/src - -# The downside of checking out a subdir is that "svn up" won't update it... -# Hence the major hack: replacing imap with kolab in .svn/entries -( cd kresources && - $SVN --username $SVNUSER checkout "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/kresources/kolab" && - perl -pi -e 's/imap/kolab/' .svn/entries && - rm -rf imap -) +switch_dir kresources for f in \ kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \ @@ -77,13 +67,13 @@ korganizer/{kodialogmanager.cpp,koagenda.cpp} \ korganizer/{kogroupware.{cpp,h},calendarview.{cpp,h}} \ korganizer/{koeventeditor.{cpp,h},koeditordetails.{cpp,h}} \ - kresources/Makefile.am \ libkdenetwork/Makefile.am \ plugins/kmail/bodypartformatter/text_calendar.cpp \ wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \ ; do switch_file $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://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done +# ( cd pure-proko2/kdepim/$subdir && cat /tmp/tocp | while read f ; do svn cp $SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done ) From cvs at intevation.de Mon May 9 23:09:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 9 23:09:23 2005 Subject: david: doc/kde-client/svn-instructions checkout_proko2.sh,1.3,1.4 Message-ID: <20050509210922.AEEA210015D@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv6463 Modified Files: checkout_proko2.sh Log Message: more readable Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- checkout_proko2.sh 9 May 2005 21:02:21 -0000 1.3 +++ checkout_proko2.sh 9 May 2005 21:09:20 -0000 1.4 @@ -69,8 +69,10 @@ korganizer/{koeventeditor.{cpp,h},koeditordetails.{cpp,h}} \ libkdenetwork/Makefile.am \ plugins/kmail/bodypartformatter/text_calendar.cpp \ - wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \ -; do switch_file $f ; done + wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} + do + switch_file $f +done ### How to finish the branching of a dir where some files were branched: ### (use with care, check each intermediate step...) From cvs at intevation.de Wed May 11 11:50:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 11 11:50:28 2005 Subject: jan: doc/www/src footer.html.m4,1.27,1.28 Message-ID: <20050511095027.206C81005CD@lists.intevation.de> Author: jan Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv24378 Modified Files: footer.html.m4 Log Message: Added Kolab-Konsortium to Support section. Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- footer.html.m4 18 Mar 2005 10:24:21 -0000 1.27 +++ footer.html.m4 11 May 2005 09:50:24 -0000 1.28 @@ -41,6 +41,7 @@ LINK(`documentation.html', `Documentation') LINK(`http://wiki.kolab.org/',`Wiki') Support Forums
    +Kolab-Konsortium
    From cvs at intevation.de Wed May 11 17:19:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 11 17:19:54 2005 Subject: jan: doc/www/src index.html.m4,1.50,1.51 Message-ID: <20050511151953.021EE1005B7@lists.intevation.de> Author: jan Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2360 Modified Files: index.html.m4 Log Message: Added news on Kolab-Konsortium. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- index.html.m4 9 May 2005 17:47:56 -0000 1.50 +++ index.html.m4 11 May 2005 15:19:50 -0000 1.51 @@ -37,6 +37,32 @@
    + + +
    May 11th, 2005» +Kolab-Konsortium: Enterprise Support available +
    +
    +Kolab-Konsortium, +formed by the companies +Intevation GmbH and Klarälvdalens Datakonsult AB, +started its activitis on commercial support +for Kolab Groupware. Its intention is +to complement the open Kolab Project with +commercial support in order to ensure +sustainable continued development of Kolab. +The web-site of Kolab-Konsortium is in german, +availability of english version will be announced here. + +

    +See the +german press release for more details. +

    + + +

    +
    May 9th, 2005 » Kolab 2 Server RC 1 published. From cvs at intevation.de Thu May 12 12:42:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 12 12:42:49 2005 Subject: wilde: doc/www/src about-kolab-clients.html.m4,1.8,1.9 Message-ID: <20050512104248.159B21006D7@lists.intevation.de> Author: wilde Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv25710 Modified Files: about-kolab-clients.html.m4 Log Message: Fixed anchor `toltec2' Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- about-kolab-clients.html.m4 20 Apr 2005 08:48:21 -0000 1.8 +++ about-kolab-clients.html.m4 12 May 2005 10:42:45 -0000 1.9 @@ -62,7 +62,7 @@ developments and prepare supported releases. - +

    Outlook Plugin: Toltec Connector 2

     From cvs at intevation.de Thu May 12 15:48:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 12 15:48:19 2005 Subject: david: doc/kolab-formats/validation kolab-storage.rng,1.16,1.17 Message-ID: <20050512134818.56972101F09@lists.intevation.de> Author: david Update of /kolabrepository/doc/kolab-formats/validation In directory doto:/tmp/cvs-serv1097/validation Modified Files: kolab-storage.rng Log Message: Revert addition of scheduling-id, as discussed today on IRC with Joon, Till and Steffen. Version is now 2.0-rc2 Index: kolab-storage.rng =================================================================== RCS file: /kolabrepository/doc/kolab-formats/validation/kolab-storage.rng,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- kolab-storage.rng 3 May 2005 10:53:31 -0000 1.16 +++ kolab-storage.rng 12 May 2005 13:48:16 -0000 1.17 @@ -137,11 +137,6 @@ - - - - - From cvs at intevation.de Thu May 12 15:48:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 12 15:48:20 2005 Subject: david: doc/kolab-formats/validation/tests event6.xml,1.5,1.6 Message-ID: <20050512134818.540F11005C9@lists.intevation.de> Author: david Update of /kolabrepository/doc/kolab-formats/validation/tests In directory doto:/tmp/cvs-serv1097/validation/tests Modified Files: event6.xml Log Message: Revert addition of scheduling-id, as discussed today on IRC with Joon, Till and Steffen. Version is now 2.0-rc2 Index: event6.xml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/validation/tests/event6.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- event6.xml 3 May 2005 10:53:31 -0000 1.5 +++ event6.xml 12 May 2005 13:48:16 -0000 1.6 @@ -3,7 +3,6 @@ 2004-06-15T14:45:00 2004-06-15T14:45:00 208sf"P£(*$ - 20812398747 2004-06-15T14:45:00 David Faure's secretary From cvs at intevation.de Thu May 12 15:48:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 12 15:48:21 2005 Subject: david: doc/kolab-formats commonfields.sgml, 1.21, 1.22 kolabformat.sgml, 1.12, 1.13 Message-ID: <20050512134818.58458101F0A@lists.intevation.de> Author: david Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv1097 Modified Files: commonfields.sgml kolabformat.sgml Log Message: Revert addition of scheduling-id, as discussed today on IRC with Joon, Till and Steffen. Version is now 2.0-rc2 Index: commonfields.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/commonfields.sgml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- commonfields.sgml 3 May 2005 10:53:31 -0000 1.21 +++ commonfields.sgml 12 May 2005 13:48:16 -0000 1.22 @@ -53,7 +53,6 @@ (string, default empty) (string, default empty) - (string, default not present) (string, default empty) (string, default empty) @@ -80,15 +79,6 @@ (string, default required) } ]]> - -The scheduling ID is usually not set (meaning that it's identical to the UID). -The only case where it's set, is when the event comes from accepting an incidence. -In that case, the scheduling ID is the same as the UID of the initial invitation, -and this incidence has a different UID. The scheduling ID is used for all -scheduling purposes, in particular for matching replies with invitations. -The reason for not using the same UID in both incidences is that they would -conflict if they are stored in different calendar folders. - The start-date is optional for tasks. For events, it is required. If they are there, they can either have a date or a datetime as the Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- kolabformat.sgml 3 May 2005 14:53:47 -0000 1.12 +++ kolabformat.sgml 12 May 2005 13:48:16 -0000 1.13 @@ -112,6 +112,14 @@ + +2.0rc2 +May 12th, 2005 + +Removed scheduling-id. + + + @@ -28,7 +28,7 @@ www.kolab.org -May 3rd, 2005 +May 16th, 2005 This documentation was written in SGML using the DocBook DTD. HTML From cvs at intevation.de Mon May 16 13:11:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 16 13:11:55 2005 Subject: bernhard: doc/www/src documentation.html.m4,1.12,1.13 Message-ID: <20050516111153.F2EF81006C9@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv12955 Modified Files: documentation.html.m4 Log Message: Added kolabformat-2.0rc2. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- documentation.html.m4 3 May 2005 15:15:52 -0000 1.12 +++ documentation.html.m4 16 May 2005 11:11:51 -0000 1.13 @@ -6,13 +6,17 @@

    Kolab2 Storage Format Specification

    From cvs at intevation.de Mon May 16 14:39:49 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 16 14:39:51 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailtransport.php, 1.1, 1.2 Message-ID: <20050516123949.B23FD101EE8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv15237 Modified Files: kolabmailtransport.php Log Message: Small error-handling fix Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolabmailtransport.php 7 Apr 2005 00:09:16 -0000 1.1 +++ kolabmailtransport.php 16 May 2005 12:39:47 -0000 1.2 @@ -50,7 +50,7 @@ if (PEAR::isError($error = $this->transport->rcptTo($recip))) { $msg = 'Failed to set recipient: ' . $error->getMessage(); myLog($msg, RM_LOG_ERROR); - return false; + return $error; } } From cvs at intevation.de Mon May 16 14:41:33 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 16 14:41:34 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.119, 1.120 Message-ID: <20050516124133.C0F9F101F09@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv15322 Modified Files: kolab-resource-handlers.spec Log Message: version Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- kolab-resource-handlers.spec 4 May 2005 14:32:44 -0000 1.119 +++ kolab-resource-handlers.spec 16 May 2005 12:41:31 -0000 1.120 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050504 +Release: 20050516 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Tue May 17 12:25:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 17 12:25:22 2005 Subject: steffen: server obmtool.conf,1.157,1.158 Message-ID: <20050517102521.0177A1005B7@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv21399 Modified Files: obmtool.conf Log Message: updated to db from openpkg 2.3.0, better error-handling in filter scripts, and better alias handling in postfix (now the problematic ldap lookup for distribution lists really shows up) Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.157 retrieving revision 1.158 diff -u -d -r1.157 -r1.158 --- obmtool.conf 4 May 2005 14:50:40 -0000 1.157 +++ obmtool.conf 17 May 2005 10:25:18 -0000 1.158 @@ -75,7 +75,7 @@ @install ${loc}imap-2004a-2.2.0 @install ${loc}procmail-3.22-2.2.0 @install ${loc}pth-2.0.4-2.3.0 - @install ${loc}db-4.2.52.2-2.2.0 + @install ${loc}db-4.3.27.3-2.3.0 @install ${loc}openldap-2.2.23-2.3.0 @install ${loc}sasl-2.1.19-2.2.1 --with=ldap --with=login @install ${loc}getopt-20030307-2.2.0 From cvs at intevation.de Tue May 17 12:25:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 17 12:25:24 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.23, 1.24 kolabmailboxfilter.php, 1.3, 1.4 kolabmailtransport.php, 1.2, 1.3 Message-ID: <20050517102521.09640101EF9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv21399/kolab-resource-handlers/kolab-resource-handlers/resmgr Modified Files: kolabfilter.php kolabmailboxfilter.php kolabmailtransport.php Log Message: updated to db from openpkg 2.3.0, better error-handling in filter scripts, and better alias handling in postfix (now the problematic ldap lookup for distribution lists really shows up) Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- kolabfilter.php 4 May 2005 14:32:44 -0000 1.23 +++ kolabfilter.php 17 May 2005 10:25:18 -0000 1.24 @@ -209,10 +209,14 @@ $tmpf = fopen($tmpfname,"r"); $smtp = new KolabSMTP( 'localhost', 10026 ); if( PEAR::isError( $smtp ) ) { - fwrite(STDOUT, $smtp->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } if( PEAR::isError( $error = $smtp->start($sender,$recipients) ) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } $headers_done = false; @@ -222,19 +226,25 @@ $headers_done = true; foreach( $add_headers as $h ) { if( PEAR::isError($error = $smtp->data( "$h\r\n" )) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } } } //myLog("Calling smtp->data( ".rtrim($buffer)." )", RM_LOG_DEBUG); if( PEAR::isError($error = $smtp->data( $buffer )) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } } while (!feof($tmpf) ) { $buffer = fread($tmpf, 8192); if( PEAR::isError($error = $smtp->data( $buffer )) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } }; Index: kolabmailboxfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolabmailboxfilter.php 3 May 2005 02:11:25 -0000 1.3 +++ kolabmailboxfilter.php 17 May 2005 10:25:18 -0000 1.4 @@ -121,10 +121,14 @@ $tmpf = fopen($tmpfname,"r"); $lmtp = new KolabLMTP(); if( PEAR::isError( $lmtp ) ) { - fwrite(STDOUT, $lmtp->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $lmtp->getMessage()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } if( PEAR::isError( $error = $lmtp->start($sender,$recipients) ) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } $headers_done = false; @@ -134,19 +138,25 @@ $headers_done = true; foreach( $add_headers as $h ) { if( PEAR::isError($error = $lmtp->data( "$h\r\n" )) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } } } //myLog("Calling smtp->data( ".rtrim($buffer)." )", RM_LOG_DEBUG); if( PEAR::isError($error = $lmtp->data( $buffer )) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } } while (!feof($tmpf) ) { $buffer = fread($tmpf, 8192); if( PEAR::isError($error = $lmtp->data( $buffer )) ) { - fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } }; //myLog("Calling smtp->end()", RM_LOG_DEBUG); Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolabmailtransport.php 16 May 2005 12:39:47 -0000 1.2 +++ kolabmailtransport.php 17 May 2005 10:25:18 -0000 1.3 @@ -34,14 +34,14 @@ $myclass = get_class($this->transport); if (!$this->transport) { - return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage()); + return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage(), 421); } if (PEAR::isError($error = $this->transport->connect())) { - return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage()); + return new PEAR_Error('Failed to connect to $myclass: ' . $error->getMessage(), 421); } if (PEAR::isError($error = $this->transport->mailFrom($sender))) { - return new PEAR_Error('Failed to set sender: ' . $error->getMessage()); + return new PEAR_Error('Failed to set sender: ' . $error->getMessage(), $this->transport->_code ); } if( !is_array( $recips ) ) $recips = array($recips); @@ -50,7 +50,7 @@ if (PEAR::isError($error = $this->transport->rcptTo($recip))) { $msg = 'Failed to set recipient: ' . $error->getMessage(); myLog($msg, RM_LOG_ERROR); - return $error; + return new PEAR_Error('Failed to set recipient: '.$error->getMessage(), $this->transport->_code); } } From cvs at intevation.de Tue May 17 12:25:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 17 12:25:24 2005 Subject: steffen: server/kolabd kolabd.spec,1.44,1.45 Message-ID: <20050517102521.0F8A2101F00@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv21399/kolabd Modified Files: kolabd.spec Log Message: updated to db from openpkg 2.3.0, better error-handling in filter scripts, and better alias handling in postfix (now the problematic ldap lookup for distribution lists really shows up) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- kolabd.spec 3 May 2005 11:55:42 -0000 1.44 +++ kolabd.spec 17 May 2005 10:25:19 -0000 1.45 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050503 +Release: 20050516 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Tue May 17 12:25:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 17 12:25:25 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.8, 1.9 master.cf.template, 1.7, 1.8 Message-ID: <20050517102521.14F4F101F14@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv21399/kolabd/kolabd/templates Modified Files: main.cf.template master.cf.template Log Message: updated to db from openpkg 2.3.0, better error-handling in filter scripts, and better alias handling in postfix (now the problematic ldap lookup for distribution lists really shows up) Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- main.cf.template 5 Apr 2005 14:27:56 -0000 1.8 +++ main.cf.template 17 May 2005 10:25:19 -0000 1.9 @@ -152,7 +152,7 @@ ldapdistlist_server_host = @@@ldap_uri@@@ ldapdistlist_search_base = @@@user_dn_list@@@ ldapdistlist_domain = $mydestination -ldapdistlist_query_filter = (cn=%u) +ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(mail=%s)) ldapdistlist_special_result_attribute = member ldapdistlist_result_attribute = mail ldapdistlist_result_filter = %s Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- master.cf.template 3 May 2005 02:12:50 -0000 1.7 +++ master.cf.template 17 May 2005 10:25:19 -0000 1.8 @@ -31,7 +31,7 @@ #bsmtp unix - n n - - pipe flags=Fq. user=foo argv=/kolab/bin/bsmtp -f $sender $nexthop $recipient 465 inet n - n - - smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes #587 inet n - n - - smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes -post-cleanup unix n - n - 0 cleanup +post-cleanup unix n - n - 0 cleanup -o virtual_maps= smtp-amavis unix - - n - 2 smtp -o smtp_data_done_timeout=1200 -o smtp_send_xforward_command=yes @@ -58,7 +58,7 @@ # from the automatic invitation handling script 127.0.0.1:10026 inet n - n - - smtpd -o content_filter= - -o cleanup_service_name=cleanup + -o cleanup_service_name=post-cleanup -o local_recipient_maps= -o relay_recipient_maps= -o smtpd_restriction_classes= From cvs at intevation.de Tue May 17 18:33:54 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 17 18:33:55 2005 Subject: bh: doc/raw-howtos fix-ldap-database-on-slave.txt,NONE,1.1 Message-ID: <20050517163354.1EA431005C9@lists.intevation.de> Author: bh Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv7329 Added Files: fix-ldap-database-on-slave.txt Log Message: describe how to reinitialize the slave's ldap database --- NEW FILE: fix-ldap-database-on-slave.txt --- Fixing OpenLDAP's Database on the Slave ======================================= When running Kolab with a multi-location setup, i.e. one master server and one or more slave servers, it can happen that the slave's openldap database becomes corrupted in some way so that it e.g. can't be recovered with db_recover. In such cases you can simply copy the current database from the master server. One way to do that is the following: - stop both master and slave ldap servers - on the slave: remove the contents of the directory /kolab/var/openldap/openldap-data - on the master: use slapcat to retrieve the contents of the ldap database /kolab/sbin/slapcat > slapcat-output - copy the slapcat-output to the slave - on the slave: use slapadd to initialize the ldap database: /kolab/sbin/slapadd < slapcat-output - start openldap again on both servers. From cvs at intevation.de Wed May 18 14:21:56 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 18 14:21:57 2005 Subject: david: doc/kde-client/svn-instructions checkout_proko2.sh,1.4,1.5 Message-ID: <20050518122156.6A473101FA8@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv1739 Modified Files: checkout_proko2.sh Log Message: mimelib is now proko2-branched for chiasmus Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- checkout_proko2.sh 9 May 2005 21:09:20 -0000 1.4 +++ checkout_proko2.sh 18 May 2005 12:21:54 -0000 1.5 @@ -50,6 +50,7 @@ switch_dir doc/korganizer switch_dir doc/kaddressbook switch_dir libkdepim +switch_dir mimelib switch_dir libkcal switch_dir kontact/src switch_dir kresources From cvs at intevation.de Wed May 18 14:54:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 18 14:54:06 2005 Subject: jan: doc/www/src getting-involved.html.m4,NONE,1.1 Message-ID: <20050518125404.A24C1101F14@lists.intevation.de> Author: jan Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2541 Added Files: getting-involved.html.m4 Log Message: A text on how people may join the Kolab Groupware Project. --- NEW FILE: getting-involved.html.m4 --- m4_define(`PAGE_TITLE',`Getting Involved') m4_include(header.html.m4)
    This page was updated on:
    $Date: 2005/05/18 12:54:02 $

    Getting Involved

    Kolab is an open project welcoming any type of helpful contribution! If you like, you can become an active member of the Kolab Groupware Project.

    Becoming a member of the Kolab Groupware Project is in fact fairly easy. Depending on your area of interest and level of expertise you may perhaps identify one of these items where you like to contribute:

    • Testing Kolab Server and/or Kolab Klients: report bugs and wishes into our issue tracker
    • Report any trouble-shooting findings and other valuable information into the Kolab Wiki
    • Write/polish documentation: There is quite some documentation already, but largely unsorted. Ask on the devel-list for what you could do.
    • Consolidate information from the mailing lists into the Wiki.
    • Fix bugs on your own: the issue tracker has lots of open items. If you feel competent, pick one that lies in your realm and solve it. Don't forget to let others know you are working on a bug (ie. assign it to yourself and change the status accordingly).
    • Improve our web-site. It always needs work.
    • ...
    In any case you should subscribe to at least one of the mailing lists and participate there. Don't be frustrated if some emails remain unanswered - sometimes the others are simply lacking time or it may slip out of intention. Just remind if no reaction occurs. And give answers yourself where you can ;-)

    Everyone who continously contributes to Kolab can get CVS write access. m4_include(footer.html.m4) From cvs at intevation.de Wed May 18 14:55:34 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 18 14:55:36 2005 Subject: jan: doc/www/src Makefile,1.19,1.20 Message-ID: <20050518125534.C4A33101F14@lists.intevation.de> Author: jan Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2601 Modified Files: Makefile Log Message: Added getting-involved.html. Index: Makefile =================================================================== RCS file: /kolabrepository/doc/www/src/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile 15 Mar 2005 09:59:27 -0000 1.19 +++ Makefile 18 May 2005 12:55:32 -0000 1.20 @@ -4,6 +4,7 @@ about-kolab-clients.html \ screenshots.html \ download.html \ + getting-involved.html \ newsarchive.html \ howtos.html \ mirrors.html \ From cvs at intevation.de Wed May 18 14:57:28 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 18 14:57:29 2005 Subject: jan: doc/www/src footer.html.m4,1.28,1.29 Message-ID: <20050518125728.40798101F14@lists.intevation.de> Author: jan Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2633 Modified Files: footer.html.m4 Log Message: Added "Getting Involved" link. Renamed "Administrators /Users" to "Users" for less confusion. Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- footer.html.m4 11 May 2005 09:50:24 -0000 1.28 +++ footer.html.m4 18 May 2005 12:57:26 -0000 1.29 @@ -33,6 +33,7 @@ LINK(`about-kolab-clients.html',`About Kolab Clients') LINK(`screenshots.html', `Screenshots') LINK(`download.html',`Download') +LINK(`getting-involved.html',`Getting Involved') @@ -44,8 +45,8 @@ Kolab-Konsortium
    - -

    Administrators and Users
    + +
    Users
    User Discussions Mailinglist: From cvs at intevation.de Wed May 18 15:01:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 18 15:01:08 2005 Subject: jan: doc/www/src kolabsearch.htm,1.1,1.2 Message-ID: <20050518130107.E67FA101F1B@lists.intevation.de> Author: jan Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv2723 Modified Files: kolabsearch.htm Log Message: Added the links which have been added meanwhile to footer. Index: kolabsearch.htm =================================================================== RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolabsearch.htm 15 Mar 2005 09:59:27 -0000 1.1 +++ kolabsearch.htm 18 May 2005 13:01:05 -0000 1.2 @@ -518,6 +518,7 @@ About Kolab Clients
    Screenshots
    Download
    +Getting Involved
    @@ -526,10 +527,11 @@ Documentation
    Wiki
    Support Forums
    +Kolab-Konsortium
    - -
    Administrators and Users
    + +
    Users
    User Discussions Mailinglist: From cvs at intevation.de Wed May 18 18:14:44 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 18 18:14:45 2005 Subject: bernhard: doc/www/src mirrors.html.m4,1.3,1.4 Message-ID: <20050518161444.73251101EE4@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv6642 Modified Files: mirrors.html.m4 Log Message: New mirror Linjection . Index: mirrors.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mirrors.html.m4 26 Mar 2005 17:50:48 -0000 1.3 +++ mirrors.html.m4 18 May 2005 16:14:42 -0000 1.4 @@ -14,6 +14,10 @@
  • ftp.belnet.be/packages/kolab/ + +
  • + Linjection From cvs at intevation.de Wed May 18 18:23:44 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 18 18:23:45 2005 Subject: bernhard: doc/www/src documentation.html.m4,1.13,1.14 Message-ID: <20050518162344.13BE0101EF5@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv6848 Modified Files: documentation.html.m4 Log Message: Added hint to get doc2.sxw and doc3.sxw from CVS. Switched second level headlines to h3. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- documentation.html.m4 16 May 2005 11:11:51 -0000 1.13 +++ documentation.html.m4 18 May 2005 16:23:41 -0000 1.14 @@ -4,7 +4,18 @@

    Kolab2

    -

    Kolab2 Storage Format Specification

    +

    Setting up clients

    + +Directly from CVS you can always download a current version of +
      +
    • + KDE Client Setup (.sxw format) +
    • + Outlook2003 with Toltec2 Setup (.sxw format) + +

      Kolab2 Storage Format Specification

      -

      Kolab2 Architecture Draft

      +

      Kolab2 Architecture Draft

      • Version Draft cvs20041011 @@ -37,7 +48,7 @@ page.

        -

        KDE Kolab1 Client Manual

        +

        KDE Kolab1 Client Manual

        • Version 0.9.x cvs20030801 (Corresponding to client version 1.0rc2) From cvs at intevation.de Thu May 19 13:13:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 19 13:13:58 2005 Subject: steffen: server/postfix postfix-ldap-leafonly.patch, NONE, 1.1 Makefile, 1.9, 1.10 kolab.patch, 1.1, 1.2 Message-ID: <20050519111357.3F1E41006A6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/postfix In directory doto:/tmp/cvs-serv30505 Modified Files: Makefile kolab.patch Added Files: postfix-ldap-leafonly.patch Log Message: patch for postfix to support "our" kind of recursive ldap lookup --- NEW FILE: postfix-ldap-leafonly.patch --- diff -upr ../postfix-2.1.5.orig/src/global/dict_ldap.c ./src/global/dict_ldap.c --- ../postfix-2.1.5.orig/src/global/dict_ldap.c 2004-01-04 19:43:18.000000000 +0100 +++ ./src/global/dict_ldap.c 2005-05-19 11:31:39.000000000 +0200 @@ -58,6 +58,10 @@ /* .IP special_result_attribute /* The attribute(s) of directory entries that can contain DNs or URLs. /* If found, a recursive subsequent search is done using their values. +/* .IP exclude_internal +/* Used in conjunction with \fIspecial_result_attribute\fR. If set to +/* yes, only matching objects without \fIspecial_result_attribute\fR +/* attributes are included in the result. The default is no. /* .IP scope /* LDAP search scope: sub, base, or one. /* .IP bind @@ -223,6 +227,7 @@ typedef struct { char *result_filter; ARGV *result_attributes; int num_attributes; /* rest of list is DN's. */ + int exclude_internal; int bind; char *bind_dn; char *bind_pw; @@ -719,6 +724,7 @@ static void dict_ldap_get_values(DICT_LD char *myname = "dict_ldap_get_values"; struct timeval tv; LDAPURLDesc *url; + int is_leaf; tv.tv_sec = dict_ldap->timeout; tv.tv_usec = 0; @@ -744,6 +750,27 @@ static void dict_ldap_get_values(DICT_LD recursion, dict_ldap->ldapsource, dict_ldap->size_limit); dict_errno = DICT_ERR_RETRY; } + + /* + * The number of ordinary attributes is "num_attributes". We run through + * the "special" attributes and check if any of them are present in the + * object. If yes, then is_leaf = 0, else is_leaf = 1 + */ + is_leaf = 1; + if (dict_ldap->exclude_internal) { + for (i = dict_ldap->num_attributes; dict_ldap->result_attributes->argv[i]; i++) { + attr = dict_ldap->result_attributes->argv[i]; + vals = ldap_get_values(dict_ldap->ld, entry, attr); + if (vals) { + if (ldap_count_values(vals) > 0) { + is_leaf = 0; + ldap_value_free(vals); + break; + } + ldap_value_free(vals); + } + } + } for (attr = ldap_first_attribute(dict_ldap->ld, entry, &ber); attr != NULL; ldap_memfree(attr), attr = ldap_next_attribute(dict_ldap->ld, @@ -791,6 +818,7 @@ static void dict_ldap_get_values(DICT_LD */ if (i < dict_ldap->num_attributes) { /* Ordinary result attribute */ + if(is_leaf) { for (i = 0; vals[i] != NULL; i++) { if (++expansion > dict_ldap->expansion_limit && dict_ldap->expansion_limit) { @@ -815,6 +843,7 @@ static void dict_ldap_get_values(DICT_LD msg_info("%s[%d]: search returned %ld value(s) for" " requested result attribute %s", myname, recursion, i, attr); + } } else if (recursion < dict_ldap->recursion_limit && dict_ldap->result_attributes->argv[i]) { /* Special result attribute */ @@ -1363,6 +1392,11 @@ DICT *dict_ldap_open(const char *ldaps myfree(attr); /* + * get configured value of "exclude_internal", default to no + */ + dict_ldap->exclude_internal = cfg_get_bool(dict_ldap->parser, "exclude_internal", 0); + + /* * get configured value of "bind"; default to true */ dict_ldap->bind = cfg_get_bool(dict_ldap->parser, "bind", 1); Only in ./src/global: dict_ldap.c~ Index: Makefile =================================================================== RCS file: /kolabrepository/server/postfix/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 16 Dec 2004 13:26:06 -0000 1.9 +++ Makefile 19 May 2005 11:13:55 -0000 1.10 @@ -17,6 +17,7 @@ $(RPM) -ihv postfix-$(VERSION)-$(RELEASE).src.rpm cp $(KOLABCVSDIR)/postfix-pipe.patch $(KOLABRPMSRC)/postfix/ + cp $(KOLABCVSDIR)/postfix-ldap-leafonly.patch $(KOLABRPMSRC)/postfix/ cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/postfix/ # Patch for postfix.spec cd $(KOLABRPMSRC)/postfix && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba postfix.spec --define 'with_ldap yes' --define 'with_sasl yes' --define 'with_ssl yes' Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/postfix/kolab.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab.patch 16 Dec 2004 13:26:06 -0000 1.1 +++ kolab.patch 19 May 2005 11:13:55 -0000 1.2 @@ -1,27 +1,29 @@ ---- ../postfix.orig/postfix.spec 2004-10-11 20:49:19.000000000 +0200 -+++ postfix.spec 2004-12-15 17:14:49.000000000 +0100 +--- postfix.spec.orig 2005-05-19 04:56:45.000000000 +0200 ++++ postfix.spec 2005-05-19 05:13:43.000000000 +0200 @@ -42,7 +42,7 @@ Class: BASE Group: Mail License: IPL Version: %{V_postfix} -Release: 2.2.0 -+Release: 2.2.0_kolab ++Release: 2.2.0_kolab2 # package options %option with_fsl yes -@@ -67,6 +67,7 @@ Patch1: postfix.patch.pfls +@@ -67,6 +67,8 @@ Patch1: postfix.patch.pfls Patch2: ftp://ftp.openpkg.org/sources/CPY/postfix/postfix-%{V_whoson}-whoson.patch Patch3: http://www.ipnet6.org/postfix/download/postfix-libspf2-%{V_spf}.patch Patch4: http://www.libsrs2.org/patch/postfix-libsrs2-%{V_srs}.patch +Patch5: postfix-pipe.patch ++Patch6: postfix-ldap-leafonly.patch # build information Prefix: %{l_prefix} -@@ -195,6 +196,7 @@ Conflicts: exim, sendmail, ssmtp +@@ -195,6 +197,8 @@ Conflicts: exim, sendmail, ssmtp %if "%{with_whoson}" == "yes" %patch -p0 -P 2 %endif + %patch -p0 -P 5 ++ %patch -p0 -P 6 %build # configure Postfix (hard-core part I) From cvs at intevation.de Thu May 19 15:10:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 19 15:10:28 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale extract_messages, 1.2, 1.3 Message-ID: <20050519131026.C2CFE1006BD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale In directory doto:/tmp/cvs-serv835/kolab-webadmin/php/admin/locale Modified Files: extract_messages Log Message: translated vacation message -- no idea why it refuses to translate the first line :-( Index: extract_messages =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- extract_messages 11 Mar 2005 10:34:28 -0000 1.2 +++ extract_messages 19 May 2005 13:10:24 -0000 1.3 @@ -87,7 +87,7 @@ # $allFiles = "$tplMessagesFile " . join(" ", @phpFiles) . " " . join(" ",@includeFiles); #print "$allFiles\n"; -print `xgettext -o messages.pot $allFiles`; +print `xgettext --language=PHP -o messages.pot $allFiles`; # # If no language is specified on the command line, get all the already installed languages From cvs at intevation.de Thu May 19 15:10:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 19 15:10:29 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.3, 1.4 Message-ID: <20050519131026.CD5D61006CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv835/kolab-webadmin/php/admin/locale/de/LC_MESSAGES Modified Files: messages.po Log Message: translated vacation message -- no idea why it refuses to translate the first line :-( Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- messages.po 18 Mar 2005 07:25:12 -0000 1.3 +++ messages.po 19 May 2005 13:10:24 -0000 1.4 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kolab-messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-11 16:46+0100\n" +"POT-Creation-Date: 2005-05-19 14:51+0200\n" "PO-Revision-Date: 2005-03-11 14:50+0100\n" "Last-Translator: Matthias Kalle Dalheimer \n" @@ -23,8 +23,8 @@ msgid "The maintainer with DN" msgstr "Der Maintainer mit DN" [...1569 lines suppressed...] +#: ../include/auth.class.php:56 msgid "Could not bind to LDAP server" msgstr "Konnte nicht auf dem LDAP-Server binden" -#: ../include/auth.class.php:76 ../include/auth.class.php:80 +#: ../include/auth.class.php:83 ../include/auth.class.php:87 msgid "Wrong username or password" msgstr "Falscher Benutzername oder falsches Passwort" -#: ../include/auth.class.php:85 +#: ../include/auth.class.php:92 msgid "Please log in as a valid user" msgstr "Bitte melden Sie sich als ein gültiger Benutzer an" #: ../include/ldap.class.php:288 msgid "LDAP Error: Can't read maintainers group: " msgstr "LDAP-Fehler: Kann die Verwalter-Gruppe nicht lesen" + +#~ msgid "React to spam" +#~ msgstr "Auf Spam reagieren" From cvs at intevation.de Thu May 19 15:10:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 19 15:10:29 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user vacation.php, 1.14, 1.15 Message-ID: <20050519131026.D2984101EE4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv835/kolab-webadmin/www/admin/user Modified Files: vacation.php Log Message: translated vacation message -- no idea why it refuses to translate the first line :-( Index: vacation.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- vacation.php 12 Apr 2005 10:50:17 -0000 1.14 +++ vacation.php 19 May 2005 13:10:24 -0000 1.15 @@ -80,14 +80,14 @@ if( $days === false ) $days = 7; if( $text === false ) { $date = strftime(_('%x')); - $text = _("I am out of office till $date.\r\n". - "In urgent cases, please contact Mrs. \r\n\r\n". - "email: \r\n". - "phone: +49 711 1111 11\r\n". - "fax.: +49 711 1111 12\r\n\r\n". - "Yours sincerely,\r\n". - "-- \r\n". - ""); + $text = sprintf(_("I am out of office until %1\$s.\r\n"). + _("In urgent cases, please contact Mrs. \r\n\r\n"). + _("email: \r\n"). + _("phone: +49 711 1111 11\r\n"). + _("fax.: +49 711 1111 12\r\n\r\n"). + _("Yours sincerely,\r\n"). + _("-- \r\n"). + _(""),$date); } $active = ( $sieve->getActive() === $scriptname ); } From cvs at intevation.de Thu May 19 23:18:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 19 23:18:25 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.4, 1.5 Message-ID: <20050519211823.ADCEC1006A6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv20056/kolab-webadmin/php/admin/locale/de/LC_MESSAGES Modified Files: messages.po Log Message: I give up on that first line... Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- messages.po 19 May 2005 13:10:24 -0000 1.4 +++ messages.po 19 May 2005 21:18:21 -0000 1.5 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kolab-messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-19 14:51+0200\n" +"POT-Creation-Date: 2005-05-19 23:10+0200\n" "PO-Revision-Date: 2005-03-11 14:50+0100\n" "Last-Translator: Matthias Kalle Dalheimer \n" @@ -1249,12 +1249,12 @@ msgid "%x" msgstr "%x" -#: ../../../www/admin/user/vacation.php:83 +#: ../../../www/admin/user/vacation.php:84 #, php-format -msgid "I am out of office until %1$s.\r\n" -msgstr "Ich bin bis %1$s abwesend.\r\n" +msgid "I am out of office until %s.\r\n" +msgstr "Ich bin bis %s abwesend.\r\n" -#: ../../../www/admin/user/vacation.php:84 +#: ../../../www/admin/user/vacation.php:85 #, php-format msgid "" "In urgent cases, please contact Mrs. \r\n" @@ -1264,17 +1264,17 @@ "auf\r\n" "\r\n" -#: ../../../www/admin/user/vacation.php:85 +#: ../../../www/admin/user/vacation.php:86 #, php-format msgid "email: \r\n" msgstr "E-Mail: \r\n" -#: ../../../www/admin/user/vacation.php:86 +#: ../../../www/admin/user/vacation.php:87 #, php-format msgid "phone: +49 711 1111 11\r\n" msgstr "Telefon: +49 711 1111 11\r\n" -#: ../../../www/admin/user/vacation.php:87 +#: ../../../www/admin/user/vacation.php:88 #, php-format msgid "" "fax.: +49 711 1111 12\r\n" @@ -1283,17 +1283,17 @@ "Fax: +49 711 1111 12\r\n" "\r\n" -#: ../../../www/admin/user/vacation.php:88 +#: ../../../www/admin/user/vacation.php:89 #, php-format msgid "Yours sincerely,\r\n" msgstr "Mit freundlichen Grüßen,\r\n" -#: ../../../www/admin/user/vacation.php:89 +#: ../../../www/admin/user/vacation.php:90 #, php-format msgid "-- \r\n" msgstr "-- \r\n" -#: ../../../www/admin/user/vacation.php:90 +#: ../../../www/admin/user/vacation.php:91 #, php-format msgid "" msgstr "" From cvs at intevation.de Thu May 19 23:18:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 19 23:18:26 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user vacation.php, 1.15, 1.16 Message-ID: <20050519211823.AFB551006CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv20056/kolab-webadmin/www/admin/user Modified Files: vacation.php Log Message: I give up on that first line... Index: vacation.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- vacation.php 19 May 2005 13:10:24 -0000 1.15 +++ vacation.php 19 May 2005 21:18:21 -0000 1.16 @@ -80,14 +80,16 @@ if( $days === false ) $days = 7; if( $text === false ) { $date = strftime(_('%x')); - $text = sprintf(_("I am out of office until %1\$s.\r\n"). + $text = sprintf( + _("I am out of office until %s.\r\n"). _("In urgent cases, please contact Mrs. \r\n\r\n"). _("email: \r\n"). _("phone: +49 711 1111 11\r\n"). _("fax.: +49 711 1111 12\r\n\r\n"). _("Yours sincerely,\r\n"). _("-- \r\n"). - _(""),$date); + _(""), + $date); } $active = ( $sieve->getActive() === $scriptname ); } From cvs at intevation.de Fri May 20 01:51:19 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 01:51:20 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.5, 1.6 Message-ID: <20050519235119.406C21006B9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv22093/kolab-webadmin/php/admin/locale/de/LC_MESSAGES Modified Files: messages.po Log Message: more translation + "no vacation replies to spam" is now default Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- messages.po 19 May 2005 21:18:21 -0000 1.5 +++ messages.po 19 May 2005 23:51:17 -0000 1.6 @@ -821,7 +821,7 @@ #: tpl_messages.php:174 msgid "Do not send vacation replies to spam messages" -msgstr "" +msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden" #: tpl_messages.php:175 msgid "Only react to mail coming from domain" From cvs at intevation.de Fri May 20 01:51:19 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 01:51:21 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user vacation.php, 1.16, 1.17 Message-ID: <20050519235119.4484E1006CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv22093/kolab-webadmin/www/admin/user Modified Files: vacation.php Log Message: more translation + "no vacation replies to spam" is now default Index: vacation.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- vacation.php 19 May 2005 21:18:21 -0000 1.16 +++ vacation.php 19 May 2005 23:51:17 -0000 1.17 @@ -72,7 +72,7 @@ $addresses = SieveUtils::getVacationAddresses( $script ); $days = SieveUtils::getVacationDays( $script ); $text = SieveUtils::getVacationText( $script ); - } + } else $reacttospam = true; if( $addresses === false ) { $object = $ldap->read( $auth->dn() ); $addresses = array_merge( $object['mail'], $object['alias'] ); From cvs at intevation.de Fri May 20 02:37:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 02:37:59 2005 Subject: steffen: server/kolabd/kolabd/amavisd - New directory Message-ID: <20050520003757.B3B321006B9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd In directory doto:/tmp/cvs-serv22766/amavisd Log Message: Directory /kolabrepository/server/kolabd/kolabd/amavisd added to the repository From cvs at intevation.de Fri May 20 02:38:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 02:38:08 2005 Subject: steffen: server/kolabd/kolabd/amavisd/en_US - New directory Message-ID: <20050520003807.927D5101FA4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd/en_US In directory doto:/tmp/cvs-serv22795/en_US Log Message: Directory /kolabrepository/server/kolabd/kolabd/amavisd/en_US added to the repository From cvs at intevation.de Fri May 20 02:38:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 02:38:09 2005 Subject: steffen: server/kolabd/kolabd/amavisd/de - New directory Message-ID: <20050520003807.962C8101FAC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd/de In directory doto:/tmp/cvs-serv22795/de Log Message: Directory /kolabrepository/server/kolabd/kolabd/amavisd/de added to the repository From cvs at intevation.de Fri May 20 02:39:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 02:39:29 2005 Subject: steffen: server/kolabd/kolabd/amavisd/de template-dsn.txt, NONE, 1.1 template-spam-admin.txt, NONE, 1.1 template-spam-sender.txt, NONE, 1.1 template-virus-admin.txt, NONE, 1.1 template-virus-recipient.txt, NONE, 1.1 template-virus-sender.txt, NONE, 1.1 Message-ID: <20050520003927.90253101FA4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd/de In directory doto:/tmp/cvs-serv22862/kolabd/amavisd/de Added Files: template-dsn.txt template-spam-admin.txt template-spam-sender.txt template-virus-admin.txt template-virus-recipient.txt template-virus-sender.txt Log Message: message templates for amavis, new postfix config param for ldap table --- NEW FILE: template-dsn.txt --- # # ============================================================================= # This is a template for (neutral: non-virus, non-spam, non-banned) DELIVERY # STATUS NOTIFICATIONS to sender. For syntax and customization instructions # see README.customize. Note that only valid header fields are allowed; # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # Subject: Undeliverable mail[?%#X||, invalid characters in header] Message-ID: [? %#X ||INVALID HEADER (INVALID CHARACTERS OR SPACE GAP) [%X\n] ]\ This nondelivery report was generated by the amavisd-new program at host %h. Our internal reference code for your message is %n. [? %#X || WHAT IS AN INVALID CHARACTER IN MAIL HEADER? The RFC 2822 standard specifies rules for forming internet messages. It does not allow the use of characters with codes above 127 to be used directly (non-encoded) in mail header (it also prohibits NUL and bare CR). If characters (e.g. with diacritics) from ISO Latin or other alphabets need to be included in the header, these characters need to be properly encoded according to RFC 2047. This encoding is often done transparently by mail reader (MUA), but if automatic encoding is not available (e.g. by some older MUA) it is the user's responsibility to avoid the use of such characters in mail header, or to encode them manually. Typically the offending header fields in this category are 'Subject', 'Organization', and comment fields in e-mail addresses of the 'From', 'To' and 'Cc'. Sometimes such invalid header fields are inserted automatically by some MUA, MTA, content checker, or other mail handling service. If this is the case, that service needs to be fixed or properly configured. Typically the offending header fields in this category are 'Date', 'Received', 'X-Mailer', 'X-Priority', 'X-Scanned', etc. If you don't know how to fix or avoid the problem, please report it to _your_ postmaster or system manager. ]\ Return-Path: %s Your message[?%m|| %m][?%r|| (Resent-Message-ID: %r)] could not be delivered to:[\n %N] --- NEW FILE: template-spam-admin.txt --- # # ============================================================================= # This is a template for SPAM ADMINISTRATOR NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; non-standard header # field heads must begin with "X-" . # Date: %d From: %f Subject: SPAM FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>] To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] [? %#B |#|Bcc: [<%B>|, ]] Message-ID: Unsolicited bulk email [? %S |from unknown or forged sender:|from:] %o Subject: %j [? %a |#|First upstream SMTP client IP address: \[%a\] %g ] [? %t |#|According to the 'Received:' trace, the message originated at: \[%e\] %t ] [? %#D |#|The message WILL BE delivered to:[\n%D] ] [? %#N |#|The message WAS NOT delivered to:[\n%N] ] [? %q |Not quarantined.|The message has been quarantined as:\n %q ] SpamAssassin report: [%A ]\ ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s [%H ]\ -------------------------- END HEADERS ------------------------------ --- NEW FILE: template-spam-sender.txt --- # # ============================================================================= # This is a template for SPAM SENDER NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # Subject: Considered UNSOLICITED BULK EMAIL from you [? %m |#|In-Reply-To: %m] Message-ID: Your message to:[ -> %R] was considered unsolicited bulk e-mail (UBE). [? %#X |#|\n[%X\n]] Subject: %j Return-Path: %s Our internal reference code for your message is %n. [? %#D |Delivery of the email was stopped! ]# # # SpamAssassin report: # [%A # ]\ --- NEW FILE: template-virus-admin.txt --- # # ============================================================================= # This is a template for non-spam (VIRUS,...) ADMINISTRATOR NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; non-standard header # field heads must begin with "X-" . # Date: %d From: %f Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED (%F)]|VIRUS (%V)]# FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>] To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] Message-ID: [? %#V |No viruses were found. |A virus was found: %V |Two viruses were found:\n %V |%#V viruses were found:\n %V ] [? %#F |#\ |A banned name was found:\n %F |Two banned names were found:\n %F |%#F banned names were found:\n %F ] [? %#X |#\ |Bad header was found:[\n %X] ] [? %#W |#\ |Scanner detecting a virus: %W |Scanners detecting a virus: %W ] The mail originated from: <%o> [? %a |#|First upstream SMTP client IP address: \[%a\] %g ] [? %t |#|According to the 'Received:' trace, the message originated at: \[%e\] %t ] [? %#S |Notification to sender will not be mailed. ]# [? %#D |#|The message WILL BE delivered to:[\n%D] ] [? %#N |#|The message WAS NOT delivered to:[\n%N] ] [? %#V |#|[? %#v |#|Virus scanner output:[\n %v] ]] [? %q |Not quarantined.|The message has been quarantined as:\n %q ] ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s [%H ]\ -------------------------- END HEADERS ------------------------------ --- NEW FILE: template-virus-recipient.txt --- # # ============================================================================= # This is a template for VIRUS/BANNED/BAD-HEADER RECIPIENTS NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; non-standard header # field heads must begin with "X-" . # Date: %d From: %f Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED]|VIRUS (%V)]# IN MAIL TO YOU (from [?%o|(?)|<%o>]) To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] Message-ID: [? %#V |[? %#F ||BANNED CONTENTS ALERT]|VIRUS ALERT] Our content checker found [? %#V |#| [? %#V |viruses|virus|viruses]: %V] [? %#F |#| banned [? %#F |names|name|names]: %F] [? %#X |#|\n[%X\n]] in an email to you [? %S |from unknown sender:|from:] %o [? %a |#|First upstream SMTP client IP address: \[%a\] %g ] [? %t |#|According to the 'Received:' trace, the message originated at: \[%e\] %t ] Our internal reference code for this message is %n. [? %q |Not quarantined.|The message has been quarantined as: %q] Please contact your system administrator for details. --- NEW FILE: template-virus-sender.txt --- # # ============================================================================= # This is a template for VIRUS/BANNED SENDER NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # Subject: [? %#V |[? %#F |Unknown problem|BANNED (%F)]|VIRUS (%V)] IN MAIL FROM YOU [? %m |#|In-Reply-To: %m] Message-ID: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED CONTENTS ALERT]|VIRUS ALERT] Our content checker found [? %#V |#| [? %#V |viruses|virus|viruses]: %V] [? %#F |#| banned [? %#F |names|name|names]: %F] [? %#X |#|\n[%X\n]] in email presumably from you (%s), to the following [? %#R |recipients|recipient|recipients]:[ -> %R] Our internal reference code for your message is %n. [? %#V ||Please check your system for viruses, or ask your system administrator to do so. ]# [? %#D |Delivery of the email was stopped! ]# [? %#V |[? %#F ||# The message has been blocked because it contains a component (as a MIME part or nested within) with declared name or MIME type or contents type violating our access policy. To transfer contents that may be considered risky or unwanted by site policies, or simply too large for mailing, please consider publishing your content on the web, and only sending an URL of the document to the recipient. Depending on the recipient and sender site policies, with a little effort it might still be possible to send any contents (including viruses) using one of the following methods: - encrypted using pgp, gpg or other encryption methods; - wrapped in a password-protected or scrambled container or archive (e.g.: zip -e, arj -g, arc g, rar -p, or other methods) Note that if the contents is not intended to be secret, the encryption key or password may be included in the same message for recipient's convenience. We are sorry for inconvenience if the contents was not malicious. The purpose of these restrictions is to cut the most common propagation methods used by viruses and other malware. These often exploit automatic mechanisms and security holes in certain mail readers (Microsoft mail readers and browsers are a common and easy target). By requiring an explicit and decisive action from the recipient to decode mail, the dangers of automatic malware propagation is largely reduced. # # Details of our mail restrictions policy are available at ... ]]# For your reference, here are headers from your email: ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s [%H ]\ -------------------------- END HEADERS ------------------------------ From cvs at intevation.de Fri May 20 02:39:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 02:39:30 2005 Subject: steffen: server/kolabd kolabd.spec,1.45,1.46 Message-ID: <20050520003927.8B7A91006CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv22862 Modified Files: kolabd.spec Log Message: message templates for amavis, new postfix config param for ldap table Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- kolabd.spec 17 May 2005 10:25:19 -0000 1.45 +++ kolabd.spec 20 May 2005 00:39:25 -0000 1.46 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050516 +Release: 20050520 # list of sources Source0: kolabd-1.9.4.tar.gz @@ -50,11 +50,11 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 2.0.0 -PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.17, postfix >= 2.1.5-2.2.0_kolab, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail +PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.17, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail PreReq: sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes PreReq: proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes PreReq: gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes -PreReq: postfix >= 2.1.5-2.2.0, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes +PreReq: postfix >= 2.1.5-2.2.0_kolab2, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes PreReq: perl-kolab >= 5.8.5-20050503, perl-db @@ -95,6 +95,8 @@ %{l_shtool} mkdir -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab \ + $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/en_US \ + $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/de \ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates \ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/log \ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/cgi-bin \ @@ -170,6 +172,14 @@ %{l_shtool} install -c -m 644 %{l_value -s -a} \ kolab2.schema rfc2739.schema \ $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema/ + + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + amavisd/en_US/* \ + $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/en_US/ + + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + amavisd/de/* \ + $RPM_BUILD_ROOT%{l_prefix}/etc/amavisd/templates/de/ %{l_shtool} install -c -m 644 %{l_value -s -a} \ doc/README.* \ From cvs at intevation.de Fri May 20 02:39:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 02:39:31 2005 Subject: steffen: server/kolabd/kolabd/templates amavisd.conf.template, 1.5, 1.6 main.cf.template, 1.9, 1.10 Message-ID: <20050520003927.AA106101FAD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv22862/kolabd/templates Modified Files: amavisd.conf.template main.cf.template Log Message: message templates for amavis, new postfix config param for ldap table Index: amavisd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- amavisd.conf.template 9 Apr 2005 01:11:03 -0000 1.5 +++ amavisd.conf.template 20 May 2005 00:39:25 -0000 1.6 @@ -330,7 +330,7 @@ # If notification template files are collectively available in some directory, # use read_l10n_templates which calls read_text for each known template. # -# read_l10n_templates('/etc/amavis/en_US'); +read_l10n_templates('@l_prefix@/etc/amavisd/templates/en_US'); # Here is an overall picture (sequence of events) of how pieces fit together Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- main.cf.template 17 May 2005 10:25:19 -0000 1.9 +++ main.cf.template 20 May 2005 00:39:25 -0000 1.10 @@ -154,6 +154,7 @@ ldapdistlist_domain = $mydestination ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(mail=%s)) ldapdistlist_special_result_attribute = member +ldapdistlist_exclude_internal = yes ldapdistlist_result_attribute = mail ldapdistlist_result_filter = %s ldapdistlist_search_timeout = 15 From cvs at intevation.de Fri May 20 02:39:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 02:39:32 2005 Subject: steffen: server/kolabd/kolabd/amavisd/en_US template-dsn.txt, NONE, 1.1 template-spam-admin.txt, NONE, 1.1 template-spam-sender.txt, NONE, 1.1 template-virus-admin.txt, NONE, 1.1 template-virus-recipient.txt, NONE, 1.1 template-virus-sender.txt, NONE, 1.1 Message-ID: <20050520003927.9812D101FAC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd/en_US In directory doto:/tmp/cvs-serv22862/kolabd/amavisd/en_US Added Files: template-dsn.txt template-spam-admin.txt template-spam-sender.txt template-virus-admin.txt template-virus-recipient.txt template-virus-sender.txt Log Message: message templates for amavis, new postfix config param for ldap table --- NEW FILE: template-dsn.txt --- # # ============================================================================= # This is a template for (neutral: non-virus, non-spam, non-banned) DELIVERY # STATUS NOTIFICATIONS to sender. For syntax and customization instructions # see README.customize. Note that only valid header fields are allowed; # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # Subject: Undeliverable mail[?%#X||, invalid characters in header] Message-ID: [? %#X ||INVALID HEADER (INVALID CHARACTERS OR SPACE GAP) [%X\n] ]\ This nondelivery report was generated by the amavisd-new program at host %h. Our internal reference code for your message is %n. [? %#X || WHAT IS AN INVALID CHARACTER IN MAIL HEADER? The RFC 2822 standard specifies rules for forming internet messages. It does not allow the use of characters with codes above 127 to be used directly (non-encoded) in mail header (it also prohibits NUL and bare CR). If characters (e.g. with diacritics) from ISO Latin or other alphabets need to be included in the header, these characters need to be properly encoded according to RFC 2047. This encoding is often done transparently by mail reader (MUA), but if automatic encoding is not available (e.g. by some older MUA) it is the user's responsibility to avoid the use of such characters in mail header, or to encode them manually. Typically the offending header fields in this category are 'Subject', 'Organization', and comment fields in e-mail addresses of the 'From', 'To' and 'Cc'. Sometimes such invalid header fields are inserted automatically by some MUA, MTA, content checker, or other mail handling service. If this is the case, that service needs to be fixed or properly configured. Typically the offending header fields in this category are 'Date', 'Received', 'X-Mailer', 'X-Priority', 'X-Scanned', etc. If you don't know how to fix or avoid the problem, please report it to _your_ postmaster or system manager. ]\ Return-Path: %s Your message[?%m|| %m][?%r|| (Resent-Message-ID: %r)] could not be delivered to:[\n %N] --- NEW FILE: template-spam-admin.txt --- # # ============================================================================= # This is a template for SPAM ADMINISTRATOR NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; non-standard header # field heads must begin with "X-" . # Date: %d From: %f Subject: SPAM FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>] To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] [? %#B |#|Bcc: [<%B>|, ]] Message-ID: Unsolicited bulk email [? %S |from unknown or forged sender:|from:] %o Subject: %j [? %a |#|First upstream SMTP client IP address: \[%a\] %g ] [? %t |#|According to the 'Received:' trace, the message originated at: \[%e\] %t ] [? %#D |#|The message WILL BE delivered to:[\n%D] ] [? %#N |#|The message WAS NOT delivered to:[\n%N] ] [? %q |Not quarantined.|The message has been quarantined as:\n %q ] SpamAssassin report: [%A ]\ ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s [%H ]\ -------------------------- END HEADERS ------------------------------ --- NEW FILE: template-spam-sender.txt --- # # ============================================================================= # This is a template for SPAM SENDER NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # Subject: Considered UNSOLICITED BULK EMAIL from you [? %m |#|In-Reply-To: %m] Message-ID: Your message to:[ -> %R] was considered unsolicited bulk e-mail (UBE). [? %#X |#|\n[%X\n]] Subject: %j Return-Path: %s Our internal reference code for your message is %n. [? %#D |Delivery of the email was stopped! ]# # # SpamAssassin report: # [%A # ]\ --- NEW FILE: template-virus-admin.txt --- # # ============================================================================= # This is a template for non-spam (VIRUS,...) ADMINISTRATOR NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; non-standard header # field heads must begin with "X-" . # Date: %d From: %f Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED (%F)]|VIRUS (%V)]# FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>] To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] Message-ID: [? %#V |No viruses were found. |A virus was found: %V |Two viruses were found:\n %V |%#V viruses were found:\n %V ] [? %#F |#\ |A banned name was found:\n %F |Two banned names were found:\n %F |%#F banned names were found:\n %F ] [? %#X |#\ |Bad header was found:[\n %X] ] [? %#W |#\ |Scanner detecting a virus: %W |Scanners detecting a virus: %W ] The mail originated from: <%o> [? %a |#|First upstream SMTP client IP address: \[%a\] %g ] [? %t |#|According to the 'Received:' trace, the message originated at: \[%e\] %t ] [? %#S |Notification to sender will not be mailed. ]# [? %#D |#|The message WILL BE delivered to:[\n%D] ] [? %#N |#|The message WAS NOT delivered to:[\n%N] ] [? %#V |#|[? %#v |#|Virus scanner output:[\n %v] ]] [? %q |Not quarantined.|The message has been quarantined as:\n %q ] ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s [%H ]\ -------------------------- END HEADERS ------------------------------ --- NEW FILE: template-virus-recipient.txt --- # # ============================================================================= # This is a template for VIRUS/BANNED/BAD-HEADER RECIPIENTS NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; non-standard header # field heads must begin with "X-" . # Date: %d From: %f Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED]|VIRUS (%V)]# IN MAIL TO YOU (from [?%o|(?)|<%o>]) To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] Message-ID: [? %#V |[? %#F ||BANNED CONTENTS ALERT]|VIRUS ALERT] Our content checker found [? %#V |#| [? %#V |viruses|virus|viruses]: %V] [? %#F |#| banned [? %#F |names|name|names]: %F] [? %#X |#|\n[%X\n]] in an email to you [? %S |from unknown sender:|from:] %o [? %a |#|First upstream SMTP client IP address: \[%a\] %g ] [? %t |#|According to the 'Received:' trace, the message originated at: \[%e\] %t ] Our internal reference code for this message is %n. [? %q |Not quarantined.|The message has been quarantined as: %q] Please contact your system administrator for details. --- NEW FILE: template-virus-sender.txt --- # # ============================================================================= # This is a template for VIRUS/BANNED SENDER NOTIFICATIONS. # For syntax and customization instructions see README.customize. # Note that only valid header fields are allowed; # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # Subject: [? %#V |[? %#F |Unknown problem|BANNED (%F)]|VIRUS (%V)] IN MAIL FROM YOU [? %m |#|In-Reply-To: %m] Message-ID: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED CONTENTS ALERT]|VIRUS ALERT] Our content checker found [? %#V |#| [? %#V |viruses|virus|viruses]: %V] [? %#F |#| banned [? %#F |names|name|names]: %F] [? %#X |#|\n[%X\n]] in email presumably from you (%s), to the following [? %#R |recipients|recipient|recipients]:[ -> %R] Our internal reference code for your message is %n. [? %#V ||Please check your system for viruses, or ask your system administrator to do so. ]# [? %#D |Delivery of the email was stopped! ]# [? %#V |[? %#F ||# The message has been blocked because it contains a component (as a MIME part or nested within) with declared name or MIME type or contents type violating our access policy. To transfer contents that may be considered risky or unwanted by site policies, or simply too large for mailing, please consider publishing your content on the web, and only sending an URL of the document to the recipient. Depending on the recipient and sender site policies, with a little effort it might still be possible to send any contents (including viruses) using one of the following methods: - encrypted using pgp, gpg or other encryption methods; - wrapped in a password-protected or scrambled container or archive (e.g.: zip -e, arj -g, arc g, rar -p, or other methods) Note that if the contents is not intended to be secret, the encryption key or password may be included in the same message for recipient's convenience. We are sorry for inconvenience if the contents was not malicious. The purpose of these restrictions is to cut the most common propagation methods used by viruses and other malware. These often exploit automatic mechanisms and security holes in certain mail readers (Microsoft mail readers and browsers are a common and easy target). By requiring an explicit and decisive action from the recipient to decode mail, the dangers of automatic malware propagation is largely reduced. # # Details of our mail restrictions policy are available at ... ]]# For your reference, here are headers from your email: ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s [%H ]\ -------------------------- END HEADERS ------------------------------ From cvs at intevation.de Fri May 20 11:46:43 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 11:46:43 2005 Subject: steffen: server/kolabd/kolabd/amavisd/en_US charset,NONE,1.1 Message-ID: <20050520094643.1E2271006AE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd/en_US In directory doto:/tmp/cvs-serv1548/en_US Added Files: charset Log Message: amavisd wants this --- NEW FILE: charset --- UTF-8 From cvs at intevation.de Fri May 20 11:46:43 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 11:46:45 2005 Subject: steffen: server/kolabd/kolabd/amavisd/de charset,NONE,1.1 Message-ID: <20050520094643.1C99B1005C9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd/de In directory doto:/tmp/cvs-serv1548/de Added Files: charset Log Message: amavisd wants this --- NEW FILE: charset --- UTF-8 From cvs at intevation.de Fri May 20 11:52:29 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 11:52:30 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.120, 1.121 Message-ID: <20050520095229.7A23B1005C9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv1749 Modified Files: kolab-resource-handlers.spec Log Message: version Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- kolab-resource-handlers.spec 16 May 2005 12:41:31 -0000 1.120 +++ kolab-resource-handlers.spec 20 May 2005 09:52:27 -0000 1.121 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050516 +Release: 20050520 Class: JUNK License: GPL Group: MAIL @@ -22,7 +22,7 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: apache, php, php::with_pear = yes -PreReq: kolabd >= 1.9.4-20050403, apache, php, php::with_pear = yes +PreReq: kolabd >= 1.9.4-20050520, apache, php, php::with_pear = yes AutoReq: no AutoReqProv: no #BuildArch: noarch From cvs at intevation.de Fri May 20 12:18:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 12:18:43 2005 Subject: steffen: server obmtool.conf,1.158,1.159 Message-ID: <20050520101842.D17B7101FC5@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2650 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.158 retrieving revision 1.159 diff -u -d -r1.158 -r1.159 --- obmtool.conf 17 May 2005 10:25:18 -0000 1.158 +++ obmtool.conf 20 May 2005 10:18:40 -0000 1.159 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot"; + kolab_version="pre-2.0-snapshot-20050520"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -82,7 +82,7 @@ @install ${loc}proftpd-1.2.10-2.2.0 --with=ldap @install ${loc}gdbm-1.8.3-2.2.0 @install ${plusloc}dbtool-1.6-2.2.0 - @install ${altloc}postfix-2.1.5-2.2.0_kolab --with=ldap --with=sasl --with=ssl + @install ${altloc}postfix-2.1.5-2.2.0_kolab2 --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 @install ${altloc}perl-kolab-5.8.5-20050503 @@ -132,9 +132,9 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050503 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050428 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20050504 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050520 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050520 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version @check %dump From cvs at intevation.de Fri May 20 12:20:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 12:20:22 2005 Subject: steffen: server README.1st,1.13,1.14 Message-ID: <20050520102021.11B2A101FC6@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2696 Modified Files: README.1st Log Message: upgrade info Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- README.1st 13 May 2005 17:21:00 -0000 1.13 +++ README.1st 20 May 2005 10:20:19 -0000 1.14 @@ -158,7 +158,12 @@ Again, the openldap configuration has changed a bit. It should be enough to run kolabconf and restart openldap. +Upgrade from before snapshot-20050520 +------------------------------------- +Distribution lists now have a mail attribute. Use an LDAP editor +to fill the mail attribute for all kolabGroupOfNames objects with +the email address of the distribution list. For more information on Kolab, see http://www.kolab.org From cvs at intevation.de Fri May 20 15:57:28 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 15:57:30 2005 Subject: bh: doc/raw-howtos freebusy-troubleshooting.txt,NONE,1.1 Message-ID: <20050520135728.C9199100179@lists.intevation.de> Author: bh Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv10435 Added Files: freebusy-troubleshooting.txt Log Message: new file with some information about troubleshooting free/busy lists --- NEW FILE: freebusy-troubleshooting.txt --- Troble Shooting Free/Busy lists in Kolab ======================================== $Id: freebusy-troubleshooting.txt,v 1.1 2005/05/20 13:57:26 bh Exp $ What to do when free/busy lists don't work with Kolab 2.0 and Kontact. For background information on how the free/busy lists work in Kolab 2, see [1] Note: The free/busy lists are generated by the server, so any changes to a calendar have to be synced to the server before they can be visible in the free/busy lists. So, don't forget to sync whenever you make a change in the client. Check Kontact Configuration --------------------------- The relevant settings are in the configure dialog you get via Settings|Configure Contact... in the part Organizer|Free/busy on the tab Retrieve. Server URL: https://kolabserver.domain/freebusy/%25EMAIL%25.ifb Check "Use full email address for retrieval" Check "Retrieve other people's free/busy information automatically" Make sure the right username/password is being used to retrieve the free/busy list. Use the same as for imap. If you configure kontact with the kolabwizard, the settings should be OK. Check the server ---------------- Check the apache access log, /kolab/var/apache/log/apache-access.log A successfull free/busy retrieval looks like this (one line, with values for client.domain, user1, etc. matching your setup.). client.domain - user1 [20/May/2005:12:58:56 +0200] "GET /freebusy/user2%40kolabserver.ifb HTTP/1.1" 200 395 You should also see the triggering of the free/busy list generation. The triggering is done with http requests to a certain URL and looks like this in the log: client.domain - user2 [20/May/2005:14:20:28 +0200] "GET /freebusy/trigger/user2/Calendar.pfb HTTP/1.1" 200 519 If the retrieval or the trigger isn't successful, check the logs of the resource manager. The freebusy part is configured in /kolab/etc/resmgr/freebusy.conf. look for the settings $params['log'] and $params['log_level']. Useful settings for debugging are: // Where are we logging to? $params['log'] = 'file:/kolab/var/resmgr/freebusy.log'; // What level of output should we log? Higher levels give more verbose // output. One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; // RM_LOG_INFO or RM_LOG_DEBUG. $params['log_level'] = RM_LOG_DEBUG; If you need to change anything, make the change in /kolab/etc/kolab/templates/freebusy.conf.template and run /kolab/sbin/kolabconf to regenerate the version under /kolab/etc/resmgr/ Then, check the logfile for errors. if you just switched debugging on, you need to retry to get the free/busy list. [TODO: describe possible errors seen in the logs] You may also want to have a look at the partial free/busy lists (pfbs) from which the final lists are assembled. The pfbs can be found under /kolab/var/kolab/www/freebusy/cache/ References: [1] How to handle freebusy lists for Kolab2 http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/architecture/freebusy.txt?rev=HEAD From cvs at intevation.de Fri May 20 17:57:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 20 17:57:43 2005 Subject: jan: doc/www/src documentation.html.m4,1.14,1.15 Message-ID: <20050520155742.E024710015B@lists.intevation.de> Author: jan Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv12319 Modified Files: documentation.html.m4 Log Message: Added pdf downloads for doc2 and doc3. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- documentation.html.m4 18 May 2005 16:23:41 -0000 1.14 +++ documentation.html.m4 20 May 2005 15:57:40 -0000 1.15 @@ -6,14 +6,21 @@

          Setting up clients

          -Directly from CVS you can always download a current version of +During the Proko2 project, two documents have been created: +

          Kolab2 Storage Format Specification

            From cvs at intevation.de Mon May 23 14:41:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 23 14:41:19 2005 Subject: steffen: doc/proko2-doc doc3.sxw,1.31,1.32 Message-ID: <20050523124118.CD3CD1006CB@lists.intevation.de> Author: steffen Update of /kolabrepository/doc/proko2-doc In directory doto:/tmp/cvs-serv16318 Modified Files: doc3.sxw Log Message: Correct freebusy download URL for Outlook Index: doc3.sxw =================================================================== RCS file: /kolabrepository/doc/proko2-doc/doc3.sxw,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 Binary files /tmp/cvsKSTXd8 and /tmp/cvsErJFO6 differ From cvs at intevation.de Mon May 23 15:07:33 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 23 15:07:34 2005 Subject: steffen: server obmtool.conf,1.159,1.160 Message-ID: <20050523130733.3325F100159@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv16928 Modified Files: obmtool.conf Log Message: revert db upgrade Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.159 retrieving revision 1.160 diff -u -d -r1.159 -r1.160 --- obmtool.conf 20 May 2005 10:18:40 -0000 1.159 +++ obmtool.conf 23 May 2005 13:07:31 -0000 1.160 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050520"; + kolab_version="pre-2.0-snapshot-20050522"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -75,7 +75,7 @@ @install ${loc}imap-2004a-2.2.0 @install ${loc}procmail-3.22-2.2.0 @install ${loc}pth-2.0.4-2.3.0 - @install ${loc}db-4.3.27.3-2.3.0 + @install ${loc}db-4.2.52.2-2.2.0 @install ${loc}openldap-2.2.23-2.3.0 @install ${loc}sasl-2.1.19-2.2.1 --with=ldap --with=login @install ${loc}getopt-20030307-2.2.0 From cvs at intevation.de Tue May 24 00:34:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 24 00:34:47 2005 Subject: steffen: server/kolabd/kolabd/amavisd/de template-dsn.txt, 1.1, 1.2 template-spam-admin.txt, 1.1, 1.2 template-spam-sender.txt, 1.1, 1.2 template-virus-admin.txt, 1.1, 1.2 template-virus-recipient.txt, 1.1, 1.2 template-virus-sender.txt, 1.1, 1.2 Message-ID: <20050523223446.253F01006A2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/amavisd/de In directory doto:/tmp/cvs-serv31194 Modified Files: template-dsn.txt template-spam-admin.txt template-spam-sender.txt template-virus-admin.txt template-virus-recipient.txt template-virus-sender.txt Log Message: german templates from Kalle Index: template-dsn.txt =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/amavisd/de/template-dsn.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-dsn.txt 20 May 2005 00:39:25 -0000 1.1 +++ template-dsn.txt 23 May 2005 22:34:44 -0000 1.2 @@ -6,43 +6,48 @@ # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # -Subject: Undeliverable mail[?%#X||, invalid characters in header] +Subject: Unzustellbare Nachricht[?%#X||, unzulässige Zeichen im Header] Message-ID: -[? %#X ||INVALID HEADER (INVALID CHARACTERS OR SPACE GAP) +[? %#X ||UNZULAESSIGER HEADER (UNZULAESSIGE ZEICHEN ODER LEERZEICHEN) [%X\n] ]\ -This nondelivery report was generated by the amavisd-new program -at host %h. Our internal reference code for your message -is %n. +Dieser Bericht über eine fehlgeschlagene Zustellung wurde vom Programm +amavisd-new auf dem Rechner %h erstellt. Der interne Referenzcode +dieser Nachricht war %n. [? %#X || -WHAT IS AN INVALID CHARACTER IN MAIL HEADER? +WAS IST EIN UNZULAESSIGES ZEICHEN IN EINEM E-MAIL-HEADER? - The RFC 2822 standard specifies rules for forming internet messages. - It does not allow the use of characters with codes above 127 to be used - directly (non-encoded) in mail header (it also prohibits NUL and bare CR). + Der RFC 2822-Standard left Regeln für Nachrichten im Internet + fest. Dazu gehört, dass Zeichen mit Codes größer als 127 nicht + direkt (nicht-enkodiert) in Header-Zeilen von E-Mail-Nachrichten + verwendet werden dürfen (NULL-Zeichen und reine Wagenrückläufe sind + ebenfalls nicht erlaubt). - If characters (e.g. with diacritics) from ISO Latin or other alphabets - need to be included in the header, these characters need to be properly - encoded according to RFC 2047. This encoding is often done transparently - by mail reader (MUA), but if automatic encoding is not available (e.g. - by some older MUA) it is the user's responsibility to avoid the use - of such characters in mail header, or to encode them manually. Typically - the offending header fields in this category are 'Subject', 'Organization', - and comment fields in e-mail addresses of the 'From', 'To' and 'Cc'. + Wenn Zeichen (z.B. mit Diakritika) aus dem ISO-Latin- oder anderen + Alphabeten in Header-Zeilen benötigt werden, müssen diese nach RFC + 2047 korrekt enkodiert werden. Diese Enkodierung wird oft transparent + vom E-Mail-Programm (MUA) vorgenommen, aber wenn das nicht der Fall + ist (z.B. in älteren MUAs), dann liegt es in der Verantwortung des + Anwenders, die Verwendung solcher Zeichen in E-Mail-Headern zu + vermeiden oder diese manuell zu enkodieren. Oftmals tritt dieses + Problem in den Betreff-, Organisation- oder in den Kommentarfeldern + von E-Mail-Adressen (Von, An, Kopie) auf. - Sometimes such invalid header fields are inserted automatically - by some MUA, MTA, content checker, or other mail handling service. - If this is the case, that service needs to be fixed or properly configured. - Typically the offending header fields in this category are 'Date', - 'Received', 'X-Mailer', 'X-Priority', 'X-Scanned', etc. + Manchmal werden solche unzulässigen Header-Felder automatisch von + einem MUA, MTA, Inhaltsüberprüfer oder anderem E-Mail-Dienst + eingefügt. Wenn das der Fall ist, dann müssen diese Dienste korrigiert + oder passend konfiguriert werden. Dieses Problem tritt typischerweise + in den Feldern 'Date', 'Received', 'X-Mailer', 'X-Priority', + 'X-Scanned' usw. auf. - If you don't know how to fix or avoid the problem, please report it - to _your_ postmaster or system manager. + Wenn Sie nicht wissen, wie Sie dieses Problem beheben oder vermeiden + können, dann fragen Sie bitte _Ihren_ E-Mail-Verwalter oder + Systemverwalter. ]\ Return-Path: %s -Your message[?%m|| %m][?%r|| (Resent-Message-ID: %r)] -could not be delivered to:[\n %N] +Ihre Nachricht[?%m|| %m][?%r|| (Resent-Message-ID: %r)] +konnte nicht zugestellt werden an:[\n %N] Index: template-spam-admin.txt =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/amavisd/de/template-spam-admin.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-spam-admin.txt 20 May 2005 00:39:25 -0000 1.1 +++ template-spam-admin.txt 23 May 2005 22:34:44 -0000 1.2 @@ -7,29 +7,29 @@ # Date: %d From: %f -Subject: SPAM FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>] +Subject: SPAM VON [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>] To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] [? %#B |#|Bcc: [<%B>|, ]] Message-ID: -Unsolicited bulk email [? %S |from unknown or forged sender:|from:] +Unerwünschte Werbepost [? %S |von unbekanntem oder gefälschtem Sender:|von:] %o Subject: %j -[? %a |#|First upstream SMTP client IP address: \[%a\] %g +[? %a |#|IP-Adresse des ersten SMTP-Klienten: \[%a\] %g ] -[? %t |#|According to the 'Received:' trace, the message originated at: +[? %t |#|Nach der 'Received:'-Spur kam die Nachricht von: \[%e\] %t ] -[? %#D |#|The message WILL BE delivered to:[\n%D] +[? %#D |#|Die Nachricht WIRD ZUGESTELLT an:[\n%D] ] -[? %#N |#|The message WAS NOT delivered to:[\n%N] +[? %#N |#|Die Nachricht WIRD NICHT ZUGESTELLT an:[\n%N] ] -[? %q |Not quarantined.|The message has been quarantined as:\n %q +[? %q |Nicht in Quarantäne.|Die Nachricht ist unter Quarantäne gestellt worden als:\n %q ] -SpamAssassin report: +SpamAssassin-Bericht: [%A ]\ Index: template-spam-sender.txt =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/amavisd/de/template-spam-sender.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-spam-sender.txt 20 May 2005 00:39:25 -0000 1.1 +++ template-spam-sender.txt 23 May 2005 22:34:44 -0000 1.2 @@ -6,20 +6,20 @@ # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # -Subject: Considered UNSOLICITED BULK EMAIL from you +Subject: Mögliche UNERWÜNSCHTE WERBEPOST von Ihnen [? %m |#|In-Reply-To: %m] Message-ID: -Your message to:[ +Ihre Nachricht an:[ -> %R] -was considered unsolicited bulk e-mail (UBE). +wurde als unerwünschte Massenwerbepost angesehen. [? %#X |#|\n[%X\n]] Subject: %j Return-Path: %s -Our internal reference code for your message is %n. +Unser interner Referenzcode für Ihre Nachricht ist %n. -[? %#D |Delivery of the email was stopped! +[? %#D |Die Zustellung der Nachricht wurde angehalten! ]# # # SpamAssassin report: Index: template-virus-admin.txt =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/amavisd/de/template-virus-admin.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-virus-admin.txt 20 May 2005 00:39:25 -0000 1.1 +++ template-virus-admin.txt 23 May 2005 22:34:44 -0000 1.2 @@ -7,46 +7,46 @@ # Date: %d From: %f -Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED (%F)]|VIRUS (%V)]# - FROM [?%l||LOCAL ][?%a||\[%a\] ][?%o|(?)|<%o>] +Subject: [? %#V |[? %#F |[? %#X ||UNZULAESSIGER HEADER]|GEBANNT (%F)]|VIRUS (%V)]# + VON [?%l||LOKAL ][?%a||\[%a\] ][?%o|(?)|<%o>] To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] Message-ID: -[? %#V |No viruses were found. -|A virus was found: %V -|Two viruses were found:\n %V -|%#V viruses were found:\n %V +[? %#V |Keine Viren gefunden. +|Ein Virus wurde gefunden: %V +|Zwei Viren wurden gefunden:\n %V +|%#V Viren wurden gefunden:\n %V ] [? %#F |#\ -|A banned name was found:\n %F -|Two banned names were found:\n %F -|%#F banned names were found:\n %F +|Ein gebannter Name wurde gefunden:\n %F +|Zwei gebannte Namen wurden gefunden:\n %F +|%#F gebannte Namen wurden gefunden:\n %F ] [? %#X |#\ -|Bad header was found:[\n %X] +|Ein schlechter Header wurde gefunden:[\n %X] ] [? %#W |#\ -|Scanner detecting a virus: %W -|Scanners detecting a virus: %W +|Scanner hat einen Virus gefunden: %W +|Scanner haben einen Virus gefunden: %W ] -The mail originated from: <%o> -[? %a |#|First upstream SMTP client IP address: \[%a\] %g +Die Nachricht kam von: <%o> +[? %a |#|IP-Adresse des ersten Upstream-SMTP-Klienten: \[%a\] %g ] -[? %t |#|According to the 'Received:' trace, the message originated at: +[? %t |#|Nach der 'Received:'-Spur kam die Nachricht von: \[%e\] %t ] -[? %#S |Notification to sender will not be mailed. +[? %#S |Es wird keine Benachrichtigung an den Absender geschickt. ]# -[? %#D |#|The message WILL BE delivered to:[\n%D] +[? %#D |#|Die Nachricht wird ausgeliefert an:[\n%D] ] -[? %#N |#|The message WAS NOT delivered to:[\n%N] +[? %#N |#|Die Nachricht wurde NICHT ausgeliefert an:[\n%N] ] -[? %#V |#|[? %#v |#|Virus scanner output:[\n %v] +[? %#V |#|[? %#v |#|Ausgabe des Virus-Scanners:[\n %v] ]] -[? %q |Not quarantined.|The message has been quarantined as:\n %q +[? %q |Nicht in Quarantäne.|Die Nachricht wurde unter Quarantäne gestellt als:\n %q ] ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s Index: template-virus-recipient.txt =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/amavisd/de/template-virus-recipient.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-virus-recipient.txt 20 May 2005 00:39:25 -0000 1.1 +++ template-virus-recipient.txt 23 May 2005 22:34:44 -0000 1.2 @@ -7,30 +7,30 @@ # Date: %d From: %f -Subject: [? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED]|VIRUS (%V)]# - IN MAIL TO YOU (from [?%o|(?)|<%o>]) +Subject: [? %#V |[? %#F |[? %#X ||UNZULAESSIGER HEADER]|GEBANNT]|VIRUS (%V)]# + IN NACHRICHT AN SIE (von [?%o|(?)|<%o>]) To: [? %#T |undisclosed-recipients: ;|[<%T>|, ]] [? %#C |#|Cc: [<%C>|, ]] Message-ID: -[? %#V |[? %#F ||BANNED CONTENTS ALERT]|VIRUS ALERT] +[? %#V |[? %#F ||WARNUNG UEBER GEBANNTEN INHALT]|VIRUS-WARNUNG] -Our content checker found -[? %#V |#| [? %#V |viruses|virus|viruses]: %V] -[? %#F |#| banned [? %#F |names|name|names]: %F] +Unsere Inhaltsüberprüfung fand +[? %#V |#| [? %#V |Viren|Virus|Viren]: %V] +[? %#F |#| gebannte [? %#F |Namen|Name|Namen]: %F] [? %#X |#|\n[%X\n]] -in an email to you [? %S |from unknown sender:|from:] +in einer Nachricht an Sie [? %S |von einem unbekannten Absender:|von:] %o -[? %a |#|First upstream SMTP client IP address: \[%a\] %g +[? %a |#|IP-Adresse des ersten SMTP-Klienten: \[%a\] %g ] -[? %t |#|According to the 'Received:' trace, the message originated at: +[? %t |#|Nach der 'Received:'-Spur kam die Nachricht von: \[%e\] %t ] -Our internal reference code for this message is %n. -[? %q |Not quarantined.|The message has been quarantined as: +Unser interner Referenzcode für diese Nachricht ist %n. +[? %q |Nicht in Quarantäne.|Die Nachricht wurde unter Quarantäne gestellt als: %q] -Please contact your system administrator for details. +Details erfragen Sie bitte von Ihrem Systemverwalter. Index: template-virus-sender.txt =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/amavisd/de/template-virus-sender.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- template-virus-sender.txt 20 May 2005 00:39:25 -0000 1.1 +++ template-virus-sender.txt 23 May 2005 22:34:44 -0000 1.2 @@ -6,65 +6,69 @@ # non-standard header field heads must begin with "X-" . # The From, To and Date header fields will be provided automatically. # -Subject: [? %#V |[? %#F |Unknown problem|BANNED (%F)]|VIRUS (%V)] IN MAIL FROM YOU +Subject: [? %#V |[? %#F |Unbekanntes Problem|GEBANNT (%F)]|VIRUS (%V)] IN NACHRICHT VON IHNEN [? %m |#|In-Reply-To: %m] Message-ID: -[? %#V |[? %#F |[? %#X ||INVALID HEADER]|BANNED CONTENTS ALERT]|VIRUS ALERT] +[? %#V |[? %#F |[? %#X ||UNZULAESSIGER HEADER]|WARNUNG UEBER GEBANNTEN INHALT]|VIRUS-WARNUNG] -Our content checker found -[? %#V |#| [? %#V |viruses|virus|viruses]: %V] -[? %#F |#| banned [? %#F |names|name|names]: %F] +Unsere Inhaltsüberprüfung hat gefunden +[? %#V |#| [? %#V |Viren|Virus|Viren]: %V] +[? %#F |#| gebannte [? %#F |Namen|Name|Namen]: %F] [? %#X |#|\n[%X\n]] -in email presumably from you (%s), -to the following [? %#R |recipients|recipient|recipients]:[ +in einer Nachricht, die vermutlich von Ihnen stammt (%s), +an den/die folgenden [? %#R |Empfänger|Empfänger|Empfänger]:[ -> %R] -Our internal reference code for your message is %n. +Unser interner Referenzcode für Ihre Nachricht ist %n. -[? %#V ||Please check your system for viruses, -or ask your system administrator to do so. +[? %#V ||Bitte suchen Sie Ihr System nach Viren ab, +oder bitten Sie Ihren Systemverwalter, dieses zu tun. ]# -[? %#D |Delivery of the email was stopped! +[? %#D |Die Zustellung der Nachricht wurde angehalten! ]# [? %#V |[? %#F ||# -The message has been blocked because it contains a component -(as a MIME part or nested within) with declared name -or MIME type or contents type violating our access policy. +Die Nachricht wurde blockiert, weil sie eine Komponente (als +MIME-Bestandteil oder eingeschachtelt) mit einem deklarierten Namen +oder MIME-Typ oder Inhaltstyp enthält, der gegen unsere +Zugriffsbedingungen verstößt. -To transfer contents that may be considered risky or unwanted -by site policies, or simply too large for mailing, please consider -publishing your content on the web, and only sending an URL of the -document to the recipient. +Um Inhalte zu übertragen, die als riskant oder unerwünscht angesehen +werden könnten oder einfach zu groß sind, um als E-Mail übertragen zu +werden, könnten Sie den Inhalt im Web veröffentlichen und nur eine URL +des Dokuments an den Empfänger schicken. -Depending on the recipient and sender site policies, with a little -effort it might still be possible to send any contents (including -viruses) using one of the following methods: +Je nach den Nutzungsbedingungen des Empfängers und Absenders kann es +trotzdem noch möglich sein, mit ein wenig Mühe beliebige Inhalte +(einschließlich Viren) mittels einer der folgenden Methoden zu +verschicken: -- encrypted using pgp, gpg or other encryption methods; +- verschlüsselt mit pgp, gpg oder anderen Verschlüsselungsmethoden; -- wrapped in a password-protected or scrambled container or archive - (e.g.: zip -e, arj -g, arc g, rar -p, or other methods) +- in einen passwortgeschützten oder verzerrten Container oder Archiv eingepackt + (z.B. zip -e, arj -g, arc g, rar -, oder andere Methoden) -Note that if the contents is not intended to be secret, the -encryption key or password may be included in the same message -for recipient's convenience. +Beachten Sie, dass der Verschlüsselungsschlüssel oder das Passwort in +der gleichen Nachricht enthalten sein kann, wenn der Inhalt nicht +geheim ist. Das macht es dem Empfänger leichter. -We are sorry for inconvenience if the contents was not malicious. +Wir bedauern die Umstände, falls der Inhalt nicht bösartig gewesen ist. -The purpose of these restrictions is to cut the most common propagation -methods used by viruses and other malware. These often exploit automatic -mechanisms and security holes in certain mail readers (Microsoft mail -readers and browsers are a common and easy target). By requiring an -explicit and decisive action from the recipient to decode mail, -the dangers of automatic malware propagation is largely reduced. +Diese Restriktionen bestehen, um die häufigsten Verbreitungsmethoden +von Viren und anderen schädlichen Programmen zu verhindern. Diese +bestehen oft darin, automatische Mechanismen und Sicherheitslöcher in +bestimmten E-Mail-Programmen auszunutzen (E-Mail-Programme und +Web-Browser von Microsoft sind beliebte und einfache Kandidaten.) In +dem der Empfänger explizit eine bestimmte Handlung ausführen muss, um +die Nachricht zu dekodieren, wird die Gefahr der automatischen +Verbreitung von schädlichen Programmen deutlich verringert. # -# Details of our mail restrictions policy are available at ... +# Details über unsere E-Mail-Beschränkungen finden Sie unter... ]]# -For your reference, here are headers from your email: +Zu Ihrer Information finden Sie die Header aus Ihrer Nachricht: ------------------------- BEGIN HEADERS ----------------------------- Return-Path: %s [%H From cvs at intevation.de Wed May 25 15:14:38 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 25 15:14:39 2005 Subject: steffen: server/openldap Makefile,1.9,1.10 kolab.patch,NONE,1.1 Message-ID: <20050525131438.1174410015D@lists.intevation.de> Author: steffen Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv17303/openldap Added Files: Makefile kolab.patch Log Message: libdb fix for openldap --- NEW FILE: kolab.patch --- --- ../openldap.orig/openldap.spec 2005-02-21 18:02:29.000000000 +0100 +++ openldap.spec 2005-05-25 14:31:19.000000000 +0200 @@ -34,7 +34,7 @@ Class: BASE Group: Database License: GPL Version: 2.2.23 -Release: 2.3.0 +Release: 2.3.0_kolab # package options %option with_fsl yes @@ -90,7 +90,7 @@ AutoReqProv: no # (2. make sure our Berkeley-DB is picked up first) %{l_shtool} subst \ -e 's;ln -s;ln;g' \ - -e 's;-ldb42;-ldb;g' \ + -e 's;-ldb43;%{l_prefix}/lib/libdb.a;g' \ -e 's;;"db.h";g' \ configure %if "%{with_sasl}" == "yes" From cvs at intevation.de Wed May 25 15:16:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 25 15:16:49 2005 Subject: steffen: server/kolabd kolabd.spec,1.46,1.47 Message-ID: <20050525131647.D4BBE10015D@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv17366 Modified Files: kolabd.spec Log Message: version Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- kolabd.spec 20 May 2005 00:39:25 -0000 1.46 +++ kolabd.spec 25 May 2005 13:16:45 -0000 1.47 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050520 +Release: 20050523 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Wed May 25 15:21:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed May 25 15:21:43 2005 Subject: steffen: server obmtool.conf,1.160,1.161 Message-ID: <20050525132142.152AA10015D@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv17461 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 --- obmtool.conf 23 May 2005 13:07:31 -0000 1.160 +++ obmtool.conf 25 May 2005 13:21:40 -0000 1.161 @@ -76,7 +76,7 @@ @install ${loc}procmail-3.22-2.2.0 @install ${loc}pth-2.0.4-2.3.0 @install ${loc}db-4.2.52.2-2.2.0 - @install ${loc}openldap-2.2.23-2.3.0 + @install ${altloc}openldap-2.2.23-2.3.0_kolab @install ${loc}sasl-2.1.19-2.2.1 --with=ldap --with=login @install ${loc}getopt-20030307-2.2.0 @install ${loc}proftpd-1.2.10-2.2.0 --with=ldap @@ -132,7 +132,7 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050520 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050523 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-0.4.0-20050520 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version @check From cvs at intevation.de Thu May 26 08:29:50 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 08:29:52 2005 Subject: martin: server/kolabd/kolabd/templates slapd.conf.template, 1.8, 1.9 Message-ID: <20050526062950.E080F1006A8@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv27821 Modified Files: slapd.conf.template Log Message: Martin Konold: - decreased idle timeout (D. Kluenther) - increased idlcachesize (D. Kluenther) - added inxeding for givenName (Andreas Gungl) Index: slapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- slapd.conf.template 3 May 2005 11:55:42 -0000 1.8 +++ slapd.conf.template 26 May 2005 06:29:48 -0000 1.9 @@ -39,13 +39,14 @@ database bdb checkpoint 128 10 + suffix "@@@base_dn@@@" directory @l_prefix@/var/openldap/openldap-data rootdn "@@@bind_dn@@@" rootpw "@@@bind_pw_hash@@@" -idletimeout 25 +idletimeout 10 replica uri=ldap://127.0.0.1:9999 binddn="cn=replicator" @@ -58,10 +59,11 @@ index alias approx,sub,pres,eq index cn approx,sub,pres,eq index sn approx,sub,pres,eq +index givenName approx,sub,pres,eq index kolabHomeServer pres,eq index member pres,eq -idlcachesize 2000 +idlcachesize 10000 access to attr=userPassword by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" =wx From cvs at intevation.de Thu May 26 08:32:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 08:32:48 2005 Subject: martin: server/kolabd/kolabd/templates imapd.conf.template, 1.3, 1.4 Message-ID: <20050526063247.9396C1006A8@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv27959 Modified Files: imapd.conf.template Log Message: Martin Konold: - make imapd more robust agains mailboxes with capital letters as LDAP does is always case insensitive in this respect. Index: imapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- imapd.conf.template 5 Jan 2005 17:15:28 -0000 1.3 +++ imapd.conf.template 26 May 2005 06:32:45 -0000 1.4 @@ -34,6 +34,7 @@ #altnamespace unixhierarchysep: yes lmtp_downcase_rcpt: yes +username_tolower: 1 ##virtdomains: userid loginrealms: @@@postfix-mydomain@@@ From cvs at intevation.de Thu May 26 13:50:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 13:50:05 2005 Subject: steffen: server/openldap kolab.patch,1.1,1.2 Message-ID: <20050526115004.1F774101FA2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv2569 Modified Files: kolab.patch Log Message: use native threads if possible Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/openldap/kolab.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab.patch 25 May 2005 13:14:35 -0000 1.1 +++ kolab.patch 26 May 2005 11:50:01 -0000 1.2 @@ -1,5 +1,5 @@ --- ../openldap.orig/openldap.spec 2005-02-21 18:02:29.000000000 +0100 -+++ openldap.spec 2005-05-25 14:31:19.000000000 +0200 ++++ openldap.spec 2005-05-26 13:24:41.000000000 +0200 @@ -34,7 +34,7 @@ Class: BASE Group: Database License: GPL @@ -18,3 +18,12 @@ -e 's;;"db.h";g' \ configure %if "%{with_sasl}" == "yes" +@@ -160,7 +160,7 @@ AutoReqProv: no + %endif + --with-dyngroup \ + --with-proxycache \ +- --with-threads=pth \ ++ --with-threads=auto \ + --enable-slurpd + + # build toolkit From cvs at intevation.de Thu May 26 13:52:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 13:52:13 2005 Subject: steffen: server/imapd kolab.patch,1.20,1.21 Message-ID: <20050526115212.9BA1D101FA2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv2630 Modified Files: kolab.patch Log Message: use openpkg supplied libdb Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imapd/kolab.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- kolab.patch 22 Apr 2005 02:01:35 -0000 1.20 +++ kolab.patch 26 May 2005 11:52:10 -0000 1.21 @@ -1,5 +1,5 @@ --- ../imapd.orig/imapd.spec 2005-02-21 18:02:27.000000000 +0100 -+++ imapd.spec 2005-04-21 00:51:04.705243928 +0200 ++++ imapd.spec 2005-05-26 12:40:54.000000000 +0200 @@ -3,6 +3,9 @@ ## Copyright (c) 2000-2005 The OpenPKG Project ## Copyright (c) 2000-2005 Ralf S. Engelschall @@ -15,7 +15,7 @@ License: BSD Version: 2.2.12 -Release: 2.3.0 -+Release: 2.3.0_kolab2 ++Release: 2.3.0_kolab3 # package options -%option with_fsl yes @@ -62,7 +62,7 @@ %endif %if "%{with_drac}" == "yes" %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch -@@ -95,6 +110,16 @@ AutoReqProv: no +@@ -95,10 +110,21 @@ AutoReqProv: no sleep 1 touch configure %endif @@ -79,3 +79,9 @@ %{l_shtool} subst \ -e 's;-L/usr/local/lib;;g' \ -e 's;-I/usr/local/include;;g' \ +- -e 's;db-4.1;db;g' \ ++ -e 's;db-4.4;db;g' \ ++ -e 's;-l\$dbname;%{l_prefix}/lib/lib$dbname.a;g' \ + configure + + # ensure local com_err can be used From cvs at intevation.de Thu May 26 13:57:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 13:57:59 2005 Subject: martin: server/openldap kolab.patch,1.2,1.3 Message-ID: <20050526115757.2B294101FA2@lists.intevation.de> Author: martin Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv2744 Modified Files: kolab.patch Log Message: Martin Konold: Currently we don't want to link agains db-4.3 but db-4.2. This patch shall only guarantee that we link statically not dynamically against the OpenPKG version Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/openldap/kolab.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab.patch 26 May 2005 11:50:01 -0000 1.2 +++ kolab.patch 26 May 2005 11:57:55 -0000 1.3 @@ -14,7 +14,7 @@ %{l_shtool} subst \ -e 's;ln -s;ln;g' \ - -e 's;-ldb42;-ldb;g' \ -+ -e 's;-ldb43;%{l_prefix}/lib/libdb.a;g' \ ++ -e 's;-ldb42;%{l_prefix}/lib/libdb.a;g' \ -e 's;;"db.h";g' \ configure %if "%{with_sasl}" == "yes" From cvs at intevation.de Thu May 26 14:34:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 14:34:18 2005 Subject: steffen: server/openldap kolab.patch,1.3,1.4 Message-ID: <20050526123418.06D911005AF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv3695 Modified Files: kolab.patch Log Message: revert Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/openldap/kolab.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolab.patch 26 May 2005 11:57:55 -0000 1.3 +++ kolab.patch 26 May 2005 12:34:16 -0000 1.4 @@ -14,7 +14,7 @@ %{l_shtool} subst \ -e 's;ln -s;ln;g' \ - -e 's;-ldb42;-ldb;g' \ -+ -e 's;-ldb42;%{l_prefix}/lib/libdb.a;g' \ ++ -e 's;-ldb43;%{l_prefix}/lib/libdb.a;g' \ -e 's;;"db.h";g' \ configure %if "%{with_sasl}" == "yes" From cvs at intevation.de Thu May 26 14:52:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 14:52:42 2005 Subject: steffen: server/kolabd kolabd.spec,1.47,1.48 Message-ID: <20050526125242.0D32E1005AF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv4100 Modified Files: kolabd.spec Log Message: version Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- kolabd.spec 25 May 2005 13:16:45 -0000 1.47 +++ kolabd.spec 26 May 2005 12:52:39 -0000 1.48 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050523 +Release: 20050526 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Thu May 26 14:53:33 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 14:53:34 2005 Subject: steffen: server obmtool.conf,1.161,1.162 Message-ID: <20050526125333.7DB7C1005AF@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4137 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.161 retrieving revision 1.162 diff -u -d -r1.161 -r1.162 --- obmtool.conf 25 May 2005 13:21:40 -0000 1.161 +++ obmtool.conf 26 May 2005 12:53:31 -0000 1.162 @@ -86,7 +86,7 @@ @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 @install ${altloc}perl-kolab-5.8.5-20050503 - @install ${altloc}imapd-2.2.12-2.3.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars + @install ${altloc}imapd-2.2.12-2.3.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars @install ${loc}m4-1.4.2-2.2.0 @install ${loc}bison-1.35-2.2.0 @install ${loc}flex-2.5.4a-2.2.0 @@ -132,7 +132,7 @@ @install ${plusloc}clamav-0.83-2.3.0 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050523 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050526 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-0.4.0-20050520 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version @check From cvs at intevation.de Thu May 26 22:07:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu May 26 22:07:47 2005 Subject: david: doc/kde-client/svn-instructions checkout_proko2.sh,1.5,1.6 Message-ID: <20050526200746.539E3101FB9@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv20226 Modified Files: checkout_proko2.sh Log Message: kontact is fully proko2-branched now Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- checkout_proko2.sh 18 May 2005 12:21:54 -0000 1.5 +++ checkout_proko2.sh 26 May 2005 20:07:44 -0000 1.6 @@ -43,7 +43,7 @@ switch_dir certmanager/lib switch_dir kmail -switch_dir kontact/plugins/summary +switch_dir kontact switch_dir kpilot switch_dir kioslaves/imap4 switch_dir doc/kmail @@ -52,7 +52,6 @@ switch_dir libkdepim switch_dir mimelib switch_dir libkcal -switch_dir kontact/src switch_dir kresources for f in \ @@ -63,7 +62,6 @@ kaddressbook/features/distributionlistwidget.{cpp,h} \ kaddressbook/features/resourceselection.{cpp,h} \ certmanager/{aboutdata.cpp,certificatewizard{.ui,impl.cpp},lib/backends/qgpgme/qgpgmejob.cpp} \ - kontact/Makefile.am \ korganizer/{freebusymanager.cpp,version.h,actionmanager.cpp} \ korganizer/{kodialogmanager.cpp,koagenda.cpp} \ korganizer/{kogroupware.{cpp,h},calendarview.{cpp,h}} \ From cvs at intevation.de Fri May 27 10:53:45 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 10:53:46 2005 Subject: bernhard: server README.1st,1.14,1.15 Message-ID: <20050527085345.809A5101FD4@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4787 Modified Files: README.1st Log Message: Added Suse to the libdb4.3 notes. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- README.1st 20 May 2005 10:20:19 -0000 1.14 +++ README.1st 27 May 2005 08:53:43 -0000 1.15 @@ -38,11 +38,12 @@ Platform specific notes ----------------------- -Debian Sarge +Debian Sarge, Suse 9.3 When libdb4.3 is installed some programs are incorrectly linked - agains the debian's libdb instead of the one from OpenPKG. To work - around this problem, deinstall the debian package. + against the libdb4.3 instead of the one from OpenPKG. To work + around this problem, temporarily deinstall the package when building + from the sources. Upgrading from earlier versions From cvs at intevation.de Fri May 27 10:58:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 10:58:54 2005 Subject: bernhard: server README.1st,1.15,1.16 Message-ID: <20050527085853.69380101FD5@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4896 Modified Files: README.1st Log Message: Removed the snapshot headline from the upgrade notes as snapshots are sort of development versions. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- README.1st 27 May 2005 08:53:43 -0000 1.15 +++ README.1st 27 May 2005 08:58:51 -0000 1.16 @@ -156,11 +156,8 @@ Upgrade from Beta5 ------------------ -Again, the openldap configuration has changed a bit. It should be -enough to run kolabconf and restart openldap. - -Upgrade from before snapshot-20050520 -------------------------------------- +Again, the openldap configuration has changed a bit. +Rerun kolabconf and restart openldap. Distribution lists now have a mail attribute. Use an LDAP editor to fill the mail attribute for all kolabGroupOfNames objects with From cvs at intevation.de Fri May 27 11:07:05 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 11:07:06 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include locale.php, 1.2, 1.3 Message-ID: <20050527090705.67C29101FD8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv5321/kolab-webadmin/php/admin/include Modified Files: locale.php Log Message: fixlet for Issue722 (language setting) Index: locale.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/locale.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- locale.php 11 Mar 2005 12:02:14 -0000 1.2 +++ locale.php 27 May 2005 09:07:03 -0000 1.3 @@ -24,6 +24,23 @@ session_start(); +function supported_lang($lang) { + + // REMEMBER TO UPDATE THIS WHEN ADDING NEW LANGUAGES + $a = array("de" => "de", + "de_DE" => "de", + "en" => "en", + "en_US" => "en"); + + // Locales must be in the format xx_YY to be recognized by xgettext + $lang = str_replace('-','_',$lang); + if(!strpos($lang, '_')) { + $lang = $lang . '_' . strtoupper($lang); + } + if( !array_key_exists( $lang, $a ) ) return false; + else return $a[$lang]; +} + // This function is called in templates my Smarty function translate($params) { @@ -47,7 +64,12 @@ } else { // In case of multiple accept languages, keep the first one $acceptList = explode(",", $acceptList); - $lang = $acceptList[0]; + foreach($acceptList as $l) { + if( supported_lang($l) ) { + $lang = $l; + break; + } + } } setLanguage($lang); @@ -58,12 +80,8 @@ # Allows languages to be set by users function setLanguage($lang) -{ - // Locales must be in the format xx_YY to be recognized by xgettext - if(!strpos($lang, "_")) { - $lang = $lang . "_" . strtoupper($lang); - } - +{ + $lang = supported_lang($lang); $_SESSION["lang"] = $lang; } From cvs at intevation.de Fri May 27 12:42:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 12:42:48 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.59, 1.60 Message-ID: <20050527104246.C4938101FCB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv6952/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: prevent inconsistant groupOfNames objects when changing an account objects DN (Issue745) Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- user.php 27 Apr 2005 21:39:59 -0000 1.59 +++ user.php 27 May 2005 10:42:44 -0000 1.60 @@ -559,6 +559,19 @@ if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$domain_dn; else $newdn = $dn; if (strcmp($dn,$newdn) != 0) { + // Check for distribution lists with this user as member + $ldap->search( $_SESSION['base_dn'], + '(&(objectClass=kolabGroupOfNames)(member='.$ldap->escape($dn).'))', + array( 'dn', 'mail' ) ); + $distlists = $ldap->getEntries(); + unset( $distlists['count'] ); + foreach( $distlists as $distlist ) { + $dlcn = $distlist['mail'][0]; + $errors[] = _("Account DN could not be modified, distribution list '$dlcn' depends on it. To modify this account, first remove it from the distribution list."); + } + if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) && ($entry=ldap_first_entry($ldap->connection,$result)) && ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) { From cvs at intevation.de Fri May 27 13:01:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 13:01:55 2005 Subject: steffen: server obmtool.conf,1.162,1.163 Message-ID: <20050527110153.B21F7101FD5@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv7273 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.162 retrieving revision 1.163 diff -u -d -r1.162 -r1.163 --- obmtool.conf 26 May 2005 12:53:31 -0000 1.162 +++ obmtool.conf 27 May 2005 11:01:51 -0000 1.163 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050522"; + kolab_version="pre-2.0-snapshot-20050527"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -133,7 +133,7 @@ @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 @install ${altloc}kolabd-1.9.4-20050526 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050520 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050527 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version @check From cvs at intevation.de Fri May 27 14:27:03 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 14:27:04 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.51,1.52 Message-ID: <20050527122703.A6959101FD7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv8653/Kolab-Conf Modified Files: Conf.pm Log Message: no need to restart imapd when changing the groupfile Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- Conf.pm 3 May 2005 11:55:42 -0000 1.51 +++ Conf.pm 27 May 2005 12:27:01 -0000 1.52 @@ -427,17 +427,6 @@ chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg); - if (-f $oldcfg) { - my $rc = `diff -q $cfg $oldcfg`; - chomp($rc); - if ($rc) { - Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG); - $Kolab::haschanged{'imapd'} = 1; - } - } else { - $Kolab::haschanged{'imapd'} = 1; - } - Kolab::log('T', 'Finished building Cyrus groups', KOLAB_DEBUG ); } From cvs at intevation.de Fri May 27 14:27:03 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 14:27:05 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.87,1.88 Message-ID: <20050527122703.A242B101FD5@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv8653 Modified Files: perl-kolab.spec Log Message: no need to restart imapd when changing the groupfile Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- perl-kolab.spec 3 May 2005 11:55:42 -0000 1.87 +++ perl-kolab.spec 27 May 2005 12:27:01 -0000 1.88 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 20050503 +Release: 20050527 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Fri May 27 14:30:00 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 14:30:01 2005 Subject: steffen: server obmtool.conf,1.163,1.164 Message-ID: <20050527123000.9B834101FD5@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv8739 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.163 retrieving revision 1.164 diff -u -d -r1.163 -r1.164 --- obmtool.conf 27 May 2005 11:01:51 -0000 1.163 +++ obmtool.conf 27 May 2005 12:29:58 -0000 1.164 @@ -85,7 +85,7 @@ @install ${altloc}postfix-2.1.5-2.2.0_kolab2 --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 - @install ${altloc}perl-kolab-5.8.5-20050503 + @install ${altloc}perl-kolab-5.8.5-20050527 @install ${altloc}imapd-2.2.12-2.3.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars @install ${loc}m4-1.4.2-2.2.0 @install ${loc}bison-1.35-2.2.0 From cvs at intevation.de Fri May 27 17:53:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 17:53:26 2005 Subject: bh: server release-notes.txt,1.7,1.8 Message-ID: <20050527155325.51985102BCB@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19117 Modified Files: release-notes.txt Log Message: update for RC 2 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- release-notes.txt 6 May 2005 10:45:11 -0000 1.7 +++ release-notes.txt 27 May 2005 15:53:23 -0000 1.8 @@ -1,48 +1,60 @@ Release notes Kolab2 Server -(Version 20050506, Kolab server 2.0 RC 1) +(Version 20050527, Kolab server 2.0 RC 2) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. -Changes since Beta 5, 20050422: +Changes since RC 1, 20050506: - - kolabd 20050421 -> 20050503 + - postfix 2.1.5-2.2.0_kolab -> 2.1.5-2.2.0_kolab2 - Run more than one instance of the kolabfilter to improve mail - performance + * Fixing: + Issue746 (distributionlist duplicates emails) - Add DB_CONFIG for openldap's database. Part of Issue707. - Some more documentation: - - how Kolab uses sieve - - solution for invitations forwarded by Outlook + - openldap 2.2.23-2.3.0 -> 2.2.23-2.3.0_kolab + + Make sure libdb is linked statically. + + Some more configuration tweaks. There's a new index on givenName + among other things + + Build with native threads instead of using pth. This may help fix + Issue707 (occasional slapd hangs after attempted writes) + + + - imapd 2.2.12-2.3.0_kolab2 -> 2.2.12-2.3.0_kolab3 + + Make sure libdb is linked statically. + + + - kolabd 20050503 -> 20050526 + + Localized virus/spam delivery status notifications. Only German + so far. It's not enabled by default. * Fixing: - Issue591 (show Kolab version) + Issue746 (distributionlist duplicates emails) - - kolab-resource-handlers 20050412 -> 20050504 - some performance improvements + - kolab-resource-handlers 20050504 -> 20050520 + + better error handling in filter scripts * Fixing: - Issue231 (german text in fbview) - Issue665 (problems with appointments forwarded by outlook) + Issue744 (invitation policy not case independent) - - kolab-webadmin 20050422 -> 20050428 - * Fixing: - Issue533 (add mail attribute to distribution lists) - Issue607 (do not remove users if they're single members of dlists) - Issue591 (Kolab version in "About Kolab" page) + - kolab-webadmin 20050428 -> 20050527 - - perl-kolab 20050421 -> 20050503 + localized vacation message text - Add DB_CONFIG for openldap's database. Part of Issue707. + "no vacation replies to spam" is now default - * Fixing: - Issue222 (no more "c" permissions for public folders) + * Fixing: + Issue745 (inconsistant groupOfNames when changing an account's DN) $Id$ From cvs at intevation.de Fri May 27 18:07:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri May 27 18:07:49 2005 Subject: bh: server README.1st,1.16,1.17 Message-ID: <20050527160748.32F43102BCE@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19703 Modified Files: README.1st Log Message: update for the RC2 release Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- README.1st 27 May 2005 08:58:51 -0000 1.16 +++ README.1st 27 May 2005 16:07:46 -0000 1.17 @@ -40,6 +40,8 @@ Debian Sarge, Suse 9.3 + Note: The following problem should be fixed with the RC2 release. + When libdb4.3 is installed some programs are incorrectly linked against the libdb4.3 instead of the one from OpenPKG. To work around this problem, temporarily deinstall the package when building @@ -164,6 +166,26 @@ the email address of the distribution list. For more information on Kolab, see http://www.kolab.org + + +Upgrade from RC1 +---------------- + +The openldap package has been updated. For how to deal with an update +of the openldap package, see the instructions for the upgrade from +Beta4. + +There's also a new index for the openldap data, so the index has to be +rebuilt as described for the update from Beta3. + +The mail attribute that was added to the distribution list entries in +RC1 is now used to lookup the distribution list's ldap entry. +Therefore, fixing the mail attribute as described for the upgrade from +beta5 is important if you want your old distribution lists to work. + + + + $Id$ From cvs at intevation.de Sat May 28 22:36:06 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat May 28 22:36:08 2005 Subject: steffen: server obmtool.conf,1.164,1.165 Message-ID: <20050528203606.B51E71005D4@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19206 Modified Files: obmtool.conf Log Message: new clamav (Issue766) Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- obmtool.conf 27 May 2005 12:29:58 -0000 1.164 +++ obmtool.conf 28 May 2005 20:36:04 -0000 1.165 @@ -129,7 +129,7 @@ @install ${altloc}spamassassin-3.0.2-20041216 @install ${altloc}amavisd-2.1.2-2.2.0_kolab @install ${loc}curl-7.12.1-2.2.0 - @install ${plusloc}clamav-0.83-2.3.0 + @install ${altloc}clamav-0.85.1-20050517 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 @install ${altloc}kolabd-1.9.4-20050526 --define kolab_version=$kolab_version From cvs at intevation.de Sat May 28 22:56:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat May 28 22:56:09 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.8, 1.9 Message-ID: <20050528205607.C83A41005D4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook In directory doto:/tmp/cvs-serv19592/kolab-webadmin/www/admin/addressbook Modified Files: addr.php Log Message: Missing validation on addressbook email entry (Issue769) Index: addr.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- addr.php 11 Mar 2005 09:11:15 -0000 1.8 +++ addr.php 28 May 2005 20:56:05 -0000 1.9 @@ -54,6 +54,17 @@ $form->entries['action']['value'] = 'save'; } +function checkuniquemail( $form, $key, $value ) { + global $ldap; + $value = trim($value); + if( $value == '' ) return ''; // OK + + if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) { + return _('User, vCard or distribution list with this email address already exists'); + } else { + return ''; + } +} /**** Submenu for current page ***/ $menuitems[$sidx]['selected'] = 'selected'; @@ -82,7 +93,8 @@ 'validation' => 'notempty', 'comment' => _('Required') ), 'title' => array( 'name' => _('Title') ), - 'mail' => array( 'name' => _('Primary E-Mail Address') ), + 'mail' => array( 'name' => _('Primary E-Mail Address'), + 'validation' => 'checkuniquemail' ), 'alias' => array( 'name' => _('E-Mail Aliases'), 'type' => 'textarea', 'comment' => _('One address per line')), @@ -253,7 +265,7 @@ /**** Insert into template and output ***/ $smarty =& new MySmarty(); -$smarty->assign( 'errors', $errors ); +$smarty->assign( 'errors', array_merge($errors,$form->errors) ); $smarty->assign( 'messages', $messages ); $smarty->assign( 'heading', $heading ); $smarty->assign( 'uid', $auth->uid() ); From cvs at intevation.de Sat May 28 22:56:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat May 28 22:56:11 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.60, 1.61 Message-ID: <20050528205607.D3CE61005D6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv19592/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: Missing validation on addressbook email entry (Issue769) Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- user.php 27 May 2005 10:42:44 -0000 1.60 +++ user.php 28 May 2005 20:56:05 -0000 1.61 @@ -66,7 +66,7 @@ } if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) { - return _('User or distribution list with this email address already exists'); + return _('User, vCard or distribution list with this email address already exists'); } else { return ''; } From cvs at intevation.de Sun May 29 00:09:08 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun May 29 00:09:09 2005 Subject: steffen: server/kolabd/kolabd/templates httpd.conf.template, 1.5, 1.6 legacy.conf.template, 1.1.1.1, NONE Message-ID: <20050528220908.D78DE1005D4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv21014 Modified Files: httpd.conf.template Removed Files: legacy.conf.template Log Message: no extra template file for legacy mode Index: httpd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- httpd.conf.template 7 Apr 2005 06:56:22 -0000 1.5 +++ httpd.conf.template 28 May 2005 22:09:06 -0000 1.6 @@ -176,7 +176,18 @@ DavLockDB @l_prefix@/var/kolab/www/locks/DAVlock -@@@legacy-mode@@@ + + SSLRequireSSL + +@@@if apache-http@@@ +@@@else@@@ + + SSLRequireSSL + + + SSLRequireSSL + +@@@endif@@@ # # SSLVerifyClient require @@ -186,7 +197,7 @@ #Dav On - Script PUT /freebusy/freebusy.php + #Script PUT /freebusy/freebusy.php AllowOverride None Options None # Disallow for everyone as default @@ -249,7 +260,6 @@ AllowOverride All Allow from all - SSLRequireSSL php_value include_path ".:@l_prefix@/var/kolab/php:@l_prefix@/var/kolab/php/pear:/php/include:@l_prefix@/lib/php" @@ -271,7 +281,6 @@ #Base_DN "@@@base_dn@@@" #UID_Attr uid #require valid-user - SSLRequireSSL AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip --- legacy.conf.template DELETED --- From cvs at intevation.de Sun May 29 00:10:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun May 29 00:10:23 2005 Subject: steffen: server/perl-kolab/Kolab Kolab.pm,1.20,1.21 Message-ID: <20050528221022.5868B1005D6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab In directory doto:/tmp/cvs-serv21058/Kolab Modified Files: Kolab.pm Log Message: no special legacy-mode handling Index: Kolab.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Kolab.pm 5 Jan 2005 13:13:31 -0000 1.20 +++ Kolab.pm 28 May 2005 22:10:20 -0000 1.21 @@ -208,11 +208,6 @@ $config{'proftpd-userPassword'} = ''; } - # Apache legacy mode - $config{'legacy-mode'} = "# no legacy configuration"; - if (exists $config{'apache-http'} && $config{'apache-http'} =~ /true/i) { - $config{'legacy-mode'} = 'Include "' . $config{'prefix'} . '/etc/apache/legacy.conf"'; - } $config{'fqdn'} = trim(`hostname`); # Cyrus admin account From cvs at intevation.de Mon May 30 00:43:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 00:43:12 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.88,1.89 Message-ID: <20050529224310.F3E6C1005CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv10126 Modified Files: perl-kolab.spec Log Message: added postfix virtual map template (Issue768) Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- perl-kolab.spec 27 May 2005 12:27:01 -0000 1.88 +++ perl-kolab.spec 29 May 2005 22:43:08 -0000 1.89 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 20050527 +Release: 20050529 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Mon May 30 00:43:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 00:43:13 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.52,1.53 Message-ID: <20050529224311.026311005D2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv10126/Kolab-Conf Modified Files: Conf.pm Log Message: added postfix virtual map template (Issue768) Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- Conf.pm 27 May 2005 12:27:01 -0000 1.52 +++ Conf.pm 29 May 2005 22:43:08 -0000 1.53 @@ -217,21 +217,32 @@ sub buildPostfixTransportMap { - Kolab::log('T', 'Building Postfix transport map', KOLAB_DEBUG); + buildPostfixMap( 'transport' ); +} + +sub buildPostfixVirtualMap +{ + buildPostfixMap( 'virtual' ); +} + +sub buildPostfixMap +{ + my $map = shift; + Kolab::log('T', "Building Postfix $map map", KOLAB_DEBUG); my $prefix = $Kolab::config{'prefix'}; - my $cfg = "$prefix/etc/postfix/transport"; + my $cfg = "$prefix/etc/postfix/$map"; my $oldcfg = $cfg . '.old'; my $oldmask = umask 077; copy($cfg, $oldcfg); chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg); umask $oldmask; - copy("$prefix/etc/kolab/templates/transport.template", $cfg); + copy("$prefix/etc/kolab/templates/$map.template", $cfg); my $transport; if (!($transport = IO::File->new($cfg, 'a'))) { - Kolab::log('T', 'Unable to create Postfix transport map', KOLAB_ERROR); + Kolab::log('T', "Unable to create Postfix $map map", KOLAB_ERROR); exit(1); } @@ -248,22 +259,22 @@ filter => '(objectclass=*)' ); if ($mesg->code) { - Kolab::log('T', 'Unable to locate Postfix transport map entries in LDAP', KOLAB_ERROR); + Kolab::log('T', "Unable to locate Postfix $map map entries in LDAP", KOLAB_ERROR); exit(1); } my $ldapobject; if ($mesg->code <= 0) { foreach $ldapobject ($mesg->entries) { - my $routes = $ldapobject->get_value('postfix-transport', asref => 1); + my $routes = $ldapobject->get_value("postfix-$map", asref => 1); foreach (@$routes) { $_ = trim($_); - Kolab::log('T', "Adding SMTP route `$_'"); + Kolab::log('T', "Adding entry `$_' to $map"); print $transport $_ . "\n"; } } } else { - Kolab::log('T', 'No Postfix transport map entries found'); + Kolab::log('T', "No Postfix $map map entries found"); } Kolab::LDAP::destroy($ldap); @@ -271,7 +282,7 @@ # FIXME: bad way of doing things... #system("chown root:root $prefix/etc/postfix/*"); - system("$prefix/sbin/postmap $prefix/etc/postfix/transport"); + system("$prefix/sbin/postmap $prefix/etc/postfix/$map"); if (-f $oldcfg) { my $rc = `diff -q $cfg $oldcfg`; @@ -284,7 +295,7 @@ $Kolab::haschanged{'postfix'} = 1; } - Kolab::log('T', 'Finished building Postfix transport map', KOLAB_DEBUG); + Kolab::log('T', 'Finished building Postfix $map map', KOLAB_DEBUG); } sub buildCyrusConfig @@ -638,6 +649,7 @@ } buildPostfixTransportMap; + buildPostfixVirtualMap; buildLDAPReplicas; buildCyrusConfig; buildCyrusGroups; From cvs at intevation.de Mon May 30 00:43:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 00:43:47 2005 Subject: steffen: server/kolabd/kolabd kolab2.schema,1.8,1.9 Message-ID: <20050529224346.10ADF1005D2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv10189/kolabd Modified Files: kolab2.schema Log Message: added postfix virtual map attribute (Issue768) Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- kolab2.schema 27 Apr 2005 19:47:49 -0000 1.8 +++ kolab2.schema 29 May 2005 22:43:44 -0000 1.9 @@ -213,6 +213,12 @@ EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) +attributetype ( 1.3.6.1.4.1.19414.2.1.509 + NAME 'postfix-virtual' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + ########################## # cyrus imapd attributes # ########################## @@ -333,6 +339,7 @@ postfix-mynetworks $ postfix-relayhost $ postfix-transport $ + postfix-virtual $ postfix-enable-virus-scan $ postfix-allow-unauthenticated $ cyrus-autocreatequota $ From cvs at intevation.de Mon May 30 00:43:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 00:43:48 2005 Subject: steffen: server/kolabd kolabd.spec,1.48,1.49 Message-ID: <20050529224346.0BB041005CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv10189 Modified Files: kolabd.spec Log Message: added postfix virtual map attribute (Issue768) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- kolabd.spec 26 May 2005 12:52:39 -0000 1.48 +++ kolabd.spec 29 May 2005 22:43:44 -0000 1.49 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050526 +Release: 20050529 # list of sources Source0: kolabd-1.9.4.tar.gz @@ -57,7 +57,7 @@ PreReq: postfix >= 2.1.5-2.2.0_kolab2, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes -PreReq: perl-kolab >= 5.8.5-20050503, perl-db +PreReq: perl-kolab >= 5.8.5-20050529, perl-db PreReq: amavisd >= 2.1.2-2.2.0_kolab PreReq: clamav AutoReq: no From cvs at intevation.de Mon May 30 00:43:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 00:43:49 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.10, 1.11 Message-ID: <20050529224346.228DF1006AA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv10189/kolabd/templates Modified Files: main.cf.template Log Message: added postfix virtual map attribute (Issue768) Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- main.cf.template 20 May 2005 00:39:25 -0000 1.10 +++ main.cf.template 29 May 2005 22:43:44 -0000 1.11 @@ -50,7 +50,7 @@ canonical_maps = hash:@l_prefix@/etc/postfix/canonical virtual_maps = hash:@l_prefix@/etc/postfix/virtual, ldap:ldapdistlist, ldap:ldapvirtual relocated_maps = hash:@l_prefix@/etc/postfix/relocated -transport_maps = ldap:ldaptransport, hash:@l_prefix@/etc/postfix/transport +transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:ldaptransport alias_maps = hash:@l_prefix@/etc/postfix/aliases alias_database = hash:@l_prefix@/etc/postfix/aliases local_recipient_maps = From cvs at intevation.de Mon May 30 13:53:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 13:53:38 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.22, 1.23 Message-ID: <20050530115337.475701005AD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv25958/kolab-webadmin/php/admin/include Modified Files: ldap.class.php Log Message: LDAP rename (Issue730) Index: ldap.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ldap.class.php 10 Mar 2005 21:58:19 -0000 1.22 +++ ldap.class.php 30 May 2005 11:53:35 -0000 1.23 @@ -47,6 +47,12 @@ $this->search_result = false; // Always connect to master server $this->connection=ldap_connect($_SESSION['ldap_master_uri']); + if (ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, 3)) { + // Good, we really neeed v3! + } else { + echo _("Error setting LDAP protocol to v3. Please contact your system administrator"); + return false; + } } function close() { @@ -89,6 +95,20 @@ return $str; } + function dn_escape( $str ) { + /* + DN component escaping as described in RFC-2253 + */ + $str = str_replace( '\\', '\\\\', $str ); + $str = str_replace( ',', '\\,', $str ); + $str = str_replace( '+', '\\,', $str ); + $str = str_replace( '<', '\\<', $str ); + $str = str_replace( '>', '\\>', $str ); + $str = str_replace( ';', '\\;', $str ); + if( $str[0] == '#' ) $str = '\\'.$str; + // PENDING(steffen): Escape leading/trailing spaces + return $str; + } function bind( $dn = false , $pw = '' ) { if( !$dn ) { From cvs at intevation.de Mon May 30 13:53:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 13:53:40 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.61, 1.62 Message-ID: <20050530115337.4A21D1005B1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv25958/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: LDAP rename (Issue730) Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- user.php 28 May 2005 20:56:05 -0000 1.61 +++ user.php 30 May 2005 11:53:35 -0000 1.62 @@ -556,7 +556,7 @@ if ($action == "save") { if (!$errors) { - if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$domain_dn; + if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$domain_dn; else $newdn = $dn; if (strcmp($dn,$newdn) != 0) { // Check for distribution lists with this user as member @@ -593,13 +593,22 @@ foreach( $ldap_object as $k => $v ) { if( $v == array() ) unset($ldap_object[$k]); } + $tmprdn = "cn=".str_rand(16); + $explodeddn = ldap_explode_dn( $dn, 0 ); + unset($explodeddn['count']); + unset($explodeddn[0]); + $tmpbasedn = join(",",$explodeddn); + if ( !$errors && !ldap_rename($ldap->connection,$dn,$tmprdn,$tmpbasedn,false) ) { + array_push($errors, _("LDAP Error: Could not rename $dn to $tmprdn: ") + .ldap_error($ldap->connection)); + } if ( !$errors && !ldap_add($ldap->connection,$newdn, $ldap_object) ) { array_push($errors, _("LDAP Error: Could not rename $dn to $newdn: ") .ldap_error($ldap->connection)); } if( !$errors ) { - if( !ldap_delete($ldap->connection,$dn)) { - array_push($errors, _("LDAP Error: Could not remove old entry $dn: ") + if( !ldap_delete($ldap->connection,$tmprdn.','.$tmpbasedn)) { + array_push($errors, _("LDAP Error: Could not remove old entry $tmprdn,$tmpbasedn: ") .ldap_error($ldap->connection)); } } @@ -648,7 +657,7 @@ } else { // firstsave if (!$errors) { - $dn = "cn=".$ldap_object['cn'].$dn_add.",".$domain_dn; + $dn = "cn=".$ldap->dn_escape($ldap_object['cn']).$dn_add.",".$domain_dn; foreach( $ldap_object as $k => $v ) { if( $v == array() ) unset($ldap_object[$k]); } From cvs at intevation.de Mon May 30 21:43:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 21:43:36 2005 Subject: steffen: server obmtool.conf,1.165,1.166 Message-ID: <20050530194336.3EA2E1005AD@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv17215 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.165 retrieving revision 1.166 diff -u -d -r1.165 -r1.166 --- obmtool.conf 28 May 2005 20:36:04 -0000 1.165 +++ obmtool.conf 30 May 2005 19:43:34 -0000 1.166 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050527"; + kolab_version="pre-2.0-snapshot-20050530"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -85,7 +85,7 @@ @install ${altloc}postfix-2.1.5-2.2.0_kolab2 --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 - @install ${altloc}perl-kolab-5.8.5-20050527 + @install ${altloc}perl-kolab-5.8.5-20050530 @install ${altloc}imapd-2.2.12-2.3.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars @install ${loc}m4-1.4.2-2.2.0 @install ${loc}bison-1.35-2.2.0 @@ -132,8 +132,8 @@ @install ${altloc}clamav-0.85.1-20050517 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050526 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050527 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050530 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050530 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version @check From cvs at intevation.de Mon May 30 21:43:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 21:43:40 2005 Subject: steffen: server/kolabd kolabd.spec,1.49,1.50 Message-ID: <20050530194336.44A351005AF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv17215/kolabd Modified Files: kolabd.spec Log Message: versions Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- kolabd.spec 29 May 2005 22:43:44 -0000 1.49 +++ kolabd.spec 30 May 2005 19:43:34 -0000 1.50 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050529 +Release: 20050530 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Mon May 30 21:43:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon May 30 21:43:41 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.89,1.90 Message-ID: <20050530194336.497941005B8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv17215/perl-kolab Modified Files: perl-kolab.spec Log Message: versions Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- perl-kolab.spec 29 May 2005 22:43:08 -0000 1.89 +++ perl-kolab.spec 30 May 2005 19:43:34 -0000 1.90 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 20050529 +Release: 20050530 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Tue May 31 00:29:54 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 00:29:55 2005 Subject: martin: server/kolabd/kolabd/templates DB_CONFIG.slapd.template, 1.1, 1.2 slapd.conf.template, 1.9, 1.10 Message-ID: <20050530222954.6C9F21005AB@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv20581 Modified Files: DB_CONFIG.slapd.template slapd.conf.template Log Message: Martin Konold: Added enhancements according to emails from Dieter K. Index: DB_CONFIG.slapd.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/DB_CONFIG.slapd.template,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- DB_CONFIG.slapd.template 3 May 2005 11:55:42 -0000 1.1 +++ DB_CONFIG.slapd.template 30 May 2005 22:29:52 -0000 1.2 @@ -8,4 +8,4 @@ # file mode 0640 set_cachesize 0 26214400 1 -set_tmp_dir /dev/shm \ No newline at end of file +set_tmp_dir /dev/shm Index: slapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- slapd.conf.template 26 May 2005 06:29:48 -0000 1.9 +++ slapd.conf.template 30 May 2005 22:29:52 -0000 1.10 @@ -1,5 +1,5 @@ # (c) 2003 Tassilo Erlewein -# (c) 2004 Martin Konold +# (c) 2003-2005 Martin Konold # (c) 2003 Achim Frank # This program is Free Software under the GNU General Public License (>=v2). # Read the file COPYING that comes with this packages for details. @@ -38,7 +38,11 @@ loglevel 0 database bdb -checkpoint 128 10 +cachesize 2000 +checkpoint 512 10 +idlcachesize 10000 +idletimeout 10 # The value can be increased if some clients develop problems. + # Please report to kolab-devel@kolab.org if you encounter such a client. suffix "@@@base_dn@@@" directory @l_prefix@/var/openldap/openldap-data @@ -46,8 +50,6 @@ rootdn "@@@bind_dn@@@" rootpw "@@@bind_pw_hash@@@" -idletimeout 10 - replica uri=ldap://127.0.0.1:9999 binddn="cn=replicator" bindmethod=simple @@ -62,8 +64,6 @@ index givenName approx,sub,pres,eq index kolabHomeServer pres,eq index member pres,eq - -idlcachesize 10000 access to attr=userPassword by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" =wx From cvs at intevation.de Tue May 31 02:20:03 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 02:20:04 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.121, 1.122 Message-ID: <20050531002003.2CA261005AB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv22277 Modified Files: kolab-resource-handlers.spec Log Message: disable creation of SID Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -d -r1.121 -r1.122 --- kolab-resource-handlers.spec 20 May 2005 09:52:27 -0000 1.121 +++ kolab-resource-handlers.spec 31 May 2005 00:20:01 -0000 1.122 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050520 +Release: 20050530 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Tue May 31 02:20:03 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 02:20:05 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.68, 1.69 Message-ID: <20050531002003.36F631005AD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv22277/kolab-resource-handlers/resmgr Modified Files: resmgr.php Log Message: disable creation of SID Index: resmgr.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- resmgr.php 12 May 2005 20:18:57 -0000 1.68 +++ resmgr.php 31 May 2005 00:20:01 -0000 1.69 @@ -684,6 +684,13 @@ return $imap; } +function expire_events( $imap, $when ) +{ + // PENDING(steffen): Think about how to add event expiry + // without serious overhead and without deleting events from + // normal user accounts +} + function iCalDate2Kolab($ical_date) { // $ical_date should be a timestamp @@ -707,8 +714,9 @@ $kolab_node = $kolab_event->append_child($kolab_xml->create_element('uid')); $kolab_node->append_child($kolab_xml->create_text_node($uid)); - $kolab_node = $kolab_event->append_child($kolab_xml->create_element('scheduling-id')); - $kolab_node->append_child($kolab_xml->create_text_node($sid)); + // No SID anymore + //$kolab_node = $kolab_event->append_child($kolab_xml->create_element('scheduling-id')); + //$kolab_node->append_child($kolab_xml->create_text_node($sid)); $kolab_node = $kolab_event->append_child($kolab_xml->create_element('organizer')); $org_params = $itip->getAttribute('ORGANIZER', true); @@ -1055,11 +1063,9 @@ myLog("Processing $method method for $resource", RM_LOG_DEBUG); // This is assumed to be constant across event creation/modification/deletipn - $sid = $itip->getAttributeDefault('UID', ''); + $uid = $itip->getAttributeDefault('UID', ''); myLog("Event has UID $sid", RM_LOG_DEBUG); - - // Generate a new UID in case we need it - $uid = 'kolab-'.md5( ''.mt_rand().time().$resource.$params['email_domain'] ); + $sid = $uid; // Who is the organiser? $organiser = preg_replace('/^mailto:\s*/i', '', $itip->getAttributeDefault('ORGANIZER', '')); From cvs at intevation.de Tue May 31 09:43:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 09:43:54 2005 Subject: steffen: server/postfix postfix-pipe-allow-empty-sender.patch, NONE, 1.1 Makefile, 1.10, 1.11 kolab.patch, 1.2, 1.3 Message-ID: <20050531074353.A0B6D1005A3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/postfix In directory doto:/tmp/cvs-serv31400 Modified Files: Makefile kolab.patch Added Files: postfix-pipe-allow-empty-sender.patch Log Message: patch to make postfix pipe transport allow empty envelope sender --- NEW FILE: postfix-pipe-allow-empty-sender.patch --- diff -upr ../postfix-2.1.5.orig/src/pipe/pipe.c ./src/pipe/pipe.c --- ../postfix-2.1.5.orig/src/pipe/pipe.c 2004-07-24 01:09:21.000000000 +0200 +++ ./src/pipe/pipe.c 2005-05-31 04:30:55.000000000 +0200 @@ -41,7 +41,7 @@ /* .fi /* The external command attributes are given in the \fBmaster.cf\fR /* file at the end of a service definition. The syntax is as follows: -/* .IP "\fBflags=BDFORhqu.>\fR (optional)" +/* .IP "\fBflags=BDFORhnqu.>\fR (optional)" /* Optional message processing flags. By default, a message is /* copied unchanged. /* .RS @@ -68,6 +68,9 @@ /* Fold the command-line \fB$recipient\fR domain name and \fB$nexthop\fR /* host name to lower case. /* This is recommended for delivery via \fBUUCP\fR. +/* .IP \fBn\fR +/* Don't rewrite empty \fB$sender\fR. The default is to rewrite empty +/* \fB$sender\fR to MAILER-DAEMON. /* .IP \fBq\fR /* Quote white space and other special characters in the command-line /* \fB$sender\fR and \fB$recipient\fR address localparts (text to the @@ -349,6 +352,7 @@ #define PIPE_OPT_FOLD_USER (1<<16) #define PIPE_OPT_FOLD_HOST (1<<17) #define PIPE_OPT_QUOTE_LOCAL (1<<18) +#define PIPE_OPT_ALLOW_NO_SENDER (1<<19) #define PIPE_OPT_FOLD_FLAGS (PIPE_OPT_FOLD_USER | PIPE_OPT_FOLD_HOST) @@ -660,6 +664,9 @@ static void get_service_attr(PIPE_ATTR * case 'h': attr->flags |= PIPE_OPT_FOLD_HOST; break; + case 'n': + attr->flags |= PIPE_OPT_ALLOW_NO_SENDER; + break; case 'q': attr->flags |= PIPE_OPT_QUOTE_LOCAL; break; @@ -835,22 +842,6 @@ static int deliver_message(DELIVER_REQUE msg_info("%s: from <%s>", myname, request->sender); /* - * First of all, replace an empty sender address by the mailer daemon - * address. The resolver already fixes empty recipient addresses. - * - * XXX Should sender and recipient be transformed into external (i.e. - * quoted) form? Problem is that the quoting rules are transport - * specific. Such information must evidently not be hard coded into - * Postfix, but would have to be provided in the form of lookup tables. - */ - if (request->sender[0] == 0) { - buf = vstring_alloc(100); - canon_addr_internal(buf, MAIL_ADDR_MAIL_DAEMON); - myfree(request->sender); - request->sender = vstring_export(buf); - } - - /* * Sanity checks. The get_service_params() and get_service_attr() * routines also do some sanity checks. Look up service attributes and * config information only once. This is safe since the information comes @@ -866,6 +857,22 @@ static int deliver_message(DELIVER_REQUE } /* + * First of all, replace an empty sender address by the mailer daemon + * address. The resolver already fixes empty recipient addresses. + * + * XXX Should sender and recipient be transformed into external (i.e. + * quoted) form? Problem is that the quoting rules are transport + * specific. Such information must evidently not be hard coded into + * Postfix, but would have to be provided in the form of lookup tables. + */ + if ((attr.flags & PIPE_OPT_ALLOW_NO_SENDER) == 0 && request->sender[0] == 0) { + buf = vstring_alloc(100); + canon_addr_internal(buf, MAIL_ADDR_MAIL_DAEMON); + myfree(request->sender); + request->sender = vstring_export(buf); + } + + /* * The D flag cannot be specified for multi-recipient deliveries. */ if ((attr.flags & MAIL_COPY_DELIVERED) && (rcpt_list->len > 1)) { Kun i ./src/pipe: pipe.c~ Index: Makefile =================================================================== RCS file: /kolabrepository/server/postfix/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 19 May 2005 11:13:55 -0000 1.10 +++ Makefile 31 May 2005 07:43:51 -0000 1.11 @@ -18,6 +18,7 @@ cp $(KOLABCVSDIR)/postfix-pipe.patch $(KOLABRPMSRC)/postfix/ cp $(KOLABCVSDIR)/postfix-ldap-leafonly.patch $(KOLABRPMSRC)/postfix/ + cp $(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch $(KOLABRPMSRC)/postfix/ cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/postfix/ # Patch for postfix.spec cd $(KOLABRPMSRC)/postfix && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba postfix.spec --define 'with_ldap yes' --define 'with_sasl yes' --define 'with_ssl yes' Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/postfix/kolab.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab.patch 19 May 2005 11:13:55 -0000 1.2 +++ kolab.patch 31 May 2005 07:43:51 -0000 1.3 @@ -1,29 +1,31 @@ ---- postfix.spec.orig 2005-05-19 04:56:45.000000000 +0200 -+++ postfix.spec 2005-05-19 05:13:43.000000000 +0200 +--- postfix.spec.orig 2005-05-31 03:13:30.000000000 +0200 ++++ postfix.spec 2005-05-31 03:15:30.000000000 +0200 @@ -42,7 +42,7 @@ Class: BASE Group: Mail License: IPL Version: %{V_postfix} -Release: 2.2.0 -+Release: 2.2.0_kolab2 ++Release: 2.2.0_kolab3 # package options %option with_fsl yes -@@ -67,6 +67,8 @@ Patch1: postfix.patch.pfls +@@ -67,6 +67,9 @@ Patch1: postfix.patch.pfls Patch2: ftp://ftp.openpkg.org/sources/CPY/postfix/postfix-%{V_whoson}-whoson.patch Patch3: http://www.ipnet6.org/postfix/download/postfix-libspf2-%{V_spf}.patch Patch4: http://www.libsrs2.org/patch/postfix-libsrs2-%{V_srs}.patch -+Patch5: postfix-pipe.patch ++Patch5: postfix-pipe.patch +Patch6: postfix-ldap-leafonly.patch ++Patch7: postfix-pipe-allow-empty-sender.patch # build information Prefix: %{l_prefix} -@@ -195,6 +197,8 @@ Conflicts: exim, sendmail, ssmtp +@@ -195,6 +198,9 @@ Conflicts: exim, sendmail, ssmtp %if "%{with_whoson}" == "yes" %patch -p0 -P 2 %endif + %patch -p0 -P 5 + %patch -p0 -P 6 ++ %patch -p0 -P 7 %build # configure Postfix (hard-core part I) From cvs at intevation.de Tue May 31 19:05:44 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 19:05:45 2005 Subject: bernhard: doc/proko2-doc/de - New directory Message-ID: <20050531170544.AF6601005A3@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/proko2-doc/de In directory doto:/tmp/cvs-serv31553/de Log Message: Directory /kolabrepository/doc/proko2-doc/de added to the repository From cvs at intevation.de Tue May 31 19:10:43 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 19:10:45 2005 Subject: bernhard: doc/proko2-doc/de doc2-de.sxw,NONE,1.1 Message-ID: <20050531171043.E2105100160@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/proko2-doc/de In directory doto:/tmp/cvs-serv32002 Added Files: doc2-de.sxw Log Message: Added initial rough translation of doc2.sxw rev 1.64 contributed by Werner Sorgenfrei . --- NEW FILE: doc2-de.sxw --- (This appears to be a binary file; contents omitted.) From cvs at intevation.de Tue May 31 20:10:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 20:11:00 2005 Subject: bernhard: server release-notes.txt,1.8,1.9 Message-ID: <20050531181058.F0C8E100167@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6886 Modified Files: release-notes.txt Log Message: added warning for issue774. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- release-notes.txt 27 May 2005 15:53:23 -0000 1.8 +++ release-notes.txt 31 May 2005 18:10:56 -0000 1.9 @@ -5,6 +5,17 @@ For upgrading and installation instructions, please refer to the 1st.README file in the source directory. +WARNING + With Kolab-Servers 2.0-rc1 and 2.0rc2 there is a chance to loose + emails which came in with a null sender (aka MAIL FROM:<>), + if you enabled the check to prevent users to forge from: headers. + The fix will be in upcoming rc3; technical details are in issue774. + + As workaround, disable the "envelope header from" check in + /kolab/etc/kolab/templates/resmgr.conf.template + set + $params['verify_from_header'] = false + and run kolabconf. Changes since RC 1, 20050506: From cvs at intevation.de Tue May 31 20:18:16 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 20:18:17 2005 Subject: bernhard: server README.1st,1.17,1.18 Message-ID: <20050531181816.01077100167@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv7677 Modified Files: README.1st Log Message: Added hint to warning in the release-notes for issue744 in rc1 and rc2. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- README.1st 27 May 2005 16:07:46 -0000 1.17 +++ README.1st 31 May 2005 18:18:13 -0000 1.18 @@ -1,6 +1,9 @@ Kolab2 Important Information ============================ +WARNING: Check the release-notes for a warning if you plan to upgrade to + rc1 or rc2. + WARNING: There's an incompatible change between Beta 1 and Beta 2. See below for more information. From cvs at intevation.de Tue May 31 20:25:54 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue May 31 20:25:55 2005 Subject: bernhard: server release-notes.txt,1.9,1.10 Message-ID: <20050531182554.729111006CC@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv8689 Modified Files: release-notes.txt Log Message: Typo fixed.^ Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- release-notes.txt 31 May 2005 18:10:56 -0000 1.9 +++ release-notes.txt 31 May 2005 18:25:52 -0000 1.10 @@ -6,7 +6,7 @@ 1st.README file in the source directory. WARNING - With Kolab-Servers 2.0-rc1 and 2.0rc2 there is a chance to loose + With Kolab-Servers 2.0-rc1 and 2.0rc2 there is a chance to lose emails which came in with a null sender (aka MAIL FROM:<>), if you enabled the check to prevent users to forge from: headers. The fix will be in upcoming rc3; technical details are in issue774. From cvs at intevation.de Wed Jun 1 01:36:28 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 01:36:30 2005 Subject: steffen: server/kolabd kolabd.spec,1.50,1.51 Message-ID: <20050531233628.998761005A8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv17476 Modified Files: kolabd.spec Log Message: use new postfix option Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- kolabd.spec 30 May 2005 19:43:34 -0000 1.50 +++ kolabd.spec 31 May 2005 23:36:26 -0000 1.51 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050530 +Release: 20050531 # list of sources Source0: kolabd-1.9.4.tar.gz @@ -54,7 +54,7 @@ PreReq: sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes PreReq: proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes PreReq: gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes -PreReq: postfix >= 2.1.5-2.2.0_kolab2, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes +PreReq: postfix >= 2.1.5-2.2.0_kolab3, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes PreReq: imapd >= 2.2.8-2.2.0_kolab, imapd::with_group = yes PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes PreReq: perl-kolab >= 5.8.5-20050529, perl-db From cvs at intevation.de Wed Jun 1 01:36:28 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 01:36:32 2005 Subject: steffen: server/kolabd/kolabd/templates master.cf.template, 1.8, 1.9 Message-ID: <20050531233628.9C9961005AF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv17476/kolabd/templates Modified Files: master.cf.template Log Message: use new postfix option Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- master.cf.template 17 May 2005 10:25:19 -0000 1.8 +++ master.cf.template 31 May 2005 23:36:26 -0000 1.9 @@ -82,7 +82,7 @@ @@@endif@@@ -permithosts @@@kolabhost|join,@@@ -kolabfilter unix - n n - - pipe user=@l_nusr@ flags= argv=@l_prefix@/bin/php +kolabfilter unix - n n - - pipe user=@l_nusr@ flags=n argv=@l_prefix@/bin/php -c @l_prefix@/etc/apache/php.ini -f @l_prefix@/etc/resmgr/kolabfilter.php -- @@ -91,7 +91,7 @@ -r ${recipient} -c ${client_address} -kolabmailboxfilter unix - n n - - pipe user=@l_nusr@ flags= argv=@l_prefix@/bin/php +kolabmailboxfilter unix - n n - - pipe user=@l_nusr@ flags=n argv=@l_prefix@/bin/php -c @l_prefix@/etc/apache/php.ini -f @l_prefix@/etc/resmgr/kolabmailboxfilter.php -- From cvs at intevation.de Wed Jun 1 01:53:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 01:53:11 2005 Subject: steffen: server obmtool.conf,1.166,1.167 Message-ID: <20050531235310.190371005A8@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19447 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.166 retrieving revision 1.167 diff -u -d -r1.166 -r1.167 --- obmtool.conf 30 May 2005 19:43:34 -0000 1.166 +++ obmtool.conf 31 May 2005 23:53:08 -0000 1.167 @@ -82,7 +82,7 @@ @install ${loc}proftpd-1.2.10-2.2.0 --with=ldap @install ${loc}gdbm-1.8.3-2.2.0 @install ${plusloc}dbtool-1.6-2.2.0 - @install ${altloc}postfix-2.1.5-2.2.0_kolab2 --with=ldap --with=sasl --with=ssl + @install ${altloc}postfix-2.1.5-2.2.0_kolab3 --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 @install ${altloc}perl-kolab-5.8.5-20050530 @@ -132,7 +132,7 @@ @install ${altloc}clamav-0.85.1-20050517 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050530 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050531 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-0.4.0-20050530 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version @check From cvs at intevation.de Wed Jun 1 11:15:29 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 11:15:31 2005 Subject: david: doc/kde-client/svn-instructions checkout_proko2.sh,1.6,1.7 Message-ID: <20050601091529.EF2741005A8@lists.intevation.de> Author: david Update of /kolabrepository/doc/kde-client/svn-instructions In directory doto:/tmp/cvs-serv10646 Modified Files: checkout_proko2.sh Log Message: Support for anonymous checkouts Index: checkout_proko2.sh =================================================================== RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- checkout_proko2.sh 26 May 2005 20:07:44 -0000 1.6 +++ checkout_proko2.sh 1 Jun 2005 09:15:27 -0000 1.7 @@ -3,19 +3,35 @@ # 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=https #SVNUSER= -if test -z "$SVNUSER"; then - echo "You must set SVNUSER!" +if test -z "$SVNSERVER"; then + echo "You must set SVNSERVER!" exit 1 fi -if test -z "$SVNPROTOCOL"; then - echo "You must set SVNPROTOCOL!" +if test "$SVNSERVER" = "svn.kde.org"; then + if test -a -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 @@ -24,21 +40,21 @@ if ! test -d kdepim; then echo "kdepim not found. Press ENTER to check it out from SVN." read && \ - $SVN --username $SVNUSER checkout $SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim || exit 1 + $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 --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$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 --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) + ( cd $dir && $SVN $USERNAMEOPT switch "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file ) } switch_dir certmanager/lib @@ -77,4 +93,4 @@ ### (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://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done ) +# ( 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 ) From cvs at intevation.de Wed Jun 1 12:25:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 12:25:05 2005 Subject: bernhard: server release-notes.txt,1.10,1.11 Message-ID: <20050601102504.827F4101EF9@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12578 Modified Files: release-notes.txt Log Message: First step for rc3 release notes, added the packages that probably will be new. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- release-notes.txt 31 May 2005 18:25:52 -0000 1.10 +++ release-notes.txt 1 Jun 2005 10:25:02 -0000 1.11 @@ -1,5 +1,5 @@ Release notes Kolab2 Server -(Version 20050527, Kolab server 2.0 RC 2) +(Version 200506xx, Kolab server 2.0 RC 3) For upgrading and installation instructions, please refer to the @@ -17,55 +17,25 @@ $params['verify_from_header'] = false and run kolabconf. -Changes since RC 1, 20050506: - - - postfix 2.1.5-2.2.0_kolab -> 2.1.5-2.2.0_kolab2 - - * Fixing: - Issue746 (distributionlist duplicates emails) - - - - openldap 2.2.23-2.3.0 -> 2.2.23-2.3.0_kolab - - Make sure libdb is linked statically. - - Some more configuration tweaks. There's a new index on givenName - among other things - - Build with native threads instead of using pth. This may help fix - Issue707 (occasional slapd hangs after attempted writes) - - - - imapd 2.2.12-2.3.0_kolab2 -> 2.2.12-2.3.0_kolab3 - - Make sure libdb is linked statically. - - - - kolabd 20050503 -> 20050526 +Changes since RC 2, 20050527: - Localized virus/spam delivery status notifications. Only German - so far. It's not enabled by default. + - clamav 0.83-2.3.0 -> 0.85.1-20050517 - * Fixing: - Issue746 (distributionlist duplicates emails) + * new upstream version, security relevant because better detection. - - kolab-resource-handlers 20050504 -> 20050520 + - postfix 2.1.5-2.2.0_kolab2 -> postfix-2.1.5-2.2.0_kolab3 - better error handling in filter scripts + * Fixing: - * Fixing: - Issue744 (invitation policy not case independent) + - kolabd 20050526 -> 20050531 - - kolab-webadmin 20050428 -> 20050527 - localized vacation message text + - perl-kolab 20050503 -> 20050530 - "no vacation replies to spam" is now default - * Fixing: - Issue745 (inconsistant groupOfNames when changing an account's DN) + - kolab-webadmin 20050527 -> 20050530 $Id$ From cvs at intevation.de Wed Jun 1 13:13:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 13:13:22 2005 Subject: bernhard: utils/testing send_filtertest_emails.py,1.2,1.3 Message-ID: <20050601111321.6BE3A101EF4@lists.intevation.de> Author: bernhard Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv14251 Modified Files: send_filtertest_emails.py Log Message: Updated docstring to fit new command line options. Index: send_filtertest_emails.py =================================================================== RCS file: /kolabrepository/utils/testing/send_filtertest_emails.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- send_filtertest_emails.py 22 Dec 2004 15:29:37 -0000 1.2 +++ send_filtertest_emails.py 1 Jun 2005 11:13:19 -0000 1.3 @@ -1,8 +1,8 @@ #!/usr/bin/env python """Create and send testmails for envelope <-> header checks for Kolab2 Server. -You need to replace kolab.mail.domain and proko2test@ below -with the real data for a test account on your server. +You need to speciy --maildomain and --username on the command line +with the real values for a test account on your server. Need to be run from a server that can give emails to postfix without authentification. Typical use is on a Kolab2 server. From cvs at intevation.de Wed Jun 1 15:38:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 15:38:19 2005 Subject: bernhard: utils/testing send_filtertest_emails.py,1.3,1.4 Message-ID: <20050601133818.9435D1006DE@lists.intevation.de> Author: bernhard Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv16689 Modified Files: send_filtertest_emails.py Log Message: Forcing --smtp-host now, as we must not come from 127.0.0.1 to actually trigger the check we want to test. Added new test #2 that tests the check with producing a bounce. Added new test #3 to test issue744. Index: send_filtertest_emails.py =================================================================== RCS file: /kolabrepository/utils/testing/send_filtertest_emails.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- send_filtertest_emails.py 1 Jun 2005 11:13:19 -0000 1.3 +++ send_filtertest_emails.py 1 Jun 2005 13:38:16 -0000 1.4 @@ -5,13 +5,15 @@ with the real values for a test account on your server. Need to be run from a server that can give emails to postfix -without authentification. Typical use is on a Kolab2 server. +without authentification. +Typically use an IP of priviledge networks of your Kolab server. +Attention: "envelope header from check" does not check mail from 127.0.0.1, +so do NOT use localhost. This script is Free Software under the GNU General Public License >=v2. Bernhard Reiter """ #20041217 Bernhard initial -#20041222 Bernhard Herzog. __version__="$Revision$"[10:-1] import sys @@ -22,7 +24,7 @@ import getopt def send_mail(envelope_from, envelope_to, header_from, header_to, - test_number=0, smtp_host="localhost", smtp_port = None): + test_number=-1, smtp_host="localhost", smtp_port = None): basemsg=("From: %s\r\nTo: %s\r\n%%s\r\n" % (header_from, string.join(header_to, ", ")) @@ -77,7 +79,7 @@ realname = None # SMTP host and port to use when sending the test mails - smtp_host = "localhost" + smtp_host = None smtp_port = 25 # parse the command line @@ -110,6 +112,9 @@ if username is None: print >>sys.stderr, "--username missing" error = True + if smtp_host is None: + print >>sys.stderr, "--smtp-host missing" + error = True if error: sys.exit(1) @@ -120,14 +125,27 @@ envelope_from = envelope_to header_from = assemble_email_address(username, maildomain) + # Tests + # number : expected behaviour to pass the test : description + + # 0: delivered: Are we functional? Do the standard settings work? send_mail(envelope_from, envelope_to, header_from, header_to, 0, smtp_host = smtp_host, smtp_port = smtp_port) - # First test: different letter cases in the header_from, should go - # through + + # 1: delivered: different letter cases in the header_from send_mail(envelope_from, envelope_to, header_from.swapcase(), header_to, 1, smtp_host = smtp_host, smtp_port = smtp_port) + # 2: bounce mail: different from and host envelope + send_mail(envelope_from, envelope_to, "rumpelstilzchen@big.local", + header_to, 2, + smtp_host = smtp_host, smtp_port = smtp_port) + + # 3: delivered, no mailer-daemon in kolabfilter log: + # issue774 (null senders not handled by kolabfilter...) + send_mail("<>", envelope_to, "some@non-existing.local", header_to, 3, + smtp_host = smtp_host, smtp_port = smtp_port) if __name__=="__main__": main(sys.argv) From cvs at intevation.de Wed Jun 1 18:23:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 18:23:26 2005 Subject: bernhard: server README.1st,1.18,1.19 Message-ID: <20050601162326.2B1871005A3@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19031 Modified Files: README.1st Log Message: Start to prepare for rc3 release. Removed platfrom specifc stuff as we have nothing there for rc3 yet. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- README.1st 31 May 2005 18:18:13 -0000 1.18 +++ README.1st 1 Jun 2005 16:23:24 -0000 1.19 @@ -1,9 +1,6 @@ Kolab2 Important Information ============================ -WARNING: Check the release-notes for a warning if you plan to upgrade to - rc1 or rc2. - WARNING: There's an incompatible change between Beta 1 and Beta 2. See below for more information. @@ -38,19 +35,6 @@ and follow the instructions. -Platform specific notes ------------------------ - -Debian Sarge, Suse 9.3 - - Note: The following problem should be fixed with the RC2 release. - - When libdb4.3 is installed some programs are incorrectly linked - against the libdb4.3 instead of the one from OpenPKG. To work - around this problem, temporarily deinstall the package when building - from the sources. - - Upgrading from earlier versions ------------------------------- @@ -186,8 +170,12 @@ Therefore, fixing the mail attribute as described for the upgrade from beta5 is important if you want your old distribution lists to work. +Upgrade from RC2 +---------------- - +clamav will send an email Warning with unresolved configuration file conflicts. +In /kolab/etc/clamav/ you can savely delete clamd.conf.rpmsave +and freshclam.conf.rpmsave. Later after starting the server run kolabconf once. $Id$ From cvs at intevation.de Wed Jun 1 18:39:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 18:39:20 2005 Subject: bernhard: doc/www/src screenshots.html.m4,1.3,1.4 Message-ID: <20050601163918.B2BD11006A7@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv19210 Modified Files: screenshots.html.m4 Log Message: Added first KDE Kolab2 screenshot, contributed by Markus Feilner and Michael Hoehnl. Index: screenshots.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/screenshots.html.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- screenshots.html.m4 15 Sep 2004 16:25:24 -0000 1.3 +++ screenshots.html.m4 1 Jun 2005 16:39:16 -0000 1.4 @@ -2,11 +2,19 @@ m4_include(header.html.m4)
            This page was updated on:
            $Date$
            -

            NOTE: These screenshots do not necessarily show the latest -versions of the software, and as such should not be taken as indication of the -quality of the current software.

            +

            KDE Kolab2 Client

            -

            KDE Kolab1 Client

            + + + +
            +

            Calendar View (734x479 100 kByte)             +
            Contributed by M. Hoehnl und M. Feilner +
            + +

            KDE Kolab1 Client (old)

            @@ -41,7 +49,7 @@
            -

            Kolab1 Server Web-Admin-Interface

            +

            Kolab1 Server Web-Admin-Interface (old)

            From cvs at intevation.de Wed Jun 1 18:39:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 18:39:21 2005 Subject: bernhard: doc/www/src/images shot-kde-client2-calendar1.png, NONE, 1.1 shot-kde-client2-calendar1.small.png, NONE, 1.1 Message-ID: <20050601163918.B7874101EE4@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv19210/images Added Files: shot-kde-client2-calendar1.png shot-kde-client2-calendar1.small.png Log Message: Added first KDE Kolab2 screenshot, contributed by Markus Feilner and Michael Hoehnl. --- NEW FILE: shot-kde-client2-calendar1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shot-kde-client2-calendar1.small.png --- (This appears to be a binary file; contents omitted.) From cvs at intevation.de Wed Jun 1 19:35:30 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 19:35:31 2005 Subject: bernhard: doc/www/src documentation.html.m4, 1.15, 1.16 index.html.m4, 1.52, 1.53 Message-ID: <20050601173530.75DAF1006DE@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22403 Modified Files: documentation.html.m4 index.html.m4 Log Message: Added link and news to doc2-de.sxw. Added news for dot.kde story. Added news: for server 2.0-rc2. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- documentation.html.m4 20 May 2005 15:57:40 -0000 1.15 +++ documentation.html.m4 1 Jun 2005 17:35:28 -0000 1.16 @@ -1,4 +1,5 @@ -m4_define(`PAGE_TITLE',`Documentation') +m +_define(`PAGE_TITLE',`Documentation') m4_include(header.html.m4)
            This page was updated on:
            $Date$
            @@ -6,14 +7,17 @@

            Setting up clients

            -During the Proko2 project, two documents have been created: -
            • KDE Client Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):
              Doc2, Version 1.64 as pdf | CVS HEAD as sxw + +
            • KDE Client Setup Translation Deutsch/German contributed by W. Sorgenfrei:
              + CVS HEAD as sxw +

            • Outlook2003 with Toltec2 Setup (aka Doc3, pdf: 1.2MB, sxw: 0.5MB):
              Doc3, Version 1.31 as pdf Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- index.html.m4 13 May 2005 13:31:50 -0000 1.52 +++ index.html.m4 1 Jun 2005 17:35:28 -0000 1.53 @@ -37,6 +37,56 @@
            + + +
            June 1st, 2005» + KDE Project using Kolab2 +
            +Check out the following dot.kde story: +
            +KDE Project Offers Kolab Groupware Services to its Contributors. +
            +

            + + + + +
            June 1st, 2005» + Contributions: first screenshot and German client instructions. +
            +

            +With many contributors working on the beef of the Kolab product, +we are very glad, that slowly more help with the documentation is coming in. +Thanks to Michael Feilner we have the first picture +of the KDE Kolab2 clients in our screenshot section. +Needless to say: We are looking for more. +

            +Life is getting easier for our German speaking users as Werner Sorgenfrei +has translated the KDE Kolab Client setup manual. +

            +

            + + + + +
            June 1st, 2005» + Kolab-Server 2.0-RC2 public, with RC3 around the corner. +
            +

            +The mirrors have the second release candidate of the server for you. +Because of a bug found in RC1 and RC2, RC3 is not far away. Check +the updated RC2 release-notes for details of the bug +and a temporary workaround. +
            +

            + +

    • + + +
    + +
    May 11th, 2005 » Kolab-Konsortium: Enterprise Support available @@ -96,11 +146,6 @@

    - - - - -

    From cvs at intevation.de Wed Jun 1 19:38:05 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 1 19:38:06 2005 Subject: bernhard: doc/www/src index.html.m4, 1.53, 1.54 newsarchive.html.m4, 1.5, 1.6 Message-ID: <20050601173805.38BB310015B@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22487 Modified Files: index.html.m4 newsarchive.html.m4 Log Message: Archived a few news items. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- index.html.m4 1 Jun 2005 17:35:28 -0000 1.53 +++ index.html.m4 1 Jun 2005 17:38:03 -0000 1.54 @@ -147,50 +147,6 @@ -
    April 25th, 2005
    - - -
    April 25th, 2005» -Kolab 2 Server beta 5 published. -
    -
    -The fith beta of Kolab 2 Server comes with minor fixes and improvements. -
    -

    - - - - - -
    April 19th, 2005» -German Install Tutorial contributed -
    -

    -For German readers the new -Kolab2 Installationsanleitung -describes how to setup the server and clients -and has many screenshots. -It was contributed by Giovanni Baroni from activmedia. -
    -

    - - - - -
    April 6th, 2005» -Sync Kolab beta 0.4.0 for Thunderbird -
    -

    -Today the 0.4.0 beta version of -Sync Kolab -for was announced. This Thunderbird plugin is compatible with the old Kolab1 -storage format and allows to sync contacts, events and tasks. -The author Niko Berger is seeking feedback on the Kolab-users list -and currently works on a Kolab2 version of Sync Kolab. -
    -

    -

    Index: newsarchive.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- newsarchive.html.m4 4 May 2005 11:12:19 -0000 1.5 +++ newsarchive.html.m4 1 Jun 2005 17:38:03 -0000 1.6 @@ -11,6 +11,53 @@
    + + + + + + +
    April 25th, 2005» +Kolab 2 Server beta 5 published. +
    +
    +The fith beta of Kolab 2 Server comes with minor fixes and improvements. +
    +

    + + + + + +
    April 19th, 2005» +German Install Tutorial contributed +
    +

    +For German readers the new +Kolab2 Installationsanleitung +describes how to setup the server and clients +and has many screenshots. +It was contributed by Giovanni Baroni from activmedia. +
    +

    + + + + +
    April 6th, 2005» +Sync Kolab beta 0.4.0 for Thunderbird +
    +

    +Today the 0.4.0 beta version of +Sync Kolab +for was announced. This Thunderbird plugin is compatible with the old Kolab1 +storage format and allows to sync contacts, events and tasks. +The author Niko Berger is seeking feedback on the Kolab-users list +and currently works on a Kolab2 version of Sync Kolab. +
    +

    +
    March 26th, 2005 » From cvs at intevation.de Thu Jun 2 00:32:02 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 00:32:03 2005 Subject: martin: server/kolabd/kolabd/templates slapd.conf.template, 1.10, 1.11 Message-ID: <20050601223202.62D4B101EE1@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv27233/kolabd/kolabd/templates Modified Files: slapd.conf.template Log Message: Martin K.: Added support for online monitoring of OpenLDAP performance as hinted by Dieter K. Index: slapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- slapd.conf.template 30 May 2005 22:29:52 -0000 1.10 +++ slapd.conf.template 1 Jun 2005 22:32:00 -0000 1.11 @@ -37,6 +37,8 @@ loglevel 0 +database monitor + database bdb cachesize 2000 checkpoint 512 10 @@ -64,6 +66,10 @@ index givenName approx,sub,pres,eq index kolabHomeServer pres,eq index member pres,eq + +access to dn.subtree="cn=Monitor" + by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write + by * none stop access to attr=userPassword by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" =wx From cvs at intevation.de Thu Jun 2 02:08:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 02:08:58 2005 Subject: steffen: server/kolabd/kolabd/templates clamd.conf.template, 1.1.1.1, 1.2 Message-ID: <20050602000857.3F564101F07@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv29391 Modified Files: clamd.conf.template Log Message: updated clamd.conf.template with comments/defaults from 0.85.1. No settings changed Index: clamd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/clamd.conf.template,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- clamd.conf.template 23 Nov 2004 20:26:48 -0000 1.1.1.1 +++ clamd.conf.template 2 Jun 2005 00:08:55 -0000 1.2 @@ -92,10 +92,21 @@ # Default: 15 #MaxConnectionQueueLength 30 +# Clamd uses FTP-like protocol to receive data from remote clients. +# If you are using clamav-milter to balance load between remote clamd daemons +# on firewall servers you may need to tune the options below. + # Close the connection if this limit is exceeded. +# The value should match your MTA's limit for a maximal attachment size. # Default: 10M #StreamMaxLength 20M +# Limit port range. +# Default: 1024 +#StreamMinPort 30000 +# Default: 2048 +#StreamMaxPort 32000 + # Maximal number of threads running at the same time. # Default: 10 #MaxThreads 20 @@ -138,6 +149,9 @@ # Default: disabled #AllowSupplementaryGroups +# Stop daemon when libclamav reports out of memory condition. +#ExitOnOOM + # Don't fork into background. # Default: disabled #Foreground @@ -234,8 +248,8 @@ # file, all files within it will also be scanned. This options specifies how # deep the process should be continued. # Value of 0 disables the limit. -# Default: 5 -#ArchiveMaxRecursion 8 +# Default: 8 +#ArchiveMaxRecursion 9 # Number of files to be scanned within an archive. # Value of 0 disables the limit. @@ -257,8 +271,9 @@ # Default: disabled #ArchiveBlockEncrypted -# Mark archives as viruses if ArchiveMaxFiles, ArchiveMaxFileSize, or -# ArchiveMaxRecursion limit is reached. +# Mark archives as viruses (e.g. RAR.ExceededFileSize, Zip.ExceededFilesLimit) +# if ArchiveMaxFiles, ArchiveMaxFileSize, or ArchiveMaxRecursion limit is +# reached. # Default: disabled #ArchiveBlockMax From cvs at intevation.de Thu Jun 2 02:15:03 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 02:15:05 2005 Subject: steffen: server/kolabd/kolabd/templates freshclam.conf.template, 1.1.1.1, 1.2 Message-ID: <20050602001503.835E1101F0A@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv29477 Modified Files: freshclam.conf.template Log Message: updated freshclam.conf.template with comments/defaults from 0.85.1, harmless Index: freshclam.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/freshclam.conf.template,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- freshclam.conf.template 23 Nov 2004 20:26:48 -0000 1.1.1.1 +++ freshclam.conf.template 2 Jun 2005 00:15:01 -0000 1.2 @@ -41,16 +41,20 @@ # Default: clamav (may depend on installation options) #DatabaseOwner clamav -# Use DNS to verify virus database version. Freshclam uses DNS TXT records -# to verify database and software versions. We highly recommend enabling -# this option. +# Initialize supplementary group access (freshclam must be started by root). # Default: disabled -DNSDatabaseInfo current.cvd.clamav.net +#AllowSupplementaryGroups + +# Use DNS to verify virus database version. Freshclam uses DNS TXT records +# to verify database and software versions. With this directive you can change +# the database verification domain. +# Default: enabled, pointing to current.cvd.clamav.net +#DNSDatabaseInfo current.cvd.clamav.net # Uncomment the following line and replace XY with your country # code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. # Default: There is no default, which results in an error when running freshclam -#DatabaseMirror db.XX.clamav.net +#DatabaseMirror db.XY.clamav.net # database.clamav.net is a round-robin record which points to our most # reliable mirrors. It's used as a fall back in case db.XY.clamav.net is @@ -73,9 +77,14 @@ #HTTPProxyUsername myusername #HTTPProxyPassword mypass +# Use aaa.bbb.ccc.ddd as client address for downloading databases. Useful for +# multi-homed systems. +# Default: Use OS'es default outgoing IP address. +#LocalIPAddress aaa.bbb.ccc.ddd + # Send the RELOAD command to clamd. # Default: disabled -NotifyClamd @l_prefix@/etc/clamav/clamd.conf +#NotifyClamd @l_prefix@/etc/clamav/clamd.conf # By default it uses the hardcoded configuration file but you can force an # another one. NotifyClamd @l_prefix@/etc/clamav/clamd.conf @@ -87,3 +96,11 @@ # Run command when database update process fails. # Default: disabled #OnErrorExecute command + +# Don't fork into background. +# Default: disabled +#Foreground + +# Enable debug messages in libclamav. +# Default: disabled +#Debug From cvs at intevation.de Thu Jun 2 04:13:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 04:13:02 2005 Subject: steffen: server/openldap kolab.patch,1.4,1.5 Message-ID: <20050602021301.06693101F07@lists.intevation.de> Author: steffen Update of /kolabrepository/server/openldap In directory doto:/tmp/cvs-serv31153 Modified Files: kolab.patch Log Message: grrr. removed more traces of pth and added db_recover to the rc script Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/openldap/kolab.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- kolab.patch 26 May 2005 12:34:16 -0000 1.4 +++ kolab.patch 2 Jun 2005 02:12:58 -0000 1.5 @@ -1,14 +1,26 @@ +diff -upr ../openldap.orig/openldap.spec ./openldap.spec --- ../openldap.orig/openldap.spec 2005-02-21 18:02:29.000000000 +0100 -+++ openldap.spec 2005-05-26 13:24:41.000000000 +0200 ++++ ./openldap.spec 2005-06-02 03:59:04.000000000 +0200 @@ -34,7 +34,7 @@ Class: BASE Group: Database License: GPL Version: 2.2.23 -Release: 2.3.0 -+Release: 2.3.0_kolab ++Release: 2.3.0_kolab2 # package options %option with_fsl yes +@@ -54,8 +54,8 @@ Prefix: %{l_prefix} + BuildRoot: %{l_buildroot} + BuildPreReq: OpenPKG, openpkg >= 2.3.0, make, gcc + PreReq: OpenPKG, openpkg >= 2.3.0 +-BuildPreReq: readline, openssl, db >= 4.2, pth +-PreReq: readline, openssl, db >= 4.2, pth ++BuildPreReq: readline, openssl, db >= 4.2 ++PreReq: readline, openssl, db >= 4.2 + %if "%{with_fsl}" == "yes" + BuildPreReq: fsl >= 1.2.0 + PreReq: fsl >= 1.2.0 @@ -90,7 +90,7 @@ AutoReqProv: no # (2. make sure our Berkeley-DB is picked up first) %{l_shtool} subst \ @@ -18,6 +30,21 @@ -e 's;;"db.h";g' \ configure %if "%{with_sasl}" == "yes" +@@ -108,10 +108,10 @@ AutoReqProv: no + ;; + esac + CC="%{l_cc}" \ +- CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pth-config --cflags`" \ +- CPPFLAGS="$cf -I`%{l_prefix}/bin/pth-config --includedir`" \ +- LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pth-config --ldflags` %{l_fsl_ldflags}" \ +- LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs} $LOCLIBS" \ ++ CFLAGS="%{l_cflags -O} " \ ++ CPPFLAGS="$cf " \ ++ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \ ++ LIBS="%{l_fsl_libs} $LOCLIBS" \ + ./configure \ + --cache-file=./config.cache \ + --prefix=%{l_prefix} \ @@ -160,7 +160,7 @@ AutoReqProv: no %endif --with-dyngroup \ @@ -27,3 +54,25 @@ --enable-slurpd # build toolkit +diff -upr ../openldap.orig/rc.openldap ./rc.openldap +--- ../openldap.orig/rc.openldap 2005-02-21 17:59:42.000000000 +0100 ++++ ./rc.openldap 2005-06-02 03:01:25.000000000 +0200 +@@ -27,6 +27,10 @@ + [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0 + return 1 + } ++ openldap_db_recover() { ++ dbdir=`sed -n -e 's/^directory\s*\(.*\)$/\1/p' < $openldap_slapd_cfgfile` ++ [ -d $dbdir ] && [ -f $dbdir/DB_CONFIG ] && ( cd $dbdir && db_recover ) ++ } + + %status -u @l_susr@ -o + openldap_usable="unknown" +@@ -48,6 +52,7 @@ + if [ $? -ne 0 -a ".$openldap_url" != . ]; then + flags="$flags -h \"$openldap_url\"" + fi ++ openldap_db_recover + eval @l_prefix@/libexec/openldap/slapd $flags + fi + openldap_slurpd_needed || exit 0 From cvs at intevation.de Thu Jun 2 04:29:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 04:29:26 2005 Subject: steffen: server/kolabd kolabd.spec,1.51,1.52 Message-ID: <20050602022924.E632F100160@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv31712 Modified Files: kolabd.spec Log Message: versions Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- kolabd.spec 31 May 2005 23:36:26 -0000 1.51 +++ kolabd.spec 2 Jun 2005 02:29:22 -0000 1.52 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050531 +Release: 20050601 # list of sources Source0: kolabd-1.9.4.tar.gz @@ -50,7 +50,7 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 2.0.0 -PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.17, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail +PreReq: OpenPKG, openpkg >= 2.2.0, openldap >= 2.2.23-2.3.0_kolab2, imapd, sasl, apache, proftpd, perl, perl-ldap, perl-mail PreReq: sasl >= 2.1.19-2.2.0, sasl::with_ldap = yes, sasl::with_login = yes PreReq: proftpd >= 1.2.10-2.2.0, proftpd::with_ldap = yes PreReq: gdbm >= 1.8.3-2.2.0, gdbm::with_ndbm = yes From cvs at intevation.de Thu Jun 2 04:30:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 04:30:12 2005 Subject: steffen: server obmtool.conf,1.167,1.168 Message-ID: <20050602023010.98C5D100160@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv31755 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.167 retrieving revision 1.168 diff -u -d -r1.167 -r1.168 --- obmtool.conf 31 May 2005 23:53:08 -0000 1.167 +++ obmtool.conf 2 Jun 2005 02:30:08 -0000 1.168 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050530"; + kolab_version="pre-2.0-snapshot-20050601"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -74,9 +74,8 @@ @install ${loc}perl-www-5.8.5-2.2.0 @install ${loc}imap-2004a-2.2.0 @install ${loc}procmail-3.22-2.2.0 - @install ${loc}pth-2.0.4-2.3.0 @install ${loc}db-4.2.52.2-2.2.0 - @install ${altloc}openldap-2.2.23-2.3.0_kolab + @install ${altloc}openldap-2.2.23-2.3.0_kolab2 @install ${loc}sasl-2.1.19-2.2.1 --with=ldap --with=login @install ${loc}getopt-20030307-2.2.0 @install ${loc}proftpd-1.2.10-2.2.0 --with=ldap @@ -132,7 +131,7 @@ @install ${altloc}clamav-0.85.1-20050517 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050531 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050601 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-0.4.0-20050530 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version @check From cvs at intevation.de Thu Jun 2 14:23:34 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 14:23:34 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.53,1.54 Message-ID: <20050602122334.22C95101F0E@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv15886/Kolab-Conf Modified Files: Conf.pm Log Message: Issue777 (legacy) Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- Conf.pm 29 May 2005 22:43:08 -0000 1.53 +++ Conf.pm 2 Jun 2005 12:23:31 -0000 1.54 @@ -570,7 +570,6 @@ "$templatedir/imapd.conf.template" => "$prefix/etc/imapd/imapd.conf", "$templatedir/httpd.conf.template" => "$prefix/etc/apache/apache.conf", "$templatedir/httpd.local.template" => "$prefix/etc/apache/apache.local", - "$templatedir/legacy.conf.template" => "$prefix/etc/apache/legacy.conf", "$templatedir/php.ini.template" => "$prefix/etc/apache/php.ini", "$templatedir/proftpd.conf.template" => "$prefix/etc/proftpd/proftpd.conf", "$templatedir/ldap.conf.template" => "$prefix/etc/openldap/ldap.conf", @@ -596,7 +595,6 @@ "$prefix/etc/imapd/imapd.conf" => 0640, "$prefix/etc/apache/apache.conf" => 0640, "$prefix/etc/apache/apache.local" => 0640, - "$prefix/etc/apache/legacy.conf" => 0640, "$prefix/etc/apache/php.ini" => 0640, "$prefix/etc/proftpd/proftpd.conf" => 0640, "$prefix/etc/openldap/slapd.conf" => 0640, @@ -621,7 +619,6 @@ "$prefix/etc/imapd/imapd.conf" => "kolab:kolab-r", "$prefix/etc/apache/apache.conf" => "kolab:kolab-n", "$prefix/etc/apache/apache.local" => "kolab:kolab-n", - "$prefix/etc/apache/legacy.conf" => "kolab:kolab-n", "$prefix/etc/apache/php.ini" => "kolab:kolab-n", "$prefix/etc/proftpd/proftpd.conf" => "kolab:kolab-n", "$prefix/etc/openldap/ldap.conf" => "kolab:kolab", From cvs at intevation.de Thu Jun 2 14:32:08 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 14:32:09 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.19, 1.20 Message-ID: <20050602123208.13D441006A6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service In directory doto:/tmp/cvs-serv16009/kolab-webadmin/www/admin/service Modified Files: index.php Log Message: support multi-valued mynetworks Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- index.php 27 Apr 2005 19:47:49 -0000 1.19 +++ index.php 2 Jun 2005 12:32:06 -0000 1.20 @@ -64,7 +64,8 @@ $quotawarn = $attrs['cyrus-quotawarn'][0]; $freebusypast = $attrs['kolabFreeBusyPast'][0]; $postfixmydomain = $attrs['postfix-mydomain'][0]; - $postfixmynetworks = $attrs['postfix-mynetworks'][0]; + unset( $attrs['postfix-mynetworks']['count'] ); + $postfixmynetworks = join(', ',$attrs['postfix-mynetworks']); $postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0]; $postfixrelayhost = $attrs['postfix-relayhost'][0]; if( ereg( '\\[(.+)\\]', $postfixrelayhost, $regs ) ) { @@ -153,8 +154,8 @@ if( $_REQUEST['submitpostfixmynetworks'] ) { $attrs = array(); - $attrs['postfix-mynetworks'] = trim( $_REQUEST['postfixmynetworks'] ); - if( $attrs['postfix-mynetworks'] == '' ) $attrs['postfix-mynetworks'] = array(); + $attrs['postfix-mynetworks'] = preg_split( "/[\s,]+/", trim( $_REQUEST['postfixmynetworks'] ) ); + //if( $attrs['postfix-mynetworks'] == '' ) $attrs['postfix-mynetworks'] = array(); if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { $errors[] = _("LDAP Error: failed to modify kolab configuration object: ") .ldap_error($ldap->connection); From cvs at intevation.de Thu Jun 2 14:32:41 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 14:32:43 2005 Subject: steffen: server/kolabd kolabd.spec,1.52,1.53 Message-ID: <20050602123241.8749C1006A6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv16052 Modified Files: kolabd.spec Log Message: we might as well have list-type config entries be multivalued Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- kolabd.spec 2 Jun 2005 02:29:22 -0000 1.52 +++ kolabd.spec 2 Jun 2005 12:32:39 -0000 1.53 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050601 +Release: 20050602 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Thu Jun 2 14:32:41 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 14:32:44 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.11, 1.12 Message-ID: <20050602123241.89041101F0E@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv16052/kolabd/templates Modified Files: main.cf.template Log Message: we might as well have list-type config entries be multivalued Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- main.cf.template 29 May 2005 22:43:44 -0000 1.11 +++ main.cf.template 2 Jun 2005 12:32:39 -0000 1.12 @@ -39,8 +39,8 @@ #inet_interfaces = 127.0.0.1 # relaying -mynetworks = @@@postfix-mynetworks@@@ -mydestination = @@@postfix-mydestination@@@ +mynetworks = @@@postfix-mynetworks|join @@@ +mydestination = @@@postfix-mydestination|join @@@ relay_domains = #smtpd_recipient_restrictions = permit_mynetworks, # check_client_access hash:/kolab/etc/postfix/access, From cvs at intevation.de Thu Jun 2 14:49:59 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 14:50:00 2005 Subject: david: doc/kolab-formats distrlists.sgml,1.2,1.3 Message-ID: <20050602124959.5BD641006B1@lists.intevation.de> Author: david Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv16427 Modified Files: distrlists.sgml Log Message: Dist lists have a new mimetype now, as discussed with Joon on kolab-format. Index: distrlists.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/distrlists.sgml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- distrlists.sgml 11 Mar 2005 11:37:07 -0000 1.2 +++ distrlists.sgml 2 Jun 2005 12:49:57 -0000 1.3 @@ -1,7 +1,8 @@ Format Of Distribution Lists -A distribution list is a special contact. -This is the specification of the body contents: +A distribution list is a special contact. It is stored into a folder that holds contacts, +but it has a different mimetype: "application/x-vnd.kolab.contact.distlist". +This is the specification of the body contents: From cvs at intevation.de Thu Jun 2 16:17:29 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 2 16:17:30 2005 Subject: bernhard: doc/raw-howtos fix-ldap-database-on-slave.txt,1.1,1.2 Message-ID: <20050602141729.3CCE71006AD@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv17866 Modified Files: fix-ldap-database-on-slave.txt Log Message: Added "Relevance" for Kolab server 2 line. Added hints for cleanup; replog. Index: fix-ldap-database-on-slave.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/fix-ldap-database-on-slave.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fix-ldap-database-on-slave.txt 17 May 2005 16:33:52 -0000 1.1 +++ fix-ldap-database-on-slave.txt 2 Jun 2005 14:17:27 -0000 1.2 @@ -1,5 +1,6 @@ Fixing OpenLDAP's Database on the Slave ======================================= +Relevant: Kolab Server 2 When running Kolab with a multi-location setup, i.e. one master server and one or more slave servers, it can happen that the slave's openldap @@ -25,4 +26,15 @@ /kolab/sbin/slapadd < slapcat-output + - (optional) Empty replication logs on the master. + + In /kolab/var/openldap/openldap-slurp/replica/ rename or move away + the *.rej files and the slurpd.replog. + - start openldap again on both servers. + + - on the slave: run kolabconf and restart kolabd + + /kolab/sbin/kolabconf + /kolab/bin/openpkg rc kolabd restart + From cvs at intevation.de Fri Jun 3 10:45:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 10:45:43 2005 Subject: bernhard: doc/kolab-formats kolabformat.sgml,1.14,1.15 Message-ID: <20050603084542.F41431006C1@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv6503 Modified Files: kolabformat.sgml Log Message: Bumped version number to rc3. Index: kolabformat.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- kolabformat.sgml 16 May 2005 11:03:21 -0000 1.14 +++ kolabformat.sgml 3 Jun 2005 08:45:39 -0000 1.15 @@ -15,7 +15,7 @@ The Kolab Storage Format -2.0rc2 +2.0rc3 @@ -28,7 +28,7 @@ www.kolab.org -May 16th, 2005 +June 3rd, 2005 This documentation was written in SGML using the DocBook DTD. HTML @@ -117,6 +117,14 @@ May 12th, 2005 Removed scheduling-id. + + + + +2.0rc3 +May 12th, 2005 + +Distribution list have their own MIME-type now. From cvs at intevation.de Fri Jun 3 11:20:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 11:20:09 2005 Subject: bernhard: doc/www/src documentation.html.m4,1.16,1.17 Message-ID: <20050603092007.EC498100160@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv7506 Modified Files: documentation.html.m4 Log Message: Added storage format spec 2.0rc3 Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- documentation.html.m4 1 Jun 2005 17:35:28 -0000 1.16 +++ documentation.html.m4 3 Jun 2005 09:20:05 -0000 1.17 @@ -29,6 +29,11 @@

    Kolab2 Storage Format Specification

    • Version Release Candidate 2.0rc2   + Browse Online + | + Download pdf + +
    • Version Release Candidate 2.0rc2   Browse Online | Download pdf From cvs at intevation.de Fri Jun 3 11:26:31 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 11:26:33 2005 Subject: bernhard: doc/www/src documentation.html.m4,1.17,1.18 Message-ID: <20050603092631.BB52F1005CF@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv8566 Modified Files: documentation.html.m4 Log Message: typo. Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- documentation.html.m4 3 Jun 2005 09:20:05 -0000 1.17 +++ documentation.html.m4 3 Jun 2005 09:26:29 -0000 1.18 @@ -28,7 +28,7 @@

      Kolab2 Storage Format Specification

        -
      • Version Release Candidate 2.0rc2   +
      • Version Release Candidate 2.0rc3   Browse Online | Download pdf From cvs at intevation.de Fri Jun 3 15:47:45 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 15:47:47 2005 Subject: bernhard: doc/raw-howtos moving-mailboxes.txt,NONE,1.1 Message-ID: <20050603134745.70A9E1005CB@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv1702 Added Files: moving-mailboxes.txt Log Message: Added description how to move mailboxes. --- NEW FILE: moving-mailboxes.txt --- From: Martin Konold Subject: [Kolab-devel] Memo: How to migrate mailboxes between Kolab Servers (multi-location setup) Date: Wed, 21 Jul 2004 23:44:30 +0200 Message-Id: <200407212344.30600.martin.konold@erfrakon.de> Hi, By popular request I am describing how to migrate Kolab mailboxes between servers. With Kolab 2 we are supporting multi-location setups. The physical location of a mailbox is determined by the kolabHomeServer attribute. Actually the mailbox of a new user is created on every server but only the kolabHomeServer is actually populated. Sometimes users shall be migrated to another server for many reasons including relocation of the user, maintainance or security. This can be achieved by two methods. Method 1: Do it the direct but brutal way (Shell access) - Block the user from login - Log in as root on the old server (shell access) - recursivly the _contents_ of the mailbox from the old server to the new server e.g. using scp. (imapd spool directory) - change the KolabHomeServer attribute so that it points to the target server - run cyrus reconstruct on the target server - check that the copy is working and complete - cyrus reconstruct does not take care about the quota so it is advisable to run quota(8) with the -f switch in order to fix the quota root files - delete original contents of the users mailbox - run cyrus reconstruct on the old server - keep the empty mailbox on the old server - Allow normal usage Method 2: Do it the imap way (using IMAP) - Disallow normal usage - Log in as user (or admin) on the old server using IMAPS (no shell!) - Log in as user (or admin) on the target server using IMAPS (no shell!) - recursively copy all folders and the contents of all folders from one IMAP connection to the other server as user - delete all contents from old server as user - keep the empty mailbox on the old server - Set new KolabHomeServer attribute - Allow normal usage I very much prefer method 2 which would allow to nicley integrate the feature in an administration interface for easy, reliable and safe operation. Method 1 is only useful for experienced and trained administrators. From cvs at intevation.de Fri Jun 3 15:54:08 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 15:54:09 2005 Subject: bernhard: doc/raw-howtos moving-mailboxes.txt,1.1,1.2 Message-ID: <20050603135408.BCF1F1005CB@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv1798 Modified Files: moving-mailboxes.txt Log Message: Removed old mailheader, added relevance and principal author lines. Fixed some typos. Made more clear that Method2 is an implementation strategy. Index: moving-mailboxes.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/moving-mailboxes.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- moving-mailboxes.txt 3 Jun 2005 13:47:43 -0000 1.1 +++ moving-mailboxes.txt 3 Jun 2005 13:54:06 -0000 1.2 @@ -1,14 +1,7 @@ -From: Martin Konold -Subject: [Kolab-devel] Memo: How to migrate mailboxes between Kolab Servers - (multi-location setup) -Date: Wed, 21 Jul 2004 23:44:30 +0200 -Message-Id: <200407212344.30600.martin.konold@erfrakon.de> - - -Hi, - -By popular request I am describing how to migrate Kolab mailboxes between -servers. +How to migration mailboxes between Kolab Server in a multi-location setup +------------------------------------------------------------------------- +Principal Author: Martin Konold +Relevance: Kolab Server 2.0x With Kolab 2 we are supporting multi-location setups. The physical location of a mailbox is determined by the kolabHomeServer attribute. @@ -17,8 +10,8 @@ kolabHomeServer is actually populated. Sometimes users shall be migrated to another server for many reasons including -relocation of the user, maintainance or security. This can be achieved by two -methods. +relocation of the user, maintainance or security. +This can be achieved by two methods. Method 1: Do it the direct but brutal way (Shell access) @@ -26,7 +19,7 @@ - Log in as root on the old server (shell access) -- recursivly the _contents_ of the mailbox from the old server to the new +- recursivly copy the _contents_ of the mailbox from the old server to the new server e.g. using scp. (imapd spool directory) - change the KolabHomeServer attribute so that it points to the target server @@ -48,7 +41,8 @@ -Method 2: Do it the imap way (using IMAP) +Method 2: Implement an application that does it the imap way +This script should: - Disallow normal usage @@ -68,6 +62,8 @@ - Allow normal usage -I very much prefer method 2 which would allow to nicley integrate the feature -in an administration interface for easy, reliable and safe operation. Method -1 is only useful for experienced and trained administrators. +I very much prefer method 2 which would allow to nicely integrate the feature +in an administration interface for easy, reliable and safe operation. +Method 1 is only useful for experienced and trained administrators. + +$Id$ From cvs at intevation.de Fri Jun 3 16:05:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 16:05:36 2005 Subject: bernhard: doc/www/src footer.html.m4,1.29,1.30 Message-ID: <20050603140535.D26C6101F01@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv5680 Modified Files: footer.html.m4 Log Message: Added direct link to test scripts. Index: footer.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/footer.html.m4,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- footer.html.m4 18 May 2005 12:57:26 -0000 1.29 +++ footer.html.m4 3 Jun 2005 14:05:33 -0000 1.30 @@ -87,6 +87,8 @@ Subscribe/Manage

        Browse CVS +
        +Testing-Utilities in CVS
        From cvs at intevation.de Fri Jun 3 16:38:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 16:38:58 2005 Subject: bh: server release-notes.txt,1.11,1.12 Message-ID: <20050603143857.7AA48101F01@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6083 Modified Files: release-notes.txt Log Message: update for RC 3 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- release-notes.txt 1 Jun 2005 10:25:02 -0000 1.11 +++ release-notes.txt 3 Jun 2005 14:38:55 -0000 1.12 @@ -1,41 +1,59 @@ Release notes Kolab2 Server -(Version 200506xx, Kolab server 2.0 RC 3) +(Version 20050603, Kolab server 2.0 RC 3) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. -WARNING - With Kolab-Servers 2.0-rc1 and 2.0rc2 there is a chance to lose - emails which came in with a null sender (aka MAIL FROM:<>), - if you enabled the check to prevent users to forge from: headers. - The fix will be in upcoming rc3; technical details are in issue774. - - As workaround, disable the "envelope header from" check in - /kolab/etc/kolab/templates/resmgr.conf.template - set - $params['verify_from_header'] = false - and run kolabconf. Changes since RC 2, 20050527: + - The pth package has been removed + - clamav 0.83-2.3.0 -> 0.85.1-20050517 * new upstream version, security relevant because better detection. + - openldap-2.2.23-2.3.0_kolab -> openldap-2.2.23-2.3.0_kolab2 + + * Some more fixes to make sure that it won't use pth. The changes + in rc2 weren't enough. + + * Some more performance tweaks. + + * Run db_recover when starting openldap + + - postfix 2.1.5-2.2.0_kolab2 -> postfix-2.1.5-2.2.0_kolab3 * Fixing: + Issue774 (null senders would cause email loss) - - kolabd 20050526 -> 20050531 + - kolabd 20050526 -> 20050601 + + * Fixing: + Issue764 (unauthenticated free/busy not allowed with legacy mode) + Issue777 (kolabconf error: cannot open legacy.conf.template) + Issue768 (added postfix virtual map template) + Issue774 (null senders would cause email loss) - perl-kolab 20050503 -> 20050530 + * Fixing: + Issue764 (unauthenticated free/busy not allowed with legacy mode) + Issue768 (added postfix virtual map template) + - kolab-webadmin 20050527 -> 20050530 + + support multi-valued mynetworks + + * Fixing + Issue769 (can create collision with external addressbook) + Issue730 (Cannot rename user in Kolab2 Admin interface) $Id$ From cvs at intevation.de Fri Jun 3 16:39:34 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 3 16:39:36 2005 Subject: bh: server README.1st,1.19,1.20 Message-ID: <20050603143934.7D756101F01@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv6125 Modified Files: README.1st Log Message: fix typo Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- README.1st 1 Jun 2005 16:23:24 -0000 1.19 +++ README.1st 3 Jun 2005 14:39:32 -0000 1.20 @@ -174,7 +174,7 @@ ---------------- clamav will send an email Warning with unresolved configuration file conflicts. -In /kolab/etc/clamav/ you can savely delete clamd.conf.rpmsave +In /kolab/etc/clamav/ you can safely delete clamd.conf.rpmsave and freshclam.conf.rpmsave. Later after starting the server run kolabconf once. From cvs at intevation.de Sat Jun 4 00:56:49 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 4 00:56:51 2005 Subject: steffen: server obmtool.conf,1.168,1.169 Message-ID: <20050603225649.007CE1005D7@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12943 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.168 retrieving revision 1.169 diff -u -d -r1.168 -r1.169 --- obmtool.conf 2 Jun 2005 02:30:08 -0000 1.168 +++ obmtool.conf 3 Jun 2005 22:56:46 -0000 1.169 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050601"; + kolab_version="pre-2.0-snapshot-20050603"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -133,7 +133,7 @@ @install ${plusloc}dcron-2.9-2.2.0 @install ${altloc}kolabd-1.9.4-20050601 --define kolab_version=$kolab_version @install ${altloc}kolab-webadmin-0.4.0-20050530 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20050520 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050530 --define kolab_version=$kolab_version @check %dump From cvs at intevation.de Mon Jun 6 12:43:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 6 12:43:10 2005 Subject: bernhard: server release-notes.txt,1.12,1.13 Message-ID: <20050606104310.0047C1005AD@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12999 Modified Files: release-notes.txt Log Message: Added warning about breaking other platforms with new openldap. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- release-notes.txt 3 Jun 2005 14:38:55 -0000 1.12 +++ release-notes.txt 6 Jun 2005 10:43:07 -0000 1.13 @@ -17,8 +17,11 @@ - openldap-2.2.23-2.3.0_kolab -> openldap-2.2.23-2.3.0_kolab2 - * Some more fixes to make sure that it won't use pth. The changes - in rc2 weren't enough. + * Some more fixes to make sure that it won't use pth. + The changes in rc2 weren't enough. We hope to fix + Issue707 (occasional slapd hangs after attempted writes) + but this might break support for Solaris platforms + in favour of GNU/Linux. * Some more performance tweaks. From cvs at intevation.de Mon Jun 6 12:50:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 6 12:50:24 2005 Subject: bernhard: doc/www/src index.html.m4,1.54,1.55 Message-ID: <20050606105022.E6039101FA1@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv13217 Modified Files: index.html.m4 Log Message: Added server 2.0rc3 news. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- index.html.m4 1 Jun 2005 17:38:03 -0000 1.54 +++ index.html.m4 6 Jun 2005 10:50:20 -0000 1.55 @@ -37,13 +37,25 @@
        + + +
        June 6th, 2005» + Kolab 2 Server RC 3 released +
        +
        +The third release candidate of the Kolab2 Server implementation +fixes a few important bugs. +
        +

        + +
        June 1st, 2005 » KDE Project using Kolab2
        -Check out the following dot.kde story:

        +Check out the following dot.kde story: KDE Project Offers Kolab Groupware Services to its Contributors.
        From cvs at intevation.de Mon Jun 6 22:35:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 6 22:35:27 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.122, 1.123 Message-ID: <20050606203526.1CDF61006A2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv23846 Modified Files: kolab-resource-handlers.spec Log Message: Issue778 (alias fb) Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -d -r1.122 -r1.123 --- kolab-resource-handlers.spec 31 May 2005 00:20:01 -0000 1.122 +++ kolab-resource-handlers.spec 6 Jun 2005 20:35:23 -0000 1.123 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050530 +Release: 20050606 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Mon Jun 6 22:35:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 6 22:35:28 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.36, 1.37 freebusyldap.class.php, 1.7, 1.8 Message-ID: <20050606203526.1FDF31006B0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv23846/kolab-resource-handlers/freebusy Modified Files: freebusy.php freebusyldap.class.php Log Message: Issue778 (alias fb) Index: freebusy.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- freebusy.php 16 Dec 2004 20:54:46 -0000 1.36 +++ freebusy.php 6 Jun 2005 20:35:24 -0000 1.37 @@ -43,6 +43,7 @@ } $imapuser = $ldap->mailForUid( $imapuser ); +$user = $ldap->mailForUidOrAlias( $user ); $homeserver = $ldap->homeServer( $user ); if( $homeserver === false ) { Index: freebusyldap.class.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap.class.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- freebusyldap.class.php 13 Jan 2005 02:41:31 -0000 1.7 +++ freebusyldap.class.php 6 Jun 2005 20:35:24 -0000 1.8 @@ -79,14 +79,11 @@ } function mailForUid( $uid ) { - if( !isset( $uid ) ) return false; - $result = ldap_search( $this->connection, $this->base, '(&(objectClass=kolabInetOrgPerson)(uid='.$uid.'))', - array( 'mail' ) ); - if( $result ) { - $entries = ldap_get_entries( $this->connection, $result ); - if( $entries['count'] > 0 && !empty($entries[0]['mail'][0]) ) return $entries[0]['mail'][0]; - } - return $uid; + return $this->_internalLookupMail('(&(objectClass=kolabInetOrgPerson)(uid='.$uid.'))',$uid); + } + + function mailForUidOrAlias( $uid ) { + return $this->_internalLookupMail('(&(objectClass=kolabInetOrgPerson)(|(uid='.$uid.')(alias='.$uid.')))',$uid); } function homeServer( $uid ) { @@ -170,6 +167,17 @@ } if( $val == '' ) $val = $default; return $val; + } + + function _internalLookupMail( $filter, $default ) { + if( !isset( $default ) ) return false; + $result = ldap_search( $this->connection, $this->base, $filter, + array( 'mail' ) ); + if( $result ) { + $entries = ldap_get_entries( $this->connection, $result ); + if( $entries['count'] > 0 && !empty($entries[0]['mail'][0]) ) return $entries[0]['mail'][0]; + } + return $default; } var $connection; From cvs at intevation.de Mon Jun 6 23:27:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 6 23:27:28 2005 Subject: steffen: server/kolabd kolabd.spec,1.53,1.54 Message-ID: <20050606212727.299451006B6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv24618 Modified Files: kolabd.spec Log Message: Issue779 (german quota warning) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- kolabd.spec 2 Jun 2005 12:32:39 -0000 1.53 +++ kolabd.spec 6 Jun 2005 21:27:25 -0000 1.54 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050602 +Release: 20050606 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Mon Jun 6 23:27:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 6 23:27:30 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn, 1.2, 1.3 quotawarning.txt, 1.1.1.1, 1.2 Message-ID: <20050606212727.3E8761006D4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv24618/kolabd Modified Files: kolabquotawarn quotawarning.txt Log Message: Issue779 (german quota warning) Index: kolabquotawarn =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolabquotawarn 24 Mar 2005 10:13:34 -0000 1.2 +++ kolabquotawarn 6 Jun 2005 21:27:25 -0000 1.3 @@ -47,7 +47,7 @@ foreach my $key (sort keys %Kolab::config) { print "$key : " . $Kolab::config{$key} . "\n"; } - exit 0; + #exit 0; } # @@ -119,15 +119,20 @@ my $msg = $warnmessage; my ($user) = ( $mailbox =~ /.*\/(.*)/ ); - $msg =~ s//$user/; - $msg =~ s//$mailbox/; - $msg =~ s//$pct/; - $msg =~ s//$used/; - $msg =~ s//$total/; + + print "mailbox=$mailbox, user=$user, used=$used, pct=$pct\n" if $opt_d; + + $msg =~ s//$user/g; + $msg =~ s//$mailbox/g; + $msg =~ s//$pct/g; + $msg =~ s//$used/g; + $msg =~ s//$total/g; my $mail = Mail::Message->build( From => "MAILER-DAEMON", - To => $user, - Subject => "Quota warning", - data => $msg ); + To => $user, + Subject => "Quota warning", + Charset => "utf-8", + data => $msg ); + $mail->print if $opt_d; $mail->send(); } @@ -144,7 +149,9 @@ my $total = $quota{'STORAGE'}[1]; my $pct = $used * 100 / $total; if( $pct >= $warnpct ) { + print "$name is at $pct\n" if $opt_d; my $ts = $quotawarn_db{$name}; + print "ts=$ts\n" if $opt_d; if( defined($ts) ) { if( $ts eq "permanent" ) { next; Index: quotawarning.txt =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/quotawarning.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- quotawarning.txt 23 Nov 2004 20:26:47 -0000 1.1.1.1 +++ quotawarning.txt 6 Jun 2005 21:27:25 -0000 1.2 @@ -1,6 +1,15 @@ [This is an automatically generated message.] The mailbox for is % full, please clean it up. -The size of the mailbox is currently KB out of a total allowed KB. +The size of the mailbox is currently KB out of a total +allowed KB. + + + +[Dies ist eine automatisch generierte Nachricht] + +Das Postfach für ist zu % gefüllt. Bitte +räumen Sie es auf. +Das Postfach belegt zurzeit KB von erlaubten KB. From cvs at intevation.de Tue Jun 7 01:46:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 01:46:20 2005 Subject: steffen: server/kolabd/kolabd kolab2.schema,1.9,1.10 Message-ID: <20050606234618.B17D91005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv27738/kolabd Modified Files: kolab2.schema Log Message: Moved kolabfilter settings verify_from and allow_sender to LDAP Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- kolab2.schema 29 May 2005 22:43:44 -0000 1.9 +++ kolab2.schema 6 Jun 2005 23:46:16 -0000 1.10 @@ -302,6 +302,23 @@ EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) +########################## +# kolabfilter attributes # +########################## + +# enable trustable From: +attributetype ( 1.3.6.1.4.1.19414.2.1.750 + NAME 'kolabfilter-verify-from-header' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + +# should Sender header be allowed instead of From +# when present? +attributetype ( 1.3.6.1.4.1.19414.2.1.751 + NAME 'kolabfilter-allow-sender-header' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + ###################### # proftpd attributes # ###################### @@ -332,7 +349,7 @@ DESC 'Kolab server configuration' SUP top STRUCTURAL MUST k - MAY ( kolabHost $ + MAY ( kolabHost $ postfix-mydomain $ postfix-relaydomains $ postfix-mydestination $ @@ -341,7 +358,7 @@ postfix-transport $ postfix-virtual $ postfix-enable-virus-scan $ - postfix-allow-unauthenticated $ + postfix-allow-unauthenticated $ cyrus-autocreatequota $ cyrus-quotawarn $ cyrus-autocreatequota $ @@ -352,7 +369,9 @@ cyrus-pop3s $ cyrus-sieve $ apache-http $ - apache-allow-unauthenticated-fb $ + apache-allow-unauthenticated-fb $ + kolabfilter-verify-from-header $ + kolabfilter-allow-sender-header $ proftpd-ftp $ proftpd-defaultquota $ kolabFreeBusyFuture $ @@ -392,13 +411,13 @@ SUP top AUXILIARY MAY ( c $ alias $ - kolabHomeServer $ + kolabHomeServer $ kolabHomeMTA $ unrestrictedMailSize $ kolabDelegate $ kolabEncryptedPassword $ - cyrus-userquota $ - kolabInvitationPolicy $ + cyrus-userquota $ + kolabInvitationPolicy $ kolabFreeBusyFuture $ calFBURL $ kolabDeleteflag ) ) From cvs at intevation.de Tue Jun 7 01:46:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 01:46:21 2005 Subject: steffen: server/kolabd/kolabd/templates resmgr.conf.template, 1.4, 1.5 Message-ID: <20050606234618.B49C61006B4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv27738/kolabd/templates Modified Files: resmgr.conf.template Log Message: Moved kolabfilter settings verify_from and allow_sender to LDAP Index: resmgr.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- resmgr.conf.template 3 Apr 2005 23:22:12 -0000 1.4 +++ resmgr.conf.template 6 Jun 2005 23:46:16 -0000 1.5 @@ -19,10 +19,10 @@ // Should we make sure that the sender and From header match for mail // that origins on this server? -$params['verify_from_header'] = true; +$params['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE'); // Should the Sender: header be used over From: if present? -$params['allow_sender_header'] = false; +$params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE'); // Should we allow forwarded ical messages from Outlook // by encapsulating them in a MIME multipart From cvs at intevation.de Tue Jun 7 01:47:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 01:47:09 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates service.tpl, 1.2, 1.3 Message-ID: <20050606234707.5E46E1006C3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv27813/kolab-webadmin/php/admin/templates Modified Files: service.tpl Log Message: Kolabfilter settings verify_from and allow_sender accessible from webgui (german translation pending) Index: service.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- service.tpl 18 Mar 2005 07:25:12 -0000 1.2 +++ service.tpl 6 Jun 2005 23:47:05 -0000 1.3 @@ -103,6 +103,20 @@

        +

        {tr msg="Mail Filter Settings"}

        +
        +
        + +{tr msg="Only allow mail with a trustable From header for accounts on this server. Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to happen for example with mailinglists."} +
        + +{tr msg="Use the Sender header instead of From for the above checks if present."} +
        +
        +
        +
        +
        +

        {tr msg="Kolab Hosts"}

        From cvs at intevation.de Tue Jun 7 01:47:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 01:47:10 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin kolab-webadmin.spec.in, 1.12, 1.13 Message-ID: <20050606234707.596091005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv27813/kolab-webadmin Modified Files: kolab-webadmin.spec.in Log Message: Kolabfilter settings verify_from and allow_sender accessible from webgui (german translation pending) Index: kolab-webadmin.spec.in =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- kolab-webadmin.spec.in 28 Apr 2005 00:16:59 -0000 1.12 +++ kolab-webadmin.spec.in 6 Jun 2005 23:47:05 -0000 1.13 @@ -42,7 +42,7 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 2.0.0 -PreReq: OpenPKG, openpkg >= 2.2.0, kolabd >= 1.9.4-20050409 +PreReq: OpenPKG, openpkg >= 2.2.0, kolabd >= 1.9.4-20050606 PreReq: apache >= 1.3.31-2.2.0, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_ssl = yes PreReq: php-smarty >= 2.6.3 AutoReq: no From cvs at intevation.de Tue Jun 7 01:47:07 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 01:47:11 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.20, 1.21 Message-ID: <20050606234707.6633F1006D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service In directory doto:/tmp/cvs-serv27813/kolab-webadmin/www/admin/service Modified Files: index.php Log Message: Kolabfilter settings verify_from and allow_sender accessible from webgui (german translation pending) Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- index.php 2 Jun 2005 12:32:06 -0000 1.20 +++ index.php 6 Jun 2005 23:47:05 -0000 1.21 @@ -47,6 +47,8 @@ global $postfixrelayhost; global $postfixrelayhostmx; global $kolabhost; + global $kolabfilterverifyfrom; + global $kolabfilterallowsender; // Get values from LDAP if (($result = ldap_read($ldap->connection, "k=kolab,".$_SESSION['base_dn'], '(objectclass=*)')) && @@ -78,6 +80,8 @@ } $kolabhost = $attrs['kolabHost']; unset( $kolabhost['count'] ); + $kolabfilterverifyfrom = $attrs['kolabfilter-verify-from-header'][0]; + $kolabfilterallowsender = $attrs['kolabfilter-allow-sender-header'][0]; ldap_free_result($result); } } @@ -171,6 +175,16 @@ } } +if( $_REQUEST['submitkolabfilter'] ) { + $attrs = array( + 'kolabfilter-verify-from-header' => postvalue( 'kolabfilterverifyfrom' ), + 'kolabfilter-allow-sender-header' => postvalue( 'kolabfilterallowsender' ) ); + if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { + $errors[] = _("LDAP Error: failed to modify kolab configuration object: ") + .ldap_error($ldap->connection); + } + } + if( $_REQUEST['submitpostfixrelayhost'] ) { $value = trim( $_REQUEST['postfixrelayhost'] ); if( $value != '' && !isset( $_REQUEST['postfixrelayhostmx'] ) ) { @@ -247,6 +261,8 @@ $smarty->assign( 'postfixallowunauth', toboolstr($postfixallowunauth) ); $smarty->assign( 'postfixrelayhost', $postfixrelayhost ); $smarty->assign( 'postfixrelayhostmx', $postfixrelayhostmx ); +$smarty->assign( 'kolabfilterverifyfrom', toboolstr($kolabfilterverifyfrom) ); +$smarty->assign( 'kolabfilterallowsender', toboolstr($kolabfilterallowsender) ); $smarty->assign( 'kolabhost', $kolabhost ); $smarty->assign( 'menuitems', $menuitems ); $smarty->assign( 'submenuitems', From cvs at intevation.de Tue Jun 7 12:41:45 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 12:41:47 2005 Subject: stephan: server/kolabd kolabd.spec,1.54,1.55 Message-ID: <20050607104145.A31C7101EF4@lists.intevation.de> Author: stephan Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv17110/kolabd Modified Files: kolabd.spec Log Message: fix kolab command-line admin tool Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- kolabd.spec 6 Jun 2005 21:27:25 -0000 1.54 +++ kolabd.spec 7 Jun 2005 10:41:43 -0000 1.55 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050606 +Release: 20050607 # list of sources Source0: kolabd-1.9.4.tar.gz @@ -154,6 +154,7 @@ namespace/libexec/adduser \ namespace/libexec/deluser \ namespace/libexec/listusers \ + namespace/libexec/showuser \ namespace/libexec/newconfig \ namespace/libexec/showlog \ namespace/libexec/start \ From cvs at intevation.de Tue Jun 7 12:41:45 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 12:41:49 2005 Subject: stephan: server/kolabd/kolabd/namespace/libexec adduser, 1.1.1.1, 1.2 Message-ID: <20050607104145.A4D8E101EFD@lists.intevation.de> Author: stephan Update of /kolabrepository/server/kolabd/kolabd/namespace/libexec In directory doto:/tmp/cvs-serv17110/kolabd/kolabd/namespace/libexec Modified Files: adduser Log Message: fix kolab command-line admin tool Index: adduser =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/adduser,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- adduser 23 Nov 2004 20:26:47 -0000 1.1.1.1 +++ adduser 7 Jun 2005 10:41:43 -0000 1.2 @@ -78,7 +78,7 @@ exit 255 fi -echo "Are you sure you want to procede? (y/n)" +echo "Are you sure you want to proceed? (y/n)" read ANS if test "$ANS" != "y"; then echo Aborted From cvs at intevation.de Tue Jun 7 12:45:28 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 12:45:29 2005 Subject: bernhard: utils/testing send_filtertest_emails.py,1.4,1.5 Message-ID: <20050607104528.157D6101EF4@lists.intevation.de> Author: bernhard Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv17366 Modified Files: send_filtertest_emails.py Log Message: Added sanity check that the username does not contain an @. Added test for issue783. Index: send_filtertest_emails.py =================================================================== RCS file: /kolabrepository/utils/testing/send_filtertest_emails.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- send_filtertest_emails.py 1 Jun 2005 13:38:16 -0000 1.4 +++ send_filtertest_emails.py 7 Jun 2005 10:45:26 -0000 1.5 @@ -116,6 +116,10 @@ print >>sys.stderr, "--smtp-host missing" error = True + if '@' in username: + print >>sys.stderr, "error: \"@\" in username!" + error = True + if error: sys.exit(1) @@ -145,6 +149,12 @@ # 3: delivered, no mailer-daemon in kolabfilter log: # issue774 (null senders not handled by kolabfilter...) send_mail("<>", envelope_to, "some@non-existing.local", header_to, 3, + smtp_host = smtp_host, smtp_port = smtp_port) + + # 4: delivered, no Invalid From: header in postfix log: + # issue783 (envelope header from check has problems with mailinglists) + send_mail("x-commits-bounces-+y=malinglist.org@big.local", envelope_to, + header_from, header_to, 4, smtp_host = smtp_host, smtp_port = smtp_port) if __name__=="__main__": From cvs at intevation.de Tue Jun 7 13:05:56 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 13:05:57 2005 Subject: stephan: server/kolabd/kolabd/namespace kolab,1.1.1.1,1.2 Message-ID: <20050607110556.8CC1B101EF4@lists.intevation.de> Author: stephan Update of /kolabrepository/server/kolabd/kolabd/namespace In directory doto:/tmp/cvs-serv18503 Modified Files: kolab Log Message: fix error message Index: kolab =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/namespace/kolab,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- kolab 23 Nov 2004 20:26:47 -0000 1.1.1.1 +++ kolab 7 Jun 2005 11:05:54 -0000 1.2 @@ -203,7 +203,7 @@ # command line sanity check if [ ${#} -eq 0 ]; then echo "kolab:ERROR: Invalid command-line arguments." 1>&2 - echo "kolab:ERROR: Run \"${openpkg_prefix}/bin/openpkg --help\" for list of valid arguments." 1>&2 + echo "kolab:ERROR: Run \"${openpkg_prefix}/bin/kolab --help\" for list of valid arguments." 1>&2 exit 1 fi From cvs at intevation.de Tue Jun 7 17:59:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 17:59:40 2005 Subject: bernhard: doc/raw-howtos moving-mailboxes.txt,1.2,1.3 Message-ID: <20050607155939.17C08101F0C@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv23092 Modified Files: moving-mailboxes.txt Log Message: Added that annotations have to be copied, too. Index: moving-mailboxes.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/moving-mailboxes.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- moving-mailboxes.txt 3 Jun 2005 13:54:06 -0000 1.2 +++ moving-mailboxes.txt 7 Jun 2005 15:59:37 -0000 1.3 @@ -39,6 +39,9 @@ - Allow normal usage +- ATTENTION: You may need to use a Kolab client to set the annotations + per mailbox again, that indicate what type of objects are in each folder. + Method 2: Implement an application that does it the imap way @@ -50,8 +53,9 @@ - Log in as user (or admin) on the target server using IMAPS (no shell!) -- recursively copy all folders and the contents of all folders from one IMAP -connection to the other server as user +- recursively copy all folders, folder annotations + and the contents of all folders from one IMAP + connection to the other server as user - delete all contents from old server as user From cvs at intevation.de Tue Jun 7 18:05:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 18:05:26 2005 Subject: bernhard: server README.1st,1.20,1.21 Message-ID: <20050607160525.F3004101F0C@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23356 Modified Files: README.1st Log Message: Added a warning for issue783. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- README.1st 3 Jun 2005 14:39:32 -0000 1.20 +++ README.1st 7 Jun 2005 16:05:23 -0000 1.21 @@ -1,6 +1,12 @@ Kolab2 Important Information ============================ +WARNING: For rc2 we recomment disabling the "envelope header from" check in +/kolab/etc/kolab/templates/resmgr.conf.template +set "$params['verify_from_header'] = false" and run kolabconf. +Otherwise emails originating from your server going through an external +mailinglist might not reach users inside of your domain because of Issue783. + WARNING: There's an incompatible change between Beta 1 and Beta 2. See below for more information. @@ -12,7 +18,6 @@ that the permissions are correct but there's a chance that the permissions can still go wrong, especially if you upgrade from pre Beta 1 releases. - Quick install instructions -------------------------- From cvs at intevation.de Tue Jun 7 23:08:59 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 7 23:08:59 2005 Subject: martin: utils/testing send_filtertest_emails.py,1.5,1.6 Message-ID: <20050607210859.203B51005D8@lists.intevation.de> Author: martin Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv28257 Modified Files: send_filtertest_emails.py Log Message: Martin Konold: Avoid the problematic .local for tld whenever possible as people tend to use this in their real world setups and cause numerious problems with Kolab. Index: send_filtertest_emails.py =================================================================== RCS file: /kolabrepository/utils/testing/send_filtertest_emails.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- send_filtertest_emails.py 7 Jun 2005 10:45:26 -0000 1.5 +++ send_filtertest_emails.py 7 Jun 2005 21:08:57 -0000 1.6 @@ -142,18 +142,18 @@ smtp_host = smtp_host, smtp_port = smtp_port) # 2: bounce mail: different from and host envelope - send_mail(envelope_from, envelope_to, "rumpelstilzchen@big.local", + send_mail(envelope_from, envelope_to, "rumpelstilzchen@big.loc", header_to, 2, smtp_host = smtp_host, smtp_port = smtp_port) # 3: delivered, no mailer-daemon in kolabfilter log: # issue774 (null senders not handled by kolabfilter...) - send_mail("<>", envelope_to, "some@non-existing.local", header_to, 3, + send_mail("<>", envelope_to, "some@non-existing.loc", header_to, 3, smtp_host = smtp_host, smtp_port = smtp_port) # 4: delivered, no Invalid From: header in postfix log: # issue783 (envelope header from check has problems with mailinglists) - send_mail("x-commits-bounces-+y=malinglist.org@big.local", envelope_to, + send_mail("x-commits-bounces-+y=malinglist.org@big.loc", envelope_to, header_from, header_to, 4, smtp_host = smtp_host, smtp_port = smtp_port) From cvs at intevation.de Wed Jun 8 09:09:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 8 09:09:03 2005 Subject: bernhard: doc/www/src download.html.m4,1.4,1.5 Message-ID: <20050608070901.99AFF1005CE@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv15693 Modified Files: download.html.m4 Log Message: Changed ftp_servers to download_servers. Removed signs of "main ftp" server, we better speak about download servers. Index: download.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/download.html.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- download.html.m4 14 Apr 2005 15:45:31 -0000 1.4 +++ download.html.m4 8 Jun 2005 07:08:59 -0000 1.5 @@ -5,7 +5,7 @@

        Download

        -Main ftp server and its mirrors +Download servers

        Kolab-2
        @@ -19,7 +19,7 @@   Kolab Server 1.0
          KDE Client for Kolab Server 1.0
        - +

        Download servers

        @@ -150,7 +150,8 @@

        From time to time, releases and packages are made available of this branch. -See the "kde-client" section on the ftp servers. +See the "kde-client" section on the +download servers. These are collateral results of the following commercial activities:

        From cvs at intevation.de Wed Jun 8 09:12:20 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 8 09:12:20 2005 Subject: bernhard: doc/www/src download.html.m4,1.5,1.6 Message-ID: <20050608071220.49A351005CE@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv15770 Modified Files: download.html.m4 Log Message: Changed from CVS to SVN instructions. Index: download.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/download.html.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- download.html.m4 8 Jun 2005 07:08:59 -0000 1.5 +++ download.html.m4 8 Jun 2005 07:12:18 -0000 1.6 @@ -145,8 +145,8 @@

        The Kolab Groupware Projects maintains the branch "proko2" in the -KDE CVS which is based on KDE 3.3. See here for the -instructions how to check out from CVS. +KDE SVN which is based on KDE 3.3. See here for the +instructions how to check out from SVN.

        From time to time, releases and packages are made available of this branch. From cvs at intevation.de Wed Jun 8 09:16:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 8 09:16:19 2005 Subject: bernhard: doc/kde-client/cvs-instructions checkout_kde_i18n_initial.sh, 1.4, NONE checkout_kde_i18n_proko2.sh, 1.13, NONE checkout_proko2.sh, 1.57, NONE Message-ID: <20050608071618.8F5D6101EE7@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/kde-client/cvs-instructions In directory doto:/tmp/cvs-serv15985/cvs-instructions Removed Files: checkout_kde_i18n_initial.sh checkout_kde_i18n_proko2.sh checkout_proko2.sh Log Message: removed cvs-instructions directory, they are not needed anymore, KDE uses SVN. --- checkout_kde_i18n_initial.sh DELETED --- --- checkout_kde_i18n_proko2.sh DELETED --- --- checkout_proko2.sh DELETED --- From cvs at intevation.de Wed Jun 8 13:05:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 8 13:05:59 2005 Subject: stephan: server obmtool.conf,1.169,1.170 Message-ID: <20050608110558.01498101EFD@lists.intevation.de> Author: stephan Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20123 Modified Files: obmtool.conf Log Message: Add symlink to kolab admin tool Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.169 retrieving revision 1.170 diff -u -d -r1.169 -r1.170 --- obmtool.conf 3 Jun 2005 22:56:46 -0000 1.169 +++ obmtool.conf 8 Jun 2005 11:05:55 -0000 1.170 @@ -136,6 +136,16 @@ @install ${altloc}kolab-resource-handlers-0.3.9-20050530 --define kolab_version=$kolab_version @check + if test ! -e "/usr/bin/kolab" ; then + echo + echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab" + ln -s $PREFIX/bin/kolab /usr/bin/kolab + fi + + + + + %dump echo "PRG = \"$PRG\"" echo "CMD = \"$CMD\"" From cvs at intevation.de Wed Jun 8 13:05:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 8 13:06:01 2005 Subject: stephan: server/kolabd/kolabd/namespace kolab,1.2,1.3 Message-ID: <20050608110558.070C3101F07@lists.intevation.de> Author: stephan Update of /kolabrepository/server/kolabd/kolabd/namespace In directory doto:/tmp/cvs-serv20123/kolabd/kolabd/namespace Modified Files: kolab Log Message: Add symlink to kolab admin tool Index: kolab =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/namespace/kolab,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab 7 Jun 2005 11:05:54 -0000 1.2 +++ kolab 8 Jun 2005 11:05:55 -0000 1.3 @@ -3,7 +3,7 @@ ## Kolab Namespace tool ## Derived with acknowledgement from: openpkg -- OpenPKG Tool Chain ## -## Copyright (c) 2004 Code Fusion cc. +## Copyright (c) 2004-2005 Code Fusion cc. ## Copyright (c) 2000-2004 The OpenPKG Project ## Copyright (c) 2000-2004 Ralf S. Engelschall ## Copyright (c) 2000-2004 Cable & Wireless @@ -130,7 +130,7 @@ echo "${release} " echo "Kolab Server Tool" echo "" - echo "Copyright (c) 2004 Code Fusion cc." + echo "Copyright (c) 2004,2005 Code Fusion cc." echo "" echo " \$ ${openpkg_prefix}/bin/kolab [

        -{tr msg="Only allow mail with a trustable From header for accounts on this server. Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to happen for example with mailinglists."} +{tr msg="Check messages for mismatching From header and envelope from."}
        -{tr msg="Use the Sender header instead of From for the above checks if present."} +{tr msg="Use the Sender header instead of From for the above checks if Sender is present."} +
        +

        Action to take for messages that fail the check:

        + +{tr msg="Modify the From header so the user can see the potential forgery."}
        + +{tr msg="Reject the message."} +{tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}
        From cvs at intevation.de Sat Jun 11 01:54:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 01:54:50 2005 Subject: steffen: server/kolabd/kolabd kolab2.schema,1.10,1.11 Message-ID: <20050610235439.84E53101FB3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv1169/kolabd/kolabd Modified Files: kolab2.schema Log Message: rewite from header (Issue783) Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- kolab2.schema 6 Jun 2005 23:46:16 -0000 1.10 +++ kolab2.schema 10 Jun 2005 23:54:37 -0000 1.11 @@ -319,6 +319,13 @@ EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) +# Should reject messages with From headers that dont match +# the envelope? Default is to rewrite the header +attributetype ( 1.3.6.1.4.1.19414.2.1.752 + NAME 'kolabfilter-reject-forged-from-header' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + ###################### # proftpd attributes # ###################### @@ -372,6 +379,7 @@ apache-allow-unauthenticated-fb $ kolabfilter-verify-from-header $ kolabfilter-allow-sender-header $ + kolabfilter-reject-forged-from-header $ proftpd-ftp $ proftpd-defaultquota $ kolabFreeBusyFuture $ @@ -451,4 +459,4 @@ DESC 'Kolab group of names (DNs) derived from RFC2256' SUP groupOfNames STRUCTURAL MAY ( mail $ - kolabDeleteflag ) ) \ No newline at end of file + kolabDeleteflag ) ) From cvs at intevation.de Sat Jun 11 01:54:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 01:54:52 2005 Subject: steffen: server/kolabd kolabd.spec,1.55,1.56 Message-ID: <20050610235439.81BA5101FB2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv1169/kolabd Modified Files: kolabd.spec Log Message: rewite from header (Issue783) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- kolabd.spec 7 Jun 2005 10:41:43 -0000 1.55 +++ kolabd.spec 10 Jun 2005 23:54:37 -0000 1.56 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050607 +Release: 20050610 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Sat Jun 11 01:54:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 01:54:53 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.14, 1.15 master.cf.template, 1.10, 1.11 resmgr.conf.template, 1.5, 1.6 Message-ID: <20050610235439.8D72F101FB4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv1169/kolabd/kolabd/templates Modified Files: main.cf.template master.cf.template resmgr.conf.template Log Message: rewite from header (Issue783) Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- main.cf.template 10 Jun 2005 14:17:05 -0000 1.14 +++ main.cf.template 10 Jun 2005 23:54:37 -0000 1.15 @@ -53,8 +53,8 @@ transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:ldaptransport alias_maps = hash:@l_prefix@/etc/postfix/aliases alias_database = hash:@l_prefix@/etc/postfix/aliases -virtual_mailbox_maps = $virtual_maps -local_recipient_maps = $virtual_mailbox_maps +#virtual_mailbox_maps = $virtual_maps +local_recipient_maps = $virtual_maps # local delivery recipient_delimiter = + Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- master.cf.template 10 Jun 2005 12:25:23 -0000 1.10 +++ master.cf.template 10 Jun 2005 23:54:37 -0000 1.11 @@ -24,7 +24,7 @@ showq unix n - n - - showq error unix - - n - - error local unix - n n - - local -virtual unix - n n - - virtual +#virtual unix - n n - - virtual lmtp unix - - n - - lmtp #cyrus unix - n n - - pipe flags=R user=cyrus argv=/kolab/bin/deliver -e -m ${extension} ${user} #uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/kolab/bin/uux -r -n -z -a$sender - $nexthop!rmail ($recipient) Index: resmgr.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- resmgr.conf.template 6 Jun 2005 23:46:16 -0000 1.5 +++ resmgr.conf.template 10 Jun 2005 23:54:37 -0000 1.6 @@ -24,6 +24,10 @@ // Should the Sender: header be used over From: if present? $params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE'); +// Should reject messages with From headers that dont match +// the envelope? Default is to rewrite the header +$params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE'); + // Should we allow forwarded ical messages from Outlook // by encapsulating them in a MIME multipart $params['allow_outlook_ical_forward'] = true; From cvs at intevation.de Sat Jun 11 02:19:02 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 02:19:04 2005 Subject: steffen: server obmtool.conf,1.170,1.171 Message-ID: <20050611001902.DE2881006D1@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv2445 Modified Files: obmtool.conf Log Message: versions and sec. updates Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.170 retrieving revision 1.171 diff -u -d -r1.170 -r1.171 --- obmtool.conf 8 Jun 2005 11:05:55 -0000 1.170 +++ obmtool.conf 11 Jun 2005 00:19:00 -0000 1.171 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050603"; + kolab_version="pre-2.0-snapshot-20050610"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -32,7 +32,7 @@ fi # start from scratch or upgrade within 2.0.x - @install ${loc}openpkg-2.2.2-2.2.2 \ + @install ${loc}openpkg-2.2.3-2.2.3 \ --tag="kolab" \ --prefix="${PREFIX}" \ --user="${CMD}" --group="${CMD}" \ @@ -43,19 +43,19 @@ @install ${loc}gcc-3.4.2-2.2.0 @install ${loc}fsl-1.5.0-2.2.0 @install ${loc}mm-1.3.1-2.2.0 - @install ${loc}perl-5.8.5-2.2.1 + @install ${loc}perl-5.8.5-2.2.2 @install ${loc}perl-openpkg-5.8.5-2.2.0 @install ${loc}perl-conv-5.8.5-2.2.0 @install ${loc}lzo-1.08-2.2.0 @install ${loc}readline-5.0.0-2.2.0 @install ${loc}sharutils-4.3.77-2.2.0 @install ${loc}ncurses-5.4.20041009-2.2.0 - @install ${loc}bzip2-1.0.2-2.2.0 + @install ${loc}bzip2-1.0.2-2.2.1 @install ${loc}pcre-5.0-2.2.0 @install ${loc}grep-2.5.1-2.2.0 @install ${loc}texinfo-4.7-2.2.0 @install ${loc}diffutils-2.8.7-2.2.0 - @install ${loc}gzip-1.3.5-2.2.0 + @install ${loc}gzip-1.3.5-2.2.1 @install ${loc}perl-term-5.8.5-2.2.0 @install ${loc}perl-ds-5.8.5-2.2.0 @install ${loc}perl-time-5.8.5-2.2.0 @@ -85,7 +85,7 @@ @install ${loc}perl-ldap-5.8.5-2.2.0 @install ${loc}perl-db-5.8.5-2.2.0 @install ${altloc}perl-kolab-5.8.5-20050530 - @install ${altloc}imapd-2.2.12-2.3.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars + @install ${altloc}imapd-2.2.12-2.3.0_kolab4 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars @install ${loc}m4-1.4.2-2.2.0 @install ${loc}bison-1.35-2.2.0 @install ${loc}flex-2.5.4a-2.2.0 @@ -131,9 +131,9 @@ @install ${altloc}clamav-0.85.1-20050517 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050601 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050530 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20050530 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050610 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050611 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050610 --define kolab_version=$kolab_version @check if test ! -e "/usr/bin/kolab" ; then From cvs at intevation.de Sat Jun 11 11:36:13 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 11:36:14 2005 Subject: martin: server/perl-kolab/Kolab Kolab.pm,1.22,1.23 Message-ID: <20050611093613.732081006BA@lists.intevation.de> Author: martin Update of /kolabrepository/server/perl-kolab/Kolab In directory doto:/tmp/cvs-serv28203/perl-kolab/Kolab Modified Files: Kolab.pm Log Message: MArtin Konold: Trivial syntax fix as noticed by Gunnar Wrobel Index: Kolab.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Kolab.pm 8 Jun 2005 12:44:35 -0000 1.22 +++ Kolab.pm 11 Jun 2005 09:36:11 -0000 1.23 @@ -30,7 +30,7 @@ use vars qw(%config %haschanged $reloadOk); require Exporter; -require "config.h" +require "config.h"; our @ISA = qw(Exporter); From cvs at intevation.de Sat Jun 11 11:40:45 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 11:40:46 2005 Subject: martin: server/perl-kolab/Kolab-Mailer Mailer.pm,1.2,1.3 Message-ID: <20050611094045.7A88B1006BA@lists.intevation.de> Author: martin Update of /kolabrepository/server/perl-kolab/Kolab-Mailer In directory doto:/tmp/cvs-serv28300/perl-kolab/Kolab-Mailer Modified Files: Mailer.pm Log Message: Martin Konold: Fix from Gunnar Wrobel Index: Mailer.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Mailer/Mailer.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Mailer.pm 8 Jun 2005 12:44:35 -0000 1.2 +++ Mailer.pm 11 Jun 2005 09:40:43 -0000 1.3 @@ -68,7 +68,7 @@ $mesg->attach(Data => $data); } - open(SENDMAIL, '|' . $Kolab::config{'prefix'} . $ap::config->{sbindir}/sendmail -oi -t -odq); + open(SENDMAIL, '|' . $Kolab::config{'prefix'} . $ap::config->{sbindir} . '/sendmail -oi -t -odq'); $mesg->print(\*SENDMAIL); close(SENDMAIL); } @@ -87,7 +87,7 @@ Data => $text, ); - open(SENDMAIL, '|' . $Kolab::config{'prefix'} . $ap::config->{sbindir}/sendmail -oi -t -odq); + open(SENDMAIL, '|' . $Kolab::config{'prefix'} . $ap::config->{sbindir} . '/sendmail -oi -t -odq'); $mesg->print(\*SENDMAIL); close(SENDMAIL); } From cvs at intevation.de Sat Jun 11 11:46:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 11:46:48 2005 Subject: martin: server/imap - New directory Message-ID: <20050611094646.A64A91006BA@lists.intevation.de> Author: martin Update of /kolabrepository/server/imap In directory doto:/tmp/cvs-serv28461/imap Log Message: Directory /kolabrepository/server/imap added to the repository From cvs at intevation.de Sat Jun 11 18:40:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 18:40:26 2005 Subject: martin: server/kolabd/kolabd kolab2.schema,1.11,1.12 Message-ID: <20050611164025.A95991006A5@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv1661 Modified Files: kolab2.schema Log Message: Martin K.: Adding support for future LDAP based sieve variables. (This is much better than parsing sieve scripts and in addition allows to close the insecure (no TLS available) sieve tcp port to the outside) Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- kolab2.schema 10 Jun 2005 23:54:37 -0000 1.11 +++ kolab2.schema 11 Jun 2005 16:40:23 -0000 1.12 @@ -163,6 +163,113 @@ SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) +# Begin date of Kolab vacation period. Sender will +# be notified every kolabVacationResendIntervall days +# that recipient is absent until kolabVacationEnd. +# Values in this syntax are encoded as printable strings, +# represented as specified in X.208. +# Note that the time zone must be specified. +# For Kolab we limit ourself to GMT +# YYYYMMDDHHMMZ e.g. 200512311458Z. +# see also: rfc 2252. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.8 + NAME 'kolabVacationBeginDateTime' + DESC 'Begin date of vacation' + EQUALITY generalizedTimeMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 ) + +# End date of Kolab vacation period. Sender will +# be notified every kolabVacationResendIntervall days +# that recipient is absent starting from kolabVacationBeginDateTime. +# Values in this syntax are encoded as printable strings, +# represented as specified in X.208. +# Note that the time zone must be specified. +# For Kolab we limit ourself to GMT +# YYYYMMDDHHMMZ e.g. 200601012258Z. +# see also: rfc 2252. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.9 + NAME 'kolabVacationEndDateTime' + DESC 'End date of vacation' + EQUALITY generalizedTimeMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 ) + +# Intervall in days after which senders get +# another vacation message. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.10 + NAME 'kolabVacationResendInterval' + DESC 'Vacation notice interval in days' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27) + +# Email recipient addresses which are handled by the +# vacation script. There can be multiple kolabVacationAddress +# entries for each kolabInetOrgPerson. +# Default is the primary email address and all +# email aliases of the kolabInetOrgPerson. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.11 + NAME 'kolabVacationAddress' + DESC 'Email address for vacation to response upon' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +# Enable sending vacation notices in reaction +# unsolicited commercial email. +# Default is no. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.12 + NAME 'kolabVacationReplyToUCE' + DESC 'Enable vacation notices to UCE' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7) + +# Email recipient domains which are handled by the +# vacation script. There can be multiple kolabVacationReactDomain +# entries for each kolabInetOrgPerson +# Default is to handle all domains. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.13 + NAME 'kolabVacationReactDomain' + DESC 'Multivalued -- Email domain for vacation to response upon' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +# Forward all incoming emails except UCE if kolabForwardUCE +# is not set to this email address. +# There can be multiple kolabForwardAddress entries for +# each kolabInetOrgPerson. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.14 + NAME 'kolabForwardAddress' + DESC 'Forward email to this address' + EQUALITY caseIgnoreIA5Match + SUBSTR caseIgnoreIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + +# Keep local copy when forwarding emails to list of +# kolabForwardAddress. +# Default is no. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.15 + NAME 'kolabForwardKeepCopy' + DESC 'Keep copy when forwarding' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + +# Enable forwarding of UCE. +# Default is yes. +# Currently this attribute is not used in Kolab. +attributetype ( 1.3.6.1.4.1.19419.1.1.1.16 + NAME 'kolabForwardUCE' + DESC 'Enable forwarding of mails known as UCE' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + ###################### # postfix attributes # ###################### @@ -428,6 +535,15 @@ kolabInvitationPolicy $ kolabFreeBusyFuture $ calFBURL $ + kolabVacationBeginDateTime $ + kolabVacationEndDateTime $ + kolabVacationResendInterval $ + kolabVacationAddress $ + kolabVacationReplyToUCE $ + kolabVacationReactDomain $ + kolabForwardAddress $ + kolabForwardKeepCopy $ + kolabForwardUCE $ kolabDeleteflag ) ) # kolab organization with country support From cvs at intevation.de Sat Jun 11 18:52:43 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jun 11 18:52:45 2005 Subject: martin: server/imap Makefile, NONE, 1.1 README, NONE, 1.1 imap.annotate.patch, NONE, 1.1 kolab.patch, NONE, 1.1 Message-ID: <20050611165243.990761006A5@lists.intevation.de> Author: martin Update of /kolabrepository/server/imap In directory doto:/tmp/cvs-serv2132/imap Added Files: Makefile README imap.annotate.patch kolab.patch Log Message: Martin Konold: Initial work for makeing a Kolab specific version of University of Washington c-client imap library. Adding support for IMAP ANNOTATEMORE --- NEW FILE: Makefile --- ifeq "x$(KOLABPKGURI)" "x" KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC endif ifeq "x$(KOLABRPMSRC)" "x" KOLABRPMSRC = /kolab/RPM/SRC endif ifeq "x$(KOLABCVSDIR)" "x" KOLABCVSDIR = $(CURDIR) endif PACKAGE=imap VERSION=2004a RELEASE=2.2.0_kolab1 RPM=/kolab/bin/openpkg rpm all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for imap.spec cp $(KOLABCVSDIR)/imap.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch to add annotate support cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_annotate yes' imap-$(VERSION)-$(RELEASE).src.rpm: wget -c $(KOLABPKGURI)/imap-$(VERSION)-$(RELEASE).src.rpm clean: rm -rf /kolab/RPM/TMP/imap-* --- NEW FILE: README --- maintain patches for the openpkg imap source rpm to build imap for kolab run make Patches maintained here: ======================== imap_annotation.patch: Add support for IMAP annotations to UW library. This patch already committed upstream kolab.patch: Patch to the OpenPKG specfile Needs be send upstream to the OpenPKG people --- NEW FILE: imap.annotate.patch --- diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.c imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.c --- imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.c 2005-05-26 08:09:54.000000000 +0200 +++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.c 2005-06-06 11:07:01.000000000 +0200 @@ -125,7 +125,8 @@ #define MULTIAPPEND 13 #define SNLIST 14 #define MULTIAPPENDREDO 15 - +#define QLIST 16 +#define QSTRING 17 /* Append data */ @@ -195,12 +196,15 @@ void imap_gc_body (BODY *body); void imap_capability (MAILSTREAM *stream); long imap_acl_work (MAILSTREAM *stream,char *command,IMAPARG *args[]); +long imap_annotation_work (MAILSTREAM *stream,char *command,IMAPARG *args[]); IMAPPARSEDREPLY *imap_send (MAILSTREAM *stream,char *cmd,IMAPARG *args[]); IMAPPARSEDREPLY *imap_sout (MAILSTREAM *stream,char *tag,char *base,char **s); long imap_soutr (MAILSTREAM *stream,char *string); IMAPPARSEDREPLY *imap_send_astring (MAILSTREAM *stream,char *tag,char **s, SIZEDTEXT *as,long wildok,char *limit); +IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s, + SIZEDTEXT *as,char *limit); IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s, STRING *st); IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base, @@ -2679,6 +2683,84 @@ args[0] = &ambx; args[1] = NIL; return imap_acl_work (stream,"GETACL",args); } + +/* IMAP set annotation + * Accepts: mail stream + * annotation struct + * Returns: T on success, NIL on failure + */ + +long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation) +{ + IMAPARG *args[4],ambx,apth,aval; + long ret; + + ambx.type = ASTRING; + ambx.text = (void *) annotation->mbox; + args[0] = &ambx; + + apth.type = QSTRING; + apth.text = (void *) annotation->entry; + args[1] = &apth; + + STRINGLIST *st,*l; + ANNOTATION_VALUES *v; + + l = st = mail_newstringlist(); + v = annotation->values; + while(v){ + l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->attr))); + l->next = mail_newstringlist(); + l = l->next; + l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->value))); + if(v->next){ + l->next = mail_newstringlist(); + l = l->next; + } + v = v->next; + } + + aval.type = QLIST; + aval.text = (void *)st; + args[2] = &aval; + args[3] = NIL; + + ret = imap_annotation_work(stream, "SETANNOTATION",args); + mail_free_stringlist(&st); + return ret; +} + + + +/* IMAP get annotation + * Accepts: mail stream + * mailbox name + * annotation entry list + * annotation attribute list + * Returns: T on success with data returned via callback, NIL on failure + */ + +long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries, STRINGLIST *attributes) +{ + IMAPARG *args[4],ambx,apth,aattr; + long ret; + ambx.type = ASTRING; + ambx.text = (void*) mailbox; + args[0] = &ambx; + + + apth.type = QLIST; + apth.text = (void*) entries; + args[1] = &apth; + + aattr.type = QLIST; + aattr.text = (void*) attributes; + args[2] = &aattr; + + args[3] = NIL; + ret = imap_annotation_work(stream, "GETANNOTATION",args); + return ret; +} /* IMAP list rights * Accepts: mail stream @@ -2731,6 +2813,16 @@ else mm_log ("ACL not available on this IMAP server",ERROR); return ret; } + long imap_annotation_work(MAILSTREAM *stream, char *command,IMAPARG *args[]) +{ + long ret = NIL; + IMAPPARSEDREPLY *reply; + if (imap_OK (stream,reply = imap_send (stream,command,args))) + ret = LONGT; + else mm_log (reply->text,ERROR); + return ret; +} + /* IMAP set quota * Accepts: mail stream @@ -2863,6 +2955,11 @@ if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND)) return reply; break; + case QSTRING: /* atom or string, must be literal? */ + st.size = strlen ((char *) (st.data = (unsigned char *) arg->text)); + if (reply = imap_send_qstring (stream,tag,&s,&st,CMDBASE+MAXCOMMAND)) + return reply; + break; case LITERAL: /* literal, as a stringstruct */ if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply; break; @@ -2879,6 +2976,18 @@ while (list = list->next); *s++ = ')'; /* close list */ break; + case QLIST: /* list of strings */ + list = (STRINGLIST *) arg->text; + c = '('; /* open paren */ + do { /* for each list item */ + *s++ = c; /* write prefix character */ + if (reply = imap_send_qstring (stream,tag,&s,&list->text, + CMDBASE+MAXCOMMAND)) return reply; + c = ' '; /* prefix character for subsequent strings */ + } + while (list = list->next); + *s++ = ')'; /* close list */ + break; case SEARCHPROGRAM: /* search program */ if (reply = imap_send_spgm (stream,tag,CMDBASE,&s,arg->text, CMDBASE+MAXCOMMAND)) @@ -3046,6 +3155,32 @@ mail_unlock (stream); /* unlock stream */ return reply; } + +/* IMAP send quoted-string + * Accepts: MAIL stream + * reply tag + * pointer to current position pointer of output bigbuf + * atom-string to output + * maximum to write as atom or qstring + * Returns: error reply or NIL if success + */ + +IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s, + SIZEDTEXT *as,char *limit) +{ + unsigned long j; + char c; + STRING st; + /* in case needed */ + INIT (&st,mail_string,(void *) as->data,as->size); + /* always write literal if no space */ + if ((*s + as->size) > limit) return imap_send_literal (stream,tag,s,&st); + + *(*s)++ = '"'; /* write open quote */ + for (j = 0; j < as->size; j++) *(*s)++ = as->data[j]; + *(*s)++ = '"'; /* write close quote */ + return NIL; +} /* IMAP send atom-string * Accepts: MAIL stream @@ -3948,6 +4083,50 @@ } } + else if (!strcmp (reply->key,"ANNOTATION") && (s = reply->text)){ + char * mbox; + /* response looks like ANNOTATION "mailbox" "entry" ("attr" "value" ["attr" "value"]) ["entry" ("attr "value" ["attr" "value"] )]*/ + getannotation_t an = (getannotation_t) mail_parameters (NIL,GET_ANNOTATION,NIL); + + mbox = imap_parse_astring (stream, &s, reply,NIL); + + while(*s){ + ANNOTATION * al = mail_newannotation(); + al->mbox = cpystr(mbox); + t = imap_parse_astring (stream, &s, reply,NIL); + al->entry = t; + STRINGLIST *strlist; + if (s){while (*s == ' ')s++;} + + strlist = imap_parse_stringlist(stream, &s,reply); + + ANNOTATION_VALUES *vlIter, *vlBegin; + vlIter = vlBegin = NIL; + if (strlist) { + while(strlist){ + if(vlIter){ + vlIter->next = mail_newannotationvalue(); + vlIter = vlIter->next; + }else{ + vlIter = mail_newannotationvalue(); + vlBegin = vlIter; + } + if ( strlist->text.size ) + vlIter->attr = cpystr (strlist->text.data); + strlist = strlist->next; + if(!strlist) continue; + if ( strlist->text.size ) + vlIter->value = cpystr (strlist->text.data); + strlist = strlist->next; + } + } + al->values = vlBegin; + if (an) + (*an) (stream,al); + mail_free_annotation(&al); + } + fs_give ((void **)&mbox); + } else if (!strcmp (reply->key,"ACL") && (s = reply->text) && (t = imap_parse_astring (stream,&s,reply,NIL))) { getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL); diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.h imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.h --- imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.h 2005-04-07 20:40:17.000000000 +0200 +++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.h 2005-06-03 14:22:14.000000000 +0200 @@ -232,3 +232,5 @@ long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits); long imap_getquota (MAILSTREAM *stream,char *qroot); long imap_getquotaroot (MAILSTREAM *stream,char *mailbox); +long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes); +long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation); diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.c imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.c --- imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.c 2005-03-17 01:12:17.000000000 +0100 +++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.c 2005-06-06 10:36:04.000000000 +0200 @@ -60,6 +60,7 @@ static newsrcquery_t mailnewsrcquery = NIL; /* ACL results callback */ static getacl_t mailaclresults = NIL; +static getannotation_t mailannotationresults = NIL; /* list rights results callback */ static listrights_t maillistrightsresults = NIL; /* my rights results callback */ @@ -516,6 +517,11 @@ ret = (void *) (debugsensitive ? VOIDT : NIL); break; + case SET_ANNOTATION: + mailannotationresults = (getannotation_t) value; + case GET_ANNOTATION: + ret = (void *) mailannotationresults; + break; case SET_ACL: mailaclresults = (getacl_t) value; case GET_ACL: @@ -5487,7 +5493,15 @@ return (ACLLIST *) memset (fs_get (sizeof (ACLLIST)),0,sizeof (ACLLIST)); } +ANNOTATION *mail_newannotation (void) +{ + return (ANNOTATION *) memset (fs_get (sizeof (ANNOTATION)),0,sizeof(ANNOTATION)); +} +ANNOTATION_VALUES *mail_newannotationvalue (void) +{ + return (ANNOTATION_VALUES *) memset (fs_get (sizeof (ANNOTATION_VALUES)),0,sizeof(ANNOTATION_VALUES)); +} /* Mail instantiate new quotalist * Returns: new quotalist */ @@ -5810,6 +5824,25 @@ } } +static void mail_free_annotation_values(ANNOTATION_VALUES **val) +{ + if (*val) { + if ((*val)->attr) fs_give ((void**) &(*val)->attr); + if ((*val)->value) fs_give ((void**) &(*val)->value); + mail_free_annotation_values (&(*val)->next); + fs_give ((void **) val); + } +} +void mail_free_annotation(ANNOTATION **al) +{ + if (*al) { + if((*al)->mbox) fs_give ((void**) &(*al)->mbox); + if((*al)->entry) fs_give ((void**) &(*al)->entry); + if((*al)->values) + mail_free_annotation_values(&(*al)->values); + fs_give ((void **) al); + } +} /* Mail garbage collect quotalist * Accepts: pointer to quotalist pointer diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.h imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.h --- imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.h 2005-02-09 00:44:54.000000000 +0100 +++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.h 2005-06-06 10:37:59.000000000 +0200 @@ -311,6 +311,8 @@ #define SET_SNARFPRESERVE (long) 567 #define GET_INBOXPATH (long) 568 #define SET_INBOXPATH (long) 569 +#define GET_ANNOTATION (long) 570 +#define SET_ANNOTATION (long) 571 /* Driver flags */ @@ -978,6 +980,24 @@ ACLLIST *next; }; +/* ANNOTATION Response */ + +#define ANNOTATION_VALUES struct annotation_value_list + +ANNOTATION_VALUES { + char *attr; + char *value; + ANNOTATION_VALUES *next; +}; + +#define ANNOTATION struct annotation + +ANNOTATION { + char *mbox; + char *entry; + ANNOTATION_VALUES * values; +}; + /* Quota resource list */ #define QUOTALIST struct quota_list @@ -1262,6 +1282,7 @@ typedef long (*sslcertificatequery_t) (char *reason,char *host,char *cert); typedef void (*sslfailure_t) (char *host,char *reason,unsigned long flags); typedef void (*logouthook_t) (void *data); +typedef void (*getannotation_t) (MAILSTREAM *stream,ANNOTATION* annot); /* Globals */ @@ -1671,7 +1692,10 @@ SORTPGM *mail_newsortpgm (void); THREADNODE *mail_newthreadnode (SORTCACHE *sc); ACLLIST *mail_newacllist (void); +ANNOTATION* mail_newannotation(void); +ANNOTATION_VALUES* mail_newannotationvalue(void); QUOTALIST *mail_newquotalist (void); +void mail_free_annotation(ANNOTATION **a); void mail_free_body (BODY **body); void mail_free_body_data (BODY *body); void mail_free_body_parameter (PARAMETER **parameter); diff -ru imap-2004e.DEV.SNAP-0505252319/src/mtest/mtest.c imap-2004e.DEV.SNAP-0505252319_annotate/src/mtest/mtest.c --- imap-2004e.DEV.SNAP-0505252319/src/mtest/mtest.c 2005-04-07 20:40:57.000000000 +0200 +++ imap-2004e.DEV.SNAP-0505252319_annotate/src/mtest/mtest.c 2005-06-06 10:37:30.000000000 +0200 @@ -137,6 +137,8 @@ #endif return NIL; } + +void mm_annotation (MAILSTREAM *stream, ANNOTATION *a); /* MM command loop * Accepts: MAIL stream @@ -187,6 +189,28 @@ mail_setflag (stream,arg,"\\DELETED"); else puts ("?Bad message number"); break; + case 'A': + { + char parms[MAILTMPLEN]; + prompt("Annotation: ",parms); + if (parms) { + mail_parameters(stream,SET_ANNOTATION,mm_annotation); + STRINGLIST *entries = mail_newstringlist(); + STRINGLIST *cur = entries; + cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr (parms))); + cur->next = NIL; + + STRINGLIST *attributes = mail_newstringlist(); + cur = attributes; + cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr ("*"))); + cur->next = NIL; + + imap_getannotation(stream,"INBOX",entries,attributes); + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + } + } + break; case 'E': /* Expunge command */ mail_expunge (stream); last = 0; @@ -339,7 +363,7 @@ case '?': /* ? command */ puts ("Body, Check, Delete, Expunge, Find, GC, Headers, Literal,"); puts (" MailboxStatus, New Mailbox, Overview, Ping, Quit, Send, Type,"); - puts ("Undelete, Xit, +, -, or for next message"); + puts ("Undelete, Xit,Annotation, +, -, or for next message"); break; default: /* bogus command */ printf ("?Unrecognized command: %s\n",cmd); @@ -587,6 +611,18 @@ /* Interfaces to C-client */ +void mm_annotation (MAILSTREAM *stream, ANNOTATION *a) +{ + if(a){ + fprintf(stderr,"mailbox: %s\nentry: %s\n",a->mbox,a->entry); + ANNOTATION_VALUES * v = a->values; + while(v){ + fprintf(stderr,"attr: %s, value: %s\n",v->attr,v->value); + v = v->next; + } + } +} + void mm_searched (MAILSTREAM *stream,unsigned long number) { --- NEW FILE: kolab.patch --- --- imap.spec.orig 2005-06-11 13:19:01.000000000 +0200 +++ imap.spec 2005-06-11 18:45:54.000000000 +0200 @@ -39,16 +39,18 @@ Group: Mail License: University of Washington's Free-Fork License Version: %{V_here} -Release: 2.2.0 +Release: 2.2.0_kolab1 # package options %option with_ssl yes %option with_pam no %option with_daemons no %option with_mbxdef no +%option with_annotate no # list of sources Source0: ftp://ftp.cac.washington.edu/imap/imap-%{V_real}.tar.Z +Patch0: imapd.patch # build information Prefix: %{l_prefix} @@ -83,6 +85,10 @@ %prep %setup -q -n imap-%{V_real} +%if "%{with_annotate}" == "yes" + %patch -p0 -P 0 +%endif + %build mflags="%{l_mflags}" cflags="%{l_cflags}" From cvs at intevation.de Mon Jun 13 19:37:19 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 13 19:37:19 2005 Subject: martin: doc/architecture freebusy.txt,1.13,1.14 Message-ID: <20050613173719.358691006C1@lists.intevation.de> Author: martin Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv19042/architecture Modified Files: freebusy.txt Log Message: Martin Konold: Add support for deleting calendar folders with nice cleanup. Add support for alias instead of primary email address (helps for migrations and renameings of mailboxes) Index: freebusy.txt =================================================================== RCS file: /kolabrepository/doc/architecture/freebusy.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- freebusy.txt 15 Feb 2005 11:01:52 -0000 1.13 +++ freebusy.txt 13 Jun 2005 17:37:17 -0000 1.14 @@ -154,7 +154,8 @@ b) the uid c) the corresponding imap patch component of the user name (the server will try to add @maildomain to it.) - and PATH and FOLDERNAME being UTF-8 encoded IMAP foldernames. + and PATH and FOLDERNAME being UTF-8 encoded IMAP foldernames. + d) any valid email alias All pfbs are readable for every (authenticated) user though normal users don't require to read the pfbs @@ -188,14 +189,24 @@ https://servername/freebusy/group1@domain.tld.ifb https://servername/freebusy/user1@domain.tld.xfb +Deletion of Calendar folders + +When deleting a calendar folder a Kolab client must first delete all +appointments on the server and then immediately call the pfb script + + https://servername/freebusy/trigger/X/PATH/FOLDERNAME.pfb + +After calling the pfb script the Kolab client may immediately delete the emtpy +folder. + +On the other hand the server side pfb creation script MUST be able to +handle empty or unexisting calendar folders. A trigger call to an unexisting +or empty folder leads to deletion of any traces related to this folder in the pfb storage. + Future ------ For the future scheme could eventually be extend towards: - - - make it possible for clients to upload the pfb instead - of just triggering the creation. - Advantages: Put load on the client. - add referal type files for the cache hierachy that make the collector script search for an pfb elsewhere. From cvs at intevation.de Mon Jun 13 19:39:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 13 19:39:28 2005 Subject: martin: doc/architecture freebusy.txt,1.14,1.15 Message-ID: <20050613173927.63C4E1006AE@lists.intevation.de> Author: martin Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv19089/architecture Modified Files: freebusy.txt Log Message: Martin Konold: Explicitly define who is doing the encoding of the foldernames and paths Index: freebusy.txt =================================================================== RCS file: /kolabrepository/doc/architecture/freebusy.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- freebusy.txt 13 Jun 2005 17:37:17 -0000 1.14 +++ freebusy.txt 13 Jun 2005 17:39:25 -0000 1.15 @@ -154,7 +154,7 @@ b) the uid c) the corresponding imap patch component of the user name (the server will try to add @maildomain to it.) - and PATH and FOLDERNAME being UTF-8 encoded IMAP foldernames. + and PATH and FOLDERNAME being UTF-8(*) encoded IMAP foldernames. d) any valid email alias All pfbs are readable for every (authenticated) user @@ -202,6 +202,9 @@ On the other hand the server side pfb creation script MUST be able to handle empty or unexisting calendar folders. A trigger call to an unexisting or empty folder leads to deletion of any traces related to this folder in the pfb storage. + +(*) It is the job of the pfb creation script to convert the UTF-8 encoded +paths and folder names into the imapd specific nameing conventions. Future ------ From cvs at intevation.de Tue Jun 14 15:36:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 15:36:38 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy pfb.php, 1.19, 1.20 Message-ID: <20050614133637.F1796101EE0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv31377 Modified Files: pfb.php Log Message: max exec time Index: pfb.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- pfb.php 23 Feb 2005 16:34:30 -0000 1.19 +++ pfb.php 14 Jun 2005 13:36:35 -0000 1.20 @@ -19,6 +19,8 @@ */ error_reporting(E_ALL); +$max_execution_time = ini_get('max_execution_time'); +if( $max_execution_time < 200 ) ini_set('max_execution_time', '200'); require_once('freebusy/freebusyldap.class.php'); require_once('freebusy/freebusycache.class.php'); @@ -194,4 +196,4 @@ // Finish up myLog("pfb.php complete", RM_LOG_DEBUG); shutdown(); -?> \ No newline at end of file +?> From cvs at intevation.de Tue Jun 14 16:46:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 16:46:23 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.124, 1.125 Message-ID: <20050614144622.C576F1005B9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv32695 Modified Files: kolab-resource-handlers.spec Log Message: added some profiling info. That Net_IMAP parser really has a problem... Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- kolab-resource-handlers.spec 10 Jun 2005 23:54:37 -0000 1.124 +++ kolab-resource-handlers.spec 14 Jun 2005 14:46:20 -0000 1.125 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050610 +Release: 20050614 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Tue Jun 14 16:46:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 16:46:25 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.class.php, 1.26, 1.27 pfb.php, 1.20, 1.21 Message-ID: <20050614144622.CEC211005CE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv32695/kolab-resource-handlers/freebusy Modified Files: freebusy.class.php pfb.php Log Message: added some profiling info. That Net_IMAP parser really has a problem... Index: freebusy.class.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- freebusy.class.php 26 Jan 2005 07:32:31 -0000 1.26 +++ freebusy.class.php 14 Jun 2005 14:46:20 -0000 1.27 @@ -137,7 +137,9 @@ $vCal->addComponent($vFb); return array($vCal->exportvCalendar(),$vCal->exportvCalendar()); } + $getMessages_start = microtime_float(); $messages = $this->imap->getMessages(); + myLog("FreeBusy::imap->getMessages() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG); if( PEAR::isError( $messages ) ) return array( $messages, null); foreach ($messages as $textmsg) { $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg); @@ -416,4 +418,4 @@ var $imap; }; -?> \ No newline at end of file +?> Index: pfb.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- pfb.php 14 Jun 2005 13:36:35 -0000 1.20 +++ pfb.php 14 Jun 2005 14:46:20 -0000 1.21 @@ -18,6 +18,14 @@ * Project's homepage; see . */ + // Profiling +function microtime_float() { + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); +} +$start_time = microtime_float(); + + error_reporting(E_ALL); $max_execution_time = ini_get('max_execution_time'); if( $max_execution_time < 200 ) ini_set('max_execution_time', '200'); @@ -194,6 +202,6 @@ #print_r($acl); // Finish up -myLog("pfb.php complete", RM_LOG_DEBUG); +myLog("pfb.php complete, execution time was ".(microtime_float()-$start_time)." secs.", RM_LOG_DEBUG); shutdown(); ?> From cvs at intevation.de Tue Jun 14 17:45:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 17:45:54 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.class.php, 1.27, 1.28 Message-ID: <20050614154553.C7A791005DE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv1244/kolab-resource-handlers/freebusy Modified Files: freebusy.class.php Log Message: Backported tiny fix from Net_IMAP 1.0.3 (not related to performance), and avoid getMessages() in order to speed up pfb creation. creating a pfb with 1000 entries now takes about 7 secs. on my devel-box (Issue793) Index: freebusy.class.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- freebusy.class.php 14 Jun 2005 14:46:20 -0000 1.27 +++ freebusy.class.php 14 Jun 2005 15:45:51 -0000 1.28 @@ -138,10 +138,11 @@ return array($vCal->exportvCalendar(),$vCal->exportvCalendar()); } $getMessages_start = microtime_float(); - $messages = $this->imap->getMessages(); - myLog("FreeBusy::imap->getMessages() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG); + $msglist = $this->imap->getMessagesList(); + myLog("FreeBusy::imap->getMessagesList() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG); if( PEAR::isError( $messages ) ) return array( $messages, null); - foreach ($messages as $textmsg) { + foreach ($msglist as $msginfo) { + $textmsg = &$this->imap->getMsg($msginfo['msg_id']); $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg); // Read in a Kolab event object, if one exists From cvs at intevation.de Tue Jun 14 17:45:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 17:45:56 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP IMAP.php, 1.1, 1.2 IMAPProtocol.php, 1.2, 1.3 Message-ID: <20050614154553.CAC861006DD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP In directory doto:/tmp/cvs-serv1244/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP Modified Files: IMAP.php IMAPProtocol.php Log Message: Backported tiny fix from Net_IMAP 1.0.3 (not related to performance), and avoid getMessages() in order to speed up pfb creation. creating a pfb with 1000 entries now takes about 7 secs. on my devel-box (Issue793) Index: IMAP.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP/IMAP.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- IMAP.php 21 Sep 2004 14:33:23 -0000 1.1 +++ IMAP.php 14 Jun 2005 15:45:51 -0000 1.2 @@ -1484,7 +1484,7 @@ /****************************************************************** ** ** - ** ALC METHODS ** + ** ACL METHODS ** ** ** ******************************************************************/ Index: IMAPProtocol.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP/IMAPProtocol.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- IMAPProtocol.php 10 Feb 2005 22:15:22 -0000 1.2 +++ IMAPProtocol.php 14 Jun 2005 15:45:51 -0000 1.3 @@ -1535,9 +1535,6 @@ return new PEAR_Error("This IMAP server does not support ACL's! "); } $mailbox_name=sprintf("\"%s\"",$this->utf_7_encode($mailbox_name) ); - if(is_array($acl)){ - $acl=implode('',$acl); - } return $this->_genericCommand('DELETEACL', sprintf("%s \"%s\"",$mailbox_name,$user) ); } From cvs at intevation.de Tue Jun 14 18:50:59 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 18:51:00 2005 Subject: bernhard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.6, 1.7 Message-ID: <20050614165059.7821B101EE2@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv6055 Modified Files: messages.po Log Message: filled in a few blanks. Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- messages.po 19 May 2005 23:51:17 -0000 1.6 +++ messages.po 14 Jun 2005 16:50:57 -0000 1.7 @@ -1,6 +1,6 @@ # translation of kolab-messages.po to deutsch -# This file is distributed under the same license as the PACKAGE package. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# This file is distributed under the same license as Kolab-Webadmin. +# Copyright (C) # Matthias Kalle Dalheimer , 2005. # msgid "" From cvs at intevation.de Tue Jun 14 21:27:56 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 21:27:58 2005 Subject: bh: server README.1st,1.21,1.22 Message-ID: <20050614192756.0A106101EF5@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv9431 Modified Files: README.1st Log Message: - Add some generic update instructions. - move the reference to kolab.org to a better location. It somehow got mixed up in the release specific notes. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- README.1st 7 Jun 2005 16:05:23 -0000 1.21 +++ README.1st 14 Jun 2005 19:27:53 -0000 1.22 @@ -1,5 +1,7 @@ -Kolab2 Important Information -============================ +Kolab2 Server Important Information +=================================== + +For more information on Kolab, see http://www.kolab.org WARNING: For rc2 we recomment disabling the "envelope header from" check in /kolab/etc/kolab/templates/resmgr.conf.template @@ -7,20 +9,10 @@ Otherwise emails originating from your server going through an external mailinglist might not reach users inside of your domain because of Issue783. -WARNING: There's an incompatible change between Beta 1 and Beta 2. See -below for more information. - -WARNING: Check the permissions of your files in /kolab/etc/kolab/ after -installing or upgrading. Especially kolab.conf and copies shall only be -readable to the owner (usually "kolab"). - -The installation and configuration script have been changed to make sure -that the permissions are correct but there's a chance that the -permissions can still go wrong, especially if you upgrade from pre Beta -1 releases. Quick install instructions -------------------------- + For a fresh install /kolab needs to be an empty directory with enough space. You can use a symlink, but do _not_ use an NFS mounted drive. Make sure that the following names are not in /etc/passwd or /etc/groups, @@ -40,6 +32,35 @@ and follow the instructions. +General update instructions +--------------------------- + +Usually an update of the Kolab 2 server works as described here. In +some cases you will need to deviate from these instructions a bit. All +such cases are documented below, so read the release specific update +instructions for all releases newer than the one you already have before +you start the update. + +The installation of the new packages works just as for the initial +installation. Download the files as described above and run + +# ./obmtool kolab + +obmtool will usually automatically determine which packages need to be +built. Then regenerate the configuration with + +# /kolab/sbin/kolabconf + + +You may want to check the permissions of your files in /kolab/etc/kolab/ +after installing or upgrading, as there have been problems with this in +the past. Especially kolab.conf and copies shall only be readable to +the owner (usually "kolab"). The installation and configuration scripts +should make sure that the permissions are correct but there's a chance +that the permissions can still go wrong, especially if you upgrade from +pre Beta 1 releases. + + Upgrading from earlier versions ------------------------------- @@ -156,8 +177,6 @@ Distribution lists now have a mail attribute. Use an LDAP editor to fill the mail attribute for all kolabGroupOfNames objects with the email address of the distribution list. - -For more information on Kolab, see http://www.kolab.org Upgrade from RC1 From cvs at intevation.de Tue Jun 14 22:18:54 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 14 22:18:56 2005 Subject: bernhard: doc/architecture freebusy.txt,1.15,1.16 Message-ID: <20050614201854.D1449101F01@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/architecture In directory doto:/tmp/cvs-serv11228 Modified Files: freebusy.txt Log Message: Readd uploading of pdfs as future concept for privacy issues and not for performance as discussion on kolab-devel@. Martin has found out that performance on the server will scale better. Index: freebusy.txt =================================================================== RCS file: /kolabrepository/doc/architecture/freebusy.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- freebusy.txt 13 Jun 2005 17:39:25 -0000 1.15 +++ freebusy.txt 14 Jun 2005 20:18:52 -0000 1.16 @@ -210,6 +210,11 @@ ------ For the future scheme could eventually be extend towards: + - make it possible for clients to upload the pfb instead + of just triggering the creation. + Advantages: privacy issues if the calendar is stored somewhere + else, but a unified freebusy list is wanted. + - add referal type files for the cache hierachy that make the collector script search for an pfb elsewhere. From cvs at intevation.de Wed Jun 15 13:05:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 13:05:48 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.25, 1.26 Message-ID: <20050615110547.6283D101F0B@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv29743 Modified Files: kolabfilter.php Log Message: Issue783 (From rewriting) Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- kolabfilter.php 10 Jun 2005 23:54:37 -0000 1.25 +++ kolabfilter.php 15 Jun 2005 11:05:45 -0000 1.26 @@ -79,6 +79,25 @@ } register_shutdown_function( 'cleanup' ); +function is_my_domain( $addr ) { + global $params; + if( is_array($params['email_domain']) ) { + $domains = $params['email_domain']; + } else { + $domains = array($params['email_domain']); + } + + $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; + } + } + return false; +} + // Check that mail from our domains have trustable // From: header and that mail from the outside // does not impersonate any user from our domain @@ -98,22 +117,22 @@ $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 || - substr($senderdom, -strlen($domain)-1) == ".$domain" || - substr($fromdom, -strlen($domain)-1) == ".$domain" ) && - $sender != $from ) { - return false; - } + //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 || + substr($senderdom, -strlen($domain)-1) == ".$domain" || + substr($fromdom, -strlen($domain)-1) == ".$domain" ) && + $sender != $from ) { + return false; + } } else { - if( ($senderdom == $domain || - $fromdom == $domain ) && - $sender != $from ) { - return false; - } + if( ($senderdom == $domain || + $fromdom == $domain ) && + $sender != $from ) { + return false; + } } } } @@ -162,10 +181,17 @@ if( !verify_sender( strtolower($sender), strtolower($from), $client_address) ) { myLog("$sender and $from differ!", RM_LOG_DEBUG); if( $params['reject_forged_from_header'] ) { + // Always reject mismatches $senderok = false; } else { - myLog("Rewriting From header", RM_LOG_DEBUG); - $rewrittenfrom = "From: $from (UNTRUSTED, sender is \"$sender\")\r\n"; + // Only rewrite if from is ours and envelope not + if( is_my_domain( $from ) && !is_my_domain( $sender )) { + myLog("Rewriting From header", RM_LOG_DEBUG); + $rewrittenfrom = "From: $from (UNTRUSTED, sender is \"$sender\")\r\n"; + } else { + // Not our domain in From, reject + $senderok = false; + } } } } From cvs at intevation.de Wed Jun 15 13:09:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 13:09:11 2005 Subject: bh: doc/raw-howtos kolab2-on-sles9.txt,1.2,1.3 Message-ID: <20050615110910.BB972101F0B@lists.intevation.de> Author: bh Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv29839 Modified Files: kolab2-on-sles9.txt Log Message: Update for RC3. Add section with update instructions. Index: kolab2-on-sles9.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/kolab2-on-sles9.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab2-on-sles9.txt 22 Apr 2005 06:58:20 -0000 1.2 +++ kolab2-on-sles9.txt 15 Jun 2005 11:09:08 -0000 1.3 @@ -1,13 +1,17 @@ -Getting started with Kolab-2 Server on a SUSE Linux Enterprise Server 9 (SLES 9) --------------------------------------------------------------------------------- +Using Kolab-2 Server on a SUSE Linux Enterprise Server 9 (SLES 9) +----------------------------------------------------------------- $Id$ Status: - - based on Kolab-2 beta 4 - - only addressing a fresh Kolab-2 installation on a fresh SLES9 + - based on Kolab-2 RC 3 + - describes a fresh Kolab-2 installation on a fresh SLES9 + - briefly describes updates +Initial installation +-------------------- + First login to SLES9 as root, then follow the instructions below. You may adapt the steps on your own needs and expertise. @@ -18,7 +22,7 @@ # cd /tmp/kolab-download Get all files in the directory - kolab/server/beta/kolab-server-2.0-beta-4/ix86-suse9-kolab + kolab/server/beta/kolab-server-2.0-rc-3/ix86-suse9-kolab from one of the Kolab mirrors listed here: http://kolab.org/mirrors.html @@ -31,7 +35,7 @@ or from a key-server: # gpg --keyserver subkeys.pgp.net --recv-keys 133a8928 -# gpg --verify md5sums.txt.gpg +# gpg --verify md5sums.txt.sig # md5sum * | grep -v md5sum > /tmp/md5sums # diff /tmp/md5sums md5sums.txt @@ -72,3 +76,10 @@ and press "Create Distribution Lists". Now you may add more users and do any other arbitrary configuration. + + +Updating +-------- + +Download the files as described above for the initial installation. +Then follow the update instructions in 1st.README From cvs at intevation.de Wed Jun 15 13:11:45 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 13:11:46 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates service.tpl, 1.4, 1.5 Message-ID: <20050615111145.B1A91101F0B@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv29904/kolab-webadmin/php/admin/templates Modified Files: service.tpl Log Message: Attempt at explaining the weird ways of Issue783 (From rewrite) Index: service.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- service.tpl 10 Jun 2005 23:54:37 -0000 1.4 +++ service.tpl 15 Jun 2005 11:11:43 -0000 1.5 @@ -114,9 +114,9 @@

        Action to take for messages that fail the check:

        -{tr msg="Modify the From header so the user can see the potential forgery."}
        +{tr msg="Reject the message with the except if it originates from the outside but has a From header that matches the Kolab server's domain. In that case rewrite the From header so the recipient can see the potential forgery."}
        -{tr msg="Reject the message."} +{tr msg="Always reject the message."} {tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}
        From cvs at intevation.de Wed Jun 15 14:08:13 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 14:08:14 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.125, 1.126 Message-ID: <20050615120813.112061006DF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv30675 Modified Files: kolab-resource-handlers.spec Log Message: fixlets Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- kolab-resource-handlers.spec 14 Jun 2005 14:46:20 -0000 1.125 +++ kolab-resource-handlers.spec 15 Jun 2005 12:08:11 -0000 1.126 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050614 +Release: 20050615 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Wed Jun 15 14:08:13 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 14:08:16 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.class.php, 1.28, 1.29 Message-ID: <20050615120813.150DA101F0B@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv30675/kolab-resource-handlers/freebusy Modified Files: freebusy.class.php Log Message: fixlets Index: freebusy.class.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- freebusy.class.php 14 Jun 2005 15:45:51 -0000 1.28 +++ freebusy.class.php 15 Jun 2005 12:08:11 -0000 1.29 @@ -137,11 +137,14 @@ $vCal->addComponent($vFb); return array($vCal->exportvCalendar(),$vCal->exportvCalendar()); } + myLog("Reading messagelist", RM_LOG_DEBUG); $getMessages_start = microtime_float(); - $msglist = $this->imap->getMessagesList(); + $msglist = &$this->imap->getMessagesList(); + //$msglist = &$this->imap->getMessages(); myLog("FreeBusy::imap->getMessagesList() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG); - if( PEAR::isError( $messages ) ) return array( $messages, null); + if( PEAR::isError( $msglist ) ) return array( $msglist, null); foreach ($msglist as $msginfo) { + //myLog("Reading message ".$msginfo['msg_id'], RM_LOG_DEBUG); $textmsg = &$this->imap->getMsg($msginfo['msg_id']); $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg); From cvs at intevation.de Wed Jun 15 14:17:55 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 14:17:56 2005 Subject: steffen: server/kolabd kolabd.spec,1.56,1.57 Message-ID: <20050615121755.8D900101F15@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv30852 Modified Files: kolabd.spec Log Message: put php timelimit below apaches Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- kolabd.spec 10 Jun 2005 23:54:37 -0000 1.56 +++ kolabd.spec 15 Jun 2005 12:17:53 -0000 1.57 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050610 +Release: 20050615 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Wed Jun 15 14:17:55 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 14:17:58 2005 Subject: steffen: server/kolabd/kolabd/templates php.ini.template,1.3,1.4 Message-ID: <20050615121755.9270B101F18@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv30852/kolabd/templates Modified Files: php.ini.template Log Message: put php timelimit below apaches Index: php.ini.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- php.ini.template 10 Jun 2005 12:25:23 -0000 1.3 +++ php.ini.template 15 Jun 2005 12:17:53 -0000 1.4 @@ -208,8 +208,8 @@ ; Resource Limits ; ;;;;;;;;;;;;;;;;;;; -max_execution_time = 600 ; Maximum execution time of each script, in seconds -memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) +max_execution_time = 120 ; Maximum execution time of each script, in seconds +memory_limit = 16M ; Maximum amount of memory a script may consume (8MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From cvs at intevation.de Wed Jun 15 14:22:55 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 14:22:56 2005 Subject: steffen: server obmtool.conf,1.171,1.172 Message-ID: <20050615122255.5763D101F1F@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv30972 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.171 retrieving revision 1.172 diff -u -d -r1.171 -r1.172 --- obmtool.conf 11 Jun 2005 00:19:00 -0000 1.171 +++ obmtool.conf 15 Jun 2005 12:22:53 -0000 1.172 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050610"; + kolab_version="pre-2.0-snapshot-20050615"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -131,9 +131,9 @@ @install ${altloc}clamav-0.85.1-20050517 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 - @install ${altloc}kolabd-1.9.4-20050610 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050611 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20050610 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050615 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050615 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050615 --define kolab_version=$kolab_version @check if test ! -e "/usr/bin/kolab" ; then From cvs at intevation.de Wed Jun 15 16:07:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 16:07:54 2005 Subject: martin: server/imap imap.annotate.patch,1.1,1.2 Message-ID: <20050615140753.774051005DE@lists.intevation.de> Author: martin Update of /kolabrepository/server/imap In directory doto:/tmp/cvs-serv32587/imap Modified Files: imap.annotate.patch Log Message: Martin Konold: Uptodate and tested patch for UW imap c-client Index: imap.annotate.patch =================================================================== RCS file: /kolabrepository/server/imap/imap.annotate.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- imap.annotate.patch 11 Jun 2005 16:52:41 -0000 1.1 +++ imap.annotate.patch 15 Jun 2005 14:07:51 -0000 1.2 @@ -1,6 +1,6 @@ -diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.c imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.c ---- imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.c 2005-05-26 08:09:54.000000000 +0200 -+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.c 2005-06-06 11:07:01.000000000 +0200 +diff -u -r imap-2004d/src/c-client/imap4r1.c imap-2004d.annotation/src/c-client/imap4r1.c +--- imap-2004d/src/c-client/imap4r1.c 2005-04-09 01:43:31.000000000 +0200 ++++ imap-2004d.annotation/src/c-client/imap4r1.c 2005-06-06 11:20:05.490904844 +0200 @@ -125,7 +125,8 @@ #define MULTIAPPEND 13 #define SNLIST 14 @@ -27,7 +27,7 @@ IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s, STRING *st); IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base, -@@ -2679,6 +2683,84 @@ +@@ -2677,6 +2681,84 @@ args[0] = &ambx; args[1] = NIL; return imap_acl_work (stream,"GETACL",args); } @@ -112,7 +112,7 @@ /* IMAP list rights * Accepts: mail stream -@@ -2731,6 +2813,16 @@ +@@ -2729,6 +2811,16 @@ else mm_log ("ACL not available on this IMAP server",ERROR); return ret; } @@ -129,7 +129,7 @@ /* IMAP set quota * Accepts: mail stream -@@ -2863,6 +2955,11 @@ +@@ -2861,6 +2953,11 @@ if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND)) return reply; break; @@ -141,7 +141,7 @@ case LITERAL: /* literal, as a stringstruct */ if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply; break; -@@ -2879,6 +2976,18 @@ +@@ -2877,6 +2974,18 @@ while (list = list->next); *s++ = ')'; /* close list */ break; @@ -160,7 +160,7 @@ case SEARCHPROGRAM: /* search program */ if (reply = imap_send_spgm (stream,tag,CMDBASE,&s,arg->text, CMDBASE+MAXCOMMAND)) -@@ -3046,6 +3155,32 @@ +@@ -3044,6 +3153,32 @@ mail_unlock (stream); /* unlock stream */ return reply; } @@ -193,7 +193,7 @@ /* IMAP send atom-string * Accepts: MAIL stream -@@ -3948,6 +4083,50 @@ +@@ -3949,6 +4084,50 @@ } } @@ -244,18 +244,18 @@ else if (!strcmp (reply->key,"ACL") && (s = reply->text) && (t = imap_parse_astring (stream,&s,reply,NIL))) { getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL); -diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.h imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.h ---- imap-2004e.DEV.SNAP-0505252319/src/c-client/imap4r1.h 2005-04-07 20:40:17.000000000 +0200 -+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/imap4r1.h 2005-06-03 14:22:14.000000000 +0200 +diff -u -r imap-2004d/src/c-client/imap4r1.h imap-2004d.annotation/src/c-client/imap4r1.h +--- imap-2004d/src/c-client/imap4r1.h 2005-04-07 20:36:52.000000000 +0200 ++++ imap-2004d.annotation/src/c-client/imap4r1.h 2005-06-06 11:20:05.491904694 +0200 @@ -232,3 +232,5 @@ long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits); long imap_getquota (MAILSTREAM *stream,char *qroot); long imap_getquotaroot (MAILSTREAM *stream,char *mailbox); +long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes); +long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation); -diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.c imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.c ---- imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.c 2005-03-17 01:12:17.000000000 +0100 -+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.c 2005-06-06 10:36:04.000000000 +0200 +diff -u -r imap-2004d/src/c-client/mail.c imap-2004d.annotation/src/c-client/mail.c +--- imap-2004d/src/c-client/mail.c 2005-03-17 01:10:18.000000000 +0100 ++++ imap-2004d.annotation/src/c-client/mail.c 2005-06-06 11:20:05.497903794 +0200 @@ -60,6 +60,7 @@ static newsrcquery_t mailnewsrcquery = NIL; /* ACL results callback */ @@ -318,9 +318,9 @@ /* Mail garbage collect quotalist * Accepts: pointer to quotalist pointer -diff -ru imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.h imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.h ---- imap-2004e.DEV.SNAP-0505252319/src/c-client/mail.h 2005-02-09 00:44:54.000000000 +0100 -+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/c-client/mail.h 2005-06-06 10:37:59.000000000 +0200 +diff -u -r imap-2004d/src/c-client/mail.h imap-2004d.annotation/src/c-client/mail.h +--- imap-2004d/src/c-client/mail.h 2005-01-22 00:56:21.000000000 +0100 ++++ imap-2004d.annotation/src/c-client/mail.h 2005-06-06 11:20:05.500903345 +0200 @@ -311,6 +311,8 @@ #define SET_SNARFPRESERVE (long) 567 #define GET_INBOXPATH (long) 568 @@ -374,9 +374,9 @@ void mail_free_body (BODY **body); void mail_free_body_data (BODY *body); void mail_free_body_parameter (PARAMETER **parameter); -diff -ru imap-2004e.DEV.SNAP-0505252319/src/mtest/mtest.c imap-2004e.DEV.SNAP-0505252319_annotate/src/mtest/mtest.c ---- imap-2004e.DEV.SNAP-0505252319/src/mtest/mtest.c 2005-04-07 20:40:57.000000000 +0200 -+++ imap-2004e.DEV.SNAP-0505252319_annotate/src/mtest/mtest.c 2005-06-06 10:37:30.000000000 +0200 +diff -u -r imap-2004d/src/mtest/mtest.c imap-2004d.annotation/src/mtest/mtest.c +--- imap-2004d/src/mtest/mtest.c 2005-04-07 20:37:44.000000000 +0200 ++++ imap-2004d.annotation/src/mtest/mtest.c 2005-06-06 11:20:05.502903045 +0200 @@ -137,6 +137,8 @@ #endif return NIL; From cvs at intevation.de Wed Jun 15 16:15:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 16:15:10 2005 Subject: martin: server/php - New directory Message-ID: <20050615141510.3FBC71006B9@lists.intevation.de> Author: martin Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv32688/php Log Message: Directory /kolabrepository/server/php added to the repository From cvs at intevation.de Wed Jun 15 16:20:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 16:20:58 2005 Subject: martin: server/php php-getacl-backport.patch, NONE, 1.1 php-imap-annotation.patch, NONE, 1.1 php-imap-status-current.patch, NONE, 1.1 Message-ID: <20050615142057.5ADC91006B9@lists.intevation.de> Author: martin Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv32721/php Added Files: php-getacl-backport.patch php-imap-annotation.patch php-imap-status-current.patch Log Message: Martin Konold: php patches for IMAP acls, IMAP annotations and IMAP status Adding the following four new php functions: php-getacl-backport.patch:+PHP_FUNCTION(imap_getacl) php-imap-annotation.patch:+PHP_FUNCTION(imap_getannotation) php-imap-annotation.patch:+PHP_FUNCTION(imap_setannotation) php-imap-status-current.patch:+PHP_FUNCTION(imap_status_current) Kudos to Thomas J. from Konsec and Intra2Net for providing the really clean implementation and to Mirko and others for the extensive testing. --- NEW FILE: php-getacl-backport.patch --- diff -u -r php-4.3.11/ext/imap/php_imap.c php-4.3.11.getacl/ext/imap/php_imap.c --- php-4.3.11/ext/imap/php_imap.c 2005-01-25 15:23:37.000000000 +0100 +++ php-4.3.11.getacl/ext/imap/php_imap.c 2005-06-02 13:34:27.412014859 +0200 @@ -139,6 +139,7 @@ PHP_FE(imap_get_quotaroot, NULL) PHP_FE(imap_set_quota, NULL) PHP_FE(imap_setacl, NULL) + PHP_FE(imap_getacl, NULL) #endif PHP_FE(imap_mail, NULL) @@ -378,6 +379,21 @@ /* }}} */ #endif +/* {{{ mail_getacl + * + * Mail GET_ACL callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist) +{ + TSRMLS_FETCH(); + + /* walk through the ACLLIST */ + for(; alist; alist = alist->next) { + add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1); + } +} +/* }}} */ /* {{{ php_imap_init_globals */ @@ -988,6 +1004,40 @@ } /* }}} */ +/* {{{ proto array imap_getacl(resource stream_id, string mailbox) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_getacl) +{ + zval **streamind, **mailbox; + pils *imap_le_struct; + + if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + IMAPG(imap_acl_list) = return_value; + + /* set the callback for the GET_ACL function */ + mail_parameters(NIL, SET_ACL, (void *) mail_getacl); + if(!imap_getacl(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) { + php_error(E_WARNING, "c-client imap_getacl failed"); + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_acl_list) = NIL; +} +/* }}} */ + #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ diff -u -r php-4.3.11/ext/imap/php_imap.h php-4.3.11.getacl/ext/imap/php_imap.h --- php-4.3.11/ext/imap/php_imap.h 2003-06-13 16:45:36.000000000 +0200 +++ php-4.3.11.getacl/ext/imap/php_imap.h 2005-06-02 13:42:19.730013114 +0200 @@ -172,6 +172,7 @@ PHP_FUNCTION(imap_get_quotaroot); PHP_FUNCTION(imap_set_quota); PHP_FUNCTION(imap_setacl); +PHP_FUNCTION(imap_getacl); #endif @@ -202,6 +203,7 @@ unsigned long status_uidvalidity; #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) zval **quota_return; + zval *imap_acl_list; #endif ZEND_END_MODULE_GLOBALS(imap) --- NEW FILE: php-imap-annotation.patch --- diff -u -r php-4.3.11/ext/imap/php_imap.c php-4.3.11.annotations/ext/imap/php_imap.c --- php-4.3.11/ext/imap/php_imap.c 2005-06-04 22:06:19.203115601 +0200 +++ php-4.3.11.annotations/ext/imap/php_imap.c 2005-06-04 21:30:36.000000000 +0200 @@ -142,6 +142,10 @@ PHP_FE(imap_setacl, NULL) PHP_FE(imap_getacl, NULL) #endif +#if defined(HAVE_IMAP2005) + PHP_FE(imap_setannotation, NULL) + PHP_FE(imap_getannotation, NULL) +#endif PHP_FE(imap_mail, NULL) @@ -396,6 +400,27 @@ } /* }}} */ +#if defined(HAVE_IMAP2005) +/* {{{ mail_getannotation + * + * Mail GET_ANNOTATION callback + * Called via the mail_parameter function in c-client:src/c-client/mail.c + */ +void mail_getannotation(MAILSTREAM *stream, ANNOTATION *alist) +{ + ANNOTATION_VALUES *cur; + + TSRMLS_FETCH(); + + /* walk through the ANNOTATION_VALUES */ + + for(cur = alist->values; cur; cur = cur->next) { + add_assoc_stringl(IMAPG(imap_annotation_list), cur->attr, cur->value, strlen(cur->value), 1); + } +} +/* }}} */ +#endif + /* {{{ php_imap_init_globals */ static void php_imap_init_globals(zend_imap_globals *imap_globals) @@ -1041,6 +1066,122 @@ #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ +#if defined(HAVE_IMAP2005) + +/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value) + Sets an annotation for a given mailbox */ +PHP_FUNCTION(imap_setannotation) +{ + zval **streamind, **mailbox, **entry, **attr, **value; + pils *imap_le_struct; + long ret; + + // TODO: Use zend_parse_parameters here + if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &streamind, &mailbox, &entry, &attr, &value) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + convert_to_string_ex(value); + + // create annotation object + ANNOTATION *annotation = mail_newannotation(); + if (!annotation) + RETURN_FALSE; + annotation->values = mail_newannotationvalue(); + if (!annotation->values) { + mail_free_annotation(&annotation); + RETURN_FALSE; + } + + // fill in annotation values + annotation->mbox = Z_STRVAL_PP(mailbox); + annotation->entry = Z_STRVAL_PP(entry); + annotation->values->attr = Z_STRVAL_PP(attr); + annotation->values->value = Z_STRVAL_PP(value); + + ret = imap_setannotation(imap_le_struct->imap_stream, annotation); + + // make sure mail_free_annotation doesn't free our variables + annotation->mbox = NULL; + annotation->entry = NULL; + annotation->values->attr = NULL; + annotation->values->value = NULL; + mail_free_annotation(&annotation); + + RETURN_BOOL(ret); +} +/* }}} */ + +/* {{{ proto array imap_getannotation(resource stream_id, string mailbox, string entry, string attr) + Gets the ACL for a given mailbox */ +PHP_FUNCTION(imap_getannotation) +{ + zval **streamind, **mailbox, **entry, **attr; + pils *imap_le_struct; + long ret; + + if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_ex(4, &streamind, &mailbox, &entry, &attr) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_string_ex(mailbox); + convert_to_string_ex(entry); + convert_to_string_ex(attr); + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + // fillup calling parameters + STRINGLIST *entries = mail_newstringlist(); + if (!entries) + RETURN_FALSE; + + STRINGLIST *cur = entries; + cur->text.data = (unsigned char *)cpystr(Z_STRVAL_PP(entry)); + cur->text.size = Z_STRLEN_PP(entry); + cur->next = NIL; + + STRINGLIST *attributes = mail_newstringlist(); + cur = attributes; + cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr)); + cur->text.size = Z_STRLEN_PP(attr); + cur->next = NIL; + + /* initializing the special array for the return values */ + if (array_init(return_value) == FAILURE) { + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = return_value; + + /* set the callback for the GET_ANNOTATION function */ + mail_parameters(NIL, SET_ANNOTATION, (void *) mail_getannotation); + ret = imap_getannotation(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox), entries, attributes); + + mail_free_stringlist(&entries); + mail_free_stringlist(&attributes); + + if (!ret) { + zval_dtor(return_value); + RETURN_FALSE; + } + + IMAPG(imap_annotation_list) = NIL; +} +/* }}} */ + +#endif /* HAVE_IMAP2005 */ /* {{{ proto bool imap_expunge(resource stream_id) Permanently delete all messages marked for deletion */ diff -u -r php-4.3.11/ext/imap/php_imap.h php-4.3.11.annotations/ext/imap/php_imap.h --- php-4.3.11/ext/imap/php_imap.h 2005-06-04 22:06:19.206115386 +0200 +++ php-4.3.11.annotations/ext/imap/php_imap.h 2005-06-04 20:00:58.000000000 +0200 @@ -168,6 +168,9 @@ PHP_FUNCTION(imap_thread); PHP_FUNCTION(imap_timeout); +// TODO: Needs fixing in configure in +#define HAVE_IMAP2005 1 + #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) PHP_FUNCTION(imap_get_quota); PHP_FUNCTION(imap_get_quotaroot); @@ -175,7 +178,10 @@ PHP_FUNCTION(imap_setacl); PHP_FUNCTION(imap_getacl); #endif - +#if defined(HAVE_IMAP2005) +PHP_FUNCTION(imap_setannotation); +PHP_FUNCTION(imap_getannotation); +#endif ZEND_BEGIN_MODULE_GLOBALS(imap) char *imap_user; @@ -206,6 +212,9 @@ zval **quota_return; zval *imap_acl_list; #endif +#if defined(HAVE_IMAP2005) + zval *imap_annotation_list; +#endif ZEND_END_MODULE_GLOBALS(imap) #ifdef ZTS --- NEW FILE: php-imap-status-current.patch --- diff -u -r -p ext/imap/php_imap.c ext.imap/imap/php_imap.c --- ext/imap/php_imap.c Tue Jan 25 15:23:37 2005 +++ ext.imap/imap/php_imap.c Wed Jun 1 17:35:41 2005 @@ -115,6 +115,7 @@ function_entry imap_functions[] = { PHP_FE(imap_binary, NULL) PHP_FE(imap_utf8, NULL) PHP_FE(imap_status, NULL) + PHP_FE(imap_status_current, NULL) PHP_FE(imap_mailboxmsginfo, NULL) PHP_FE(imap_setflag_full, NULL) PHP_FE(imap_clearflag_full, NULL) @@ -2548,6 +2549,42 @@ PHP_FUNCTION(imap_msgno) convert_to_long_ex(msgno); RETURN_LONG(mail_msgno(imap_le_struct->imap_stream, Z_LVAL_PP(msgno))); +} +/* }}} */ + +/* {{{ proto object imap_status_current(resource stream_id, int options) + Get (cached) status info from current mailbox */ +PHP_FUNCTION(imap_status_current) +{ + zval **streamind, **pflags; + pils *imap_le_struct; + long flags = 0L; + + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &pflags) == FAILURE) { + ZEND_WRONG_PARAM_COUNT(); + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); + + convert_to_long_ex(pflags); + flags = Z_LVAL_PP(pflags); + + if (object_init(return_value) == FAILURE) { + RETURN_FALSE; + } + + if (flags & SA_MESSAGES) { + add_property_long(return_value, "messages", imap_le_struct->imap_stream->nmsgs); + } + if (flags & SA_RECENT) { + add_property_long(return_value, "recent", imap_le_struct->imap_stream->recent); + } + if (flags & SA_UIDNEXT) { + add_property_long(return_value, "uidnext", imap_le_struct->imap_stream->uid_last+1); + } + if (flags & SA_UIDVALIDITY) { + add_property_long(return_value, "uidvalidity", imap_le_struct->imap_stream->uid_validity); + } } /* }}} */ diff -u -r -p ext/imap/php_imap.h ext.imap/imap/php_imap.h --- ext/imap/php_imap.h Fri Jun 13 16:45:36 2003 +++ ext.imap/imap/php_imap.h Wed Jun 1 17:35:49 2005 @@ -151,6 +151,7 @@ PHP_FUNCTION(imap_lsub); PHP_FUNCTION(imap_lsub_full); PHP_FUNCTION(imap_create); PHP_FUNCTION(imap_rename); +PHP_FUNCTION(imap_status_current); PHP_FUNCTION(imap_status); PHP_FUNCTION(imap_bodystruct); PHP_FUNCTION(imap_fetch_overview); From cvs at intevation.de Wed Jun 15 16:30:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 16:30:36 2005 Subject: bh: doc/raw-howtos kolab-kde-client-on-suse91p.txt,1.2,1.3 Message-ID: <20050615143036.317401006B9@lists.intevation.de> Author: bh Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv431 Modified Files: kolab-kde-client-on-suse91p.txt Log Message: update for RC3 fix section numbering add section for updates Index: kolab-kde-client-on-suse91p.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/kolab-kde-client-on-suse91p.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab-kde-client-on-suse91p.txt 22 Apr 2005 09:11:09 -0000 1.2 +++ kolab-kde-client-on-suse91p.txt 15 Jun 2005 14:30:34 -0000 1.3 @@ -1,5 +1,5 @@ -Getting started with Kolab KDE Client on a SUSE 9.1 Professional ----------------------------------------------------------------- +Kolab KDE Client on a SUSE 9.1 Professional +------------------------------------------- $Id$ @@ -9,11 +9,16 @@ It covers the KDEPIM proko2 branch client for Kolab-2 and all Ägypten-2 components for SMIME/Sphinx email-encryption. The German localisation is included. + - Description of the update from kolab2.0-kdepim3.3-aegypten2.0-client + 1.0.0 to 1.0.2 - tested as a initial installation on a fresh SUSE 9.1P with online-updates as of 20050420. - some steps are in German +Initial Installation +-------------------- + First login to SUSE 9.1P as root, then follow the instructions below. You may adapt the steps on your own needs and expertise. @@ -53,10 +58,10 @@ packages directly: SUSEs genIS_PLAINcache can't handle this) -4. Install Kolab KDE Client +3. Install Kolab KDE Client # cd /tmp/kolab-download -# rpm -U noarch/kde3-i18n-de-3.2.1.proko2.0.beta2-0.noarch.rpm +# rpm -Uvh noarch/kde3-i18n-de-3.2.1.proko2.0.rc3-0.noarch.rpm (SUSEs genIS_PLAINcache can't handle noarch) # yast @@ -72,7 +77,7 @@ und installieren. -5. Configuration +4. Configuration New users should run "kolabwizard" first. Ask the administration of your Kolab Server about what to enter. @@ -87,7 +92,7 @@ All folders will be created for you now. -6. Known issues of version 1.0.0: +5. Known issues of version 1.0.0: - Icons for Kleopatra, KolabWizard and Kontact are missing in the menu. These tools can be executed from a shell or a user can create @@ -99,3 +104,28 @@ within Kleopatra is missing. - Some already fixed bugs in Ägypten-2 (especially keyIdentifier support) need to be incoporated in the packages. + + +Updating +-------- + +The package download, signature check and package installation works +pretty much the same way as described in points 1, 2 and 3 above. The +only difference is in the way this is handled in yast if an earlier +version of kolab2.0-kdepim3.3-aegypten2.0-client is already installed. + +In such a situation, if you try to update, you will get conflicts for +the packages the old version depended on and which were updated with the +new release. E.g. version 1.0.0 depends on kdepim3-3.3.proko2.0.beta2 +and 1.0.2 requires kdepim3-3.3.proko2.0.rc3. For some reason yast wants +to keep kdepim3 at version 3.3.proko2.0.beta2 even though a newer +version of kdepim3 is available. + +In the text mode version of yast, this can be seen in the package +dependency dialog which comes up when you start "Install and Remove +Software" ("Software installieren oder löschen" in the German version) +where may of the packages are marked with "-i-" instead of a simple "i". +You can solve the problem by selecting all of these packages and +pressing Space until it says ">" (i.e. update) instead of "-i-". After +this you still need to ignore the dependcies because of yast does not +handle kde3-i18n-de properly. From cvs at intevation.de Wed Jun 15 17:26:11 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 17:26:12 2005 Subject: bernhard: doc/www/src index.html.m4, 1.55, 1.56 newsarchive.html.m4, 1.6, 1.7 Message-ID: <20050615152611.9FE2E1006DF@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv1573 Modified Files: index.html.m4 newsarchive.html.m4 Log Message: Added client rc3 news. Archived some older news. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- index.html.m4 6 Jun 2005 10:50:20 -0000 1.55 +++ index.html.m4 15 Jun 2005 15:26:09 -0000 1.56 @@ -37,6 +37,18 @@
        + + +
        June 15th, 2005» + KDE client close to release +
        +
        +The third release candidate of the KDE Kolab2 Client based on KDE 3.3 +is public. After a short final testing period it will be declared stable. +
        +

        + +
        June 6th, 2005 » Kolab 2 Server RC 3 released @@ -48,6 +60,13 @@

        + + + + +

        + +
        June 1st, 2005 » @@ -61,6 +80,7 @@

        + '; $str .= ''; Index: ldap.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ldap.class.php 30 May 2005 11:53:35 -0000 1.23 +++ ldap.class.php 16 Jun 2005 00:32:10 -0000 1.24 @@ -346,6 +346,13 @@ } } else $count += $entries['count']; + /* Distribution lists have a mail attr now too, + so it looks like we count them twice. + For some reason I've not seen any problems + with it though, so I dare not remove the code + below... /steffen + */ + // Now count dist. lists $cn = substr( $mail, 0, strpos( $mail, '@' ) ); $filter = '(&(objectClass=kolabGroupOfNames)(cn='.$this->escape($cn).'))'; @@ -360,7 +367,7 @@ $count++; } } else $count += $entries['count']; - + debug("Got $count addresses"); $this->freeSearchResult(); From cvs at intevation.de Thu Jun 16 02:32:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 02:32:17 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.9, 1.10 Message-ID: <20050616003212.9999A1006BE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook In directory doto:/tmp/cvs-serv21018/kolab-webadmin/www/admin/addressbook Modified Files: addr.php Log Message: verification bugs (Issue804) and form elements readonly looknfeel (Issue797) Index: addr.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- addr.php 28 May 2005 20:56:05 -0000 1.9 +++ addr.php 16 Jun 2005 00:32:10 -0000 1.10 @@ -54,18 +54,43 @@ $form->entries['action']['value'] = 'save'; } +$dn=""; +if (!empty($_REQUEST['dn'])) $dn = trim($_REQUEST['dn']); + function checkuniquemail( $form, $key, $value ) { global $ldap; + global $dn; + global $action; $value = trim($value); if( $value == '' ) return ''; // OK - if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) { + $excludedn = false; + if( $action == 'save' ) $excludedn = trim($dn); + + if( $ldap->countMail( $_SESSION['base_dn'], $value, $excludedn ) > 0 ) { return _('User, vCard or distribution list with this email address already exists'); } else { return ''; } } +function checkuniquealias( $form, $key, $value ) { + global $ldap; + global $action; + global $dn; + $excludedn = false; + if( $action == 'save' ) $excludedn = trim($dn); + $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $value ) ), 'strlen') ); + $str = ''; + foreach( $lst as $alias ) { + debug( "looking at $alias, exluding $dn" ); + if( $ldap->countMail( $_SESSION['base_dn'], $alias, $excludedn ) > 0 ) { + $str .= _('Email address ').htmlentities($alias)._(' collision
        '); + } + } + return $str; +} + /**** Submenu for current page ***/ $menuitems[$sidx]['selected'] = 'selected'; $heading = ''; @@ -75,9 +100,6 @@ in_array($_REQUEST['action'],$valid_actions)) $action = trim($_REQUEST['action']); else array_push($errors, _("Error: need valid action to proceed") ); -$dn=""; -if (!empty($_REQUEST['dn'])) $dn = trim($_REQUEST['dn']); - if (!$errors && $auth->group() != 'maintainer' && $auth->group() != 'admin') array_push($errors, _("Error: You don't have the required Permissions") ); @@ -97,6 +119,7 @@ 'validation' => 'checkuniquemail' ), 'alias' => array( 'name' => _('E-Mail Aliases'), 'type' => 'textarea', + 'validation' => 'checkuniquealias', 'comment' => _('One address per line')), 'o' => array( 'name' => _('Organisation') ), 'ou' => array( 'name' => _('Organisational Unit') ), @@ -111,10 +134,9 @@ $entries['action'] = array( 'name' => 'action', 'type' => 'hidden' ); -if( $action == 'modify' || $action == 'delete' ) { - if( $_POST['dn'] ) { - $dn = $POST['dn']; - } else if( $_REQUEST['dn'] ) { +$dn = ''; +if( $action == 'modify' || $action == 'delete' || $action == 'save') { + if( $_REQUEST['dn'] ) { $dn = $_REQUEST['dn']; } else { array_push($errors, _("Error: DN required for $action operation") ); @@ -164,6 +186,7 @@ if (!$errors) { if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$addressbook_root; else $newdn = $dn; + debug("action=save, dn=$dn, newdn=$newdn
        \n"); if (strcmp($dn,$newdn) != 0) { if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) && ($entry=ldap_first_entry($ldap->connection,$result)) && @@ -232,6 +255,11 @@ } break; case 'delete': + foreach( $form->entries as $k => $v ) { + if( $v['type'] != 'hidden' ) { + $form->entries[$k]['attrs'] = 'readonly'; + } + } $result = $ldap->search( $dn, '(objectClass=*)' ); if( $result ) { $ldap_object = ldap_get_entries( $ldap->connection, $result ); From cvs at intevation.de Thu Jun 16 05:04:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 05:04:16 2005 Subject: steffen: server obmtool.conf,1.172,1.173 Message-ID: <20050616030415.078D91005D6@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23783 Modified Files: obmtool.conf Log Message: integrated patches from Martin. Had to upgrade to imap-2004c-2.3.0 because patch was rejected by 2004a-2.2.0 Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.172 retrieving revision 1.173 diff -u -d -r1.172 -r1.173 --- obmtool.conf 15 Jun 2005 12:22:53 -0000 1.172 +++ obmtool.conf 16 Jun 2005 03:04:12 -0000 1.173 @@ -72,7 +72,7 @@ @install ${loc}perl-parse-5.8.5-2.2.0 @install ${loc}perl-xml-5.8.5-2.2.0 @install ${loc}perl-www-5.8.5-2.2.0 - @install ${loc}imap-2004a-2.2.0 + @install ${altloc}imap-2004c-2.3.0_kolab --with=annotate @install ${loc}procmail-3.22-2.2.0 @install ${loc}db-4.2.52.2-2.2.0 @install ${altloc}openldap-2.2.23-2.3.0_kolab2 @@ -99,7 +99,7 @@ @install ${loc}sed-4.1.2-2.2.0 @install ${loc}libxml-2.6.14-2.2.1 @install ${loc}libxslt-1.1.11-2.2.0 # WARNING: Remove libgcrypt before building! - @install ${altloc}apache-1.3.31-2.2.3_kolab \ + @install ${altloc}apache-1.3.31-2.2.3_kolab2 \ --with=mod_auth_ldap \ --with=mod_dav \ --with=mod_php \ @@ -112,7 +112,7 @@ --with=mod_php_dom \ --with=mod_ssl \ --with=mod_php_mbstring - @install ${loc}php-4.3.9-2.2.2 \ + @install ${altloc}php-4.3.9-2.2.2_kolab \ --with=zlib \ --with=gdbm \ --with=gettext \ From cvs at intevation.de Thu Jun 16 05:04:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 05:04:18 2005 Subject: steffen: server/apache Makefile,1.15,1.16 kolab.patch,1.4,1.5 Message-ID: <20050616030415.0F7321005D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/apache In directory doto:/tmp/cvs-serv23783/apache Modified Files: Makefile kolab.patch Log Message: integrated patches from Martin. Had to upgrade to imap-2004c-2.3.0 because patch was rejected by 2004a-2.2.0 Index: Makefile =================================================================== RCS file: /kolabrepository/server/apache/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile 22 Dec 2004 00:59:13 -0000 1.15 +++ Makefile 16 Jun 2005 03:04:13 -0000 1.16 @@ -8,17 +8,21 @@ KOLABCVSDIR = $(CURDIR) endif +PACKAGE=apache VERSION=1.3.31 RELEASE=2.2.3 RPM=/kolab/bin/openpkg rpm -all: apache-$(VERSION)-$(RELEASE).src.rpm - $(RPM) -ihv apache-$(VERSION)-$(RELEASE).src.rpm +all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm + $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm - cp $(KOLABCVSDIR)/mod_auth_ldap.patch $(KOLABRPMSRC)/apache/ + cp $(KOLABCVSDIR)/mod_auth_ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/ + cp $(KOLABCVSDIR)/../php/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/ + cp $(KOLABCVSDIR)/../php/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/ + cp $(KOLABCVSDIR)/../php/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/ - cd $(KOLABRPMSRC)/apache && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba apache.spec \ + cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \ --define 'with_mod_auth_ldap yes' \ --define 'with_mod_dav yes' \ --define 'with_mod_php yes' \ @@ -31,8 +35,8 @@ --define 'with_mod_php_dom yes' \ --define 'with_mod_ssl yes' -apache-$(VERSION)-$(RELEASE).src.rpm: - wget -c $(KOLABPKGURI)/apache-$(VERSION)-$(RELEASE).src.rpm +$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: + wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm clean: - rm -rf /kolab/RPM/TMP/apache-$(VERSION)* + rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)* Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/apache/kolab.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- kolab.patch 22 Dec 2004 00:59:13 -0000 1.4 +++ kolab.patch 16 Jun 2005 03:04:13 -0000 1.5 @@ -1,23 +1,36 @@ ---- /kolab/RPM/SRC/apache/apache.spec.orig 2004-10-29 13:13:01.000000000 +0200 -+++ /kolab/RPM/SRC/apache/apache.spec 2004-11-22 14:00:41.000000000 +0100 +--- ../apache.orig/apache.spec 2004-12-16 21:23:03.000000000 +0100 ++++ apache.spec 2005-06-16 04:34:29.000000000 +0200 @@ -66,7 +66,7 @@ Class: BASE Group: Web License: ASF Version: %{V_apache} -Release: 2.2.3 -+Release: 2.2.3_kolab ++Release: 2.2.3_kolab2 # package options (suexec related) %option with_suexec yes -@@ -213,6 +213,7 @@ Patch0: apache.patch +@@ -213,6 +213,10 @@ Patch0: apache.patch Patch1: apache.patch.modowa Patch2: apache.patch.php Patch3: http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz +Patch4: mod_auth_ldap.patch ++Patch5: php-getacl-backport.patch ++Patch6: php-imap-annotation.patch ++Patch7: php-imap-status-current.patch # build information Prefix: %{l_prefix} -@@ -552,6 +553,7 @@ AutoReqProv: no +@@ -521,6 +525,9 @@ AutoReqProv: no + %if "%{with_mod_php_hardened}" == "yes" + %patch -p1 -P 3 + %endif ++ %patch -p1 -P 5 ++ %patch -p1 -P 6 ++ %patch -p0 -P 7 + ) || exit $? + %endif + %if "%{with_mod_dav}" == "yes" +@@ -552,6 +559,7 @@ AutoReqProv: no %endif %if "%{with_mod_auth_ldap}" == "yes" %setup -q -T -D -a 14 From cvs at intevation.de Thu Jun 16 05:04:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 05:04:20 2005 Subject: steffen: server/imap Makefile,1.1,1.2 kolab.patch,1.1,1.2 Message-ID: <20050616030415.134541006BE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imap In directory doto:/tmp/cvs-serv23783/imap Modified Files: Makefile kolab.patch Log Message: integrated patches from Martin. Had to upgrade to imap-2004c-2.3.0 because patch was rejected by 2004a-2.2.0 Index: Makefile =================================================================== RCS file: /kolabrepository/server/imap/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 11 Jun 2005 16:52:41 -0000 1.1 +++ Makefile 16 Jun 2005 03:04:13 -0000 1.2 @@ -9,8 +9,8 @@ endif PACKAGE=imap -VERSION=2004a -RELEASE=2.2.0_kolab1 +VERSION=2004c +RELEASE=2.3.0 RPM=/kolab/bin/openpkg rpm Index: kolab.patch =================================================================== RCS file: /kolabrepository/server/imap/kolab.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab.patch 11 Jun 2005 16:52:41 -0000 1.1 +++ kolab.patch 16 Jun 2005 03:04:13 -0000 1.2 @@ -4,8 +4,8 @@ Group: Mail License: University of Washington's Free-Fork License Version: %{V_here} --Release: 2.2.0 -+Release: 2.2.0_kolab1 +-Release: 2.3.0 ++Release: 2.3.0_kolab # package options %option with_ssl yes @@ -16,7 +16,7 @@ # list of sources Source0: ftp://ftp.cac.washington.edu/imap/imap-%{V_real}.tar.Z -+Patch0: imapd.patch ++Patch0: imap.annotate.patch # build information Prefix: %{l_prefix} @@ -25,7 +25,7 @@ %setup -q -n imap-%{V_real} +%if "%{with_annotate}" == "yes" -+ %patch -p0 -P 0 ++ %patch -p1 -P 0 +%endif + %build From cvs at intevation.de Thu Jun 16 05:04:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 05:04:22 2005 Subject: steffen: server/php Makefile,NONE,1.1 kolab.patch,NONE,1.1 Message-ID: <20050616030415.14EF71006C3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/php In directory doto:/tmp/cvs-serv23783/php Added Files: Makefile kolab.patch Log Message: integrated patches from Martin. Had to upgrade to imap-2004c-2.3.0 because patch was rejected by 2004a-2.2.0 --- NEW FILE: Makefile --- ifeq "x$(KOLABPKGURI)" "x" KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD endif ifeq "x$(KOLABRPMSRC)" "x" KOLABRPMSRC = /kolab/RPM/SRC endif ifeq "x$(KOLABCVSDIR)" "x" KOLABCVSDIR = $(CURDIR) endif PACKAGE=php VERSION=4.3.9 RELEASE=2.2.2 RPM=/kolab/bin/openpkg rpm all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm cp $(KOLABCVSDIR)/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/ cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \ --define 'with_zlib yes' \ --define 'with_gdbm yes' \ --define 'with_gettext yes' \ --define 'with_imap yes' \ --define 'with_openldap yes' \ --define 'with_pear yes' \ --define 'with_xml yes' \ --define 'with_dom yes' \ --define 'with_ssl yes' \ --define 'with_mbstring yes' $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm clean: rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)* --- NEW FILE: kolab.patch --- diff -up ../php.orig/php.spec ./php.spec --- ../php.orig/php.spec 2004-12-16 21:20:01.000000000 +0100 +++ ./php.spec 2005-06-16 04:12:51.000000000 +0200 @@ -38,7 +38,7 @@ Class: BASE Group: Language License: PHP Version: %{V_php} -Release: 2.2.2 +Release: 2.2.2_kolab # package options %option with_bc no @@ -105,6 +105,9 @@ Source0: http://static.php.net/www. Source1: php.ini Patch0: http://www.hardened-php.net/hardened-php-%{V_php_hardened}.patch.gz Patch1: php.patch +Patch2: php-getacl-backport.patch +Patch3: php-imap-annotation.patch +Patch4: php-imap-status-current.patch # build information Prefix: %{l_prefix} @@ -258,6 +261,9 @@ AutoReqProv: no %patch -p1 -P 0 %endif %patch -p0 -P 1 + %patch -p1 -P 2 + %patch -p1 -P 3 + %patch -p0 -P 4 %{l_shtool} subst \ %{l_value -s l_prefix l_rpm l_rpmtool} \ scripts/phpize.in From cvs at intevation.de Thu Jun 16 05:07:31 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 05:07:33 2005 Subject: steffen: server obmtool.conf,1.173,1.174 Message-ID: <20050616030731.D06291005D6@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv28332 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.173 retrieving revision 1.174 diff -u -d -r1.173 -r1.174 --- obmtool.conf 16 Jun 2005 03:04:12 -0000 1.173 +++ obmtool.conf 16 Jun 2005 03:07:29 -0000 1.174 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050615"; + kolab_version="pre-2.0-snapshot-20050616"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -132,7 +132,7 @@ @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 @install ${altloc}kolabd-1.9.4-20050615 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050615 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050616 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050615 --define kolab_version=$kolab_version @check From cvs at intevation.de Thu Jun 16 14:59:34 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 14:59:35 2005 Subject: bh: doc/raw-howtos kolab-kde-client-on-suse91p.txt,1.4,1.5 Message-ID: <20050616125934.080A01006CD@lists.intevation.de> Author: bh Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv16073 Modified Files: kolab-kde-client-on-suse91p.txt Log Message: remove an old version number fix a typo Index: kolab-kde-client-on-suse91p.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/kolab-kde-client-on-suse91p.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- kolab-kde-client-on-suse91p.txt 15 Jun 2005 19:53:59 -0000 1.4 +++ kolab-kde-client-on-suse91p.txt 16 Jun 2005 12:59:31 -0000 1.5 @@ -5,7 +5,7 @@ Status: - description on how to install the prepared package set - "kolab2.0-kdepim3.3-aegypten2.0-client" version 1.0.0. + "kolab2.0-kdepim3.3-aegypten2.0-client". It covers the KDEPIM proko2 branch client for Kolab-2 and all Ägypten-2 components for SMIME/Sphinx email-encryption. The German localisation is included. @@ -127,5 +127,5 @@ where may of the packages are marked with "-i-" instead of a simple "i". You can solve the problem by selecting all of these packages and pressing Space until it says ">" (i.e. update) instead of "-i-". After -this you still need to ignore the dependcies because of yast does not +this you still need to ignore the dependcies because yast does not handle kde3-i18n-de properly. From cvs at intevation.de Fri Jun 17 11:33:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 11:33:23 2005 Subject: bernhard: utils/testing send_filtertest_emails.py,1.7,1.8 Message-ID: <20050617093322.2A6C3101EE9@lists.intevation.de> Author: bernhard Update of /kolabrepository/utils/testing In directory doto:/tmp/cvs-serv13777 Modified Files: send_filtertest_emails.py Log Message: Improved username check. Index: send_filtertest_emails.py =================================================================== RCS file: /kolabrepository/utils/testing/send_filtertest_emails.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- send_filtertest_emails.py 9 Jun 2005 11:16:38 -0000 1.7 +++ send_filtertest_emails.py 17 Jun 2005 09:33:20 -0000 1.8 @@ -116,7 +116,7 @@ print >>sys.stderr, "--smtp-host missing" error = True - if '@' in username: + if not error and '@' in username: print >>sys.stderr, "error: \"@\" in username!" error = True From cvs at intevation.de Fri Jun 17 16:12:05 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 16:12:07 2005 Subject: bh: server release-notes.txt,1.13,1.14 Message-ID: <20050617141205.A8246101F15@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19444 Modified Files: release-notes.txt Log Message: Update for RC 4 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- release-notes.txt 6 Jun 2005 10:43:07 -0000 1.13 +++ release-notes.txt 17 Jun 2005 14:12:03 -0000 1.14 @@ -1,62 +1,70 @@ Release notes Kolab2 Server -(Version 20050603, Kolab server 2.0 RC 3) +(Version 20050617, Kolab server 2.0 RC 4) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. -Changes since RC 2, 20050527: +Changes since RC 3, 20050603: - - The pth package has been removed + - Some openpkg updates: - - clamav 0.83-2.3.0 -> 0.85.1-20050517 + openpkg 2.2.2-2.2.2 -> 2.2.3-2.2.3 + perl 5.8.5-2.2.1 -> 5.8.5-2.2.2 + bzip2 1.0.2-2.2.0 -> 1.0.2-2.2.1 + gzip 1.3.5-2.2.0 -> 1.3.5-2.2.1 - * new upstream version, security relevant because better detection. + - imap-2004a-2.2.0 -> imap-2004c-2.3.0_kolab + * Kolab specific version of the package with a patch that addes + support for annotations. - - openldap-2.2.23-2.3.0_kolab -> openldap-2.2.23-2.3.0_kolab2 + - imapd-2.2.12-2.3.0_kolab3 -> imapd-2.2.12-2.3.0_kolab4 - * Some more fixes to make sure that it won't use pth. - The changes in rc2 weren't enough. We hope to fix - Issue707 (occasional slapd hangs after attempted writes) - but this might break support for Solaris platforms - in favour of GNU/Linux. + * Fixing: + Issue784 (managesieve undef symbol) - * Some more performance tweaks. + - apache-1.3.31-2.2.3_kolab -> apache-1.3.31-2.2.3_kolab2 - * Run db_recover when starting openldap + - php-4.3.9-2.2.2 -> php-4.3.9-2.2.2_kolab + * KOlab specific version of the package with some patches for IMAP + ACLs, annotations and status - - postfix 2.1.5-2.2.0_kolab2 -> postfix-2.1.5-2.2.0_kolab3 + - kolabd 20050601 -> 20050615 - * Fixing: - Issue774 (null senders would cause email loss) + * Moved kolabfilter settings verify_from and allow_sender to LDAP + and some other changes related to the fix for Issue783 + * Fixing: + Issue779 (german quota warning) - - kolabd 20050526 -> 20050601 + - kolab-webadmin 20050530 -> 20050616 - * Fixing: - Issue764 (unauthenticated free/busy not allowed with legacy mode) - Issue777 (kolabconf error: cannot open legacy.conf.template) - Issue768 (added postfix virtual map template) - Issue774 (null senders would cause email loss) + * Make verify_from and allow_sender accessible from webgui. This + is part of the fix for Issue783 + * Added french translations. Doesn't work properly yet, though. - - perl-kolab 20050503 -> 20050530 + * Fixes: + Issue722 (webgui language switching) + Issue804 (addressbook collision with distribution-list) + Issue797 (better confirmation dialog for deleting distribution list) - * Fixing: - Issue764 (unauthenticated free/busy not allowed with legacy mode) - Issue768 (added postfix virtual map template) + - kolab-resource-handlers 20050520 -> 20050615 + * disable SID creation - - kolab-webadmin 20050527 -> 20050530 + * Increase the maximal execution time for php scripts - support multi-valued mynetworks + * Substantial improvement of the performance of the partial + free/busy generation (this is part of the fix for Issue793) - * Fixing - Issue769 (can create collision with external addressbook) - Issue730 (Cannot rename user in Kolab2 Admin interface) + * Fixing: + Issue778 (mail alias for free/busy retrieval) + Issue783 (envelope header from check has problems with mailinglists) + Issue793 (php aborts on long pfb creations) $Id$ From cvs at intevation.de Fri Jun 17 16:40:30 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 16:40:31 2005 Subject: steffen: server/kolabd/kolabd/templates resmgr.conf.template, 1.6, 1.7 Message-ID: <20050617144030.EC949101FAA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv19989 Modified Files: resmgr.conf.template Log Message: Issue791: Using https for fb seems to cause no ill effects Index: resmgr.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- resmgr.conf.template 10 Jun 2005 23:54:37 -0000 1.6 +++ resmgr.conf.template 17 Jun 2005 14:40:28 -0000 1.7 @@ -64,10 +64,10 @@ $params['calendar_store'] = 'Calendar'; // Where can we get free/busy information from? -$params['freebusy_url'] = 'http://@@@fqdnhostname@@@/freebusy/${USER}.xfb'; +$params['freebusy_url'] = 'https://@@@fqdnhostname@@@/freebusy/${USER}.xfb'; // PFB url to trigger creation of pfb -$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb'; +$params['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb'; // Where are we logging to? $params['log'] = 'file:@l_prefix@/var/resmgr/resmgr.log'; // File... From cvs at intevation.de Fri Jun 17 16:42:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 16:42:44 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl - New directory Message-ID: <20050617144242.47AD81005B9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl In directory doto:/tmp/cvs-serv20036/nl Log Message: Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl added to the repository From cvs at intevation.de Fri Jun 17 16:43:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 16:43:02 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES - New directory Message-ID: <20050617144301.32F74101F14@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES In directory doto:/tmp/cvs-serv20055/LC_MESSAGES Log Message: Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES added to the repository From cvs at intevation.de Fri Jun 17 16:50:34 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 16:50:36 2005 Subject: bh: server README.1st,1.22,1.23 Message-ID: <20050617145034.8B6F2101FAA@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20183 Modified Files: README.1st Log Message: Remove the now obsolete warning added for RC2 about the from header checks. They shold be working properly with RC4 Add a note about config files when updating Add RC4 specific update notes. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- README.1st 14 Jun 2005 19:27:53 -0000 1.22 +++ README.1st 17 Jun 2005 14:50:32 -0000 1.23 @@ -3,12 +3,6 @@ For more information on Kolab, see http://www.kolab.org -WARNING: For rc2 we recomment disabling the "envelope header from" check in -/kolab/etc/kolab/templates/resmgr.conf.template -set "$params['verify_from_header'] = false" and run kolabconf. -Otherwise emails originating from your server going through an external -mailinglist might not reach users inside of your domain because of Issue783. - Quick install instructions -------------------------- @@ -47,7 +41,11 @@ # ./obmtool kolab obmtool will usually automatically determine which packages need to be -built. Then regenerate the configuration with +built. If you have made changes to the configuration files in +/kolab/etc/kolab/templates/ and the new release has a new kolabd package +you may need to transfer your changes from the backups created by rpm +(the *.rpmsave) files to the new template files. Then regenerate the +configuration with # /kolab/sbin/kolabconf @@ -194,12 +192,24 @@ Therefore, fixing the mail attribute as described for the upgrade from beta5 is important if you want your old distribution lists to work. + Upgrade from RC2 ---------------- clamav will send an email Warning with unresolved configuration file conflicts. In /kolab/etc/clamav/ you can safely delete clamd.conf.rpmsave and freshclam.conf.rpmsave. Later after starting the server run kolabconf once. + + +Upgrade from RC3 +---------------- + +Nothing special really, only a note to avoid confusion. This release +uses a new openpkg base package and it's normal that obmtool lists the +.sh part as MISSSRC or MISSPKG. The .sh part is only used for the +initial install and is not required for an update. + + $Id$ From cvs at intevation.de Fri Jun 17 17:03:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 17:03:42 2005 Subject: bh: server release-notes.txt,1.14,1.15 Message-ID: <20050617150342.08C06101FA6@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv20442 Modified Files: release-notes.txt Log Message: Fix some typos combine the entries for php, imap and apache into one. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- release-notes.txt 17 Jun 2005 14:12:03 -0000 1.14 +++ release-notes.txt 17 Jun 2005 15:03:40 -0000 1.15 @@ -8,7 +8,7 @@ Changes since RC 3, 20050603: - - Some openpkg updates: + - Some openpkg security updates: openpkg 2.2.2-2.2.2 -> 2.2.3-2.2.3 perl 5.8.5-2.2.1 -> 5.8.5-2.2.2 @@ -16,21 +16,17 @@ gzip 1.3.5-2.2.0 -> 1.3.5-2.2.1 - imap-2004a-2.2.0 -> imap-2004c-2.3.0_kolab + - apache-1.3.31-2.2.3_kolab -> apache-1.3.31-2.2.3_kolab2 + - php-4.3.9-2.2.2 -> php-4.3.9-2.2.2_kolab - * Kolab specific version of the package with a patch that addes - support for annotations. + * Kolab specific versions of the packages with a patch that adds + support for annotations in cimap and its php bindings. Unused so + far. - imapd-2.2.12-2.3.0_kolab3 -> imapd-2.2.12-2.3.0_kolab4 * Fixing: Issue784 (managesieve undef symbol) - - - apache-1.3.31-2.2.3_kolab -> apache-1.3.31-2.2.3_kolab2 - - - php-4.3.9-2.2.2 -> php-4.3.9-2.2.2_kolab - - * KOlab specific version of the package with some patches for IMAP - ACLs, annotations and status - kolabd 20050601 -> 20050615 From cvs at intevation.de Fri Jun 17 17:19:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 17:19:20 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin Makefile.am, 1.19, 1.20 Message-ID: <20050617151918.46F36101FA6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv20877/kolab-webadmin Modified Files: Makefile.am Log Message: Now we speak Néeerlandais too Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile.am 15 Jun 2005 20:48:21 -0000 1.19 +++ Makefile.am 17 Jun 2005 15:19:16 -0000 1.20 @@ -160,14 +160,18 @@ PHP_LOCALE_DE_MO = php/admin/locale/de/LC_MESSAGES/messages.mo PHP_LOCALE_FR_PO = php/admin/locale/fr/LC_MESSAGES/messages.po PHP_LOCALE_FR_MO = php/admin/locale/fr/LC_MESSAGES/messages.mo +PHP_LOCALE_NL_PO = php/admin/locale/nl/LC_MESSAGES/messages.po +PHP_LOCALE_NL_MO = php/admin/locale/nl/LC_MESSAGES/messages.mo localedir = $(phpadmindir)/locale phplocalededir = $(localedir)/de/LC_MESSAGES phplocalefrdir = $(localedir)/fr/LC_MESSAGES +phplocalenldir = $(localedir)/nl/LC_MESSAGES phplocalede_DATA = $(PHP_LOCALE_DE_MO) phplocalefr_DATA = $(PHP_LOCALE_FR_MO) +phplocalenl_DATA = $(PHP_LOCALE_NL_MO) EXTRA_DIST += $(WSTOPLEVEL_FILES) \ @@ -184,7 +188,8 @@ $(PHP_INCLUDES) \ $(PHP_TEMPLATES) \ $(PHP_LOCALE_DE_PO) \ - $(PHP_LOCALE_FR_PO) + $(PHP_LOCALE_FR_PO) \ + $(PHP_LOCALE_NL_PO) install-data-hook: $(mkinstalldirs) $(DESTDIR)$(phpadmindir)/templates_c From cvs at intevation.de Fri Jun 17 17:19:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 17:19:22 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include locale.php, 1.5, 1.6 mysmarty.php, 1.7, 1.8 Message-ID: <20050617151918.4F3E6101FAE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv20877/kolab-webadmin/php/admin/include Modified Files: locale.php mysmarty.php Log Message: Now we speak Néeerlandais too Index: locale.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/locale.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- locale.php 15 Jun 2005 20:48:21 -0000 1.5 +++ locale.php 17 Jun 2005 15:19:16 -0000 1.6 @@ -31,6 +31,8 @@ "de_de" => "de_DE", "fr" => "fr_FR", "fr_fr" => "fr_FR", + "nl" => "nl_NL", + "nl_nl" => "nl_NL", "en" => "en_US", "en_gb" => "en_US", "en_us" => "en_US"); Index: mysmarty.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mysmarty.php 15 Jun 2005 20:48:21 -0000 1.7 +++ mysmarty.php 17 Jun 2005 15:19:16 -0000 1.8 @@ -60,7 +60,9 @@ array( 'name' => 'English', 'code' => 'en_US' ), array( 'name' => 'Français', - 'code' => 'fr_FR' ) + 'code' => 'fr_FR' ), + array( 'name' => 'Néerlandais', + 'code' => 'nl_NL' ) )); } }; From cvs at intevation.de Fri Jun 17 17:19:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 17:19:23 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES messages.po, NONE, 1.1 Message-ID: <20050617151918.53529101FB0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES In directory doto:/tmp/cvs-serv20877/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES Added Files: messages.po Log Message: Now we speak Néeerlandais too --- NEW FILE: messages.po --- # translation of messages.po to francais # This file is distributed under the same license as the kolab package. # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER. # Vincent Seynhaeve , 2005. # msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-06-08 12:24+0200\n" "PO-Revision-Date: 2005-06-16 19:35+0200\n" "Last-Translator: Vincent Seynhaeve \n" "Language-Team: Néerlandais \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" #: tpl_messages.php:2 [...1603 lines suppressed...] #: ../include/menu.php:99 msgid "Intevation" msgstr "Intevation" #: ../include/menu.php:101 msgid "Klarälvdalens Datakonsult" msgstr "Klarälvdalens Datakonsu" #: ../include/menu.php:103 msgid "Code Fusion" msgstr "Code Fusion" #: ../include/menu.php:105 msgid "KDE" msgstr "KDE1" #: ../include/menu.php:109 msgid "Versions" msgstr "Versies" From cvs at intevation.de Fri Jun 17 20:03:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 20:03:03 2005 Subject: bh: server/kolabd/kolabd kolab_bootstrap,1.14,1.15 Message-ID: <20050617180301.B88D6101FAE@lists.intevation.de> Author: bh Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv23292 Modified Files: kolab_bootstrap Log Message: fix a typo Index: kolab_bootstrap =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- kolab_bootstrap 10 Jun 2005 12:25:23 -0000 1.14 +++ kolab_bootstrap 17 Jun 2005 18:02:59 -0000 1.15 @@ -583,7 +583,7 @@ } print <<'EOS'; -Kolab can create an manage a certificate authority that can be +Kolab can create and manage a certificate authority that can be used to create SSL certificates for use within the Kolab environment. You can choose to skip this section if you already have certificates for the Kolab server. From cvs at intevation.de Fri Jun 17 20:41:49 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 17 20:41:50 2005 Subject: bernhard: doc/www/src index.html.m4,1.56,1.57 Message-ID: <20050617184149.91039101FAF@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv23860 Modified Files: index.html.m4 Log Message: Added server 2.0rc4 announcement. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- index.html.m4 15 Jun 2005 15:26:09 -0000 1.56 +++ index.html.m4 17 Jun 2005 18:41:47 -0000 1.57 @@ -37,6 +37,20 @@
        June 1st, 2005 » @@ -92,71 +112,6 @@ and a temporary workaround.

        - - - - -

        - - - - -
        May 11th, 2005» -Kolab-Konsortium: Enterprise Support available -
        -
        -Kolab-Konsortium (German Page), -formed by the companies -Intevation GmbH and Klarälvdalens Datakonsult AB, -started commercial support for Kolab Groupware. -The consortium aims to complement the open Kolab Project -with a standardised technical support offer in order to ensure -a sustainable development. -Individual commercial support continues to be available by several companies. -(The web-site of Kolab-Konsortium is in German, -availability of English version will be announced here.) - -

        -See the -German press release for more details. -

        - - -

        - - - -
        May 9th, 2005» -Kolab 2 Server RC 1 published. -
        -

        -The first release candidate for Kolab 2 Server is public. -Like the couple of last betas -there are only a few minor fixes and improvements in this release. -
        -

        - - - - -
        May 4th, 2005» - Kolab2 Clients out of beta. -
        -

        -The KDE Kolab2 client has been published as -"release candidate 1" tarball based on KDE 3.3. -A logical consequence of good experiences with this software -within the last months. -Get it from the download servers along with the release notes. -The release comes so late, because: -KDE packagers tend to build from stable CVS branches -and often do not rely on tarballs anyway. -

        -On a related note: Toltec 2.0 release candidate 2 is also available. -

        -

        - Index: newsarchive.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- newsarchive.html.m4 1 Jun 2005 17:38:03 -0000 1.6 +++ newsarchive.html.m4 15 Jun 2005 15:26:09 -0000 1.7 @@ -12,6 +12,64 @@

        + + + +
        May 11th, 2005» +Kolab-Konsortium: Enterprise Support available +
        +
        +Kolab-Konsortium (German Page), +formed by the companies +Intevation GmbH and Klarälvdalens Datakonsult AB, +started commercial support for Kolab Groupware. +The consortium aims to complement the open Kolab Project +with a standardised technical support offer in order to ensure +a sustainable development. +Individual commercial support continues to be available by several companies. +(The web-site of Kolab-Konsortium is in German, +availability of English version will be announced here.) + +

        +See the +German press release for more details. +

        + + +

        + + + +
        May 9th, 2005» +Kolab 2 Server RC 1 published. +
        +

        +The first release candidate for Kolab 2 Server is public. +Like the couple of last betas +there are only a few minor fixes and improvements in this release. +
        +

        + + + + +
        May 4th, 2005» + Kolab2 Clients out of beta. +
        +

        +The KDE Kolab2 client has been published as +"release candidate 1" tarball based on KDE 3.3. +A logical consequence of good experiences with this software +within the last months. +Get it from the download servers along with the release notes. +The release comes so late, because: +KDE packagers tend to build from stable CVS branches +and often do not rely on tarballs anyway. +

        +On a related note: Toltec 2.0 release candidate 2 is also available. +

        +

        From cvs at intevation.de Wed Jun 15 17:27:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 17:27:25 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr - New directory Message-ID: <20050615152724.5DDE61006DF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr In directory doto:/tmp/cvs-serv1630/fr Log Message: Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr added to the repository From cvs at intevation.de Wed Jun 15 17:27:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 17:27:33 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES - New directory Message-ID: <20050615152732.CE579101EFC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES In directory doto:/tmp/cvs-serv1643/LC_MESSAGES Log Message: Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES added to the repository From cvs at intevation.de Wed Jun 15 21:54:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 21:54:02 2005 Subject: bh: doc/raw-howtos kolab-kde-client-on-suse91p.txt,1.3,1.4 Message-ID: <20050615195401.AB01B1005B9@lists.intevation.de> Author: bh Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv6293 Modified Files: kolab-kde-client-on-suse91p.txt Log Message: Update to 1.0.3 which includes some dirmngr fixes Index: kolab-kde-client-on-suse91p.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/kolab-kde-client-on-suse91p.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolab-kde-client-on-suse91p.txt 15 Jun 2005 14:30:34 -0000 1.3 +++ kolab-kde-client-on-suse91p.txt 15 Jun 2005 19:53:59 -0000 1.4 @@ -10,7 +10,7 @@ Ägypten-2 components for SMIME/Sphinx email-encryption. The German localisation is included. - Description of the update from kolab2.0-kdepim3.3-aegypten2.0-client - 1.0.0 to 1.0.2 + 1.0.0 to 1.0.3 - tested as a initial installation on a fresh SUSE 9.1P with online-updates as of 20050420. - some steps are in German @@ -102,8 +102,8 @@ kontact or kmail is started (dbgmd-000*). - A more sensible pre-definition of the certificate status within Kleopatra is missing. -- Some already fixed bugs in Ägypten-2 (especially keyIdentifier - support) need to be incoporated in the packages. +- Some already fixed bugs in Ägypten-2 need to be incoporated in the + packages. Updating @@ -117,7 +117,7 @@ In such a situation, if you try to update, you will get conflicts for the packages the old version depended on and which were updated with the new release. E.g. version 1.0.0 depends on kdepim3-3.3.proko2.0.beta2 -and 1.0.2 requires kdepim3-3.3.proko2.0.rc3. For some reason yast wants +and 1.0.3 requires kdepim3-3.3.proko2.0.rc3. For some reason yast wants to keep kdepim3 at version 3.3.proko2.0.beta2 even though a newer version of kdepim3 is available. From cvs at intevation.de Wed Jun 15 22:48:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 22:48:24 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin Makefile.am, 1.18, 1.19 Message-ID: <20050615204823.59A5A1005B9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv10022/kolab-webadmin Modified Files: Makefile.am Log Message: French translations (Issue803). Thanks to Benoit Mortier Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile.am 18 Mar 2005 08:59:00 -0000 1.18 +++ Makefile.am 15 Jun 2005 20:48:21 -0000 1.19 @@ -155,12 +155,19 @@ .po.mo: $(MSGFMT) -o $@ $< + PHP_LOCALE_DE_PO = php/admin/locale/de/LC_MESSAGES/messages.po PHP_LOCALE_DE_MO = php/admin/locale/de/LC_MESSAGES/messages.mo +PHP_LOCALE_FR_PO = php/admin/locale/fr/LC_MESSAGES/messages.po +PHP_LOCALE_FR_MO = php/admin/locale/fr/LC_MESSAGES/messages.mo localedir = $(phpadmindir)/locale + phplocalededir = $(localedir)/de/LC_MESSAGES +phplocalefrdir = $(localedir)/fr/LC_MESSAGES + phplocalede_DATA = $(PHP_LOCALE_DE_MO) +phplocalefr_DATA = $(PHP_LOCALE_FR_MO) EXTRA_DIST += $(WSTOPLEVEL_FILES) \ @@ -176,7 +183,8 @@ $(WSUSER_FILES) \ $(PHP_INCLUDES) \ $(PHP_TEMPLATES) \ - $(PHP_LOCALE_DE_PO) + $(PHP_LOCALE_DE_PO) \ + $(PHP_LOCALE_FR_PO) install-data-hook: $(mkinstalldirs) $(DESTDIR)$(phpadmindir)/templates_c From cvs at intevation.de Wed Jun 15 22:48:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 22:48:26 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include locale.php, 1.4, 1.5 mysmarty.php, 1.6, 1.7 Message-ID: <20050615204823.5FE4D1005D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv10022/kolab-webadmin/php/admin/include Modified Files: locale.php mysmarty.php Log Message: French translations (Issue803). Thanks to Benoit Mortier Index: locale.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/locale.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- locale.php 10 Jun 2005 12:17:47 -0000 1.4 +++ locale.php 15 Jun 2005 20:48:21 -0000 1.5 @@ -29,7 +29,10 @@ // REMEMBER TO UPDATE THIS WHEN ADDING NEW LANGUAGES $a = array("de" => "de_DE", "de_de" => "de_DE", + "fr" => "fr_FR", + "fr_fr" => "fr_FR", "en" => "en_US", + "en_gb" => "en_US", "en_us" => "en_US"); // Locales must be in the format xx_YY to be recognized by xgettext Index: mysmarty.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mysmarty.php 10 Jun 2005 12:17:47 -0000 1.6 +++ mysmarty.php 15 Jun 2005 20:48:21 -0000 1.7 @@ -58,7 +58,9 @@ array( 'name' => 'Deutsch', 'code' => 'de_DE' ), array( 'name' => 'English', - 'code' => 'en_US' ) + 'code' => 'en_US' ), + array( 'name' => 'Français', + 'code' => 'fr_FR' ) )); } }; From cvs at intevation.de Wed Jun 15 22:48:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 22:48:28 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.7, 1.8 Message-ID: <20050615204823.70CC71006D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv10022/kolab-webadmin/php/admin/locale/de/LC_MESSAGES Modified Files: messages.po Log Message: French translations (Issue803). Thanks to Benoit Mortier Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- messages.po 14 Jun 2005 16:50:57 -0000 1.7 +++ messages.po 15 Jun 2005 20:48:21 -0000 1.8 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kolab-messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-19 23:10+0200\n" +"POT-Creation-Date: 2005-06-15 17:23+0200\n" "PO-Revision-Date: 2005-03-11 14:50+0100\n" "Last-Translator: Matthias Kalle Dalheimer \n" @@ -24,7 +24,7 @@ msgstr "Der Maintainer mit DN" #: tpl_messages.php:3 tpl_messages.php:9 tpl_messages.php:19 -#: tpl_messages.php:209 +#: tpl_messages.php:216 msgid "has been deleted" msgstr "wurde gelöscht" @@ -178,7 +178,7 @@ #: tpl_messages.php:29 tpl_messages.php:35 tpl_messages.php:44 #: tpl_messages.php:54 tpl_messages.php:84 tpl_messages.php:104 -#: tpl_messages.php:122 tpl_messages.php:161 +#: tpl_messages.php:122 tpl_messages.php:168 msgid "Action" msgstr "Aktion" @@ -190,12 +190,12 @@ #: tpl_messages.php:31 tpl_messages.php:38 tpl_messages.php:47 #: tpl_messages.php:57 tpl_messages.php:86 tpl_messages.php:109 -#: tpl_messages.php:125 tpl_messages.php:162 -#: ../../../www/admin/user/user.php:714 ../../../www/admin/user/user.php:752 +#: tpl_messages.php:125 tpl_messages.php:169 +#: ../../../www/admin/user/user.php:736 ../../../www/admin/user/user.php:774 #: ../../../www/admin/sharedfolder/sf.php:280 #: ../../../www/admin/administrator/admin.php:326 #: ../../../www/admin/distributionlist/list.php:298 -#: ../../../www/admin/addressbook/addr.php:232 +#: ../../../www/admin/addressbook/addr.php:244 msgid "Delete" msgstr "Löschen" @@ -477,11 +477,11 @@ #: tpl_messages.php:90 tpl_messages.php:100 tpl_messages.php:138 #: tpl_messages.php:142 tpl_messages.php:145 tpl_messages.php:148 #: tpl_messages.php:151 tpl_messages.php:155 tpl_messages.php:158 -#: tpl_messages.php:177 +#: tpl_messages.php:165 tpl_messages.php:184 msgid "Update" msgstr "Aktualisieren" -#: tpl_messages.php:91 tpl_messages.php:164 +#: tpl_messages.php:91 tpl_messages.php:171 msgid "Welcome to the Kolab administration interface" msgstr "Willkommen zur Kolab-Systemadministration" @@ -755,18 +755,52 @@ "Nachrichten aus anderen Internet-Domänen empfangen können soll." #: tpl_messages.php:159 +#, fuzzy +msgid "Mail Filter Settings" +msgstr "Meine Benutzereinstellungen" + +#: tpl_messages.php:160 +msgid "Check messages for mismatching From header and envelope from." +msgstr "" + +#: tpl_messages.php:161 +msgid "" +"Use the Sender header instead of From for the above checks if Sender is " +"present." +msgstr "" + +#: tpl_messages.php:162 +msgid "" +"Reject the message with the except if it originates from the outside but has " +"a From header that matches the Kolab server's domain. In that case rewrite " +"the From header so the recipient can see the potential forgery." +msgstr "" + +#: tpl_messages.php:163 +#, fuzzy +msgid "Always reject the message." +msgstr "Immer ablehnen" + +#: tpl_messages.php:164 +msgid "" +"Note that enabling this setting will make the server reject any mail with " +"non-matching sender and From header if the sender is an account on this " +"server. This is known to cause trouble for example with mailinglists." +msgstr "" + +#: tpl_messages.php:166 msgid "Kolab Hosts" msgstr "Kolab-Hosts" -#: tpl_messages.php:160 +#: tpl_messages.php:167 msgid "Host" msgstr "Host" -#: tpl_messages.php:163 +#: tpl_messages.php:170 msgid "Add" msgstr "Hinzufügen" -#: tpl_messages.php:165 +#: tpl_messages.php:172 msgid "" "Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are " "the main driving force behind Kolab1&2. In addition to project management " @@ -776,7 +810,7 @@ "Haupt-Triebkraft hinter Kolab1&2 waren. Neben dem Projektmanagement hat " "Intevation auch den größten Teil der Qualitätssicherung übernommen." -#: tpl_messages.php:166 +#: tpl_messages.php:173 msgid "" "Intevation GmbH is a IT-company exclusively focusing on Free Software. Its " "business units are strategic consulting, project management and geographic " @@ -786,15 +820,15 @@ "Software befaßt. Ihre Geschäftseinheiten sind die strategische Beratung, " "Projektmanagement und geografische Informationssysteme." -#: tpl_messages.php:167 +#: tpl_messages.php:174 msgid "The following people worked on Kolab for Intevation:" msgstr "Die folgenden Mitarbeiter von Intevation haben an Kolab mitgewirkt:" -#: tpl_messages.php:168 +#: tpl_messages.php:175 msgid "Vacation Notification" msgstr "Benachrichtigungen bei Abwesenheit" -#: tpl_messages.php:169 +#: tpl_messages.php:176 msgid "" "Activate vacation notification (only one of vacation, forward and delivery " "to folder can be active at any time)" @@ -803,55 +837,55 @@ "nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder " "Zustellungsordner aktiviert sein)" -#: tpl_messages.php:170 +#: tpl_messages.php:177 msgid "Resend notification only after" msgstr "Benachrichtigung erst nach" -#: tpl_messages.php:171 +#: tpl_messages.php:178 msgid "days" msgstr "Tagen erneut senden" -#: tpl_messages.php:172 +#: tpl_messages.php:179 msgid "Send responses for these addresses:" msgstr "Antworten für diese Adressen schicken:" -#: tpl_messages.php:173 +#: tpl_messages.php:180 msgid "(one address per line)" msgstr "(Eine Adresse per Zeile)" -#: tpl_messages.php:174 +#: tpl_messages.php:181 msgid "Do not send vacation replies to spam messages" msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden" -#: tpl_messages.php:175 +#: tpl_messages.php:182 msgid "Only react to mail coming from domain" msgstr "Nur auf Nachrichten reagieren, die aus dieser Domäne kommen" -#: tpl_messages.php:176 +#: tpl_messages.php:183 msgid "(leave empty for all domains)" msgstr "(freilassen für alle Domänen)" -#: tpl_messages.php:178 +#: tpl_messages.php:185 msgid "Attribute" msgstr "Attribut" -#: tpl_messages.php:179 +#: tpl_messages.php:186 msgid "Value" msgstr "Wert" -#: tpl_messages.php:180 +#: tpl_messages.php:187 msgid "Comment" msgstr "Kommentar" -#: tpl_messages.php:181 ../../../www/admin/user/user.php:358 +#: tpl_messages.php:188 ../../../www/admin/user/user.php:358 #: ../../../www/admin/maintainer/maintainer.php:155 #: ../../../www/admin/administrator/admin.php:162 -#: ../../../www/admin/addressbook/addr.php:78 +#: ../../../www/admin/addressbook/addr.php:89 msgid "First Name" msgstr "Vorname" -#: tpl_messages.php:182 tpl_messages.php:184 tpl_messages.php:186 -#: tpl_messages.php:188 ../../../www/admin/user/user.php:350 +#: tpl_messages.php:189 tpl_messages.php:191 tpl_messages.php:193 +#: tpl_messages.php:195 ../../../www/admin/user/user.php:350 #: ../../../www/admin/user/user.php:360 ../../../www/admin/user/user.php:363 #: ../../../www/admin/sharedfolder/sf.php:121 #: ../../../www/admin/maintainer/maintainer.php:149 @@ -861,35 +895,35 @@ #: ../../../www/admin/administrator/admin.php:164 #: ../../../www/admin/administrator/admin.php:167 #: ../../../www/admin/distributionlist/list.php:126 -#: ../../../www/admin/addressbook/addr.php:80 -#: ../../../www/admin/addressbook/addr.php:83 +#: ../../../www/admin/addressbook/addr.php:91 +#: ../../../www/admin/addressbook/addr.php:94 msgid "Required" msgstr "Obligatorisch" -#: tpl_messages.php:183 ../../../www/admin/user/user.php:361 +#: tpl_messages.php:190 ../../../www/admin/user/user.php:361 #: ../../../www/admin/maintainer/maintainer.php:158 #: ../../../www/admin/administrator/admin.php:165 -#: ../../../www/admin/addressbook/addr.php:81 +#: ../../../www/admin/addressbook/addr.php:92 msgid "Last Name" msgstr "Nachname" -#: tpl_messages.php:185 ../../../www/admin/user/user.php:364 +#: tpl_messages.php:192 ../../../www/admin/user/user.php:364 #: ../../../www/admin/maintainer/maintainer.php:161 #: ../../../www/admin/administrator/admin.php:168 msgid "Password" msgstr "Passwort" -#: tpl_messages.php:187 ../../../www/admin/user/user.php:368 +#: tpl_messages.php:194 ../../../www/admin/user/user.php:368 #: ../../../www/admin/maintainer/maintainer.php:165 #: ../../../www/admin/administrator/admin.php:172 msgid "Verify Password" msgstr "Passwort überprüfen" -#: tpl_messages.php:189 ../../../www/admin/user/user.php:372 +#: tpl_messages.php:196 ../../../www/admin/user/user.php:372 msgid "Primary Email Address" msgstr "Primäre E-Mail-Adresse" -#: tpl_messages.php:190 ../../../www/admin/user/user.php:349 +#: tpl_messages.php:197 ../../../www/admin/user/user.php:349 #: ../../../www/admin/user/user.php:351 #: ../../../www/admin/sharedfolder/sf.php:124 #: ../../../www/admin/maintainer/maintainer.php:148 @@ -897,91 +931,91 @@ msgid "Required, non volatile" msgstr "Obligatorisch, nicht-flüchtig" -#: tpl_messages.php:191 ../../../www/admin/user/user.php:393 -#: ../../../www/admin/addressbook/addr.php:84 +#: tpl_messages.php:198 ../../../www/admin/user/user.php:393 +#: ../../../www/admin/addressbook/addr.php:95 msgid "Title" msgstr "Titel" -#: tpl_messages.php:192 +#: tpl_messages.php:199 msgid "Email Alias" msgstr "E-Mail-Aliasnamen" -#: tpl_messages.php:193 ../../../www/admin/user/user.php:402 -#: ../../../www/admin/addressbook/addr.php:89 +#: tpl_messages.php:200 ../../../www/admin/user/user.php:402 +#: ../../../www/admin/addressbook/addr.php:101 msgid "Organisation" msgstr "Organisation" -#: tpl_messages.php:194 ../../../www/admin/user/user.php:403 -#: ../../../www/admin/addressbook/addr.php:90 +#: tpl_messages.php:201 ../../../www/admin/user/user.php:403 +#: ../../../www/admin/addressbook/addr.php:102 msgid "Organisational Unit" msgstr "Organisationseinheit" -#: tpl_messages.php:195 ../../../www/admin/user/user.php:404 -#: ../../../www/admin/addressbook/addr.php:91 +#: tpl_messages.php:202 ../../../www/admin/user/user.php:404 +#: ../../../www/admin/addressbook/addr.php:103 msgid "Room Number" msgstr "Zimmernummer" -#: tpl_messages.php:196 ../../../www/admin/user/user.php:405 -#: ../../../www/admin/addressbook/addr.php:92 +#: tpl_messages.php:203 ../../../www/admin/user/user.php:405 +#: ../../../www/admin/addressbook/addr.php:104 msgid "Street Address" msgstr "Straßenanschrift" -#: tpl_messages.php:197 ../../../www/admin/user/user.php:406 +#: tpl_messages.php:204 ../../../www/admin/user/user.php:406 msgid "Postbox" msgstr "Postfach" -#: tpl_messages.php:198 ../../../www/admin/user/user.php:407 -#: ../../../www/admin/addressbook/addr.php:94 +#: tpl_messages.php:205 ../../../www/admin/user/user.php:407 +#: ../../../www/admin/addressbook/addr.php:106 msgid "Postal Code" msgstr "Postleitzahl" -#: tpl_messages.php:199 ../../../www/admin/user/user.php:408 -#: ../../../www/admin/addressbook/addr.php:95 +#: tpl_messages.php:206 ../../../www/admin/user/user.php:408 +#: ../../../www/admin/addressbook/addr.php:107 msgid "City" msgstr "Stadt" -#: tpl_messages.php:200 ../../../www/admin/user/user.php:409 -#: ../../../www/admin/addressbook/addr.php:96 +#: tpl_messages.php:207 ../../../www/admin/user/user.php:409 +#: ../../../www/admin/addressbook/addr.php:108 msgid "Country" msgstr "Land" -#: tpl_messages.php:201 ../../../www/admin/user/user.php:410 -#: ../../../www/admin/addressbook/addr.php:97 +#: tpl_messages.php:208 ../../../www/admin/user/user.php:410 +#: ../../../www/admin/addressbook/addr.php:109 msgid "Telephone Number" msgstr "Telefonnummer" -#: tpl_messages.php:202 ../../../www/admin/user/user.php:411 -#: ../../../www/admin/addressbook/addr.php:98 +#: tpl_messages.php:209 ../../../www/admin/user/user.php:411 +#: ../../../www/admin/addressbook/addr.php:110 msgid "Fax Number" msgstr "Faxnummer" -#: tpl_messages.php:203 ../include/menu.php:45 +#: tpl_messages.php:210 ../include/menu.php:45 msgid "Addressbook" msgstr "Adressbuch" -#: tpl_messages.php:204 +#: tpl_messages.php:211 msgid "check here to make this users address
        visible in the address book" msgstr "" "Wählen Sie diese Option an, um die Adresse dieses Benutzers
        im " "Adressbuch anzuzeigen" -#: tpl_messages.php:205 +#: tpl_messages.php:212 msgid "User Quota in KB" msgstr "Plattenplatz des Benutzers in KBytes" -#: tpl_messages.php:206 ../../../www/admin/user/user.php:414 +#: tpl_messages.php:213 ../../../www/admin/user/user.php:414 msgid "Leave blank for unlimited" msgstr "Freilassen für unbegrenzten Platz" -#: tpl_messages.php:207 ../include/form.class.php:40 +#: tpl_messages.php:214 ../include/form.class.php:40 msgid "Submit" msgstr "Absenden" -#: tpl_messages.php:208 +#: tpl_messages.php:215 msgid "The administrator with DN" msgstr "Der Administrator mit DN" -#: tpl_messages.php:210 +#: tpl_messages.php:217 msgid "Back to list of administrators" msgstr "Zurück zur Liste der Administratoren" @@ -1049,8 +1083,9 @@ msgstr "endete mit" #: ../../../www/admin/user/user.php:69 -#: ../../../www/admin/distributionlist/list.php:71 -msgid "User or distribution list with this email address already exists" +#: ../../../www/admin/addressbook/addr.php:63 +#, fuzzy +msgid "User, vCard or distribution list with this email address already exists" msgstr "" "Es existiert bereits eine Benutzer oder Verteilerliste mit dieser E-Mail-" "Adresse" @@ -1086,7 +1121,7 @@ #: ../../../www/admin/maintainer/maintainer.php:137 #: ../../../www/admin/administrator/admin.php:144 #: ../../../www/admin/distributionlist/list.php:116 -#: ../../../www/admin/addressbook/addr.php:65 +#: ../../../www/admin/addressbook/addr.php:76 msgid "Error: need valid action to proceed" msgstr "Fehler: kann nicht weitermachen ohne zulässige Aktion" @@ -1095,7 +1130,7 @@ #: ../../../www/admin/maintainer/maintainer.php:143 #: ../../../www/admin/administrator/admin.php:150 #: ../../../www/admin/distributionlist/list.php:122 -#: ../../../www/admin/addressbook/addr.php:71 +#: ../../../www/admin/addressbook/addr.php:82 msgid "Error: You don't have the required Permissions" msgstr "Fehler: Sie haben die erforderlichen Zugriffsrechte nicht" @@ -1170,7 +1205,7 @@ msgstr "E-Mail-Aliasnamen" #: ../../../www/admin/user/user.php:397 -#: ../../../www/admin/addressbook/addr.php:88 +#: ../../../www/admin/addressbook/addr.php:100 msgid "One address per line" msgstr "Eine Adresse per Zeile" @@ -1198,41 +1233,47 @@ msgid "Could not encrypt password: " msgstr "Konnte Passwort nicht verschlüsseln: " -#: ../../../www/admin/user/user.php:625 ../../../www/admin/user/user.php:700 +#: ../../../www/admin/user/user.php:570 +msgid "" +"Account DN could not be modified, distribution list Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale In directory doto:/tmp/cvs-serv10022/kolab-webadmin/php/admin/locale Modified Files: extract_messages Log Message: French translations (Issue803). Thanks to Benoit Mortier Index: extract_messages =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- extract_messages 19 May 2005 13:10:24 -0000 1.3 +++ extract_messages 15 Jun 2005 20:48:21 -0000 1.4 @@ -1,4 +1,4 @@ -#! /usr/bin/perl +#!/kolab/bin/perl # This script extracts messages from the TPL files to pass along with the PHP files to xgettext # It also manages the i18n files and directory structure # 2000 by Romain Pokrzywka From cvs at intevation.de Wed Jun 15 22:48:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jun 15 22:48:31 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES messages.po, NONE, 1.1 Message-ID: <20050615204823.6CB6C1006C3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES In directory doto:/tmp/cvs-serv10022/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES Added Files: messages.po Log Message: French translations (Issue803). Thanks to Benoit Mortier --- NEW FILE: messages.po --- # translation of messages.po to # translation of messages.po to # translation of messages.po to # translation of messages.po to # translation of messages.po to # translation of messages.po to # translation of messages.po to # translation of messages.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # Benoit Mortier , 2005. # msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-06-15 17:24+0200\n" "PO-Revision-Date: 2005-06-13 18:10+0200\n" "Last-Translator: Benoit Mortier \n" [...1777 lines suppressed...] msgstr "Impossible de se connecter au serveur LDAP" #: ../include/auth.class.php:83 ../include/auth.class.php:87 msgid "Wrong username or password" msgstr "Mauvais utilisateur ou mot de passe" #: ../include/auth.class.php:92 msgid "Please log in as a valid user" msgstr "Veuillez vous connecter comme un utilisateur valide" #: ../include/ldap.class.php:53 msgid "" "Error setting LDAP protocol to v3. Please contact your system administrator" msgstr "" "Erreur lors de la négociation du protocole LDAP v3. Veuillez contacter votre " "administrateur système" #: ../include/ldap.class.php:308 msgid "LDAP Error: Can't read maintainers group: " msgstr "Erreur LDAP: Impossible de lire le groupe des mainteneurs: " From cvs at intevation.de Thu Jun 16 02:32:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 02:32:13 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin style.css, 1.6, 1.7 Message-ID: <20050616003212.956CA100164@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin In directory doto:/tmp/cvs-serv21018/kolab-webadmin/www/admin Modified Files: style.css Log Message: verification bugs (Issue804) and form elements readonly looknfeel (Issue797) Index: style.css =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- style.css 11 Mar 2005 12:05:25 -0000 1.6 +++ style.css 16 Jun 2005 00:32:10 -0000 1.7 @@ -177,3 +177,9 @@ background-color: #EEEEEE; border: 0px; } + +.ctrl { + background-color: #E0E3E0; + border: solid 1px black; + padding: .2em .5em .2em .5em; +} From cvs at intevation.de Thu Jun 16 02:32:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jun 16 02:32:15 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.17, 1.18 ldap.class.php, 1.23, 1.24 Message-ID: <20050616003212.976131005D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv21018/kolab-webadmin/php/admin/include Modified Files: form.class.php ldap.class.php Log Message: verification bugs (Issue804) and form elements readonly looknfeel (Issue797) Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- form.class.php 10 Mar 2005 21:58:19 -0000 1.17 +++ form.class.php 16 Jun 2005 00:32:10 -0000 1.18 @@ -67,16 +67,20 @@ if( !isset( $value['value'] ) ) $value['value'] = ''; switch( $value['type'] ) { case 'hidden': continue; + case 'password': + if( ereg( 'readonly', $value['attrs'] ) ) { + // If readonly, skip it -- passwords are at most write-only + break; + } case '': // Default is text $value['type'] = 'text'; case 'input': case 'text': - case 'password': $str .= '        '; $str .= ''; if( ereg( 'readonly', $value['attrs'] ) ) { - $str .= ''; + $str .= ''; } else { $str .= ''; } @@ -94,7 +98,7 @@ $str .= ''; $str .= ''; if( ereg( 'readonly', $value['attrs'] ) ) { - $str .= ''; + $str .= ''; } else { $str .= ''; } @@ -104,7 +108,11 @@ case 'checkbox': $str .= ''; $str .= ''; - $str .= ''; + if( ereg( 'readonly', $value['attrs'] ) ) { + $str .= ''; + } else { + $str .= ''; + } $str .= ''; $str .= ''."\n"; break; @@ -112,7 +120,7 @@ $str .= ''; $str .= ''; if( ereg( 'readonly', $value['attrs'] ) ) { - $str .= ''; } else { $str .= ''; $str .= ''; - $str .= ''; + } else { + $str .= ''; } - $str .= ''; - $str .= ''; - $str .= ''; + $str .= ''; $str .= ''."\n"; break; case 'resourcepolicy': // Special Kolab entry for group/resource policies debug("resourcepolicy"); + $ro = ereg( 'readonly', $value['attrs'] ); $str .= ''; $str .= ''; $str .= ''."\n"; } else { - $str .= ''; - } - $str .= ''."\n"; } - $i++; - $str .= ''."\n"; } $str .= '
        '.$value['name'].''.$value['value'].'

        '.$value['value'].'

        '.$value['name'].'

        '.htmlentities($value['value']).'

        '.htmlentities($value['value']).'

        '.$value['name'].''.($value['value']?_('Yes'):_('No')).''.$value['comment'].'
        '.$value['name'].'

        '.htmlentities($value['options'][$value['value']]). + $str .= '

        '.htmlentities($value['options'][$value['value']]). '

        '.$value['name'].''; - $str .= ''.htmlentities($value['user']).' '.$value['perm'].''; + $str .= ''; + $str .= ''.$value['comment'].''.$value['comment'].'
        '.$value['name'].''; @@ -165,30 +178,39 @@ unset($tmppol['']); ksort($tmppol); $tmppol[''] = 0; + $policies = array( _('Always accept'), + _('Always reject'), + _('Reject if conflicts'), + _('Manual if conflicts'), + _('Manual') ); foreach( $tmppol as $user => $pol ) { debug("form: ".$user." => ".$pol); - $str .= '
        '; - if( $user == 'anyone' ) { - $str .= 'Anyone'; + if( $ro ) { + if( !$user ) continue; + $str .= '
        '; + if( $user == 'anyone' ) $str .= '

        '._('Anyone').'

        '; + else $str .= '

        '.htmlentities($user).'

        '; + $str .= '

        '.$policies[$pol].'

        '; + if( $user == 'anyone' ) { + $str .= _('Anyone').''; } else { - $str .= ''."\n"; + $str .= ''; } + $str .= '

        		'.$value['comment'].'
        + + +
        June 17th, 2005» + Kolab Server 2.0 RC 4 published; security and bug fixes +
        +

        +The latest and probably last release candidate for the Kolab Server 2 +comes with two important bugfixes +and draws a few security updates from OpenPKG. After a brief testing +period it will become the stable release. +
        +

        + +
        June 15th, 2005 » KDE client close to release @@ -48,6 +62,13 @@

        + + + + + +

        +
        June 6th, 2005 » @@ -59,13 +80,6 @@ fixes a few important bugs.

        - - - - - -

        - From cvs at intevation.de Sun Jun 19 17:09:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Jun 19 17:09:49 2005 Subject: martin: server/kolab-resource-handlers freebusy-folder-deleted.patch, NONE, 1.1 Message-ID: <20050619150948.3FE751005A2@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv14302 Added Files: freebusy-folder-deleted.patch Log Message: Martin K. patch for deleting pfb information and potentially available pfb cache information if folder is already deleted in the meantime. (No need for any cron based cleanup script!) --- NEW FILE: freebusy-folder-deleted.patch --- diff -u -r freebusy/pfb.php freebusy.delete/pfb.php --- freebusy/pfb.php Mon Jun 13 17:19:12 2005 +++ freebusy.delete/pfb.php Mon Jun 13 18:21:41 2005 @@ -133,6 +133,18 @@ $rc = $fb->imapOpenMailbox(FreeBusy::imapFolderName( $imapuser, $owner, $folder, $params['email_domain'])); if( $rc === false ) { + // folder doesn't exist (anymore) + $cache->store( $owner.'/'.$folder, false, array(), "delete folder"); + $xcache->store( $owner.'/'.$folder, false, array(), "delete folder"); + + // clear IMAP cache + $imapcache = new FreeBusyIMAPCache($full_cache_dir."/", $owner, $fb->foldername); + $imapcache->cache_delete(); + + // try to unlink (parent) directory, works only if empty + $parent_folder = $full_cache_dir."/".str_replace(".", "^", $owner."/".$folder); + @rmdir($parent_folder); + notfound( "Folder: ".$fb->foldername.', '.imap_last_error()); return false; } From cvs at intevation.de Sun Jun 19 17:25:31 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Jun 19 17:25:33 2005 Subject: martin: server/kolab-resource-handlers freebusy-imap-caching.patch, NONE, 1.1 Message-ID: <20050619152531.E972F1005A2@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv14350 Added Files: freebusy-imap-caching.patch Log Message: Martin Konold: Post 2.0 code change! Basically this adds the the imap/uid mapping with a persistent cache for the result. - add imapcache and imapuid parameters to function FreeBusyRecurrance() - add cachedir parameter to function FreeBusy() - change from PEAR/IMAP to c-client in imapConnect() - change from PEAR/IMAP to c-client in imapDisconnect() - change from PEAR/IMAP to c-client in imapOpenMailbox() - change from PEAR/IMAP to c-client in imap_reopen() - change from PEAR/IMAP to c-client in getACL() - change from PEAR/IMAP to c-client in getRelevance() - change from PEAR/IMAP to c-client in class FreeBusy - add caching to class FreeBusy Kudos to Thomas Jarosch for contributing the nice and clean implementation! --- NEW FILE: freebusy-imap-caching.patch --- diff -u -r -p --new-file freebusy.clean/freebusy.class.php freebusy/freebusy.class.php --- freebusy.clean/freebusy.class.php Wed Jan 26 05:49:33 2005 +++ freebusy/freebusy.class.php Mon Jun 13 14:28:31 2005 @@ -1,8 +1,9 @@ + * Thomas Jarosch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -18,75 +19,104 @@ * Project's homepage; see . */ + /* + TODO: Looks like we don't get called for deleted folders. + Best thing would be to have a cron script which deletes + unmodified pfbs/caches after 2 months. + */ + + +require_once 'freebusy/freebusycache.class.php'; +require_once 'freebusy/freebusyimapcache.class.php'; require_once 'freebusy/recurrence.class.php'; class FreeBusyRecurrence extends Recurrence { - function FreeBusyRecurrence( &$vfb, &$extra ) { + function FreeBusyRecurrence( &$imapcache, &$imapuid, &$vfb, &$extra ) { + $this->imapcache =& $imapcache; + $this->imapuid =& $imapuid; $this->vfb =& $vfb; $this->extra =& $extra; } function setBusy( $start, $end, $duration ) { - $this->vfb->addBusyPeriod('BUSY', $start, null, $duration, $this->extra); + $this->imapcache->add_imap2fb($this->imapuid, $start, null, $duration, $this->extra); } + var $imapcache; var $vfb; var $extra; }; class FreeBusy { - function FreeBusy( $username, + function FreeBusy( $cache_dir, + $username, $password, $imaphost, + $imapoptions, $fbfuture=60, $fbpast=0 ) { + $this->cache_dir = $cache_dir; $this->username = $username; $this->password = $password; $this->imaphost = $imaphost; + $this->imapoptions = $imapoptions; $this->fbfuture = $fbfuture; $this->fbpast = $fbpast; + + $this->relevance = null; } function imapConnect() { - require_once('Net/IMAP.php'); - $this->imap = &new Net_IMAP( $this->imaphost, $this->imapport ); - #$this->imap->setDebug(true); + $this->imap_serverstring = "{".$this->imaphost.":".$this->imapport.$this->imapoptions."}"; + $this->imap = imap_open( $this->imap_serverstring, $this->username, $this->password ); return $this->imap; } function imapDisconnect() { - return $this->imap->disconnect(); - } - - function imapLogin() { - return $this->imap->login($this->username,$this->password, true, false); + return imap_close($this->imap); } function imapOpenMailbox($foldername = 'INBOX') { $this->foldername = $foldername; - $rc = $this->imap->selectMailbox( $foldername ); - $a = $this->imap->getAnnotation( '/vendor/kolab/folder-type', '*' ); + + $rc = imap_reopen($this->imap, $this->imap_serverstring . $this->foldername); + // PHP only returns false for imap_reopen() if we use an HALF_OPEN connection. doh! + if (imap_last_error() !== false) + $rc = false; + + // $a = $this->imap->getAnnotation( '/vendor/kolab/folder-type', '*' ); //myLog( "$folder has annotation: ".print_r($a,true), RM_LOG_DEBUG); + return $rc; } function getACL() { - return $this->imap->getACL(); + $imap_acls = imap_getacl($this->imap, $this->foldername); + + $rtn = array(); + while (list($user, $rights) = each($imap_acls)) + $rtn[] = array("USER" => $user, "RIGHTS" => $rights); + + return $rtn; } function getRelevance() { - $val = $this->imap->getAnnotation( '/vendor/kolab/incidences-for', 'value.shared' ); - if( PEAR::isError($val) || empty($val) ) { + // cached? + if (isset($this->relevance)) + return $this->relevance; + + $val = imap_getannotation( $this->imap, $this->foldername, '/vendor/kolab/incidences-for', 'value.shared' ); + if( $val === false || empty($val) ) { myLog("No /vendor/kolab/incidences-for found for ".$this->foldername, RM_LOG_DEBUG); - return 'admins'; + $this->relevance = "admins"; } else { myLog("/vendor/kolab/incidences-for = ".print_r($val,true)." for ".$this->foldername, RM_LOG_DEBUG); - return $val; } + + return $this->relevance; } function &generateFreeBusy($startstamp = NULL, $endstamp = NULL ) { - require_once 'PEAR.php'; require_once 'Horde/iCalendar.php'; require_once 'Horde/MIME.php'; @@ -102,7 +132,7 @@ class FreeBusy { $startstamp = strtotime( '-'.$this->fbpast.' days', mktime(0, 0, 0, $month, $day, $year) ); } - // Default the end date to the start date + freebusy_days. + // Default the end date to the start date + fbfuture. if (is_null($endstamp) || $endstamp < $startstamp) { $endstamp = strtotime( '+'.$this->fbfuture.' days', $startstamp ); } @@ -124,7 +154,9 @@ class FreeBusy { // URL is not required, so out it goes... //$vFb->setAttribute('URL', 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']); - if( $this->imap->getNumberOfMessages() == 0 ) { + $status = imap_status_current($this->imap, SA_MESSAGES | SA_UIDVALIDITY | SA_UIDNEXT); + + if( $status->messages == 0 ) { $vFb->setAttribute('DTSTART', 0, array(), false ); $vFb->setAttribute('DTEND', 0, array(), false ); $vFb->setAttribute('COMMENT', 'This is a dummy vfreebusy that indicates an empty calendar'); @@ -137,13 +169,50 @@ class FreeBusy { $vCal->addComponent($vFb); return array($vCal->exportvCalendar(),$vCal->exportvCalendar()); } - $messages = $this->imap->getMessages(); - if( PEAR::isError( $messages ) ) return array( $messages, null); - foreach ($messages as $textmsg) { + + // This only happens in php standalone mode and is needed + // to make the debug log quiet + if (!isset($_SERVER["SERVER_NAME"])) + $_SERVER["SERVER_NAME"] = "localhost"; + + $imapcache = new FreeBusyIMAPCache($this->cache_dir."/", $this->username, $this->foldername); + $imapcache->cache_load(); + + $uids = imap_search($this->imap, "UNDELETED", SE_UID); + + if ($imapcache->check_folder_changed($status->uidvalidity, $status->uidnext, $this->getRelevance(), $uids)) { + reset ($uids); + while(list($key, $uid) = each($uids)) + if (!$imapcache->check_uid_exists($uid)) + $this->process_imap_message($imapcache, $uid, $startstamp, $endstamp); + } + + // store cache and output free busy list + $imapcache->cache_store(); + $imapcache->output_fb($vFb); + + $xvCal = $vCal; + $xvCal->addComponent($vFb); + $vCal->addComponent($this->clearExtra($vFb)); + + // Generate the vCal file. + return array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() ); + } + + /********************** Private API below this line ********************/ + + function process_imap_message(&$imapcache, &$imapuid, &$startstamp, &$endstamp) + { + myLog("Processing new message $imapuid", RM_LOG_DEBUG); + $imapcache->add_empty_imap2fb($imapuid); + + $textmsg = imap_fetchheader($this->imap, $imapuid, FT_UID).imap_body($this->imap, $imapuid, FT_UID); + $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg); // Read in a Kolab event object, if one exists $parts = $mimemsg->contentTypeMap(); + $event = false; foreach ($parts as $mimeid => $conttype) { if ($conttype == 'application/x-vnd.kolab.event') { @@ -159,23 +228,16 @@ class FreeBusy { if ($event === false) { myLog("No x-vnd.kolab.events at all ", RM_LOG_DEBUG); - continue; + return; } - + $uid = $event['uid']; - /* - // See if we need to ignore this event - if (isset($params['ignore'][$uid])) { - trigger_error("Ignoring event with uid=$uid", E_USER_NOTICE); - continue; - } - */ if( array_key_exists( 'show-time-as', $event ) && strtolower(trim($event['show-time-as'])) == 'free' ) { - continue; + return; } - + $summary = ($event['sensitivity'] == 'public' ? $event['summary'] : ''); //myLog("Looking at message with uid=$uid and summary=$summary", RM_LOG_DEBUG); @@ -194,11 +256,11 @@ class FreeBusy { if( !empty($event['scheduling-id']) ) { $extra['X-SID'] = base64_encode($event['scheduling-id']); } - + if( array_key_exists( 'recurrence', $event ) ) { myLog("Detected recurring event $uid", RM_LOG_DEBUG); $rec = $event['recurrence']; - $recurrence =& new FreeBusyRecurrence( $vFb, $extra ); + $recurrence =& new FreeBusyRecurrence( $imapcache, $imapuid, $vFb, $extra ); $recurrence->setStartDate( $initial_start ); $recurrence->setEndDate( $initial_end ); $recurrence->setCycletype( $rec['cycle'] ); @@ -224,24 +286,14 @@ class FreeBusy { // Don't bother adding the initial event if it's outside our free/busy window if ($initial_start < $startstamp || $initial_end > $endstamp) { - continue; + return; } - - $vFb->addBusyPeriod('BUSY', $initial_start/* + FreeBusy::tzOffset($initial_start)*/, - $initial_end/* + FreeBusy::tzOffset($initial_end)*/, null, $extra); + + // $initial_start/* + FreeBusy::tzOffset($initial_start) + $imapcache->add_imap2fb($imapuid, $initial_start, $initial_end, null, $extra); } - } - - $xvCal = $vCal; - $xvCal->addComponent($vFb); - $vCal->addComponent($this->clearExtra($vFb)); - - // Generate the vCal file. - return array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() ); } - - /********************** Private API below this line ********************/ - + function tzOffset( $ts ) { $dstr = date('O',$ts); return 3600 * substr( $dstr, 0, 3) + 60 * substr( $dstr, 3, 2); @@ -401,11 +453,14 @@ class FreeBusy { return $vFb; } + var $cache_dir; var $username; var $password; var $imaphost; var $imapport = 143; + var $imapoptions; var $foldername; + var $relevance; // Settings var $fbfuture; @@ -414,6 +469,7 @@ class FreeBusy { var $week_starts_on_sunday = false; var $imap; + var $imap_serverstring; }; -?> \ No newline at end of file +?> diff -u -r -p --new-file freebusy.clean/freebusy.conf freebusy/freebusy.conf --- freebusy.clean/freebusy.conf Mon May 30 17:13:44 2005 +++ freebusy/freebusy.conf Mon Jun 6 15:32:40 2005 @@ -51,3 +51,20 @@ $params['send_content_length'] = false; // Should we send a Content-Disposition header, indicating what the name of the // resulting VFB file should be? $params['send_content_disposition'] = false; + +// Logging +$params['log'] = "syslog:"; +$params['log_level'] = 2; + +// IMAP options passed to imap_open +$params['imap_options'] = "/notls/secure/readonly"; + +// Directory prefixes +$params['kolab_prefix'] = ""; +$params['cache_dir'] = "/datastore/freebusy"; // default: /var/kolab/www/freebusy/cache + +$params['pfb_dbformat'] = ""; // default: gdbm + +// don't change this if you don't have to +$params['ldap_uri'] = ""; +$params['ldap_classname_suffix'] = "_dummy"; diff -u -r -p --new-file freebusy.clean/freebusy.php freebusy/freebusy.php --- freebusy.clean/freebusy.php Thu Dec 16 21:53:55 2004 +++ freebusy/freebusy.php Mon Jun 6 13:11:12 2005 @@ -1,8 +1,9 @@ + * Thomas Jarosch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -18,13 +19,13 @@ * Project's homepage; see . */ +require_once('freebusy.conf'); + require_once('freebusy/freebusycache.class.php'); require_once('freebusy/freebusycollector.class.php'); -require_once('freebusy/freebusyldap.class.php'); +require_once('freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php'); require_once('freebusy/misc.php'); -require_once('@l_prefix@/etc/resmgr/freebusy.conf'); - logInit( 'freebusy' ); $user = trim($_REQUEST['uid']); @@ -32,6 +33,14 @@ $imapuser = $_SERVER['PHP_AUTH_USER' $imappw = $_SERVER['PHP_AUTH_PW']; $req_cache = (bool)$_REQUEST['cache']; $req_extended = (bool)$_REQUEST['extended']; +/* +// Debug test values +$user = "groupware"; +$imapuser = "groupware"; +$imappw = "groupware"; +$req_cache = 0; +$req_extended = 0; +*/ myLog("---FreeBusy Script starting (".$_SERVER['REQUEST_URI'].")---", RM_LOG_DEBUG ); myLog("user=$user, imapuser=$imapuser, req_cache=$req_cache, req_extended=$req_extended", RM_LOG_DEBUG ); @@ -66,8 +75,8 @@ if( $homeserver != $params['server'] ) { exit; } - -$cache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache', $req_extended ); +$full_cache_dir = $params['kolab_prefix'].$params['cache_dir']; +$cache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], $req_extended ); $collector =& new FreeBusyCollector( $user ); $groups = $ldap->distlists( $ldap->dn( $user ) ); @@ -126,4 +135,4 @@ if ($params['send_content_disposition']) } echo $vfb; -?> \ No newline at end of file +?> diff -u -r -p --new-file freebusy.clean/freebusycache.class.php freebusy/freebusycache.class.php --- freebusy.clean/freebusycache.class.php Tue Feb 22 17:38:28 2005 +++ freebusy/freebusycache.class.php Tue Jun 14 13:49:57 2005 @@ -1,8 +1,9 @@ + * Thomas Jarosch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -21,17 +22,13 @@ /*! To load/store partial freebusy lists and their ACLs */ class FreeBusyCache { - function FreeBusyCache( $basedir, $extended = false ) { + function FreeBusyCache( $basedir, $dbformat, $extended = false ) { $this->basedir = $basedir; + $this->dbformat = $dbformat; $this->extended = $extended; } function store( $filename, $fbdata, $acl, $relevance ) { - if( ereg( '\.\.', $filename ) ) { - $this->error = $filename._(' is not absolute'); - return false; - } - $fbfilename = $this->mkfbfilename($filename); myLog("FreeBusyCache::store( file=$fbfilename, acl=[ " .str_replace("\n",", ",$this->aclToString($acl)) @@ -40,7 +37,7 @@ class FreeBusyCache { // false data means delete the pfb unlink($fbfilename); $oldacl = $this->loadACL( $filename ); - $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' ); + $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $this->dbformat ); if( $db === false ) return false; foreach( $oldacl as $ac ) { if( dba_exists( $ac['USER'], $db ) ) { @@ -87,7 +84,7 @@ class FreeBusyCache { default: $perm = 'a'; } - $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' ); + $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $this->dbformat ); if( $db === false ) { myLog('Unable to open freebusy cache db '.$this->basedir.'/pfbcache.db', RM_LOG_ERROR ); @@ -139,7 +136,7 @@ class FreeBusyCache { $fbfilename = $this->mkfbfilename($filename); unlink($fbfilename); unlink($this->mkaclfilename($filename)); - $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' ); + $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', $this->dbformat ); if( $db === false ) return false; for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) { $lst = dba_fetch( $uid, $db ); @@ -153,7 +150,7 @@ class FreeBusyCache { function findAll( $uid, $groups ) { $lst = array(); - $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', 'gdbm' ); + $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', $this->dbformat ); if( $db === false ) return false; $uids = $groups; for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i]; @@ -169,14 +166,17 @@ class FreeBusyCache { } dba_close($db); $lst = array_unique($lst); + myLog( "FreeBusyCache::findAll( $uid, [".join(', ', $groups).'] ) = ['.join(', ',$lst).']', RM_LOG_DEBUG ); return $lst; } /*************** Private API below this line *************/ + // a copy of this function exists in freebusyimapcache.class.php function mkdirhier( $dirname ) { $base = substr($dirname,0,strrpos($dirname,'/')); + $base = str_replace(".", "^", $base); if( !empty( $base ) && !is_dir( $base ) ) { if( !$this->mkdirhier( $base ) ) return false; } @@ -185,13 +185,13 @@ class FreeBusyCache { } function mkfbfilename( $fbfilename ) { - $fbfilename = str_replace( '..', '', $fbfilename ); + $fbfilename = str_replace( '.', '^', $fbfilename ); $fbfilename = str_replace( "\0", '', $fbfilename ); return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb'); } function mkaclfilename( $fbfilename ) { - $fbfilename = str_replace( '..', '', $fbfilename ); + $fbfilename = str_replace( '.', '^', $fbfilename ); $fbfilename = str_replace( "\0", '', $fbfilename ); return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb').'.acl'; } @@ -311,6 +311,7 @@ class FreeBusyCache { } var $basedir; + var $dbformat; var $error; }; diff -u -r -p --new-file freebusy.clean/freebusyimapcache.class.php freebusy/freebusyimapcache.class.php --- freebusy.clean/freebusyimapcache.class.php Thu Jan 1 01:00:00 1970 +++ freebusy/freebusyimapcache.class.php Tue Jun 14 13:49:26 2005 @@ -0,0 +1,229 @@ + + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You can view the GNU General Public License, online, at the GNU + * Project's homepage; see . + */ + + /* Class to efficently cache kolab events stored on an IMAP server */ + +class FreeBusyIMAPCache +{ + var $version; // internal version of format + + var $store_prefix; // prefix to prepend to all file operations + var $owner; // folder owner + var $foldername; // folder name + + var $cache_modified; // indicates if we have to writeout the cache + var $cache; // cache data + + function FreeBusyIMAPCache($store_prefix, &$owner, &$foldername) + { + $this->store_prefix = $store_prefix; + $this->owner = $owner; + $this->foldername = $foldername; + + $this->version = 1; + $this->reset_cache(); + } + + function reset_cache() + { + $this->cache = array(); + + $this->cache["version"] = $this->version; + $this->cache["uidvalidity"] = -1; + $this->cache["uidnext"] = -1; + $this->cache["incidences-for"] = ""; + $this->cache["imap2fb"] = array(); + + $this->cache_modified = true; + } + + function check_folder_changed($uidvalidity, $uidnext, $incidences_for, &$new_uids) + { + $changed = false; + + // uidvalidity changed? + if ($uidvalidity != $this->cache["uidvalidity"]) { + myLog("uidvalidity changed (old: ".$this->cache["uidvalidity"].", new: $uidvalidity), clearing cache", RM_LOG_DEBUG); + $this->reset_cache(); + $changed = true; + } + + // uidnext changed? + if ($uidnext != $this->cache["uidnext"]) { + myLog("uidnext on folder changed (old: ".$this->cache["uidnext"].", new: ".$uidnext.")", RM_LOG_DEBUG); + $changed = true; + } + + // incidences-for changed? + if ($incidences_for != $this->cache["incidences-for"]) { + myLog("incidences-for changed (old: ".$this->cache["incidences-for"].", new: $incidences_for), clearing cache", RM_LOG_DEBUG); + $this->reset_cache(); + $changed = true; + } + + $this->cache["uidvalidity"] = $uidvalidity; + $this->cache["uidnext"] = $uidnext; + $this->cache["incidences-for"] = $incidences_for; + + // deleted a message? + $old_uids = array_keys($this->cache["imap2fb"]); + while(list($key, $old_uid) = each($old_uids)) { + if (!in_array($old_uid, $new_uids)) { + unset($this->cache["imap2fb"][$old_uid]); + $this->cache_modified = true; + $changed = true; + } + } + + if (!$changed) + myLog("check_changed: folder didn't change", RM_LOG_DEBUG); + + return $changed; + } + + function check_uid_exists($uid) + { + return array_key_exists($uid, $this->cache["imap2fb"]); + } + + function add_empty_imap2fb(&$imap_uid) + { + $this->cache["imap2fb"][$imap_uid] = array(); + $this->cache_modified = true; + } + + function add_imap2fb(&$imap_uid, $fb_start, $fb_end, $fb_duration, $fb_extra) + { + /* + Internal imap2fb array structure: + 0..n IMAP uid + |----------- 0..n free/busy periods + |----------- start + |----------- end + |----------- duration + |----------- extra + */ + myLog("added event to store: uid: $imap_uid, start: $fb_start, end: $fb_end, duration: $fb_duration", RM_LOG_DEBUG); + + $store = array(); + + $store["start"] = $fb_start; + $store["end"] = $fb_end; + $store["duration"] = $fb_duration; + $store["extra"] = $fb_extra; + + $this->cache["imap2fb"][$imap_uid][] = $store; + $this->cache_modified = true; + } + + function output_fb(&$vFb) + { + reset($this->cache["imap2fb"]); + while(list($uid, $periods) = each($this->cache["imap2fb"])) + while(list($key, $period) = each($periods)) + $vFb->addBusyPeriod('BUSY', $period["start"], $period["end"], $period["duration"], $period["extra"]); + } + + + function compute_filename() + { + $folder_parts = explode('/', $this->foldername); + unset($folder_parts[0]); + $folder_storename = join('/', $folder_parts); + + $folder_storename = str_replace(".", "^", $folder_storename); + $folder_storename = str_replace("\0", "", $folder_storename); + + $full_path = $this->store_prefix.$folder_storename.".imapcache"; + return $full_path; + } + + function cache_load() + { + $filename = $this->compute_filename(); + + myLog("Trying to load file: $filename", RM_LOG_DEBUG); + + if (!is_readable($filename)) + return false; + + $this->cache = unserialize(file_get_contents($filename)); + + // Delete disc cache if it's from an old version + if ($this->cache["version"] != $this->version) { + myLog("Version mismatch (got: ".$this->cache["version"].", current: ".$this->version.", dropping cache", RM_LOG_WARN); + $this->reset_cache(); + } else + $this->cache_modified = false; + + return true; + } + + function cache_store($force=false) + { + if ($this->cache_modified || $force) { + $filename = $this->compute_filename(); + myLog("Trying to save cache to file: $filename", RM_LOG_DEBUG); + + if (!$this->mkdirhier(dirname($filename))) { + myLog("can't create director hierachy: ".dirname($filename), RM_LOG_ERROR); + return; + } + + $tmpname = tempnam(dirname($this->store_prefix), 'imapcache'); + $fp = fopen($tmpname, 'w'); + if(!$fp) + return false; + + if (fwrite($fp, serialize($this->cache)) === false) { + fclose ($fp); + myLog("can't write to file: $tmpname. Out of discspace?", RM_LOG_ERROR); + return; + } + + if(!rename($tmpname, $filename)) { + myLog("can't rename $tmpname to $filename", RM_LOG_ERROR); + return false; + } + fclose($fp); + + $this->cache_modified = false; + } else + myLog("IMAPcache unmodified, not saving", RM_LOG_DEBUG); + } + + function cache_delete() + { + unlink($this->compute_filename()); + $this->reset_cache(); + } + + function mkdirhier( $dirname ) { + $base = substr($dirname,0,strrpos($dirname,'/')); + $base = str_replace(".", "^", $base); + if( !empty( $base ) && !is_dir( $base ) ) { + if( !$this->mkdirhier( $base ) ) return false; + } + if( !file_exists( $dirname ) ) return mkdir( $dirname, 0755 ); + return true; + } +}; + +?> diff -u -r -p --new-file freebusy.clean/freebusyldap_dummy.class.php freebusy/freebusyldap_dummy.class.php --- freebusy.clean/freebusyldap_dummy.class.php Thu Jan 1 01:00:00 1970 +++ freebusy/freebusyldap_dummy.class.php Thu Jun 2 15:33:35 2005 @@ -0,0 +1,70 @@ + + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You can view the GNU General Public License, online, at the GNU + * Project's homepage; see . + */ + +class FreeBusyLDAP { + function FreeBusyLDAP( $uri, $base ) { + return true; + } + + function error() { + return "LDAP::error not implemented"; + } + + function close() { + return true; + } + + function bind( $dn = false , $pw = '' ) { + return true; + } + + function freeBusyPast() { + return 0; // Default + } + + // Return a hash of info about a user + function userInfo( $uid ) { + $rtn = array(); + + $rtn["MAIL"] = $uid; + $rtn["HOMESERVER"] = ""; + $rtn["FBFUTURE"] = 60; + + return $rtn; + } + + function mailForUid( $uid ) { + return $uid; + } + + function homeServer( $uid ) { + return "localhost"; + } + + function dn( $uid ) { + return ""; + } + + function distlists( $dn ) { + return array(); + } +}; + +?> diff -u -r -p --new-file freebusy.clean/pfb.php freebusy/pfb.php --- freebusy.clean/pfb.php Tue Feb 22 17:57:15 2005 +++ freebusy/pfb.php Mon Jun 13 17:18:51 2005 @@ -1,8 +1,9 @@ + * Thomas Jarosch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -20,12 +21,12 @@ error_reporting(E_ALL); -require_once('freebusy/freebusyldap.class.php'); +require_once('freebusy/freebusy.conf'); + +require_once('freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php'); require_once('freebusy/freebusycache.class.php'); require_once('freebusy/misc.php'); -require_once('@l_prefix@/etc/resmgr/freebusy.conf'); - logInit('pfb'); $imapuser = isset($_SERVER['PHP_AUTH_USER'])?$_SERVER['PHP_AUTH_USER']:false; @@ -33,7 +34,18 @@ $imappw = isset($_SERVER['PHP_AUTH $req_cache = isset($_REQUEST['cache'])?(bool)$_REQUEST['cache']:false; $req_folder = isset($_REQUEST['folder'])?$_REQUEST['folder']:false; $req_extended = isset($_REQUEST['extended'])?(bool)$_REQUEST['extended']:false; - +// convert character encoding (stores utf7 folder names also on disc) +require_once "Horde/Util.php"; +require_once "Horde/String.php"; +$req_folder = String::convertCharset($req_folder, "UTF-8", "UTF7-IMAP"); +/* +// Debug test values +$imapuser = "groupware"; +$imappw = "groupware"; +$req_cache = 0; +$req_folder = "groupware/Kalender"; +$req_extended = 0; +*/ myLog("pfb.php starting up: user=$imapuser, folder=$req_folder, extended=$req_extended", RM_LOG_DEBUG); @@ -49,7 +61,7 @@ if( $userinfo ) { //$homeserver = $userinfo['HOMESERVER']; } -$folder = array_values(array_filter(explode('/', $req_folder ))); +$folder = explode('/', $req_folder); if( count($folder) < 1 ) { // error notFound( _('No such folder ').htmlentities($req_folder) ); @@ -86,9 +98,11 @@ if( $homeserver && $homeserver != $param exit; } -$cache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache', +$full_cache_dir = $params['kolab_prefix'] . $params['cache_dir']; + +$cache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], false ); -$xcache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache', +$xcache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], true ); if( $req_cache ) { @@ -128,23 +142,17 @@ if( $req_cache ) { unset($folder[0]); $folder = join('/', $folder); $fbpast = $ldap->freeBusyPast(); - $fb =& new FreeBusy( $imapuser, $imappw, 'localhost', $uinfo['FBFUTURE'], $fbpast ); - $fb->freebusy_days = $params['freebusy_days']; + $fb =& new FreeBusy( $full_cache_dir, $imapuser, $imappw, 'localhost', $params['imap_options'], $uinfo['FBFUTURE'], $fbpast ); $fb->default_domain = $params['email_domain']; $rc = $fb->imapConnect(); - if( PEAR::isError( $rc ) ) { - unauthorized($rc->toString()); - return false; - } - $rc = $fb->imapLogin(); - if( PEAR::isError( $rc ) ) { - unauthorized("Access denied for user $imapuser: ".$rc->toString()); + if( $rc === false ) { + unauthorized(imap_last_error()); return false; } $rc = $fb->imapOpenMailbox(FreeBusy::imapFolderName( $imapuser, $owner, $folder, $params['email_domain'])); - if( PEAR::isError( $rc ) ) { - notfound( "Folder: ".$fb->foldername.', '.$rc->toString()); + if( $rc === false ) { + notfound( "Folder: ".$fb->foldername.', '.imap_last_error()); return false; } $relevance = $fb->getRelevance(); @@ -156,6 +164,7 @@ if( $req_cache ) { } $acl = $fb->getACL(); + if( !$cache->store( $owner.'/'.$folder, $vfb, $acl, $relevance ) ) { trigger_error('Could not store pfb in cache file '.$owner.'/'.$folder .'.pfb: '.$cache->error, E_USER_WARNING); From cvs at intevation.de Mon Jun 20 13:07:02 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 13:07:03 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.18, 1.19 Message-ID: <20050620110702.816FD1005D1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv7893/kolab-webadmin/php/admin/include Modified Files: form.class.php Log Message: Fix for issue813 (password intry not of type password) Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- form.class.php 16 Jun 2005 00:32:10 -0000 1.18 +++ form.class.php 20 Jun 2005 11:07:00 -0000 1.19 @@ -67,14 +67,14 @@ if( !isset( $value['value'] ) ) $value['value'] = ''; switch( $value['type'] ) { case 'hidden': continue; + case '': + // Default is text + $value['type'] = 'text'; case 'password': if( ereg( 'readonly', $value['attrs'] ) ) { // If readonly, skip it -- passwords are at most write-only break; } - case '': - // Default is text - $value['type'] = 'text'; case 'input': case 'text': $str .= ''; From cvs at intevation.de Mon Jun 20 13:15:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 13:15:55 2005 Subject: steffen: server obmtool.conf,1.174,1.175 Message-ID: <20050620111553.310D81005C8@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv7996 Modified Files: obmtool.conf Log Message: version Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.174 retrieving revision 1.175 diff -u -d -r1.174 -r1.175 --- obmtool.conf 16 Jun 2005 03:07:29 -0000 1.174 +++ obmtool.conf 20 Jun 2005 11:15:51 -0000 1.175 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0-snapshot-20050616"; + kolab_version="pre-2.0-snapshot-20050620"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -132,7 +132,7 @@ @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 @install ${altloc}kolabd-1.9.4-20050615 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050616 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050620 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050615 --define kolab_version=$kolab_version @check From cvs at intevation.de Mon Jun 20 13:35:45 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 13:35:46 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.19, 1.20 Message-ID: <20050620113545.981781005C8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv8383/kolab-webadmin/php/admin/include Modified Files: form.class.php Log Message: Issue813, take two... Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- form.class.php 20 Jun 2005 11:07:00 -0000 1.19 +++ form.class.php 20 Jun 2005 11:35:43 -0000 1.20 @@ -61,15 +61,12 @@ $size = 60; foreach( $this->entries as $key => $value ) { - if( !isset( $value['type'] ) ) $value['type'] = ''; + if( !isset( $value['type'] ) || $value['type']=='' ) $value['type'] = 'text'; if( !isset( $value['comment'] ) ) $value['comment'] = ''; if( !isset( $value['attrs'] ) ) $value['attrs'] = ''; if( !isset( $value['value'] ) ) $value['value'] = ''; switch( $value['type'] ) { case 'hidden': continue; - case '': - // Default is text - $value['type'] = 'text'; case 'password': if( ereg( 'readonly', $value['attrs'] ) ) { // If readonly, skip it -- passwords are at most write-only From cvs at intevation.de Mon Jun 20 16:18:05 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 16:18:06 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.10, 1.11 Message-ID: <20050620141805.49580100167@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook In directory doto:/tmp/cvs-serv11162/kolab-webadmin/www/admin/addressbook Modified Files: addr.php Log Message: issue810 Index: addr.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- addr.php 16 Jun 2005 00:32:10 -0000 1.10 +++ addr.php 20 Jun 2005 14:18:03 -0000 1.11 @@ -135,7 +135,7 @@ 'type' => 'hidden' ); $dn = ''; -if( $action == 'modify' || $action == 'delete' || $action == 'save') { +if( $action == 'modify' || $action == 'delete' || $action == 'save' || $action == 'kill' ) { if( $_REQUEST['dn'] ) { $dn = $_REQUEST['dn']; } else { @@ -266,7 +266,7 @@ if( $ldap_object['count'] == 1 ) { fill_form_for_modify( $form, $ldap_object[0] ); $form->entries['action']['value'] = 'kill'; - foreach( $form->entries as $key ) { + foreach( $form->entries as $key => $value ) { $form->entries[$key]['attrs'] = 'readonly'; } $form->submittext = _('Delete'); @@ -280,7 +280,7 @@ case 'kill': if (!$errors) { if (!(ldap_delete($ldap->connection,$dn))) { - array_push($errors, _("LDAP Error: could not delete ").$dn.": ".ldap_error($link)); + array_push($errors, _("LDAP Error: could not delete ").$dn.": ".ldap_error($ldap->connection)); } else { $heading = _('Entry Deleted'); $messages[] = _("Address book entry with DN $dn was deleted"); From cvs at intevation.de Mon Jun 20 18:25:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 18:25:24 2005 Subject: bh: server release-notes.txt,1.15,1.16 Message-ID: <20050620162523.6ABC710016A@lists.intevation.de> Author: bh Update of /kolabrepository/server In directory doto:/tmp/cvs-serv13291 Modified Files: release-notes.txt Log Message: update for 2.0 final Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- release-notes.txt 17 Jun 2005 15:03:40 -0000 1.15 +++ release-notes.txt 20 Jun 2005 16:25:21 -0000 1.16 @@ -1,66 +1,19 @@ Release notes Kolab2 Server -(Version 20050617, Kolab server 2.0 RC 4) +(Version 20050620, Kolab server 2.0 final) For upgrading and installation instructions, please refer to the 1st.README file in the source directory. -Changes since RC 3, 20050603: - - - Some openpkg security updates: - - openpkg 2.2.2-2.2.2 -> 2.2.3-2.2.3 - perl 5.8.5-2.2.1 -> 5.8.5-2.2.2 - bzip2 1.0.2-2.2.0 -> 1.0.2-2.2.1 - gzip 1.3.5-2.2.0 -> 1.3.5-2.2.1 - - - imap-2004a-2.2.0 -> imap-2004c-2.3.0_kolab - - apache-1.3.31-2.2.3_kolab -> apache-1.3.31-2.2.3_kolab2 - - php-4.3.9-2.2.2 -> php-4.3.9-2.2.2_kolab - - * Kolab specific versions of the packages with a patch that adds - support for annotations in cimap and its php bindings. Unused so - far. - - - imapd-2.2.12-2.3.0_kolab3 -> imapd-2.2.12-2.3.0_kolab4 - - * Fixing: - Issue784 (managesieve undef symbol) - - - kolabd 20050601 -> 20050615 - - * Moved kolabfilter settings verify_from and allow_sender to LDAP - and some other changes related to the fix for Issue783 +Changes since RC 4, 20050617: - * Fixing: - Issue779 (german quota warning) - kolab-webadmin 20050530 -> 20050616 - * Make verify_from and allow_sender accessible from webgui. This - is part of the fix for Issue783 - - * Added french translations. Doesn't work properly yet, though. - - * Fixes: - Issue722 (webgui language switching) - Issue804 (addressbook collision with distribution-list) - Issue797 (better confirmation dialog for deleting distribution list) - - - kolab-resource-handlers 20050520 -> 20050615 - - * disable SID creation - - * Increase the maximal execution time for php scripts - - * Substantial improvement of the performance of the partial - free/busy generation (this is part of the fix for Issue793) - * Fixing: - Issue778 (mail alias for free/busy retrieval) - Issue783 (envelope header from check has problems with mailinglists) - Issue793 (php aborts on long pfb creations) + Issue813 (password entry not of type password) + Issue810 (Cannot delete addressbook entry) $Id$ From cvs at intevation.de Mon Jun 20 18:59:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 18:59:25 2005 Subject: bernhard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.8, 1.9 Message-ID: <20050620165924.EB7DF1006B8@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv13674 Modified Files: messages.po Log Message: Typo fixed. Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- messages.po 15 Jun 2005 20:48:21 -0000 1.8 +++ messages.po 20 Jun 2005 16:59:22 -0000 1.9 @@ -438,7 +438,7 @@ "The principal authors of the Kolab client and server software are (in " "alphabetical order):" msgstr "" -"Die Hauptentiwckler der Kolab-Klienten- und Server-Software sind (in " +"Die Hauptentwickler der Kolab-Klienten- und Server-Software sind (in " "alphabetischer Reihenfolge):" #: tpl_messages.php:79 tpl_messages.php:114 From cvs at intevation.de Mon Jun 20 23:33:58 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 23:33:59 2005 Subject: bernhard: doc/www/src/news - New directory Message-ID: <20050620213358.54B6510016A@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src/news In directory doto:/tmp/cvs-serv17499/news Log Message: Directory /kolabrepository/doc/www/src/news added to the repository From cvs at intevation.de Mon Jun 20 23:46:30 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 23:46:31 2005 Subject: bernhard: doc/www/src Makefile,1.20,1.21 Message-ID: <20050620214630.287CD1005CA@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv17631 Modified Files: Makefile Log Message: Added new directory news. First news/pr-20050620 Adding images for pr-20050620. Index: Makefile =================================================================== RCS file: /kolabrepository/doc/www/src/Makefile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile 18 May 2005 12:55:32 -0000 1.20 +++ Makefile 20 Jun 2005 21:46:28 -0000 1.21 @@ -18,7 +18,8 @@ all: mkdir -p ../html/images ../html/howtos/amavis_spamassassin_sophos \ - ../html/howtos/amavis_spamassassin_clam ../html/security + ../html/howtos/amavis_spamassassin_clam ../html/security \ + ../html/news cp -u howtos/amavis_spamassassin_sophos/*.* \ ../html/howtos/amavis_spamassassin_sophos cp -u howtos/amavis_spamassassin_clam/*.* \ @@ -26,6 +27,8 @@ cp -u images/*.png ../html/images/ cp -u *.css *.ico *.htm ../html/ cp -u security/*.txt ../html/security + cp -u news/*.html ../html/news/ + for f in $(HTML_FILES); \ do \ rm -f ../html/$$f; \ From cvs at intevation.de Mon Jun 20 23:46:30 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 23:46:33 2005 Subject: bernhard: doc/www/src/images kde_logo_small.png, NONE, 1.1 kolab-konsortium_logo_small.png, NONE, 1.1 Message-ID: <20050620214630.23DDB10016A@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src/images In directory doto:/tmp/cvs-serv17631/images Added Files: kde_logo_small.png kolab-konsortium_logo_small.png Log Message: Added new directory news. First news/pr-20050620 Adding images for pr-20050620. --- NEW FILE: kde_logo_small.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kolab-konsortium_logo_small.png --- (This appears to be a binary file; contents omitted.) From cvs at intevation.de Mon Jun 20 23:46:30 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jun 20 23:46:35 2005 Subject: bernhard: doc/www/src/news pr-20050620.html,NONE,1.1 Message-ID: <20050620214630.2A33A1006B7@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src/news In directory doto:/tmp/cvs-serv17631/news Added Files: pr-20050620.html Log Message: Added new directory news. First news/pr-20050620 Adding images for pr-20050620. --- NEW FILE: pr-20050620.html --- Kolab 2 Groupware released, PR June 20th, 2005Back to www.kolab.org
        June 1st, 2005
        [ for immediate release ]
        June 20th, 2005

        Kolab 2 Groupware released

        The Kolab Groupware Project (www.kolab.org) today announced the immediate availability of Kolab 2, a reliable and extremely scalable groupware solution for GNU/Linux that can replace Microsoft Exchange. Beside emails, the solution empowers users to manage and share their appointments, contacts and tasks. without the necessity of being constantly online.

        "With our focus on native offline-capable clients, Kolab 1 had brought a new approach to the groupware world," explains Bernhard Reiter, CEO of Intevation GmbH and project coordinator. "With this second generation, users can now share their groupware folders even with users that use Outlook when they are using KDE and vice versa." Additional new features are support for servers at several locations, usability, speed improvements, support for spam-control and anti virus software. The new stable release 2.0 has been about two years in coming as 1.0 has been released in mid 2003. Beta versions of Kolab 2.0 have undergone intensive testing in the last 6 months.

        "Kolab owes its scalability to its concept", explains Martin Konold senior partner at erfrakon, who designed the Kolab architecture, "all groupware data is stored on the IMAP server in MIME structures instead of using a traditional database. Thanks to the smart client concept, most CPU-intensive operations are performed on the client. Cyrus, the chosen IMAP server software, also allows for an on-the-fly backup of the IMAP store."

        The Kolab-Konsortium will present the Kolab Solution at LinuxTag in Karlsruhe (Booth B81, Intevation GmbH) this week. Additionally, Bernhard Reiter will give a presentation on thursday, 13:00-14:00h.

        Kolab has an active and growing community that can be reached via several active mailinglists as well as the Kolab Wiki at wiki.kolab.org. Enterprise-level support is available from the Kolab Konsortium.

        All daily administration tasks can be performed via a web interface. The OpenPKG environment makes the server easy to deploy on all kinds of GNU/Linux distributions and Unix derivates. Just like its predecessor, Kolab 2 is based on well-proven Free Software server components, such as Apache, Postfix, Cyrus imapd and OpenLDAP.

        Windows users can keep their Outlook installation: The Toltec Connector 2.0 turns Outlook into a fully-fledged Kolab 2 client at low cost. Additionally, a special convenience package of Kontact, the KDE Groupware client, has been made available. It has undergone special testing by the Kolab-Konsortium and can be used with KDE 3.2 and higher. Users that cannot upgrade to KDE 3.4.1 should use this package for client deployment. Kontact is a feature-complete Kolab 2 client.

        "A unique property of the Kolab Project is that it uses existing proven components and works very closely with the associated Free Software communities." says Kalle Dalheimer, CEO of Klarälvdalens Datakonsult AB, the company that did the actual software implementation. "For example, our KDE Kolab client benefits from the full S/MIME capabilities for email signatures and encryption done by a different project."

        In addition to the native clients a Kolab-compliant web interface based on the Horde Framework is in beta stage and will become available later in 2005.


        About the Kolab Konsortium:
        Logo Kolab Konsortium The Kolab Konsortium was founded by Intevation GmbH, Klarälvdalens Datakonsult AB and erfrakon Partnerschaftsgesellschaft, the creators of Kolab. The Konsortium offers courses, consultancy, development and enterprise-level support for the Kolab server and clients. It works together with Radley Network Technologies CC (open file-format for the Toltec Connector) and Code Fusion CC. Read more about the Kolab Konsortium at www.kolab-konsortium.de

        Press Contact: 
        Bernhard Reiter 
Phone: +49-541-3350830
info@kolab-konsortium.de

        About KDE:
        KDE KDE is a powerful Free Software graphical desktop environment for GNU/Linux and Unix workstations. It combines ease of use, modern functionality, and outstanding graphical design with the technological superiority of the Unix operating system. Read more about KDE at www.kde.org.

        Press Contact: 
        Matthias Kalle Dalheimer
Phone: +46-563-540023
info@kde.org
        From cvs at intevation.de Tue Jun 21 00:08:27 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jun 21 00:08:29 2005 Subject: bernhard: doc/www/src about-kolab-clients.html.m4, 1.9, 1.10 index.html.m4, 1.57, 1.58 newsarchive.html.m4, 1.7, 1.8 Message-ID: <20050620220827.9D38B10016A@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv18361 Modified Files: about-kolab-clients.html.m4 index.html.m4 newsarchive.html.m4 Log Message: Added news about 2.0 release with link to the pressrelease. Archived all older news. Minor update on the about-client page, mainly to reflect that the KDE client is stable now. Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- about-kolab-clients.html.m4 12 May 2005 10:42:45 -0000 1.9 +++ about-kolab-clients.html.m4 20 Jun 2005 22:08:25 -0000 1.10 @@ -42,7 +42,7 @@ src="images/kontact-logo.png" align="right"> License: Free Software - GNU GPL
        -Status: Beta +Status: stable 2.0

        The Kolab Project is working on a KDE Client which @@ -91,7 +91,7 @@ src="images/horde-logo.png" align="right"> License: Free Software
        -Status: Development +Status: Beta

        Currently part of Horde CVS, this is still @@ -185,11 +185,9 @@ License: proprietary
        -Status: unclear (not tested) +Status: release candidate Homepage: www.konsec.com -

        -In development, release candidates have been pubslished.

        Aethera

        @@ -235,12 +233,10 @@ Planned License: Free Software
        -Status: unclea
        -Homepage: None +Status: unclear
        +Homepage: None
        Ian Geiser's Company SourceXtreme -is working on a mapi connector. -First development release was expected spring 2004. -It seems they have struck and there is nothing to be expected for Kolab. +was working on a mapi connector. Not much news in a while. m4_include(footer.html.m4) Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- index.html.m4 17 Jun 2005 18:41:47 -0000 1.57 +++ index.html.m4 20 Jun 2005 22:08:25 -0000 1.58 @@ -37,28 +37,22 @@
        - +
        June 17th, 2005
        June 20th, 2005 » - Kolab Server 2.0 RC 4 published; security and bug fixes + Kolab 2 Groupware released!
        -The latest and probably last release candidate for the Kolab Server 2 -comes with two important bugfixes -and draws a few security updates from OpenPKG. After a brief testing -period it will become the stable release. -
        + Almost two years after the stable release of Kolab 1, + the Kolab team is proud to present the stable releases + of Kolab Server 2.0 and KDE Kolab Client 2.0!

        - - - -
        June 15th, 2005» - KDE client close to release -
        -

        -The third release candidate of the KDE Kolab2 Client based on KDE 3.3 -is public. After a short final testing period it will be declared stable. + Check out the + official press release, + get the packages from the mirrors + and watch out for Kolab at Linuxtag2005 starting Wednesday + in Karlsruhe.

        @@ -67,70 +61,13 @@

        -
        - - - - -
        June 6th, 2005» - Kolab 2 Server RC 3 released -
        -
        -The third release candidate of the Kolab2 Server implementation -fixes a few important bugs. -
        -

        - - - - -
        June 1st, 2005» - KDE Project using Kolab2 -
        -

        -Check out the following dot.kde story: -KDE Project Offers Kolab Groupware Services to its Contributors. -
        -

        - - - - - -
        June 1st, 2005» - Contributions: first screenshot and German client instructions. -
        -

        -With many contributors working on the beef of the Kolab product, -we are very glad, that slowly more help with the documentation is coming in. -Thanks to Michael Feilner we have the first picture -of the KDE Kolab2 clients in our screenshot section. -Needless to say: We are looking for more. -

        -Life is getting easier for our German speaking users as Werner Sorgenfrei -has translated the KDE Kolab Client setup manual. -

        -

        + +

        --> Archived news Index: newsarchive.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- newsarchive.html.m4 15 Jun 2005 15:26:09 -0000 1.7 +++ newsarchive.html.m4 20 Jun 2005 22:08:25 -0000 1.8 @@ -13,6 +13,88 @@ + + +
        June 17th, 2005» + Kolab Server 2.0 RC 4 published; security and bug fixes +
        +
        +The latest and probably last release candidate for the Kolab Server 2 +comes with two important bugfixes +and draws a few security updates from OpenPKG. After a brief testing +period it will become the stable release. +
        +

        + + + + +
        June 15th, 2005» + KDE client close to release +
        +

        +The third release candidate of the KDE Kolab2 Client based on KDE 3.3 +is public. After a short final testing period it will be declared stable. +
        +

        + + + +
        June 6th, 2005» + Kolab 2 Server RC 3 released +
        +

        +The third release candidate of the Kolab2 Server implementation +fixes a few important bugs. +
        +

        + + + + +
        June 1st, 2005» + KDE Project using Kolab2 +
        +

        +Check out the following dot.kde story: +KDE Project Offers Kolab Groupware Services to its Contributors. +
        +

        + + + + + +
        June 1st, 2005» + Contributions: first screenshot and German client instructions. +
        +

        +With many contributors working on the beef of the Kolab product, +we are very glad, that slowly more help with the documentation is coming in. +Thanks to Michael Feilner we have the first picture +of the KDE Kolab2 clients in our screenshot section. +Needless to say: We are looking for more. +

        +Life is getting easier for our German speaking users as Werner Sorgenfrei +has translated the KDE Kolab Client setup manual. +

        +

        + + + + +
        June 1st, 2005» + Kolab-Server 2.0-RC2 public, with RC3 around the corner. +
        +

        +The mirrors have the second release candidate of the server for you. +Because of a bug found in RC1 and RC2, RC3 is not far away. Check +the updated RC2 release-notes for details of the bug +and a temporary workaround. +
        +

        +
        May 11th, 2005 » Kolab-Konsortium: Enterprise Support available From cvs at intevation.de Fri Jun 24 18:37:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jun 24 18:37:20 2005 Subject: bernhard: doc/www/src index.html.m4, 1.58, 1.59 newsarchive.html.m4, 1.8, 1.9 Message-ID: <20050624163718.75DAD101F15@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv28215 Modified Files: index.html.m4 newsarchive.html.m4 Log Message: Revived news to fill up the front page for a better look as suggested by Martin. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- index.html.m4 20 Jun 2005 22:08:25 -0000 1.58 +++ index.html.m4 24 Jun 2005 16:37:16 -0000 1.59 @@ -61,6 +61,76 @@ + + + +
        June 17th, 2005» + Kolab Server 2.0 RC 4 published; security and bug fixes +
        +
        +The latest and probably last release candidate for the Kolab Server 2 +comes with two important bugfixes +and draws a few security updates from OpenPKG. After a brief testing +period it will become the stable release. +
        +

        + + + + +
        June 15th, 2005» + KDE client close to release +
        +

        +The third release candidate of the KDE Kolab2 Client based on KDE 3.3 +is public. After a short final testing period it will be declared stable. +
        +

        + + + +
        June 6th, 2005» + Kolab 2 Server RC 3 released +
        +

        +The third release candidate of the Kolab2 Server implementation +fixes a few important bugs. +
        +

        + + + + +
        June 1st, 2005» + KDE Project using Kolab2 +
        +

        +Check out the following dot.kde story: +KDE Project Offers Kolab Groupware Services to its Contributors. +
        +

        + + + + + +
        June 1st, 2005» + Contributions: first screenshot and German client instructions. +
        +

        +With many contributors working on the beef of the Kolab product, +we are very glad, that slowly more help with the documentation is coming in. +Thanks to Michael Feilner we have the first picture +of the KDE Kolab2 clients in our screenshot section. +Needless to say: We are looking for more. +

        +Life is getting easier for our German speaking users as Werner Sorgenfrei +has translated the KDE Kolab Client setup manual. +

        +

        + +