From cvs at intevation.de Fri Jul 1 13:55:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 1 13:55:51 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusycache.class.php, 1.15, 1.16 Message-ID: <20050701115551.227AA101FAA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy In directory doto:/tmp/cvs-serv2333 Modified Files: freebusycache.class.php Log Message: typo Index: freebusycache.class.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- freebusycache.class.php 22 Feb 2005 16:32:31 -0000 1.15 +++ freebusycache.class.php 1 Jul 2005 11:55:48 -0000 1.16 @@ -153,7 +153,7 @@ function findAll( $uid, $groups ) { $lst = array(); - $db = dba_open( $this->basedir.'/pfbcache.db', 'rd', 'gdbm' ); + $db = dba_open( $this->basedir.'/pfbcache.db', 'cd', 'gdbm' ); if( $db === false ) return false; $uids = $groups; for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i]; @@ -314,4 +314,5 @@ var $error; }; -?> \ No newline at end of file +?> + From cvs at intevation.de Fri Jul 1 13:59:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 1 13:59:48 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.126, 1.127 Message-ID: <20050701115947.73625101FAA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv2398 Modified Files: kolab-resource-handlers.spec Log Message: Errorhandling for multiple recipients (Issue825) Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- kolab-resource-handlers.spec 15 Jun 2005 12:08:11 -0000 1.126 +++ kolab-resource-handlers.spec 1 Jul 2005 11:59:45 -0000 1.127 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050615 +Release: 20050701 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Fri Jul 1 13:59:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 1 13:59:48 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26, 1.27 kolabmailtransport.php, 1.3, 1.4 Message-ID: <20050701115947.7A2B2101FAF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv2398/kolab-resource-handlers/resmgr Modified Files: kolabfilter.php kolabmailtransport.php Log Message: Errorhandling for multiple recipients (Issue825) Index: kolabfilter.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- kolabfilter.php 15 Jun 2005 11:05:45 -0000 1.26 +++ kolabfilter.php 1 Jul 2005 11:59:45 -0000 1.27 @@ -267,9 +267,9 @@ $headers_done = true; foreach( $add_headers as $h ) { if( PEAR::isError($error = $smtp->data( "$h\r\n" )) ) { - fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); - if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); - else exit(EX_UNAVAILABLE); + fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); + if( $error->getCode() < 500 ) exit(EX_TEMPFAIL); + else exit(EX_UNAVAILABLE); } } } Index: kolabmailtransport.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolabmailtransport.php 17 May 2005 10:25:18 -0000 1.3 +++ kolabmailtransport.php 1 Jul 2005 11:59:45 -0000 1.4 @@ -46,23 +46,47 @@ if( !is_array( $recips ) ) $recips = array($recips); + $reciperrors = array(); 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 new PEAR_Error('Failed to set recipient: '.$error->getMessage(), $this->transport->_code); + $msg = "Failed to set recipient $recip: " . $error->getMessage(). ", code=".$this->transport->_code;; + myLog($msg, RM_LOG_ERROR); + $reciperrors[] = new PEAR_Error('Failed to set recipient: '.$error->getMessage(), $this->transport->_code); } } - + if( count($reciperrors) == count($recips) ) { + // OK, all failed, just give up + if( count($reciperrors) == 1 ) { + // Only one failure, just return that + return $reciperrors[0]; + } + // Multiple errors + return $this->createErrorObject( $reciperrors, 'Delivery to all recipients failed' ); + } if (PEAR::isError($error = $this->transport->_put('DATA'))) { return $error; } if (PEAR::isError($error = $this->transport->_parseResponse(354))) { return $error; } + if( !empty($reciperrors) ) { + return $this->createErrorObject( $reciperrors, 'Delivery to some recipients failed' ); + } return true; } + // Encapsulate multiple errors in one + function createErrorObject( $reciperrors, $msg = null ) { + // Return the lowest errorcode to not bounce more + // than we have to + if($msg == null) $msg = 'Delivery to recipients failed.'; + $code = 1000; + foreach( $reciperrors as $err ) { + if( $err->code < $code ) $code = $err->code; + } + return new PEAR_Error( $msg, $code, null, null, $reciperrors); + } + /* Modified implementation from Net_SMTP that supports * dotstuffing even when getting the mail line-by line */ function quotedataline(&$data) { @@ -128,4 +152,4 @@ } }; -?> \ No newline at end of file +?> From cvs at intevation.de Fri Jul 1 14:52:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 1 14:52:58 2005 Subject: bernhard: doc/www/src about-kolab-clients.html.m4,1.16,1.17 Message-ID: <20050701125257.9C8CE1006A3@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv4357 Modified Files: about-kolab-clients.html.m4 Log Message: Revert Martin's change to Toltec connection information as my information from the vendor are different. Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- about-kolab-clients.html.m4 30 Jun 2005 18:19:56 -0000 1.16 +++ about-kolab-clients.html.m4 1 Jul 2005 12:52:55 -0000 1.17 @@ -78,11 +78,9 @@ The Toltec Connector 2 is the Kolab projects' reference connector for Outlook for Kolab-2 and so interoperability with the KDE Kolab client -was tested intensively. -Toltec is a plugin for Microsoft Outlook®. -Its vendor Radley Network Technologies has -a stable Outlook connector (Toltec 1) for Kolab 1 -on the market since October 2003. +as tested intensively. Toltec uses the same hooks into Outlook +as Exchange. Its vendor Radley Network Technologies has +a stable Outlook connector (Toltec 1) on the market since October 2003. User and groups can share folders including those that contain emails, calendar items, tasks and contacts with the Toltec Connector. From cvs at intevation.de Fri Jul 1 15:01:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 1 15:01:41 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.15, 1.16 Message-ID: <20050701130139.854F1101F1E@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv4513/kolabd/templates Modified Files: main.cf.template Log Message: Enable delivery to multiple recipients (Issue824) Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- main.cf.template 10 Jun 2005 23:54:37 -0000 1.15 +++ main.cf.template 1 Jul 2005 13:01:37 -0000 1.16 @@ -59,7 +59,7 @@ # local delivery recipient_delimiter = + #mailbox_transport = lmtp:unix:@l_prefix@/var/kolab/lmtp -mailbox_transport = kolabmailboxfilter +local_transport = kolabmailboxfilter #TLS settings smtpd_use_tls = yes From cvs at intevation.de Fri Jul 1 15:01:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 1 15:01:41 2005 Subject: steffen: server/kolabd kolabd.spec,1.57,1.58 Message-ID: <20050701130139.7C50E101F18@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv4513 Modified Files: kolabd.spec Log Message: Enable delivery to multiple recipients (Issue824) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- kolabd.spec 15 Jun 2005 12:17:53 -0000 1.57 +++ kolabd.spec 1 Jul 2005 13:01:37 -0000 1.58 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050615 +Release: 20050701 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Fri Jul 1 16:54:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 1 16:54:24 2005 Subject: bernhard: doc/www/src about-kolab-clients.html.m4,1.17,1.18 Message-ID: <20050701145423.B75F9101F1E@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv6514 Modified Files: about-kolab-clients.html.m4 Log Message: Removed unprecise description after clarification. Index: about-kolab-clients.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- about-kolab-clients.html.m4 1 Jul 2005 12:52:55 -0000 1.17 +++ about-kolab-clients.html.m4 1 Jul 2005 14:54:21 -0000 1.18 @@ -78,8 +78,8 @@ The Toltec Connector 2 is the Kolab projects' reference connector for Outlook for Kolab-2 and so interoperability with the KDE Kolab client -as tested intensively. Toltec uses the same hooks into Outlook -as Exchange. Its vendor Radley Network Technologies has +as tested intensively. +Its vendor Radley Network Technologies has a stable Outlook connector (Toltec 1) on the market since October 2003. User and groups can share folders including those that contain emails, calendar items, tasks and contacts From cvs at intevation.de Tue Jul 5 12:23:56 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:23:59 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer - New directory Message-ID: <20050705102356.AE8AF1005A0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer In directory doto:/tmp/cvs-serv9586/domainmaintainer Log Message: Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer added to the repository From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:55 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin Makefile.am, 1.20, 1.21 bootstrap, 1.1, 1.2 Message-ID: <20050705103153.516EE1005A0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin In directory doto:/tmp/cvs-serv9721/kolab-webadmin Modified Files: Makefile.am bootstrap Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile.am 17 Jun 2005 15:19:16 -0000 1.20 +++ Makefile.am 5 Jul 2005 10:31:51 -0000 1.21 @@ -57,6 +57,12 @@ wsmaintainerdir = $(wsadmindir)/maintainer wsmaintainer_DATA = $(WSMAINTAINER_FILES) +WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \ + www/admin/domainmaintainer/index.php + +wsdomainmaintainerdir = $(wsadmindir)/domainmaintainer +wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES) + WSPICS_FILES = www/admin/pics/erfrakon.png \ www/admin/pics/codefusion.png \ www/admin/pics/intevation_logo.png \ @@ -124,6 +130,7 @@ php/admin/templates/adminlistall.tpl \ php/admin/templates/login.tpl \ php/admin/templates/maintainerlistall.tpl \ + php/admin/templates/domainmaintainerlistall.tpl \ php/admin/templates/kolab.tpl \ php/admin/templates/versions.tpl \ php/admin/templates/addrlistall.tpl \ @@ -181,6 +188,7 @@ $(WSDISTRIBUTIONLIST_FILES) \ $(WSKOLAB_FILES) \ $(WSMAINTAINER_FILES) \ + $(WSDOMAINMAINTAINER_FILES) \ $(WSPICS_FILES) \ $(WSSERVICE_FILES) \ $(WSsharedfolder_FILES) \ Index: bootstrap =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/bootstrap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- bootstrap 7 Jun 2004 22:29:45 -0000 1.1 +++ bootstrap 5 Jul 2005 10:31:51 -0000 1.2 @@ -1,4 +1,4 @@ -cp -pr ../../dist_conf . +cp -pr ../../perl-kolab/dist_conf . touch NEWS README AUTHORS ChangeLog From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:56 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.20, 1.21 ldap.class.php, 1.24, 1.25 menu.php, 1.12, 1.13 Message-ID: <20050705103153.625AA1005C7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv9721/kolab-webadmin/php/admin/include Modified Files: form.class.php ldap.class.php menu.php Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) Index: form.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- form.class.php 20 Jun 2005 11:35:43 -0000 1.20 +++ form.class.php 5 Jul 2005 10:31:51 -0000 1.21 @@ -84,6 +84,34 @@ $str .= ''.$value['comment'].''; $str .= ''."\n"; break; + case 'email': + $str .= ''; + $str .= ''.$value['name'].''; + list($uname,$domain) = split('@',$value['value']); + if( ereg( 'readonly', $value['attrs'] ) ) { + $str .= '

'.$value['value'].'

'; + } else { + $str .= ''; + if( count($value['domains']) == 1 ) { + $str .= ''; + $str .= '@'.htmlentities($value['domains'][0]).''; + } else { + $str .= '@'; + $str .= ''; + } + } + $str .= ''.$value['comment'].''; + $str .= ''."\n"; + break; case 'comment': $str .= ''; $str .= ''.$value['name'].''; @@ -113,6 +141,24 @@ $str .= ''.$value['comment'].''; $str .= ''."\n"; break; + case 'checklist': + $str .= ''; + $str .= ''.$value['name'].''; + if( ereg( 'readonly', $value['attrs'] ) ) { + $str .= ''.(join('
',$value['options'])).''; + } else { + $str .= ''; + foreach( $value['options'] as $opt ) { + $checked = ( in_array($opt ,$value['value'] ))?"checked":""; + debug("Checking if $opt is in ".join(",",$value['value'])." :$checked"); + $str .= ''; + } + $str .= '
" + .htmlentities($opt).'
'; + } + $str .= ''.$value['comment'].''; + $str .= ''."\n"; + break; case 'select': $str .= ''; $str .= ''.$value['name'].''; @@ -241,15 +287,22 @@ foreach( $va as $v ) { //print "validating using $v
"; if( $v == 'notempty' ) { - //print "checking nonemptiness of $key: ".$_REQUEST[$key]." len=".strlen(trim($_REQUEST[$key]))."
"; + debug("checking nonemptiness of $key: ".$_REQUEST[$key]." len=".strlen(trim($_REQUEST[$key]))); if( $value['type'] == 'aclselect' ) { // ignore + } else if( $value['type'] == 'email' ) { + debug('Checking '.$value['name'].': '.$_REQUEST['user_'.$key]); + if( strlen(trim($_REQUEST['user_'.$key])) == 0 ) { + $this->errors[] = _('Required field ').$value['name']._(' is empty'); + } } else if( strlen( trim($_REQUEST[$key]) ) == 0 ) { $this->errors[] = _('Required field ').$value['name']._(' is empty'); } } else { if( $value['type'] == 'aclselect' ) { $data = $_REQUEST['user_'.$key].' '.$_REQUEST['perm_'.$key]; + } else if( $value['type'] == 'email' ) { + $data = trim($_REQUEST['user_'.$key]).'@'.trim($_REQUEST['domain_'.$key]); } else if( $value['type'] == 'resourcepolicy' ) { $i = 0; $data = array(); @@ -299,8 +352,12 @@ $this->entries[$k]['policies'] = $pols; } else if( $this->entries[$k]['type'] == 'checkbox' ) { $this->entries[$k]['value'] = isset( $_REQUEST[$k] ); + } else if( $this->entries[$k]['type'] == 'checklist' ) { + $this->entries[$k]['value'] = $_REQUEST[$k]; } else if( $this->entries[$k]['type'] == 'password' ) { $this->entries[$k]['value'] = $this->value($k); + } else if( $this->entries[$k]['type'] == 'email' ) { + $this->entries[$k]['value'] = trim($this->value('user_'.$k)).'@'.trim($this->value('domain_'.$k)); } else { $this->entries[$k]['value'] = trim($this->value($k)); } Index: ldap.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ldap.class.php 16 Jun 2005 00:32:10 -0000 1.24 +++ ldap.class.php 5 Jul 2005 10:31:51 -0000 1.25 @@ -1,6 +1,6 @@ * @@ -45,6 +45,7 @@ $this->is_bound = false; $this->bind_dn = false; $this->search_result = false; + $this->cached_domains = 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)) { @@ -128,19 +129,14 @@ function read( $dn ) { $result = ldap_read($this->connection, $dn, "(objectclass=*)"); if( !$result ) { - print $this->error(); return false; } $entry = ldap_first_entry($this->connection,$result); if( !$entry ) { - print $this->error(); ldap_free_result($result); return false; } $ldap_object = ldap_get_attributes($this->connection,$entry); - if( !$ldap_object ) { - print $this->error(); - } ldap_free_result($result); return $ldap_object; } @@ -288,6 +284,8 @@ if ($dn) { $group = 'user'; $filter = '(member='.$this->escape($dn).')'; + $result = $this->search( 'cn=domain-maintainer,cn=internal,'.$_SESSION['base_dn'], $filter); + if (ldap_count_entries($this->connection, $result) > 0) $group = 'domain-maintainer'; $result = $this->search( 'cn=maintainer,cn=internal,'.$_SESSION['base_dn'], $filter); if (ldap_count_entries($this->connection, $result) > 0) $group = 'maintainer'; $result = $this->search( 'cn=admin,cn=internal,'.$_SESSION["base_dn"], $filter); @@ -297,6 +295,35 @@ return $group; } + function domainsForMaintainerDn( $dn ) { + if( !$this->is_bound ) { + return false; + } + debug("\tdn=$dn"); + $domains = array(); + $filter = '(member='.$this->escape($dn).')'; + debug("filter:$filter"); + $result = $this->search( 'cn=domains,cn=internal,'.$_SESSION['base_dn'], $filter); + $entries = $this->getEntries(); + unset($entries['count']); + if( count($entries) > 0) { + foreach( $entries as $val ) { + debug("\tdomain=".$val['cn'][0]); + $domains[] = $val['cn'][0]; + } + } + return $domains; + } + + function domainsForMaintainerUid( $uid ) { + debug("domainsForMaintainer( $uid ):"); + $dn = $this->dnForUid($uid); + if($dn) { + return $this->domainsForMaintainerDn($dn); + } + return false; + } + // Get members of a group as an array of DNs function groupMembers( $base, $group ) { global $errors; @@ -374,6 +401,66 @@ return $count; } + function domains( $reload = false ) { + if( $reload || !$this->cached_domains ) { + $kolab_obj = $this->read( 'k=kolab,'.$_SESSION['base_dn'] ); + if( !$kolab_obj ) return false; + $this->cached_domains = $kolab_obj['postfix-mydestination']; + unset($this->cached_domains['count']); + debug("loading domains"); + } + debug("ldap->domains() returns ".join(", ", $this->cached_domains)); + return $this->cached_domains; + } + + function addToDomainGroups( $member, $domains ) { + foreach( $domains as $domain ) { + $domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn']; + $dom_obj = $this->read( $domgrpdn ); + if( !$dom_obj ) { + debug("+Adding group $domgrpdn with member $member"); + if( !ldap_add($this->connection, $domgrpdn, + array( 'objectClass' => array('top', 'kolabGroupOfNames'), + 'cn' => $domain, + 'member' => $member ) ) ) { + debug("Error adding domain group: ".ldap_error($this->connection)); + return false; + } + } else { + if( !in_array( $member, $dom_obj['member'] ) ) { + debug("+Adding member $member to $domgrpdn"); + if( !ldap_mod_add( $this->connection, $domgrpdn, array( 'member' => $member ) ) ) { + debug("Error adding $member to domain $domgrpdn: ".ldap_error($this->connection)); + return false; + } + } + } + } + return true; + } + + function removeFromDomainGroups( $member, $domains ) { + foreach( $domains as $domain ) { + $domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn']; + $dom_obj = $this->read( $domgrpdn ); + if( $dom_obj ) { + if( count( $dom_obj['member'] == 1 ) ) { + debug("-Removing group $domgrpdn"); + if( !ldap_delete( $this->connection, $domgrpdn ) ) { + debug("Error deleting domain group $domgrpdn: ".ldap_error($this->connection)); + return false; + } + } else { + debug("-Removing member $member from group $domgrpdn"); + if( !ldap_mod_del( $this->connection, $domgrpdn, array( 'member' => $member ) ) ) { + debug("Error deleting $member from domain $domgrpdn: ".ldap_error($this->connection)); + return false; + } + } + } + } + } + // Set deleflag on object, or if $delete_now is // true, just delete it function deleteObject( $dn, $delete_now = false ) { @@ -413,6 +500,7 @@ var $is_bound; var $bind_dn; var $search_result; + var $cached_domains; }; $ldap =& new KolabLDAP; Index: menu.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- menu.php 10 Mar 2005 21:58:19 -0000 1.12 +++ menu.php 5 Jul 2005 10:31:51 -0000 1.13 @@ -22,7 +22,7 @@ $menuitems = array(); -if( $auth->group() == "admin" || $auth->group() == "maintainer" ) { +if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer' ) { $menuitems['user'] = array( 'name' => _('Users'), 'url' => $topdir.'/user/', 'title' => _('Manage Email Users'), @@ -41,7 +41,7 @@ array( 'name' => _('Vacation'), 'url' => 'vacation.php' ))); } -if( $auth->group() == "admin" || $auth->group() == "maintainer" ) { +if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') { $menuitems['addressbook'] = array( 'name' => _('Addressbook'), 'url' => $topdir.'/addressbook/', 'title' => _('Manage Address Book'), @@ -55,7 +55,7 @@ array( 'name' => _('Add Shared Folder'), 'url' => 'sf.php?action=create' ))); } -if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) { +if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') { $menuitems['distlist'] = array( 'name' => _('Distribution Lists'), 'url' => $topdir.'/distributionlist/', 'title' => _('Manage Distribution Lists'), @@ -70,6 +70,12 @@ 'submenu' => array( array( 'name' => _('Create New Administrator'), 'url' => 'admin.php?action=create' ) ) ); + $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'), + 'url' => $topdir.'/domainmaintainer/', + 'title' => _('Manage Domain Maintainers'), + 'submenu' => array( + array( 'name' => _('Create New Domain Maintainer'), + 'url' => 'maintainer.php?action=create' ) ) ); } if( $auth->group() == 'admin' ) { $menuitems['maintainer'] = array( 'name' => _('Maintainers'), @@ -77,12 +83,14 @@ 'title' => _('Manage Maintainers'), 'submenu' => array( array( 'name' => _('Create New Maintainer'), - 'url' => 'maintainer.php?action=create' ) ) ); + 'url' => 'domainmaintainer.php?action=create' ) ) ); } else if( $auth->group() == 'maintainer' ) { $mdn = $auth->dn(); $menuitems['maintainer'] = array( 'name' => _('Maintainers'), 'url' => $topdir.'/maintainer/maintainer.php?action=modify&dn='.urlencode($mdn), 'title' => _('Manage Maintainer') ); +} else if( $auth->group() == 'domain-maintainer' ) { + // Domain maintainer } if( $auth->group() == 'admin' ) { $menuitems['service'] = array( 'name' => _('Services'), @@ -105,7 +113,7 @@ array( 'name' => _('KDE'), 'url' => 'kde.php' ) )); -if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) { +if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') { $menuitems['about']['submenu'][] = array( 'name' => _('Versions'), 'url' => 'versions.php' ); } From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:57 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES messages.po, 1.9, 1.10 Message-ID: <20050705103153.712E31006B1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES In directory doto:/tmp/cvs-serv9721/kolab-webadmin/php/admin/locale/de/LC_MESSAGES Modified Files: messages.po Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- messages.po 20 Jun 2005 16:59:22 -0000 1.9 +++ messages.po 5 Jul 2005 10:31:51 -0000 1.10 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kolab-messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-15 17:23+0200\n" +"POT-Creation-Date: 2005-07-03 16:26+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:216 +#: tpl_messages.php:221 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:168 +#: tpl_messages.php:122 tpl_messages.php:161 tpl_messages.php:173 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:169 -#: ../../../www/admin/user/user.php:736 ../../../www/admin/user/user.php:774 +#: tpl_messages.php:125 tpl_messages.php:162 tpl_messages.php:174 +#: ../../../www/admin/user/user.php:738 ../../../www/admin/user/user.php:776 #: ../../../www/admin/sharedfolder/sf.php:280 #: ../../../www/admin/administrator/admin.php:326 #: ../../../www/admin/distributionlist/list.php:298 -#: ../../../www/admin/addressbook/addr.php:244 +#: ../../../www/admin/addressbook/addr.php:272 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:165 tpl_messages.php:184 +#: tpl_messages.php:170 tpl_messages.php:189 msgid "Update" msgstr "Aktualisieren" -#: tpl_messages.php:91 tpl_messages.php:171 +#: tpl_messages.php:91 tpl_messages.php:176 msgid "Welcome to the Kolab administration interface" msgstr "Willkommen zur Kolab-Systemadministration" @@ -756,51 +756,60 @@ #: tpl_messages.php:159 #, fuzzy +msgid "Domains" +msgstr "enthält" + +#: tpl_messages.php:160 +msgid "Domain" +msgstr "" + +#: tpl_messages.php:163 tpl_messages.php:175 +msgid "Add" +msgstr "Hinzufügen" + +#: tpl_messages.php:164 +#, fuzzy msgid "Mail Filter Settings" msgstr "Meine Benutzereinstellungen" -#: tpl_messages.php:160 +#: tpl_messages.php:165 msgid "Check messages for mismatching From header and envelope from." msgstr "" -#: tpl_messages.php:161 +#: tpl_messages.php:166 msgid "" "Use the Sender header instead of From for the above checks if Sender is " "present." msgstr "" -#: tpl_messages.php:162 +#: tpl_messages.php:167 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 +#: tpl_messages.php:168 #, fuzzy msgid "Always reject the message." msgstr "Immer ablehnen" -#: tpl_messages.php:164 +#: tpl_messages.php:169 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 +#: tpl_messages.php:171 msgid "Kolab Hosts" msgstr "Kolab-Hosts" -#: tpl_messages.php:167 +#: tpl_messages.php:172 msgid "Host" msgstr "Host" -#: tpl_messages.php:170 -msgid "Add" -msgstr "Hinzufügen" - -#: tpl_messages.php:172 +#: tpl_messages.php:177 msgid "" "Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are " "the main driving force behind Kolab1&2. In addition to project management " @@ -810,7 +819,7 @@ "Haupt-Triebkraft hinter Kolab1&2 waren. Neben dem Projektmanagement hat " "Intevation auch den größten Teil der Qualitätssicherung übernommen." -#: tpl_messages.php:173 +#: tpl_messages.php:178 msgid "" "Intevation GmbH is a IT-company exclusively focusing on Free Software. Its " "business units are strategic consulting, project management and geographic " @@ -820,15 +829,15 @@ "Software befaßt. Ihre Geschäftseinheiten sind die strategische Beratung, " "Projektmanagement und geografische Informationssysteme." -#: tpl_messages.php:174 +#: tpl_messages.php:179 msgid "The following people worked on Kolab for Intevation:" msgstr "Die folgenden Mitarbeiter von Intevation haben an Kolab mitgewirkt:" -#: tpl_messages.php:175 +#: tpl_messages.php:180 msgid "Vacation Notification" msgstr "Benachrichtigungen bei Abwesenheit" -#: tpl_messages.php:176 +#: tpl_messages.php:181 msgid "" "Activate vacation notification (only one of vacation, forward and delivery " "to folder can be active at any time)" @@ -837,55 +846,55 @@ "nur entweder ein Abwesenheitsbenachrichtigungs-, Weiterleitungs- oder " "Zustellungsordner aktiviert sein)" -#: tpl_messages.php:177 +#: tpl_messages.php:182 msgid "Resend notification only after" msgstr "Benachrichtigung erst nach" -#: tpl_messages.php:178 +#: tpl_messages.php:183 msgid "days" msgstr "Tagen erneut senden" -#: tpl_messages.php:179 +#: tpl_messages.php:184 msgid "Send responses for these addresses:" msgstr "Antworten für diese Adressen schicken:" -#: tpl_messages.php:180 +#: tpl_messages.php:185 msgid "(one address per line)" msgstr "(Eine Adresse per Zeile)" -#: tpl_messages.php:181 +#: tpl_messages.php:186 msgid "Do not send vacation replies to spam messages" msgstr "Keine Abwesenheitsbenachrichtigungen auf Spamnachrichten senden" -#: tpl_messages.php:182 +#: tpl_messages.php:187 msgid "Only react to mail coming from domain" msgstr "Nur auf Nachrichten reagieren, die aus dieser Domäne kommen" -#: tpl_messages.php:183 +#: tpl_messages.php:188 msgid "(leave empty for all domains)" msgstr "(freilassen für alle Domänen)" -#: tpl_messages.php:185 +#: tpl_messages.php:190 msgid "Attribute" msgstr "Attribut" -#: tpl_messages.php:186 +#: tpl_messages.php:191 msgid "Value" msgstr "Wert" -#: tpl_messages.php:187 +#: tpl_messages.php:192 msgid "Comment" msgstr "Kommentar" -#: tpl_messages.php:188 ../../../www/admin/user/user.php:358 +#: tpl_messages.php:193 ../../../www/admin/user/user.php:358 #: ../../../www/admin/maintainer/maintainer.php:155 #: ../../../www/admin/administrator/admin.php:162 -#: ../../../www/admin/addressbook/addr.php:89 +#: ../../../www/admin/addressbook/addr.php:111 msgid "First Name" msgstr "Vorname" -#: tpl_messages.php:189 tpl_messages.php:191 tpl_messages.php:193 -#: tpl_messages.php:195 ../../../www/admin/user/user.php:350 +#: tpl_messages.php:194 tpl_messages.php:196 tpl_messages.php:198 +#: tpl_messages.php:200 ../../../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 @@ -895,35 +904,35 @@ #: ../../../www/admin/administrator/admin.php:164 #: ../../../www/admin/administrator/admin.php:167 #: ../../../www/admin/distributionlist/list.php:126 -#: ../../../www/admin/addressbook/addr.php:91 -#: ../../../www/admin/addressbook/addr.php:94 +#: ../../../www/admin/addressbook/addr.php:113 +#: ../../../www/admin/addressbook/addr.php:116 msgid "Required" msgstr "Obligatorisch" -#: tpl_messages.php:190 ../../../www/admin/user/user.php:361 +#: tpl_messages.php:195 ../../../www/admin/user/user.php:361 #: ../../../www/admin/maintainer/maintainer.php:158 #: ../../../www/admin/administrator/admin.php:165 -#: ../../../www/admin/addressbook/addr.php:92 +#: ../../../www/admin/addressbook/addr.php:114 msgid "Last Name" msgstr "Nachname" -#: tpl_messages.php:192 ../../../www/admin/user/user.php:364 +#: tpl_messages.php:197 ../../../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:194 ../../../www/admin/user/user.php:368 +#: tpl_messages.php:199 ../../../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:196 ../../../www/admin/user/user.php:372 +#: tpl_messages.php:201 ../../../www/admin/user/user.php:372 msgid "Primary Email Address" msgstr "Primäre E-Mail-Adresse" -#: tpl_messages.php:197 ../../../www/admin/user/user.php:349 +#: tpl_messages.php:202 ../../../www/admin/user/user.php:349 #: ../../../www/admin/user/user.php:351 #: ../../../www/admin/sharedfolder/sf.php:124 #: ../../../www/admin/maintainer/maintainer.php:148 @@ -931,91 +940,91 @@ msgid "Required, non volatile" msgstr "Obligatorisch, nicht-flüchtig" -#: tpl_messages.php:198 ../../../www/admin/user/user.php:393 -#: ../../../www/admin/addressbook/addr.php:95 +#: tpl_messages.php:203 ../../../www/admin/user/user.php:395 +#: ../../../www/admin/addressbook/addr.php:117 msgid "Title" msgstr "Titel" -#: tpl_messages.php:199 +#: tpl_messages.php:204 msgid "Email Alias" msgstr "E-Mail-Aliasnamen" -#: tpl_messages.php:200 ../../../www/admin/user/user.php:402 -#: ../../../www/admin/addressbook/addr.php:101 +#: tpl_messages.php:205 ../../../www/admin/user/user.php:404 +#: ../../../www/admin/addressbook/addr.php:124 msgid "Organisation" msgstr "Organisation" -#: tpl_messages.php:201 ../../../www/admin/user/user.php:403 -#: ../../../www/admin/addressbook/addr.php:102 +#: tpl_messages.php:206 ../../../www/admin/user/user.php:405 +#: ../../../www/admin/addressbook/addr.php:125 msgid "Organisational Unit" msgstr "Organisationseinheit" -#: tpl_messages.php:202 ../../../www/admin/user/user.php:404 -#: ../../../www/admin/addressbook/addr.php:103 +#: tpl_messages.php:207 ../../../www/admin/user/user.php:406 +#: ../../../www/admin/addressbook/addr.php:126 msgid "Room Number" msgstr "Zimmernummer" -#: tpl_messages.php:203 ../../../www/admin/user/user.php:405 -#: ../../../www/admin/addressbook/addr.php:104 +#: tpl_messages.php:208 ../../../www/admin/user/user.php:407 +#: ../../../www/admin/addressbook/addr.php:127 msgid "Street Address" msgstr "Straßenanschrift" -#: tpl_messages.php:204 ../../../www/admin/user/user.php:406 +#: tpl_messages.php:209 ../../../www/admin/user/user.php:408 msgid "Postbox" msgstr "Postfach" -#: tpl_messages.php:205 ../../../www/admin/user/user.php:407 -#: ../../../www/admin/addressbook/addr.php:106 +#: tpl_messages.php:210 ../../../www/admin/user/user.php:409 +#: ../../../www/admin/addressbook/addr.php:129 msgid "Postal Code" msgstr "Postleitzahl" -#: tpl_messages.php:206 ../../../www/admin/user/user.php:408 -#: ../../../www/admin/addressbook/addr.php:107 +#: tpl_messages.php:211 ../../../www/admin/user/user.php:410 +#: ../../../www/admin/addressbook/addr.php:130 msgid "City" msgstr "Stadt" -#: tpl_messages.php:207 ../../../www/admin/user/user.php:409 -#: ../../../www/admin/addressbook/addr.php:108 +#: tpl_messages.php:212 ../../../www/admin/user/user.php:411 +#: ../../../www/admin/addressbook/addr.php:131 msgid "Country" msgstr "Land" -#: tpl_messages.php:208 ../../../www/admin/user/user.php:410 -#: ../../../www/admin/addressbook/addr.php:109 +#: tpl_messages.php:213 ../../../www/admin/user/user.php:412 +#: ../../../www/admin/addressbook/addr.php:132 msgid "Telephone Number" msgstr "Telefonnummer" -#: tpl_messages.php:209 ../../../www/admin/user/user.php:411 -#: ../../../www/admin/addressbook/addr.php:110 +#: tpl_messages.php:214 ../../../www/admin/user/user.php:413 +#: ../../../www/admin/addressbook/addr.php:133 msgid "Fax Number" msgstr "Faxnummer" -#: tpl_messages.php:210 ../include/menu.php:45 +#: tpl_messages.php:215 ../include/menu.php:45 msgid "Addressbook" msgstr "Adressbuch" -#: tpl_messages.php:211 +#: tpl_messages.php:216 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:212 +#: tpl_messages.php:217 msgid "User Quota in KB" msgstr "Plattenplatz des Benutzers in KBytes" -#: tpl_messages.php:213 ../../../www/admin/user/user.php:414 +#: tpl_messages.php:218 ../../../www/admin/user/user.php:416 msgid "Leave blank for unlimited" msgstr "Freilassen für unbegrenzten Platz" -#: tpl_messages.php:214 ../include/form.class.php:40 +#: tpl_messages.php:219 ../include/form.class.php:40 msgid "Submit" msgstr "Absenden" -#: tpl_messages.php:215 +#: tpl_messages.php:220 msgid "The administrator with DN" msgstr "Der Administrator mit DN" -#: tpl_messages.php:217 +#: tpl_messages.php:222 msgid "Back to list of administrators" msgstr "Zurück zur Liste der Administratoren" @@ -1083,7 +1092,7 @@ msgstr "endete mit" #: ../../../www/admin/user/user.php:69 -#: ../../../www/admin/addressbook/addr.php:63 +#: ../../../www/admin/addressbook/addr.php:71 #, fuzzy msgid "User, vCard or distribution list with this email address already exists" msgstr "" @@ -1091,10 +1100,12 @@ "Adresse" #: ../../../www/admin/user/user.php:86 +#: ../../../www/admin/addressbook/addr.php:88 msgid "Email address " msgstr "E-Mail-Adresse" #: ../../../www/admin/user/user.php:86 ../../../www/admin/user/user.php:102 +#: ../../../www/admin/addressbook/addr.php:88 msgid " collision
" msgstr " Kollision
" @@ -1121,7 +1132,7 @@ #: ../../../www/admin/maintainer/maintainer.php:137 #: ../../../www/admin/administrator/admin.php:144 #: ../../../www/admin/distributionlist/list.php:116 -#: ../../../www/admin/addressbook/addr.php:76 +#: ../../../www/admin/addressbook/addr.php:101 msgid "Error: need valid action to proceed" msgstr "Fehler: kann nicht weitermachen ohne zulässige Aktion" @@ -1130,7 +1141,7 @@ #: ../../../www/admin/maintainer/maintainer.php:143 #: ../../../www/admin/administrator/admin.php:150 #: ../../../www/admin/distributionlist/list.php:122 -#: ../../../www/admin/addressbook/addr.php:82 +#: ../../../www/admin/addressbook/addr.php:104 msgid "Error: You don't have the required Permissions" msgstr "Fehler: Sie haben die erforderlichen Zugriffsrechte nicht" @@ -1145,54 +1156,54 @@ msgid "Leave blank to keep password unchanged" msgstr "Frei lassen, um das alte Passwort beizubehalten" -#: ../../../www/admin/user/user.php:375 +#: ../../../www/admin/user/user.php:377 msgid "Unique Identity (UID)" msgstr "Eindeutige Identität (UID)" -#: ../../../www/admin/user/user.php:377 +#: ../../../www/admin/user/user.php:379 msgid "Optional - Defaults to Primary Email Address" msgstr "Optional - Default ist die primäre E-Mail-Adresse" -#: ../../../www/admin/user/user.php:378 +#: ../../../www/admin/user/user.php:380 msgid "Mailbox Home Server" msgstr "Home-Server des E-Mail-Kontos" -#: ../../../www/admin/user/user.php:382 +#: ../../../www/admin/user/user.php:384 msgid "Account Type" msgstr "Kontotyp" -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "User Account" msgstr "Benutzerkonto" -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "Internal User Account" msgstr "Internes Benutzerkonto" -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "Group Account" msgstr "Gruppenkonto" -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "Resource Account" msgstr "Ressourcenkonto" -#: ../../../www/admin/user/user.php:386 +#: ../../../www/admin/user/user.php:388 msgid "" "NOTE: An internal user is a user that will not be visible in the address book" msgstr "" "ANMERKUNG: Ein interner Benutzer ist ein Benutzer, der nicht im Adressbuch " "angezeigt wird" -#: ../../../www/admin/user/user.php:387 +#: ../../../www/admin/user/user.php:389 msgid "Invitation Policy" msgstr "Einladungs-Policy" -#: ../../../www/admin/user/user.php:391 +#: ../../../www/admin/user/user.php:393 msgid "For automatic invitation handling" msgstr "Für das automatische Bearbeiten von Einladungen" -#: ../../../www/admin/user/user.php:392 +#: ../../../www/admin/user/user.php:394 msgid "" "NOTE: For regular accounts to use this feature, give the 'calendar' user " "access to the Calendar folder" @@ -1200,80 +1211,80 @@ "ANMERKUNG: Damit normale Konten diese Funktion verwenden können, muss der " "Benutzer 'calendar' Zugriff auf den Kalender-Ordner haben" -#: ../../../www/admin/user/user.php:394 +#: ../../../www/admin/user/user.php:396 msgid "Email Aliases" msgstr "E-Mail-Aliasnamen" -#: ../../../www/admin/user/user.php:397 -#: ../../../www/admin/addressbook/addr.php:100 +#: ../../../www/admin/user/user.php:399 +#: ../../../www/admin/addressbook/addr.php:123 msgid "One address per line" msgstr "Eine Adresse per Zeile" -#: ../../../www/admin/user/user.php:398 +#: ../../../www/admin/user/user.php:400 msgid "Delegates" msgstr "Delegierungen" -#: ../../../www/admin/user/user.php:401 +#: ../../../www/admin/user/user.php:403 msgid "One Email address per line" msgstr "Eine E-Mail-Adresse per Zeile" -#: ../../../www/admin/user/user.php:413 +#: ../../../www/admin/user/user.php:415 msgid "User Quota in MBytes" msgstr "Plattenplatz des Benutzers in MBytes" -#: ../../../www/admin/user/user.php:425 +#: ../../../www/admin/user/user.php:427 msgid "Free/Busy interval in days" msgstr "Frei/Belegt-Intervall in Tagen" -#: ../../../www/admin/user/user.php:426 +#: ../../../www/admin/user/user.php:428 msgid "Leave blank for default (60 days)" msgstr "Freilassen für die Voreinstellung (60 Tage)" -#: ../../../www/admin/user/user.php:475 +#: ../../../www/admin/user/user.php:477 msgid "Could not encrypt password: " msgstr "Konnte Passwort nicht verschlüsseln: " -#: ../../../www/admin/user/user.php:570 +#: ../../../www/admin/user/user.php:572 msgid "" "Account DN could not be modified, distribution list visible in the address book" msgstr "" "Cochez ceci pour faire apparaître l'adresse de cet utilisateur
dans le " "carnet d'adresse" -#: tpl_messages.php:212 +#: tpl_messages.php:217 msgid "User Quota in KB" msgstr "Le quota de l'utilisateur en KB" -#: tpl_messages.php:213 ../../../www/admin/user/user.php:414 +#: tpl_messages.php:218 ../../../www/admin/user/user.php:416 msgid "Leave blank for unlimited" msgstr "Laissez vide pour non limité" -#: tpl_messages.php:214 ../include/form.class.php:40 +#: tpl_messages.php:219 ../include/form.class.php:40 msgid "Submit" msgstr "Soumettre" -#: tpl_messages.php:215 +#: tpl_messages.php:220 msgid "The administrator with DN" msgstr "L'administrateur avec le DN" -#: tpl_messages.php:217 +#: tpl_messages.php:222 msgid "Back to list of administrators" msgstr "Retour à la liste des administrateurs" @@ -1087,15 +1096,17 @@ msgstr "fini avec" #: ../../../www/admin/user/user.php:69 -#: ../../../www/admin/addressbook/addr.php:63 +#: ../../../www/admin/addressbook/addr.php:71 msgid "User, vCard or distribution list with this email address already exists" msgstr "L'utilisateur, vCard ou liste de distribution existe déjà" #: ../../../www/admin/user/user.php:86 +#: ../../../www/admin/addressbook/addr.php:88 msgid "Email address " msgstr "Adresse de messagerie" #: ../../../www/admin/user/user.php:86 ../../../www/admin/user/user.php:102 +#: ../../../www/admin/addressbook/addr.php:88 msgid " collision
" msgstr " collision
" @@ -1122,7 +1133,7 @@ #: ../../../www/admin/maintainer/maintainer.php:137 #: ../../../www/admin/administrator/admin.php:144 #: ../../../www/admin/distributionlist/list.php:116 -#: ../../../www/admin/addressbook/addr.php:76 +#: ../../../www/admin/addressbook/addr.php:101 msgid "Error: need valid action to proceed" msgstr "Erreur: une action valide est nécessaire pour continuer" @@ -1131,7 +1142,7 @@ #: ../../../www/admin/maintainer/maintainer.php:143 #: ../../../www/admin/administrator/admin.php:150 #: ../../../www/admin/distributionlist/list.php:122 -#: ../../../www/admin/addressbook/addr.php:82 +#: ../../../www/admin/addressbook/addr.php:104 msgid "Error: You don't have the required Permissions" msgstr "Erreur: Vous n'avez pas les permissions requises" @@ -1147,54 +1158,54 @@ msgid "Leave blank to keep password unchanged" msgstr "Laissez vide pour garder les mots de passe inchangés" -#: ../../../www/admin/user/user.php:375 +#: ../../../www/admin/user/user.php:377 msgid "Unique Identity (UID)" msgstr "Identité unique (UID)" -#: ../../../www/admin/user/user.php:377 +#: ../../../www/admin/user/user.php:379 msgid "Optional - Defaults to Primary Email Address" msgstr "Optionnel - Adresse de messagerie primaire par défaut" -#: ../../../www/admin/user/user.php:378 +#: ../../../www/admin/user/user.php:380 msgid "Mailbox Home Server" msgstr "Serveur contenant le compte de messagerie" -#: ../../../www/admin/user/user.php:382 +#: ../../../www/admin/user/user.php:384 msgid "Account Type" msgstr "Type de compte " -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "User Account" msgstr "Compte utilisateur" -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "Internal User Account" msgstr "Compte utilisateur interne" -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "Group Account" msgstr "Compte de groupe" -#: ../../../www/admin/user/user.php:384 +#: ../../../www/admin/user/user.php:386 msgid "Resource Account" msgstr "Compte de ressources" -#: ../../../www/admin/user/user.php:386 +#: ../../../www/admin/user/user.php:388 msgid "" "NOTE: An internal user is a user that will not be visible in the address book" msgstr "" "NOTE: Un utilisateur interne sera un utilisateur qui ne sera pas visible " "dans le carnet d'adresse" -#: ../../../www/admin/user/user.php:387 +#: ../../../www/admin/user/user.php:389 msgid "Invitation Policy" msgstr "Politique d'invitation" -#: ../../../www/admin/user/user.php:391 +#: ../../../www/admin/user/user.php:393 msgid "For automatic invitation handling" msgstr "Pour le gestion des invitation automatiques" -#: ../../../www/admin/user/user.php:392 +#: ../../../www/admin/user/user.php:394 msgid "" "NOTE: For regular accounts to use this feature, give the 'calendar' user " "access to the Calendar folder" @@ -1202,40 +1213,40 @@ "NOTE: Pour que les comptes classiques puissent utiliser cette " "fonctionnalité, donnez à l'utilisateur 'calendar' accès au dossier Calendrier" -#: ../../../www/admin/user/user.php:394 +#: ../../../www/admin/user/user.php:396 msgid "Email Aliases" msgstr "Alias de messagerie" -#: ../../../www/admin/user/user.php:397 -#: ../../../www/admin/addressbook/addr.php:100 +#: ../../../www/admin/user/user.php:399 +#: ../../../www/admin/addressbook/addr.php:123 msgid "One address per line" msgstr "Une adresse par ligne" -#: ../../../www/admin/user/user.php:398 +#: ../../../www/admin/user/user.php:400 msgid "Delegates" msgstr "Delegués" -#: ../../../www/admin/user/user.php:401 +#: ../../../www/admin/user/user.php:403 msgid "One Email address per line" msgstr "Une adresse par ligne" -#: ../../../www/admin/user/user.php:413 +#: ../../../www/admin/user/user.php:415 msgid "User Quota in MBytes" msgstr "Quota utilisateur en MBytes" -#: ../../../www/admin/user/user.php:425 +#: ../../../www/admin/user/user.php:427 msgid "Free/Busy interval in days" msgstr "Options de disponibilités en jours" -#: ../../../www/admin/user/user.php:426 +#: ../../../www/admin/user/user.php:428 msgid "Leave blank for default (60 days)" msgstr "Laisser vide pour les défauts (60 jours)" -#: ../../../www/admin/user/user.php:475 +#: ../../../www/admin/user/user.php:477 msgid "Could not encrypt password: " msgstr "Impossible de crypter le mot de passe: " -#: ../../../www/admin/user/user.php:570 +#: ../../../www/admin/user/user.php:572 msgid "" "Account DN could not be modified, distribution list AttributeValueComment" msgstr "AttributValeurCommentaire" -#: ../include/form.class.php:179 +#: ../include/form.class.php:137 +msgid "Yes" +msgstr "" + +#: ../include/form.class.php:137 +msgid "No" +msgstr "" + +#: ../include/form.class.php:206 msgid "Always accept" msgstr "Toujours accepter" -#: ../include/form.class.php:180 +#: ../include/form.class.php:207 msgid "Always reject" msgstr "Toujours rejeter" -#: ../include/form.class.php:181 +#: ../include/form.class.php:208 msgid "Reject if conflicts" msgstr "Rejeter si il y a conflit" -#: ../include/form.class.php:182 +#: ../include/form.class.php:209 msgid "Manual if conflicts" msgstr "Passer en mode manuel si il y a conflit" -#: ../include/form.class.php:183 +#: ../include/form.class.php:210 msgid "Manual" msgstr "Manuel" -#: ../include/form.class.php:229 +#: ../include/form.class.php:216 ../include/form.class.php:222 +msgid "Anyone" +msgstr "" + +#: ../include/form.class.php:278 ../include/form.class.php:281 msgid "Required field " msgstr "Champ " -#: ../include/form.class.php:229 +#: ../include/form.class.php:278 ../include/form.class.php:281 msgid " is empty" msgstr "est vide" From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:57 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES messages.po, 1.1, 1.2 Message-ID: <20050705103153.92ADA1006C4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES In directory doto:/tmp/cvs-serv9721/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES Modified Files: messages.po Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) Index: messages.po =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- messages.po 17 Jun 2005 15:19:16 -0000 1.1 +++ messages.po 5 Jul 2005 10:31:51 -0000 1.2 @@ -6,104 +6,103 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-06-08 12:24+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-07-03 16:26+0200\n" "PO-Revision-Date: 2005-06-16 19:35+0200\n" "Last-Translator: Vincent Seynhaeve \n" -"Language-Team: Néerlandais \n" +"Language-Team: Nerlandais \n" [...2592 lines suppressed...] +msgstr "Kon geen verbinding maken met LDAP server" + +#: ../include/auth.class.php:83 ../include/auth.class.php:87 +msgid "Wrong username or password" +msgstr "Verkeerde gebruikersnaam of wachtwoord" + +#: ../include/auth.class.php:92 +msgid "Please log in as a valid user" +msgstr "Gelieve aan te melden als een geldige gebruiker" + +#: ../include/ldap.class.php:53 +msgid "" +"Error setting LDAP protocol to v3. Please contact your system administrator" +msgstr "" +"Fout met instelling LDAP protocol to v3. Gelieve contact op te nemen met uw " +"systeembeheerder " + +#: ../include/ldap.class.php:308 +msgid "LDAP Error: Can't read maintainers group: " +msgstr "LDAP fout: Can't read maintainers group" From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:58 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php, NONE, 1.1 index.php, NONE, 1.1 Message-ID: <20050705103153.9F9861006C5@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer In directory doto:/tmp/cvs-serv9721/kolab-webadmin/www/admin/domainmaintainer Added Files: domainmaintainer.php index.php Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) --- NEW FILE: domainmaintainer.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: index.php --- (This appears to be a binary file; contents omitted.) From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:58 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates domainmaintainerlistall.tpl, NONE, 1.1 service.tpl, 1.5, 1.6 Message-ID: <20050705103153.A22771006CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv9721/kolab-webadmin/php/admin/templates Modified Files: service.tpl Added Files: domainmaintainerlistall.tpl Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) --- NEW FILE: domainmaintainerlistall.tpl --- {* Smarty Template *} {* Local variables: buffer-file-coding-system: utf-8 End: *}
{section name=id loop=$entries} {if $entries[id].deleted neq "FALSE"} {else} {/if} {/section}
{tr msg="Name"}{tr msg="UID"}Domains{tr msg="Action"}
{$entries[id].sn|escape:"html"}, {$entries[id].fn|escape:"html"} {$entries[id].uid|escape:"html"} {$entries[id].domains|escape:"html"}{tr msg="Object Deleted, awaiting cleanup..."}{tr msg="Modify"} {tr msg="Delete"}
Index: service.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- service.tpl 15 Jun 2005 11:11:43 -0000 1.5 +++ service.tpl 5 Jul 2005 10:31:51 -0000 1.6 @@ -103,6 +103,31 @@
+

{tr msg="Domains"}

+ + + + +{section name=id loop=$postfixmydestination} + + + + +{/section} + + + + + +
{tr msg="Domain"}{tr msg="Action"}
{$postfixmydestination[id]|escape:"html"}{strip} +
+ + +
+ {/strip}
+ +
+

{tr msg="Mail Filter Settings"}

From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:59 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.22, 1.23 Message-ID: <20050705103153.BC4361006CD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service In directory doto:/tmp/cvs-serv9721/kolab-webadmin/www/admin/service Modified Files: index.php Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- index.php 10 Jun 2005 23:54:37 -0000 1.22 +++ index.php 5 Jul 2005 10:31:51 -0000 1.23 @@ -42,6 +42,7 @@ global $quotawarn; global $freebusypast; global $postfixmydomain; + global $postfixmydestination; global $postfixmynetworks; global $postfixallowunauth; global $postfixrelayhost; @@ -67,6 +68,8 @@ $quotawarn = $attrs['cyrus-quotawarn'][0]; $freebusypast = $attrs['kolabFreeBusyPast'][0]; $postfixmydomain = $attrs['postfix-mydomain'][0]; + $postfixmydestination = $attrs['postfix-mydestination']; + unset($postfixmydestination['count']); unset( $attrs['postfix-mynetworks']['count'] ); $postfixmynetworks = join(', ',$attrs['postfix-mynetworks']); $postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0]; @@ -202,10 +205,37 @@ } } +// Delete domain +if( $_REQUEST['deletedestination'] ) { + extract_ldap_values(); + $key = array_search( trim($_REQUEST['adestination']),$postfixmydestination); + if( $key !== false ) { + unset( $postfixmydestination[ $key ] ); + } + $attrs = array(); + $attrs['postfix-mydestination'] = $postfixmydestination; + 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); + } +} +// Add domain +if( $_REQUEST['adddestination'] ) { + extract_ldap_values(); + if( trim($_REQUEST['adestination']) ) { + $postfixmydestination[] = trim($_REQUEST['adestination']); + $attrs = array(); + $attrs['postfix-mydestination'] = $postfixmydestination; + 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); + } + } +} +// Delete kolabhost if( $_REQUEST['deletekolabhost'] ) { extract_ldap_values(); - $key = array_search($_REQUEST['akolabhost'],$kolabhost); + $key = array_search( trim($_REQUEST['akolabhost']),$kolabhost); if( $key !== false ) { unset( $kolabhost[ $key ] ); } @@ -216,6 +246,8 @@ .ldap_error($ldap->connection); } } + +// Add kolabhost if( $_REQUEST['addkolabhost'] ) { extract_ldap_values(); if( trim($_REQUEST['akolabhost']) ) { @@ -260,6 +292,7 @@ $smarty->assign( 'quotawarn', $quotawarn ); $smarty->assign( 'httpallowunauthfb', toboolstr($httpallowunauthfb) ); $smarty->assign( 'freebusypast', $freebusypast ); +$smarty->assign( 'postfixmydestination', $postfixmydestination ); $smarty->assign( 'postfixmynetworks', $postfixmynetworks ); $smarty->assign( 'postfixallowunauth', toboolstr($postfixallowunauth) ); $smarty->assign( 'postfixrelayhost', $postfixrelayhost ); From cvs at intevation.de Tue Jul 5 12:31:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:31:59 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php, 1.12, 1.13 user.php, 1.62, 1.63 Message-ID: <20050705103153.C1F091006CE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv9721/kolab-webadmin/www/admin/user Modified Files: index.php user.php Log Message: multi-domain config (working) + per-domain maintainer config (not working yet) Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- index.php 22 Apr 2005 01:34:52 -0000 1.12 +++ index.php 5 Jul 2005 10:31:51 -0000 1.13 @@ -29,8 +29,9 @@ /**** Authentication etc. ***/ $sidx = 'user'; -if( $auth->group() != 'maintainer' && $auth->group() != 'admin') { - array_push($errors, _("Error: You don't have Permissions to access this Menu")); +if( $auth->group() != 'maintainer' && $auth->group() != 'admin' && $auth->group() != 'domain-maintainer' ) { + debug("auth->group=".$auth->group()); + array_push($errors, _("Error: You don't have Permissions to access this Menu")); } require_once('admin/include/menu.php'); @@ -87,7 +88,18 @@ default: $alphalimit = ''; } } - $filter = "(&($userfilter)$alphalimit(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))"; + $domains = $ldap->domainsForMaintainerDn($auth->dn()); + #debug_var_dump($domains); + if( is_array($domains) ) { + $domainfilter=''; + foreach( $domains as $dom ) { + $domainfilter .= '(mail=*@'.$ldap->escape($dom).')'; + } + if( $domainfilter ) $domainfilter = "(|$domainfilter)"; + } else { + $domainfilter= ""; + } + $filter = "(&($userfilter)$domainfilter$alphalimit(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))"; $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabDeleteflag' )); if( $result ) { Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- user.php 30 May 2005 11:53:35 -0000 1.62 +++ user.php 5 Jul 2005 10:31:51 -0000 1.63 @@ -54,16 +54,26 @@ function checkuniquemail( $form, $key, $value ) { debug("checkuniquemail( $form, $key, $value )"); global $ldap; + global $auth; $value = trim($value); if( $value == '' ) return _('Please enter an email address'); // Check that we are in the domain $kolab = $ldap->read( 'k=kolab,'.$_SESSION['base_dn'] ); - $domain = trim($kolab['postfix-mydomain'][0]); - debug("value=$value, domain=$domain"); - if( !endsWith( $value, '@'.$domain ) ) { - return _("Email address $value not in domain $domain"); + if( $auth->group() == 'domain-maintainer' ) { + $domains = $ldap->domainsForMaintainerDn($auth->dn()); + } else { + $domains = $kolab['postfix-mydestination']; + unset($domains['count']); + } + debug("value=$value, domain=$domains"); + $ok = false; + foreach( $domains as $domain ) { + if( endsWith( $value, '@'.$domain ) ) { + $ok = true; + } } + if(!$ok) return _("Email address $value not in domains ".join(", ", $domain)); if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) { return _('User, vCard or distribution list with this email address already exists'); @@ -336,9 +346,13 @@ // Check auth if (!$errors && $auth->group() != 'maintainer' && $auth->group() != 'admin' && + $auth->group() != 'domain-maintainer' && !($auth->group() == 'user' && $dn == $auth->dn() )) { array_push($errors, _("Error: You don't have the required Permissions") ); -} +} else if( $auth->group() == 'domain-maintainer' ) { + // TODO(steffen): Check that user is in correct domain(s) +} + if( !$errors && $auth->group() == 'user' && ($action == 'firstsave' || $action == 'kill' ) ) { $errors[] = _("Error: You don't have the required Permissions"); @@ -370,8 +384,10 @@ 'validation' => 'checkpw', 'comment' => $comment_password ), 'mail' => array( 'name' => _('Primary Email Address'), + 'type' => 'email', + 'domains' => $ldap->domains(), 'validation' => 'notempty', - 'comment' => $comment_mail ), + 'comment' => $comment_mail ), 'uid' => array( 'name' => _('Unique Identity (UID)'), 'validation' => 'checkuid', 'comment' => _('Optional - Defaults to Primary Email Address') ), @@ -483,7 +499,7 @@ } } } - $ldap_object['mail'] = trim( strtolower( $_POST['mail'] ) ); + $ldap_object['mail'] = trim( strtolower( $_POST['user_mail'] ) ).'@'.trim( strtolower( $_POST['domain_mail'] ) ); $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) ); if( $action == 'firstsave' ) { if ($ldap_object['uid'] == "") $ldap_object['uid'] = $ldap_object['mail']; @@ -624,10 +640,10 @@ unset($ldap_object['uid']); unset($ldap_object['kolabHomeServer']); } - debug_var_dump($ldap_object); if (!ldap_modify($ldap->connection, $dn, $ldap_object)) { array_push($errors, _("LDAP Error: Could not modify object $dn: ") .ldap_error($ldap->connection)); + debug_var_dump( $ldap_object ); } } // Check for collisions on alias From cvs at intevation.de Tue Jul 5 12:33:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:33:03 2005 Subject: steffen: server/perl-kolab perl-kolab.spec, 1.94, 1.95 perl-kolab.spec.in, 1.5, 1.6 Message-ID: <20050705103301.D0E1C1005A0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv9853 Modified Files: perl-kolab.spec perl-kolab.spec.in Log Message: better logging when running kolabconf Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- perl-kolab.spec 30 Jun 2005 11:12:09 -0000 1.94 +++ perl-kolab.spec 5 Jul 2005 10:32:59 -0000 1.95 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: 5.8.5 -Release: 20050630 +Release: 20050701 # list of sources Source0: perl-kolab-5.8.5.tar.gz Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- perl-kolab.spec.in 30 Jun 2005 11:12:09 -0000 1.5 +++ perl-kolab.spec.in 5 Jul 2005 10:32:59 -0000 1.6 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050630 +Release: 20050701 # list of sources Source0: perl-kolab-@VERSION@.tar.gz From cvs at intevation.de Tue Jul 5 12:33:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:33:03 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm, 1.16, 1.17 Message-ID: <20050705103301.DF15D1005C7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd In directory doto:/tmp/cvs-serv9853/Kolab-LDAP-Backend-slurpd Modified Files: slurpd.pm Log Message: better logging when running kolabconf Index: slurpd.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/slurpd.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- slurpd.pm 30 Jun 2005 15:52:48 -0000 1.16 +++ slurpd.pm 5 Jul 2005 10:32:59 -0000 1.17 @@ -277,8 +277,11 @@ if (!($select->can_read(1)) && $changes) { $changes = 0; Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed'); - Kolab::LDAP::sync; - system($ap::config->{sbindir}."/kolabconf"); + Kolab::LDAP::sync; + Kolab::log('SD', 'Running kolabconf'); + system($ap::config->{sbindir}."/kolabconf") == 0 + or Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR); + Kolab::log('SD', 'Kolabconf complete'); } Kolab::log('SD', 'Waiting for LDAP updates'); From cvs at intevation.de Tue Jul 5 12:40:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:40:16 2005 Subject: steffen: server/kolabd/kolabd kolab_bootstrap,1.15,1.16 Message-ID: <20050705104015.55EC71005A0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv9969 Modified Files: kolab_bootstrap Log Message: multidomain email Index: kolab_bootstrap =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- kolab_bootstrap 17 Jun 2005 18:02:59 -0000 1.15 +++ kolab_bootstrap 5 Jul 2005 10:40:13 -0000 1.16 @@ -434,7 +434,7 @@ 'kolabhost' => \@kolabhosts, 'postfix-mydomain' => $domain, #'postfix-relaydomains' => "", - 'postfix-mydestination' => "\$mydomain", + 'postfix-mydestination' => "$domain", 'postfix-mynetworks' => $mynetworkinterfaces, #'postfix-relayhost' => "", #'postfix-transport' => "", @@ -470,6 +470,14 @@ $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error; undef $ldapobject; + # create domain groups topnode + $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=domains,cn=internal,$base_dn" ); + $ldapobject->replace('cn' => 'domains', 'objectclass' => ['top','kolabnamedobject']); + $ldapobject->dn("cn=domains,cn=internal,$base_dn"); + $mesg = $ldapobject->update($ldap); + $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error; + undef $ldapobject; + # create external user topnode $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=external,$base_dn" ); $ldapobject->replace('cn' => 'external', 'objectclass' => ['top','kolabnamedobject']); @@ -528,6 +536,9 @@ # create mainainter group newkolabgroupofnames( $ldap, "cn=internal,$base_dn", 'maintainer', $bind_dn ); + + # create domain-mainainter group + newkolabgroupofnames( $ldap, "cn=internal,$base_dn", 'domain-maintainer', $bind_dn ); $ldap->unbind; } From cvs at intevation.de Tue Jul 5 12:40:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:40:16 2005 Subject: steffen: server/kolabd/kolabd/templates session_vars.php.template, 1.3, 1.4 slapd.conf.template, 1.11, 1.12 Message-ID: <20050705104015.61E1F1005C7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv9969/templates Modified Files: session_vars.php.template slapd.conf.template Log Message: multidomain email Index: session_vars.php.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- session_vars.php.template 9 Apr 2005 08:54:44 -0000 1.3 +++ session_vars.php.template 5 Jul 2005 10:40:13 -0000 1.4 @@ -35,7 +35,7 @@ * 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' ); +$params['allow_user_classes'] = array( 'user', 'admin', 'maintainer', 'manager', 'domain-maintainer' ); /* * Array to configure visibility/access of LDAP attributes to user's account object Index: slapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- slapd.conf.template 1 Jun 2005 22:32:00 -0000 1.11 +++ slapd.conf.template 5 Jul 2005 10:40:13 -0000 1.12 @@ -67,9 +67,21 @@ 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 +## Domain test +#access to filter=(&(objectClass=kolabInetOrgPerson)(mail=*@)(|(!(alias=*))(alias=*@))) +# by group/kolabGroupOfNames="cn=,cn=domains,cn=internal,@@@base_dn@@@" write +# by * continue + +#access to dn="cn=domains,cn=internal,@@@base_dn@@@" +# by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write +# by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write +# by dn="cn=nobody,cn=internal,@@@base_dn@@@" read +# by group/kolabGroupOfNames="cn=,cn=domains,@@@base_dn@@@" read +# by * search stop + +#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 Tue Jul 5 12:40:30 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 12:40:30 2005 Subject: steffen: server/kolabd kolabd.spec,1.58,1.59 Message-ID: <20050705104030.176971005C7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv10027 Modified Files: kolabd.spec Log Message: multidomain email Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- kolabd.spec 1 Jul 2005 13:01:37 -0000 1.58 +++ kolabd.spec 5 Jul 2005 10:40:28 -0000 1.59 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050701 +Release: 20050703 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Tue Jul 5 18:32:29 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Jul 5 18:32:30 2005 Subject: martin: doc/kolab-formats events.sgml,1.12,1.13 Message-ID: <20050705163229.049C41005A0@lists.intevation.de> Author: martin Update of /kolabrepository/doc/kolab-formats In directory doto:/tmp/cvs-serv23062 Modified Files: events.sgml Log Message: Martin Konold: Add clarification about full day events. (Documents the current implicit implementation) Index: events.sgml =================================================================== RCS file: /kolabrepository/doc/kolab-formats/events.sgml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- events.sgml 11 Mar 2005 11:37:07 -0000 1.12 +++ events.sgml 5 Jul 2005 16:32:26 -0000 1.13 @@ -50,6 +50,10 @@ ]]> + +An event without a time but with a date associated is a full day event. Such a full day event may span +over multiple days and may have recurrances. + See for the description of the common fields See for the description of the incidence fields From cvs at intevation.de Wed Jul 6 00:51:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 00:51:43 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.23, 1.24 Message-ID: <20050705225142.6C2D61005D7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service In directory doto:/tmp/cvs-serv28201/kolab-webadmin/www/admin/service Modified Files: index.php Log Message: handle deletion of domains correctly. (but what about all the accounts in the deleted domain?) Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- index.php 5 Jul 2005 10:31:51 -0000 1.23 +++ index.php 5 Jul 2005 22:51:40 -0000 1.24 @@ -208,16 +208,25 @@ // Delete domain if( $_REQUEST['deletedestination'] ) { extract_ldap_values(); + debug_var_dump($_REQUEST['adestination']); $key = array_search( trim($_REQUEST['adestination']),$postfixmydestination); if( $key !== false ) { unset( $postfixmydestination[ $key ] ); } + $postfixmydestination = array_values( $postfixmydestination ); + debug_var_dump($postfixmydestination); $attrs = array(); $attrs['postfix-mydestination'] = $postfixmydestination; if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { - $errors[] = _("LDAP Error: failed to modify kolab configuration object: ") + $errors[] = _("LDAP Error: Failed to modify kolab configuration object: ") .ldap_error($ldap->connection); } + $domain_obj_dn = 'cn='.$ldap->escape(trim($_REQUEST['adestination'])).',cn=domains,cn=internal,'.$_SESSION['base_dn']; + debug("Trying to delete $domain_obj_dn"); + if( !$errors && $ldap->read($domain_obj_dn) && !ldap_delete($ldap->connection, $domain_obj_dn ) ) { + $errors[] = _("LDAP Error: Failed to delete domain object $domain_obj_dn: ") + .ldap_error($ldap->connection); + } } // Add domain if( $_REQUEST['adddestination'] ) { @@ -239,6 +248,7 @@ if( $key !== false ) { unset( $kolabhost[ $key ] ); } + $kolabhost = array_values( $kolabhost ); $attrs = array(); $attrs['kolabhost'] = $kolabhost; if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) { From cvs at intevation.de Wed Jul 6 12:40:09 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 12:40:10 2005 Subject: steffen: server/perl-kolab perl-kolab.spec, 1.95, 1.96 perl-kolab.spec.in, 1.6, 1.7 Message-ID: <20050706104009.3A1E610016A@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv11143 Modified Files: perl-kolab.spec perl-kolab.spec.in Log Message: Code for creating domain-maintainer related LDAP ACLs. We have to embed the config strings in the perl-code because the config-engine cant do loops (yet?) Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- perl-kolab.spec 5 Jul 2005 10:32:59 -0000 1.95 +++ perl-kolab.spec 6 Jul 2005 10:40:07 -0000 1.96 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: 5.8.5 -Release: 20050701 +Release: 20050706 # list of sources Source0: perl-kolab-5.8.5.tar.gz Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- perl-kolab.spec.in 5 Jul 2005 10:32:59 -0000 1.6 +++ perl-kolab.spec.in 6 Jul 2005 10:40:07 -0000 1.7 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050701 +Release: 20050706 # list of sources Source0: perl-kolab-@VERSION@.tar.gz From cvs at intevation.de Wed Jul 6 12:40:09 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 12:40:11 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.56,1.57 Message-ID: <20050706104009.4CD191006DF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv11143/Kolab-Conf Modified Files: Conf.pm Log Message: Code for creating domain-maintainer related LDAP ACLs. We have to embed the config strings in the perl-code because the config-engine cant do loops (yet?) Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- Conf.pm 30 Jun 2005 01:43:55 -0000 1.56 +++ Conf.pm 6 Jul 2005 10:40:07 -0000 1.57 @@ -442,6 +442,85 @@ Kolab::log('T', 'Finished building Cyrus groups', KOLAB_DEBUG ); } +sub buildLDAPAccess +{ + Kolab::log('T', 'Building LDAP access file', KOLAB_DEBUG); + my $prefix = $Kolab::config{'prefix'}; + my $cfg = "$ap::config->{sysconfdir}/openldap/slapd.access"; + my $oldcfg = $cfg . '.old'; + + my $oldmask = umask 077; + copy($cfg, $oldcfg); + chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg); + copy("$ap::config->{sysconfdir}/kolab/templates/slapd.access.template", $cfg); + my $access; + if (!($access = IO::File->new($cfg, 'a'))) { + Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR); + exit(1); + } + + my $global_acl = <<'EOS'; +# Domain specific access +access to filter=(&(objectClass=kolabInetOrgPerson)(mail=*@@@@domain@@@)(|(!(alias=*))(alias=*@@@@domain@@@))) + by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write + by * continue + +access to filter=(&(objectClass=kolabGroupOfNames)(mail=*@@@@domain@@@)) + by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write + by * continue + +EOS + + my $dom_acl1 = << 'EOS'; +# Access to domain groups +access to dn.children="cn=domains,cn=internal,@@@base_dn@@@" + by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write + by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write + by dn="cn=nobody,cn=internal,@@@base_dn@@@" read +EOS + my $dom_acl2 = << 'EOS'; + by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" read +EOS + my $dom_acl3 = << 'EOS'; + by * search stop + +EOS + + my $str; + my $domain; + my @domains; + if( ref($Kolab::config{'postfix-mydestination'}) eq 'ARRAY' ) { + @domains = @{$Kolab::config{'postfix-mydestination'}}; + } else { + @domains =( $Kolab::config{'postfix-mydestination'} ); + } + + ($str = $dom_acl1) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g; + print $access $str; + + foreach $domain (@domains) { + ($str = $dom_acl2) =~ s/\@{3}domain\@{3}/$domain/g; + $str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g; + print $access $str; + } + + ($str = $dom_acl3) =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g; + print $access $str; + + foreach $domain (@domains) { + ($str = $global_acl) =~ s/\@{3}domain\@{3}/$domain/g; + $str =~ s/\@{3}base_dn\@{3}/$Kolab::config{'base_dn'}/g; + print $access $str; + Kolab::log('T', "Adding acl for domain '$str'"); + } + + $access->close; + + chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg); + + Kolab::log('T', 'Finished building LDAP access file', KOLAB_DEBUG ); +} + sub buildLDAPReplicas { Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG); @@ -652,6 +731,7 @@ buildPostfixTransportMap; buildPostfixVirtualMap; + buildLDAPAccess; buildLDAPReplicas; buildCyrusConfig; buildCyrusGroups; From cvs at intevation.de Wed Jul 6 12:42:38 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 12:42:39 2005 Subject: steffen: server/kolabd kolabd.spec,1.59,1.60 Message-ID: <20050706104238.B27C21006DF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv11222 Modified Files: kolabd.spec Log Message: Template for domain-maintainer related LDAP ACLs. Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- kolabd.spec 5 Jul 2005 10:40:28 -0000 1.59 +++ kolabd.spec 6 Jul 2005 10:42:36 -0000 1.60 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050703 +Release: 20050706 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Wed Jul 6 12:42:38 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 12:42:40 2005 Subject: steffen: server/kolabd/kolabd/templates slapd.access.template, NONE, 1.1 slapd.conf.template, 1.12, 1.13 Message-ID: <20050706104238.C41E3101EF8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv11222/kolabd/templates Modified Files: slapd.conf.template Added Files: slapd.access.template Log Message: Template for domain-maintainer related LDAP ACLs. --- NEW FILE: slapd.access.template --- ## Copyright (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. # Domain ACL statements for inclusion in slapd.conf Index: slapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- slapd.conf.template 5 Jul 2005 10:40:13 -0000 1.12 +++ slapd.conf.template 6 Jul 2005 10:42:36 -0000 1.13 @@ -67,21 +67,14 @@ index kolabHomeServer pres,eq index member pres,eq -## Domain test -#access to filter=(&(objectClass=kolabInetOrgPerson)(mail=*@)(|(!(alias=*))(alias=*@))) -# by group/kolabGroupOfNames="cn=,cn=domains,cn=internal,@@@base_dn@@@" write -# by * continue +include @l_prefix@/etc/openldap/slapd.access -#access to dn="cn=domains,cn=internal,@@@base_dn@@@" -# by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write -# by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write -# by dn="cn=nobody,cn=internal,@@@base_dn@@@" read -# by group/kolabGroupOfNames="cn=,cn=domains,@@@base_dn@@@" read -# by * search stop +access to dn="@@@base_dn@@@" attrs=children + by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,@@@base_dn@@@" write -#access to dn.subtree="cn=Monitor" -# by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write -# by * none stop +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 @@ -164,8 +157,9 @@ access to dn="k=kolab,@@@base_dn@@@" by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" read + by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,@@@base_dn@@@" read by dn="cn=nobody,cn=internal,@@@base_dn@@@" read - by * none stop + by * none stop access to * by self write From cvs at intevation.de Wed Jul 6 12:43:08 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 12:43:09 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.25, 1.26 Message-ID: <20050706104308.D779D1006DF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv11264/kolab-webadmin/php/admin/include Modified Files: ldap.class.php Log Message: access to user page Index: ldap.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ldap.class.php 5 Jul 2005 10:31:51 -0000 1.25 +++ ldap.class.php 6 Jul 2005 10:43:06 -0000 1.26 @@ -292,6 +292,7 @@ if (ldap_count_entries($this->connection, $result) > 0) $group = 'admin'; if ($result) $this->freeSearchResult(); } + debug("groupForUid( $uid) = $group"); return $group; } From cvs at intevation.de Wed Jul 6 12:43:08 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 12:43:10 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.63, 1.64 Message-ID: <20050706104308.EB413101EF8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv11264/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: access to user page Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- user.php 5 Jul 2005 10:31:51 -0000 1.63 +++ user.php 6 Jul 2005 10:43:06 -0000 1.64 @@ -385,7 +385,7 @@ 'comment' => $comment_password ), 'mail' => array( 'name' => _('Primary Email Address'), 'type' => 'email', - 'domains' => $ldap->domains(), + 'domains' => ($auth->group()=='domain-maintainer')?$ldap->domainsForMaintainerDn($auth->dn()):$ldap->domains(), 'validation' => 'notempty', 'comment' => $comment_mail ), 'uid' => array( 'name' => _('Unique Identity (UID)'), @@ -425,7 +425,7 @@ $entries['c_0'] = array( 'name' => _('Country') ); $entries['telephoneNumber_0'] = array( 'name' => _('Telephone Number') ); $entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number') ); -if( $auth->group() == "admin" || $auth->group() == "maintainer" ) { +if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer' ) { $entries['cyrus-userquota'] = array( 'name' => _('User Quota in MBytes'), 'comment' => _('Leave blank for unlimited') ); } else { From cvs at intevation.de Wed Jul 6 15:55:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 15:55:40 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php, 1.9, 1.10 Message-ID: <20050706135539.8FABB101F19@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv18514 Modified Files: index.php Log Message: leave out domain-maintainers list Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- index.php 11 Mar 2005 09:11:15 -0000 1.9 +++ index.php 6 Jul 2005 13:55:37 -0000 1.10 @@ -57,7 +57,7 @@ $attrs = ldap_get_attributes($ldap->connection, $entry); $dn = ldap_get_dn($ldap->connection,$entry); $cn = $attrs['cn'][0]; - if( $cn != 'admin' && $cn != 'maintainer' ) { + if( $cn != 'admin' && $cn != 'maintainer' && $cn != 'domain-maintainer' ) { $kolabdeleteflag = $attrs['kolabdeleteflag'][0]; $kolabhomeserver = _('not yet implemented'); $internal = (strpos($dn,"cn=internal")!==false); From cvs at intevation.de Wed Jul 6 15:56:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Jul 6 15:56:13 2005 Subject: steffen: server README.1st,1.24,1.25 obmtool.conf,1.176,1.177 Message-ID: <20050706135612.37B40101F15@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv18552 Modified Files: README.1st obmtool.conf Log Message: versions Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- README.1st 27 Jun 2005 14:38:54 -0000 1.24 +++ README.1st 6 Jul 2005 13:56:10 -0000 1.25 @@ -215,6 +215,22 @@ There's nothing special to be done. +Upgrade from Kolab 2.0 to pre-2.1-snapshots +------------------------------------------- + +Manually add two LDAP objects: + +dn: cn=domains,cn=internal, +objectClass: top +objectClass: kolabNamedObject +cn: domains + +dn: cn=domain-maintainer,cn=internal, +objectClass: top +objectClass: kolabGroupOfNames +cn: domain-maintainer +member: cn=manager,cn=internal, + $Id$ Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.176 retrieving revision 1.177 diff -u -d -r1.176 -r1.177 --- obmtool.conf 28 Jun 2005 12:55:16 -0000 1.176 +++ obmtool.conf 6 Jul 2005 13:56:10 -0000 1.177 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.1-snapshot-20050628"; + kolab_version="pre-2.1-snapshot-20050706"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -84,7 +84,7 @@ @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 + @install ${altloc}perl-kolab-5.8.5-20050706 @install ${altloc}imapd-2.2.12-2.3.0_kolab5 --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 @@ -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-20050615 --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 + @install ${altloc}kolabd-1.9.4-20050706 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050706 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050701 --define kolab_version=$kolab_version @check if test ! -e "/usr/bin/kolab" ; then From cvs at intevation.de Thu Jul 7 12:47:02 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 7 12:47:03 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include debug.php, 1.9, 1.10 Message-ID: <20050707104702.5D869101F07@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv3970/kolab-webadmin/php/admin/include Modified Files: debug.php Log Message: per-domain distlists Index: debug.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/debug.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- debug.php 7 Apr 2005 08:36:36 -0000 1.9 +++ debug.php 7 Jul 2005 10:47:00 -0000 1.10 @@ -28,7 +28,7 @@ function debug_var_dump($var) { #print '
';
     #var_dump($var);
-    #print '
'; + #print ''; } function backtrace() { $debug_array = debug_backtrace(); From cvs at intevation.de Thu Jul 7 12:47:02 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 7 12:47:04 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php, 1.10, 1.11 list.php, 1.16, 1.17 Message-ID: <20050707104702.6F35D101F09@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv3970/kolab-webadmin/www/admin/distributionlist Modified Files: index.php list.php Log Message: per-domain distlists Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- index.php 6 Jul 2005 13:55:37 -0000 1.10 +++ index.php 7 Jul 2005 10:47:00 -0000 1.11 @@ -30,7 +30,8 @@ /**** Authentication etc. ***/ $sidx = 'distlist'; -if( $auth->group() != 'maintainer' && $auth->group() != 'admin') { +$group = $auth->group(); +if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer' ) { array_push($errors, _("Error: You don't have Permissions to access this Menu") ); } @@ -45,7 +46,7 @@ if( !$errors ) { if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn']; else $base_dn = 'k=kolab'; - $filter = "(&(cn=*)(objectclass=kolabGroupOfNames))"; + $filter = "(&(!(cn=domans))(objectclass=kolabGroupOfNames))"; $result = ldap_search($ldap->connection, $base_dn, $filter); if( $result ) { $count = ldap_count_entries($ldap->connection, $result); @@ -57,7 +58,8 @@ $attrs = ldap_get_attributes($ldap->connection, $entry); $dn = ldap_get_dn($ldap->connection,$entry); $cn = $attrs['cn'][0]; - if( $cn != 'admin' && $cn != 'maintainer' && $cn != 'domain-maintainer' ) { + if( $cn != 'admin' && $cn != 'maintainer' && $cn != 'domain-maintainer' + && !preg_match('/.*,cn=domains,cn=internal,'.$_SESSION['base_dn'].'/', $dn ) ) { $kolabdeleteflag = $attrs['kolabdeleteflag'][0]; $kolabhomeserver = _('not yet implemented'); $internal = (strpos($dn,"cn=internal")!==false); Index: list.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- list.php 27 Apr 2005 19:47:49 -0000 1.16 +++ list.php 7 Jul 2005 10:47:00 -0000 1.17 @@ -32,7 +32,8 @@ $contenttemplate = 'formcontainer.tpl'; $valid_actions = array('firstsave','save','modify','create','delete','kill'); -if( $auth->group() != 'maintainer' && $auth->group() != 'admin') { +$group = $auth->group(); +if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer' ) { array_push($errors, _("Error: You don't have Permissions to access this Menu") ); } @@ -52,24 +53,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' ) { // Here we have the required hack again: // email address is @default-domain - $kolab = $ldap->read( 'k=kolab,'.$_SESSION['base_dn'] ); - for( $i = 0; $i < $kolab['postfix-mydomain']['count']; $i++ ) { - $domain = $kolab['postfix-mydomain'][$i]; - if( $ldap->countMail( $_SESSION['base_dn'], $value.'@'.$domain ) > 0 ) { - return _('User or distribution list with this email address already exists'); - } + if( $ldap->countMail( $_SESSION['base_dn'], $value ) > 0 ) { + return _('User or distribution list with this email address already exists'); } } return ''; @@ -118,10 +108,11 @@ $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") ); - $entries = array( 'cn' => array( 'name' => _('List Name'), + 'type' => 'email', + 'domains' => ($auth->group()=='domain-maintainer') + ?$ldap->domainsForMaintainerDn($auth->dn()) + :$ldap->domains(), 'validation' => 'notempty', 'comment' => _('Required') ), 'members' => array( 'name' => _('Members'), @@ -170,11 +161,11 @@ if (!$visible) $dl_root = "cn=internal,".$dl_root; $ldap_object = array('objectClass' => 'kolabGroupOfNames'); - $cn = strtolower(trim($_POST['cn'])); + $cn = strtolower(trim( trim($_POST['user_cn']).'@'.$_POST['domain_cn'])); // Keep cn and mail in sync $ldap_object['cn'] = $cn; - $ldap_object['mail'] = $cn.'@'.mail_domain(); + $ldap_object['mail'] = $cn; $ldap_object['member'] = array(); $lst = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', trim($_POST['members']) ) ), 'strlen') ); From cvs at intevation.de Thu Jul 7 12:47:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 7 12:47:27 2005 Subject: steffen: server/kolabd kolabd.spec,1.60,1.61 Message-ID: <20050707104726.C9825101F09@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv4031 Modified Files: kolabd.spec Log Message: domain-maintainers need access to cn=internal Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- kolabd.spec 6 Jul 2005 10:42:36 -0000 1.60 +++ kolabd.spec 7 Jul 2005 10:47:24 -0000 1.61 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050706 +Release: 20050707 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Thu Jul 7 12:47:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 7 12:47:28 2005 Subject: steffen: server/kolabd/kolabd/templates slapd.conf.template, 1.13, 1.14 Message-ID: <20050707104726.DA891101F0E@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv4031/kolabd/templates Modified Files: slapd.conf.template Log Message: domain-maintainers need access to cn=internal Index: slapd.conf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- slapd.conf.template 6 Jul 2005 10:42:36 -0000 1.13 +++ slapd.conf.template 7 Jul 2005 10:47:24 -0000 1.14 @@ -72,6 +72,9 @@ access to dn="@@@base_dn@@@" attrs=children by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,@@@base_dn@@@" write +access to dn="cn=internal,@@@base_dn@@@" attrs=children + by group/kolabGroupOfNames="cn=domain-maintainer,cn=internal,@@@base_dn@@@" write + access to dn.subtree="cn=Monitor" by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write by * none stop From cvs at intevation.de Thu Jul 7 15:25:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 7 15:25:37 2005 Subject: steffen: server obmtool.conf,1.174,1.174.2.1 Message-ID: <20050707132536.0F1A3101F15@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv698 Modified Files: Tag: kolab_2_0_branch obmtool.conf Log Message: updated zlib and clamav Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.174 retrieving revision 1.174.2.1 diff -u -d -r1.174 -r1.174.2.1 --- obmtool.conf 16 Jun 2005 03:07:29 -0000 1.174 +++ obmtool.conf 7 Jul 2005 13:25:33 -0000 1.174.2.1 @@ -65,7 +65,7 @@ @install ${loc}perl-crypto-5.8.5-2.2.0 @install ${loc}perl-net-5.8.5-2.2.0 @install ${loc}perl-mail-5.8.5-2.2.0 - @install ${loc}zlib-1.2.2-2.3.0 + @install ${loc}zlib-1.2.2-2.3.1 @install ${loc}perl-comp-5.8.5-2.2.0 @install ${loc}expat-1.95.8-2.2.0 @install ${loc}perl-ssl-5.8.5-2.2.0 @@ -128,7 +128,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 ${altloc}clamav-0.85.1-20050517 + @install ${altloc}clamav-0.86.1-20050624 @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 From cvs at intevation.de Thu Jul 7 23:18:49 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 7 23:18:51 2005 Subject: martin: server/kolabd/kolabd kolab2.schema,1.12,1.13 Message-ID: <20050707211849.615BB101F07@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv8083 Modified Files: kolab2.schema Log Message: Martin Konold: Made some attributes explicitly singe-valued and add new attributes for comments Index: kolab2.schema =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- kolab2.schema 11 Jun 2005 16:40:23 -0000 1.12 +++ kolab2.schema 7 Jul 2005 21:18:47 -0000 1.13 @@ -1,6 +1,6 @@ # $Id$ # (c) 2003, 2004 Tassilo Erlewein -# (c) 2003, 2004 Martin Konold +# (c) 2003-2005 Martin Konold # (c) 2003 Achim Frank # # Redistribution and use in source and binary forms, with or without @@ -143,7 +143,8 @@ NAME 'kolabFreeBusyFuture' DESC 'time in days for fb data towards the future' EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) # time span from now to the past used for the free busy data # measured in days @@ -151,7 +152,8 @@ NAME 'kolabFreeBusyPast' DESC 'time in days for fb data towards the past' EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) # fqdn of the server as the default SMTP MTA # not used in Kolab 2 currently as in Kolab 2 the @@ -161,7 +163,8 @@ DESC 'fqdn of default MTA' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} + SINGLE-VALUE ) # Begin date of Kolab vacation period. Sender will # be notified every kolabVacationResendIntervall days @@ -177,7 +180,8 @@ NAME 'kolabVacationBeginDateTime' DESC 'Begin date of vacation' EQUALITY generalizedTimeMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 + SINGLE-VALUE ) # End date of Kolab vacation period. Sender will # be notified every kolabVacationResendIntervall days @@ -193,7 +197,8 @@ NAME 'kolabVacationEndDateTime' DESC 'End date of vacation' EQUALITY generalizedTimeMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 + SINGLE-VALUE ) # Intervall in days after which senders get # another vacation message. @@ -202,7 +207,8 @@ NAME 'kolabVacationResendInterval' DESC 'Vacation notice interval in days' EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) # Email recipient addresses which are handled by the # vacation script. There can be multiple kolabVacationAddress @@ -225,7 +231,8 @@ NAME 'kolabVacationReplyToUCE' DESC 'Enable vacation notices to UCE' EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) # Email recipient domains which are handled by the # vacation script. There can be multiple kolabVacationReactDomain @@ -259,7 +266,8 @@ NAME 'kolabForwardKeepCopy' DESC 'Keep copy when forwarding' EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) # Enable forwarding of UCE. # Default is yes. @@ -268,7 +276,19 @@ NAME 'kolabForwardUCE' DESC 'Enable forwarding of mails known as UCE' EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) + +# comment when creating or deleting a kolab object +# a comment might be appropriate. This is most useful +# for tracability when users get moved to the graveyard +# instead of being really deleted +attributetype ( 1.3.6.1.4.1.19419.1.1.1.17 + NAME 'kolabComment' + DESC 'multi-value comment' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} ) ###################### # postfix attributes # @@ -313,12 +333,14 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.507 NAME 'postfix-enable-virus-scan' EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.19414.2.1.508 NAME 'postfix-allow-unauthenticated' EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.19414.2.1.509 NAME 'postfix-virtual' @@ -333,7 +355,8 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.601 NAME 'cyrus-autocreatequota' EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE ) attributetype ( 1.3.6.1.4.1.19414.2.1.602 NAME 'cyrus-admins' @@ -345,7 +368,8 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.603 NAME 'cyrus-imap' EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 + SINGLE-VALUE ) # enable legacy pop3 attributetype ( 1.3.6.1.4.1.19414.2.1.604 @@ -544,7 +568,8 @@ kolabForwardAddress $ kolabForwardKeepCopy $ kolabForwardUCE $ - kolabDeleteflag ) ) + kolabDeleteflag $ + kolabComment ) ) # kolab organization with country support objectclass ( 1.3.6.1.4.1.19414.3.2.3 From cvs at intevation.de Fri Jul 8 04:05:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 04:05:41 2005 Subject: steffen: server obmtool.conf,1.177,1.178 Message-ID: <20050708020537.A889B1005D1@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv12403 Modified Files: obmtool.conf Log Message: multidomain shared folders. New folder have the domain encoded in CN, existing folders work as before Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.177 retrieving revision 1.178 diff -u -d -r1.177 -r1.178 --- obmtool.conf 6 Jul 2005 13:56:10 -0000 1.177 +++ obmtool.conf 8 Jul 2005 02:05:35 -0000 1.178 @@ -65,7 +65,7 @@ @install ${loc}perl-crypto-5.8.5-2.2.0 @install ${loc}perl-net-5.8.5-2.2.0 @install ${loc}perl-mail-5.8.5-2.2.0 - @install ${loc}zlib-1.2.2-2.3.0 + @install ${loc}zlib-1.2.2-2.3.1 @install ${loc}perl-comp-5.8.5-2.2.0 @install ${loc}expat-1.95.8-2.2.0 @install ${loc}perl-ssl-5.8.5-2.2.0 @@ -128,7 +128,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 ${altloc}clamav-0.85.1-20050517 + @install ${altloc}clamav-0.86.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-20050706 --define kolab_version=$kolab_version From cvs at intevation.de Fri Jul 8 04:05:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 04:05:41 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder index.php, 1.7, 1.8 sf.php, 1.20, 1.21 Message-ID: <20050708020537.AD8871005D8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder In directory doto:/tmp/cvs-serv12403/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder Modified Files: index.php sf.php Log Message: multidomain shared folders. New folder have the domain encoded in CN, existing folders work as before Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- index.php 11 Mar 2005 09:11:15 -0000 1.7 +++ index.php 8 Jul 2005 02:05:35 -0000 1.8 @@ -17,7 +17,8 @@ /**** Authentication etc. ***/ $sidx = 'sf'; -if( $auth->group() != 'maintainer' && $auth->group() != 'admin') { +$group = $auth->group(); +if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer' ) { array_push($errors, _("Error: You don't have Permissions to access this Menu")); } @@ -28,11 +29,23 @@ /**** Extract data from LDAP ***/ +function prepare_domain_filter_component($str) { + return '(cn=*@'.KolabLDAP::escape($str).')'; +} + // Get all entries & dynamically split the letters with growing entries if( !$errors ) { if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn']; else $base_dn = 'k=kolab'; - $filter = "(&(cn=*)(objectclass=kolabSharedFolder))"; + if( $group == 'domain-maintainer' ) { + $domainfilter = '(|'.join('', array_map( 'prepare_domain_filter_component', + $ldap->domainsForMaintainerDn($auth->dn()))).')'; + + } else { + $domainfilter = '(cn=*)'; + } + debug("domainfilter=$domainfilter"); + $filter = "(&$domainfilter(objectclass=kolabSharedFolder))"; $result = ldap_search($ldap->connection, $base_dn, $filter); if( $result ) { $count = ldap_count_entries($ldap->connection, $result); Index: sf.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- sf.php 4 May 2005 14:50:40 -0000 1.20 +++ sf.php 8 Jul 2005 02:05:35 -0000 1.21 @@ -20,7 +20,8 @@ $contenttemplate = 'formcontainer.tpl'; $valid_actions = array('firstsave','save','modify','create','delete','kill'); -if( $auth->group() != 'maintainer' && $auth->group() != 'admin') { +$group = $auth->group(); +if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer' ) { array_push($errors, _("Error: You don't have Permissions to access this Menu")); } @@ -113,10 +114,11 @@ $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")); - $entries = array( 'cn' => array( 'name' => _('Folder Name'), + 'type' => 'email', + 'domains' => ($auth->group()=='domain-maintainer') + ?$ldap->domainsForMaintainerDn($auth->dn()) + :$ldap->domains(), 'validation' => 'notempty', 'comment' => _('Required') ), 'kolabhomeserver' => array( 'name' => _('Folder Location'), @@ -163,7 +165,7 @@ // OK, we need to get the name down to lowercase ascii only // we handle a few common cases here // Really cheesy, but strtolower is latin1 only :-( - $cn = trim($_POST['cn']); + $cn = empty($_POST['domain_cn'])?trim($_POST['user_cn']):trim($_POST['user_cn']).'@'.$_POST['domain_cn']; debug("cn=$cn"); $cn = strtolower(utf8_decode($cn)); debug("cn=$cn"); From cvs at intevation.de Fri Jul 8 04:05:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 04:05:42 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.57,1.58 Message-ID: <20050708020537.C7CB2101FA8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv12403/perl-kolab/Kolab-Conf Modified Files: Conf.pm Log Message: multidomain shared folders. New folder have the domain encoded in CN, existing folders work as before Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- Conf.pm 6 Jul 2005 10:40:07 -0000 1.57 +++ Conf.pm 8 Jul 2005 02:05:35 -0000 1.58 @@ -469,6 +469,10 @@ by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write by * continue +access to filter=(&(objectClass=kolabSharedFolder)(cn=*@@@@domain@@@)) + by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write + by * continue + EOS my $dom_acl1 = << 'EOS'; @@ -515,6 +519,17 @@ } $access->close; + + if (-f $oldcfg) { + my $rc = `diff -q $cfg $oldcfg`; + chomp($rc); + if ($rc) { + Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG); + $Kolab::haschanged{'slapd'} = 1; + } + } else { + $Kolab::haschanged{'slapd'} = 1; + } chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg); From cvs at intevation.de Fri Jul 8 04:05:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 04:05:42 2005 Subject: steffen: server/perl-kolab perl-kolab.spec.in, 1.7, 1.8 perl-kolab.spec, 1.96, NONE Message-ID: <20050708020537.C3DE01005D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv12403/perl-kolab Modified Files: perl-kolab.spec.in Removed Files: perl-kolab.spec Log Message: multidomain shared folders. New folder have the domain encoded in CN, existing folders work as before Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- perl-kolab.spec.in 6 Jul 2005 10:40:07 -0000 1.7 +++ perl-kolab.spec.in 8 Jul 2005 02:05:35 -0000 1.8 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050706 +Release: 20050707 # list of sources Source0: perl-kolab-@VERSION@.tar.gz --- perl-kolab.spec DELETED --- From cvs at intevation.de Fri Jul 8 04:05:38 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 04:05:43 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.33,1.34 Message-ID: <20050708020538.14C73101FA9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv12403/perl-kolab/Kolab-LDAP Modified Files: LDAP.pm Log Message: multidomain shared folders. New folder have the domain encoded in CN, existing folders work as before Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- LDAP.pm 30 Jun 2005 11:12:10 -0000 1.33 +++ LDAP.pm 8 Jul 2005 02:05:35 -0000 1.34 @@ -256,16 +256,18 @@ } my $uid = trim($object->get_value($objuidfield)) || 0; - if( $p eq 'sf' ) { - # We have to create shared folders - # with names user.@ - my @dcs = split(/,/,$object->dn()); - my @dn; - while( pop( @dcs ) =~ /dc=(.*)/ ) { - push(@dn, $1); - } - if( $#dn > 0 ) { $uid .= '@'.join('.',reverse(@dn)); } - } + # Intermediate multidomain support: + # We accept domain encoded in CN... + if( $p eq 'sf' && index( $uid, '@' ) < 0 ) { + # We have to create shared folders + # with names shared.@ + my @dcs = split(/,/,$object->dn()); + my @dn; + while( pop( @dcs ) =~ /dc=(.*)/ ) { + push(@dn, $1); + } + if( $#dn > 0 ) { $uid .= '@'.join('.',reverse(@dn)); } + } if (!$uid) { Kolab::log('L', "Kolab::LDAP::createObject() called with null id attribute `$objuidfield', returning", KOLAB_DEBUG); return; From cvs at intevation.de Fri Jul 8 12:41:03 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 12:41:04 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.17, 1.18 Message-ID: <20050708104103.A9A30101EFE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv23415 Modified Files: list.php Log Message: Fix for Issue820 (dist list lookup error) Index: list.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- list.php 7 Jul 2005 10:47:00 -0000 1.17 +++ list.php 8 Jul 2005 10:41:01 -0000 1.18 @@ -261,19 +261,16 @@ } break; case 'modify': - $result = $ldap->search( $dn, '(objectClass=kolabGroupOfNames)' ); - if( $result ) { - $ldap_object = ldap_get_entries( $ldap->connection, $result ); - if( $ldap_object['count'] == 1 ) { - fill_form_for_modify( $form, $ldap_object[0] ); + $ldap_object = $ldap->read( $dn ); + if( $ldap_object ) { + fill_form_for_modify( $form, $ldap_object ); $form->entries['action']['value'] = 'save'; $form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn ); $form->entries['cn']['attrs'] = 'readonly'; $heading = _('Modify Distribution List'); $content = $form->outputForm(); - } else { - array_push($errors, _("Error: Multiple results returned for DN '$dn'")); - } + } else { + array_push($errors, _("Error: No results returned for DN '$dn'") ); } break; case 'delete': From cvs at intevation.de Fri Jul 8 13:07:59 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 13:08:01 2005 Subject: steffen: server obmtool.conf,1.178,1.179 Message-ID: <20050708110759.14434101EFE@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv24357 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.178 retrieving revision 1.179 diff -u -d -r1.178 -r1.179 --- obmtool.conf 8 Jul 2005 02:05:35 -0000 1.178 +++ obmtool.conf 8 Jul 2005 11:07:57 -0000 1.179 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.1-snapshot-20050706"; + kolab_version="pre-2.1-snapshot-20050708"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -84,7 +84,7 @@ @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-20050706 + @install ${altloc}perl-kolab-5.8.5-20050708 @install ${altloc}imapd-2.2.12-2.3.0_kolab5 --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 @@ -131,8 +131,8 @@ @install ${altloc}clamav-0.86.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-20050706 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050706 --define kolab_version=$kolab_version + @install ${altloc}kolabd-1.9.4-20050708 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050708 --define kolab_version=$kolab_version @install ${altloc}kolab-resource-handlers-0.3.9-20050701 --define kolab_version=$kolab_version @check From cvs at intevation.de Fri Jul 8 13:07:59 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 13:08:01 2005 Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.8,1.9 Message-ID: <20050708110759.24A44101FAD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv24357/perl-kolab Modified Files: perl-kolab.spec.in Log Message: versions Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- perl-kolab.spec.in 8 Jul 2005 02:05:35 -0000 1.8 +++ perl-kolab.spec.in 8 Jul 2005 11:07:57 -0000 1.9 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050707 +Release: 20050708 # list of sources Source0: perl-kolab-@VERSION@.tar.gz From cvs at intevation.de Fri Jul 8 13:07:59 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 8 13:08:02 2005 Subject: steffen: server/kolabd kolabd.spec,1.61,1.62 Message-ID: <20050708110759.2E787101FAF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv24357/kolabd Modified Files: kolabd.spec Log Message: versions Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- kolabd.spec 7 Jul 2005 10:47:24 -0000 1.61 +++ kolabd.spec 8 Jul 2005 11:07:57 -0000 1.62 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050707 +Release: 20050708 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Mon Jul 11 13:33:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jul 11 13:33:47 2005 Subject: steffen: server obmtool.conf,1.179,1.180 Message-ID: <20050711113346.2A4F91006CB@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv18579 Modified Files: obmtool.conf Log Message: wrong date for clamav package Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.179 retrieving revision 1.180 diff -u -d -r1.179 -r1.180 --- obmtool.conf 8 Jul 2005 11:07:57 -0000 1.179 +++ obmtool.conf 11 Jul 2005 11:33:43 -0000 1.180 @@ -128,7 +128,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 ${altloc}clamav-0.86.1-20050517 + @install ${altloc}clamav-0.86.1-20050624 @install ${loc}vim-6.3.30-2.2.1 @install ${plusloc}dcron-2.9-2.2.0 @install ${altloc}kolabd-1.9.4-20050708 --define kolab_version=$kolab_version From cvs at intevation.de Mon Jul 11 17:44:39 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jul 11 17:44:41 2005 Subject: wilde: doc/www/src documentation.html.m4,1.20,1.21 Message-ID: <20050711154439.F19D91006A2@lists.intevation.de> Author: wilde Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22919 Modified Files: documentation.html.m4 Log Message: Minor fix: "m4_define" was somehow broken into "m\n_define" Index: documentation.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- documentation.html.m4 30 Jun 2005 17:02:54 -0000 1.20 +++ documentation.html.m4 11 Jul 2005 15:44:37 -0000 1.21 @@ -1,5 +1,4 @@ -m -_define(`PAGE_TITLE',`Documentation') +m4_define(`PAGE_TITLE',`Documentation') m4_include(header.html.m4)
This page was updated on:
$Date$
From cvs at intevation.de Thu Jul 14 23:34:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 14 23:34:52 2005 Subject: steffen: server/perl-kolab/Kolab Kolab.pm,1.23,1.23.2.1 Message-ID: <20050714213451.09D571005DE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab In directory doto:/tmp/cvs-serv12168/Kolab Modified Files: Tag: kolab_2_0_branch Kolab.pm Log Message: patch for Issue845 applied (groupOfNames cleanup handling) Index: Kolab.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -d -r1.23 -r1.23.2.1 --- Kolab.pm 11 Jun 2005 09:36:11 -0000 1.23 +++ Kolab.pm 14 Jul 2005 21:34:48 -0000 1.23.2.1 @@ -327,6 +327,38 @@ $config{'sf_field_quota'} = 'cyrus-userquota' if (!exists $config{'sf_field_quota'}); } + # The `group_XXX' variables are the distribution list/groups + # equivalents of the `user_XXX' variables + $config{'group_ldap_uri'} = $config{'ldap_uri'} if (!exists $config{'group_ldap_uri'}); + + if (!($tempval = URI->new($config{'group_ldap_uri'}))) { + &log('C', "Unable to parse group_ldap_uri `" . $config{'group_ldap_uri'} . "'", KOLAB_ERROR); +# exit(1); + $error = 1; + } else { + $config{'group_ldap_ip'} = $tempval->host; + $config{'group_ldap_port'} = $tempval->port; + } + + $config{'group_bind_dn'} = $config{'bind_dn'} if (!exists $config{'group_bind_dn'}); + $config{'group_bind_pw'} = $config{'bind_pw'} if (!exists $config{'group_bind_pw'}); + $config{'group_dn_list'} = $config{'base_dn'} if (!exists $config{'group_dn_list'}); + $config{'group_directory_mode'} = $config{'directory_mode'} if (!exists $config{'group_directory_mode'}); + + $config{'group_object_class'} = 'kolabgroupofnames' if (!exists $config{'group_object_class'}); + + if ($config{'group_directory_mode'} eq 'ad') { + # AD + $config{'group_field_deleted'} = 'isDeleted' if (!exists $config{'group_field_deleted'}); + $config{'group_field_modified'} = 'whenChanged' if (!exists $config{'group_field_modified'}); + $config{'group_field_guid'} = 'entryUUID' if (!exists $config{'group_field_guid'}); + } else { + # slurd/default + $config{'group_field_deleted'} = 'kolabdeleteflag' if (!exists $config{'group_field_deleted'}); + $config{'group_field_modified'} = 'modifytimestamp' if (!exists $config{'group_field_modified'}); + $config{'group_field_guid'} = 'entryUUID' if (!exists $config{'group_field_guid'}); + } + # `gyard_deletion_period' specifies how many minutes to leave lost users in # the graveyard before deleting them. # Defaults to seven days. From cvs at intevation.de Thu Jul 14 23:34:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 14 23:34:52 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.31,1.31.2.1 Message-ID: <20050714213451.0C4EE101F1A@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv12168/Kolab-LDAP Modified Files: Tag: kolab_2_0_branch LDAP.pm Log Message: patch for Issue845 applied (groupOfNames cleanup handling) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -u -d -r1.31 -r1.31.2.1 --- LDAP.pm 8 Jun 2005 12:44:35 -0000 1.31 +++ LDAP.pm 14 Jul 2005 21:34:48 -0000 1.31.2.1 @@ -238,6 +238,9 @@ Kolab::log('L', "Kolab::LDAP::createObject() called with obj uid field `$objuidfield' for obj type `$p'", KOLAB_DEBUG); + # No action for groups + return if( $objuidfield eq '' ); + my $kolabhomeserver = lc($object->get_value('kolabhomeserver')); my $islocal = 1; my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1); @@ -480,6 +483,7 @@ syncBasic($cyrus, 'user', '(uid=*)', 0); syncBasic($cyrus, 'sf', '', 1); + syncBasic($cyrus, 'group', '', 0); # Check that all mailboxes correspond to LDAP objects Kolab::log('L', 'Synchronising mailboxes'); From cvs at intevation.de Thu Jul 14 23:39:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 14 23:39:52 2005 Subject: steffen: server/perl-kolab/Kolab Kolab.pm,1.26,1.27 Message-ID: <20050714213951.9A62B101F1D@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab In directory doto:/tmp/cvs-serv12581/Kolab Modified Files: Kolab.pm Log Message: patch for Issue845 applied (groupOfNames cleanup handling) Index: Kolab.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- Kolab.pm 30 Jun 2005 12:35:34 -0000 1.26 +++ Kolab.pm 14 Jul 2005 21:39:49 -0000 1.27 @@ -331,6 +331,38 @@ $config{'sf_field_quota'} = 'cyrus-userquota' if (!exists $config{'sf_field_quota'}); } + # The `group_XXX' variables are the distribution list/groups + # equivalents of the `user_XXX' variables + $config{'group_ldap_uri'} = $config{'ldap_uri'} if (!exists $config{'group_ldap_uri'}); + + if (!($tempval = URI->new($config{'group_ldap_uri'}))) { + &log('C', "Unable to parse group_ldap_uri `" . $config{'group_ldap_uri'} . "'", KOLAB_ERROR); +# exit(1); + $error = 1; + } else { + $config{'group_ldap_ip'} = $tempval->host; + $config{'group_ldap_port'} = $tempval->port; + } + + $config{'group_bind_dn'} = $config{'bind_dn'} if (!exists $config{'group_bind_dn'}); + $config{'group_bind_pw'} = $config{'bind_pw'} if (!exists $config{'group_bind_pw'}); + $config{'group_dn_list'} = $config{'base_dn'} if (!exists $config{'group_dn_list'}); + $config{'group_directory_mode'} = $config{'directory_mode'} if (!exists $config{'group_directory_mode'}); + + $config{'group_object_class'} = 'kolabgroupofnames' if (!exists $config{'group_object_class'}); + + if ($config{'group_directory_mode'} eq 'ad') { + # AD + $config{'group_field_deleted'} = 'isDeleted' if (!exists $config{'group_field_deleted'}); + $config{'group_field_modified'} = 'whenChanged' if (!exists $config{'group_field_modified'}); + $config{'group_field_guid'} = 'entryUUID' if (!exists $config{'group_field_guid'}); + } else { + # slurd/default + $config{'group_field_deleted'} = 'kolabdeleteflag' if (!exists $config{'group_field_deleted'}); + $config{'group_field_modified'} = 'modifytimestamp' if (!exists $config{'group_field_modified'}); + $config{'group_field_guid'} = 'entryUUID' if (!exists $config{'group_field_guid'}); + } + # `gyard_deletion_period' specifies how many minutes to leave lost users in # the graveyard before deleting them. # Defaults to seven days. From cvs at intevation.de Thu Jul 14 23:39:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 14 23:39:52 2005 Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.9,1.10 Message-ID: <20050714213951.97D52101F1A@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv12581 Modified Files: perl-kolab.spec.in Log Message: patch for Issue845 applied (groupOfNames cleanup handling) Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- perl-kolab.spec.in 8 Jul 2005 11:07:57 -0000 1.9 +++ perl-kolab.spec.in 14 Jul 2005 21:39:49 -0000 1.10 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050708 +Release: 20050714 # list of sources Source0: perl-kolab-@VERSION@.tar.gz From cvs at intevation.de Thu Jul 14 23:39:51 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Jul 14 23:39:53 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.34,1.35 Message-ID: <20050714213951.A0E7E101FA4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv12581/Kolab-LDAP Modified Files: LDAP.pm Log Message: patch for Issue845 applied (groupOfNames cleanup handling) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- LDAP.pm 8 Jul 2005 02:05:35 -0000 1.34 +++ LDAP.pm 14 Jul 2005 21:39:49 -0000 1.35 @@ -238,6 +238,9 @@ Kolab::log('L', "Kolab::LDAP::createObject() called with obj uid field `$objuidfield' for obj type `$p'", KOLAB_DEBUG); + # No action for groups + return if( $objuidfield eq '' ); + my $kolabhomeserver = lc($object->get_value('kolabhomeserver')); my $islocal = 1; my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1); @@ -482,6 +485,7 @@ syncBasic($cyrus, 'user', '(uid=*)', 0); syncBasic($cyrus, 'sf', '', 1); + syncBasic($cyrus, 'group', '', 0); # Check that all mailboxes correspond to LDAP objects Kolab::log('L', 'Synchronising mailboxes'); From cvs at intevation.de Fri Jul 15 01:07:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 01:07:34 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.26, 1.27 Message-ID: <20050714230732.AAAE01005DE@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include In directory doto:/tmp/cvs-serv16748/kolab-webadmin/php/admin/include Modified Files: ldap.class.php Log Message: groupOfNames cleanup handling Index: ldap.class.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ldap.class.php 6 Jul 2005 10:43:06 -0000 1.26 +++ ldap.class.php 14 Jul 2005 23:07:30 -0000 1.27 @@ -472,6 +472,10 @@ return $this->_doDeleteObject( $dn, $delete_now, false ); } + function deleteGroupOfNames( $dn, $delete_now = false ) { + return $this->_doDeleteObject( $dn, $delete_now, false ); + } + // Private function _doDeleteObject( $dn, $delete_now = false, $nuke_password = false ) { if( $delete_now ) { From cvs at intevation.de Fri Jul 15 01:07:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 01:07:34 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates distlistall.tpl, 1.1, 1.2 Message-ID: <20050714230732.B0946101FA3@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv16748/kolab-webadmin/php/admin/templates Modified Files: distlistall.tpl Log Message: groupOfNames cleanup handling Index: distlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/distlistall.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- distlistall.tpl 11 Mar 2005 09:59:05 -0000 1.1 +++ distlistall.tpl 14 Jul 2005 23:07:30 -0000 1.2 @@ -20,8 +20,8 @@ {else} {tr msg="Public"} {/if} - {if $entries[id].deleted eq "TRUE"} - {tr msg="Folder deleted, awaiting cleanup..."} + {if $entries[id].deleted neq "FALSE"} + {tr msg="List deleted, awaiting cleanup..."} {else} {tr msg="Modify"} {tr msg="Delete"} From cvs at intevation.de Fri Jul 15 01:07:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 01:07:35 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.64, 1.65 Message-ID: <20050714230732.B8CC9101FA8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv16748/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: groupOfNames cleanup handling Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- user.php 6 Jul 2005 10:43:06 -0000 1.64 +++ user.php 14 Jul 2005 23:07:30 -0000 1.65 @@ -577,7 +577,7 @@ 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).'))', + '(&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(member='.$ldap->escape($dn).'))', array( 'dn', 'mail' ) ); $distlists = $ldap->getEntries(); unset( $distlists['count'] ); From cvs at intevation.de Fri Jul 15 01:07:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 01:07:36 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php, 1.11, 1.12 list.php, 1.18, 1.19 Message-ID: <20050714230732.B5D7B101FA4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv16748/kolab-webadmin/www/admin/distributionlist Modified Files: index.php list.php Log Message: groupOfNames cleanup handling Index: index.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- index.php 7 Jul 2005 10:47:00 -0000 1.11 +++ index.php 14 Jul 2005 23:07:30 -0000 1.12 @@ -60,7 +60,7 @@ $cn = $attrs['cn'][0]; if( $cn != 'admin' && $cn != 'maintainer' && $cn != 'domain-maintainer' && !preg_match('/.*,cn=domains,cn=internal,'.$_SESSION['base_dn'].'/', $dn ) ) { - $kolabdeleteflag = $attrs['kolabdeleteflag'][0]; + $kolabdeleteflag = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE"; $kolabhomeserver = _('not yet implemented'); $internal = (strpos($dn,"cn=internal")!==false); $entries[] = array( 'dn' => $dn, Index: list.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- list.php 8 Jul 2005 10:41:01 -0000 1.18 +++ list.php 14 Jul 2005 23:07:30 -0000 1.19 @@ -274,32 +274,29 @@ } break; case 'delete': - $result = $ldap->search( $dn, '(objectClass=kolabGroupOfNames)' ); - if( $result ) { - $ldap_object = ldap_get_entries( $ldap->connection, $result ); - if( $ldap_object['count'] == 1 ) { - fill_form_for_modify( $form, $ldap_object[0] ); - $form->entries['action']['value'] = 'kill'; - foreach( $form->entries as $key => $val ) { - $form->entries[$key]['attrs'] = 'readonly'; - } - $form->submittext = _('Delete'); - $heading = _('Delete Distribution List'); - $content = $form->outputForm(); - } else { - array_push($errors, _("Error: Multiple results returned for DN '$dn'")); + $ldap_object = $ldap->read( $dn ); + if( $ldap_object ) { + fill_form_for_modify( $form, $ldap_object ); + $form->entries['action']['value'] = 'kill'; + foreach( $form->entries as $key => $val ) { + $form->entries[$key]['attrs'] = 'readonly'; } + $form->submittext = _('Delete'); + $heading = _('Delete Distribution List'); + $content = $form->outputForm(); + } else { + array_push($errors, _("Error: No results returned for DN '$dn'")); } break; case 'kill': if (!$errors) { /* Just delete the object and let kolabd clean up */ - if( ldap_delete($ldap->connection, $dn ) ) { + if ($ldap->deleteGroupOfNames($dn)) { $messages[] = _('Distribution List ').$_REQUEST['cn']._(' deleted'); $heading = _('Entry Deleted'); $contenttemplate = 'sfdeleted.tpl'; } else { - array_push($errors, _("LDAP Error: could delete $dn: ").ldap_error($link)); + array_push($errors, _("LDAP Error: Nould not delete $dn: ").$ldap->error()); } } break; From cvs at intevation.de Fri Jul 15 02:40:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 02:40:49 2005 Subject: steffen: server/kolabd kolabd.spec,1.62,1.63 Message-ID: <20050715004048.37DF0101FA4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv18209 Modified Files: kolabd.spec Log Message: dont deliver to soon-to-be-killed objects Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- kolabd.spec 8 Jul 2005 11:07:57 -0000 1.62 +++ kolabd.spec 15 Jul 2005 00:40:46 -0000 1.63 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050708 +Release: 20050714 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Fri Jul 15 02:40:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 02:40:50 2005 Subject: steffen: server/kolabd/kolabd/templates main.cf.template, 1.16, 1.17 Message-ID: <20050715004048.431CD101FA8@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv18209/kolabd/templates Modified Files: main.cf.template Log Message: dont deliver to soon-to-be-killed objects Index: main.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- main.cf.template 1 Jul 2005 13:01:37 -0000 1.16 +++ main.cf.template 15 Jul 2005 00:40:46 -0000 1.17 @@ -136,7 +136,7 @@ ldapvirtual_server_host = @@@ldap_uri@@@ ldapvirtual_search_base = @@@user_dn_list@@@ -ldapvirtual_query_filter = (|(alias=%s)(mail=%s)) +ldapvirtual_query_filter = (&(!(kolabDeleteFlag=*))(|(alias=%s)(mail=%s))) ldapvirtual_result_attribute = mail ldapvirtual_result_filter = %s ldapvirtual_search_timeout = 15 @@ -158,7 +158,7 @@ ldapdistlist_server_host = @@@ldap_uri@@@ ldapdistlist_search_base = @@@user_dn_list@@@ ldapdistlist_domain = $mydestination -ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(mail=%s)) +ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(mail=%s)) ldapdistlist_special_result_attribute = member ldapdistlist_exclude_internal = yes ldapdistlist_result_attribute = mail From cvs at intevation.de Fri Jul 15 03:01:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 03:01:37 2005 Subject: steffen: server/perl-kolab Makefile.am, 1.2, 1.3 Makefile.cvs, 1.1, 1.2 configure, 1.2, 1.3 perl-kolab.spec.in, 1.10, 1.11 Message-ID: <20050715010135.8C291101FA4@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv18587 Modified Files: Makefile.am Makefile.cvs configure perl-kolab.spec.in Log Message: updated auto-perl + applied patch from Marcus Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 30 Jun 2005 01:43:55 -0000 1.2 +++ Makefile.am 15 Jul 2005 01:01:33 -0000 1.3 @@ -21,11 +21,9 @@ # own Variables and default values: -localstatedir_ARG = ${prefix}/var -localstatedir_ARG_HELP = localstatedir default: +dist_ARG = dist_conf/kolab +dist_ARG_HELP = dist_conf file # for including the ../dist_conf/kolab file -{ - `cat ./dist_conf/kolab` -} +#include "dist_conf/$(dist)" Index: Makefile.cvs =================================================================== RCS file: /kolabrepository/server/perl-kolab/Makefile.cvs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.cvs 8 Jun 2005 12:44:35 -0000 1.1 +++ Makefile.cvs 15 Jul 2005 01:01:33 -0000 1.2 @@ -12,7 +12,7 @@ all: test -d $(KOLABRPMSRC)/$(RPMNAME) || mkdir $(KOLABRPMSRC)/$(RPMNAME) - ./configure --prefix=/kolab \ + ./configure --prefix=/kolab --dist=kolab \ && make dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME) cp $(RPMNAME).spec $(KOLABRPMSRC)/$(RPMNAME)/ cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec --define 'kolab_version CVS' Index: configure =================================================================== RCS file: /kolabrepository/server/perl-kolab/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- configure 30 Jun 2005 11:12:09 -0000 1.2 +++ configure 15 Jul 2005 01:01:33 -0000 1.3 @@ -126,7 +126,7 @@ BEGIN { import Autoperl::Logger; } BEGIN { import Autoperl::Packager; } -# Generated by autoperl 1.25 +# Generated by autoperl 1.26 unless (defined $ap::CONFIG_H) { $ap::CONFIG_H = 1; @@ -137,6 +137,7 @@ 'author' => 'Mark Heily ', 'program' => 'autoperl', 'ovr_custom' => 'default', + 'crap' => 'good', 'infodir' => '/usr/local/info', 'cc' => '/usr/bin/perl -c', 'sysconfdir' => '/usr/local/etc', @@ -147,9 +148,8 @@ 'autoperl' => '$(TOPDIR)/configure --autoperl', 'localedir' => '/usr/local/locale', 'install' => '$(TOPDIR)/configure --autoperl install -p', - 'version' => '1.25', + 'version' => '1.26', 'includedir' => '/usr/local/lib/site_perl', - 'statedir' => '/var/lib', 'datadir' => '/usr/local/share', 'sbindir' => '/usr/local/sbin', 'libdir' => '/usr/local/lib', @@ -157,7 +157,8 @@ 'def_custom' => 'default', 'ld' => '$(TOPDIR)/configure --autoperl link', 'destdir' => '', - 'prefix' => '/usr/local' + 'prefix' => '/usr/local', + 'localstatedir' => '/usr/local/var' ); # Allow references to $ap::foo @@ -168,6 +169,7 @@ $ap::{author} = sub { 'Mark Heily ' }; $ap::{program} = sub { 'autoperl' }; $ap::{ovr_custom} = sub { 'default' }; +$ap::{crap} = sub { 'good' }; $ap::{infodir} = sub { '/usr/local/info' }; $ap::{cc} = sub { '/usr/bin/perl -c' }; $ap::{sysconfdir} = sub { '/usr/local/etc' }; @@ -178,9 +180,8 @@ $ap::{autoperl} = sub { '$(TOPDIR)/configure --autoperl' }; $ap::{localedir} = sub { '/usr/local/locale' }; $ap::{install} = sub { '$(TOPDIR)/configure --autoperl install -p' }; -$ap::{version} = sub { '1.25' }; +$ap::{version} = sub { '1.26' }; $ap::{includedir} = sub { '/usr/local/lib/site_perl' }; -$ap::{statedir} = sub { '/var/lib' }; $ap::{datadir} = sub { '/usr/local/share' }; $ap::{sbindir} = sub { '/usr/local/sbin' }; $ap::{libdir} = sub { '/usr/local/lib' }; @@ -189,6 +190,7 @@ $ap::{ld} = sub { '$(TOPDIR)/configure --autoperl link' }; $ap::{destdir} = sub { '' }; $ap::{prefix} = sub { '/usr/local' }; +$ap::{localstatedir} = sub { '/usr/local/var' }; # Allow references to $ap::config{foo} or $ap::config->{foo} @@ -225,13 +227,14 @@ our $log = new Autoperl::Logger; our $ap = new Autoperl(); - # Parse Makefile.am - $ap->{mk}->parse_all(); - # Parse command line options unshift @ARGV, $original_action if defined $original_action; $ap->get_options(); + # Parse Makefile.am + $ap->{mk}->parse_all(); + + # FIXME-WORKAROUND for $ap->{program} # this is ugly $ap->{program} = $ap->{mk}->{program}; @@ -758,22 +761,27 @@ my $target = $mk->{curdir} . '/Makefile'; my ($basename,$topdir) = ("",""); + # Get the subdirectory relative to topdir + my $subdir = $mk->{curdir}; + $subdir =~ s/^$ap->{mk}->{curdir}//; + $subdir =~ s/^\///; + # Get basename and topdir $target =~ /.*\//; $basename = $&; $basename = "" unless defined $basename; $basename = "" if $basename =~ m|^\./?$|; if ($basename) { - $topdir = $basename; + $topdir = $subdir; $topdir =~ s/[a-zA-Z0-9\-\_\.]+/\.\./g; } - notice("writing $target.."); + notice("writing ".($subdir ? "$subdir/" : '')."Makefile.."); open ( MKFILE, ">$target" ) or die $!; print MKFILE "# Generated by\n#\n# ./configure --" . join("\n#" . ' 'x16 . '--' ,@ARGV) . "\n#\n"; - foreach my $id ( keys %{ $ap } ) { + foreach my $id ( sort( keys %{ $ap }) ) { next if ref($ap->{$id}); next if $id =~ /^_/; # don't print internal structures @@ -781,13 +789,14 @@ $uc_id =~ tr/a-z/A-Z/; my $val = $ap->{$id}; + unless ($id eq 'topdir') { $val = '$$DESTDIR' . $val if $id =~ /dir$/; + } die "null values for $id not permitted" unless defined $val; print MKFILE $uc_id . " = $val\n"; } -print MKFILE "TOPDIR = " . $ap->{topdir}. "\n"; -print MKFILE "DISTDIR = ${topdir}\$(PROGRAM)-\$(VERSION)/${basename}\n"; +print MKFILE "DISTDIR = \$(TOPDIR)/\$(PROGRAM)-\$(VERSION)/${subdir}\n"; Autoperl::Generator::write_makefile($mk,*MKFILE); close(MKFILE); @@ -835,7 +844,8 @@ libdir => '${prefix}/lib', docdir => '${prefix}/share/doc', localedir => '${prefix}/locale', - statedir => '/var/lib', + localstatedir => '${prefix}/var', + sharedstatedir => '${prefix}/com', # Build flags static => 0, @@ -950,6 +960,7 @@ use Carp; use Data::Dumper; BEGIN { import Autoperl::Logger; } +use Cwd; use subs qw(raise); @@ -1003,6 +1014,9 @@ # Variables defined in Makefile.am my $self = +{ + # Absolute pathname of the directory containing Makefile.am + curdir => undef, + # Global variables from configure.in # TODO- reorganize this crap program => 'mtest-comment-parsery-program', @@ -1084,6 +1098,81 @@ return $self; } +# Parser for cpp-compatible directives +sub cpp_parser($$$) +{ + my ($mk, $lines, $idx_ref) = @_; + my $idx = $$idx_ref; + + if ($lines->[$idx] =~ /^\s*\#include\s*\"(.*?)\"/) { + my $target = $mk->{curdir} . '/' . $1; + + # Expand custom arguments inside the target spec + foreach my $key (keys %{$mk->{custom_arg}}) { + $target =~ s/\$[\{\(]$key[\}\)]/$mk->{custom_arg}->{$key}/g; + } + + # Read the file + open(my $fd1, "<$target") or die "Makefile.am:$idx: $!: $target"; + my @include = <$fd1>; + close($fd1); + + # Insert the contents into the buffer + splice @{$lines}, $idx, 1, @include; + $$idx_ref -= 2; + return 0; + } + + return 1; + + #XXX-DEADWOOD-XXX This will be finished someday but is buggy + + # KLUDGE - ugly + if ($lines->[$idx] =~ /^\s*\#endif\s*$/) { + splice @{$lines}, $idx, 1; + $$idx_ref -= 2; + return 0; + } + + # Process '#if' statement + if ($lines->[$idx] =~ /^\s*\#if\s*(.*)$/) { + my $cond = $1; + my ($lhs,$op,$rhs) = split /\s+/, $cond, 3; + + # Test the truth value of the condition + my $truth = 0; + my $lval = $mk->get_variable($lhs); + if ($op eq '==') { + $truth = $lval eq $rhs ? 1 : 0; + } elsif ($op eq '!=') { + $truth = $lval ne $rhs ? 1 : 0; + } else { + die "unsupported operator: $op"; + } + + # Remove the #if line from the output + splice @{$lines}, $idx, 1; + + # Remove the section if the condition is false + my $endline; + do { + $endline = $lines->[$idx]; + if ( not $truth ) { + splice @{$lines}, $idx, 1; + } else { + $idx++; + $$idx_ref++; + } + die 'XXX-TODO: support else, elif' + if $endline and $endline =~ /^\s*\#(else|elif)/; + } until (not defined $endline or $endline =~ /^\s\#endif\s*$/); + $$idx_ref -= 2; + return 0; + } + + 1; +} + sub parse_makefile_am($$) { my ($mk,$input) = @_; @@ -1094,7 +1183,7 @@ # Get the current directory $input =~ /(.*)\//; my $curdir = $1;; -$curdir = '.' unless defined $curdir; +$curdir = getcwd unless defined $curdir; $curdir =~ s|^\./||; $mk->{curdir} = $curdir; debug("curdir = $curdir"); @@ -1105,7 +1194,7 @@ $mk->parse_aplocal_inc("$curdir/aplocal.inc"); # Slurp the entire file into @lines -open ( my $infile, "<./$input") or raise "$input: $!"; +open ( my $infile, "<$input") or raise "$input: $!"; my @lines = <$infile>; close ($infile); @@ -1118,6 +1207,10 @@ debug("stage1, $lineno: $s"); #==================================================== + # Parser for cpp-compatible directives + $mk->cpp_parser(\@lines, \$lineno) or next; + + #==================================================== # Parser for inline perl code my $left_curly = '{'; my $right_curly = '}'; @@ -1165,8 +1258,12 @@ }; $lineno++; - while ($lineno <= $#lines and $lines[$lineno] =~ /^\t/) { + while ($lineno <= $#lines and $lines[$lineno] =~ /^\s*\t/) { chomp ( my $s = $lines[$lineno]); + + # Replace any leading whitespace with a single tab + $s =~ s/^\s+/\t/; + # DEADWOOD-Strip comments #$s =~ s/(?!\\)(#.*?)(\\?)$//; #$s .= "\\" if $2; @@ -1211,7 +1308,8 @@ $mk->{top}->{lc $token} = $value; } elsif ($token =~ /_ARG$/) { my $arg = $`; - $mk->{top}->{custom_arg}->{$arg} = $value; + $mk->{top}->{custom_arg}->{$arg} = $value + unless exists $mk->{top}->{custom_arg}->{$arg}; } elsif ($token =~ /_ARG_HELP$/) { my $arg = $`; $mk->{top}->{help_string}->{$arg} = $value; @@ -1307,7 +1405,7 @@ } else { # FIXME this should never happen but breaks on innocent whitespace - warn "$input:$lineno: unhandled parser path "; + die "$input:$lineno: unhandled parser path"; } } } @@ -1503,6 +1601,19 @@ } +# Given a variable name, return the corresponding value +sub get_variable($$) +{ + my ($self, $key) = @_; + if (exists $self->{custom_arg}->{$key} ) { + return $self->{custom_arg}->{$key}; + } elsif ( exists $self->{vars}->{$key} ) { + return $self->{vars}->{$key}; + } else { + return ''; + } +} + ############ Flattening routines sub get_all_vars($) @@ -1511,9 +1622,21 @@ my $s = ""; - foreach my $key (keys %{$self->{vars}}) { - $s .= $key . ' := ' . $self->{vars}->{$key} . "\n"; + # Serialize a hash + sub serialize($) { + my $substr = ''; + my ($hashref,$s_ref) = @_; + foreach my $key (sort (keys %{$hashref})) { + my $proper_key = $key; + $proper_key =~ tr/-/_/; + $substr .= $proper_key . ' := ' . $hashref->{$key} . "\n"; + } + return $substr; } + + $s .= serialize($self->{vars}); + $s .= serialize($self->{custom_arg}); + return $s; } @@ -2029,7 +2152,7 @@ libdir docdir localedir - statedir + localstatedir sysconfdir destdir ); @@ -2040,8 +2163,6 @@ my ($ap,$mk) = @_; my $outfile = $mk->{curdir} . '/config.h'; - notice("writing $outfile.."); - # Generate a 'cfg' object to be included in the binary my $cfg; foreach my $key (INSTALL_PATHS, qw(program author version)) { @@ -2145,14 +2266,13 @@ # Generate all variable definitions my $subdirs = join(' ',@{$mk->{subdirs}}); -print MOUT "SUBDIRS = $subdirs\n" if $subdirs; if ($mk->get_all_vars()) { - #print MOUT "\n\n#---- User defined variables ----\n\n"; print MOUT $mk->get_all_vars() . "\n"; } +print MOUT "# Internal Autoperl variables -- don't use these\n"; +print MOUT "SUBDIRS = $subdirs\n" if $subdirs; print MOUT "APLOCAL = \$(PERL) -e 'do \"config.h\"; do \"aplocal.inc\";' -e \n"; - # ----------- BEGIN targets ------------- my @recursive_targets = qw(all install dist clean test uninstall); @@ -2416,8 +2536,9 @@ if grep /post_make_dist/, @{$mk->{hooks}}; # Create the tarball and clean up -if ( $curdir eq '.' ) { - print MOUT "\ttar zcvf ".$mk->{top}->{program}."-".$mk->{version}.".tar.gz $buildd\n"; +if ( $curdir eq $mk->{top}->{curdir} ) { + my $prog_id = $mk->{top}->{program}."-".$mk->{version}; + print MOUT "\ttar zcvf ${prog_id}.tar.gz ${prog_id}\n"; print MOUT "\trm -rf $buildd\n"; } print MOUT "\n"; @@ -2734,7 +2855,7 @@ use File::Compare; use File::Spec::Functions ':ALL'; -# Generated by autoperl 1.25 +# Generated by autoperl 1.26 unless (defined $ap::CONFIG_H) { $ap::CONFIG_H = 1; @@ -2745,6 +2866,7 @@ 'author' => 'Mark Heily ', 'program' => 'autoperl', 'ovr_custom' => 'default', + 'crap' => 'good', 'infodir' => '/usr/local/info', 'cc' => '/usr/bin/perl -c', 'sysconfdir' => '/usr/local/etc', @@ -2755,9 +2877,8 @@ 'autoperl' => '$(TOPDIR)/configure --autoperl', 'localedir' => '/usr/local/locale', 'install' => '$(TOPDIR)/configure --autoperl install -p', - 'version' => '1.25', + 'version' => '1.26', 'includedir' => '/usr/local/lib/site_perl', - 'statedir' => '/var/lib', 'datadir' => '/usr/local/share', 'sbindir' => '/usr/local/sbin', 'libdir' => '/usr/local/lib', @@ -2765,7 +2886,8 @@ 'def_custom' => 'default', 'ld' => '$(TOPDIR)/configure --autoperl link', 'destdir' => '', - 'prefix' => '/usr/local' + 'prefix' => '/usr/local', + 'localstatedir' => '/usr/local/var' ); # Allow references to $ap::foo @@ -2776,6 +2898,7 @@ $ap::{author} = sub { 'Mark Heily ' }; $ap::{program} = sub { 'autoperl' }; $ap::{ovr_custom} = sub { 'default' }; +$ap::{crap} = sub { 'good' }; $ap::{infodir} = sub { '/usr/local/info' }; $ap::{cc} = sub { '/usr/bin/perl -c' }; $ap::{sysconfdir} = sub { '/usr/local/etc' }; @@ -2786,9 +2909,8 @@ $ap::{autoperl} = sub { '$(TOPDIR)/configure --autoperl' }; $ap::{localedir} = sub { '/usr/local/locale' }; $ap::{install} = sub { '$(TOPDIR)/configure --autoperl install -p' }; -$ap::{version} = sub { '1.25' }; +$ap::{version} = sub { '1.26' }; $ap::{includedir} = sub { '/usr/local/lib/site_perl' }; -$ap::{statedir} = sub { '/var/lib' }; $ap::{datadir} = sub { '/usr/local/share' }; $ap::{sbindir} = sub { '/usr/local/sbin' }; $ap::{libdir} = sub { '/usr/local/lib' }; @@ -2797,6 +2919,7 @@ $ap::{ld} = sub { '$(TOPDIR)/configure --autoperl link' }; $ap::{destdir} = sub { '' }; $ap::{prefix} = sub { '/usr/local' }; +$ap::{localstatedir} = sub { '/usr/local/var' }; # Allow references to $ap::config{foo} or $ap::config->{foo} Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- perl-kolab.spec.in 14 Jul 2005 21:39:49 -0000 1.10 +++ perl-kolab.spec.in 15 Jul 2005 01:01:33 -0000 1.11 @@ -60,7 +60,8 @@ %build %{configure} --prefix=@l_prefix@ \ - --includedir=%{perl_sitearch} + --includedir=%{perl_sitearch} \ + --dist=kolab make %install From cvs at intevation.de Fri Jul 15 13:50:46 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 13:50:47 2005 Subject: steffen: server/perl-kolab Makefile.am,1.3,1.4 Message-ID: <20050715115046.0E7141006C7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv2190 Modified Files: Makefile.am Log Message: another fixlet from Marcus Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 15 Jul 2005 01:01:33 -0000 1.3 +++ Makefile.am 15 Jul 2005 11:50:43 -0000 1.4 @@ -21,7 +21,7 @@ # own Variables and default values: -dist_ARG = dist_conf/kolab +dist_ARG = kolab dist_ARG_HELP = dist_conf file # for including the ../dist_conf/kolab file From cvs at intevation.de Fri Jul 15 14:56:02 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Jul 15 14:56:04 2005 Subject: bernhard: doc/raw-howtos speaking-imap-for-debugging.txt,1.3,1.4 Message-ID: <20050715125602.DC2BD100179@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/raw-howtos In directory doto:/tmp/cvs-serv3581 Modified Files: speaking-imap-for-debugging.txt Log Message: Added how to list the /vendor/kolab/ annotations. Index: speaking-imap-for-debugging.txt =================================================================== RCS file: /kolabrepository/doc/raw-howtos/speaking-imap-for-debugging.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- speaking-imap-for-debugging.txt 17 Mar 2005 16:48:07 -0000 1.3 +++ speaking-imap-for-debugging.txt 15 Jul 2005 12:56:00 -0000 1.4 @@ -41,8 +41,11 @@ or a004 namespace - Listing all mailboxes: + Listing all mailboxes: a list "" * + + Listing all Kolab annotations: + a getannotation "*" "/vendor/kolab/*" "value" 4. Close session a logout From cvs at intevation.de Sat Jul 16 23:40:05 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jul 16 23:40:05 2005 Subject: steffen: server/perl-kolab Makefile.am,1.4,1.5 Message-ID: <20050716214005.4D2E81005AD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv5643 Modified Files: Makefile.am Log Message: use $dist Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 15 Jul 2005 11:50:43 -0000 1.4 +++ Makefile.am 16 Jul 2005 21:40:03 -0000 1.5 @@ -15,7 +15,7 @@ Kolab-Util -EXTRA_DIST = perl-kolab.spec.in dist_conf/kolab +EXTRA_DIST = perl-kolab.spec.in dist_conf/$(dist) AC_CONFIG_FILES = perl-kolab.spec From cvs at intevation.de Sat Jul 16 23:40:22 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Jul 16 23:40:24 2005 Subject: steffen: server/dist_conf kolab,1.1,NONE Message-ID: <20050716214022.E9D0E1005DC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/dist_conf In directory doto:/tmp/cvs-serv5679/dist_conf Removed Files: kolab Log Message: we dont need this anymore --- kolab DELETED --- From cvs at intevation.de Mon Jul 18 09:35:38 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Mon Jul 18 09:35:39 2005 Subject: martin: doc/www/src webclient.html.m4,1.5,1.6 Message-ID: <20050718073538.5BE431005A3@lists.intevation.de> Author: martin Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv9905 Modified Files: webclient.html.m4 Log Message: Martin Konold: Don't recommend to use root account for cvs. Removed section about Kolab 2 snapshots Index: webclient.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/webclient.html.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- webclient.html.m4 27 Jan 2005 15:53:09 -0000 1.5 +++ webclient.html.m4 18 Jul 2005 07:35:36 -0000 1.6 @@ -17,15 +17,6 @@ tracker.
-
-NOTE: The Kolab Webclient has been re-designed to work exclusively with -version 2 of the Kolab server. As this new version of Kolab is currently in -development it is recommended that you wait until it is fully released before -running the webclient. However, If you know how to get the latest Kolab 2 -snapshots up and running and want to help test the webclient, then this guide -is for you. -
-

Credits and thanks must also go out to the Horde project, on which the Kolab Webclient @@ -44,7 +35,7 @@

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

 cvs -z4 -q
 update -dP


From cvs at intevation.de  Mon Jul 18 10:24:20 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Jul 18 10:24:21 2005
Subject: martin: doc/www/src about-kolab-clients.html.m4,1.18,1.19 
Message-ID: <20050718082420.2CB481006B6@lists.intevation.de>

Author: martin

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

Modified Files:
	about-kolab-clients.html.m4 
Log Message:
Martin Konold: remove some cruft, correct ordering of items


Index: about-kolab-clients.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- about-kolab-clients.html.m4	1 Jul 2005 14:54:21 -0000	1.18
+++ about-kolab-clients.html.m4	18 Jul 2005 08:24:18 -0000	1.19
@@ -6,25 +6,15 @@
 
 Clients for Kolab-2

   KDE Kontact Client for Linux/Unix

-  MAPI Storage Provider for Microsoft Windows: KONSEC Konnektor for Outlook

   Microsoft Outlook Plugin: Toltec Connector 2 for Outlook

+  MAPI Storage Provider for Microsoft Windows: KONSEC Konnektor for Outlook

   Horde Webmail

 
 

-Clients for Kolab-1

-  KDE Client for Kolab-1

-  Kontact 1.0

-  Outlook Plugin: Bynari v1

-  Outlook Plugin: Toltec Connector 1

-
-

 Other Kolab-related Clients

   Thunderbird Plugin: Sync Kolab

   Aethera

   Outlook Plugin: Bynari v2

-  Outlook Plugin: Open Connctor (otlkcon)

-  Outlook Plugin: SourceXtreme's mapi connector

-
 
 
 
Clients for Kolab-2

@@ -76,11 +66,11 @@
 
 

 The Toltec Connector 2
-is the Kolab projects' reference connector for Outlook
-for Kolab-2 and so interoperability with the KDE Kolab client
-as tested intensively. 
+is the reference Outlook connector used during development of the Kolab project
+so interoperability with the KDE Kolab client
+was tested intensively. 
 Its vendor Radley Network Technologies has
-a stable Outlook connector (Toltec 1) on the market since October 2003.
+a stable Outlook connector (Toltec 1 for Kolab 1) on the market since October 2003.
 User and groups can share folders 
 including those that contain emails, calendar items, tasks and contacts
 with the Toltec Connector.
@@ -94,7 +84,7 @@
 KONSEC
   
-License: proprietary with a gratis 30 day demo

+License: proprietary with a gratis 30 day evaluation

 Status: stable release 1.0 for Kolab 2 
 Homepage: www.konsec.com
 
@@ -116,7 +106,7 @@
   src="images/horde-logo.png" align="right">
 
 License: Free Software (GPL)

-Status: Beta
+Status: pre Beta
 
 

 Currently part of Horde CVS, this is still
@@ -138,6 +128,7 @@
 
 These are clients known to work with Kolab Server 1.0. - Please note that the Kolab 1 server
 is not activly developed anymore and that it is recommended to use Kolab 2 for new installations.
+Existing users of Kolab 1 are asked to upgrade to Kolab 2 for continued support.
 
 
 
KDE Client for Kolab-1

@@ -220,41 +211,5 @@
 Aethera is a independent client running on Windows and GNU/Linux.
 Its homepage says it is a Kolab Client. 
 The developers are working eagerly on making aethera a Kolab 2 client.
-
-
-
Outlook Plugin: Bynari v2

-
-
-License: proprietary

-Status: Untested, users reported problems. Does not work with the Kolab 2 storage format

-Homepage: www.bynari.net
-
-

-Bynari v1 was compatible with Kolab-1. The new
-release v2 seems to differ a lot and it is highly questionable whether
-it works with Kolab-1. It surely does not work with Kolab-2.
-
-
-
Outlook Plugin: Open Connctor (otlkcon)

-
-
-License: Free Software: GNU LGPL

-Status: early development

-Homepage: www.openconnector.org
-
-

-Pre-alpha stage. No reports on connectivity with Kolab known.
-It is even unclear whether they want to maintain any support for Kolab.
-
-
-
Outlook Plugin: SourceXtreme's mapi connector

-
-
-Planned License: Free Software

-Status: unclear

-Homepage: None

-
-Ian Geiser's Company SourceXtreme
-was working on a mapi connector. Not much news in a while.
 
 m4_include(footer.html.m4)


From cvs at intevation.de  Mon Jul 18 10:26:48 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Jul 18 10:26:50 2005
Subject: martin: doc/www/src about-kolab-clients.html.m4,1.19,1.20 
Message-ID: <20050718082648.3DFC61006BA@lists.intevation.de>

Author: martin

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

Modified Files:
	about-kolab-clients.html.m4 
Log Message:
MArtin Konold: Fixed headline. KK is not a plugin but a MAPI Storage Provider


Index: about-kolab-clients.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/about-kolab-clients.html.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- about-kolab-clients.html.m4	18 Jul 2005 08:24:18 -0000	1.19
+++ about-kolab-clients.html.m4	18 Jul 2005 08:26:46 -0000	1.20
@@ -79,7 +79,7 @@
 in cooperation with the Toltec developers.
 
 
-
Outlook Plugin: KONSEC Konnektor

+
MAPI Storage Provider for Microsoft Outlook: KONSEC Konnektor

 
 KONSEC


From cvs at intevation.de  Mon Jul 18 21:36:11 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Jul 18 21:36:12 2005
Subject: bh: doc/raw-howtos kolab-kde-client-on-suse91p.txt,1.9,1.10 
Message-ID: <20050718193611.149091006A9@lists.intevation.de>

Author: bh

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

Modified Files:
	kolab-kde-client-on-suse91p.txt 
Log Message:
update for the new packages


Index: kolab-kde-client-on-suse91p.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab-kde-client-on-suse91p.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab-kde-client-on-suse91p.txt	28 Jun 2005 11:34:47 -0000	1.9
+++ kolab-kde-client-on-suse91p.txt	18 Jul 2005 19:36:09 -0000	1.10
@@ -4,16 +4,15 @@
 $Id$
 
 Status:
- - description on how to install the prepared package set
-   "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.
+ - description on how to install the kolab kde client packages.  The
+   packages include 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 of the kolab2.0-kdepim3.3-aegypten2.0-client
    packages
  - tested as a initial installation on a fresh SUSE 9.1P
    with online-updates as of 20050420.
- - some steps are in German
+ - tested update from earlier versions which used a meta package (20050718)
 
 
 Initial Installation
@@ -37,7 +36,8 @@
 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.
+You can omit the RPM/src directory if you don't want to download the
+sources as it's not needed to install the software.
 
 
 2. Check the signature of Kolab-Konsortium
@@ -51,7 +51,7 @@
 For each directory of i586, noarch, srpms:
 
 # gpg  --verify md5sums.txt.sig
-# md5sum * | grep -v md5sum  > /tmp/md5sums
+# find . -type f | grep -v md5sums | sort | xargs md5sum > /tmp/md5sums
 # diff /tmp/md5sums md5sums.txt
 
 (For those who wonder why we did not sign the rpm
@@ -60,21 +60,33 @@
 
 3. Install Kolab KDE Client
 
-# cd /tmp/kolab-download
-# rpm -Uvh noarch/kde3-i18n-de-3.2.1.proko2.0.rc3-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.
+ - Add a new installation source with via "Software->Change Source of
+   Installation". ("Software->Installationquelle wechseln" in the German
+   version).
 
-	In yast unter "Sofware->Installieren oder löschen" das
-	Paket "kolab2.0-kdepim3.3-aegypten2.0-client" selektieren
-	und installieren.
+   Use "Add" ("Hinzufügen") to create a new installation source for the
+   local directory you downloaded the software into
+   (/tmp/kolab-download/).
+
+   Disable any other sources to make the package selection easier.
+
+   Select "Finish" ("Beenden")
+
+ - Use "Install and Remove Software" ("Sofware->Installieren oder
+   löschen") to install the software:
+
+   Go to "Filter->Selections" and choose the "Kolab 2.0 KDE-Client"
+   selection.
+
+   "Accept" ("Übernehmen") the package selection.  A dialog will come up
+   informing you that the packages "newpg" and "cryptplug" will be
+   removed.  This is OK as their functionality is included in the new
+   packages.
+
+   Now the software will be intalled.
+   
 
 
 4. Configuration
@@ -125,27 +137,22 @@
 3. Go to the "Install and Remove Software" ("Software installieren oder
    löschen" in the German version) section of yast.  
 
-   You will get a conflict dialog because the new meta package depends
-   on newer versions of the other components but yast for some reason
-   thinks it has to keep the old version of those packages.
-   E.g. version 1.0.0 depends on kdepim3-3.3.proko2.0.beta2 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.
+   You will get a conflict dialog because the old meta package is still
+   installed.  In the conflict dialog, select the meta package and press
+   space until it's marked for deletion, i.e. with a "-" in the first
+   column.  The select "Solve" ("Lösen").
 
-   Resolve this by selecting those packages in the conflict dialog that
-   are marked with "-i-" instead of a simple "i" and press the space bar
-   twice to turn the "-i-" into an ">" ("-i-" means that the version of
-   the package is fixed while ">" means that it should be updated)
+   A new conflict dialog appears which lists kdepim3 with the "-i-" flag
+   which means that it is to be kept at the old version even though a
+   newer version is available.  Press space until kdepim3 is marked with
+   ">" indicating an update.  Again, select "Solve" ("Lösen").
 
-   Yast doesn't handle the dependency on the kde-i18n package properly,
-   so you need to select the "Ignore All" button.
+   Select "Filter/Installationsüberblick".  This will list several
+   packages with "-i-".  These are the packages the old virtual package
+   depended on.  Select them and mark them for update.
 
-   After you have closed the conflict dialog, "Accept" ("Übernehmen") the
-   package installation and the packages will be installed.
+   Then, "Accept" ("Übernehmen") the package installation and the
+   packages will be installed.
 
    Quit yast.
 
-4. Install the i18n package on the commandline with rpm:
-
-   rpm -Uvh noarch/kde3-i18n-de-3.2.1.proko2.0.rc3-0.noarch.rpm


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:42 2005
Subject: steffen: server/perl-kolab Makefile, NONE, 1.3.2.1 perl-kolab.spec,
	1.91, 1.91.2.1 Makefile.am, 1.1, NONE Makefile.cvs, 1.1,
	NONE configure, 1.1, NONE perl-kolab.spec.in, 1.1, NONE 
Message-ID: <20050719013241.719F61005CA@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	perl-kolab.spec 
Added Files:
      Tag: kolab_2_0_branch
	Makefile 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am Makefile.cvs configure perl-kolab.spec.in 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

--- NEW FILE: Makefile ---
RPM = /kolab/bin/openpkg rpm
VERSION = 0.9.2

ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = /kolab/RPM/SRC
endif

SRCDIR=$(KOLABRPMSRC)/perl-kolab

all:
	test -d $(SRCDIR) || mkdir $(SRCDIR)
	tar cvzf $(SRCDIR)/Kolab-$(VERSION).tar.gz Kolab 
	tar cvzf $(SRCDIR)/Kolab-Util-$(VERSION).tar.gz Kolab-Util
	tar cvzf $(SRCDIR)/Kolab-Conf-$(VERSION).tar.gz Kolab-Conf 
	tar cvzf $(SRCDIR)/Kolab-Cyrus-$(VERSION).tar.gz Kolab-Cyrus
	tar cvzf $(SRCDIR)/Kolab-DirServ-$(VERSION).tar.gz Kolab-DirServ
	tar cvzf $(SRCDIR)/Kolab-LDAP-$(VERSION).tar.gz Kolab-LDAP
	tar cvzf $(SRCDIR)/Kolab-LDAP-Backend-$(VERSION).tar.gz Kolab-LDAP-Backend 
	tar cvzf $(SRCDIR)/Kolab-LDAP-Backend-ad-$(VERSION).tar.gz Kolab-LDAP-Backend-ad
	tar cvzf $(SRCDIR)/Kolab-LDAP-Backend-dirservd-$(VERSION).tar.gz Kolab-LDAP-Backend-dirservd
	tar cvzf $(SRCDIR)/Kolab-LDAP-Backend-slurpd-$(VERSION).tar.gz Kolab-LDAP-Backend-slurpd
	tar cvzf $(SRCDIR)/Kolab-Mailer-$(VERSION).tar.gz Kolab-Mailer
	cp perl-kolab.spec $(SRCDIR)
	cd $(SRCDIR) && $(RPM) -ba perl-kolab.spec
binary:
	$(RPM) -bB perl-kolab.spec

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Attic/perl-kolab.spec,v
retrieving revision 1.91
retrieving revision 1.91.2.1
diff -u -d -r1.91 -r1.91.2.1
--- perl-kolab.spec	8 Jun 2005 12:44:35 -0000	1.91
+++ perl-kolab.spec	19 Jul 2005 01:32:39 -0000	1.91.2.1
@@ -24,7 +24,18 @@
 ##
 
 #   versions of individual parts
-
+%define       V_perl                            5.8.5
+%define       V_kolab                           0.9.2
+%define       V_kolab_util                      0.9.2
+%define       V_kolab_ldap                      0.9.2
+%define       V_kolab_ldap_backend              0.9.2
+%define       V_kolab_ldap_backend_ad           0.9.2
+%define       V_kolab_ldap_backend_slurpd       0.9.2
+%define       V_kolab_ldap_backend_dirservd     0.9.2
+%define       V_kolab_cyrus                     0.9.2
+%define       V_kolab_conf                      0.9.2
+%define       V_kolab_dirserv                   0.9.2
+%define       V_kolab_mailer                    0.9.2
 
 #   package information
 Name:         perl-kolab
@@ -36,44 +47,124 @@
 Class:        PLUS
 Group:        Language
 License:      GPL/Artistic
-Version:      0.9.2
-Release:      20050421
+Version:      %{V_perl}
+Release:      20050719
 
 #   list of sources
-Source0:      perl-kolab-0.9.2.tar.gz
+Source0:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz
+Source1:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-Util-%{V_kolab_util}.tar.gz
+Source2:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-LDAP-%{V_kolab_ldap}.tar.gz
+Source3:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-LDAP-Backend-%{V_kolab_ldap_backend}.tar.gz
+Source4:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-LDAP-Backend-ad-%{V_kolab_ldap_backend_ad}.tar.gz
+Source5:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-LDAP-Backend-slurpd-%{V_kolab_ldap_backend_slurpd}.tar.gz
+Source6:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-LDAP-Backend-dirservd-%{V_kolab_ldap_backend_dirservd}.tar.gz
+Source7:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-Cyrus-%{V_kolab_cyrus}.tar.gz
+Source8:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-Conf-%{V_kolab_conf}.tar.gz
+Source9:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-DirServ-%{V_kolab_dirserv}.tar.gz
+Source10:     http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-Mailer-%{V_kolab_mailer}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 2.0, perl >= 0.9.2, perl-openpkg >= 0.9.2
-PreReq:       OpenPKG, openpkg >= 2.2.0, perl >= 0.9.2, perl-openpkg >= 0.9.2, perl-db, perl-mail, perl-ldap
+BuildPreReq:  OpenPKG, openpkg >= 2.0, perl >= %{V_perl}, perl-openpkg >= %{V_perl}
+PreReq:       OpenPKG, openpkg >= 2.2.0, perl >= %{V_perl}, perl-openpkg >= %{V_perl}, perl-db, perl-mail, perl-ldap
 AutoReq:      no
 AutoReqProv:  no
 
 %description
     Perl modules for use with the Kolab server
 
-%prep
+%track
+    prog perl-util:Kolab = {
+        version   = %{V_kolab}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-Conf = {
+        version   = %{V_kolab_conf}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-Conf-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-Cyrus = {
+        version   = %{V_kolab_cyrus}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-Cyrus-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-DirServ = {
+        version   = %{V_kolab_dirserv}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-DirServ-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-LDAP = {
+        version   = %{V_kolab_ldap}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-LDAP-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-LDAP-Backend = {
+        version   = %{V_kolab_ldap_backend}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-LDAP-Backend-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-LDAP-Backend-ad = {
+        version   = %{V_kolab_ldap_backend_ad}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-LDAP-Backend-ad-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-LDAP-Backend-dirservd = {
+        version   = %{V_kolab_ldap_backend_dirservd}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-LDAP-Backend-dirservd-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-LDAP-Backend-slurpd = {
+        version   = %{V_kolab_ldap_backend_slurpd}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-LDAP-Backend-slurpd-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-Mailer = {
+        version   = %{V_kolab_mailer}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-Mailer-(__VER__)\.tar\.gz
+    }
+    prog perl-util:Kolab-Util = {
+        version   = %{V_kolab_util}
+        url       = http://www.cpan.org/authors/id/S/ST/STEPHANB/
+        regex     = Kolab-Util-(__VER__)\.tar\.gz
+    }
 
-%setup -n %{name}-%{version}
+%prep
+    %setup -q -c
+    %setup -q -T -D -a 1
+    %setup -q -T -D -a 2
+    %setup -q -T -D -a 3
+    %setup -q -T -D -a 4
+    %setup -q -T -D -a 5
+    %setup -q -T -D -a 6
+    %setup -q -T -D -a 7
+    %setup -q -T -D -a 8
+    %setup -q -T -D -a 9
+    %setup -q -T -D -a 10
 
 
 %build
-    %{configure} --prefix=/usr \
-		 --includedir=%{perl_sitearch} \
-                 --localstatedir=/var \
-                 --sysconfdir=/etc \
-                 --webadmindir=/srv/www/htdocs/kolab
-
-    make
 
 %install
-    make DESTDIR=%{buildroot} install
+    %{l_prefix}/bin/perl-openpkg prepare
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE1}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE2}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE3}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE4}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE5}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE6}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE7}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE8}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE9}  configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE10} configure build install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
 
 %files -f files
 
 %clean
-    [ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf  %{buildroot}
+    rm -rf $RPM_BUILD_ROOT
 

--- Makefile.am DELETED ---

--- Makefile.cvs DELETED ---

--- configure DELETED ---

--- perl-kolab.spec.in DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:45 2005
Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm, 1.55,
	1.55.2.1 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.91F671006BD@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv31903/Kolab-Conf

Modified Files:
      Tag: kolab_2_0_branch
	Conf.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -u -d -r1.55 -r1.55.2.1
--- Conf.pm	8 Jun 2005 12:44:35 -0000	1.55
+++ Conf.pm	19 Jul 2005 01:32:39 -0000	1.55.2.1
@@ -1,10 +1,10 @@
 package Kolab::Conf;
 
 ##
-##  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
+##  Copyright (c) 2004  Klaralvdalens Datakonsult AB
 ##  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  
@@ -38,7 +38,6 @@
 use Kolab::LDAP;
 
 require Exporter;
-require "config.h";
 
 our @ISA = qw(Exporter);
 
@@ -107,7 +106,7 @@
     }
     my $config;
     if (!($config = new File::Temp( TEMPLATE => 'tmpXXXXX',
-				    DIR => $prefix.$ap::config->{sysconfdir}/kolab/,
+				    DIR => $prefix.'/etc/kolab/',
 				    SUFFIX => '.kolabtmp',
 				    UNLINK => 0 ))) {
         Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
@@ -232,14 +231,14 @@
     Kolab::log('T', "Building Postfix $map map", KOLAB_DEBUG);
 
     my $prefix = $Kolab::config{'prefix'};
-    my $cfg = "$ap::config->{sysconfdir}/postfix/$map";
+    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("$ap::config->{sysconfdir}/kolab/templates/$map.template", $cfg);
+    copy("$prefix/etc/kolab/templates/$map.template", $cfg);
 
     my $transport;
     if (!($transport = IO::File->new($cfg, 'a'))) {
@@ -282,8 +281,8 @@
     $transport->close;
 
     # FIXME: bad way of doing things...
-    #system("chown root:root $ap::config->{sysconfdir}/postfix/*");
-    system("$ap::config->{sbindir}/postmap $ap::config->{sysconfdir}/etc/postfix/$map");
+    #system("chown root:root $prefix/etc/postfix/*");
+    system("$prefix/sbin/postmap $prefix/etc/postfix/$map");
 
     if (-f $oldcfg) {
         my $rc = `diff -q $cfg $oldcfg`;
@@ -305,12 +304,12 @@
 
     my $prefix = $Kolab::config{'prefix'};
     my $cyrustemplate;
-    if (!($cyrustemplate = IO::File->new("$ap::config->{sysconfdir}/kolab/templates/cyrus.conf.template", 'r')))  {
+    if (!($cyrustemplate = IO::File->new("$prefix/etc/kolab/templates/cyrus.conf.template", 'r')))  {
         Kolab::log('T', "Unable to open template file `cyrus.conf.template'", KOLAB_ERROR);
         exit(1);
     }
 
-    my $cfg = "$ap::config->{sysconfdir}/imapd/cyrus.conf";
+    my $cfg = "$prefix/etc/imapd/cyrus.conf";
     my $oldcfg = $cfg . '.old';
     my $oldmask = umask 077;
     copy($cfg, $oldcfg);
@@ -325,23 +324,23 @@
 
     while (<$cyrustemplate>) {
         if (/\@{3}cyrus-imap\@{3}/ && ($Kolab::config{"cyrus-imap"} =~ /true/i)) {
-            $_ = "imap cmd=\"imapd -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"143\" prefork=0\n";
+            $_ = "imap cmd=\"imapd -C $prefix/etc/imapd/imapd.conf\" listen=\"143\" prefork=0\n";
         }
         elsif (/\@{3}cyrus-imap\@{3}/ && ($Kolab::config{"cyrus-imap"} =~ /false/i)) {
 	    # Even if imapd is disabled, enable it for localhost -- resource handlers depend on it
-            $_ = "imap cmd=\"imapd -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"127.0.0.1:143\" prefork=0\n";
+            $_ = "imap cmd=\"imapd -C $prefix/etc/imapd/imapd.conf\" listen=\"127.0.0.1:143\" prefork=0\n";
         }
         elsif (/\@{3}cyrus-pop3\@{3}/ && ($Kolab::config{"cyrus-pop3"} =~ /true/i)) {
-            $_ = "pop3 cmd=\"pop3d -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"110\" prefork=0\n";
+            $_ = "pop3 cmd=\"pop3d -C $prefix/etc/imapd/imapd.conf\" listen=\"110\" prefork=0\n";
         }
         elsif (/\@{3}cyrus-imaps\@{3}/ && ($Kolab::config{"cyrus-imaps"} =~ /true/i)) {
-            $_ = "imaps cmd=\"imapd -s -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"993\" prefork=0\n";
+            $_ = "imaps cmd=\"imapd -s -C $prefix/etc/imapd/imapd.conf\" listen=\"993\" prefork=0\n";
         }
         elsif (/\@{3}cyrus-pop3s\@{3}/ && ($Kolab::config{"cyrus-pop3s"} =~ /true/i)) {
-            $_ = "pop3s cmd=\"pop3d -s -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"995\" prefork=0\n";
+            $_ = "pop3s cmd=\"pop3d -s -C $prefix/etc/imapd/imapd.conf\" listen=\"995\" prefork=0\n";
         }
         elsif (/\@{3}cyrus-sieve\@{3}/ && ($Kolab::config{"cyrus-sieve"} =~ /true/i)) {
-            $_ = "sieve cmd=\"timsieved -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"2000\" prefork=0\n";
+            $_ = "sieve cmd=\"timsieved -C $prefix/etc/imapd/imapd.conf\" listen=\"2000\" prefork=0\n";
         }
         $_ =~ s/\@{3}.*\@{3}//;
         print $cyrusconf $_;
@@ -371,14 +370,14 @@
     Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
 
     my $prefix = $Kolab::config{'prefix'};
-    my $cfg = "$ap::config->{sysconfdir}/imapd/imapd.group";
+    my $cfg = "$prefix/etc/imapd/imapd.group";
     my $oldcfg = $cfg . '.old';
 
     my $oldmask = umask 077;
     copy($cfg, $oldcfg);
     chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
     umask $oldmask;
-    copy("$ap::config->{sysconfdir}/kolab/templates/imapd.group.template", $cfg);
+    copy("$prefix/etc/kolab/templates/imapd.group.template", $cfg);
     my $groupconf;
     if (!($groupconf = IO::File->new($cfg, 'a'))) {
         Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
@@ -447,13 +446,13 @@
     Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG);
 
     my $prefix = $Kolab::config{'prefix'};
-    my $cfg = "$ap::config->{sysconfdir}/openldap/slapd.replicas";
+    my $cfg = "$prefix/etc/openldap/slapd.replicas";
     my $oldcfg = $cfg . '.old';
 
     my $oldmask = umask 077;
     copy($cfg, $oldcfg);
     chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
-    copy("$ap::config->{sysconfdir}/kolab/templates/slapd.replicas.template", $cfg);
+    copy("$prefix/etc/kolab/templates/slapd.replicas.template", $cfg);
     my $repl;
     if (!($repl = IO::File->new($cfg, 'a'))) {
         Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
@@ -557,79 +556,77 @@
 }
 
 my $prefix = $Kolab::config{'prefix'};
-my $templatedir = "$ap::config->{sysconfdir}/kolab/templates";
+my $templatedir = "$prefix/etc/kolab/templates";
 
 my %templates = (
-		 "$templatedir/rc.conf.template" => "$ap::config->{sysconfdir}/rc.conf",
-		 "$templatedir/session_vars.php.template" => "$ap::config->{webadmindir}/php/admin/include/session_vars.php",
-		 "$templatedir/clamd.conf.template" => "$ap::config->{sysconfdir}/clamav/clamd.conf",
-		 "$templatedir/freshclam.conf.template" => "$ap::config->{sysconfdir}/clamav/freshclam.conf",
-		 "$templatedir/amavisd.conf.template" => "$ap::config->{sysconfdir}/amavisd/amavisd.conf",
-		 "$templatedir/main.cf.template" => "$ap::config->{sysconfdir}/postfix/main.cf",
-		 "$templatedir/master.cf.template" => "$ap::config->{sysconfdir}/postfix/master.cf",
-		 "$templatedir/saslauthd.conf.template" => "$ap::config->{sysconfdir}/sasl/saslauthd.conf",
-		 "$templatedir/imapd.conf.template" => "$ap::config->{sysconfdir}/imapd/imapd.conf",
-		 "$templatedir/httpd.conf.template" => "$ap::config->{webserver_confdir}/apache.conf",
-		 "$templatedir/httpd.local.template" => "$ap::config->{webserver_confdir}/apache.local",
-		 "$templatedir/php.ini.template" => "$ap::config->{webserver_confdir}/php.ini",
-		 "$templatedir/proftpd.conf.template" => "$ap::config->{ftpserver_confdir}/proftpd.conf",
-		 "$templatedir/ldap.conf.template" => "$ap::config->{sysconfdir}/openldap/ldap.conf",
-		 "$templatedir/slapd.conf.template" => "$ap::config->{sysconfdir}/openldap/slapd.conf",
+		 "$templatedir/rc.conf.template" => "$prefix/etc/rc.conf",
+		 "$templatedir/session_vars.php.template" => "$prefix/var/kolab/php/admin/include/session_vars.php",
+		 "$templatedir/clamd.conf.template" => "$prefix/etc/clamav/clamd.conf",
+		 "$templatedir/freshclam.conf.template" => "$prefix/etc/clamav/freshclam.conf",
+		 "$templatedir/amavisd.conf.template" => "$prefix/etc/amavisd/amavisd.conf",
+		 "$templatedir/main.cf.template" => "$prefix/etc/postfix/main.cf",
+		 "$templatedir/master.cf.template" => "$prefix/etc/postfix/master.cf",
+		 "$templatedir/saslauthd.conf.template" => "$prefix/etc/sasl/saslauthd.conf",
+		 "$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/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",
+		 "$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" => "$ap::config->{sysconfdir}/resmgr/freebusy.conf",
-		 "$templatedir/fbview.conf.template" => "$ap::config->{sysconfdir}/resmgr/fbview.conf",
-		 "$templatedir/resmgr.conf.template" => "$ap::config->{sysconfdir}/resmgr/resmgr.conf"
+		 "$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"
 		);
 
 my %permissions = (
-		   "$ap::config->{sysconfdir}/rc.conf"                                  => 0644,
-		   "$ap::config->{webadmindir}/php/admin/include/session_vars.php" => 0640,
-		   "$ap::config->{sysconfdir}/resmgr/freebusy.conf"                     => 0640,
-		   "$ap::config->{sysconfdir}/resmgr/fbview.conf"                       => 0640,
-		   "$ap::config->{sysconfdir}/resmgr/resmgr.conf"                       => 0640,
-		   "$ap::config->{sysconfdir}/postfix/main.cf"                          => 0640,
-		   "$ap::config->{sysconfdir}/postfix/master.cf"                        => 0640,
-		   "$ap::config->{sysconfdir}/clamav/clamd.conf"                        => 0640,
-		   "$ap::config->{sysconfdir}/clamav/freshclam.conf"                    => 0640,
-		   "$ap::config->{sysconfdir}/amavisd/amavisd.conf"                     => 0640,
-		   "$ap::config->{sysconfdir}/sasl/saslauthd.conf"                      => 0600,
-		   "$ap::config->{sysconfdir}/imapd/imapd.conf"                         => 0640,
-		   "$ap::config->{webserver_confdir}/apache.conf"                       => 0640,
-		   "$ap::config->{webserver_confdir}/apache.local"                      => 0640,
-		   "$ap::config->{webserver_confdir}/php.ini"                           => 0640,
-		   "$ap::config->{ftpserver_confdir}/proftpd.conf"                     => 0640,
-		   "$ap::config->{sysconfdir}/openldap/slapd.conf"                      => 0640,
+		   "$prefix/etc/rc.conf"                                  => 0644,
+		   "$prefix/var/kolab/php/admin/include/session_vars.php" => 0640,
+		   "$prefix/etc/resmgr/freebusy.conf"                     => 0640,
+		   "$prefix/etc/resmgr/fbview.conf"                       => 0640,
+		   "$prefix/etc/resmgr/resmgr.conf"                       => 0640,
+		   "$prefix/etc/postfix/main.cf"                          => 0640,
+		   "$prefix/etc/postfix/master.cf"                        => 0640,
+		   "$prefix/etc/clamav/clamd.conf"                        => 0640,
+		   "$prefix/etc/clamav/freshclam.conf"                    => 0640,
+		   "$prefix/etc/amavisd/amavisd.conf"                     => 0640,
+		   "$prefix/etc/sasl/saslauthd.conf"                      => 0600,
+		   "$prefix/etc/imapd/imapd.conf"                         => 0640,
+		   "$prefix/etc/apache/apache.conf"                       => 0640,
+		   "$prefix/etc/apache/apache.local"                      => 0640,
+		   "$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,
-		   "$ap::config->{sysconfdir}/openldap/ldap.conf"                       => 0644,
-		   "$ap::config->{sysconfdir}/postfix/transport"                        => 0640,
-		   "$ap::config->{sysconfdir}/postfix/virtual"                          => 0640,
-		   "$ap::config->{sysconfdir}/imapd/cyrus.conf"                         => 0640,
-		   "$ap::config->{sysconfdir}/imapd/imapd.group"                        => 0640);
+		   "$prefix/etc/openldap/ldap.conf"                       => 0644,
+		   "$prefix/etc/postfix/transport"                        => 0640,
+		   "$prefix/etc/imapd/cyrus.conf"                         => 0640,
+		   "$prefix/etc/imapd/imapd.group"                        => 0640);
 
 my %ownership = (
-		 "$ap::config->{sysconfdir}/rc.conf"                                  => "kolab:kolab",
-		 "$ap::config->{webadmindir}/php/admin/include/session_vars.php" => "kolab:kolab-n",
-		 "$ap::config->{sysconfdir}/resmgr/freebusy.conf"                     => "kolab:kolab-n",
-		 "$ap::config->{sysconfdir}/resmgr/fbview.conf"                       => "kolab:kolab-n",
-		 "$ap::config->{sysconfdir}/resmgr/resmgr.conf"                       => "kolab:kolab-n",
-		 "$ap::config->{sysconfdir}/postfix/main.cf"                          => "kolab:kolab-r",
-		 "$ap::config->{sysconfdir}/postfix/master.cf"                        => "kolab:kolab-r",
-		 "$ap::config->{sysconfdir}/clamav/clamd.conf"                        => "kolab:kolab-r",
-		 "$ap::config->{sysconfdir}/clamav/freshclam.conf"                    => "kolab:kolab-r",
-		 "$ap::config->{sysconfdir}/amavisd/amavisd.conf"                     => "kolab:kolab-r",
-		 "$ap::config->{sysconfdir}/sasl/saslauthd.conf"                      => "kolab:kolab",
-		 "$ap::config->{sysconfdir}/imapd/imapd.conf"                         => "kolab:kolab-r",
-		 "$ap::config->{webserver_confdir}/apache.conf"                       => "kolab:kolab-n",
-		 "$ap::config->{webserver_confdir}/apache.local"                      => "kolab:kolab-n",
-		 "$ap::config->{webserver_confdir}/php.ini"                           => "kolab:kolab-n",
-		 "$ap::config->{ftpserver_confdir}/proftpd.conf"                      => "kolab:kolab-n",
-		 "$ap::config->{sysconfdir}/openldap/ldap.conf"                       => "kolab:kolab",
-		 "$ap::config->{sysconfdir}/openldap/slapd.conf"                      => "kolab:kolab",
-		 "$prefix/var/openldap/openldap-data/DB_CONFIG"                       => "kolab:kolab",
-		 "$ap::config->{sysconfdir}/postfix/transport"                        => "root:kolab",
-		 "$ap::config->{sysconfdir}/postfix/virtual"                          => "root:kolab",
-		 "$ap::config->{sysconfdir}/imapd/cyrus.conf"                         => "kolab:kolab",
-		 "$ap::config->{sysconfdir}/imapd/imapd.group"                        => "kolab:kolab-r");
+		 "$prefix/etc/rc.conf"                                  => "kolab:kolab",
+		 "$prefix/var/kolab/php/admin/include/session_vars.php" => "kolab:kolab-n",
+		 "$prefix/etc/resmgr/freebusy.conf"                     => "kolab:kolab-n",
+		 "$prefix/etc/resmgr/fbview.conf"                       => "kolab:kolab-n",
+		 "$prefix/etc/resmgr/resmgr.conf"                       => "kolab:kolab-n",
+		 "$prefix/etc/postfix/main.cf"                          => "kolab:kolab-r",
+		 "$prefix/etc/postfix/master.cf"                        => "kolab:kolab-r",
+		 "$prefix/etc/clamav/clamd.conf"                        => "kolab:kolab-r",
+		 "$prefix/etc/clamav/freshclam.conf"                    => "kolab:kolab-r",
+		 "$prefix/etc/amavisd/amavisd.conf"                     => "kolab:kolab-r",
+		 "$prefix/etc/sasl/saslauthd.conf"                      => "kolab:kolab",
+		 "$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/php.ini"                           => "kolab:kolab-n",
+		 "$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");
 
 
 sub rebuildTemplates
@@ -699,7 +696,7 @@
 
 =head1 AUTHOR
 
-Stuart Bingë s.binge@codefusion.co.zaE
+Stuart Bing묠Es.binge@codefusion.co.zaE
 
 =head1 COPYRIGHT AND LICENSE
 

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:46 2005
Subject: steffen: server/perl-kolab/Kolab Kolab.pm, 1.23.2.1,
	1.23.2.2 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.7F5761006A9@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Kolab.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -d -r1.23.2.1 -r1.23.2.2
--- Kolab.pm	14 Jul 2005 21:34:48 -0000	1.23.2.1
+++ Kolab.pm	19 Jul 2005 01:32:39 -0000	1.23.2.2
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bingë 
+##    Writen by Stuart Bing?
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as
@@ -30,7 +30,6 @@
 use vars qw(%config %haschanged $reloadOk);
 
 require Exporter;
-require "config.h";
 
 our @ISA = qw(Exporter);
 
@@ -83,12 +82,12 @@
         &log('C', 'Unable to determine the kolab root directory', KOLAB_ERROR);	
 	$error = 1;
     } else {
-        %config = readConfig(%config, "$tempval$ap::config->{sysconfdir}/kolab/kolab.globals");
+        %config = readConfig(%config, "$tempval/etc/kolab/kolab.globals");
         $config{'prefix'} = $tempval;
     }
 
     # Now read `kolab.conf', overwriting values read from `kolab.globals'
-    %config = readConfig(\%config, "$tempval$ap::config->{sysconfdir}/kolab/kolab.conf");
+    %config = readConfig(\%config, "$tempval/etc/kolab/kolab.conf");
 
 #    $config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
     &log('C', 'Reloading configuration');
@@ -127,7 +126,7 @@
 
     # Make a hash of the bind password available too
     if( !exists $config{'bind_pw_hash'} ) {
-      my $hashcmd = $config{'prefix'}."$ap::config->{sbindir}/slappasswd -s '".$config{'bind_pw'}."'";
+      my $hashcmd = $config{'prefix'}."/sbin/slappasswd -s '".$config{'bind_pw'}."'";
       $config{'bind_pw_hash'} = `$hashcmd`;
       chomp($config{'bind_pw_hash'});
     }
@@ -383,49 +382,49 @@
 
     if ($haschanged{'slapd'}) {
         &log('K', 'Restarting OpenLDAP...');
-        system("$ap::config->{sbindir}/slurpd restart &");
+        system("$prefix/bin/openpkg rc openldap restart &");
     }
 
     if ($haschanged{'saslauthd'}) {
         &log('K', 'Restarting SASLAuthd...');
-        system("$ap::config->{sbindir}/rcsaslauthd stop; sleep 1; $ap::config->{sbindir}/rcsaslauthd -a ldap -n 5");
+        system("$prefix/bin/openpkg rc sasl stop; sleep 1; $prefix/sbin/saslauthd -a ldap -n 5");
     }
 
     if ($haschanged{'apache'}) {
         &log('K', 'Reloading Apache...');
-        system("$ap::config->{sbindir}/apache2ctl graceful");
+        system("$prefix/sbin/apachectl graceful");
     }
 
     if ($haschanged{'postfix'}) {
         &log('K', 'Reloading Postfix...');
-        system("$ap::config->{sbindir}/rcpostfix reload");
+        system("$prefix/sbin/postfix reload");
     }
 
     if ($haschanged{'imapd'}) {
         &log('K', 'Restarting imapd...');
-        system("$ap::config->{sbindir}/rccyrus restart");
+        system("$prefix/bin/openpkg rc imapd restart");
     }
 
     if ($haschanged{'amavisd'}) {
         &log('K', 'Restarting amavisd...');
-        system("$ap::config->{sbindir}/rcamavisd restart");
+        system("$prefix/bin/openpkg rc amavisd restart");
     }
 
     if ($haschanged{'clamav'}) {
         &log('K', 'Restarting clamav...');
-        system("$ap::config->{sbindir}/clamd restart");
+        system("$prefix/bin/openpkg rc clamav restart");
     }
 
     if ($config{'proftpd-ftp'} =~ /true/i) {
         Kolab::log('K', 'Starting ProFTPd if not running');
-        system("$ap::config->{bindir}/openpkg rc proftpd start");
+        system("$prefix/bin/openpkg rc proftpd start");
         if ($haschanged{'proftpd'}) {
             &log('K', 'Reloading ProFTPd...');
-            kill('SIGHUP', `cat $ap::config->{localstatedir}/proftpd/proftpd.pid`);
+            kill('SIGHUP', `cat $prefix/var/proftpd/proftpd.pid`);
         }
     } else {
         &log('K', 'Stopping ProFTPd, if running...');
-        system("$ap::config->{bindir}/openpkg rc proftpd stop");
+        system("$prefix/bin/openpkg rc proftpd stop");
     }
 
     %Kolab::Conf::haschanged = ();

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:47 2005
Subject: steffen: server/perl-kolab/Kolab-DirServ DirServ.pm, 1.3,
	1.3.2.1 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.ABF551006CC@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-DirServ
In directory doto:/tmp/cvs-serv31903/Kolab-DirServ

Modified Files:
      Tag: kolab_2_0_branch
	DirServ.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: DirServ.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-DirServ/DirServ.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- DirServ.pm	8 Jun 2005 12:44:35 -0000	1.3
+++ DirServ.pm	19 Jul 2005 01:32:39 -0000	1.3.2.1
@@ -38,7 +38,6 @@
 use vars qw(@peers);
 
 require Exporter;
-require "config.h";
 
 our @ISA = qw(Exporter);
 
@@ -63,7 +62,7 @@
 
 sub reloadPeers
 {
-    @peers = readList($Kolab::config{"$ap::config->{prefix}"} . "$ap::config->{sysconfdir}/kolab/addressbook.peers");
+    @peers = readList($Kolab::config{'prefix'} . "/etc/kolab/addressbook.peers");
 
     foreach my $peer (@peers) {
         Kolab::log('DS', "Using peer $peer", KOLAB_DEBUG);

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:48 2005
Subject: steffen: server/perl-kolab/Kolab-Cyrus Cyrus.pm, 1.7,
	1.7.2.1 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.9C5CA1006C7@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Cyrus
In directory doto:/tmp/cvs-serv31903/Kolab-Cyrus

Modified Files:
      Tag: kolab_2_0_branch
	Cyrus.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Cyrus/Cyrus.pm,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- Cyrus.pm	8 Jun 2005 12:44:35 -0000	1.7
+++ Cyrus.pm	19 Jul 2005 01:32:39 -0000	1.7.2.1
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bing� 
+##    Writen by Stuart Bingë  
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as
@@ -199,7 +199,7 @@
 
 =head1 AUTHOR
 
-Stuart Bing� Es.binge@codefusion.co.zaE
+Stuart Bingë, Es.binge@codefusion.co.zaE
 
 =head1 COPYRIGHT AND LICENSE
 

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:48 2005
Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm, 1.31.2.1,
	1.31.2.2 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.B52071006CD@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv31903/Kolab-LDAP

Modified Files:
      Tag: kolab_2_0_branch
	LDAP.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -d -r1.31.2.1 -r1.31.2.2
--- LDAP.pm	14 Jul 2005 21:34:48 -0000	1.31.2.1
+++ LDAP.pm	19 Jul 2005 01:32:39 -0000	1.31.2.2
@@ -35,7 +35,6 @@
 use vars qw(%uid_db %gyard_db %newuid_db %gyard_ts_db);
 
 require Exporter;
-require "config.h";
 
 our @ISA = qw(Exporter);
 
@@ -68,19 +67,19 @@
 
     Kolab::log('L', 'Opening mailbox uid cache DB');
 
-    if (!dbmopen(%uid_db, $Kolab::config{'prefix'} . $ap::config->{localstatedir}/kolab/mailbox-uidcache.db, 0666)) {
+    if (!dbmopen(%uid_db, $Kolab::config{'prefix'} . '/var/kolab/mailbox-uidcache.db', 0666)) {
         Kolab::log('L', 'Unable to open mailbox uid cache DB', KOLAB_ERROR);
         exit(1);
     }
 
     Kolab::log('L', 'Opening graveyard uid/timestamp cache DB');
 
-    if (!dbmopen(%gyard_db, $Kolab::config{'prefix'} . $ap::config->{localstatedir}/kolab/graveyard-uidcache.db, 0666)) {
+    if (!dbmopen(%gyard_db, $Kolab::config{'prefix'} . '/var/kolab/graveyard-uidcache.db', 0666)) {
         Kolab::log('L', 'Unable to open graveyard uid cache DB', KOLAB_ERROR);
         exit(1);
     }
 
-    if (!dbmopen(%gyard_ts_db, $Kolab::config{'prefix'} . $ap::config->{localstatedir}/kolab/graveyard-tscache.db, 0666)) {
+    if (!dbmopen(%gyard_ts_db, $Kolab::config{'prefix'} . '/var/kolab/graveyard-tscache.db', 0666)) {
         Kolab::log('L', 'Unable to open graveyard timestamp cache DB', KOLAB_ERROR);
         exit(1);
     }

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:49 2005
Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend Makefile.am, 1.1,
	NONE 
Message-ID: <20050719013241.B7ABE1006D0@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend
In directory doto:/tmp/cvs-serv31903/Kolab-LDAP-Backend

Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:49 2005
Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend-dirservd dirservd.pm,
	1.3, 1.3.2.1 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.C5FA51006D2@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-dirservd
In directory doto:/tmp/cvs-serv31903/Kolab-LDAP-Backend-dirservd

Modified Files:
      Tag: kolab_2_0_branch
	dirservd.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: dirservd.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-dirservd/dirservd.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- dirservd.pm	8 Jun 2005 12:44:35 -0000	1.3
+++ dirservd.pm	19 Jul 2005 01:32:39 -0000	1.3.2.1
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bing� 
+##    Writen by Stuart Bingë  
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as
@@ -111,7 +111,7 @@
 
 =head1 AUTHOR
 
-Stuart Bing� Es.buys@codefusion.co.zaE
+Stuart Bingë, Es.buys@codefusion.co.zaE
 
 =head1 COPYRIGHT AND LICENSE
 

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:50 2005
Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend-ad ad.pm, 1.2,
	1.2.2.1 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.C38D91005CA@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-ad
In directory doto:/tmp/cvs-serv31903/Kolab-LDAP-Backend-ad

Modified Files:
      Tag: kolab_2_0_branch
	ad.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: ad.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-ad/ad.pm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ad.pm	8 Jun 2005 12:44:35 -0000	1.2
+++ ad.pm	19 Jul 2005 01:32:39 -0000	1.2.2.1
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bing� 
+##    Writen by Stuart Bingë  
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as
@@ -225,7 +225,7 @@
 
 =head1 AUTHOR
 
-Stuart Bing� Es.binge@codefusion.co.zaE
+Stuart Bingë, Es.binge@codefusion.co.zaE
 
 =head1 COPYRIGHT AND LICENSE
 

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:50 2005
Subject: steffen: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm, 1.14,
	1.14.2.1 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.CF86F1006D4@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd
In directory doto:/tmp/cvs-serv31903/Kolab-LDAP-Backend-slurpd

Modified Files:
      Tag: kolab_2_0_branch
	slurpd.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: slurpd.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/slurpd.pm,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- slurpd.pm	8 Jun 2005 12:44:35 -0000	1.14
+++ slurpd.pm	19 Jul 2005 01:32:39 -0000	1.14.2.1
@@ -40,7 +40,6 @@
 use vars qw($conn $server);
 
 require Exporter;
-require "config.h";
 
 our @ISA = qw(Exporter);
 
@@ -278,7 +277,7 @@
                 $changes = 0;
                 Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed');
                 Kolab::LDAP::sync;
-                system($Kolab::config{'prefix'} . $ap::config->{sbindir}/kolabconf);
+                system($Kolab::config{'prefix'} . '/sbin/kolabconf');
             }
 
             Kolab::log('SD', 'Waiting for LDAP updates');

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:51 2005
Subject: steffen: server/perl-kolab/Kolab-Mailer Mailer.pm, 1.3,
	1.3.2.1 Makefile.am, 1.1, NONE 
Message-ID: <20050719013241.D79EF1006D6@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Mailer
In directory doto:/tmp/cvs-serv31903/Kolab-Mailer

Modified Files:
      Tag: kolab_2_0_branch
	Mailer.pm 
Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

Index: Mailer.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Mailer/Mailer.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- Mailer.pm	11 Jun 2005 09:40:43 -0000	1.3
+++ Mailer.pm	19 Jul 2005 01:32:39 -0000	1.3.2.1
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bing� 
+##    Writen by Stuart Bingë  
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as
@@ -27,7 +27,6 @@
 use MIME::Body;
 
 require Exporter;
-require "config.h";
 
 our @ISA = qw(Exporter);
 
@@ -68,7 +67,7 @@
         $mesg->attach(Data => $data);
     }
 
-    open(SENDMAIL, '|' . $Kolab::config{'prefix'} . $ap::config->{sbindir} . '/sendmail -oi -t -odq');
+    open(SENDMAIL, '|' . $Kolab::config{'prefix'} . '/sbin/sendmail -oi -t -odq');
     $mesg->print(\*SENDMAIL);
     close(SENDMAIL);
 }
@@ -87,7 +86,7 @@
         Data    => $text,
     );
 
-    open(SENDMAIL, '|' . $Kolab::config{'prefix'} . $ap::config->{sbindir} . '/sendmail -oi -t -odq');
+    open(SENDMAIL, '|' . $Kolab::config{'prefix'} . '/sbin/sendmail -oi -t -odq');
     $mesg->print(\*SENDMAIL);
     close(SENDMAIL);
 }
@@ -107,7 +106,7 @@
 
 =head1 AUTHOR
 
-Stuart Bing� Es.binge@codefusion.co.zaE
+Stuart Bingë, Es.binge@codefusion.co.zaE
 
 =head1 COPYRIGHT AND LICENSE
 

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:51 2005
Subject: steffen: server/perl-kolab/dist_conf kolab,1.1,NONE 
Message-ID: <20050719013241.DDCC81006D8@lists.intevation.de>

Author: steffen

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

Removed Files:
      Tag: kolab_2_0_branch
	kolab 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

--- kolab DELETED ---


From cvs at intevation.de  Tue Jul 19 03:32:41 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 03:32:52 2005
Subject: steffen: server/perl-kolab/Kolab-Util Makefile.am,1.1,NONE 
Message-ID: <20050719013241.DBB461006D7@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Util
In directory doto:/tmp/cvs-serv31903/Kolab-Util

Removed Files:
      Tag: kolab_2_0_branch
	Makefile.am 
Log Message:
lets stick to the pre-autoperl version for the 2.0-branch

--- Makefile.am DELETED ---


From cvs at intevation.de  Tue Jul 19 21:28:31 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 21:28:33 2005
Subject: steffen: server/utilities/rpmsort - New directory 
Message-ID: <20050719192831.43F3E100161@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/utilities/rpmsort
In directory doto:/tmp/cvs-serv15520/rpmsort

Log Message:
Directory /kolabrepository/server/utilities/rpmsort added to the repository



From cvs at intevation.de  Tue Jul 19 21:29:20 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 21:29:21 2005
Subject: steffen: server/utilities/rpmsort main.cpp, NONE, 1.1 rpmsort.pro,
	NONE, 1.1 
Message-ID: <20050719192920.8A1B71005CC@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/utilities/rpmsort
In directory doto:/tmp/cvs-serv15571/rpmsort

Added Files:
	main.cpp rpmsort.pro 
Log Message:
I needed help with the RPM dependencies. This tool can help a little...

--- NEW FILE: main.cpp ---
/*
 * Helper app to figure out the order which RPMs 
 * must be installed to satisfy dependencies.
 *
 * Uses the 00INDEX.rdf files from OpenPKG
 *
 * (c) 2005 Steffen Hansen 
 */

#include 
#include 
#include 
#include 
#include 
#include 
#include 

#include 

struct RPMNode {
  QString name;
  QString about;
  QString version;
  QString release;
  QSet requires;
  QSet provides;

  void dumpNode() const {
	std::cout << qPrintable(name) << " [";
	for( QSet::const_iterator it = requires.constBegin();
		 it != requires.constEnd(); ++it ) {
	  std::cout << " " << qPrintable(*it);
	}
	std::cout << " ]" << std::endl;
  }
};

class RPMSorter {
public:
  void clear();
  bool addFrom( QIODevice* device );

  void dumpNodes() const;
  void dumpNodes( const QMap& ) const;
  QStringList sort() const;

private:
  QMap nodes;
};

void RPMSorter::clear()
{
  nodes.clear();
}

bool RPMSorter::addFrom( QIODevice* device ) 
{
  QString errorStr;
  int errorLine;
  int errorColumn;
  QDomDocument domDocument;

  if (!domDocument.setContent(device, true, &errorStr, &errorLine,
							  &errorColumn)) {
	qFatal(	"Parse error at line %d, column %d:\n%s",
			errorLine, errorColumn, qPrintable(errorStr));
	return false;
  }
  QDomElement root = domDocument.documentElement();
  if( root.tagName() != "RDF" ) {
	qFatal("Root node is not RDF, it is %s", qPrintable(root.tagName()));
	return false;
  }
  QDomElement repo = root.firstChildElement("Repository");
  //qDebug() << repo.attribute("resource");
  for( QDomElement desc = repo.firstChildElement("Description"); 
	   !desc.isNull(); desc = desc.nextSiblingElement()) {
	QString name = desc.firstChildElement("Name").text().toLower();
	QString version = desc.firstChildElement("Version").text();
	QString release = desc.firstChildElement("Release").text();
	//qDebug() << desc.attribute("about");
	RPMNode rpmnode;
	if( nodes.contains(name)) rpmnode = nodes[name];
	if( name.isEmpty() ) continue;
	rpmnode.name = name;
	rpmnode.about = desc.attribute("about");
	rpmnode.version = version;
	rpmnode.release = release;
	for( QDomElement req = desc.firstChildElement("BuildPreReq"); 
		 !req.isNull(); req = req.nextSiblingElement("BuildPreReq")) {
	  if( req.hasAttribute("cond") ) continue;
	  QDomNodeList lst = req.elementsByTagName("resource");
	  for( int i = 0; i < lst.count(); ++i ) {
		QString req = lst.item(i).toElement().text().toLower();		
		if( !req.isEmpty() && !req.contains("::") && req != rpmnode.name ) 
		  rpmnode.requires.insert( req );
	  }
	}
	for( QDomElement req = desc.firstChildElement("Provides"); 
		 !req.isNull(); req = req.nextSiblingElement("Provides")) {
	  QDomNodeList lst = req.elementsByTagName("resource");
	  for( int i = 0; i < lst.count(); ++i ) {
		QString prov = lst.item(i).toElement().text().toLower();		
		if( !prov.isEmpty() ) 
		  rpmnode.provides.insert( prov );
	  }
	}
	rpmnode.provides.insert( rpmnode.name );
	nodes[rpmnode.name] = rpmnode;
  }
  return true;
}

QStringList RPMSorter::sort() const
{
  QMap nodes = this->nodes;
  for( QMap::iterator it = nodes.begin();
	   it != nodes.end(); ++it ) {
	if( (*it).requires.isEmpty() ) {
	  nodes[it.key()].requires.insert("START");
	}
  }
  RPMNode startnode;
  startnode.name="START";
  nodes["START"] = startnode;

  QStringList result;
  
  while( !nodes.isEmpty() ) {
	RPMNode current;
	for( QMap::iterator it = nodes.begin();
		 it != nodes.end(); ++it ) {
	  //qDebug() << (*it).name << " has " << (*it).requires.count() << " deps";
	  if( (*it).requires.isEmpty() ) {
		current = *it;
		nodes.erase(it);
		break;
	  }
	}
	if( current.name.isNull() ) {
	  std::cout << "Cycle detected. Remaining packages are" << std::endl;
	  dumpNodes(nodes);
	  qFatal("Bailing out!");
	}
	//qDebug() << qPrintable(current.name);
	result << current.name;
	for( QMap::iterator it = nodes.begin();
		 it != nodes.end(); ++it ) {
	  nodes[it.key()].requires.remove(current.name);
	  for( QSet::const_iterator it2 = current.provides.constBegin();
		   it2 != current.provides.constEnd(); ++it2 ) {
		nodes[it.key()].requires.remove(*it2);		
	  }
	}
  }
  return result;
}

void RPMSorter::dumpNodes() const
{
  dumpNodes(nodes);
}

void RPMSorter::dumpNodes( const QMap& nodes ) const
{
  for( QMap::const_iterator it = nodes.constBegin();
	   it != nodes.constEnd(); ++it ) {
	(*it).dumpNode();
  }
}

int main( int argc, char** argv ) {
    QCoreApplication app( argc, argv );

	if( argc < 2 ) {
	  std::cout << "Usage: " << argv[0] << " file1.rdf [file2.rdf ...]" << std::endl;
	  exit(1);
	}
	
	RPMSorter sorter;

	for( int i = 1; i < argc; ++i ) {
	  QFile file( argv[i] );
	  if (!file.open(QFile::ReadOnly | QFile::Text)) {
		qFatal( qPrintable(file.errorString()));
	  }
	  sorter.addFrom(&file);
	}
	//sorter.dumpNodes();
	std::cout << qPrintable( sorter.sort().join("\n") ) << std::endl;
	return 0;
}

--- NEW FILE: rpmsort.pro ---
######################################################################
# Automatically generated by qmake (2.00a) Tue Jul 19 17:25:11 2005
######################################################################

QT += xml
CONFIG += warn_on debug 

TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += .

# Input
SOURCES += main.cpp


From cvs at intevation.de  Tue Jul 19 23:01:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:05 2005
Subject: steffen: server obmtool.conf,1.174.2.1,1.174.2.2 
Message-ID: <20050719210101.B9C85101EE1@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
Updated to openpkg-2.4

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.1
retrieving revision 1.174.2.2
diff -u -d -r1.174.2.1 -r1.174.2.2
--- obmtool.conf	7 Jul 2005 13:25:33 -0000	1.174.2.1
+++ obmtool.conf	19 Jul 2005 21:00:59 -0000	1.174.2.2
@@ -4,18 +4,18 @@
 ##  Package listing for Kolab
 ##
 ##  based on Ralf S. Engelschall's "obmtool.conf -- Development Tool Configuration"
-##  Copyright (c) 2004 Steffen Hansen 
+##  Copyright (c) 2004-2005 Steffen Hansen 
 ##  Copyright (c) 2003 Thomas Lotterer 
 ##
 
 %common
     @hasfeature TAGFMT || exit              # require obmtool to support TAGFMT
     TMPDIR=/var/tmp                            # large tmp with 300MB space
-    URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/" # used for non-ftp://ftp.openpkg.org/ packages
+    URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/2.0" # used for non-ftp://ftp.openpkg.org/ packages
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.0-snapshot-20050616";
+    kolab_version="pre-2.0.1-snapshot-20050719";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -32,74 +32,76 @@
     fi
 
     # start from scratch or upgrade within 2.0.x
-    @install ${loc}openpkg-2.2.3-2.2.3 \
+    @install ${loc}openpkg-2.4.1-2.4.1 \
         --tag="kolab" \
         --prefix="${PREFIX}" \
         --user="${CMD}" --group="${CMD}" \
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
-    @install ${loc}make-3.80-2.2.0
-    @install ${loc}binutils-2.14-2.2.0
-    @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.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.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.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
-    @install ${loc}perl-sys-5.8.5-2.2.0
-    @install ${loc}perl-util-5.8.5-2.2.0
-    @install ${loc}openssl-0.9.7d-2.2.0
-    @install ${loc}perl-crypto-5.8.5-2.2.0
-    @install ${loc}perl-net-5.8.5-2.2.0
-    @install ${loc}perl-mail-5.8.5-2.2.0
-    @install ${loc}zlib-1.2.2-2.3.1
-    @install ${loc}perl-comp-5.8.5-2.2.0
-    @install ${loc}expat-1.95.8-2.2.0
-    @install ${loc}perl-ssl-5.8.5-2.2.0
-    @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 ${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
-    @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
-    @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_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
-    @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
-    @install ${loc}libiconv-1.9.2-2.2.0
-    @install ${loc}autoconf-2.59-2.2.0
-    @install ${loc}automake-1.9.2-2.2.0
-    @install ${loc}gettext-0.14.1-2.2.1
-    @install ${loc}file-4.10-2.2.0
-    @install ${loc}openpkg-tools-0.8.26-2.2.1
-    @install ${loc}patch-2.5.9-2.2.0
-    @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_kolab2 \
+    @install ${loc}make-3.80-2.4.0
+    @install ${loc}binutils-2.16.1-2.4.0
+    @install ${loc}gcc-3.4.4-2.4.0
+    @install ${loc}fsl-1.6.0-2.4.0
+    @install ${loc}mm-1.3.1-2.4.0
+    @install ${loc}perl-5.8.7-2.4.0
+    @install ${loc}perl-openpkg-5.8.7-2.4.0
+    @install ${loc}perl-conv-5.8.7-2.4.0
+    @install ${loc}lzo-2.00-2.4.0 # PENDING(steffen) Check if we need lzop-1.0
+    @install ${loc}readline-5.0.5-2.4.0
+    @install ${loc}sharutils-4.3.80-2.4.0
+    @install ${loc}ncurses-5.4.20050611-2.4.0
+    @install ${loc}bzip2-1.0.3-2.4.0
+    @install ${loc}pcre-6.0-2.4.0
+    @install ${loc}grep-2.5.1a-2.4.0
+    @install ${loc}texinfo-4.8-2.4.0
+    @install ${loc}diffutils-2.8.7-2.4.0
+    @install ${loc}gzip-1.3.5-2.4.0
+    @install ${loc}expat-1.95.8-2.4.0
+    @install ${loc}perl-term-5.8.7-2.4.0
+    @install ${loc}perl-ds-5.8.7-2.4.0
+    @install ${loc}perl-stats-5.8.7-2.4.0
+    @install ${loc}perl-time-5.8.7-2.4.0
+    @install ${loc}perl-parse-5.8.7-2.4.0
+    @install ${loc}perl-sys-5.8.7-2.4.0
+    @install ${loc}perl-util-5.8.7-2.4.0
+    @install ${loc}openssl-0.9.7g-2.4.1
+    @install ${loc}perl-mail-5.8.7-2.4.0
+    @install ${loc}perl-crypto-5.8.7-2.4.0
+    @install ${loc}perl-xml-5.8.7-2.4.0
+    @install ${loc}perl-net-5.8.7-2.4.0
+    @install ${loc}zlib-1.2.2-2.4.1
+    @install ${loc}perl-comp-5.8.7-2.4.0
+    @install ${loc}perl-ssl-5.8.7-2.4.0
+    @install ${loc}perl-www-5.8.7-2.4.0
+    @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate
+    @install ${loc}procmail-3.22-2.4.0
+    @install ${loc}db-4.3.28.0-2.4.0
+    @install ${altloc}openldap-2.2.27-2.4.0_kolab
+    @install ${loc}groff-1.19.1-2.4.0
+    @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
+    @install ${loc}getopt-20030307-2.4.0
+    @install ${loc}proftpd-1.3.0rc1-2.4.0 --with=ldap
+    @install ${loc}gdbm-1.8.3-2.4.0
+    @install ${plusloc}dbtool-1.6-2.4.0
+    @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
+    @install ${loc}perl-ldap-5.8.7-2.4.0
+    @install ${loc}perl-db-5.8.7-2.4.0
+    @install ${altloc}perl-kolab-5.8.7-2.0_20050719
+    @install ${altloc}imapd-2.2.12-2.4.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
+    @install ${loc}m4-1.4.3-2.4.0
+    @install ${loc}bison-2.0-2.4.0
+    @install ${loc}flex-2.5.31-2.4.0
+    @install ${loc}libiconv-1.9.2-2.4.0
+    @install ${loc}autoconf-2.59-2.4.0
+    @install ${loc}automake-1.9.5-2.4.0
+    @install ${loc}gettext-0.14.5-2.4.0
+    @install ${loc}file-4.13-2.4.0
+    @install ${loc}openpkg-tools-0.8.37-2.4.0
+    @install ${loc}patch-2.5.9-2.4.0
+    @install ${loc}sed-4.1.4-2.4.0
+    @install ${loc}libxml-2.6.19-2.4.0
+    @install ${loc}libxslt-1.1.14-2.4.0 # WARNING: Remove libgcrypt before building!
+    @install ${altloc}apache-1.3.33-2.4.0_kolab \
         --with=mod_auth_ldap \
         --with=mod_dav \
         --with=mod_php \
@@ -112,7 +114,7 @@
 	--with=mod_php_dom \
         --with=mod_ssl \
 	--with=mod_php_mbstring
-    @install ${altloc}php-4.3.9-2.2.2_kolab \
+    @install ${altloc}php-4.3.11-2.4.0_kolab \
 	--with=zlib \
 	--with=gdbm \
 	--with=gettext \
@@ -124,13 +126,13 @@
 	--with=ssl \
 	--with=mbstring
     @install ${altloc}php-smarty-2.6.3-20040702
-    @install ${altloc}gmp-4.1.4-20040924
-    @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}gmp-4.1.4-2.4.0
+    @install ${loc}spamassassin-3.0.3-2.4.0
+    @install ${plusloc}amavisd-2.3.1-2.4.0
+    @install ${loc}curl-7.14.0-2.4.0
     @install ${altloc}clamav-0.86.1-20050624
-    @install ${loc}vim-6.3.30-2.2.1
-    @install ${plusloc}dcron-2.9-2.2.0
+    @install ${loc}vim-6.3.78-2.4.0
+    @install ${plusloc}dcron-2.9-2.4.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-resource-handlers-0.3.9-20050615 --define kolab_version=$kolab_version


From cvs at intevation.de  Tue Jul 19 23:01:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:06 2005
Subject: steffen: server/imap Makefile,1.2,1.2.2.1 kolab.patch,1.2,1.2.2.1 
Message-ID: <20050719210101.C8A8E101EE4@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
Updated to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imap/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile	16 Jun 2005 03:04:13 -0000	1.2
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.2.2.1
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=imap
-VERSION=2004c
-RELEASE=2.3.0
+VERSION=2004d
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imap/kolab.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- kolab.patch	16 Jun 2005 03:04:13 -0000	1.2
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.2.2.1
@@ -4,8 +4,8 @@
  Group:        Mail
  License:      University of Washington's Free-Fork License
  Version:      %{V_here}
--Release:      2.3.0
-+Release:      2.3.0_kolab
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
  %option       with_ssl      yes


From cvs at intevation.de  Tue Jul 19 23:01:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:07 2005
Subject: steffen: server/apache Makefile, 1.16, 1.16.2.1 kolab.patch, 1.5,
	1.5.2.1 
Message-ID: <20050719210101.CFEC4101EE5@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
Updated to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- Makefile	16 Jun 2005 03:04:13 -0000	1.16
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.16.2.1
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=apache
-VERSION=1.3.31
-RELEASE=2.2.3
+VERSION=1.3.33
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- kolab.patch	16 Jun 2005 03:04:13 -0000	1.5
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.5.2.1
@@ -4,8 +4,8 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.2.3
-+Release:      2.2.3_kolab2
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes


From cvs at intevation.de  Tue Jul 19 23:01:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:08 2005
Subject: steffen: server/perl-kolab perl-kolab.spec,1.91.2.1,1.91.2.2 
Message-ID: <20050719210101.E0515101EE7@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	perl-kolab.spec 
Log Message:
Updated to openpkg-2.4

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Attic/perl-kolab.spec,v
retrieving revision 1.91.2.1
retrieving revision 1.91.2.2
diff -u -d -r1.91.2.1 -r1.91.2.2
--- perl-kolab.spec	19 Jul 2005 01:32:39 -0000	1.91.2.1
+++ perl-kolab.spec	19 Jul 2005 21:00:59 -0000	1.91.2.2
@@ -24,7 +24,7 @@
 ##
 
 #   versions of individual parts
-%define       V_perl                            5.8.5
+%define       V_perl                            5.8.7
 %define       V_kolab                           0.9.2
 %define       V_kolab_util                      0.9.2
 %define       V_kolab_ldap                      0.9.2
@@ -48,7 +48,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20050719
+Release:      2.0_20050719
 
 #   list of sources
 Source0:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz


From cvs at intevation.de  Tue Jul 19 23:01:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:09 2005
Subject: steffen: server/imapd Makefile, 1.22, 1.22.2.1 kolab.patch, 1.22,
	1.22.2.1 
Message-ID: <20050719210101.E9F88101EEB@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
Updated to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- Makefile	20 Apr 2005 23:09:35 -0000	1.22
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.22.2.1
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,7 +10,7 @@
 
 PACKAGE=imapd
 VERSION=2.2.12
-RELEASE=2.3.0
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- kolab.patch	10 Jun 2005 02:03:42 -0000	1.22
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.22.2.1
@@ -1,9 +1,9 @@
 --- ../imapd.orig/imapd.spec	2005-02-21 18:02:27.000000000 +0100
 +++ imapd.spec	2005-06-10 04:00:13.000000000 +0200
 @@ -3,6 +3,9 @@
- ##  Copyright (c) 2000-2005 The OpenPKG Project 
- ##  Copyright (c) 2000-2005 Ralf S. Engelschall 
- ##  Copyright (c) 2000-2005 Cable & Wireless 
+ ##  imapd.spec -- OpenPKG RPM Package Specification
+ ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. 
+ ##  Copyright (c) 2000-2005 Ralf S. Engelschall 
 +##  Copyright (c) 2004 Tassilo Erlewein 
 +##  Copyright (c) 2004 Martin Konold 
 +##  Copyright (c) 2005 Steffen Hansen 
@@ -14,8 +14,8 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.12
--Release:      2.3.0
-+Release:      2.3.0_kolab4
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
 -%option       with_fsl    yes
@@ -85,18 +85,3 @@
          configure
  
      #   ensure local com_err can be used
-@@ -112,12 +138,12 @@ AutoReqProv:  no
-         *-sunos* )
-             %{l_shtool} subst \
-                 -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb -lrt\2;' \
--                perl/imap/Makefile.PL
-+                perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
-         ;;
-         * )
-             %{l_shtool} subst \
-                 -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \
--                perl/imap/Makefile.PL
-+                perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
-         ;;
-     esac
- 


From cvs at intevation.de  Tue Jul 19 23:01:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:10 2005
Subject: steffen: server/openldap Makefile, 1.10, 1.10.2.1 kolab.patch, 1.5,
	1.5.2.1 
Message-ID: <20050719210101.E11FD101EE8@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
Updated to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- Makefile	25 May 2005 13:14:35 -0000	1.10
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.10.2.1
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=openldap
-VERSION=2.2.23
-RELEASE=2.3.0
+VERSION=2.2.27
+RELEASE=2.4.0
 
 
 RPM=/kolab/bin/openpkg rpm

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- kolab.patch	2 Jun 2005 02:12:58 -0000	1.5
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.5.2.1
@@ -1,19 +1,20 @@
+Only in .: kolab.patch
 diff -upr ../openldap.orig/openldap.spec ./openldap.spec
---- ../openldap.orig/openldap.spec	2005-02-21 18:02:29.000000000 +0100
-+++ ./openldap.spec	2005-06-02 03:59:04.000000000 +0200
-@@ -34,7 +34,7 @@ Class:        BASE
+--- ../openldap.orig/openldap.spec	2005-06-15 20:55:42.000000000 +0200
++++ ./openldap.spec	2005-07-19 01:51:30.000000000 +0200
+@@ -33,7 +33,7 @@ Class:        BASE
  Group:        Database
  License:      GPL
- Version:      2.2.23
--Release:      2.3.0
-+Release:      2.3.0_kolab2
+ Version:      2.2.27
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
  %option       with_fsl   yes
-@@ -54,8 +54,8 @@ Prefix:       %{l_prefix}
+@@ -53,8 +53,8 @@ Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
- BuildPreReq:  OpenPKG, openpkg >= 2.3.0, make, gcc
- PreReq:       OpenPKG, openpkg >= 2.3.0
+ BuildPreReq:  OpenPKG, openpkg >= 2.4.0, make, gcc
+ PreReq:       OpenPKG, openpkg >= 2.4.0
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
 +BuildPreReq:  readline, openssl, db >= 4.2
@@ -21,16 +22,18 @@
  %if "%{with_fsl}" == "yes"
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
-@@ -90,7 +90,7 @@ AutoReqProv:  no
+@@ -90,8 +90,8 @@ 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;-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"
-@@ -108,10 +108,10 @@ AutoReqProv:  no
+@@ -109,10 +109,10 @@ AutoReqProv:  no
          ;;
      esac
      CC="%{l_cc}" \
@@ -45,7 +48,7 @@
      ./configure \
          --cache-file=./config.cache \
          --prefix=%{l_prefix} \
-@@ -160,7 +160,7 @@ AutoReqProv:  no
+@@ -161,7 +161,7 @@ AutoReqProv:  no
  %endif
          --with-dyngroup \
          --with-proxycache \
@@ -55,8 +58,8 @@
  
      #   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
+--- ../openldap.orig/rc.openldap	2004-12-07 20:57:36.000000000 +0100
++++ ./rc.openldap	2005-07-19 01:50:46.000000000 +0200
 @@ -27,6 +27,10 @@
          [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0
          return 1


From cvs at intevation.de  Tue Jul 19 23:01:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:11 2005
Subject: steffen: server/postfix Makefile, 1.11, 1.11.2.1 kolab.patch, 1.3,
	1.3.2.1 postfix-ldap-leafonly.patch, 1.1,
	1.1.2.1 postfix-pipe-allow-empty-sender.patch, 1.1, 1.1.2.1 
Message-ID: <20050719210101.F3644101EEC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch postfix-ldap-leafonly.patch 
	postfix-pipe-allow-empty-sender.patch 
Log Message:
Updated to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- Makefile	31 May 2005 07:43:51 -0000	1.11
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.11.2.1
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -8,15 +8,14 @@
   KOLABCVSDIR = $(CURDIR)
 endif
 
-VERSION=2.1.5
-RELEASE=2.2.0
+VERSION=2.2.3
+RELEASE=2.4.1
 
 RPM=/kolab/bin/openpkg rpm
  
 all: postfix-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv postfix-$(VERSION)-$(RELEASE).src.rpm
 
-	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

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/postfix/kolab.patch,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- kolab.patch	31 May 2005 07:43:51 -0000	1.3
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.3.2.1
@@ -1,31 +1,30 @@
---- 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
+--- ../postfix.orig/postfix.spec	2005-07-11 16:51:25.000000000 +0200
++++ postfix.spec	2005-07-19 10:28:58.000000000 +0200
+@@ -38,7 +38,7 @@ Class:        BASE
  Group:        Mail
  License:      IPL
  Version:      %{V_postfix}
--Release:      2.2.0
-+Release:      2.2.0_kolab3
+-Release:      2.4.1
++Release:      2.4.1_kolab
  
  #   package options
  %option       with_fsl       yes
-@@ -67,6 +67,9 @@ Patch1:       postfix.patch.pfls
+@@ -59,6 +59,8 @@ Source4:      rc.postfix
+ Patch0:       postfix.patch
+ 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
-+Patch7:       postfix-pipe-allow-empty-sender.patch
++Patch3:       postfix-ldap-leafonly.patch
++Patch4:       postfix-pipe-allow-empty-sender.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -195,6 +198,9 @@ Conflicts:    exim, sendmail, ssmtp
+@@ -148,6 +150,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
++    %patch -p0 -P 3
++    %patch -p0 -P 4
++    
  
  %build
      #   configure Postfix (hard-core part I)

Index: postfix-ldap-leafonly.patch
===================================================================
RCS file: /kolabrepository/server/postfix/postfix-ldap-leafonly.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- postfix-ldap-leafonly.patch	19 May 2005 11:13:55 -0000	1.1
+++ postfix-ldap-leafonly.patch	19 Jul 2005 21:00:59 -0000	1.1.2.1
@@ -1,7 +1,7 @@
-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 @@
+diff -upr ../postfix-2.2.3.orig/src/global/dict_ldap.c ./src/global/dict_ldap.c
+--- ../postfix-2.2.3.orig/src/global/dict_ldap.c	2005-03-08 19:58:44.000000000 +0100
++++ ./src/global/dict_ldap.c	2005-07-19 02:46:30.000000000 +0200
+@@ -60,6 +60,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.
@@ -12,15 +12,15 @@
  /* .IP scope
  /*	LDAP search scope: sub, base, or one.
  /* .IP bind
-@@ -223,6 +227,7 @@ typedef struct {
-     char   *result_filter;
+@@ -226,6 +230,7 @@ typedef struct {
+     char   *search_base;
      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
+@@ -717,6 +722,7 @@ static void dict_ldap_get_values(DICT_LD
      char   *myname = "dict_ldap_get_values";
      struct timeval tv;
      LDAPURLDesc *url;
@@ -29,7 +29,7 @@
      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_ldap->size_limit);
  	    dict_errno = DICT_ERR_RETRY;
  	}
 +
@@ -62,9 +62,9 @@
  		/* 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
+ 		    if (db_common_expand(dict_ldap->ctx,
+ 					 dict_ldap->result_format, vals[i],
+@@ -809,6 +837,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);
@@ -72,7 +72,7 @@
  	    } 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
+@@ -1351,6 +1380,11 @@ DICT   *dict_ldap_open(const char *ldaps
      myfree(attr);
  
      /*
@@ -84,4 +84,3 @@
       * 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: postfix-pipe-allow-empty-sender.patch
===================================================================
RCS file: /kolabrepository/server/postfix/postfix-pipe-allow-empty-sender.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- postfix-pipe-allow-empty-sender.patch	31 May 2005 07:43:51 -0000	1.1
+++ postfix-pipe-allow-empty-sender.patch	19 Jul 2005 21:00:59 -0000	1.1.2.1
@@ -1,16 +1,16 @@
-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:
+diff -upr ../postfix-2.2.3.orig/src/pipe/pipe.c ./src/pipe/pipe.c
+--- ../postfix-2.2.3.orig/src/pipe/pipe.c	2005-02-05 05:21:23.000000000 +0100
++++ ./src/pipe/pipe.c	2005-07-19 02:49:43.000000000 +0200
+@@ -51,7 +51,7 @@
+ /*	\fB\er\en\fR or \fB\en\fR. The usual C-style backslash escape
+ /*	sequences are recognized: \fB\ea \eb \ef \en \er \et \ev
+ /*	\e\fIddd\fR (up to three octal digits) and \fB\e\e\fR.
 -/* .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 @@
+@@ -82,6 +82,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.
@@ -20,7 +20,7 @@
  /* .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 @@
+@@ -399,6 +402,7 @@
  #define PIPE_OPT_FOLD_USER	(1<<16)
  #define PIPE_OPT_FOLD_HOST	(1<<17)
  #define PIPE_OPT_QUOTE_LOCAL	(1<<18)
@@ -28,7 +28,7 @@
  
  #define PIPE_OPT_FOLD_FLAGS	(PIPE_OPT_FOLD_USER | PIPE_OPT_FOLD_HOST)
  
-@@ -660,6 +664,9 @@ static void get_service_attr(PIPE_ATTR *
+@@ -719,6 +723,9 @@ static void get_service_attr(PIPE_ATTR *
  		case 'h':
  		    attr->flags |= PIPE_OPT_FOLD_HOST;
  		    break;
@@ -38,7 +38,7 @@
  		case 'q':
  		    attr->flags |= PIPE_OPT_QUOTE_LOCAL;
  		    break;
-@@ -835,22 +842,6 @@ static int deliver_message(DELIVER_REQUE
+@@ -901,22 +908,6 @@ static int deliver_message(DELIVER_REQUE
  	msg_info("%s: from <%s>", myname, request->sender);
  
      /*
@@ -61,7 +61,7 @@
       * 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
+@@ -932,6 +923,22 @@ static int deliver_message(DELIVER_REQUE
      }
  
      /*
@@ -84,4 +84,3 @@
       * 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~


From cvs at intevation.de  Tue Jul 19 23:01:02 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:01:11 2005
Subject: steffen: server/php Makefile,1.1,1.1.2.1 kolab.patch,1.1,1.1.2.1 
Message-ID: <20050719210102.01A08101EED@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
Updated to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile	16 Jun 2005 03:04:13 -0000	1.1
+++ Makefile	19 Jul 2005 21:00:59 -0000	1.1.2.1
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=php
-VERSION=4.3.9
-RELEASE=2.2.2
+VERSION=4.3.11
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- kolab.patch	16 Jun 2005 03:04:13 -0000	1.1
+++ kolab.patch	19 Jul 2005 21:00:59 -0000	1.1.2.1
@@ -5,8 +5,8 @@
  Group:        Language
  License:      PHP
  Version:      %{V_php}
--Release:      2.2.2
-+Release:      2.2.2_kolab
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
  %option       with_bc                   no


From cvs at intevation.de  Tue Jul 19 23:03:13 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 19 23:03:15 2005
Subject: steffen: server/amavisd Makefile, 1.1, NONE amavisd.MYUSERS.patch,
	1.1, NONE kolab.patch, 1.1, NONE 
Message-ID: <20050719210313.BD136101EE4@lists.intevation.de>

Author: steffen

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

Removed Files:
      Tag: kolab_2_0_branch
	Makefile amavisd.MYUSERS.patch kolab.patch 
Log Message:
MYUSERS patch for amavisd has been accepted upstream and released -- one less patch to worry about

--- Makefile DELETED ---

--- amavisd.MYUSERS.patch DELETED ---

--- kolab.patch DELETED ---


From cvs at intevation.de  Thu Jul 21 23:19:14 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Jul 21 23:19:15 2005
Subject: steffen: server obmtool.conf,1.174.2.2,1.174.2.3 
Message-ID: <20050721211914.54D88101EF8@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
2.4-port

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.2
retrieving revision 1.174.2.3
diff -u -d -r1.174.2.2 -r1.174.2.3
--- obmtool.conf	19 Jul 2005 21:00:59 -0000	1.174.2.2
+++ obmtool.conf	21 Jul 2005 21:19:11 -0000	1.174.2.3
@@ -56,6 +56,7 @@
     @install ${loc}texinfo-4.8-2.4.0
     @install ${loc}diffutils-2.8.7-2.4.0
     @install ${loc}gzip-1.3.5-2.4.0
+    @install ${loc}zlib-1.2.2-2.4.1
     @install ${loc}expat-1.95.8-2.4.0
     @install ${loc}perl-term-5.8.7-2.4.0
     @install ${loc}perl-ds-5.8.7-2.4.0
@@ -69,7 +70,6 @@
     @install ${loc}perl-crypto-5.8.7-2.4.0
     @install ${loc}perl-xml-5.8.7-2.4.0
     @install ${loc}perl-net-5.8.7-2.4.0
-    @install ${loc}zlib-1.2.2-2.4.1
     @install ${loc}perl-comp-5.8.7-2.4.0
     @install ${loc}perl-ssl-5.8.7-2.4.0
     @install ${loc}perl-www-5.8.7-2.4.0


From cvs at intevation.de  Fri Jul 22 21:30:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Jul 22 21:30:03 2005
Subject: bernhard: doc/kolab-formats events.sgml,1.13,1.14 
Message-ID: <20050722193001.7E242101F15@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/kolab-formats
In directory doto:/tmp/cvs-serv25569

Modified Files:
	events.sgml 
Log Message:
Fixed typo found by David.


Index: events.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/events.sgml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- events.sgml	5 Jul 2005 16:32:26 -0000	1.13
+++ events.sgml	22 Jul 2005 19:29:59 -0000	1.14
@@ -52,7 +52,7 @@
 
 
 An event without a time but with a date associated is a full day event. Such a full day event may span
-over multiple days and may have recurrances.
+over multiple days and may have recurrences.
 
 See  for the description of the common fields
 


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:18 2005
Subject: steffen: server obmtool.conf,1.180,1.181 
Message-ID: <20050722223616.BF12A1005D0@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
Upgrade to openpkg-2.4

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- obmtool.conf	11 Jul 2005 11:33:43 -0000	1.180
+++ obmtool.conf	22 Jul 2005 22:36:14 -0000	1.181
@@ -4,18 +4,18 @@
 ##  Package listing for Kolab
 ##
 ##  based on Ralf S. Engelschall's "obmtool.conf -- Development Tool Configuration"
-##  Copyright (c) 2004 Steffen Hansen 
+##  Copyright (c) 2004-2005 Steffen Hansen 
 ##  Copyright (c) 2003 Thomas Lotterer 
 ##
 
 %common
     @hasfeature TAGFMT || exit              # require obmtool to support TAGFMT
     TMPDIR=/var/tmp                            # large tmp with 300MB space
-    URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/" # used for non-ftp://ftp.openpkg.org/ packages
+    URL="ftp://ftp.klaralvdalens-datakonsult.se/pub/kolab/server/current/2.1" # used for non-ftp://ftp.openpkg.org/ packages
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.1-snapshot-20050708";
+    kolab_version="pre-2.1-snapshot-20050719";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -32,74 +32,75 @@
     fi
 
     # start from scratch or upgrade within 2.0.x
-    @install ${loc}openpkg-2.2.3-2.2.3 \
+    @install ${loc}openpkg-2.4.1-2.4.1 \
         --tag="kolab" \
         --prefix="${PREFIX}" \
         --user="${CMD}" --group="${CMD}" \
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
-    @install ${loc}make-3.80-2.2.0
-    @install ${loc}binutils-2.14-2.2.0
-    @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.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.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.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
-    @install ${loc}perl-sys-5.8.5-2.2.0
-    @install ${loc}perl-util-5.8.5-2.2.0
-    @install ${loc}openssl-0.9.7d-2.2.0
-    @install ${loc}perl-crypto-5.8.5-2.2.0
-    @install ${loc}perl-net-5.8.5-2.2.0
-    @install ${loc}perl-mail-5.8.5-2.2.0
-    @install ${loc}zlib-1.2.2-2.3.1
-    @install ${loc}perl-comp-5.8.5-2.2.0
-    @install ${loc}expat-1.95.8-2.2.0
-    @install ${loc}perl-ssl-5.8.5-2.2.0
-    @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 ${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
-    @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
-    @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_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-20050708
-    @install ${altloc}imapd-2.2.12-2.3.0_kolab5 --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
-    @install ${loc}libiconv-1.9.2-2.2.0
-    @install ${loc}autoconf-2.59-2.2.0
-    @install ${loc}automake-1.9.2-2.2.0
-    @install ${loc}gettext-0.14.1-2.2.1
-    @install ${loc}file-4.10-2.2.0
-    @install ${loc}openpkg-tools-0.8.26-2.2.1
-    @install ${loc}patch-2.5.9-2.2.0
-    @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_kolab2 \
+    @install ${loc}make-3.80-2.4.0
+    @install ${loc}binutils-2.16.1-2.4.0
+    @install ${loc}gcc-3.4.4-2.4.0
+    @install ${loc}fsl-1.6.0-2.4.0
+    @install ${loc}mm-1.3.1-2.4.0
+    @install ${loc}perl-5.8.7-2.4.0
+    @install ${loc}perl-openpkg-5.8.7-2.4.0
+    @install ${loc}perl-conv-5.8.7-2.4.0
+    @install ${loc}lzo-2.00-2.4.0 # PENDING(steffen) Check if we need lzop-1.0
+    @install ${loc}readline-5.0.5-2.4.0
+    @install ${loc}sharutils-4.3.80-2.4.0
+    @install ${loc}ncurses-5.4.20050611-2.4.0
+    @install ${loc}bzip2-1.0.3-2.4.0
+    @install ${loc}pcre-6.0-2.4.0
+    @install ${loc}grep-2.5.1a-2.4.0
+    @install ${loc}texinfo-4.8-2.4.0
+    @install ${loc}diffutils-2.8.7-2.4.0
+    @install ${loc}gzip-1.3.5-2.4.0
+    @install ${loc}zlib-1.2.2-2.4.1
+    @install ${loc}expat-1.95.8-2.4.0
+    @install ${loc}perl-term-5.8.7-2.4.0
+    @install ${loc}perl-ds-5.8.7-2.4.0
+    @install ${loc}perl-stats-5.8.7-2.4.0
+    @install ${loc}perl-time-5.8.7-2.4.0
+    @install ${loc}perl-util-5.8.7-2.4.0
+    @install ${loc}perl-parse-5.8.7-2.4.0
+    @install ${loc}perl-sys-5.8.7-2.4.0
+    @install ${loc}openssl-0.9.7g-2.4.1
+    @install ${loc}perl-mail-5.8.7-2.4.0
+    @install ${loc}perl-crypto-5.8.7-2.4.0
+    @install ${loc}perl-xml-5.8.7-2.4.0
+    @install ${loc}perl-net-5.8.7-2.4.0
+    @install ${loc}perl-comp-5.8.7-2.4.0
+    @install ${loc}perl-ssl-5.8.7-2.4.0
+    @install ${loc}perl-www-5.8.7-2.4.0
+    @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate
+    @install ${loc}procmail-3.22-2.4.0
+    @install ${loc}db-4.3.28.0-2.4.0
+    @install ${altloc}openldap-2.2.27-2.4.0_kolab
+    @install ${loc}m4-1.4.3-2.4.0
+    @install ${loc}bison-2.0-2.4.0
+    @install ${loc}flex-2.5.31-2.4.0
+    @install ${loc}groff-1.19.1-2.4.0
+    @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
+    @install ${loc}getopt-20030307-2.4.0
+    @install ${loc}proftpd-1.3.0rc1-2.4.0 --with=ldap
+    @install ${loc}gdbm-1.8.3-2.4.0
+    @install ${plusloc}dbtool-1.6-2.4.0
+    @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
+    @install ${loc}perl-ldap-5.8.7-2.4.0
+    @install ${loc}perl-db-5.8.7-2.4.0
+    @install ${altloc}imapd-2.2.12-2.4.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
+    @install ${loc}libiconv-1.9.2-2.4.0
+    @install ${loc}autoconf-2.59-2.4.0
+    @install ${loc}automake-1.9.5-2.4.0
+    @install ${loc}gettext-0.14.5-2.4.0
+    @install ${loc}file-4.13-2.4.0
+    @install ${loc}openpkg-tools-0.8.37-2.4.0
+    @install ${loc}patch-2.5.9-2.4.0
+    @install ${loc}sed-4.1.4-2.4.0
+    @install ${loc}libxml-2.6.19-2.4.0
+    @install ${loc}libxslt-1.1.14-2.4.0 # WARNING: Remove libgcrypt before building!
+    @install ${altloc}apache-1.3.33-2.4.0_kolab \
         --with=mod_auth_ldap \
         --with=mod_dav \
         --with=mod_php \
@@ -112,7 +113,7 @@
 	--with=mod_php_dom \
         --with=mod_ssl \
 	--with=mod_php_mbstring
-    @install ${altloc}php-4.3.9-2.2.2_kolab \
+    @install ${altloc}php-4.3.11-2.4.0_kolab \
 	--with=zlib \
 	--with=gdbm \
 	--with=gettext \
@@ -124,16 +125,17 @@
 	--with=ssl \
 	--with=mbstring
     @install ${altloc}php-smarty-2.6.3-20040702
-    @install ${altloc}gmp-4.1.4-20040924
-    @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}gmp-4.1.4-2.4.0
+    @install ${loc}spamassassin-3.0.3-2.4.0
+    @install ${plusloc}amavisd-2.3.1-2.4.0
+    @install ${loc}curl-7.14.0-2.4.0
     @install ${altloc}clamav-0.86.1-20050624
-    @install ${loc}vim-6.3.30-2.2.1
-    @install ${plusloc}dcron-2.9-2.2.0
-    @install ${altloc}kolabd-1.9.4-20050708 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-0.4.0-20050708 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20050701 --define kolab_version=$kolab_version
+    @install ${loc}vim-6.3.78-2.4.0
+    @install ${plusloc}dcron-2.9-2.4.0
+    @install ${altloc}perl-kolab-5.8.7-20050719
+    @install ${altloc}kolabd-1.9.4-20050722 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-0.4.0-20050720 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.3.9-20050719 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:19 2005
Subject: steffen: server/apache Makefile,1.16,1.17 kolab.patch,1.5,1.6 
Message-ID: <20050722223616.C729B101FC4@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	16 Jun 2005 03:04:13 -0000	1.16
+++ Makefile	22 Jul 2005 22:36:14 -0000	1.17
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=apache
-VERSION=1.3.31
-RELEASE=2.2.3
+VERSION=1.3.33
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab.patch	16 Jun 2005 03:04:13 -0000	1.5
+++ kolab.patch	22 Jul 2005 22:36:14 -0000	1.6
@@ -4,8 +4,8 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.2.3
-+Release:      2.2.3_kolab2
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:20 2005
Subject: steffen: server/imap Makefile,1.2,1.3 kolab.patch,1.2,1.3 
Message-ID: <20050722223616.CAF31101FD0@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imap/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	16 Jun 2005 03:04:13 -0000	1.2
+++ Makefile	22 Jul 2005 22:36:14 -0000	1.3
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=imap
-VERSION=2004c
-RELEASE=2.3.0
+VERSION=2004d
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imap/kolab.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.patch	16 Jun 2005 03:04:13 -0000	1.2
+++ kolab.patch	22 Jul 2005 22:36:14 -0000	1.3
@@ -4,8 +4,8 @@
  Group:        Mail
  License:      University of Washington's Free-Fork License
  Version:      %{V_here}
--Release:      2.3.0
-+Release:      2.3.0_kolab
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
  %option       with_ssl      yes


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:20 2005
Subject: steffen: server/imapd Makefile,1.23,1.24 kolab.patch,1.23,1.24 
Message-ID: <20050722223616.D19FA101FD2@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	28 Jun 2005 12:51:38 -0000	1.23
+++ Makefile	22 Jul 2005 22:36:14 -0000	1.24
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,15 +10,15 @@
 
 PACKAGE=imapd
 VERSION=2.2.12
-RELEASE=2.3.0
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
-	cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
 	cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	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

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kolab.patch	28 Jun 2005 12:51:38 -0000	1.23
+++ kolab.patch	22 Jul 2005 22:36:14 -0000	1.24
@@ -1,9 +1,9 @@
 --- ../imapd.orig/imapd.spec	2005-02-21 18:02:27.000000000 +0100
-+++ imapd.spec	2005-06-28 14:11:31.000000000 +0200
++++ imapd.spec	2005-06-10 04:00:13.000000000 +0200
 @@ -3,6 +3,9 @@
- ##  Copyright (c) 2000-2005 The OpenPKG Project 
- ##  Copyright (c) 2000-2005 Ralf S. Engelschall 
- ##  Copyright (c) 2000-2005 Cable & Wireless 
+ ##  imapd.spec -- OpenPKG RPM Package Specification
+ ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. 
+ ##  Copyright (c) 2000-2005 Ralf S. Engelschall 
 +##  Copyright (c) 2004 Tassilo Erlewein 
 +##  Copyright (c) 2004 Martin Konold 
 +##  Copyright (c) 2005 Steffen Hansen 
@@ -14,8 +14,8 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.12
--Release:      2.3.0
-+Release:      2.3.0_kolab5
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
 -%option       with_fsl    yes
@@ -37,14 +37,14 @@
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
 +Patch2:       imapd.annotate.patch
-+Patch3:       kolab-ldap.patch
-+Patch4:       imapd.group2.patch
++Patch3:	      kolab-ldap.patch
++Patch4:	      imapd.group2.patch
 +Patch5:       imapd-goodchars.patch
 +Patch6:       cyradm.annotate.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -62,6 +73,10 @@ PreReq:       sasl, db >= 4.2.52, openss
+@@ -62,6 +72,10 @@ PreReq:       sasl, db >= 4.2.52, openss
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -55,7 +55,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -88,6 +103,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
@@ -63,13 +63,12 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -95,10 +111,22 @@ AutoReqProv:  no
+@@ -95,10 +110,21 @@ AutoReqProv:  no
      sleep 1
      touch configure
  %endif
 +%if "%{with_annotate}" == "yes"
 +    %patch -p0 -P 2
-+    %patch -p0 -P 6
 +%endif
 +%if "%{with_ldap}" == "yes"
 +    %patch -p0 -P 3
@@ -77,7 +76,7 @@
 +%if "%{with_goodchars}" == "yes"
 +    %patch -p1 -P 5
 +%endif
-+
++    %patch -p0 -P 6
      %{l_shtool} subst \
          -e 's;-L/usr/local/lib;;g' \
          -e 's;-I/usr/local/include;;g' \
@@ -87,18 +86,3 @@
          configure
  
      #   ensure local com_err can be used
-@@ -112,12 +140,12 @@ AutoReqProv:  no
-         *-sunos* )
-             %{l_shtool} subst \
-                 -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb -lrt\2;' \
--                perl/imap/Makefile.PL
-+                perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
-         ;;
-         * )
-             %{l_shtool} subst \
-                 -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \
--                perl/imap/Makefile.PL
-+                perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
-         ;;
-     esac
- 


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:21 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.127, 1.128 
Message-ID: <20050722223616.D618D101FD9@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab-resource-handlers.spec 
Log Message:
Upgrade to openpkg-2.4

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- kolab-resource-handlers.spec	1 Jul 2005 11:59:45 -0000	1.127
+++ kolab-resource-handlers.spec	22 Jul 2005 22:36:14 -0000	1.128
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050701
+Release:	20050719
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:21 2005
Subject: steffen: server/kolabd kolabd.spec,1.63,1.64 
Message-ID: <20050722223616.D92B9101FDC@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabd.spec 
Log Message:
Upgrade to openpkg-2.4

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- kolabd.spec	15 Jul 2005 00:40:46 -0000	1.63
+++ kolabd.spec	22 Jul 2005 22:36:14 -0000	1.64
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050714
+Release:      20050722
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz
@@ -57,8 +57,8 @@
 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
-PreReq:	      amavisd >= 2.1.2-2.2.0_kolab
+PreReq:       perl-kolab >= 5.8.7-20050719, perl-db
+PreReq:	      amavisd >= 2.3.1-2.4.0
 PreReq:	      clamav
 AutoReq:      no
 AutoReqProv:  no


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:24 2005
Subject: steffen: server/kolabd/kolabd kolab_bootstrap, 1.16,
	1.17 kolabquotawarn, 1.3, 1.4 
Message-ID: <20050722223616.DE913101FDD@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab_bootstrap kolabquotawarn 
Log Message:
Upgrade to openpkg-2.4

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kolab_bootstrap	5 Jul 2005 10:40:13 -0000	1.16
+++ kolab_bootstrap	22 Jul 2005 22:36:14 -0000	1.17
@@ -402,6 +402,9 @@
       $confname = "$kolab_prefix/etc/openldap/slapd.replicas";
       copy( "$kolab_prefix/etc/kolab/templates/slapd.replicas.template", $confname ) || die "Could not write $confname";
       chmod (0640,$confname );
+      $confname = "$kolab_prefix/etc/openldap/slapd.access";
+      copy( "$kolab_prefix/etc/kolab/templates/slapd.access.template", $confname ) || die "Could not write $confname";
+      chmod (0640,$confname );
       # now we must startup slapd
       print "temporarily starting slapd\n";
       $ldap_uri = "ldap://127.0.0.1:389/";

Index: kolabquotawarn
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabquotawarn	6 Jun 2005 21:27:25 -0000	1.3
+++ kolabquotawarn	22 Jul 2005 22:36:14 -0000	1.4
@@ -133,7 +133,7 @@
 				Charset => "utf-8",
 				data => $msg );
   $mail->print if $opt_d;
-  $mail->send();
+  $mail->send( via => smtp );
 }
 
 sub kolablistquotas {


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:25 2005
Subject: steffen: server/perl-kolab Makefile.am, 1.5, 1.6 perl-kolab.spec.in,
	1.11, 1.12 
Message-ID: <20050722223616.EE05B101FDF@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile.am perl-kolab.spec.in 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	16 Jul 2005 21:40:03 -0000	1.5
+++ Makefile.am	22 Jul 2005 22:36:14 -0000	1.6
@@ -1,5 +1,5 @@
 PROGRAM = perl-kolab
-VERSION = 5.8.5
+VERSION = 5.8.7
 
 SUBDIRS = \
  Kolab \

Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- perl-kolab.spec.in	15 Jul 2005 01:01:33 -0000	1.11
+++ perl-kolab.spec.in	22 Jul 2005 22:36:14 -0000	1.12
@@ -37,7 +37,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      @VERSION@
-Release:      20050714
+Release:      20050719
 
 #   list of sources
 Source0:      perl-kolab-@VERSION@.tar.gz
@@ -59,8 +59,10 @@
 
 
 %build
+    # Notice: %{perl_sitearch} does not work,
+    #   it picks up the host system's perl
     %{configure} --prefix=@l_prefix@ \
-		 --includedir=%{perl_sitearch} \
+		 --includedir=`@l_prefix@/bin/perl -V:installsitearch` \
 		 --dist=kolab
     make
 


From cvs at intevation.de  Sat Jul 23 00:36:17 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:25 2005
Subject: steffen: server/postfix Makefile, 1.11, 1.12 kolab.patch, 1.3,
	1.4 postfix-ldap-leafonly.patch, 1.1,
	1.2 postfix-pipe-allow-empty-sender.patch, 1.1, 1.2 
Message-ID: <20050722223617.08A8B102BC3@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch postfix-ldap-leafonly.patch 
	postfix-pipe-allow-empty-sender.patch 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	31 May 2005 07:43:51 -0000	1.11
+++ Makefile	22 Jul 2005 22:36:14 -0000	1.12
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -8,15 +8,14 @@
   KOLABCVSDIR = $(CURDIR)
 endif
 
-VERSION=2.1.5
-RELEASE=2.2.0
+VERSION=2.2.3
+RELEASE=2.4.1
 
 RPM=/kolab/bin/openpkg rpm
  
 all: postfix-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv postfix-$(VERSION)-$(RELEASE).src.rpm
 
-	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

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/postfix/kolab.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.patch	31 May 2005 07:43:51 -0000	1.3
+++ kolab.patch	22 Jul 2005 22:36:14 -0000	1.4
@@ -1,31 +1,30 @@
---- 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
+--- ../postfix.orig/postfix.spec	2005-07-11 16:51:25.000000000 +0200
++++ postfix.spec	2005-07-19 10:28:58.000000000 +0200
+@@ -38,7 +38,7 @@ Class:        BASE
  Group:        Mail
  License:      IPL
  Version:      %{V_postfix}
--Release:      2.2.0
-+Release:      2.2.0_kolab3
+-Release:      2.4.1
++Release:      2.4.1_kolab
  
  #   package options
  %option       with_fsl       yes
-@@ -67,6 +67,9 @@ Patch1:       postfix.patch.pfls
+@@ -59,6 +59,8 @@ Source4:      rc.postfix
+ Patch0:       postfix.patch
+ 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
-+Patch7:       postfix-pipe-allow-empty-sender.patch
++Patch3:       postfix-ldap-leafonly.patch
++Patch4:       postfix-pipe-allow-empty-sender.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -195,6 +198,9 @@ Conflicts:    exim, sendmail, ssmtp
+@@ -148,6 +150,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
++    %patch -p0 -P 3
++    %patch -p0 -P 4
++    
  
  %build
      #   configure Postfix (hard-core part I)

Index: postfix-ldap-leafonly.patch
===================================================================
RCS file: /kolabrepository/server/postfix/postfix-ldap-leafonly.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postfix-ldap-leafonly.patch	19 May 2005 11:13:55 -0000	1.1
+++ postfix-ldap-leafonly.patch	22 Jul 2005 22:36:14 -0000	1.2
@@ -1,7 +1,7 @@
-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 @@
+diff -upr ../postfix-2.2.3.orig/src/global/dict_ldap.c ./src/global/dict_ldap.c
+--- ../postfix-2.2.3.orig/src/global/dict_ldap.c	2005-03-08 19:58:44.000000000 +0100
++++ ./src/global/dict_ldap.c	2005-07-19 02:46:30.000000000 +0200
+@@ -60,6 +60,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.
@@ -12,15 +12,15 @@
  /* .IP scope
  /*	LDAP search scope: sub, base, or one.
  /* .IP bind
-@@ -223,6 +227,7 @@ typedef struct {
-     char   *result_filter;
+@@ -226,6 +230,7 @@ typedef struct {
+     char   *search_base;
      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
+@@ -717,6 +722,7 @@ static void dict_ldap_get_values(DICT_LD
      char   *myname = "dict_ldap_get_values";
      struct timeval tv;
      LDAPURLDesc *url;
@@ -29,7 +29,7 @@
      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_ldap->size_limit);
  	    dict_errno = DICT_ERR_RETRY;
  	}
 +
@@ -62,9 +62,9 @@
  		/* 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
+ 		    if (db_common_expand(dict_ldap->ctx,
+ 					 dict_ldap->result_format, vals[i],
+@@ -809,6 +837,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);
@@ -72,7 +72,7 @@
  	    } 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
+@@ -1351,6 +1380,11 @@ DICT   *dict_ldap_open(const char *ldaps
      myfree(attr);
  
      /*
@@ -84,4 +84,3 @@
       * 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: postfix-pipe-allow-empty-sender.patch
===================================================================
RCS file: /kolabrepository/server/postfix/postfix-pipe-allow-empty-sender.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postfix-pipe-allow-empty-sender.patch	31 May 2005 07:43:51 -0000	1.1
+++ postfix-pipe-allow-empty-sender.patch	22 Jul 2005 22:36:14 -0000	1.2
@@ -1,16 +1,16 @@
-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:
+diff -upr ../postfix-2.2.3.orig/src/pipe/pipe.c ./src/pipe/pipe.c
+--- ../postfix-2.2.3.orig/src/pipe/pipe.c	2005-02-05 05:21:23.000000000 +0100
++++ ./src/pipe/pipe.c	2005-07-19 02:49:43.000000000 +0200
+@@ -51,7 +51,7 @@
+ /*	\fB\er\en\fR or \fB\en\fR. The usual C-style backslash escape
+ /*	sequences are recognized: \fB\ea \eb \ef \en \er \et \ev
+ /*	\e\fIddd\fR (up to three octal digits) and \fB\e\e\fR.
 -/* .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 @@
+@@ -82,6 +82,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.
@@ -20,7 +20,7 @@
  /* .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 @@
+@@ -399,6 +402,7 @@
  #define PIPE_OPT_FOLD_USER	(1<<16)
  #define PIPE_OPT_FOLD_HOST	(1<<17)
  #define PIPE_OPT_QUOTE_LOCAL	(1<<18)
@@ -28,7 +28,7 @@
  
  #define PIPE_OPT_FOLD_FLAGS	(PIPE_OPT_FOLD_USER | PIPE_OPT_FOLD_HOST)
  
-@@ -660,6 +664,9 @@ static void get_service_attr(PIPE_ATTR *
+@@ -719,6 +723,9 @@ static void get_service_attr(PIPE_ATTR *
  		case 'h':
  		    attr->flags |= PIPE_OPT_FOLD_HOST;
  		    break;
@@ -38,7 +38,7 @@
  		case 'q':
  		    attr->flags |= PIPE_OPT_QUOTE_LOCAL;
  		    break;
-@@ -835,22 +842,6 @@ static int deliver_message(DELIVER_REQUE
+@@ -901,22 +908,6 @@ static int deliver_message(DELIVER_REQUE
  	msg_info("%s: from <%s>", myname, request->sender);
  
      /*
@@ -61,7 +61,7 @@
       * 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
+@@ -932,6 +923,22 @@ static int deliver_message(DELIVER_REQUE
      }
  
      /*
@@ -84,4 +84,3 @@
       * 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~


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:26 2005
Subject: steffen: server/php Makefile,1.1,1.2 kolab.patch,1.1,1.2 
Message-ID: <20050722223616.EE1BD102BC1@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	16 Jun 2005 03:04:13 -0000	1.1
+++ Makefile	22 Jul 2005 22:36:14 -0000	1.2
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.2/UPD
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=php
-VERSION=4.3.9
-RELEASE=2.2.2
+VERSION=4.3.11
+RELEASE=2.4.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/php/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch	16 Jun 2005 03:04:13 -0000	1.1
+++ kolab.patch	22 Jul 2005 22:36:14 -0000	1.2
@@ -5,8 +5,8 @@
  Group:        Language
  License:      PHP
  Version:      %{V_php}
--Release:      2.2.2
-+Release:      2.2.2_kolab
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
  %option       with_bc                   no


From cvs at intevation.de  Sat Jul 23 00:36:16 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:36:27 2005
Subject: steffen: server/openldap Makefile,1.10,1.11 kolab.patch,1.5,1.6 
Message-ID: <20050722223616.EEFB1102BC2@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Upgrade to openpkg-2.4

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	25 May 2005 13:14:35 -0000	1.10
+++ Makefile	22 Jul 2005 22:36:14 -0000	1.11
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=openldap
-VERSION=2.2.23
-RELEASE=2.3.0
+VERSION=2.2.27
+RELEASE=2.4.0
 
 
 RPM=/kolab/bin/openpkg rpm

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab.patch	2 Jun 2005 02:12:58 -0000	1.5
+++ kolab.patch	22 Jul 2005 22:36:14 -0000	1.6
@@ -1,19 +1,20 @@
+Only in .: kolab.patch
 diff -upr ../openldap.orig/openldap.spec ./openldap.spec
---- ../openldap.orig/openldap.spec	2005-02-21 18:02:29.000000000 +0100
-+++ ./openldap.spec	2005-06-02 03:59:04.000000000 +0200
-@@ -34,7 +34,7 @@ Class:        BASE
+--- ../openldap.orig/openldap.spec	2005-06-15 20:55:42.000000000 +0200
++++ ./openldap.spec	2005-07-19 01:51:30.000000000 +0200
+@@ -33,7 +33,7 @@ Class:        BASE
  Group:        Database
  License:      GPL
- Version:      2.2.23
--Release:      2.3.0
-+Release:      2.3.0_kolab2
+ Version:      2.2.27
+-Release:      2.4.0
++Release:      2.4.0_kolab
  
  #   package options
  %option       with_fsl   yes
-@@ -54,8 +54,8 @@ Prefix:       %{l_prefix}
+@@ -53,8 +53,8 @@ Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
- BuildPreReq:  OpenPKG, openpkg >= 2.3.0, make, gcc
- PreReq:       OpenPKG, openpkg >= 2.3.0
+ BuildPreReq:  OpenPKG, openpkg >= 2.4.0, make, gcc
+ PreReq:       OpenPKG, openpkg >= 2.4.0
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
 +BuildPreReq:  readline, openssl, db >= 4.2
@@ -21,16 +22,18 @@
  %if "%{with_fsl}" == "yes"
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
-@@ -90,7 +90,7 @@ AutoReqProv:  no
+@@ -90,8 +90,8 @@ 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;-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"
-@@ -108,10 +108,10 @@ AutoReqProv:  no
+@@ -109,10 +109,10 @@ AutoReqProv:  no
          ;;
      esac
      CC="%{l_cc}" \
@@ -45,7 +48,7 @@
      ./configure \
          --cache-file=./config.cache \
          --prefix=%{l_prefix} \
-@@ -160,7 +160,7 @@ AutoReqProv:  no
+@@ -161,7 +161,7 @@ AutoReqProv:  no
  %endif
          --with-dyngroup \
          --with-proxycache \
@@ -55,8 +58,8 @@
  
      #   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
+--- ../openldap.orig/rc.openldap	2004-12-07 20:57:36.000000000 +0100
++++ ./rc.openldap	2005-07-19 01:50:46.000000000 +0200
 @@ -27,6 +27,10 @@
          [ ".`grep '^replogfile' $openldap_slapd_cfgfile`" != . ] && return 0
          return 1


From cvs at intevation.de  Sat Jul 23 00:45:04 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:45:05 2005
Subject: steffen: server/kolabd/kolabd kolabquotawarn,1.4,1.5 
Message-ID: <20050722224504.AC9811005D0@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabquotawarn 
Log Message:
fixes

Index: kolabquotawarn
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabquotawarn	22 Jul 2005 22:36:14 -0000	1.4
+++ kolabquotawarn	22 Jul 2005 22:45:02 -0000	1.5
@@ -133,7 +133,8 @@
 				Charset => "utf-8",
 				data => $msg );
   $mail->print if $opt_d;
-  $mail->send( via => smtp );
+  my $mailer = Mail::Transport::SMTP->new();
+  $mailer->send( $mail );
 }
 
 sub kolablistquotas {


From cvs at intevation.de  Sat Jul 23 00:45:04 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:45:06 2005
Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.12,1.13 
Message-ID: <20050722224504.B86E0101FC4@lists.intevation.de>

Author: steffen

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

Modified Files:
	perl-kolab.spec.in 
Log Message:
fixes

Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- perl-kolab.spec.in	22 Jul 2005 22:36:14 -0000	1.12
+++ perl-kolab.spec.in	22 Jul 2005 22:45:02 -0000	1.13
@@ -61,8 +61,8 @@
 %build
     # Notice: %{perl_sitearch} does not work,
     #   it picks up the host system's perl
-    %{configure} --prefix=@l_prefix@ \
-		 --includedir=`@l_prefix@/bin/perl -V:installsitearch` \
+    %{configure} --prefix=%{l_prefix} \
+		 --includedir=%(eval "`perl -V:installsitearch`"; echo $installsitearch) \
 		 --dist=kolab
     make
 


From cvs at intevation.de  Sat Jul 23 00:51:56 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:51:57 2005
Subject: steffen: server obmtool.conf,1.181,1.182 
Message-ID: <20050722225156.119A01005D0@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
fixes

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- obmtool.conf	22 Jul 2005 22:36:14 -0000	1.181
+++ obmtool.conf	22 Jul 2005 22:51:54 -0000	1.182
@@ -132,7 +132,7 @@
     @install ${altloc}clamav-0.86.1-20050624
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20050719
+    @install ${altloc}perl-kolab-5.8.7-20050722
     @install ${altloc}kolabd-1.9.4-20050722 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-0.4.0-20050720 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-0.3.9-20050719 --define kolab_version=$kolab_version


From cvs at intevation.de  Sat Jul 23 00:51:56 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:51:58 2005
Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.13,1.14 
Message-ID: <20050722225156.15AAA101FD0@lists.intevation.de>

Author: steffen

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

Modified Files:
	perl-kolab.spec.in 
Log Message:
fixes

Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- perl-kolab.spec.in	22 Jul 2005 22:45:02 -0000	1.13
+++ perl-kolab.spec.in	22 Jul 2005 22:51:54 -0000	1.14
@@ -37,7 +37,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      @VERSION@
-Release:      20050719
+Release:      20050722
 
 #   list of sources
 Source0:      perl-kolab-@VERSION@.tar.gz


From cvs at intevation.de  Sat Jul 23 00:56:05 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:56:05 2005
Subject: steffen: server/kolabd/kolabd kolabquotawarn,1.3,1.3.2.1 
Message-ID: <20050722225605.2A555101FA7@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabquotawarn 
Log Message:
Issue851

Index: kolabquotawarn
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- kolabquotawarn	6 Jun 2005 21:27:25 -0000	1.3
+++ kolabquotawarn	22 Jul 2005 22:56:03 -0000	1.3.2.1
@@ -133,7 +133,8 @@
 				Charset => "utf-8",
 				data => $msg );
   $mail->print if $opt_d;
-  $mail->send();
+  my $mailer = Mail::Transport::SMTP->new();
+  $mailer->send($mail);
 }
 
 sub kolablistquotas {


From cvs at intevation.de  Sat Jul 23 00:59:35 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:59:36 2005
Subject: steffen: server obmtool.conf,1.174.2.3,1.174.2.4 
Message-ID: <20050722225935.38F1C1005D0@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
version

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.3
retrieving revision 1.174.2.4
diff -u -d -r1.174.2.3 -r1.174.2.4
--- obmtool.conf	21 Jul 2005 21:19:11 -0000	1.174.2.3
+++ obmtool.conf	22 Jul 2005 22:59:33 -0000	1.174.2.4
@@ -86,7 +86,6 @@
     @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-2.0_20050719
     @install ${altloc}imapd-2.2.12-2.4.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
     @install ${loc}m4-1.4.3-2.4.0
     @install ${loc}bison-2.0-2.4.0
@@ -133,7 +132,8 @@
     @install ${altloc}clamav-0.86.1-20050624
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}kolabd-1.9.4-20050615 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-2.0_20050719
+    @install ${altloc}kolabd-1.9.4-20050722 --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  Sat Jul 23 00:59:35 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Jul 23 00:59:39 2005
Subject: steffen: server/kolabd kolabd.spec,1.57,1.57.2.1 
Message-ID: <20050722225935.573C3101FD0@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabd.spec 
Log Message:
version

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -u -d -r1.57 -r1.57.2.1
--- kolabd.spec	15 Jun 2005 12:17:53 -0000	1.57
+++ kolabd.spec	22 Jul 2005 22:59:33 -0000	1.57.2.1
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050615
+Release:      20050722
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz


From cvs at intevation.de  Sun Jul 24 16:29:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun Jul 24 16:29:37 2005
Subject: steffen: server obmtool.conf,1.182,1.183 
Message-ID: <20050724142936.802BE1005CE@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
next attempt at fixing perl-kolab installation trouble

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- obmtool.conf	22 Jul 2005 22:51:54 -0000	1.182
+++ obmtool.conf	24 Jul 2005 14:29:34 -0000	1.183
@@ -132,7 +132,7 @@
     @install ${altloc}clamav-0.86.1-20050624
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20050722
+    @install ${altloc}perl-kolab-5.8.7-20050723
     @install ${altloc}kolabd-1.9.4-20050722 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-0.4.0-20050720 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-0.3.9-20050719 --define kolab_version=$kolab_version


From cvs at intevation.de  Sun Jul 24 16:29:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun Jul 24 16:29:38 2005
Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.14,1.15 
Message-ID: <20050724142936.821A11005D3@lists.intevation.de>

Author: steffen

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

Modified Files:
	perl-kolab.spec.in 
Log Message:
next attempt at fixing perl-kolab installation trouble

Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- perl-kolab.spec.in	22 Jul 2005 22:51:54 -0000	1.14
+++ perl-kolab.spec.in	24 Jul 2005 14:29:34 -0000	1.15
@@ -37,7 +37,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      @VERSION@
-Release:      20050722
+Release:      20050723
 
 #   list of sources
 Source0:      perl-kolab-@VERSION@.tar.gz
@@ -62,7 +62,7 @@
     # Notice: %{perl_sitearch} does not work,
     #   it picks up the host system's perl
     %{configure} --prefix=%{l_prefix} \
-		 --includedir=%(eval "`perl -V:installsitearch`"; echo $installsitearch) \
+		 --includedir=%(eval "`%{l_prefix}/bin/perl -V:installsitearch`"; echo $installsitearch) \
 		 --dist=kolab
     make
 


From cvs at intevation.de  Sun Jul 24 23:47:43 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun Jul 24 23:47:44 2005
Subject: steffen: server obmtool.conf,1.183,1.184 
Message-ID: <20050724214743.5970F1005BB@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
Fixed LDAP access bug that showed up after upgrading + a few details in the webgui

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- obmtool.conf	24 Jul 2005 14:29:34 -0000	1.183
+++ obmtool.conf	24 Jul 2005 21:47:41 -0000	1.184
@@ -130,11 +130,11 @@
     @install ${plusloc}amavisd-2.3.1-2.4.0
     @install ${loc}curl-7.14.0-2.4.0
     @install ${altloc}clamav-0.86.1-20050624
-    @install ${loc}vim-6.3.78-2.4.0
-    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20050723
-    @install ${altloc}kolabd-1.9.4-20050722 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-0.4.0-20050720 --define kolab_version=$kolab_version
+#    @install ${loc}vim-6.3.78-2.4.0
+#    @install ${plusloc}dcron-2.9-2.4.0
+    @install ${altloc}perl-kolab-5.8.7-20050724
+    @install ${altloc}kolabd-1.9.4-20050723 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-0.4.0-20050724 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-0.3.9-20050719 --define kolab_version=$kolab_version
     @check
 


From cvs at intevation.de  Sun Jul 24 23:47:43 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun Jul 24 23:47:47 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.21, 1.22 menu.php, 1.13, 1.14 
Message-ID: <20050724214743.609901005CC@lists.intevation.de>

Author: steffen

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

Modified Files:
	form.class.php menu.php 
Log Message:
Fixed LDAP access bug that showed up after upgrading + a few details in the webgui

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- form.class.php	5 Jul 2005 10:31:51 -0000	1.21
+++ form.class.php	24 Jul 2005 21:47:41 -0000	1.22
@@ -77,9 +77,11 @@
 		$str .= '';
 		$str .= ''.$value['name'].'';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '
'.$value['value'].'
';
+		  $str .= '
'.htmlentities($value['value']).'
';
 		} else {
-		  $str .= '';
+		  $str .= '';
 		}
 		$str .= ''.$value['comment'].'';
 		$str .= ''."\n";
@@ -89,7 +91,7 @@
 		$str .= ''.$value['name'].'';
 		list($uname,$domain) = split('@',$value['value']);
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '
'.$value['value'].'
'.htmlentities($value['value']).'
';
 		} else {
@@ -125,7 +127,7 @@
 		if( ereg( 'readonly', $value['attrs'] ) ) {
 		  $str .= '
'.htmlentities($value['value']).'
';
 		} else {
-		  $str .= '';
+		  $str .= '';
 		}
 		$str .= ''.$value['comment'].'';
 		$str .= ''."\n";
@@ -164,7 +166,7 @@
 		$str .= ''.$value['name'].'';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
 		  $str .= '
'.htmlentities($value['options'][$value['value']]).
-			'
';
+			'
';
 		} else {
 		  $str .= '';
+		  $str .= '';
 		  $str .= '';
+			  $str .= _('Anyone').'';
 			} else {
 			  $str .= '';
+				.'" value="'.htmlentities($user).'" '.$value['attrs'].' />';
 			}
 			$str .= '';
+		$str .= '';
       }
     }
     $str .= '';

Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- menu.php	5 Jul 2005 10:31:51 -0000	1.13
+++ menu.php	24 Jul 2005 21:47:41 -0000	1.14
@@ -75,7 +75,7 @@
 									   'title' => _('Manage Domain Maintainers'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New Domain Maintainer'),
-																 'url'   => 'maintainer.php?action=create' ) ) );
+																 'url'   => 'domainmaintainer.php?action=create' ) ) );
 }
 if( $auth->group() == 'admin' ) {
   $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
@@ -83,7 +83,7 @@
 									'title' => _('Manage Maintainers'),
 									'submenu' => array(
 													   array( 'name' => _('Create New Maintainer'),
-															  'url'   => 'domainmaintainer.php?action=create' ) ) );
+															  'url'   => 'maintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'maintainer' ) {
   $mdn = $auth->dn();
   $menuitems['maintainer'] = array( 'name' => _('Maintainers'),


From cvs at intevation.de  Sun Jul 24 23:47:43 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun Jul 24 23:47:47 2005
Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.15,1.16 
Message-ID: <20050724214743.67FEB1005CE@lists.intevation.de>

Author: steffen

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

Modified Files:
	perl-kolab.spec.in 
Log Message:
Fixed LDAP access bug that showed up after upgrading + a few details in the webgui

Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- perl-kolab.spec.in	24 Jul 2005 14:29:34 -0000	1.15
+++ perl-kolab.spec.in	24 Jul 2005 21:47:41 -0000	1.16
@@ -37,7 +37,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      @VERSION@
-Release:      20050723
+Release:      20050724
 
 #   list of sources
 Source0:      perl-kolab-@VERSION@.tar.gz


From cvs at intevation.de  Sun Jul 24 23:47:43 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun Jul 24 23:47:48 2005
Subject: steffen: server/kolabd kolabd.spec,1.64,1.65 
Message-ID: <20050724214743.6AB3F1005CF@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabd.spec 
Log Message:
Fixed LDAP access bug that showed up after upgrading + a few details in the webgui

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- kolabd.spec	22 Jul 2005 22:36:14 -0000	1.64
+++ kolabd.spec	24 Jul 2005 21:47:41 -0000	1.65
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050722
+Release:      20050723
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz
@@ -209,9 +209,11 @@
 
 %post
     %{l_shtool} echo -e "Installing crontab entry"
-    %{l_shtool} echo -e "`%{l_prefix}/bin/crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
+	# NOTE: OpenPKG's dcron package does not work currently, 
+	# so we have to rely on the host system's cron:
+    %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
 	'
-*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | %{l_prefix}/bin/crontab - -u %{l_musr}
+*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | crontab - -u %{l_musr}
 
     echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/etc/kolab/kolab_bootstrap -b' as user root."
     echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."


From cvs at intevation.de  Sun Jul 24 23:47:43 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sun Jul 24 23:47:49 2005
Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.58,1.59 
Message-ID: <20050724214743.6EE721005D3@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv27715/perl-kolab/Kolab-Conf

Modified Files:
	Conf.pm 
Log Message:
Fixed LDAP access bug that showed up after upgrading + a few details in the webgui

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Conf.pm	8 Jul 2005 02:05:35 -0000	1.58
+++ Conf.pm	24 Jul 2005 21:47:41 -0000	1.59
@@ -463,15 +463,15 @@
 # Domain specific access
 access to filter=(&(objectClass=kolabInetOrgPerson)(mail=*@@@@domain@@@)(|(!(alias=*))(alias=*@@@@domain@@@)))
         by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
-        by * continue
+        by * break
 
 access to filter=(&(objectClass=kolabGroupOfNames)(mail=*@@@@domain@@@))
         by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
-        by * continue
+        by * break
 
 access to filter=(&(objectClass=kolabSharedFolder)(cn=*@@@@domain@@@))
         by group/kolabGroupOfNames="cn=@@@domain@@@,cn=domains,cn=internal,@@@base_dn@@@" write
-        by * continue
+        by * break
 
 EOS
 


From cvs at intevation.de  Mon Jul 25 03:12:00 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Jul 25 03:12:01 2005
Subject: steffen: server/kolabd/kolabd/templates imapd.conf.template, 1.4,
	1.5 
Message-ID: <20050725011200.37A161005D3@lists.intevation.de>

Author: steffen

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

Modified Files:
	imapd.conf.template 
Log Message:
Fix login problem

Index: imapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imapd.conf.template	26 May 2005 06:32:45 -0000	1.4
+++ imapd.conf.template	25 Jul 2005 01:11:58 -0000	1.5
@@ -37,7 +37,7 @@
 username_tolower:       1
 ##virtdomains:            userid
 
-loginrealms:		@@@postfix-mydomain@@@
+loginrealms:		@@@postfix-mydomain@@@ @@@postfix-mydestination|join @@@
 
 # support for lookup of mailbox name from local LDAP server
 ldap_uri:               @@@user_ldap_uri@@@


From cvs at intevation.de  Mon Jul 25 03:29:56 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Jul 25 03:29:58 2005
Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.59,1.60 
Message-ID: <20050725012956.B5DF21005D3@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv31283/perl-kolab/Kolab-Conf

Modified Files:
	Conf.pm 
Log Message:
imapd conf creation buglets fixed

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Conf.pm	24 Jul 2005 21:47:41 -0000	1.59
+++ Conf.pm	25 Jul 2005 01:29:54 -0000	1.60
@@ -313,7 +313,7 @@
     my $cfg = "$ap::config->{imap_confdir}/cyrus.conf";
     my $oldcfg = $cfg . '.old';
     my $oldmask = umask 077;
-    copy($cfg, $oldcfg);
+    copy($cfg, $oldcfg) or Kolab::log('T', "Unable to back up configuration file `$cfg'", KOLAB_WARN);
     chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
     umask $oldmask;
 
@@ -663,8 +663,8 @@
 		 "$templatedir/master.cf.template" => "$ap::config->{sysconfdir}/postfix/master.cf",
 		 "$templatedir/saslauthd.conf.template" => "$ap::config->{sasl_confdir}/saslauthd.conf",
 		 "$templatedir/imapd.conf.template" => "$ap::config->{imap_confdir}/imapd.conf",
-		 "$templatedir/imapd.group.template" => "$ap::config->{imap_confdir}/imapd.group",
-		 "$templatedir/cyrus.conf.template" => "$ap::config->{imap_confdir}/cyrus.conf",
+#		 "$templatedir/imapd.group.template" => "$ap::config->{imap_confdir}/imapd.group",
+#		 "$templatedir/cyrus.conf.template" => "$ap::config->{imap_confdir}/cyrus.conf",
 		 "$templatedir/httpd.conf.template" => "$ap::config->{webserver_confdir}/apache.conf",
 		 "$templatedir/httpd.local.template" => "$ap::config->{webserver_confdir}/apache.local",
 		 "$templatedir/php.ini.template" => "$ap::config->{webserver_confdir}/php.ini",


From cvs at intevation.de  Tue Jul 26 03:29:19 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 03:29:21 2005
Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.60,1.61 
Message-ID: <20050726012919.B5E10101EF3@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv15878/Kolab-Conf

Modified Files:
	Conf.pm 
Log Message:
ldap stuff for postfix in separate files

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Conf.pm	25 Jul 2005 01:29:54 -0000	1.60
+++ Conf.pm	26 Jul 2005 01:29:17 -0000	1.61
@@ -660,6 +660,9 @@
 		 "$templatedir/freshclam.conf.template" => "$ap::config->{clamav_confdir}/freshclam.conf",
 		 "$templatedir/amavisd.conf.template" => "$ap::config->{sysconfdir}/amavisd/amavisd.conf",
 		 "$templatedir/main.cf.template" => "$ap::config->{sysconfdir}/postfix/main.cf",
+		 "$templatedir/ldapdistlist.cf.template" => "$ap::config->{sysconfdir}/postfix/ldapdistlist.cf",
+		 "$templatedir/ldaptransport.cf.template" => "$ap::config->{sysconfdir}/postfix/ldaptransport.cf",
+		 "$templatedir/ldapvirtual.cf.template" => "$ap::config->{sysconfdir}/postfix/ldapvirtual.cf",
 		 "$templatedir/master.cf.template" => "$ap::config->{sysconfdir}/postfix/master.cf",
 		 "$templatedir/saslauthd.conf.template" => "$ap::config->{sasl_confdir}/saslauthd.conf",
 		 "$templatedir/imapd.conf.template" => "$ap::config->{imap_confdir}/imapd.conf",
@@ -683,7 +686,10 @@
 		   "$ap::config->{sysconfdir}/resmgr/freebusy.conf"                     => 0640,
 		   "$ap::config->{sysconfdir}/resmgr/fbview.conf"                       => 0640,
 		   "$ap::config->{sysconfdir}/resmgr/resmgr.conf"                       => 0640,
-		   "$ap::config->{sysconfdir}/postfix/main.cf"                          => 0640,
+		   "$ap::config->{sysconfdir}/postfix/main.cf"                          => 0644,
+		   "$ap::config->{sysconfdir}/postfix/ldapdistlist.cf"                  => 0640,
+		   "$ap::config->{sysconfdir}/postfix/ldaptransport.cf"                 => 0640,
+		   "$ap::config->{sysconfdir}/postfix/ldapvirtual.cf"                   => 0640,
 		   "$ap::config->{sysconfdir}/postfix/master.cf"                        => 0640,
 		   "$ap::config->{clamav_confdir}/clamd.conf"                           => 0640,
 		   "$ap::config->{clamav_confdir}/freshclam.conf"                       => 0640,
@@ -704,16 +710,19 @@
 
 my %ownership = (
 		 "$ap::config->{sysconfdir}/rc.conf"                                  => "kolab:kolab",
-		 "$ap::config->{webadmindir}/php/admin/include/session_vars.php" => "kolab:kolab-n",
+		 "$ap::config->{webadmindir}/php/admin/include/session_vars.php"      => "kolab:kolab-n",
 		 "$ap::config->{sysconfdir}/resmgr/freebusy.conf"                     => "kolab:kolab-n",
 		 "$ap::config->{sysconfdir}/resmgr/fbview.conf"                       => "kolab:kolab-n",
 		 "$ap::config->{sysconfdir}/resmgr/resmgr.conf"                       => "kolab:kolab-n",
-		 "$ap::config->{sysconfdir}/postfix/main.cf"                          => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
+		 "$ap::config->{sysconfdir}/postfix/main.cf"                          => "root:root",
+		 "$ap::config->{sysconfdir}/postfix/ldapdistlist.cf"                  => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
+		 "$ap::config->{sysconfdir}/postfix/ldaptransport.cf"                 => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
+		 "$ap::config->{sysconfdir}/postfix/ldapvirtual.cf"                   => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
 		 "$ap::config->{sysconfdir}/postfix/master.cf"                        => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
 		 "$ap::config->{clamav_confdir}/clamd.conf"                           => "kolab:kolab-r",
 		 "$ap::config->{clamav_confdir}/freshclam.conf"                       => "kolab:kolab-r",
 		 "$ap::config->{sysconfdir}/amavisd/amavisd.conf"                     => "kolab:kolab-r",
-		 "$ap::config->{sasl_confdir}/saslauthd.conf"                          => "kolab:kolab",
+		 "$ap::config->{sasl_confdir}/saslauthd.conf"                         => "kolab:kolab",
 		 "$ap::config->{imap_confdir}/imapd.conf"                             => "$ap::config->{imap_usr}:$ap::config->{imap_grp}",
 		 "$ap::config->{webserver_confdir}/apache.conf"                       => "kolab:kolab-n",
 		 "$ap::config->{webserver_confdir}/apache.local"                      => "kolab:kolab-n",


From cvs at intevation.de  Tue Jul 26 03:29:19 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 03:29:23 2005
Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.16,1.17 
Message-ID: <20050726012919.B4395101EF1@lists.intevation.de>

Author: steffen

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

Modified Files:
	perl-kolab.spec.in 
Log Message:
ldap stuff for postfix in separate files

Index: perl-kolab.spec.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- perl-kolab.spec.in	24 Jul 2005 21:47:41 -0000	1.16
+++ perl-kolab.spec.in	26 Jul 2005 01:29:17 -0000	1.17
@@ -37,7 +37,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      @VERSION@
-Release:      20050724
+Release:      20050725
 
 #   list of sources
 Source0:      perl-kolab-@VERSION@.tar.gz


From cvs at intevation.de  Tue Jul 26 03:34:19 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 03:34:21 2005
Subject: steffen: server/kolabd kolabd.spec,1.65,1.66 
Message-ID: <20050726013419.B75C7101EF1@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabd.spec 
Log Message:
ldap stuff for postfix in separate files + added anvil, tlsmgr and scache to master.cf

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- kolabd.spec	24 Jul 2005 21:47:41 -0000	1.65
+++ kolabd.spec	26 Jul 2005 01:34:17 -0000	1.66
@@ -40,7 +40,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.4
-Release:      20050723
+Release:      20050725
 
 #   list of sources
 Source0:      kolabd-1.9.4.tar.gz
@@ -57,7 +57,7 @@
 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.7-20050719, perl-db
+PreReq:       perl-kolab >= 5.8.7-20050725, perl-db
 PreReq:	      amavisd >= 2.3.1-2.4.0
 PreReq:	      clamav
 AutoReq:      no


From cvs at intevation.de  Tue Jul 26 03:34:19 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 03:34:22 2005
Subject: steffen: server/kolabd/kolabd/templates ldapdistlist.cf.template,
	NONE, 1.1 ldaptransport.cf.template, NONE,
	1.1 ldapvirtual.cf.template, NONE, 1.1 main.cf.template, 1.17,
	1.18 master.cf.template, 1.11, 1.12 
Message-ID: <20050726013419.C0356101EF3@lists.intevation.de>

Author: steffen

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

Modified Files:
	main.cf.template master.cf.template 
Added Files:
	ldapdistlist.cf.template ldaptransport.cf.template 
	ldapvirtual.cf.template 
Log Message:
ldap stuff for postfix in separate files + added anvil, tlsmgr and scache to master.cf

--- NEW FILE: ldapdistlist.cf.template ---
# (c) 2005 Steffen Hansen  (Klaralvdalens Datakonsult AB)
#
# 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
# manual additions are lost unless made to the template in the Kolab config directory

#
# LDAP Distributionlist support for postfix
#

server_host = @@@ldap_uri@@@
search_base = @@@user_dn_list@@@
domain = $mydestination
query_filter = (&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(mail=%s))
special_result_attribute = member
exclude_internal = yes
result_attribute = mail
result_filter = %s
search_timeout = 15
scope = sub
bind = yes
bind_dn = @@@php_dn@@@
bind_pw = @@@php_pw@@@
version = 3
#debuglevel = 255

--- NEW FILE: ldaptransport.cf.template ---
# (c) 2005 Steffen Hansen  (Klaralvdalens Datakonsult AB)
#
# 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
# manual additions are lost unless made to the template in the Kolab config directory

#
# LDAP Transport for multilocation support
#

server_host = @@@ldap_uri@@@
search_base = @@@user_dn_list@@@
query_filter = (&(mail=%s)(objectClass=kolabInetOrgPerson)(!(kolabHomeServer=@@@fqdnhostname@@@)))
result_attribute = kolabHomeServer
result_filter = smtp:[%s]
search_timeout = 15
scope = sub
bind = yes
bind_dn = @@@php_dn@@@
bind_pw = @@@php_pw@@@
version = 3
#debuglevel = 255

--- NEW FILE: ldapvirtual.cf.template ---
# (c) 2005 Steffen Hansen  (Klaralvdalens Datakonsult AB)
#
# 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
# manual additions are lost unless made to the template in the Kolab config directory

#
# LDAP Alias support for postfix
#

server_host = @@@ldap_uri@@@
search_base = @@@user_dn_list@@@
query_filter = (&(!(kolabDeleteFlag=*))(|(alias=%s)(mail=%s)))
result_attribute = mail
result_filter = %s
search_timeout = 15
scope = sub
bind = yes
bind_dn = @@@php_dn@@@
bind_pw = @@@php_pw@@@
version = 3
#debuglevel = 255

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- main.cf.template	15 Jul 2005 00:40:46 -0000	1.17
+++ main.cf.template	26 Jul 2005 01:34:17 -0000	1.18
@@ -48,9 +48,9 @@
 
 #   maps
 canonical_maps = hash:@l_prefix@/etc/postfix/canonical
-virtual_maps =  hash:@l_prefix@/etc/postfix/virtual, ldap:ldapdistlist, ldap:ldapvirtual
+virtual_maps =  hash:@l_prefix@/etc/postfix/virtual, ldap:@l_prefix@/etc/postfix/ldapdistlist.cf, ldap:@l_prefix@/etc/postfix/ldapvirtual.cf
 relocated_maps = hash:@l_prefix@/etc/postfix/relocated
-transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:ldaptransport
+transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:@l_prefix@/etc/postfix/ldaptransport.cf
 alias_maps = hash:@l_prefix@/etc/postfix/aliases
 alias_database = hash:@l_prefix@/etc/postfix/aliases
 #virtual_mailbox_maps = $virtual_maps
@@ -129,63 +129,6 @@
 
 # Support broken clients like Microsoft Outlook Express 4.x which expect AUTH=LOGIN instead of AUTH LOGIN
 broken_sasl_auth_clients = yes
-
-#
-# LDAP Alias support
-#
-
-ldapvirtual_server_host = @@@ldap_uri@@@
-ldapvirtual_search_base = @@@user_dn_list@@@
-ldapvirtual_query_filter = (&(!(kolabDeleteFlag=*))(|(alias=%s)(mail=%s)))
-ldapvirtual_result_attribute = mail
-ldapvirtual_result_filter = %s
-ldapvirtual_search_timeout = 15
-ldapvirtual_scope = sub
-ldapvirtual_bind = yes
-ldapvirtual_bind_dn = @@@php_dn@@@
-ldapvirtual_bind_pw = @@@php_pw@@@
-ldapvirtual_version = 3
-
-#
-# LDAP Recipient map
-#
-
-
-#
-# LDAP Distributionlist support
-#
-
-ldapdistlist_server_host = @@@ldap_uri@@@
-ldapdistlist_search_base = @@@user_dn_list@@@
-ldapdistlist_domain = $mydestination
-ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(mail=%s))
-ldapdistlist_special_result_attribute = member
-ldapdistlist_exclude_internal = yes
-ldapdistlist_result_attribute = mail
-ldapdistlist_result_filter = %s
-ldapdistlist_search_timeout = 15
-ldapdistlist_scope = sub
-ldapdistlist_bind = yes
-ldapdistlist_bind_dn = @@@php_dn@@@
-ldapdistlist_bind_pw = @@@php_pw@@@
-ldapdistlist_version = 3
-
-#
-# LDAP Transport for multilocation support
-#
-
-ldaptransport_server_host = @@@ldap_uri@@@
-ldaptransport_search_base = @@@user_dn_list@@@
-ldaptransport_query_filter = (&(mail=%s)(objectClass=kolabInetOrgPerson)(!(kolabHomeServer=$myhostname)))
-ldaptransport_result_attribute = kolabHomeServer
-ldaptransport_result_filter = smtp:[%s]
-ldaptransport_search_timeout = 15
-ldaptransport_scope = sub
-ldaptransport_bind = yes
-ldaptransport_bind_dn = @@@php_dn@@@
-ldaptransport_bind_pw = @@@php_pw@@@
-ldaptransport_version = 3
-
 
 @@@if postfix-enable-virus-scan@@@
 #

Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- master.cf.template	10 Jun 2005 23:54:37 -0000	1.11
+++ master.cf.template	26 Jul 2005 01:34:17 -0000	1.12
@@ -26,6 +26,9 @@
 local     unix  -       n       n       -       -       local
 #virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
+anvil     unix  -       -       n       -       1       anvil
+scache    unix  -       -       n       -       1       scache
+tlsmgr    unix  -       -       n       1000?   1       tlsmgr
 #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)
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=/kolab/bin/ifmail -r $nexthop ($recipient)


From cvs at intevation.de  Tue Jul 26 03:34:57 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 03:34:58 2005
Subject: steffen: server obmtool.conf,1.184,1.185 
Message-ID: <20050726013457.141F6101EF1@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
version

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- obmtool.conf	24 Jul 2005 21:47:41 -0000	1.184
+++ obmtool.conf	26 Jul 2005 01:34:55 -0000	1.185
@@ -132,8 +132,8 @@
     @install ${altloc}clamav-0.86.1-20050624
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20050724
-    @install ${altloc}kolabd-1.9.4-20050723 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20050725
+    @install ${altloc}kolabd-1.9.4-20050725 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-0.4.0-20050724 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-0.3.9-20050719 --define kolab_version=$kolab_version
     @check


From cvs at intevation.de  Tue Jul 26 03:37:59 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 03:38:00 2005
Subject: steffen: server/kolabd/kolabd/templates master.cf.template, 1.11,
	1.11.2.1 
Message-ID: <20050726013759.63E1D101EF1@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	master.cf.template 
Log Message:
backported anvil etc. addition from HEAD

Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- master.cf.template	10 Jun 2005 23:54:37 -0000	1.11
+++ master.cf.template	26 Jul 2005 01:37:57 -0000	1.11.2.1
@@ -26,6 +26,9 @@
 local     unix  -       n       n       -       -       local
 #virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
+anvil     unix  -       -       n       -       1       anvil
+scache    unix  -       -       n       -       1       scache
+tlsmgr    unix  -       -       n       1000?   1       tlsmgr
 #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)
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=/kolab/bin/ifmail -r $nexthop ($recipient)


From cvs at intevation.de  Tue Jul 26 03:50:01 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 03:50:02 2005
Subject: steffen: server/kolabd/kolabd kolabconf,1.2,1.3 
Message-ID: <20050726015001.34A15101EF1@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabconf 
Log Message:
better debug output of multivalued data

Index: kolabconf
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabconf	28 Apr 2005 00:16:59 -0000	1.2
+++ kolabconf	26 Jul 2005 01:49:59 -0000	1.3
@@ -52,7 +52,13 @@
 }
 if ($opt_d) {
     foreach my $key (sort keys %Kolab::config) {
-        print "$key : " . $Kolab::config{$key} . "\n";
+		my $value;
+		if( ref($Kolab::config{$key}) eq "ARRAY" ) {
+			$value = join( ", ", @{$Kolab::config{$key}});
+		} else {
+			$value = $Kolab::config{$key};
+		}
+        print "$key : " . $value . "\n";
     }
     exit 0;
 }


From cvs at intevation.de  Tue Jul 26 12:02:53 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 12:02:55 2005
Subject: bh: server obmtool.conf,1.174.2.4,1.174.2.5 
Message-ID: <20050726100253.B0D22101EFC@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
rearrange the package order so that kolab compiles in one go.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.4
retrieving revision 1.174.2.5
diff -u -d -r1.174.2.4 -r1.174.2.5
--- obmtool.conf	22 Jul 2005 22:59:33 -0000	1.174.2.4
+++ obmtool.conf	26 Jul 2005 10:02:51 -0000	1.174.2.5
@@ -62,9 +62,9 @@
     @install ${loc}perl-ds-5.8.7-2.4.0
     @install ${loc}perl-stats-5.8.7-2.4.0
     @install ${loc}perl-time-5.8.7-2.4.0
+    @install ${loc}perl-util-5.8.7-2.4.0
     @install ${loc}perl-parse-5.8.7-2.4.0
     @install ${loc}perl-sys-5.8.7-2.4.0
-    @install ${loc}perl-util-5.8.7-2.4.0
     @install ${loc}openssl-0.9.7g-2.4.1
     @install ${loc}perl-mail-5.8.7-2.4.0
     @install ${loc}perl-crypto-5.8.7-2.4.0
@@ -77,6 +77,9 @@
     @install ${loc}procmail-3.22-2.4.0
     @install ${loc}db-4.3.28.0-2.4.0
     @install ${altloc}openldap-2.2.27-2.4.0_kolab
+    @install ${loc}m4-1.4.3-2.4.0
+    @install ${loc}bison-2.0-2.4.0
+    @install ${loc}flex-2.5.31-2.4.0
     @install ${loc}groff-1.19.1-2.4.0
     @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
     @install ${loc}getopt-20030307-2.4.0
@@ -87,9 +90,6 @@
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
     @install ${altloc}imapd-2.2.12-2.4.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
-    @install ${loc}m4-1.4.3-2.4.0
-    @install ${loc}bison-2.0-2.4.0
-    @install ${loc}flex-2.5.31-2.4.0
     @install ${loc}libiconv-1.9.2-2.4.0
     @install ${loc}autoconf-2.59-2.4.0
     @install ${loc}automake-1.9.5-2.4.0


From cvs at intevation.de  Tue Jul 26 13:53:48 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Jul 26 13:53:49 2005
Subject: martin: doc/kolab-formats overview.sgml,1.15,1.16 
Message-ID: <20050726115348.2E416100161@lists.intevation.de>

Author: martin

Update of /kolabrepository/doc/kolab-formats
In directory doto:/tmp/cvs-serv18878

Modified Files:
	overview.sgml 
Log Message:
Martin Konold: Added rfc 2119 definitions for keywords


Index: overview.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/overview.sgml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- overview.sgml	7 Oct 2004 16:07:30 -0000	1.15
+++ overview.sgml	26 Jul 2005 11:53:46 -0000	1.16
@@ -6,6 +6,15 @@
 The Kolab storage format is designed to provide a unified
 storage format for several Kolab client implementations.
 
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+"SHOULD", "SHOULD NOT", "MAY", and "OPTIONAL" in this document are to
+be interpreted as described in RFC 2119.
+
+
+
+The word "can" (not "may") is used to refer to a possible
+circumstance or situation, as opposed to an optional facility of this standard
+	    
 Mail structure
 
 Each Kolab object (note, event, contact etc.) is stored in its own email,


From cvs at intevation.de  Wed Jul 27 00:37:24 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Jul 27 00:37:25 2005
Subject: steffen: server obmtool.conf,1.174.2.5,1.174.2.6 
Message-ID: <20050726223724.10CBF1005CD@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
new clamav

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.5
retrieving revision 1.174.2.6
diff -u -d -r1.174.2.5 -r1.174.2.6
--- obmtool.conf	26 Jul 2005 10:02:51 -0000	1.174.2.5
+++ obmtool.conf	26 Jul 2005 22:37:21 -0000	1.174.2.6
@@ -129,7 +129,7 @@
     @install ${loc}spamassassin-3.0.3-2.4.0
     @install ${plusloc}amavisd-2.3.1-2.4.0
     @install ${loc}curl-7.14.0-2.4.0
-    @install ${altloc}clamav-0.86.1-20050624
+    @install ${altloc}clamav-0.86.2-20050726
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-2.0_20050719


From cvs at intevation.de  Wed Jul 27 00:39:04 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Jul 27 00:39:06 2005
Subject: steffen: server obmtool.conf,1.185,1.186 
Message-ID: <20050726223904.88F5C1006C2@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
new clamav

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- obmtool.conf	26 Jul 2005 01:34:55 -0000	1.185
+++ obmtool.conf	26 Jul 2005 22:39:02 -0000	1.186
@@ -129,7 +129,7 @@
     @install ${loc}spamassassin-3.0.3-2.4.0
     @install ${plusloc}amavisd-2.3.1-2.4.0
     @install ${loc}curl-7.14.0-2.4.0
-    @install ${altloc}clamav-0.86.1-20050624
+    @install ${altloc}clamav-0.86.2-20050726
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20050725


From cvs at intevation.de  Wed Jul 27 16:16:38 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Jul 27 16:16:40 2005
Subject: bh: doc/www/src/security kolab-vendor-notice-02.txt,NONE,1.1 
Message-ID: <20050727141638.DB204101EFE@lists.intevation.de>

Author: bh

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

Added Files:
	kolab-vendor-notice-02.txt 
Log Message:
Add security advisory for the clamav buffer overrun and a corresponding
news item


--- NEW FILE: kolab-vendor-notice-02.txt ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Kolab Security Issue 02 20050727
================================

Package:	      Kolab Server
Vulnerability:        buffer overflow, remotely exploitable
Kolab Specific:       no
Dependent Packages:   none


Summary
- -------

The Clam AntiVirus package contains several buffer overflows that can be
exploited remotely.


Affected Versions
- -----------------

This affects all servers which have ClamAV 0.86.1 or earlier versions running.
Kolab Server 2.0 and previous releases of the 2.0 branch are affected.


Fixes
- -----

Upgrade to ClamAV 0.86.2.

A new ClamAV RPM is available from the Kolab download mirrors as the
file security-updates/20050727/clamav-0.86.2-20050726.src.rpm
The mirrors are listed on http://kolab.org/mirrors.html

While the mirrors are catching up, you can also get the package via rsync:
# rsync -tzv rsync://rsync.kolab.org/kolab/server/security-updates/20050727/clamav-0.86.2-20050726.src.rpm .


This package can be installed on your Kolab Server with

# /kolab/bin/openpkg rpm --rebuild clamav-0.86.2-20050726.src.rpm
# /kolab/bin/openpkg rpm \
 -Uvh /kolab/RPM/PKG/clamav-0.86.2-20050726.--kolab.rpm

##optional
# /kolab/bin/freshclam


Details
- -------

http://www.securityfocus.com/bid/14359
	the vulnerabilities present themselves when 
	the ClamAV antivirus library handles malformed files. 

Details of the vulnerability can be found in
http://www.rem0te.com/public/images/clamav.pdf

	At least 4 of its file format processors contain remote security bugs.
	Specifically, during the processing of TNEF, CHM, & FSG 
	formats an attacker is able to trigger several integer overflows 

	These vulnerabilities can be reached by default 
	and triggered without user interaction 
	by sending an e-mail containing crafted data.


Timeline
- --------
    20050725 clamav vulnerability published by rem0te
    20050727 kolab update and security advisory published
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFC55W50vCiU5+ISsgRAuRRAJwPMHzzXu0FwB9GeEv6kq3WOBqvdwCeLKot
d85iJsTD7wjyY+ebkIzklQk=
=NPAR
-----END PGP SIGNATURE-----


From cvs at intevation.de  Wed Jul 27 16:16:38 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Jul 27 16:16:43 2005
Subject: bh: doc/www/src index.html.m4,1.59,1.60 
Message-ID: <20050727141638.EEA26101F1A@lists.intevation.de>

Author: bh

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

Modified Files:
	index.html.m4 
Log Message:
Add security advisory for the clamav buffer overrun and a corresponding
news item


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- index.html.m4	24 Jun 2005 16:37:16 -0000	1.59
+++ index.html.m4	27 Jul 2005 14:16:36 -0000	1.60
@@ -37,6 +37,25 @@
  

 
 
+
+
+
July 27th, 2005»
+	Security Advisory for Kolab Server
+

+

+	The Clam AntiVirus package contains several buffer overflows
+	that can be exploited remotely.  A new ClamAV RPM with a fix is
+	available.  See
+	the Kolab Security
+	Advisory 02 for details.
+

+

+
+
+
+
 
+
+';
 		}
@@ -165,15 +165,15 @@
 		$str .= '';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '';
+		  $str .= '';
 		} else {
 		  $str .= '';
@@ -185,10 +185,10 @@
 		$str .= '';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  if( $value['user'] ) $str .= '';
+		  if( $value['user'] ) $str .= '';
 		} else {
 		  $str .= ''."\n";
+			else $str .= '
'.MySmarty::htmlentities($user).'
';
+			$str .= ''."\n";
 		  } else {
 			$str .= '';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '';
+		  $str .= '';
 		} else {
-		  $str .= '';
+		  $str .= '';
 		}
 		$str .= '';
 		$str .= ''."\n";
@@ -102,9 +102,9 @@
 		$str .= '';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '';
+		  $str .= '';
 		} else {
-		  $str .= '';
+		  $str .= '';
 		}
 		$str .= '';
 		$str .= ''."\n";
@@ -124,15 +124,15 @@
 		$str .= '';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '';
+		  $str .= '';
 		} else {
 		  $str .= '';
@@ -144,10 +144,10 @@
 		$str .= '';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  if( $value['user'] ) $str .= '';
+		  if( $value['user'] ) $str .= '';
 		} else {
 		  $str .= ''."\n";
+			else $str .= '
'.MySmarty::htmlentities($user).'
';
+			$str .= ''."\n";
 		  } else {
 			$str .= '
 	{else}
-	   
-	   
+	   
+	   
 	{/if}
 	
 {/section}


From cvs at intevation.de  Thu Sep  1 00:04:59 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Sep  1 00:05:00 2005
Subject: steffen: server obmtool.conf,1.190,1.191 
Message-ID: <20050831220459.72FBD1005AD@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
versions

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- obmtool.conf	31 Aug 2005 01:55:58 -0000	1.190
+++ obmtool.conf	31 Aug 2005 22:04:57 -0000	1.191
@@ -134,7 +134,7 @@
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20050728
     @install ${altloc}kolabd-2.0.0-20050729 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-0.4.9-20050831 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-0.4.9-20050901 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-0.4.1-20050830 --define kolab_version=$kolab_version
     @check
 


From cvs at intevation.de  Sat Sep  3 02:19:49 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Sep  3 02:19:50 2005
Subject: steffen: server/apache Makefile, 1.16.2.1, 1.16.2.2 kolab.patch,
	1.5.2.1, 1.5.2.2 
Message-ID: <20050903001949.BBF43101EEE@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
updated apache

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- Makefile	19 Jul 2005 21:00:59 -0000	1.16.2.1
+++ Makefile	3 Sep 2005 00:19:47 -0000	1.16.2.2
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,7 +10,7 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.4.0
+RELEASE=2.4.1
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- kolab.patch	19 Jul 2005 21:00:59 -0000	1.5.2.1
+++ kolab.patch	3 Sep 2005 00:19:47 -0000	1.5.2.2
@@ -4,19 +4,19 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.4.0
-+Release:      2.4.0_kolab
+-Release:      2.4.1
++Release:      2.4.1_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -213,6 +213,10 @@ Patch0:       apache.patch
- Patch1:       apache.patch.modowa
+@@ -214,6 +214,10 @@ Patch0:       apache.patch
  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
+ Patch4:       apache.patch.modssl
++Patch5:       mod_auth_ldap.patch
++Patch6:       php-getacl-backport.patch
++Patch7:       php-imap-annotation.patch
++Patch8:       php-imap-status-current.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -24,9 +24,9 @@
  %if "%{with_mod_php_hardened}" == "yes"
        %patch -p1 -P 3
  %endif
-+     %patch -p1 -P 5
 +     %patch -p1 -P 6
-+     %patch -p0 -P 7
++     %patch -p1 -P 7
++     %patch -p0 -P 8
      ) || exit $?
  %endif
  %if "%{with_mod_dav}" == "yes"
@@ -34,7 +34,7 @@
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14
-+    %patch -p0 -P 4
++    %patch -p0 -P 5
  %endif
  %if "%{with_mod_auth_radius}" == "yes"
      %setup -q -T -D -a 15


From cvs at intevation.de  Sat Sep  3 02:21:06 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Sep  3 02:21:08 2005
Subject: steffen: server obmtool.conf,1.174.2.11,1.174.2.12 
Message-ID: <20050903002106.F03D6101EEF@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
versions

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.11
retrieving revision 1.174.2.12
diff -u -d -r1.174.2.11 -r1.174.2.12
--- obmtool.conf	31 Aug 2005 01:55:34 -0000	1.174.2.11
+++ obmtool.conf	3 Sep 2005 00:21:04 -0000	1.174.2.12
@@ -15,7 +15,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.0.1-snapshot-20050831";
+    kolab_version="pre-2.0.1-snapshot-20050902";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -100,7 +100,7 @@
     @install ${loc}sed-4.1.4-2.4.0
     @install ${loc}libxml-2.6.19-2.4.0
     @install ${loc}libxslt-1.1.14-2.4.0 # WARNING: Remove libgcrypt before building!
-    @install ${altloc}apache-1.3.33-2.4.0_kolab \
+    @install ${altloc}apache-1.3.33-2.4.1_kolab \
         --with=mod_auth_ldap \
         --with=mod_dav \
         --with=mod_php \


From cvs at intevation.de  Sat Sep  3 02:49:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Sat Sep  3 02:49:37 2005
Subject: steffen: server obmtool.conf,1.191,1.192 
Message-ID: <20050903004936.086D3101EEE@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
versions

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- obmtool.conf	31 Aug 2005 22:04:57 -0000	1.191
+++ obmtool.conf	3 Sep 2005 00:49:34 -0000	1.192
@@ -15,7 +15,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.1-snapshot-20050831";
+    kolab_version="pre-2.1-snapshot-20050902";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -100,7 +100,7 @@
     @install ${loc}sed-4.1.4-2.4.0
     @install ${loc}libxml-2.6.19-2.4.0
     @install ${loc}libxslt-1.1.14-2.4.0 # WARNING: Remove libgcrypt before building!
-    @install ${altloc}apache-1.3.33-2.4.0_kolab \
+    @install ${altloc}apache-1.3.33-2.4.1_kolab \
         --with=mod_auth_ldap \
         --with=mod_dav \
         --with=mod_php \


From cvs at intevation.de  Wed Sep  7 04:28:40 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Sep  7 04:28:42 2005
Subject: steffen: server obmtool.conf,1.192,1.193 
Message-ID: <20050907022840.D4FC81006D7@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
security updates

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- obmtool.conf	3 Sep 2005 00:49:34 -0000	1.192
+++ obmtool.conf	7 Sep 2005 02:28:38 -0000	1.193
@@ -51,7 +51,7 @@
     @install ${loc}sharutils-4.3.80-2.4.0
     @install ${loc}ncurses-5.4.20050611-2.4.0
     @install ${loc}bzip2-1.0.3-2.4.0
-    @install ${loc}pcre-6.0-2.4.0
+    @install ${loc}pcre-6.0-2.4.1
     @install ${loc}grep-2.5.1a-2.4.0
     @install ${loc}texinfo-4.8-2.4.0
     @install ${loc}diffutils-2.8.7-2.4.0
@@ -83,7 +83,7 @@
     @install ${loc}groff-1.19.1-2.4.0
     @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
     @install ${loc}getopt-20030307-2.4.0
-    @install ${loc}proftpd-1.3.0rc1-2.4.0 --with=ldap
+    @install ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
     @install ${loc}gdbm-1.8.3-2.4.0
     @install ${plusloc}dbtool-1.6-2.4.0
     @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl


From cvs at intevation.de  Wed Sep  7 04:28:40 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Sep  7 04:28:44 2005
Subject: steffen: server/apache Makefile,1.17,1.18 kolab.patch,1.6,1.7 
Message-ID: <20050907022840.D64C31006D9@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
security updates

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	22 Jul 2005 22:36:14 -0000	1.17
+++ Makefile	7 Sep 2005 02:28:38 -0000	1.18
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/UPD
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,7 +10,7 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.4.0
+RELEASE=2.4.1
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab.patch	22 Jul 2005 22:36:14 -0000	1.6
+++ kolab.patch	7 Sep 2005 02:28:38 -0000	1.7
@@ -4,19 +4,19 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.4.0
-+Release:      2.4.0_kolab
+-Release:      2.4.1
++Release:      2.4.1_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -213,6 +213,10 @@ Patch0:       apache.patch
- Patch1:       apache.patch.modowa
+@@ -212,6 +212,10 @@ Patch0:       apache.patch
  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
+ Patch4:       apache.patch.modssl
++Patch5:       mod_auth_ldap.patch
++Patch6:       php-getacl-backport.patch
++Patch7:       php-imap-annotation.patch
++Patch8:       php-imap-status-current.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -24,9 +24,9 @@
  %if "%{with_mod_php_hardened}" == "yes"
        %patch -p1 -P 3
  %endif
-+     %patch -p1 -P 5
 +     %patch -p1 -P 6
-+     %patch -p0 -P 7
++     %patch -p1 -P 7
++     %patch -p0 -P 8
      ) || exit $?
  %endif
  %if "%{with_mod_dav}" == "yes"
@@ -34,7 +34,7 @@
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14
-+    %patch -p0 -P 4
++    %patch -p0 -P 5
  %endif
  %if "%{with_mod_auth_radius}" == "yes"
      %setup -q -T -D -a 15


From cvs at intevation.de  Wed Sep  7 04:30:49 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Sep  7 04:30:50 2005
Subject: steffen: server obmtool.conf,1.193,1.194 
Message-ID: <20050907023049.B2E9D1006D9@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
version

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- obmtool.conf	7 Sep 2005 02:28:38 -0000	1.193
+++ obmtool.conf	7 Sep 2005 02:30:47 -0000	1.194
@@ -15,7 +15,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.1-snapshot-20050902";
+    kolab_version="pre-2.1-snapshot-20050906";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'


From cvs at intevation.de  Wed Sep  7 04:31:07 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Sep  7 04:31:08 2005
Subject: steffen: server obmtool.conf,1.174.2.12,1.174.2.13 
Message-ID: <20050907023107.8779F1006DF@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
security updates

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.12
retrieving revision 1.174.2.13
diff -u -d -r1.174.2.12 -r1.174.2.13
--- obmtool.conf	3 Sep 2005 00:21:04 -0000	1.174.2.12
+++ obmtool.conf	7 Sep 2005 02:31:05 -0000	1.174.2.13
@@ -15,7 +15,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.0.1-snapshot-20050902";
+    kolab_version="pre-2.0.1-snapshot-20050906";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -51,7 +51,7 @@
     @install ${loc}sharutils-4.3.80-2.4.0
     @install ${loc}ncurses-5.4.20050611-2.4.0
     @install ${loc}bzip2-1.0.3-2.4.0
-    @install ${loc}pcre-6.0-2.4.0
+    @install ${loc}pcre-6.0-2.4.1
     @install ${loc}grep-2.5.1a-2.4.0
     @install ${loc}texinfo-4.8-2.4.0
     @install ${loc}diffutils-2.8.7-2.4.0
@@ -83,7 +83,7 @@
     @install ${loc}groff-1.19.1-2.4.0
     @install ${loc}sasl-2.1.21-2.4.0 --with=ldap --with=login
     @install ${loc}getopt-20030307-2.4.0
-    @install ${loc}proftpd-1.3.0rc1-2.4.0 --with=ldap
+    @install ${loc}proftpd-1.3.0rc1-2.4.1 --with=ldap
     @install ${loc}gdbm-1.8.3-2.4.0
     @install ${plusloc}dbtool-1.6-2.4.0
     @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl


From cvs at intevation.de  Fri Sep  9 18:40:11 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Sep  9 18:40:12 2005
Subject: thomas: doc/raw-howtos email-split-setup.txt,1.1,1.2 
Message-ID: <20050909164011.914601006D7@lists.intevation.de>

Author: thomas

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

Modified Files:
	email-split-setup.txt 
Log Message:
Small spacing/wrapping/syntax fixes.


Index: email-split-setup.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/email-split-setup.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- email-split-setup.txt	15 Aug 2005 13:44:23 -0000	1.1
+++ email-split-setup.txt	9 Sep 2005 16:40:09 -0000	1.2
@@ -9,21 +9,21 @@
      Interesting for tests and gradual migration.
 
 Flow of emails:
-	
+
    Incoming -------->    Other MTA  -------->  Outgoing
                            |    ^
            (optional:    <-+    |
             keep a copy)   |    |
-	                   |    |
+                           |    |
                            v    |
                         Kolab Server
 
-What to do when you have an mail transport agent (MTA) 
-which feels responsible for real.example.com 
+What to do when you have an mail transport agent (MTA)
+which feels responsible for real.example.com
 and want to have _some_ users on the Kolab Server?
 
 Make the MTA (e.g. exchange) rewrite the envelope addresses to
-@tokolab.real.example.com and fowarded it to the Kolab Server.
+@tokolab.real.example.com and forwarded it to the Kolab Server.
 Optionally you can keep a copy on this MTA as a backup.
 
 The email arrives at the Kolab Server.
@@ -36,22 +36,21 @@
         @tokolab.example.com @real.example.com
 
 To accept emails within example.com though they are not on the server,
-we need to switch of the check for unlisted recipients.
-Do not set local_recipient_maps and 
+we need to switch off the check for unlisted recipients.
+Do not set local_recipient_maps and
 Remove "reject_unlisted_recipient," from smtpd_recipient_restrictions:
 
    main.cf
-	local_recipient_maps =
+        local_recipient_maps =
 
-	smtpd_recipient_restrictions = permit_mynetworks,
-			permit_sasl_authenticated, 
-			reject_unauth_destination, 
-			check_policy_service unix:private/kolabpolicy
+        smtpd_recipient_restrictions = permit_mynetworks,
+                        permit_sasl_authenticated,
+                        reject_unauth_destination,
+                        check_policy_service unix:private/kolabpolicy
 
 
-Next it must be decided 
-whether to keep the email because the user is on this server
-or to send it back to the other MTA.
+Next it must be decided whether to keep the email because the user is
+on this server or to send it back to the other MTA.
 Postfix can do an ldap request to determine the transportation path.
 
 More main.cf settings (use template):
@@ -72,6 +71,6 @@
     ldapkolabmailboxfilter_version = 3
 
 and /kolab/etc/postfix/transport (use template):
-    real.example.com     smtp:[outgoingsmptserver]
+    real.example.com     smtp:[outgoingsmtpserver]
 
-Note the interesting query_filter to exclude the external addressbook.
+Note the interesting query_filter to exclude the external address book.


From cvs at intevation.de  Fri Sep  9 18:41:05 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Sep  9 18:41:07 2005
Subject: thomas: doc/raw-howtos email-split-setup.txt,1.2,1.3 
Message-ID: <20050909164105.F21E5101EE2@lists.intevation.de>

Author: thomas

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

Modified Files:
	email-split-setup.txt 
Log Message:
Replaced real.example.com with example.com


Index: email-split-setup.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/email-split-setup.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- email-split-setup.txt	9 Sep 2005 16:40:09 -0000	1.2
+++ email-split-setup.txt	9 Sep 2005 16:41:03 -0000	1.3
@@ -19,11 +19,11 @@
                         Kolab Server
 
 What to do when you have an mail transport agent (MTA)
-which feels responsible for real.example.com
+which feels responsible for example.com
 and want to have _some_ users on the Kolab Server?
 
 Make the MTA (e.g. exchange) rewrite the envelope addresses to
-@tokolab.real.example.com and forwarded it to the Kolab Server.
+@tokolab.example.com and forwarded it to the Kolab Server.
 Optionally you can keep a copy on this MTA as a backup.
 
 The email arrives at the Kolab Server.
@@ -33,7 +33,7 @@
         virtual_maps = hash:/kolab/etc/postfix/virtual, ldap:ldapdistlist, ldap:ldapvirtual
 
    in /kolab/etc/postfix/virtual (use the template to make the change):
-        @tokolab.example.com @real.example.com
+        @tokolab.example.com @example.com
 
 To accept emails within example.com though they are not on the server,
 we need to switch off the check for unlisted recipients.
@@ -71,6 +71,6 @@
     ldapkolabmailboxfilter_version = 3
 
 and /kolab/etc/postfix/transport (use template):
-    real.example.com     smtp:[outgoingsmtpserver]
+    example.com     smtp:[outgoingsmtpserver]
 
 Note the interesting query_filter to exclude the external address book.


From cvs at intevation.de  Fri Sep  9 19:20:39 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Sep  9 19:20:40 2005
Subject: thomas: doc/raw-howtos mutts_for_kolab.txt,1.6,1.7 
Message-ID: <20050909172039.8DFD51006D2@lists.intevation.de>

Author: thomas

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

Modified Files:
	mutts_for_kolab.txt 
Log Message:
Added hint on ssl_ca_certificates_file setting.


Index: mutts_for_kolab.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/mutts_for_kolab.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mutts_for_kolab.txt	5 Feb 2004 10:02:55 -0000	1.6
+++ mutts_for_kolab.txt	9 Sep 2005 17:20:37 -0000	1.7
@@ -49,7 +49,11 @@
 set folder=imap://kroupware.kroupware-net/
 set mail_check=120
 
-You might be prompted to accept the SSL certificate of the server.
+You might be prompted to accept the SSL certificate of the server, or you
+can put the server certificates in a file and point your muttrc to it, e.g.:
+
+set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
+
 To access the imap subfolder, use the mutt internal filetree browser:
 Press "c" for 'change-dir' and TAB to get the list.
 


From cvs at intevation.de  Mon Sep 12 21:56:11 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Sep 12 21:56:13 2005
Subject: steffen: server/perl-kolab perl-kolab.spec,1.91.2.3,1.91.2.4 
Message-ID: <20050912195611.D993C101EE3@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	perl-kolab.spec 
Log Message:
Fix for Issue885 (shared folder domain-part problem)

Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Attic/perl-kolab.spec,v
retrieving revision 1.91.2.3
retrieving revision 1.91.2.4
diff -u -d -r1.91.2.3 -r1.91.2.4
--- perl-kolab.spec	28 Jul 2005 02:46:34 -0000	1.91.2.3
+++ perl-kolab.spec	12 Sep 2005 19:56:09 -0000	1.91.2.4
@@ -48,7 +48,7 @@
 Group:        Language
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      2.0_20050727
+Release:      2.0_20050912
 
 #   list of sources
 Source0:      http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz


From cvs at intevation.de  Mon Sep 12 21:56:11 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Sep 12 21:56:15 2005
Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.31.2.3,1.31.2.4 
Message-ID: <20050912195611.DEB36101EE6@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv11069/Kolab-LDAP

Modified Files:
      Tag: kolab_2_0_branch
	LDAP.pm 
Log Message:
Fix for Issue885 (shared folder domain-part problem)

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -d -r1.31.2.3 -r1.31.2.4
--- LDAP.pm	28 Jul 2005 01:52:48 -0000	1.31.2.3
+++ LDAP.pm	12 Sep 2005 19:56:09 -0000	1.31.2.4
@@ -261,13 +261,8 @@
 
    if( $p eq 'sf' ) {
      # We have to create shared folders
-     # with names user.@
-     my @dcs = split(/,/,$object->dn());
-     my @dn;
-     while( pop( @dcs ) =~ /dc=(.*)/ ) {
-       push(@dn, $1);
-     }
-     if( $#dn > 0 ) { $uid .= '@'.join('.',reverse(@dn)); }
+     # with names shared.@
+     $uid .= '@'.$Kolab::config{'postfix-mydomain'};
    }
     if (!$uid) {
         Kolab::log('L', "Kolab::LDAP::createObject() called with null id attribute `$objuidfield', returning", KOLAB_DEBUG);


From cvs at intevation.de  Mon Sep 12 22:10:02 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Sep 12 22:10:03 2005
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	index.php, 1.7, 1.8 
Message-ID: <20050912201002.7A2E3101EE3@lists.intevation.de>

Author: martin

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

Modified Files:
	index.php 
Log Message:
Martin K.: Patch for correctness with PHP from Andreas Hasenack 


Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index.php	28 Jul 2005 02:14:38 -0000	1.7
+++ index.php	12 Sep 2005 20:10:00 -0000	1.8
@@ -116,7 +116,7 @@
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
-$smarty->assign( 'self_url', $PHP_SELF );
+$smarty->assign( 'self_url', $_SERVER['PHP_SELF'] );
 
 $smarty->assign( 'filterattrs', array( 'cn'   => _('Name'),
 									   'mail' => _('Email') ) );


From cvs at intevation.de  Mon Sep 12 22:10:02 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Sep 12 22:10:04 2005
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/user
	index.php, 1.13, 1.14 
Message-ID: <20050912201002.7D2B5101EE6@lists.intevation.de>

Author: martin

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

Modified Files:
	index.php 
Log Message:
Martin K.: Patch for correctness with PHP from Andreas Hasenack 


Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- index.php	5 Jul 2005 10:31:51 -0000	1.13
+++ index.php	12 Sep 2005 20:10:00 -0000	1.14
@@ -1,7 +1,6 @@
 
  *
@@ -164,7 +163,7 @@
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );
 $smarty->assign( 'page_title', $menuitems[$sidx]['title'] );
-$smarty->assign( 'self_url', $PHP_SELF );
+$smarty->assign( 'self_url', $_SERVER['PHP_SELF'] );
 
 $smarty->assign( 'filterattrs', array( 'cn'   => _('Name'),
 									   'mail' => _('Email'),


From cvs at intevation.de  Mon Sep 12 22:49:46 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Sep 12 22:49:47 2005
Subject: martin: server/kolabd/kolabd/templates slapd.conf.template, 1.15,
	1.16 
Message-ID: <20050912204946.8642A101EEB@lists.intevation.de>

Author: martin

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

Modified Files:
	slapd.conf.template 
Log Message:
Martin Konold: Work around a bug in some versions of mod_auth_ldap by increasing idle timeout


Index: slapd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- slapd.conf.template	29 Jul 2005 02:15:52 -0000	1.15
+++ slapd.conf.template	12 Sep 2005 20:49:44 -0000	1.16
@@ -48,7 +48,7 @@
 cachesize       2000
 checkpoint 	512 10
 idlcachesize    10000
-idletimeout     10 # The value can be increased if some clients develop problems.
+idletimeout     80 # 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@@@"


From cvs at intevation.de  Tue Sep 13 00:14:15 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 00:14:16 2005
Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.55.2.1,1.55.2.2 
Message-ID: <20050912221415.5258A101EFE@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv14973/Kolab-Conf

Modified Files:
      Tag: kolab_2_0_branch
	Conf.pm 
Log Message:
Prevent creation of mailboxes for external users

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -u -d -r1.55.2.1 -r1.55.2.2
--- Conf.pm	19 Jul 2005 01:32:39 -0000	1.55.2.1
+++ Conf.pm	12 Sep 2005 22:14:13 -0000	1.55.2.2
@@ -295,7 +295,7 @@
         $Kolab::haschanged{'postfix'} = 1;
     }
 
-    Kolab::log('T', 'Finished building Postfix $map map', KOLAB_DEBUG);
+    Kolab::log('T', "Finished building Postfix $map map", KOLAB_DEBUG);
 }
 
 sub buildCyrusConfig


From cvs at intevation.de  Tue Sep 13 00:14:15 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 00:14:17 2005
Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.31.2.4,1.31.2.5 
Message-ID: <20050912221415.55CAD101EFF@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP
In directory doto:/tmp/cvs-serv14973/Kolab-LDAP

Modified Files:
      Tag: kolab_2_0_branch
	LDAP.pm 
Log Message:
Prevent creation of mailboxes for external users

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v
retrieving revision 1.31.2.4
retrieving revision 1.31.2.5
diff -u -d -r1.31.2.4 -r1.31.2.5
--- LDAP.pm	12 Sep 2005 19:56:09 -0000	1.31.2.4
+++ LDAP.pm	12 Sep 2005 22:14:13 -0000	1.31.2.5
@@ -234,6 +234,7 @@
     my $p = shift || 'user';
     my $doacls = shift || 0;
     my $objuidfield = shift || ($p eq 'user' ? 'mail' : ($p eq 'sf' ? 'cn' : ''));
+    my $is_external = ($object->dn =~ /.*,cn=external,$Kolab::config{'base_dn'}/);
 
     Kolab::log('L', "Kolab::LDAP::createObject() called with obj uid field `$objuidfield' for obj type `$p'", KOLAB_DEBUG);
 
@@ -302,10 +303,12 @@
             Kolab::log('L', "Creating user `$uid' corresponding to GUID `$guid'", KOLAB_DEBUG);
             # We have a object that we have no previous record of, so create everything
             if ($sync) { $newuid_db{$guid} = $uid; } else { $uid_db{$guid} = $uid; }
-            Kolab::Cyrus::createMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
-	    if( $p ne 'sf' && !$islocal ) {
-	      # Hide user mailboxes on other servers
-	      Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rswipcda"]);
+	    if( !$is_external ) {
+	      Kolab::Cyrus::createMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
+	      if( $p ne 'sf' && !$islocal ) {
+		# Hide user mailboxes on other servers
+		Kolab::Cyrus::setACL($cyrus,$uid,0, ["$uid rswipcda"]);
+	      }
 	    }
 #	    if( $p ne 'sf' ) {
 #	      # Create FB dir for user
@@ -317,14 +320,15 @@
         }
     }
 
-    if ($doacls) {
+    if( !$is_external ) {
+      if ($doacls) {
         my $acls = $object->get_value('acl', 'asref' => 1);
         Kolab::Cyrus::setACL($cyrus, $uid, ($p eq 'sf' ? 1 : 0), mapAcls( $acls, ($p eq 'sf' ? 1:0)));
+      }
+      my $quota = $object->get_value($Kolab::config{$p . '_field_quota'});
+      defined($quota) or ($quota = 0);
+      Kolab::Cyrus::setQuota($cyrus, $uid, $quota*1024, ($p eq 'sf' ? 1 : 0));
     }
-
-    my $quota = $object->get_value($Kolab::config{$p . '_field_quota'});
-    defined($quota) or ($quota = 0);
-    Kolab::Cyrus::setQuota($cyrus, $uid, $quota*1024, ($p eq 'sf' ? 1 : 0));
 }
 
 sub createMasterLDAP {
@@ -364,6 +368,7 @@
     my $object = shift;
     my $remfromldap = shift || 0;
     my $p = shift || 'user';
+    my $is_external = ($object->dn =~ /.*,cn=external,$Kolab::config{'base_dn'}/);
 
     if ($remfromldap) {
         my $dn = $object->dn;
@@ -455,7 +460,9 @@
 
     Kolab::DirServ::genericRequest($object, "remove alias") if $p eq 'user';
 
-    Kolab::Cyrus::deleteMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
+    if( !$is_external ) {
+      Kolab::Cyrus::deleteMailbox($cyrus, $uid, ($p eq 'sf' ? 1 : 0));
+    }
 #    if( $p ne 'sf' ) {
 #      # Create FB dir for user
 #      my $fbdir = $Kolab::config{'prefix'}.'/var/kolab/www/freebusy/'.$uid;


From cvs at intevation.de  Tue Sep 13 00:43:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 00:43:37 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.126.2.4, 1.126.2.5 
Message-ID: <20050912224336.00CF1101F07@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolab-resource-handlers.spec 
Log Message:
Missed this one for Issue666 -- the bug of the beast...

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.126.2.4
retrieving revision 1.126.2.5
diff -u -d -r1.126.2.4 -r1.126.2.5
--- kolab-resource-handlers.spec	31 Aug 2005 01:55:34 -0000	1.126.2.4
+++ kolab-resource-handlers.spec	12 Sep 2005 22:43:33 -0000	1.126.2.5
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050830
+Release:	20050912
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Tue Sep 13 00:43:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 00:43:38 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
	day.php, 1.4.2.1, 1.4.2.2 
Message-ID: <20050912224336.080CE101F09@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv15495/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView

Modified Files:
      Tag: kolab_2_0_branch
	day.php 
Log Message:
Missed this one for Issue666 -- the bug of the beast...

Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- day.php	29 Aug 2005 23:53:19 -0000	1.4.2.1
+++ day.php	12 Sep 2005 22:43:33 -0000	1.4.2.2
@@ -56,8 +56,8 @@
             $right = 100;
             $width = $right - $left;
 
-            $template->set('left', $left);
-            $template->set('width', $width);
+            $template->set('left', sprintf("%F", $left));
+            $template->set('width', sprintf("%F", $width));
             $template->set('top', $count++ * 15);
             $template->set('label', _("Unknown"));
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -66,8 +66,8 @@
             $right = min(100, 100 * (($member->getStart() - $this->_startStamp) / ($this->_endStamp - $this->_startStamp)));
             $width = $right - $left;
 
-            $template->set('left', $left);
-            $template->set('width', $width);
+            $template->set('left', sprintf("%F", $left));
+            $template->set('width', sprintf("%F", $width));
             $template->set('top', $count++ * 15);
             $template->set('label', _("Unknown"));
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');


From cvs at intevation.de  Tue Sep 13 00:46:14 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 00:46:14 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
	day.php, 1.5, 1.6 
Message-ID: <20050912224614.2A060101F0A@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv15584/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView

Modified Files:
	day.php 
Log Message:
Fix for issue666 (fbview)

Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- day.php	29 Aug 2005 23:52:34 -0000	1.5
+++ day.php	12 Sep 2005 22:46:12 -0000	1.6
@@ -56,8 +56,8 @@
             $right = 100;
             $width = $right - $left;
 
-            $template->set('left', $left);
-            $template->set('width', $width);
+            $template->set('left', sprintf("%F", $left));
+            $template->set('width', sprintf("%F", $width));
             $template->set('top', $count++ * 15);
             $template->set('label', _("Unknown"));
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -66,8 +66,8 @@
             $right = min(100, 100 * (($member->getStart() - $this->_startStamp) / ($this->_endStamp - $this->_startStamp)));
             $width = $right - $left;
 
-            $template->set('left', $left);
-            $template->set('width', $width);
+            $template->set('left', sprintf("%F", $left));
+            $template->set('width', sprintf("%F", $width));
             $template->set('top', $count++ * 15);
             $template->set('label', _("Unknown"));
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');


From cvs at intevation.de  Tue Sep 13 00:46:14 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 00:46:16 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.132, 1.133 
Message-ID: <20050912224614.274B3101F09@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab-resource-handlers.spec 
Log Message:
Fix for issue666 (fbview)

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- kolab-resource-handlers.spec	31 Aug 2005 01:55:58 -0000	1.132
+++ kolab-resource-handlers.spec	12 Sep 2005 22:46:12 -0000	1.133
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050830
+Release:	20050912
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Tue Sep 13 01:04:03 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 01:04:04 2005
Subject: steffen: server obmtool.conf,1.174.2.13,1.174.2.14 
Message-ID: <20050912230403.8649F101F09@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
versions, new packages uploaded...

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.13
retrieving revision 1.174.2.14
diff -u -d -r1.174.2.13 -r1.174.2.14
--- obmtool.conf	7 Sep 2005 02:31:05 -0000	1.174.2.13
+++ obmtool.conf	12 Sep 2005 23:04:01 -0000	1.174.2.14
@@ -15,7 +15,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.0.1-snapshot-20050906";
+    kolab_version="pre-2.0.1-snapshot-20050912";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -132,10 +132,10 @@
     @install ${altloc}clamav-0.86.2-20050726
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-2.0_20050727
+    @install ${altloc}perl-kolab-5.8.7-2.0_20050912
     @install ${altloc}kolabd-1.9.4-20050801 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-0.4.0-20050831 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20050830 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.3.9-20050912 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then


From cvs at intevation.de  Tue Sep 13 15:47:37 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 15:47:38 2005
Subject: steffen: server/kolabd/kolabd/dist_conf - New directory 
Message-ID: <20050913134737.3F7D7101F17@lists.intevation.de>

Author: steffen

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

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



From cvs at intevation.de  Tue Sep 13 16:38:24 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 16:38:26 2005
Subject: steffen: server/kolabd Makefile, 1.5, 1.6 kolabd.spec, 1.69,
	NONE rc.kolabd, 1.3, NONE 
Message-ID: <20050913143824.255591005BB@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Removed Files:
	kolabd.spec rc.kolabd 
Log Message:
kolabd autoconfiscated!

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	28 Jul 2005 02:14:38 -0000	1.5
+++ Makefile	13 Sep 2005 14:38:22 -0000	1.6
@@ -1,18 +1,18 @@
 RPM = /kolab/bin/openpkg rpm
-VERSION = 2.0.0
+RPMNAME=kolabd
 
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 
+VERSION:=`grep 'm4_define(_VERSION' $(PWD)/$(RPMNAME)/configure.ac|sed 's/m4_define(_VERSION,\(.*\))/\1/'`
+
 all:
-	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 --define 'kolab_version CVS'
+	test -d $(KOLABRPMSRC)/$(RPMNAME) || mkdir $(KOLABRPMSRC)/$(RPMNAME)
+	cd $(RPMNAME) && ./bootstrap && ./configure --prefix=/kolab --enable-dist=kolab \
+		&& make dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME)
+	cp $(RPMNAME)/$(RPMNAME).spec $(KOLABRPMSRC)/$(RPMNAME)/
+	cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec --define 'kolab_version CVS'
 binary:
-	$(RPM) -bB kolabd.spec
+	$(RPM) -bB $(RPMNAME).spec
 
-release:
-	cd kolabd && tar -cvz --exclude=CVS --exclude=\*~ -f ../kolabd-$(VERSION).tar.gz *
-	$(RPM) -ba kolabd.spec

--- kolabd.spec DELETED ---

--- rc.kolabd DELETED ---


From cvs at intevation.de  Tue Sep 13 16:38:24 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 16:38:28 2005
Subject: steffen: server/kolabd/kolabd Makefile.am, NONE, 1.1 Makefile.in,
	NONE, 1.1 bootstrap, NONE, 1.1 configure.ac, NONE,
	1.1 kolab.in, NONE, 1.1 kolab_bootstrap.in, NONE,
	1.1 kolab_ca.sh.in, NONE, 1.1 kolab_smtpdpolicy.in, NONE,
	1.1 kolab_sslcert.sh.in, NONE, 1.1 kolabcheckperm.in, NONE,
	1.1 kolabconf.in, NONE, 1.1 kolabd.in, NONE,
	1.1 kolabd.spec.in, NONE, 1.1 kolabpasswd.in, NONE,
	1.1 kolabquotawarn.in, NONE, 1.1 rc.kolabd.in, NONE,
	1.1 workaround.sh.in, NONE, 1.1 kolab, 1.1.1.1,
	NONE kolab_bootstrap, 1.18, NONE kolab_ca.sh, 1.1.1.1,
	NONE kolab_smtpdpolicy, 1.6, NONE kolab_sslcert.sh, 1.1.1.1,
	NONE kolabcheckperm, 1.1, NONE kolabconf, 1.3, NONE kolabd,
	1.2, NONE kolabpasswd, 1.7, NONE kolabquotawarn, 1.5,
	NONE workaround.sh, 1.1.1.1, NONE 
Message-ID: <20050913143824.31E33101F17@lists.intevation.de>

Author: steffen

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

Added Files:
	Makefile.am Makefile.in bootstrap configure.ac kolab.in 
	kolab_bootstrap.in kolab_ca.sh.in kolab_smtpdpolicy.in 
	kolab_sslcert.sh.in kolabcheckperm.in kolabconf.in kolabd.in 
	kolabd.spec.in kolabpasswd.in kolabquotawarn.in rc.kolabd.in 
	workaround.sh.in 
Removed Files:
	kolab kolab_bootstrap kolab_ca.sh kolab_smtpdpolicy 
	kolab_sslcert.sh kolabcheckperm kolabconf kolabd kolabpasswd 
	kolabquotawarn workaround.sh 
Log Message:
kolabd autoconfiscated!

--- NEW FILE: Makefile.am ---
EXTRA_DIST = 
CLEANFILES =

@distribution@
@common@

noinst_HEADERS = @PACKAGE@.spec

# is sometimes used in this file
kolabconfdir = $(sysconfdir)/kolab

kolabdir = $(sysconfdir)/kolab
dist_kolab_SCRIPTS = \
	kolab_sslcert.sh \
	kolab_ca.sh \
	kolab kolab_bootstrap \
	workaround.sh \
	kolabquotawarn \
	kolab_smtpdpolicy 


kolabconfig_FILES = kolab.conf \
	kolab.globals \
	rootDSE.ldif \
	quotawarning.txt

kolabconfigdir = $(kolabconfdir)
dist_kolabconfig_DATA = $(kolabconfig_FILES)


kolabtemplate_FILES = templates/amavisd.conf.template \
	templates/clamd.conf.template \
	templates/cyrus.conf.template \
	templates/DB_CONFIG.slapd.template \
	templates/fbview.conf.template \
	templates/freebusy.conf.template \
	templates/freshclam.conf.template \
	templates/httpd.conf.template \
	templates/httpd.local.template \
	templates/imapd.conf.template \
	templates/imapd.group.template \
	templates/kolab.conf.template \
	templates/ldap.conf.template \
	templates/main.cf.template \
	templates/master.cf.template \
	templates/php.ini.template \
	templates/proftpd.conf.template \
	templates/rc.conf.template \
	templates/resmgr.conf.template \
	templates/saslauthd.conf.template \
	templates/session_vars.php.template \
	templates/slapd.access.template \
	templates/slapd.conf.template \
	templates/slapd.replicas.template \
	templates/smtpd.conf.template \
	templates/transport.template \
	templates/virtual.template

kolabtemplatedir = $(kolabconfdir)/templates
kolabtemplate_DATA = $(kolabtemplate_FILES)


kolabnamespace_FILES = namespace/libexec/newconfig \
	namespace/libexec/adduser \
	namespace/libexec/deluser \
	namespace/libexec/listusers \
	namespace/libexec/showuser \
	namespace/libexec/newconfig \
	namespace/libexec/services \
	namespace/libexec/showlog \
	namespace/libexec/start \
	namespace/libexec/stop 

kolabnamespacedir = $(libexecdir)/kolab
kolabnamespace_DATA = $(kolabnamespace_FILES)
EXTRA_DIST += namespace/libexec/start
EXTRA_DIST += namespace/libexec/stop

ldapschema_FILES =  kolab2.schema \
	rfc2739.schema

ldapschemadir = $(ldapconfdir)/schema
dist_ldapschema_DATA = $(ldapschema_FILES)


amavisdus_FILES = amavisd/en_US/charset \
	amavisd/en_US/template-dsn.txt \
	amavisd/en_US/template-spam-admin.txt \
	amavisd/en_US/template-spam-sender.txt \
	amavisd/en_US/template-virus-admin.txt \
	amavisd/en_US/template-virus-recipient.txt \
	amavisd/en_US/template-virus-sender.txt

amavisdusdir = $(amavisdconfdir)/templates/en_US
dist_amavisdus_DATA = $(amavisdus_FILES)


amavisdde_FILES = amavisd/de/charset \
	amavisd/de/template-dsn.txt \
	amavisd/de/template-spam-admin.txt \
	amavisd/de/template-spam-sender.txt \
	amavisd/de/template-virus-admin.txt \
	amavisd/de/template-virus-recipient.txt \
	amavisd/de/template-virus-sender.txt

amavisddedir = $(amavisdconfdir)/templates/de
dist_amavisdde_DATA = $(amavisdde_FILES)


kolabdoc_FILES = doc/README.amavisd \
	doc/README.ldapdelete \
	doc/README.outlook \
	doc/README.sieve \
	doc/README.webgui

kolabdocdir = $(datadir)/kolab/doc
dist_kolabdoc_DATA = $(kolabdoc_FILES)

kolabsbin_FILES =  kolabd \
	kolabconf \
	kolabcheckperm

kolabsbindir = $(sbindir)/
kolabsbin_DATA = $(kolabsbin_FILES)
EXTRA_DIST += kolabcheckperm


kolabbin_FILE = namespace/kolab \
	kolabpasswd

kolabbindir = $(bindir)
dist_kolabbin_DATA = $(kolabbin_FILE)


kolabrc_FILE = rc.kolabd

# that works - but $(rcdir) not :/
kolabrcdir = $(sysconfdir)/rc.d

dist_kolabrc_DATA = $(kolabrc_FILE)

#srcdir = .

kolab:
	@$(mkinstalldirs) .
	$(do_subst) <$(srcdir)/kolab.in >$@
	chmod a+x kolab
CLEANFILES += kolab
EXTRA_DIST += kolab.in

#kolab2.schema:
#	@$(mkinstalldirs) .
#	 $(do_subst) <$(srcdir)/kolab2.schema.in >$@
#CLEANFILES += kolab2.schema
#EXTRA_DIST += kolab2.schema.in

kolab_ca.sh:
	@$(mkinstalldirs) .
	 $(do_subst) <$(srcdir)/kolab_ca.sh.in >$@
	 chmod a+x kolab_ca.sh
CLEANFILES += kolab_ca.sh
EXTRA_DIST += kolab_ca.sh.in

kolab_bootstrap:
	@$(mkinstalldirs) .
	$(do_subst) <$(srcdir)/kolab_bootstrap.in >$@
	chmod a+x kolab_bootstrap
CLEANFILES += kolab_bootstrap
EXTRA_DIST += kolab_bootstrap.in

kolab_sslcert.sh:
	@$(mkinstalldirs) .
	$(do_subst) <$(srcdir)/kolab_sslcert.sh.in >$@
	chmod a+x kolab_sslcert.sh
CLEANFILES += kolab_sslcert.sh
EXTRA_DIST += kolab_sslcert.sh.in

kolabconf:
	@$(mkinstalldirs) .
	 $(do_subst) <$(srcdir)/kolabconf.in >$@
	 chmod a+x kolabconf
CLEANFILES += kolabconf
EXTRA_DIST += kolabconf.in

kolabcheckperm:
	@$(mkinstalldirs) .
	$(do_subst) <$(srcdir)/kolabcheckperm.in >$@
CLEANFILES += kolabcheckperm
EXTRA_DIST += kolabcheckperm.in

kolabd:
	@$(mkinstalldirs) .
	 $(do_subst) <$(srcdir)/kolabd.in >$@
	 chmod a+x kolabd
CLEANFILES += kolabd
EXTRA_DIST += kolabd.in

kolabpasswd:
	@$(mkinstalldirs) .
	 $(do_subst) <$(srcdir)/kolabpasswd.in >$@
	 chmod a+x kolabpasswd
CLEANFILES += kolabpasswd
EXTRA_DIST += kolabpasswd.in

kolabquotawarn:
	@$(mkinstalldirs) .
	 $(do_subst) <$(srcdir)/kolabquotawarn.in >$@
	 chmod a+x kolabquotawarn
CLEANFILES += kolabquotawarn
EXTRA_DIST += kolabquotawarn.in

#namespace/kolab:
#	@$(mkinstalldirs) namespace/
#	 $(do_subst) <$(srcdir)/namespace/kolab.in >$@
#CLEANFILES += namespace/kolab
#EXTRA_DIST += namespace/kolab.in

namespace/libexec/adduser:
	@$(mkinstalldirs) namespace/libexec
	 $(do_subst) <$(srcdir)/namespace/libexec/adduser.in >$@
	 chmod a+x namespace/libexec/adduser
CLEANFILES += namespace/libexec/adduser
EXTRA_DIST += namespace/libexec/adduser.in

namespace/libexec/deluser:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/deluser.in >$@
	chmod a+x namespace/libexec/deluser
CLEANFILES += namespace/libexec/deluser
EXTRA_DIST += namespace/libexec/deluser.in

namespace/libexec/listusers:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/listusers.in >$@
	chmod a+x namespace/libexec/listusers
CLEANFILES += namespace/libexec/listusers
EXTRA_DIST += namespace/libexec/listusers.in

namespace/libexec/newconfig:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/newconfig.in >$@
	chmod a+x namespace/libexec/newconfig
CLEANFILES += namespace/libexec/newconfig
EXTRA_DIST += namespace/libexec/newconfig.in

namespace/libexec/services:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/services.in >$@
	chmod a+x namespace/libexec/services
CLEANFILES += namespace/libexec/services
EXTRA_DIST += namespace/libexec/services.in

namespace/libexec/showlog:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/showlog.in >$@
	chmod a+x namespace/libexec/showlog
CLEANFILES += namespace/libexec/showlog
EXTRA_DIST += namespace/libexec/showlog.in

namespace/libexec/showuser:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/showuser.in >$@
	chmod a+x namespace/libexec/showuser
CLEANFILES += namespace/libexec/showuser
EXTRA_DIST += namespace/libexec/showuser.in

namespace/libexec/start:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/start.in >$@
	chmod a+x namespace/libexec/start
CLEANFILES += namespace/libexec/start
EXTRA_DIST += namespace/libexec/start.in

namespace/libexec/stop:
	@$(mkinstalldirs) namespace/libexec
	$(do_subst) <$(srcdir)/namespace/libexec/stop.in >$@
	chmod a+x namespace/libexec/stop
CLEANFILES += namespace/libexec/stop
EXTRA_DIST += namespace/libexec/stop.in

namespace/kolab:
	@$(mkinstalldirs) namespace/
	$(do_subst) <$(srcdir)/namespace/kolab.in >$@
	chmod a+x namespace/kolab
CLEANFILES += namespace/kolab
EXTRA_DIST += namespace/kolab.in

templates/clamd.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
CLEANFILES += templates/clamd.conf.template
EXTRA_DIST += templates/clamd.conf.template.in

templates/cyrus.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/cyrus.conf.template.in >$@
CLEANFILES += templates/cyrus.conf.template
EXTRA_DIST += templates/cyrus.conf.template.in

templates/DB_CONFIG.slapd.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/DB_CONFIG.slapd.template.in >$@
CLEANFILES += templates/DB_CONFIG.slapd.template
EXTRA_DIST += templates/DB_CONFIG.slapd.template.in

templates/fbview.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/fbview.conf.template.in >$@
CLEANFILES += templates/fbview.conf.template
EXTRA_DIST += templates/fbview.conf.template.in

templates/freebusy.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/freebusy.conf.template.in >$@
CLEANFILES += templates/freebusy.conf.template
EXTRA_DIST += templates/freebusy.conf.template.in

templates/freshclam.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/freshclam.conf.template.in >$@
CLEANFILES += templates/freshclam.conf.template
EXTRA_DIST += templates/freshclam.conf.template.in

templates/httpd.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/httpd.conf.template.in >$@
CLEANFILES += templates/httpd.conf.template
EXTRA_DIST += templates/httpd.conf.template.in

templates/httpd.local.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/httpd.local.template.in >$@
CLEANFILES += templates/httpd.local.template
EXTRA_DIST += templates/httpd.local.template.in

templates/imapd.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/imapd.conf.template.in >$@
CLEANFILES += templates/imapd.conf.template
EXTRA_DIST += templates/imapd.conf.template.in

templates/imapd.group.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/imapd.group.template.in >$@
CLEANFILES += templates/imapd.group.template
EXTRA_DIST += templates/imapd.group.template.in

templates/kolab.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/kolab.conf.template.in >$@
CLEANFILES += templates/kolab.conf.template
EXTRA_DIST += templates/kolab.conf.template.in

templates/ldap.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/ldap.conf.template.in >$@
CLEANFILES += templates/ldap.conf.template
EXTRA_DIST += templates/ldap.conf.template.in

templates/ldapdistlist.cf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/ldapdistlist.cf.template.in >$@
CLEANFILES += templates/ldapdistlist.cf.template
EXTRA_DIST += templates/ldapdistlist.cf.template.in

templates/ldaptransport.cf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/ldaptransport.cf.template.in >$@
CLEANFILES += templates/ldaptransport.cf.template
EXTRA_DIST += templates/ldaptransport.cf.template.in

templates/ldapvirtual.cf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/ldapvirtual.cf.template.in >$@
CLEANFILES += templates/ldapvirtual.cf.template
EXTRA_DIST += templates/ldapvirtual.cf.template.in

templates/main.cf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/main.cf.template.in >$@
CLEANFILES += templates/main.cf.template
EXTRA_DIST += templates/main.cf.template.in

templates/master.cf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/master.cf.template.in >$@
CLEANFILES += templates/master.cf.template
EXTRA_DIST += templates/master.cf.template.in

templates/php.ini.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/php.ini.template.in >$@
CLEANFILES += templates/php.ini.template
EXTRA_DIST += templates/php.ini.template.in

templates/proftpd.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/proftpd.conf.template.in >$@
CLEANFILES += templates/proftpd.conf.template
EXTRA_DIST += templates/proftpd.conf.template.in

templates/rc.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/rc.conf.template.in >$@
CLEANFILES += templates/rc.conf.template
EXTRA_DIST += templates/rc.conf.template.in

templates/resmgr.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
CLEANFILES += templates/resmgr.conf.template
EXTRA_DIST += templates/resmgr.conf.template.in

templates/saslauthd.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/saslauthd.conf.template.in >$@
CLEANFILES += templates/saslauthd.conf.template
EXTRA_DIST += templates/saslauthd.conf.template.in

templates/session_vars.php.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/session_vars.php.template.in >$@
CLEANFILES += templates/session_vars.php.template
EXTRA_DIST += templates/session_vars.php.template.in

templates/slapd.access.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/slapd.access.template.in >$@
CLEANFILES += templates/slapd.access.template
EXTRA_DIST += templates/slapd.access.template.in

templates/slapd.conf.template:
	@$(mkinstalldirs) templtes
	$(do_subst) <$(srcdir)/templates/slapd.conf.template.in >$@
CLEANFILES += templates/slapd.conf.template
EXTRA_DIST += templates/slapd.conf.template.in

templates/slapd.replicas.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/slapd.replicas.template.in >$@
CLEANFILES += templates/slapd.replicas.template
EXTRA_DIST += templates/slapd.replicas.template.in

templates/smtpd.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/smtpd.conf.template.in >$@
CLEANFILES += templates/smtpd.conf.template
EXTRA_DIST += templates/smtpd.conf.template.in

templates/transport.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/transport.template.in >$@
CLEANFILES += templates/transport.template
EXTRA_DIST += templates/transport.template.in

templates/virtual.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/virtual.template.in >$@
CLEANFILES += templates/virtual.template
EXTRA_DIST += templates/virtual.template.in

templates/amavisd.conf.template:
	@$(mkinstalldirs) templates
	$(do_subst) <$(srcdir)/templates/amavisd.conf.template.in >$@
CLEANFILES += templates/amavisd.conf.template
EXTRA_DIST += templates/amavisd.conf.template.in

workaround.sh:
	@$(mkinstalldirs) .
	 $(do_subst) <$(srcdir)/workaround.sh.in >$@
	 chmod a+x workaround.sh
CLEANFILES += workaround.sh
EXTRA_DIST += workaround.sh.in

kolab_smtpdpolicy:
	@$(mkinstalldirs) .
	$(do_subst) <$(srcdir)/kolab_smtpdpolicy.in >$@
	chmod a+x kolab_smtpdpolicy
CLEANFILES += kolab_smtpdpolicy
EXTRA_DIST += kolab_smtpdpolicy.in

doc/README.amavisd:
	@$(mkinstalldirs) doc
	$(do_subst) <$(srcdir)/doc/README.amavisd.in >$@
CLEANFILES += doc/README.amavisd
EXTRA_DIST += doc/README.amavisd.in

doc/README.webgui:
	@$(mkinstalldirs) doc
	$(do_subst) <$(srcdir)/doc/README.webgui.in >$@
CLEANFILES += doc/README.webgui
EXTRA_DIST += doc/README.webgui.in

rc.kolabd:
	@$(mkinstalldirs) .
	$(do_subst) <$(srcdir)/rc.kolabd.in >$@
CLEANFILES += rc.kolabd
EXTRA_DIST += rc.kolabd.in


EXTRA_DIST += dist_conf kolabd.spec.in

install-data-hook:
	$(mkinstalldirs) -m 755 $(DESTDIR)
	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_logdir)
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/cgi-bin
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/icons
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/freebusy
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
#	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/locks
	chmod +775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
	chmod +600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
	chmod +744 $(DESTDIR)$(kolabnamespacedir)/*
	chmod +744 $(DESTDIR)$(sbindir)/kolabd
	chmod +744 $(DESTDIR)$(sbindir)/kolabconf
	chmod +744 $(DESTDIR)$(sbindir)/kolabcheckperm
	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_FILE)
	chmod +744 $(DESTDIR)$(bindir)/kolab
	chmod +755 $(DESTDIR)$(bindir)/kolabpasswd


--- NEW FILE: Makefile.in ---
# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005  Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.

@SET_MAKE@



srcdir = @srcdir@
[...1093 lines suppressed...]
install-data-hook:
	$(mkinstalldirs) -m 755 $(DESTDIR)
	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_logdir)
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/cgi-bin
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/icons
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/freebusy
	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
#	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/locks
	chmod +775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
	chmod +600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
	chmod +744 $(DESTDIR)$(kolabnamespacedir)/*
	chmod +744 $(DESTDIR)$(sbindir)/kolabd
	chmod +744 $(DESTDIR)$(sbindir)/kolabconf
	chmod +744 $(DESTDIR)$(sbindir)/kolabcheckperm
	chmod +755 $(DESTDIR)$(kolabrcdir)/$(kolabrc_FILE)
	chmod +744 $(DESTDIR)$(bindir)/kolab
	chmod +755 $(DESTDIR)$(bindir)/kolabpasswd
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

--- NEW FILE: bootstrap ---
touch NEWS README AUTHORS ChangeLog
#cp -R ../../perl-kolab/dist_conf .
autoreconf -f -i


--- NEW FILE: configure.ac ---
AC_PREREQ(2.59)

# not the real version
m4_define(_VERSION,2.0.0)
AC_INIT([kolabd],[_VERSION],[kolab-devel@kolab.org])
AC_CONFIG_AUX_DIR(.)

AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2])
AC_PREFIX_DEFAULT([/usr])

common=dist_conf/common
AC_SUBST_FILE(common)

AC_ARG_ENABLE([dist],
  [AC_HELP_STRING([--enable-dist=DIST],
     [distribution target (default: openpkg)])],
     [distribution=dist_conf/$enable_dist],
   [distribution=dist_conf/kolab])
AC_SUBST_FILE(distribution)

AC_ARG_ENABLE([ldapconfdir],
  [AC_HELP_STRING([--enable-ldapconfdir=DIR],
  	 [The LDAP configuration dir (default: SYSCONFDIR/openldap)])],
  [ldapconfdir="$enable_ldapconfdir"],
  [ldapconfdir="\$(sysconfdir)/openldap"])
AC_SUBST(ldapconfdir)

AC_ARG_ENABLE([amavasdconfdir],
  [AC_HELP_STRING([--enable-amavisdconfdir=DIR],
    [The amavisd configuration dir (default: SYSCONFDIR/amavisd)])],
  [amavisdconfdir="$enable_amavisdconfdir"],
  [amavisdconfdir="\$(sysconfdir)/amavisd"])
AC_SUBST(amavisdconfdir)  

# Checks for libraries.

# Checks for header files.

# Checks for typedefs, structures, and compiler characteristics.

# Checks for library functions.

# Build date for spec file
spec_build_date=`date '+%Y%m%d'`
AC_SUBST(spec_build_date)

AC_CONFIG_FILES([
Makefile
kolabd.spec
])

AC_OUTPUT


--- NEW FILE: kolab.in ---
#!@perl_exec@

##
##  Copyright (c) 2003  Code Fusion cc
##
##    Writen by Stuart Bingë  
##    Portions based on work by the following people:
##
##      (c) 2003  Tassilo Erlewein  
##      (c) 2003  Martin Konold     
##      (c) 2003  Achim Frank       
##
##
##  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 .
##

use strict;
use Getopt::Std;
use vars qw($opt_o);

getopts('vol:');

if ($opt_o) {
    print "NOTE: USE OF THIS SCRIPT IS DEPRECATED. Please use `@sbindir@/kolabconf' in the future.\n";
    system("@sbindir@/kolabconf");
} else {
    print "NOTE: USE OF THIS SCRIPT IS DEPRECATED. Please use `@sbindir@/kolabd' in the future.\n";
    system("@sbindir@/kolabd");
}

--- NEW FILE: kolab_bootstrap.in ---
#!@perl_exec@

# (c) 2004 Steffen Hansen 
# (c) 2003,2004 Tassilo Erlewein 
# (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.

# kolab_bootstrap Version 0.93

use strict;
use vars qw($opt_b $opt_f);

use URI;
use Socket;
use IO::File;
use IO::Select;
use Net::LDAP;
use Net::LDAP::Entry;
use Net::Netmask;
use File::Copy;
use Getopt::Std;
use Sys::Hostname;
use Term::ReadKey;
use Time::Local;
use Time::localtime;

my $kolab_prefix = "@prefix@";
my $kolab_config = "@sysconfdir@/kolab/kolab.conf";
my %kolab_config;

##### Utility Functions

# Try to get fqdn
sub myhostname {
  my $host = '';
  # FIXME: hardcoded - maybe fixed later
  if( open( HOSTNAME, '/etc/HOSTNAME' ) ) {
    $host = ;
    chomp $host;
    close( HOSTNAME );
  }
  # FIXME: hardcoded - maybe fixed later  
  if( open( HOSTNAME, '/etc/hostname' ) ) {
    $host = ;
    chomp $host;
    close( HOSTNAME );
  }
  if( $host eq '' ) {
    $host = `hostname`;
  }
  return $host;
}

# Connect to host,port and return 1 on success
sub tryConnect {
  my $host  = shift;
  my $port    = shift;
  if ($port =~ /\D/) { $port = getservbyname($port, 'tcp') }
  die "No port" unless $port;
  my $iaddr   = inet_aton($host)               || die "no host: $host";
  my $paddr   = sockaddr_in($port, $iaddr);
  my $proto   = getprotobyname('tcp');
  socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || die "socket: $!";
  my $retval = connect(SOCK, $paddr) || 0;
  close( SOCK );
  return $retval;
}

# Check for running service
sub checkPort {
  my $name = shift; # Name of the service e.g. webserver
  my $port = shift; # tcp Port of the named service
  print ("Check for running $name on port $port\n");
  if (tryConnect("localhost",$port) == 1) {
    print ("Error: Found $name running on Port $port\n");
    print ("Check your installation!\n");
    print ("You must stop the service $name before running Kolab\n");
    print ("You may try to execute \"$kolab_prefix/bin/openpkg rc all stop\" initially\n");
    exit 1;
  }
}

# Hash a password
sub hashPassword {
  my $pw = shift;
  my $hashcmd = "@sbindir@/slappasswd -s '".$pw."'";
  (my $hashpw = `$hashcmd`) or die $@;
  chomp($hashpw);
  return $hashpw;
}

# Ask the user a question
sub getUserInput {
  my $text = shift;
  my $default = shift;
  my @values = @_;

  if( $default ) {
        $text = "$text [$default]";
  }
  if( @values ) {
        $text = "$text (".join('/', @values)."): ";
  } else {
        $text = "$text: ";
  }
AGAIN:
  print $text;
  my $tmp = ReadLine;
  chomp $tmp;
  if( $default && $tmp eq '' ) { $tmp = $default; }
  if( @values ) {
    foreach( @values ) { return $tmp if( $tmp eq $_ ); }
    goto AGAIN;
  }
  return $tmp;
}

# Like system() but echo the line before executing
sub kolab_system {
  my $arg = shift;
  print "$arg\n";
  system( $arg ) == 0
    or die "system $arg failed: $?";
};

# Usable chown
sub kolab_chown {
    my $u = shift;
    my $g = shift;
    my $uid = getpwnam($u);
    my $gid = getgrnam($g);
    while( my $file = shift ) {
	chown $uid,$gid,$file;
    }
}

# Fetch entry from ldap server or create new entry of none exist
sub newOrExistingLDAPEntry {
  my $ldap = shift;
  my $dn = shift;

  my $mesg = $ldap->search( base => $dn, scope => 'exact', filter => '(objectClass=*)' );
  if( $mesg && $mesg->count() > 0 ) {
    return $mesg->entry(0);
  } else {
    return Net::LDAP::Entry->new;
  }
}

sub newkolabgroupofnames {
  my $ldap = shift;
  my $basedn = shift;
  my $cn = shift;

  if( scalar(@_) < 1 ) {
    warn "kolabgroupofnames must contain at least one member";
  }

  my $ldapobject = newOrExistingLDAPEntry($ldap,"cn=$cn,$basedn");
  $ldapobject->replace('cn' => $cn, 'objectclass' => ['top','kolabgroupofnames'],
		       'member' => @_);
  $ldapobject->dn("cn=$cn,$basedn");
  my $mesg = $ldapobject->update($ldap);
  $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
  return $ldapobject;
}

print "\nKOLAB BOOTSTRAP\n\n";

# Check for already running services preventing proper operation of kolab_bootstrap and Kolab
checkPort("webserver",80);    # http
checkPort("webserver",443);   # https
checkPort("imap server",143); # imap
checkPort("imap server",220); # 
checkPort("imap server",585);
checkPort("imap server",993);
checkPort("pop3 server",109);
checkPort("pop3 server",110);  # pop3
checkPort("pop3 server",473);
checkPort("pop3 server",995);
checkPort("smtp server",25);   # smtp
checkPort("smtp server",465);
checkPort("ftp server",21);
checkPort("Amavis Virus Scanner Interface",10024);
checkPort("Kolab daemon",9999);
checkPort("OpenLDAP server",636);
checkPort("OpenLDAP server",389);
checkPort("Sieve server",2000);

print ("Excellent all required Ports are available!\n");

system("@sbindir@/slapcat >/dev/null 2>&1");
if ($?==0) {
  print ("\nFound existing configuration\n");
  print "\nBootstrapping Kolab will overwrite old configuration\n";
  my $tmp = getUserInput( "\nContinue", "n", "y", "n" );
  if( (lc $tmp eq 'n') || ($tmp eq '')  ) {
    print "Bootstrapping aborted - not creating new configuration\n";
    exit 0;
  }
  print "Creating backup of old configuration (LDAP, kolab.conf and certificates\n";
  my $epochseconds = timelocal(gmtime);
  my $backupdir="@sysconfdir@/kolab/backup".$epochseconds;
  mkdir($backupdir,0700) || die "cannot mkdir : $!";
  print "creating backup of LDAP repository\n";
  system("cp -pRP "@ldapserver_dir@ .$backupdir."/openldap-data");
  system("rm -f @ldapserver_dir@/*");
  print "creating backup of CA data\n";
  system(mv @sysconfdir@/kolab/ca .$backupdir);
  system(mv @sysconfdir@/kolab/*.pem .$backupdir);
  system("mv $kolab_config $backupdir");
  print "Cleaning up LDAP\n";
  system(rm -f @ldapserver_dir@/*");
} else {
  print "LDAP repository is empty - assuming fresh install\n";
}


# fetch fresh template
copy(@sysconfdir@/kolab/templates/kolab.conf.template, $kolab_config);

my $fd = IO::File->new($kolab_config, "r")
   || die "could not open $kolab_config";
foreach (<$fd>) {
   if (/(.*) : (.*)/) {
      $kolab_config{$1} = $2;
   }
}
undef $fd;
my $fqdnhostname = $kolab_config{'fqdnhostname'} || die "could not read fqdnhostname from $kolab_config";
my $is_master = $kolab_config{'is_master'} || "true";
my $bind_dn = $kolab_config{'bind_dn'} || die "could not read bind_dn from $kolab_config";
my $bind_pw = $kolab_config{'bind_pw'} || die "could not read bind_pw from $kolab_config";
my $bind_pw_hash = $kolab_config{'bind_pw_hash'} || hashPassword( $bind_pw );
my $ldap_uri = $kolab_config{'ldap_uri'} || die "could not read ldap_uri from $kolab_config";
my $base_dn = $kolab_config{'base_dn'} || die "could not read base_dn from $kolab_config";
my $php_dn = $kolab_config{'php_dn'} || die "could not read php_dn from $kolab_config";
my $php_pw = $kolab_config{'php_pw'} || die "could not read php_pw from $kolab_config";
my $calendar_dn = $kolab_config{'calendar_dn'};
my $calendar_pw = $kolab_config{'calendar_pw'};
my @kolabhosts;

if (!$bind_dn || !$bind_pw || !$ldap_uri || !$base_dn) {
   print "Please check $kolab_config (seems to be incomplete)\n";
   die "and run kolab_bootstrap afterwards, manually";
}
my $fqdn;
if( $fqdnhostname =~ /\@\@\@/ ) {
  $fqdn = myhostname;
} else {
  $fqdn = $fqdnhostname;
}
chomp($fqdn);

$fqdn = getUserInput("Please enter Hostname including Domain Name (e.g. thishost.domain.tld)", $fqdn);
print "Proceeding with Hostname $fqdn\n";

my $tmp;
if( $is_master eq "false" ) {
  $tmp = "2";
} else {
  $tmp = "1";
}

my $tmp2 = getUserInput( "Do you want to set up (1) a master Kolab server or (2) a slave",
			 $tmp, "1", "2");
if ( $tmp2 eq "2" ) {
  $is_master = "false";
  print "Proceeding with slave server setup\n\n";
} else {
  $is_master = "true";
  print "Proceeding with master server setup\n\n";
}

if ( $is_master eq "true" ) {
  ##### Master server setup
  getopt('f');

  (my $dummy, my $domain) = split(/\./, $fqdn, 2);
  if (!$domain) {
    $domain = $fqdn;
  }

  $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";
  

  if ( $opt_f || $base_dn =~ /\@\@\@/ || $bind_dn =~ /\@\@\@/ || $bind_pw =~ /\@\@\@/ ) {
    print "Generating default configuration:\n";
    if ($base_dn =~ /\@\@\@/) {
      $base_dn = "";
      foreach my $dc ((split(/\./,$domain))) {
        $base_dn .= "dc=$dc,";
      }
      chop $base_dn;
      print " base_dn : $base_dn\n";
    }
    if ($bind_dn =~ /\@\@\@/) {
      $bind_dn =~ s/\@\@\@kolab_basedn\@\@\@/$base_dn/g;
      print " bind_dn : $bind_dn\n";
    }
    if ($bind_pw =~ /\@\@\@/) {
      $bind_pw = `@bindir@/openssl rand -base64 12`;
      chomp $bind_pw;
      $bind_pw = getUserInput("Please choose a manager password", $bind_pw);
      print " bind_pw : $bind_pw\n";
      $bind_pw_hash = hashPassword($bind_pw);
    }

    # Generate passwords
    if ($php_dn =~ /\@\@\@/) {
      $php_dn =~ s/\@\@\@kolab_basedn\@\@\@/$base_dn/g;
    }
    if ($php_pw =~ /\@\@\@/) {
      $php_pw = `@bindir@/openssl rand -base64 30`;
      chomp $php_pw;
    }
    if ($calendar_dn =~ /\@\@\@/) {
      $calendar_dn =~ s/\@\@\@kolab_basedn\@\@\@/$base_dn/g;
      chomp $calendar_dn;
    }
    if ($calendar_pw =~ /\@\@\@/) {
      $calendar_pw = `@bindir@/openssl rand -base64 30`;
      chomp $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";
    print $fd "base_dn : $base_dn\n";
    print $fd "bind_dn : $bind_dn\n";
    print $fd "bind_pw : $bind_pw\n";
    print $fd "bind_pw_hash : $bind_pw_hash\n";
    print $fd "ldap_uri : $ldap_uri\n";
    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;
    kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
    print "IMPORTANT NOTE:\n";
    print "use login=manager and passwd=$bind_pw when you log into the webinterface!\n\n";
  }

  # Set up slapd to replicate to slave server's kolabds
  @kolabhosts = ( $fqdn );
  while(1) {
    my $tmp = getUserInput("Enter fully qualified hostname of slave kolab server e.g. thishost.domain.tld [empty when done]");
    if( $tmp ) {
      push @kolabhosts, $tmp;
      #$cfg .= "replica host=$tmp\n";
      #$cfg .= "  binddn=\"cn=replicator\"\n";
      #$cfg .= "  bindmethod=simple credentials=secret\n\n";
    } else {
      last;
    }
  };

  my $confname = "@emailserver_sasl_conffile@";
  copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";

  getopts('b');

  if ($opt_b) {
    print "prepare LDAP database...\n";
    if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
#      This cannot happen anymore
#      print "stop running slapd (if any)\n";
#      system("@bindir@/openpkg rc openldap stop");
#      sleep 5;

      # Make sure that no rogue daemons are running
      tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
        ."Please stop any running ldap server and bootstrap again\n";
      tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
        ."Please stop any running kolabd and bootstrap again\n";
      if( `ps aux|grep slurpd|grep -v grep` ) {
        print "Error: Detected running slurpd processes.\n";
        print "Please make sure the OpenLDAP server is stopped properly!\n";
        exit 1;
      }

      # Creating slapd.conf from template
      my $tmpl = IO::File->new("@sysconfdir@/kolab/templates/slapd.conf.template", "r") || die "could not read @sysconfdir@/kolab/templates/slapd.conf.template";
      my $slpd = IO::File->new("@ldapserver_confdir@/slapd.conf","w+") || die "could not write to @ldapserver_confdir@/slapd.conf";
      chmod (0640,"@ldapserver_confdir@/slapd.conf");
      while (<$tmpl>) {
        if (/^KOLAB_META_START$/) {
           my $found_end;
           while (!$found_end) {
               $_ = <$tmpl>;
               $found_end = /^KOLAB_META_END$/;
           }
			  $_ = <$tmpl>;
		 }
        s/\@\@\@base_dn\@\@\@/$base_dn/g;
        s/\@\@\@bind_dn\@\@\@/$bind_dn/g;
        s/\@\@\@bind_pw_hash\@\@\@/$bind_pw/g;
        s/TLSCertificate/\#TLSCertificate/g;
        print $slpd $_;
      }
      undef $slpd;
      undef $tmpl;
      
		my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
      $confname = "@ldapserver_confdir@/slapd.replicas";

      $tmpl = IO::File->new($tmplname, "r") || die "could not read $tmplname";
      $slpd = IO::File->new($confname,"w+") || die "could not write to $confname";
      chmod (0640,$confname);
      while (<$tmpl>) {
        if (/^KOLAB_META_START$/) {
           my $found_end;
           while (!$found_end) {
               $_ = <$tmpl>;
               $found_end = /^KOLAB_META_END$/;
           }
           $_ = <$tmpl>;
        }
         print $slpd $_;
      }
      undef $slpd;
		undef $tmpl;
		
		$tmplname = "@sysconfdir@/kolab/templates/slapd.access.template";
		
      $confname = "@ldapserver_confdir@/slapd.access";

      $tmpl = IO::File->new($tmplname, "r") || die "could not read $tmplname";
      $slpd = IO::File->new($confname,"w+") || die "could not write to $confname";
      chmod (0640,$confname);
      while (<$tmpl>) {
        if (/^KOLAB_META_START$/) {
           my $found_end;
           while (!$found_end) {
               $_ = <$tmpl>;
               $found_end = /^KOLAB_META_END$/;
           }
           $_ = <$tmpl>;
        }
         print $slpd $_;
       }
       undef $slpd;
       undef $tmpl;
		
      # now we must startup slapd
      print "temporarily starting slapd\n";
      $ldap_uri = "ldap://127.0.0.1:389/";
      (system("@libexecdir@/openldap/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf") == 0 ) || die( "Could not start temporary slapd" );
      print ("Waiting for OpenLDAP to start\n");
      sleep 10;

    }

    my $ldapuri = URI->new($ldap_uri) || die "error: could not parse given uri";
    my $ldap = Net::LDAP->new($ldap_uri, verify => 'none' ) || die "could not connect ldap server $ldap_uri";
    if ($ldap) {
      $ldap->bind($bind_dn, password=> $bind_pw) || die "could not bind to ldap server $ldap_uri";
      my $mesg = $ldap->search(base=> "$base_dn", scope=> 'exact', filter=> "(objectclass=*)");
      if ($mesg && $mesg->count != 1) {
        print "no $base_dn object found, creating one\n";
        my $dccomp = (split(/\./,$domain))[0];
        chomp $dccomp;
        $mesg = $ldap->add( $base_dn, attr=> [dc=> $dccomp, 'objectclass'=> ['top', 'domain'] ]);
      }
      $mesg && $mesg->code && warn "failed to write basedn entry : ", $mesg->error;
      my $ldapobject = newOrExistingLDAPEntry( $ldap, "k=kolab,$base_dn" );

      # create kolab config object
      my $mynetworkinterfaces = "127.0.0.0/8";
      print "mynetworkinterfaces: ".$mynetworkinterfaces."\n";

      $ldapobject->replace(
        'k' => 'kolab',
        'kolabhost' => \@kolabhosts,
        'postfix-mydomain' => $domain,
        #'postfix-relaydomains' => "",
        'postfix-mydestination' => "$domain",
        'postfix-mynetworks' => $mynetworkinterfaces,
        #'postfix-relayhost' => "",
        #'postfix-transport' => "",
        'postfix-enable-virus-scan' => "TRUE",
        'cyrus-autocreatequota' => 100000,
        'cyrus-quotawarn' => 80,
        'cyrus-admins' => "manager",
        'cyrus-imap' => "TRUE",
        'cyrus-pop3' => "FALSE",
        'cyrus-imaps' => "TRUE",
        'cyrus-pop3s' => "TRUE",
        'cyrus-sieve' => "TRUE",
        'apache-http' => "FALSE",
        'apache-allow-unauthenticated-fb' => "FALSE",
        'proftpd-ftp' => "FALSE",
        #'proftpd-defaultquota' => 100000,
        #'proftpd-userPassword' => "freebusy",
        'uid' => "freebusy",
        'userPassword' => "freebusy",
        'objectclass' => ['top', 'kolab' ] );
      # Get rid of fqdnhostname, it will cause pain and suffering...
      #$ldapobject->delete( 'fqdnhostname' );
      $ldapobject->dn("k=kolab,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create internal user topnode
      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=internal,$base_dn" );
      $ldapobject->replace('cn' => 'internal', 'objectclass' => ['top','kolabnamedobject']);
      $ldapobject->dn("cn=internal,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create domain groups topnode
      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=domains,cn=internal,$base_dn" );
      $ldapobject->replace('cn' => 'domains', 'objectclass' => ['top','kolabnamedobject']);
      $ldapobject->dn("cn=domains,cn=internal,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create external user topnode
      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=external,$base_dn" );
      $ldapobject->replace('cn' => 'external', 'objectclass' => ['top','kolabnamedobject']);
      $ldapobject->dn("cn=external,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create groups user topnode
      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=groups,$base_dn" );
      $ldapobject->replace('cn' => 'groups', 'objectclass' => ['top','kolabnamedobject']);
      $ldapobject->dn("cn=groups,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create resources user topnode
      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=resources,$base_dn" );
      $ldapobject->replace('cn' => 'resources', 'objectclass' => ['top','kolabnamedobject']);
      $ldapobject->dn("cn=resources,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create admin group
      newkolabgroupofnames( $ldap, "cn=internal,$base_dn", 'admin', $bind_dn );

      # create manager user
      $ldapobject = newOrExistingLDAPEntry( $ldap, $bind_dn );
      $ldapobject->replace('cn' => 'manager', 'sn' => 'n/a', 'uid' => 'manager',
                           'userPassword' => $bind_pw_hash, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
      $ldapobject->dn($bind_dn);
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create php read-only user
      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=nobody,cn=internal,$base_dn" );
      $ldapobject->replace('cn' => 'nobody', 'sn' => 'n/a n/a', 'uid' => 'nobody',
                           'userPassword' => hashPassword($php_pw), 
			   'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
      $ldapobject->dn("cn=nobody,cn=internal,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create calendar user
      $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=calendar,cn=internal,$base_dn" );
      $ldapobject->replace('cn' => 'calendar', 'sn' => 'n/a n/a', 'uid' => 'calendar@'.$domain,
                           'userPassword' => hashPassword($calendar_pw), 
			   'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
      $ldapobject->dn("cn=calendar,cn=internal,$base_dn");
      $mesg = $ldapobject->update($ldap);
      $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
      undef $ldapobject;

      # create mainainter group
      newkolabgroupofnames( $ldap, "cn=internal,$base_dn", 'maintainer', $bind_dn );

      # create domain-mainainter group
      newkolabgroupofnames( $ldap, "cn=internal,$base_dn", 'domain-maintainer', $bind_dn );

      $ldap->unbind;
   }

   print "LDAP setup finished\n\n";

   print "Create initial config files for postfix, apache, proftpd, cyrus imap, saslauthd\n";

   my $cfg;
   open(FH, "<@sysconfdir@/rc.conf") || die;
   $cfg .= $_ while ();
   close(FH);

   $cfg =~ s/\n((openldap_url|sasl_authmech)\S*=[^\n]*)/#$1\n/sg;
   $cfg .= "openldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";

   open(FH, ">@sysconfdir@/rc.conf") || die;
   print FH $cfg;
   close(FH);
   undef $cfg;

   #print " running @sysconfdir@/kolab/kolab -v -o -l$ldap_uri\n";
   print "running @sbindir@/kolabconf -n\n";

   #system("@sysconfdir@/kolab/kolab -v -o -l$ldap_uri");
   system("@sbindir@/kolabconf -n");

   if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
      print "\nkill temporary slapd\n\n";
      system("@sysconfdir@/rc openldap stop");
      sleep 5;
      system("killall -9 slapd >/dev/null 2>&1");
   }
  }

  # Create key-pair for resource password encryption 
  # if they dont exist already
  my $pubreskey = "@sysconfdir@/kolab/res_pub.pem";
  my $privreskey = "@sysconfdir@/kolab/res_priv.pem";
  if( ! -e $pubreskey || ! -e $privreskey ) {
    my $oldmask = umask 0077;
    #print "Creating DSA keypair for resource password encryption\n";
    #system("@bindir@/openssl dsaparam 1024 -out dsa-params");
    #system("@bindir@/openssl gendsa -out $privreskey dsa-params");
    #system("@bindir@/openssl dsa -in $privreskey -pubout -out $pubreskey");
    print "Creating RSA keypair for resource password encryption\n";
    kolab_system("@bindir@/openssl genrsa -out $privreskey 1024");
    kolab_system("@bindir@/openssl rsa -in $privreskey -pubout -out $pubreskey");
    kolab_system("chown @kolab_musr@:@kolab_grp@ $pubreskey $privreskey");
    chmod 0660, $privreskey, $pubreskey;
    #unlink( "dsa-params" );
    umask $oldmask;
  }

  print <<'EOS';
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.
EOS

  my $tmp = getUserInput( "Do you want to create CA and certificates", "y", "y", "n");
  if( lc $tmp eq 'n' ) {
    print <<'EOS';
Skipping certificate creation. Please copy your certificate to
@sysconfdir@/kolab/cert.pem and private key to
@sysconfdir@/kolab/key.pem when the bootstrap script is finished.

EOS
  } else {
    print <<'EOS';
Now we need to create a cerificate authority (CA) for Kolab and a server
certificate. You will be prompted for a passphrase for the CA.
################################################################################
EOS
    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newca $fqdn");
    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/newreq.pem @sysconfdir@/kolab/cert.pem");
    kolab_system("chgrp @kolab_rusr@ @sysconfdir@/kolab/key.pem;");
    kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
    kolab_system("chgrp @kolab_rusr@ @sysconfdir@/kolab/cert.pem;");
    kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
    print <<'EOS';
################################################################################
CA and certificate creation complete.

You can install @sysconfdir@/kolab/ca/cacert.pem on your clients to allow them
to verify the validity of your server certificates.

EOS
  }
} else {
  ##### Slave server setup

  print "stop running slapd (if any)\n";
  kolab_system("@bindir@/openpkg rc openldap stop");
  sleep 1;
  kolab_system("@bindir@/openpkg rc openldap stop");
  sleep 1;

  # Make sure that no rogue demons are running
  tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
    ."Please stop any running ldap server and bootstrap again\n";
  tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
    ."Please stop any running kolabd and bootstrap again\n";
  if( `ps aux|grep slurpd|grep -v grep` ) {
    print "WARNING: Detected running slurpd processes.\n";
    print " Please make sure the OpenLDAP server is stopped properly!\n";
  }

  # For now we just connect to the remote slapd
 SLAVESTART:
  print "Now some information about the master LDAP server is required:\n\n";
  do { 
      $ldap_uri = getUserInput("URI of master LDAP server (for example ldaps://host.example.com)", 
			       $ldap_uri);
  } until $ldap_uri;
  my $ldapuri = URI->new($ldap_uri) || warn "error: could not parse given uri";
  if( $ldapuri ) {
    $base_dn = join( ',', map { "dc=$_" } split /\./, $ldapuri->host() );
  }
  $base_dn = getUserInput("Base DN of server", $base_dn);
  print "proceeding with base DN $base_dn\n";

  $bind_dn = "cn=manager,cn=internal,$base_dn";
  $bind_pw = getUserInput("Manager password");
  $bind_pw_hash = hashPassword($bind_pw);

  my $confname = "@emailserver_sasl_conffile@";
  copy("@sysconfdir@/kolab/templates/smtpd.conf.template", $confname) || die "could not write to $confname";

  print "Checking server info...\n";
  my $ldap = Net::LDAP->new($ldap_uri, verify => 'none', onerror => 'undef' );
  if (!defined($ldap)) {
    print "Could not connect to ldap server at $ldap_uri, please check your input\n";
    goto SLAVESTART;
  }
  $ldap->bind($bind_dn, password=> $bind_pw) || warn "could not bind to ldap";
  my $mesg = $ldap->search(base=> "$base_dn", scope=> 'exact', filter=> "(objectclass=*)");
  if ($mesg && $mesg->count != 1) {
    print "No $base_dn object found, please check your input\n";
    goto SLAVESTART;
  }
  $php_dn = "cn=nobody,cn=internal,$base_dn";
  $mesg = $ldap->search(base=> $php_dn, scope=> 'exact', filter=> "(objectclass=*)");
  if ($mesg && $mesg->count != 1) {
    print "Nobody object not found, please check your input\n";
    goto SLAVESTART;
  }
  #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=*)");
  if ($mesg && $mesg->count != 1) {
    print "Calendar object not found, please check your input\n";
    goto SLAVESTART;
  }
  #$entry = $mesg->entry(0);
  #$calendar_pw = $entry->get_value( 'userPassword' );

  $mesg = $ldap->search(base=> "k=kolab,$base_dn", scope=> 'exact',
			filter=> "(objectClass=*)");
  if ($mesg && $mesg->count != 1) {
    print "No Kolab object found, please check your input\n";
    goto SLAVESTART;
  }
  my $kolabhosts = $mesg->entry(0)->get_value( 'kolabhost', asref => 1 );
  foreach(@$kolabhosts) {
    if( lc($_) eq lc($fqdn) ) {
	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 @sysconfdir@/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";
  print $fd "base_dn : $base_dn\n";
  print $fd "bind_dn : $bind_dn\n";
  print $fd "bind_pw : $bind_pw\n";
  print $fd "bind_pw_hash : $bind_pw_hash\n";
  print $fd "ldap_uri : $ldap_uri\n";
  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;
  kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;

  print << 'EOS';
Now the master server needs to be stopped briefly while the contents of the LDAP database
is copied over to this slave. Please make sure that this slave is entered into the list 
of kolabhosts on the master before proceeding.
EOS
  kolab_system("ssh -CA $master_host @bindir@/openpkg rc openldap stop");
  kolab_system("ssh -CA $master_host @libdir@/openpkg/tar -C @ldapserver_confdir@ -pcf - openldap-data | @libdir@/openpkg/tar -C @ldapserver_confdir@ -pxf -");
  kolab_system("ssh -CA $master_host @bindir@/openpkg rc openldap start");

  print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
  my $cfg;
  open(FH, "<@sysconfdir@/rc.conf") || die;
  $cfg .= $_ while ();
  close(FH);
  
  $cfg =~ s/\n((openldap_url|sasl_authmech|openldap_enable)\S*=[^\n]*)/#$1\n/sg;
  # $cfg .= "openldap_enable=\"no\"\nopenldap_url=\"\"\nsasl_authmech=\"ldap\"\n";
  $cfg .= "\nopenldap_url=\"ldap:// ldaps://\"\nsasl_authmech=\"ldap\"\n";
  
  open(FH, ">@sysconfdir@/rc.conf") || die;
  print FH $cfg;
  close(FH);
  undef $cfg;
  
  print <<'EOS';
If you chose to create a CA on the master server, you will now need to create
a certificate request and copy it to the master to get it signed. If you already
have a certificate for this server, you can choose to skip this section.
EOS
  my $tmp = getUserInput( "Do you want to create a certificate request and sign it", 
			  "y", "y", "n");
  if( lc $tmp eq 'n' ) {
    print <<'EOS';
Skipping certificate creation. Please copy your certificate to
@sysconfdir@/kolab/cert.pem and private key to
@sysconfdir@/kolab/key.pem when the bootstrap script is finished.

EOS
  } else {
    
    print <<'EOS';
Now we need to create a cerificate request for this slave
and then ssh to the master server to have the request signed.
You will be asked multiple times for the root password of the
master server and the passphrase for the CA key on the master.
################################################################################
EOS

    # Create cert req
    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newkey $fqdn @sysconfdir@/kolab/key.pem");
    kolab_system("@sysconfdir@/kolab/kolab_ca.sh -newreq $fqdn @sysconfdir@/kolab/key.pem @sysconfdir@/kolab/newreq.pem ");
    # Log into master and sign cert request
    kolab_system("scp @sysconfdir@/kolab/newreq.pem $master_host:@sysconfdir@/kolab/$fqdn-req.pem");
    kolab_system("ssh -CA $master_host \"@sysconfdir@/kolab/kolab_ca.sh -sign @sysconfdir@/kolab/$fqdn-req.pem @sysconfdir@/kolab/$fqdn.pem;\"");
    kolab_system("scp $master_host:@sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/cert.pem");
    kolab_system("ssh -CA $master_host \"rm @sysconfdir@/kolab/$fqdn.pem @sysconfdir@/kolab/$fqdn-req.pem\"");
    die("Creation of @sysconfdir@/kolab/cert.pem failed") unless -f "@sysconfdir@/kolab/cert.pem";
    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/key.pem;");
    kolab_system("chmod 0640 @sysconfdir@/kolab/key.pem;");
    kolab_system("chgrp @kolab_rgrp@ @sysconfdir@/kolab/cert.pem;");
    kolab_system("chmod 0640 @sysconfdir@/kolab/cert.pem;");
    
    print <<'EOS';
################################################################################
Certificate creation done!

EOS
  }

  print <<'EOS';
To be able to encrypt and decrypt passwords for group and resource accounts
we need to copy the RSA keypair used for that purpose from the master server.
EOS
  my $privreskey = "@sysconfdir@/kolab/res_priv.pem";
  my $pubreskey  = "@sysconfdir@/kolab/res_pub.pem";
  kolab_system("scp $master_host:$privreskey "
	       ."$master_host:$pubreskey "
	       ."@sysconfdir@/kolab/");
  kolab_system("chown @kolab_musr@:@kolab_grp@ $pubreskey $privreskey");
  chmod 0660, $privreskey, $pubreskey;
  kolab_system("@sbindir@/kolabconf -n");

  $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";
  print $fd "base_dn : $base_dn\n";
  print $fd "bind_dn : $bind_dn\n";
  print $fd "bind_pw : $bind_pw\n";
  print $fd "ldap_uri : ldap://127.0.0.1\n";
  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;
}

#system("@sysconfdir@/kolab/kolab_sslcert.sh $fqdn");
print "kolab is now ready to run!\n";
print "please run '@bindir@/openpkg rc all start'\n";
print ("Use login=manager and passwd=$bind_pw when you log into\n");
print ("the webinterface https://$fqdn/admin !\n");

--- NEW FILE: kolab_ca.sh.in ---
#!@bash_exec@
##
##  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
##   Written by Steffen Hansen 
##
## CA management script that is heavily inspired by Tim Hudson's
## CA.sh script from the openssl distribution

PREFIX=@prefix@

DAYS="-days 3650"
REQ="$PREFIX/bin/openssl req"
CA="$PREFIX/bin/openssl ca"
VERIFY="$PREFIX/bin/openssl verify"
X509="$PREFIX/bin/openssl x509"
RSA="$PREFIX/bin/openssl rsa"
GENRSA="$PREFIX/bin/openssl genrsa"

CATOP=@sysconfdir@/kolab/ca
CAKEY=cakey.pem
CACERT=cacert.pem

# Make sure not to create world readable files
umask 0077

cd @sysconfdir@/kolab

# Config
function createconf() {
local DNAME=$1
echo "Using dn $hostname"
#if [ ! -d "@sysconfdir@/kolab/ca" ]; then
#    mkdir @sysconfdir@/kolab/ca
#fi
export OPENSSL_CONF=@sysconfdir@/kolab/kolab-ssl.cnf
cat > ${OPENSSL_CONF} < ${CATOP}/serial
        touch ${CATOP}/index.txt
    fi
    if [ ! -f ${CATOP}/private/$CAKEY ]; then
	cn=$2
	shift
	if [ -n "$2" ]; then
	    o=$2
	    shift
	else
	    readinput "Enter organization name" "Kolab"
	    o=$value
	fi
	if [ -n "$2" ]; then
	    ou=$2
	    shift
	else
	    readinput "Enter organizational unit" "Test-CA"
	    ou=$value
	fi
	shift
	echo "Using subject O=$o,OU=$ou,CN=$cn";
	createconf "O=$o
OU=$ou
CN=$cn"

        echo "CA certificate filename (or enter to create)"
        read FILE

        # ask user for existing CA certificate
        if [ "$FILE" ]; then
            cp $FILE ${CATOP}/private/$CAKEY
            RET=$?
        else
            echo "Making CA certificate ..."
            $REQ -new -x509 -keyout ${CATOP}/private/$CAKEY \
                           -out ${CATOP}/$CACERT $DAYS
            RET=$?
        fi
    fi
    ;;
-newkey)
    # create a new priv. key
    createconf "CN=$2"
    keyfile=key.pem
    if [ -n "$3" ]; then
	keyfile=$3
    fi
    shift 2
    echo "secret"|$GENRSA -des3 -passout fd:0 -out .tmp.pass.key 1024
    echo "secret"|$RSA -passin fd:0 -in .tmp.pass.key -out $keyfile
    rm .tmp.pass.key
    ;;
-newreq)
    # create a certificate request
    createconf "CN=$2"
    reqfile=newreq.pem
    if [ -n "$3" ]; then
	keyfile=$3
    fi
    if [ -n "$4" ]; then
	reqfile=$4
    fi
    shift 3
    $REQ -new -nodes -key ${keyfile} -out ${reqfile} $DAYS
    RET=$?
    echo "Request is in $reqfile and private key is in $keyfile"
    ;;
-sign|-signreq)
    createconf
    infile=newreq.pem
    outfile=newcert.pem
    if [ -n "$2" ]; then
	infile=$2
    fi
    if [ -n "$3" ]; then
	outfile=$3
    fi
    shift 2
    $CA -policy policy_anything -out ${outfile} -infiles ${infile}
    RET=$?
    #cat ${outfile}
    echo "Signed certificate is in ${outfile}"
    ;;
-verify)
    createconf
    shift
    if [ -z "$1" ]; then
            $VERIFY -CAfile $CATOP/$CACERT newcert.pem	    
            RET=$?
    else
        for j
        do
            $VERIFY -CAfile $CATOP/$CACERT $j
            if [ $? != 0 ]; then
                    RET=$?
            fi
        done
    fi
    exit 0
    ;;
*)
    echo "Unknown arg $i";
    exit 1
    ;;
esac
shift
done

cd -

exit $RET


--- NEW FILE: kolab_smtpdpolicy.in ---
#!@perl_exec@

##
##  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
##
##    Writen by 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
##  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 .
##

use Fcntl;
use Sys::Syslog qw(:DEFAULT setlogsock);
use URI;
use Net::LDAP qw(LDAP_NO_SUCH_OBJECT);
use Net::LDAP::Entry;
use Net::hostent;
use Socket;

#
# Usage: kolab_smtpd_policy.pl [-v]
#
# kolabdelegated Postfix SMTPD policy server for Kolab. This server implements
# various policies for Kolab:
#
# 1) Only authenticated users can use From addresses @$domain
# 2) Some distribution lists are only available to authenticated users
#
# Logging is sent to syslogd.
#
# How it works: each time a Postfix SMTP server process is started
# it connects to the policy service socket, and Postfix runs one
# instance of this PERL script.  By default, a Postfix SMTP server
# process terminates after 100 seconds of idle time, or after serving
# 100 clients. Thus, the cost of starting this PERL script is smoothed
# out over time.
#
# To run this from /etc/postfix/master.cf:
#
#    policy  unix  -       n       n       -       -       spawn
#      user=kolab-n argv=/usr/bin/perl /usr/libexec/postfix/kolab_smtpd_policy.pl
#
# To use this from Postfix SMTPD, use in /etc/postfix/main.cf:
#
#    smtpd_recipient_restrictions =
#	...
#	reject_unauth_destination
#	check_policy_service unix:private/policy
#	...
#
# NOTE: specify check_policy_service AFTER reject_unauth_destination
# or else your system can become an open relay.
#
# To test this script by hand, execute:
#
#    % perl kolab_smtpd_policy.pl
#
# Each query is a bunch of attributes. Order does not matter, and
# the demo script uses only a few of all the attributes shown below:
#
#    request=smtpd_access_policy
#    protocol_state=RCPT
#    protocol_name=SMTP
#    helo_name=some.domain.tld
#    queue_id=8045F2AB23
#    sender=foo@bar.tld
#    recipient=bar@foo.tld
#    client_address=1.2.3.4
#    client_name=another.domain.tld
#    instance=123.456.7
#    sasl_method=plain
#    sasl_username=you
#    sasl_sender=
#    size=12345
#    [empty line]
#
# The policy server script will answer in the same style, with an
# attribute list followed by a empty line:
#
#    action=dunno
#    [empty line]
#

#
# Syslogging options for verbose mode and for fatal errors.
# NOTE: comment out the $syslog_socktype line if syslogging does not
# work on your system.
#
$syslog_socktype = 'unix'; # inet, unix, stream, console
$syslog_facility="mail";
$syslog_options="pid";
$syslog_priority="info";

$ldap_max_tries = 5;

sub mylog {
  my $prio = shift;
  my $fmt = shift;

  my $text = sprintf( $fmt, @_ );

  #Kolab::log( 'P', $text );
  syslog $prio, $text;
}

sub contains {
  my $needle = lc(shift);
  my $haystack = shift;
  map { return 1 if $needle eq lc($_) } @$haystack;
  return 0;
}

sub ldap_connect {
    my $ldapuri = URI->new($conf_ldapuri) || fatal_exit("error: could not parse given uri");
    $ldap = Net::LDAP->new($conf_ldapuri) || fatal_exit("could not connect ldap server");
    if ($ldap) {
	if( $conf_binddn ) {
	    $ldap->bind( $conf_binddn, password => $conf_bindpw ) || fatal_exit( "could not bind as $conf_binddn" );
	} else {
	    $ldap->bind || fatal_exit("could not bind");
	}
    } else {
	fatal_exit( "Could not contact LDAP server" );
    }
}

#
# SMTPD access policy routine. The result is an action just like
# it would be specified on the right-hand side of a Postfix access
# table.  Request attributes are available via the %attr hash.
#
sub smtpd_access_policy {

  # Get relevant attributes
  my $sender      = $attr{'sender'};
  my $recip       = $attr{'recipient'};
  my $username    = $attr{'sasl_username'};
  my $client_addr = $attr{'client_address'};

  mylog($syslog_priority, "Checking sender=\"$sender\", recipient=\"$recip\", username=\"$username\", domains=".join(',',@conf_domain)." permithosts=".join(',',@conf_permithosts).", conf_allowunauth=$conf_allowunauth") if $verbose;

  #### This should probably be simplifed to
  #### reject sender @domain.tld if the user is
  #### not authenticated

 CHECKPERMITHOSTS:
  # First check if the sender is a privileged kolabhost
  # Kolab hosts use un-authenticated smtp currently
  if( !$username ) {
      for my $host (@conf_permithosts) {
	  unless ($h = gethost($host)) {
	      mylog($syslog_priority,"No such host $host\n");
	      next;
	  }
	  for my $addr ( @{$h->addr_list} ) {
	      return "DUNNO" if inet_ntoa($addr) eq $client_addr;
	  }
      }
  }

  # Translate uid to mail:
  my $tries = 0;
 LOOKUPUID:
  my $mesg = $ldap->search( base=> $conf_basedn,
			    scope=> 'sub',
			    filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$username)(uid=$username)))");
  if( !$mesg->code && $mesg->count() > 0 ) {
      mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
      my $ldapobject = $mesg->entry(0);
      $username = lc($ldapobject->get_value('mail'));
      mylog($syslog_priority, "Translated username to $username") if $verbose;
  } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT ) {
      if( $tries++ <= $ldap_max_tries ) {
	  mylog($syslog_priority, "LDAP Connection error during LOOKUPUID: ".$mesg->error.". trying to reconnect" );
	  ldap_connect;
	  goto LOOKUPUID;
      } else {
	  mylog($syslog_priority, "LDAP Connection error during LOOKUPUID: ".$mesg->error.", giving up!" );
	  return "DEFER_IF_PERMIT LDAP Error during LOOKUPUID:: ".$mesg->error;
      }
  }
  # Check for allowed sender
  $tries = 0;
 CHECKSENDER:

  $mesg = $ldap->search( base=> $conf_basedn,
			    scope=> 'sub', 
			    filter=> "(&(objectClass=kolabinetorgperson)(|(mail=$sender)(alias=$sender)))");
  if( !$mesg->code ) {
    mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
    foreach $ldapobject ($mesg->entries) {
      mylog($syslog_priority, "Got object ".$ldapobject->get_value('uid') ) if $verbose;
      mylog($syslog_priority, "Got delegates ".join(", ", @{$ldapobject->get_value('kolabdelegate', asref => 1 )})) if $verbose;
      if( $username && ( lc($username) eq lc($ldapobject->get_value('uid'))  ||
                         lc($username) eq lc($ldapobject->get_value('mail')) ||
	                 contains( $username, $ldapobject->get_value('kolabdelegate', asref => 1 )))  ) {
	# All OK, user is sending as herself or as kolabdelegate
	mylog($syslog_priority, "$username using valid from address $sender") if $verbose;	
	goto CHECKDISTLIST;
      }
    }
  } else {
      # LDAP error?
      if( $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
	  mylog($syslog_priority, "LDAP Connection error during CHECKSENDER: ".$mesg->error.", trying to reconnect" );
	  ldap_connect;
	  goto CHECKSENDER;
      } else {
	  mylog($syslog_priority, "Query returned error during CHECKSENDER: ".$mesg->error ) if $verbose;	
	  return "DEFER_IF_PERMIT Temporary LDAP error during CHECKSENDER: ".$mesg->error;
      }
  }
  if( $conf_allowunauth && !$username ) {
    # Dont reject mail from other domains
    $sender =~ /(.*)@(.*)/;
    my $domain = $2;
    mylog($syslog_priority, "sender=$sender, domain=$domain") if $verbose;
    if( !contains( $domain, \@conf_domain ) ) {
      # Ok
      mylog($syslog_priority, "sending from other domains OK") if $verbose;
      goto CHECKDISTLIST;
    }
  }
  # UPS, fake sender
  mylog($syslog_priority, "Attempt to fake address $sender") if $verbose;	
  return "REJECT Invalid sender";
  
  # Check for valid access to restricted distribution lists
  $tries = 0;
 CHECKDISTLIST:
  if( !$username or $username eq '' ) {
    $recip =~ /(.*)@(.*)/;
    my $cn = $1;
    my $domain = $2;
    if( contains($domain,\@conf_domain ) ) {
      $mesg = $ldap->search( base=> "cn=internal,".$conf_basedn,
                             scope=> 'one', filter=> "(&(cn=$cn)(objectClass=kolabgroupofnames))");
      if( !$mesg->code && $mesg->count() > 0 ) {
	# Ups, recipient is a restricted list, reject
	mylog( $syslog_priority, "Attempt from $sender to access restricted list $recip" ) if $verbose;	
	return "REJECT Access denied";
      } elsif( $mesg->code && $mesg->code != LDAP_NO_SUCH_OBJECT && $tries++ <= $ldap_max_tries ) {
	  mylog($syslog_priority, "LDAP Connection error during CHECKDISTLIST: ".$mesg->error.", trying to reconnect" );
	  ldap_connect;
	  goto CHECKDISTLIST;
      } elsif( $mesg->code ) {
	mylog( $syslog_priority, "LDAP Error during CHECKDISTLIST: ".$mesg->error ) if $verbose;
	# Just fall through and accept the message in case there was an LDAP problem.
      }
    }
  }

  # The result can be any action that is allowed in a Postfix access(5) map.
  #
  # To label mail, return ``PREPEND'' headername: headertext
  #
  # In case of success, return ``DUNNO'' instead of ``OK'' so that the
  # check_policy_service restriction can be followed by other restrictions.
  #
  # In case of failure, specify ``DEFER_IF_PERMIT optional text...''
  # so that mail can still be blocked by other access restrictions.

  mylog($syslog_priority, "sender $sender, recipient $recip seems ok") if $verbose;

  return "DUNNO";
}

#
# Log an error and abort.
#
sub fatal_exit {
    my($first) = shift(@_);
    mylog("err", "fatal: $first", @_);
    print STDOUT "action=DEFER_IF_PERMIT $first\n\n";
    exit 1;
}

#
# Signal 11 means that we have crashed perl
#
sub sigsegv_handler {
    fatal_exit "Caught signal 11;";
}

$SIG{'SEGV'} = 'sigsegv_handler';

#
# This process runs as a daemon, so it can't log to a terminal. Use
# syslog so that people can actually see our messages.
#
setlogsock $syslog_socktype;
openlog $0, $syslog_options, $syslog_facility;

#
# We don't need getopt() for now.
#
$conf_allowunauth = 0;
while ($option = shift(@ARGV)) {
  if ($option eq "-v") {
    $verbose = 1;
  } elsif ($option eq '-ldap') {
    $conf_ldapuri = shift(@ARGV);
  } elsif ($option eq '-basedn') {
    $conf_basedn = shift(@ARGV);
  } elsif ($option eq '-binddn' ) {
    $conf_binddn = shift(@ARGV);
  } elsif ($option eq '-bindpw' ) {
    $conf_bindpw = shift(@ARGV);
  } elsif ($option eq '-domain') {
    push @conf_domain, shift(@ARGV);
  } elsif ($option eq '-allow-unauth') {
    $conf_allowunauth = 1;
  } elsif ($option eq '-permithosts') {
    for my $h (split /\s*,\s*/, shift(@ARGV)) {
      push @conf_permithosts, $h;
    }
  } else {
    mylog( $syslog_priority, "Invalid option: %s. Usage: %s [-v] -ldap  -basedn  [-binddn  -bindpw ] [-domain ] [-permithosts ]",
	   $option, $0);
    exit 1;
  }
}

#
# Unbuffer standard output.
#
select((select(STDOUT), $| = 1)[0]);

if( $verbose ) {
  mylog( $syslog_priority, "ldap=$conf_ldapuri, basedn=$conf_basedn, binddn=$conf_binddn");
}

ldap_connect;

#
# Receive a bunch of attributes, evaluate the policy, send the result.
#
while () {
    if (/([^=]+)=(.*)\n/) {
	$attr{substr($1, 0, 512)} = substr($2, 0, 512);
    } elsif ($_ eq "\n") {
	if ($verbose) {
	    for (keys %attr) {
		mylog( $syslog_priority, "Attribute: %s=%s", $_, $attr{$_});
	    }
	}
	fatal_exit "unrecognized request type: '%s'", $attr{'request'}
	    unless $attr{'request'} eq "smtpd_access_policy";
	$action = smtpd_access_policy();
	mylog( $syslog_priority, "Action: %s", $action) if $verbose;
	print STDOUT "action=$action\n\n";
	%attr = ();
    } else {
	chop;
	mylog( $syslog_priority, "warning: ignoring garbage: %.100s", $_);
    }
}

--- NEW FILE: kolab_sslcert.sh.in ---
#!/bin/sh

##  Copyright (c) 2003 Martin Konold 
##  Copyright (c) 2003 Tassilo Erlewein 
##  This program is Free Software under the GNU General Public License (>=v2).
##  Read the file COPYING that comes with this packages for details.


cd @sysconfdir@/kolab

if [ $1 ];then
  HN=$1
else
  HN=`hostname -f`
fi

echo "[ req ]" > tmp.req.cnf
echo "distinguished_name = req_distinguished_name" >> tmp.req.cnf
echo "default_bits = 1024" >> tmp.req.cnf
echo "prompt = no" >> tmp.req.cnf
echo "x509_extensions = v3_req" >> tmp.req.cnf
echo >> tmp.req.cnf
echo "string_mask = nombstr" >> tmp.req.cnf
echo >> tmp.req.cnf
echo "[ req_distinguished_name ]" >> tmp.req.cnf
echo "CN = $HN" >> tmp.req.cnf
echo >> tmp.req.cnf
echo "[ v3_req ]" >> tmp.req.cnf
echo "basicConstraints = CA:TRUE" >> tmp.req.cnf

echo -n "generate self-signed certificate for hostname $HN... "

    @bindir@/openssl req -new -x509 -outform PEM -keyform PEM -nodes \
                                   -days 3650 -out cert.pem -keyout key.pem \
		                   -config tmp.req.cnf >/dev/null 2>&1
echo "done"

chgrp @restricted_kolab_grp@ key.pem
chmod 0640 key.pem
chgrp @restricted_kolab_grp@ cert.pem
chmod 0640 cert.pem

#rm -f tmp.req.cnf

cd -

echo "New certificate has been installed under @sysconfdir@/kolab/"

--- NEW FILE: kolabcheckperm.in ---
#!@perl_exec@

# (c) 2004 Klaralvdalens 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.

use strict;
use Kolab;
use Kolab::Util;
use Kolab::Conf;

exit( Kolab::Conf::checkPermissions>0?0:-1 );

--- NEW FILE: kolabconf.in ---
#!@perl_exec@

##
##  Copyright (c) 2003  Code Fusion cc
##
##    Written by Stuart Binge  
##    Portions based on work by the following people:
##
##      (c) 2004  Klaraelvdalens Datakonsult AB
##	(c) 2003  Tassilo Erlewein  
##      (c) 2003  Martin Konold     
##      (c) 2003  Achim Frank       
##
##
##  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 of the License, 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 should have received a copy of the GNU General Public License
##  along with this program; if not, write to the Free Software
##  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##

use strict;
use Getopt::Std;
use Sys::Syslog;
use IO::File;
use Kolab;
use Kolab::Util;
use Kolab::Conf;
use Kolab::LDAP;
use vars qw($opt_d $opt_n $opt_h);

openlog('kolabconf', 'cons, pid', 'user');

getopts('dnh');
if ($opt_h) {
  print <<'EOS';
Usage: kolabconf [-d] [-n] [-h]

Option d (debug) to print out the current config.
Option n (noreload) to skip reloading services after changing configuration.
Option h (help) to get this text.
EOS
exit 0;
}
if ($opt_d) {
    foreach my $key (sort keys %Kolab::config) {
		my $value;
		if( ref($Kolab::config{$key}) eq "ARRAY" ) {
			$value = join( ", ", @{$Kolab::config{$key}});
		} else {
			$value = $Kolab::config{$key};
		}
        print "$key : " . $value . "\n";
    }
    exit 0;
}
my $do_reload = 1;
if($opt_n) {
  $do_reload = 0;
}

print 'kolabconf - Kolab Configuration Generator

  Version: @VERSION@

  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
  Copyright (c) 2003  Code Fusion cc
  Copyright (c) 2003  Tassilo Erlewein, Martin Konold, Achim Frank, erfrakon

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
';

if( !$Kolab::reloadOk ) {
  my $msg = "Error loading configuration. Maybe the LDAP server is not running. Please check the system log for errors.";
  print STDERR "$msg\n";
  Kolab::log('KC', $msg);
  exit(-1);
}
Kolab::log('KC', 'Rebuilding templates');
Kolab::Conf::rebuildTemplates;
Kolab::log('KC', 'Reloading kolab components');
if( $do_reload ) {
  Kolab::reload;
}
#if ($pid) {
#    Kolab::log('KC', "Refreshing the kolab daemon (w/ PID $pid)");
#    kill('HUP', $pid);
#} else {
#    Kolab::log('KC', "Unable to determine the PID of the kolab daemon; skipping refresh", KOLAB_WARN);
#}
Kolab::log('KC', 'Finished');

--- NEW FILE: kolabd.in ---
#!@perl_exec@

##
##  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
##  Copyright (c) 2003  Code Fusion cc
##
##    Writen by Stuart Bing?
##    Portions based on work by the following people:
##
##      (c) 2003  Tassilo Erlewein  
##      (c) 2003  Martin Konold     
##      (c) 2003  Achim Frank       
##
##
##  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 .
##

#
#  Module prefixes in the logs:
#    K: kolabd
#    C: Config
#    T: Templates
#    L: LDAP
#    Y: Cyrus
#    B: Backend
#    KC: kolabconf
#    DS: DirServ
#    Anything else: the various backends
#

use strict;
use Sys::Syslog;
use IO::File;
use Kolab;
use Kolab::Util;
use Kolab::DirServ;
use Kolab::LDAP;
use Kolab::LDAP::Backend;
use vars qw(%pids);

openlog('kolabd', 'cons, pid', 'user');

# won't be needed now (i think)
# my $prefix = $Kolab::config{'prefix'};

my $pidfile = IO::File->new("@kolab_pidfile", 'w+')
    || die "Unable to open PID file `@kolab_pidfile@'";
print $pidfile $$;
undef $pidfile;

sub sigInt
{
    Kolab::Util::superLog('Kolab is shutting down');

    Kolab::log('K', 'SIGINT/SIGTERM detected, kill()ing children');

    foreach my $pid (keys %pids) {
        kill('INT', $pid);
        waitpid($pid, 0);
    }

    Kolab::LDAP::shutdown;

    Kolab::log('K', 'Exiting');
    exit(0);
}

sub sigHup
{
    Kolab::log('K', 'Refreshing configuration');
    foreach my $pid (keys %pids) {
        kill('INT', $pid);
        waitpid($pid, 0);
    }
    %pids = ();
    Kolab::reloadConfig;
    Kolab::log('K', 'Synchronising');
    Kolab::LDAP::sync;
    Kolab::log('K', 'Reloading addressbook.peers');
    Kolab::DirServ::reloadPeers;
    Kolab::log('K', 'Finished refresh');
    &run;
}

sub sigDie {
  Kolab::log( 'K', $_[0], KOLAB_ERROR );
}

sub run
{
    my $pid;
    my $finished = 0;
    foreach my $backend (keys %Kolab::LDAP::Backend::backends) {
        Kolab::log('K', "Forking `$backend' listener");
        $pid = fork;
        if (!defined($pid)) {
	    Kolab::log('K', "Unable to fork `$backend' listener", KOLAB_ERROR);
            exit(1);
        }

        if ($pid) {
            $pids{$pid} = 1;
            $finished++;
            next;
        }
        Kolab::LDAP::Backend::run($backend);

        Kolab::log('K', "`$backend' returned");
	# exit with 0 status to avoid killing daemon
	exit(0);
    }

    $SIG{'INT'} = \&sigInt;
    $SIG{'TERM'} = \&sigInt;
    $SIG{'HUP'} = \&sigHup;
    $SIG{__DIE__} = \&sigDie;

    Kolab::log('K', 'Listeners spawned, wait()ing');

    while ($finished > 0) {
        wait;
        if ($?) {
            Kolab::log('K', 'Abnormal child exit status encountered, aborting');
            kill('INT', $$);
        } else {
            Kolab::log('K', 'Child terminated normally');
        }
    }
}

print 'kolabd - Kolab Backend Daemon

  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
  Copyright (c) 2003  Code Fusion cc
  Copyright (c) 2003  Tassilo Erlewein, Martin Konold, Achim Frank

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
';

Kolab::Util::superLog('Kolab is starting up');

eval {
  Kolab::LDAP::startup;

  Kolab::log('K', 'Loading backends');
  Kolab::LDAP::Backend::load;
  Kolab::LDAP::Backend::load('user');
  Kolab::LDAP::Backend::load('sf');
  Kolab::LDAP::Backend::load('dirservd',1);
  
  Kolab::log('K', 'Performing backend startup');
  &Kolab::LDAP::Backend::startup;
  
  Kolab::log('K', 'Synchronising');
  Kolab::LDAP::sync;
  
  Kolab::log('K', 'Synchronisation complete, starting up daemon');
  run;
}; Kolab::log( 'K', $@, KOLAB_ERROR ) if $@;


--- NEW FILE: kolabd.spec.in ---
##
##  kolabd.spec -- OpenPKG RPM Specification
##  Copyright (c) 2004-2005 Klaraelvdalens Datakonsult AB 
##  Copyright (c) 2000-2004 The OpenPKG Project 
##  Copyright (c) 2000-2004 Ralf S. Engelschall 
##  Copyright (c) 2000-2004 Cable & Wireless 
##
##  Permission to use, copy, modify, and distribute this software for
##  any purpose with or without fee is hereby granted, provided that
##  the above copyright notice and this permission notice appear in all
##  copies.
##
##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
##  SUCH DAMAGE.
##

#   package version
%define       V_ei_maj 2.0
%define       V_ei_min 0
%define       V_cf     1.0.4

#   package information
Name:         kolabd
Summary:      Kolab2 Groupware Server Daemon
URL:          http://www.kolab.org/
Vendor:       Erfrakon, Intevation, Code Fusion, Klaraelvdalens Datakonsult AB
Packager:     Klaraelvdalens Datakonsult AB
Distribution: OpenPKG
Class:        PLUS
Group:        Mail
License:      GPL
Version:      @VERSION@
Release:      @spec_build_date@

#   list of sources
Source0:      kolabd-%{version}.tar.gz
#Source1:      rc.kolabd

#   build information
Prefix:       %{l_prefix}
BuildRoot:    %{l_buildroot}
BuildPreReq:  OpenPKG, openpkg >= 2.0.0
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
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.7-20050728, perl-db
PreReq:	      amavisd >= 2.3.1-2.4.0
PreReq:	      clamav
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]
    clients using third party plugins and web clients in the future. 
    In addition it is a robust and flexible general IMAP mail server 
    with LDAP addressbooks.
    Kolab %{V_ei_maj}.%{V_ei_min}

    The Code Fusion fork adds functionality such as integration with
    Active Directory, a more modularised backend, separation of the
    daemon and the configuration generator and more.
    Code Fusion Engine %{V_cf}, shares Admin (see above)

%track
    prog kolab-ei = {
        version   = %{V_ei_maj}.%{V_ei_min}
        url       = ftp://ftp.kdab.net/pub/kolab/server/current/
        regex     = kolabd-(__VER__)\.src\.rpm
    }

%prep
    %setup -q

%build
    ./configure --prefix=%{l_prefix} --enable-dist=kolab
    %{l_make} %{l_mflags}

%install
    rm -rf $RPM_BUILD_ROOT

    #   install package
    %{l_make} %{l_mflags} install \
        DESTDIR=$RPM_BUILD_ROOT

    #   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' \
	'%config %{l_prefix}/etc/kolab/quotawarning.txt' \
	'%config %{l_prefix}/etc/kolab/templates/*.template'

%files -f files

%clean
    rm -rf $RPM_BUILD_ROOT

%post
    %{l_shtool} echo -e "Installing crontab entry"
	# NOTE: OpenPKG's dcron package does not work currently, 
	# so we have to rely on the host system's cron:
    %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
	'
*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | crontab - -u %{l_musr}

    echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/etc/kolab/kolab_bootstrap -b' as user root."
    echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."
    echo "In every case execute '$RPM_INSTALL_PREFIX/bin/openpkg rc kolabd restart' as user root."

--- NEW FILE: kolabpasswd.in ---
#!@perl_exec@ -w 

# The kolabpasswd script is used for changing the manager password on a Kolab Server.
# In multi-location Kolab setups the script must be run on each individual host 
# seperately.
# After changing the manager password it is highly recommended to restart 
# the Kolab server.
# In the future this utility may be enhanced to allow to change the passwords of 
# normal users and special system accounts.

##  Copyright (c) 2004  Erfrakon
##
##      (c) 2004  Tassilo Erlewein  
##      (c) 2004  Martin Konold     
##
##  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 .

use Term::ReadKey;
use IO::File;
use File::Temp;
use Net::LDAP;
use Kolab::Util;

# won't be needed (i think)
# my $kolab_prefix = (getpwnam('kolab'))[7] || die "Error: could not determine the kolab directory prefix (e.g. /kolab)";

# Hash a password
sub hashPassword {
  my $pw = shift;
  my $hashcmd = "@sbindir@/slappasswd -s '".$pw."'";
  (my $hashpw = `$hashcmd`) or die $@;
  chomp($hashpw);
  return $hashpw;
}

# open old kolab master config file
my $kolabconfname = "@sysconfdir@/kolab/kolab.conf";

# read old config data
my %config = readConfig($kolabconfname);
my $kolabconf = IO::File->new(@sysconfdir@/kolab/kolab.conf','r')
                || die "kolabpasswd: Fatal Error: could not open kolab config at $kolabconfname";

my $account = 'manager';
my $account_dn = $config{'bind_dn'};
if( $#ARGV == 0 ) {
    $account = $ARGV[0];
    if( $account ne 'calendar' and $account ne 'nobody' and $account ne 'manager' ) {
	die("$^X can only change the passwod for manager, nobody and calendar");
    }
    $account_dn =~ s/cn=manager/cn=$account/;
}
      
print "Changing password for $account";

# open ldap connection and verify old password
my $ldap = Net::LDAP->new( $config{'ldap_uri'})
         || die "\nkolabpasswd: Fatal Error: could not connect to LDAP Server";

do {
  print "\nOld Password: ";
  ReadMode 'noecho';
  my $old_password = ReadLine 0; chomp $old_password;

  $mesg = $ldap->bind( $account_dn, password => $old_password ) || die "\nkolabpasswd: Failed to bind to LDAP server";
  if( $mesg->code ) { print "\nError: ".$mesg->error.". Please try again\n"; }
} while ( $mesg->code );
   
# read in new password
print "\nNew Password for $account: ";
ReadMode 'noecho';
my $new_password = ReadLine 0; chomp $new_password;

print "\nRe-enter New Password: ";
my $new_password2 = ReadLine 0; chomp $new_password2;
print "\n";
ReadMode 'normal';
($new_password eq $new_password2) || die "Sorry, passwords do not match.\n";

my $bind_pw_hash;

# create temporary config file
my $tmp = new File::Temp( TEMPLATE => 'tempXXXXX', DIR => '@sysconfdir@/kolab', UNLINK => 0, SUFFIX => '.conf')
     || die "Error: could not create temporary file under @sysconfdir@/kolab";
$tmpfilename = $tmp->filename;
$bind_pw_hash = hashPassword($new_password);

# copy and replace old config to temporary file
foreach ($kolabconf->getlines()) {
    if( $account eq 'manager' ) {
	if (/^(bind_pw\s:\s).*$/) {
	    print $tmp $1.$new_password."\n";
	} else {
	    if (/^(bind_pw_hash\s:\s).*$/) {
		print $tmp $1.$bind_pw_hash."\n"; 
	    } else {
		print $tmp $_;
	    }
	}
    } elsif( $account eq 'calendar' ) {
	if (/^(calendar_pw\s:\s).*$/) {
	    print $tmp $1.$new_password."\n";
	} else {
	    print $tmp $_;
	}
    } elsif( $account eq 'nobody' ) {
	if (/^(php_pw\s:\s).*$/) {
	    print $tmp $1.$new_password."\n";
	} else {
	    print $tmp $_;  
	}
    }
}
undef $tmp;
undef $kolabconf;

# open ldap connection and update manager password
$ldap = Net::LDAP->new( $config{'ldap_uri'})
   || die "Error: could not connect LDAP Server";
$ldap->bind( $config{'bind_dn'}, password => $config{'bind_pw'} )
   || die "Error: Failed to bind as manager to LDAP Server";
$ldap->modify($account_dn, replace => {'userPassword' => $bind_pw_hash } )
   || die "Error: could not update LDAP with new manager password";
$ldap->unbind;
undef $ldap;

# move temporary file to kolab master config
rename($tmpfilename,$kolabconfname) || die "Error: could not install new $kolabconfname";
system("chown @ldapserver_usr@:@ldapserver_grp@ $kolabconfname");

print "Password changed successfully, please be patient...\n";

# trigger kolabd to run update
system("@sbindir@/kolabconf > /dev/null 2>&1");
exit 0;

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

--- NEW FILE: rc.kolabd.in ---
#!@prefix@/lib/openpkg/bash @sysconfdir@/rc
##
##  rc.kolabd -- Run-Commands
##

%config
    kolabd_enable="$openpkg_rc_def"
    kolabd_log_resmgr_logfile="@resmgr_logfile@"
    kolabd_log_resmgr_owner="@kolab_usr@"
    kolabd_log_resmgr_group="@kolab_grp@"
    kolabd_log_resmgr_prolog="true"
    kolabd_log_resmgr_epilog="true"
    kolabd_log_resmgr_numfiles="10"
    kolabd_log_resmgr_minsize="1M"
    kolabd_log_resmgr_complevel="9"
    kolabd_log_freebusy_logfile="@freebusy_logfile@"
    kolabd_log_freebusy_owner="@kolab_usr@"
    kolabd_log_freebusy_group="@kolab_grp@"
    kolabd_log_freebusy_prolog="true"
    kolabd_log_freebusy_epilog="true"
    kolabd_log_freebusy_numfiles="10"
    kolabd_log_freebusy_minsize="1M"
    kolabd_log_freebusy_complevel="9"
    kolabd_log_fbview_logfile="@fbview_logfile@"
    kolabd_log_fbview_owner="@kolab_usr@"
    kolabd_log_fbview_group="@kolab_grp@"
    kolabd_log_fbview_prolog="true"
    kolabd_log_fbview_epilog="true"
    kolabd_log_fbview_numfiles="10"
    kolabd_log_fbview_minsize="1M"
    kolabd_log_fbview_complevel="9"

%common
    kolabd_pidfile="@kolab_pidfile@"
    kolabd_signal () {
        [ -f $kolabd_pidfile ] && kill -$1 `cat $kolabd_pidfile`
    }

%status -u root -o
    kolabd_usable="unknown"
    kolabd_active="no"
    rcService kolabd enable yes && \
        kolabd_signal 0 && kolabd_active="yes"
    echo "kolabd_enable=\"$kolabd_enable\""
    echo "kolabd_usable=\"$kolabd_usable\""
    echo "kolabd_active=\"$kolabd_active\""

%start -p 600 -u @kolab_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active yes && exit 0
    @sbindir@/kolabd &
    sleep 5

%stop -p 600 -u @kolab_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active no  && exit 0
    kolabd_signal TERM
    sleep 5

%restart -u @kolab_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active no  && exit 0
    rc kolabd stop start

%reload -u @kolab_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active no  && exit 0
    kolabd_signal HUP
    sleep 5

%daily -u root
    rcService kolabd enable yes || exit 0
    #   rotate logfiles
    shtool rotate -f \
        -n ${kolabd_log_resmgr_numfiles} -s ${kolabd_log_resmgr_minsize} -d \
        -z ${kolabd_log_resmgr_complevel} -m 640 \
	-o ${kolabd_log_resmgr_owner} \
	-g ${kolabd_log_resmgr_group} \
        -P "${kolabd_log_resmgr_prolog}" \
        -E "${kolabd_log_resmgr_epilog}" \
	"${kolabd_log_resmgr_logfile}"
    shtool rotate -f \
        -n ${kolabd_log_freebusy_numfiles} -s ${kolabd_log_freebusy_minsize} -d \
        -z ${kolabd_log_freebusy_complevel} -m 640 \
	-o ${kolabd_log_freebusy_owner} \
	-g ${kolabd_log_freebusy_group} \
        -P "${kolabd_log_freebusy_prolog}" \
        -E "${kolabd_log_freebusy_epilog}" \
	"${kolabd_log_freebusy_logfile}"
    shtool rotate -f \
        -n ${kolabd_log_fbview_numfiles} -s ${kolabd_log_fbview_minsize} -d \
        -z ${kolabd_log_fbview_complevel} -m 640 \
	-o ${kolabd_log_fbview_owner} \
	-g ${kolabd_log_fbview_group} \
        -P "${kolabd_log_fbview_prolog}" \
        -E "${kolabd_log_fbview_epilog}" \
	"${kolabd_log_fbview_logfile}"

--- NEW FILE: workaround.sh.in ---
#!/bin/sh
# (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.


@bindir@/cyradm --user manager --password $2 localhost <

Author: steffen

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

Added Files:
	common gentoo kolab mandriva 
Log Message:
kolabd autoconfiscated!

--- NEW FILE: common ---
do_subst = sed \
	-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
	-e 's,[@]bindir[@],$(bindir),g' \
	-e 's,[@]sbindir[@],$(sbindir),g' \
	-e 's,[@]prefix[@],$(prefix),g' \
	-e 's,[@]libdir[@],$(libdir),g' \
	-e 's,[@]datadir[@],$(datadir),g' \
	-e 's,[@]bash_exec[@],$(bash_exec),g' \
	-e 's,[@]perl_exec[@],$(perl_exec),g' \
	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
	-e 's,[@]VERSION[@],$(VERSION),g' \
	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
	-e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
	-e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
	-e 's,[@]ldapserver_grp[@],$(ldapserver_grp),g' \
	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
	-e 's,[@]ftpserver_logfile[@],$(ftpserver_logfile),g' \
	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
	-e 's,[@]clamav_logfile[@],$(clamav_logfile),g' \
	-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
	-e 's,[@]ldapserver_logfile[@],$(ldapserver_logfile),g' \
	-e 's,[@]postfix_logfile[@],$(postfix_logfile),g' \
	-e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
	-e 's,[@]clamav_usr[@],$(clamav_usr),g' \
	-e 's,[@]clamav_grp[@],$(clamav_grp),g' \
	-e 's,[@]clamav_logdir[@],$(clamav_logdir),g' \
	-e 's,[@]clamav_pidfile[@],$(clamav_pidfile),g' \
	-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
	-e 's,[@]clamav_socket[@],$(clamav_socket),g' \
	-e 's,[@]clamav_rusr[@],$(clamav_rusr),g' \
	-e 's,[@]imap_confdir[@],$(imap_confdir),g' \
	-e 's,[@]imap_usr[@],$(imap_usr),g' \
	-e 's,[@]imap_grp[@],$(imap_grp),g' \
	-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
	-e 's,[@]webserver_confdir[@],$(webserver_confdir),g' \
	-e 's,[@]webserver_usr[@],$(webserver_usr),g' \
	-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
	-e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
	-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \
	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
	-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
	-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
	-e 's,[@]webserver_document_root[@],$(webserver_document_root),g' \
	-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
	-e 's,[@]webserver_phpdir[@],$(webserver_phpdir),g' \
	-e 's,[@]phplibdir[@],$(phplibdir),g' \
	-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
	-e 's,[@]imap_spool[@],$(imap_spool),g' \
	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
	-e 's,[@]emailserver_confdir[@],$(emailserver_confdir),g' \
	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
	-e 's,[@]emailserver_grp[@],$(emailserver_grp),g' \
	-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
	-e 's,[@]emailserver_sasl_conffile[@],$(emailserver_sasl_conffile),g' \
	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
	-e 's,[@]ftpserver_confdir[@],$(ftpserver_confdir),g' \
	-e 's,[@]ftpserver_musr[@],$(ftpserver_musr),g' \
	-e 's,[@]ftpserver_grp[@],$(ftpserver_grp),g' \
	-e 's,[@]ftpserver_usr[@],$(ftpserver_usr),g' \
	-e 's,[@]ftpserver_uid[@],$(ftpserver_uid),g' \
	-e 's,[@]ftpserver_gid[@],$(ftpserver_gid),g' \
	-e 's,[@]ftpserver_scoreboardfile[@],$(ftpserver_scoreboardfile),g' \
	-e 's,[@]kolab_musr[@],$(kolab_musr),g' \
	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
	-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
	-e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \
	-e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
	-e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
	-e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
	-e 's,[@]libexecdir[@],$(libexecdir),g' \
	-e 's,[@]ldapconfdir[@],$(ldapconfdir),g' \
	-e 's,[@]amavisdconfdir[@],$(amavisdconfdir),g' \
	-e 's,[@]localstatedir[@],$(localstatedir),g' \
	-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g'

--- NEW FILE: gentoo ---
kolab_usr=kolab-n               # @l_nusr@
kolab_grp=kolab-n               # @l_ngrp@
kolab_uid=1002                  # @l_nuid@
kolab_gid=1002                  # @l_ngid@
restricted_kolab_usr=kolab-r    # @l_rusr@
restricted_kolab_grp=kolab-r    # @l_rgrp@

rcdir=${sysconfdir}/rc

kolabd_usr=root
kolab_statedir = ${localstatedir}/lib/kolab

sasl_confdir = ${sysconfdir}/sasl2

imap_confdir=${sysconfdir}
imap_confperm=0644
imap_usr=root
imap_grp=root

clamav_socket=${localstatedir}/clamav/clamd.sock
clamav_logfile=${localstatedir}/clamav/clamd.log
clamav_pidfile=${localstatedir}/clamav/clamd.pid
clamav_confdir=${sysconfdir}

postfix_usr=root
postfix_grp=root

emailscan_usr=${restricted_kolab_usr}
emailscan_grp=${restricted_kolab_grp}

emailserver_socket=${localstatedir}/kolab/lmtp
emailserver_localstatedir=${localstatedir}/postfix
emailserver_imapdir=${localstatedir}/imapd
emailserver_imapspooldir=${localstatedir}/imapd/spool
emailserver_sievedir=${localstatedir}/imapd/sieve
emailserver_sasl_conffile=${sasl_confdir}/apps/smtpd.conf
emailserver_usr=${kolab_usr}
emailserver_grp=${restricted_kolab_grp}
emailserver_mail_usr=kolab              # = @l_musr@

ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
ftpserver_pidfile=${localstatedir}/run/proftpd.pid
ftpserver_confdir=${sysconfdir}/proftpd
ftpserver_usr=${kolab_usr}
ftpserver_grp=${kolab_grp}
ftpserver_uid=19416
ftpserver_gid=19416

kolab_logdir=${localstatedir}/kolab/log
kolab_pidfile=${localstatedir}/kolab/kolab.pid

ldapserver_dir=${localstatedir}/lib/openldap-data
ldapserver_rundir=${localstatedir}/lib/openldap/run
ldapserver_schemadir=${sysconfdir}/openldap/schema
ldapserver_replogfile=${localstatedir}/lib/openldap/replog
ldapserver_argsfile=${localstatedir}/lib/openldap/slapd.args
ldapserver_usr=ldap
ldapserver_grp=ldap

webserver_document_root=${localstatedir}/kolab/www
webserver_logdir=${localstatedir}/apache/log
webadmindir = ${libdir}
webserver_confdir=${sysconfdir}/apache/conf
webserver_pidfile=${localstatedir}/apache/run/apache.pid
webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
webserver_mime_typesfile=${sysconfdir}/apache/mime.types
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}

sysrundir = ${localstatedir}/run


--- NEW FILE: kolab ---
# @l_nusr@
kolab_usr=kolab-n
# @l_ngrp@
kolab_grp=kolab-n
# @l_musr@
kolab_musr=kolab
# @l_mgrp@
kolab_mgrp=kolab
# @l_nuid@
kolab_uid=1002
# @l_ngid@
kolab_gid=1002
# @l_rusr@
restricted_kolab_usr=kolab-r
# @l_rgrp@
restricted_kolab_grp=kolab-r
kolab_rusr=${restricted_kolab_usr}
kolab_rgrp=${restricted_kolab_grp}
# @l_susr@
kolab_susr=root


kolab_rcdir=${sysconfdir}/rc.d

bash_exec=${libdir}/openpkg/bash
perl_exec=${bindir}/perl

amavisd_confdir=${sysconfdir}/amavisd
amavisd_logfile=${localstatedir}/amavisd/amavis.log
amavisd_home=${localstatedir}/amavisd
# @l_rusr@
amavisd_rusr=kolab-r
# @l_musr@
amavisd_usr=kolab
# @l_rgrp@
amavisd_grp=kolab-r


fsl_logfile=${localstatedir}/fsl/fsl.log

clamav_confdir=${sysconfdir}/clamav
clamav_socket=${localstatedir}/clamav/clamd.sock
clamav_logfile=${localstatedir}/clamav/clamd.log
clamav_pidfile=${localstatedir}/clamav/clamd.pid
clamav_datadir=${datadir}/clamav
freshclam_logfile=${localstatedir}/clamav/freshclam.log
freshclam_pidfile=${sysrundir}/freshclam.pid
# @l_rusr@
clamav_rusr=${restricted_kolab_usr}
# @l_musr@
clamav_usr=kolab
# @l_rgrp@
clamav_grp=${restricted_kolab_usr}

# @l_musr@
postfix_usr=kolab
# @l_rgrp@
postfix_grp=kolab-r
postfix_logfile=${localstatedir}/postfix/log/postfix.log

emailscan_usr=${restricted_kolab_usr}
emailscan_grp=${restricted_kolab_grp}

emailserver_confdir=${sysconfdir}/postfix
emailserver_socket=${localstatedir}/kolab/lmtp
emailserver_localstatedir=${localstatedir}/postfix
emailserver_imapdir=${localstatedir}/imapd
emailserver_imapspooldir=${localstatedir}/imapd/spool
emailserver_sievedir=${localstatedir}/imapd/sieve
emailserver_sasl_conffile=${sysconfdir}/sasl/apps/smtpd.conf
emailserver_usr=${kolab_usr}
emailserver_musr=kolab
emailserver_grp=${restricted_kolab_grp}
# @l_musr@
emailserver_mail_usr=kolab

ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
ftpserver_confdir=${sysconfdir}/proftpd
ftpserver_pidfile=${localstatedir}/proftpd/proftpd.pid
ftpserver_musr=kolab
ftpserver_usr=${kolab_usr}
ftpserver_grp=${kolab_grp}
# Why hardcoded uid/gid???
ftpserver_uid=19416
ftpserver_gid=19416

imap_confdir=${sysconfdir}/imapd
imap_confperm=0640
# @l_musr@
imap_usr=kolab
# @l_rgrp@
imap_grp=kolab-r
imap_masterlogfile=${localstatedir}/imapd/log/master.log
imap_misclogfile=${localstatedir}/imapd/log/misc.log
imap_statedir=${localstatedir}/imapd
imap_spool=${imap_statedir}/spool
imap_sievedir=${imap_statedir}/sieve
imap_lmtp=${imap_statedir}/lmtp

kolabd_usr=root
kolab_logdir=${localstatedir}/kolab/log
kolab_statedir=${localstatedir}/kolab
kolab_pidfile=${localstatedir}/kolab/kolab.pid
kolab_mailboxuiddb=$(localstatedir)/kolab/mailbox-uidcache.db

ldapserver_dir=${localstatedir}/openldap/openldap-data
ldapserver_rundir=${localstatedir}/openldap/run
ldapserver_pidfile=${ldapserver_rundir}/slapd.pid
ldapserverslurpd_pidfile=${ldapserver_rundir}/slurpd.pid
ldapserver_schemadir=${sysconfdir}/openldap/schema
ldapserver_replogfile=${localstatedir}/openldap/replog
ldapserver_argsfile=${localstatedir}/openldap/slapd.args
ldapserver_logfile=${localstatedir}/openldap/openldap.log
ldapserver_confdir=${sysconfdir}/openldap
# @l_musr@
ldapserver_usr=kolab
# @l_mgrp@
ldapserver_grp=kolab

webserver_document_root=${localstatedir}/kolab/www
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_phpdir=${localstatedir}/kolab/php
webserver_sessions=${localstatedir}/kolab/httpd_sessions
phplibdir=${libdir}/php
webserver_logdir=${localstatedir}/apache/log
webserver_acceptlock=${webserver_logdir}/accept.lock
webserver_runtime_status=${webserver_logdir}/apache_runtime_status
webserver_errorlogfile=${webserver_logdir}/apache-error.log
webserver_accesslogfile=${webserver_logdir}/apache-access.log
webserver_confdir=${sysconfdir}/apache
webserver_pidfile=${localstatedir}/apache/run/apache.pid
webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
webserver_mime_typesfile=${sysconfdir}/apache/mime.types
webserver_sslscache=${webserver_logdir}/ssl_scache
webserver_sslmutex=${webserver_logdir}/ssl_mutex
webserver_musr=kolab
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}

webadmindir=${localstatedir}/kolab

sasl_confdir=${sysconfdir}/sasl
sasl_logfile=${localstatedir}/sasl/log/saslauthd.log

sysrundir=${localstatedir}/run

resmgr_logfile=${localstatedir}/resmgr/resmgr.log
resmgr_confdir=${sysconfdir}/resmgr
# @l_musr@
resmgr_usr=kolab
# @l_ngrp@
resmgr_grp=kolab-n

fbview_logfile=${localstatedir}/resmgr/fbview.log
freebusy_logfile=${localstatedir}/resmgr/freebusy.log

graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db

--- NEW FILE: mandriva ---
kolab_usr=kolab               # kolab-n
kolab_grp=kolab               # kolab-n
kolab_uid=60001               # @l_nuid@
kolab_gid=60001               # @l_ngid@
restricted_kolab_usr=kolab    # kolab-r
restricted_kolab_grp=kolab    # kolab-r

rcdir=${sysconfdir}/rc

kolabd_usr=root
kolab_statedir = ${localstatedir}/kolab

sasl_confdir = ${sysconfdir}

imap_confdir=${sysconfdir}
imap_confperm=0644
imap_usr=cyrus
imap_grp=mail

clamav_socket=${localstatedir}/clamav/clamd.sock
clamav_logfile=/var/log/clamav/clamd.log
clamav_pidfile=/var/run/clamav/clamd.pid
clamav_confdir=${sysconfdir}

postfix_usr=postfix
postfix_grp=postfix

emailscan_usr=${restricted_kolab_usr}
emailscan_grp=${restricted_kolab_grp}

emailserver_socket=${localstatedir}/imap/socket/lmtp
emailserver_localstatedir=/var/spool/postfix
emailserver_imapdir=${localstatedir}/imap
emailserver_imapspooldir=/var/spool/imap
emailserver_sievedir=${localstatedir}/imap/sieve
emailserver_sasl_conffile=${sasl_confdir}/postfix/sasl/smtpd.conf
emailserver_usr=${kolab_usr}
emailserver_grp=${restricted_kolab_grp}
emailserver_mail_usr=kolab              # = kolab

ftpserver_scoreboardfile=/var/run/proftpd/proftpd.scoreboard
ftpserver_logfile=/var/log/proftpd/proftpd.log
ftpserver_pidfile=/var/run/proftpd.pid
ftpserver_confdir=${sysconfdir}
ftpserver_usr=nobody
ftpserver_grp=nogroup
ftpserver_uid=65534
ftpserver_gid=65534

kolab_logdir=/var/log/kolab
kolab_pidfile=/var/run/kolab/kolab.pid

ldapserver_dir=${localstatedir}/ldap-kolab
ldapserver_rundir=/var/run/ldap
ldapserver_schemadir=${datadir}/openldap/schema
ldapserver_replogfile=${localstatedir}/ldap-kolab/replog
ldapserver_argsfile=/var/run/ldap/slapd.args
ldapserver_usr=ldap
ldapserver_grp=ldap

webserver_document_root=/var/www/html/kolab
webserver_logdir=/var/log/httpd
webadmindir = /var/www/html/kolab/admin
webserver_confdir=${sysconfdir}/httpd/conf
webserver_pidfile=/var/run/httpd/httpd.pid
webserver_mime_magicfile=${sysconfdir}/httpd/conf/magic
webserver_mime_typesfile=${sysconfdir}/httpd/conf/mime.types
webserver_usr=apache
webserver_grp=apache

sysrundir = /var/run



From cvs at intevation.de  Tue Sep 13 16:38:24 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 16:38:31 2005
Subject: steffen: server/kolabd/kolabd/doc README.amavisd.in, NONE,
	1.1 README.webgui.in, NONE, 1.1 README.amavisd, 1.1,
	NONE README.webgui, 1.1, NONE 
Message-ID: <20050913143824.40304101F1A@lists.intevation.de>

Author: steffen

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

Added Files:
	README.amavisd.in README.webgui.in 
Removed Files:
	README.amavisd README.webgui 
Log Message:
kolabd autoconfiscated!

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

Last edited: $Id: README.amavisd.in,v 1.1 2005/09/13 14:38:22 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.
--- NEW FILE: README.webgui.in ---
Web admin interface for Kolab
=============================

Last edited: $Id: README.webgui.in,v 1.1 2005/09/13 14:38:22 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' );
--- README.amavisd DELETED ---

--- README.webgui DELETED ---


From cvs at intevation.de  Tue Sep 13 16:38:24 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 16:38:32 2005
Subject: steffen: server/kolabd/kolabd/namespace/libexec adduser.in, NONE,
	1.1 deluser.in, NONE, 1.1 listusers.in, NONE, 1.1 newconfig.in,
	NONE, 1.1 services.in, NONE, 1.1 showlog.in, NONE,
	1.1 showuser.in, NONE, 1.1 start.in, NONE, 1.1 stop.in, NONE,
	1.1 adduser, 1.2, NONE deluser, 1.1.1.1, NONE listusers,
	1.1.1.1, NONE newconfig, 1.1.1.1, NONE services, 1.1.1.1,
	NONE showlog, 1.1.1.1, NONE showuser, 1.1.1.1, NONE start,
	1.1.1.1, NONE stop, 1.1.1.1, NONE 
Message-ID: <20050913143824.495A9101F1B@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd/namespace/libexec
In directory doto:/tmp/cvs-serv22600/kolabd/namespace/libexec

Added Files:
	adduser.in deluser.in listusers.in newconfig.in services.in 
	showlog.in showuser.in start.in stop.in 
Removed Files:
	adduser deluser listusers newconfig services showlog showuser 
	start stop 
Log Message:
kolabd autoconfiscated!

--- NEW FILE: adduser.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##

if [ ".$1" = ".--showhelp" ]; then
	echo "Add a user mailbox"
	exit 0
	HASHELP
fi

#Collect some vitals
SERVER=127.0.0.1

BINDDN=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_dn :" | sed -e "s;bind_dn : ;;"`
BINDPW=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_pw :" | sed -e "s;bind_pw : ;;"`
BASEDN=`cat @sysconfdir@/kolab/kolab.conf | grep "base_dn :" | sed -e "s;base_dn : ;;"`
HOMESERV=`cat @sysconfdir@/kolab/kolab.conf | grep "fqdnhostname :" | sed -e "s;fqdnhostname : ;;"`

echo "Please specify the firstname:"
read FIRSTNAME
echo "Please specify the lastname:"
read LASTNAME
echo "Please specify the email address:"
read EMAIL
echo "Please specify the password:"
read PASSWORD
echo "Please specify the quota (kb):"
read QUOTA

CN="$FIRSTNAME $LASTNAME"
SN="$LASTNAME"

#Sanity checks
if test "$FIRSTNAME" = ""; then
echo "You must specify a firstname"
exit 255
fi
if test "$LASTNAME" = ""; then
echo "You must specify a lastname"
exit 255
fi
if test "$EMAIL" = ""; then
echo "You must specify a valid mail address"
exit 255
fi
if test "$PASSWORD" = ""; then
echo "You must specify a password"
exit 255
fi

#Echo to user - last chance
echo "--"
echo "About to add the following user:"
echo "Name: $CN"
echo "Mail: $EMAIL"
echo "Password: $PASSWORD"
if test "$QUOTA" != ""; then
echo "Quota: ${QUOTA}kb"
fi
echo "--"

#Check if the user already exists
DN=`@bindir@/kolab showuser $EMAIL | grep dn`
if test "$DN" != ""; then
echo User already found! Or other error occurred.
exit 255
fi

echo "Are you sure you want to proceed? (y/n)"
read ANS
if test "$ANS" != "y"; then
echo Aborted
exit 255
fi



#Create the ldif
LDIFFILE="/tmp/cfadduser.ldif"
trap "rm $LDIFFILE" 0 1 2 3 15

cat < $LDIFFILE
dn: cn=$CN,$BASEDN
objectClass: top
objectClass: inetOrgPerson
objectClass: kolabInetOrgPerson
mail: $EMAIL
uid: $EMAIL
sn: $LASTNAME
givenName: $FIRSTNAME
cn: $CN
userPassword: $PASSWORD
kolabHomeServer: $HOMESERV
LDIF

if test "$QUOTA" != ""; then
echo "userquota: $QUOTA" >> $LDIFFILE
fi

@bindir@/ldapadd -x -D "$BINDDN" -w $BINDPW -h $SERVER -f $LDIFFILE

--- NEW FILE: deluser.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##


if [ ".$1" = ".--showhelp" ]; then
	echo "Delete a user mailbox"
	exit 0
	HASHELP
fi

#Collect some vitals
SERVER=127.0.0.1

BINDDN=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_dn :" | sed -e "s;bind_dn : ;;"`
BINDPW=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_pw :" | sed -e "s;bind_pw : ;;"`
BASEDN=`cat @sysconfdir@/kolab/kolab.conf | grep "base_dn :" | sed -e "s;base_dn : ;;"`
HOMESERV=`cat @sysconfdir@/kolab/kolab.conf | grep "fqdnhostname :" | sed -e "s;fqdnhostname : ;;"`

DN=`@bindir@/kolab showuser $1 | grep dn`
if test "$DN" = ""; then
echo User not found! 
exit 255
else
	echo $DN
	echo Are you sure you want to delete this user?
	read ANS
	if test "$ANS" != "y"; then
		exit 0
	fi
fi


LDIFFILE="/tmp/cfdeluser.ldif"
trap "rm $LDIFFILE" 0 1 2 3 15

cat < $LDIFFILE
$DN
add: kolabdeleteflag
kolabdeleteflag: $HOMESERV
LDIF

@bindir@/ldapmodify -x -D "$BINDDN" -w $BINDPW -h $SERVER -f $LDIFFILE 

--- NEW FILE: listusers.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##


if [ ".$1" = ".--showhelp" ]; then
	echo "Display a list of mailboxes"
	exit 0
	HASHELP
fi

server=127.0.0.1
binddn=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_dn :" | sed -e "s;bind_dn : ;;"`
bindpw=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_pw :" | sed -e "s;bind_pw : ;;"`
basedn=`cat @sysconfdir@/kolab/kolab.conf | grep "base_dn :" | sed -e "s;base_dn : ;;"`


@bindir@/ldapsearch -x -LLL -b "$basedn" -D "$binddn" -w $bindpw -h $server "(&(objectClass=kolabInetOrgPerson)(mail=*))" mail | grep mail | sed -e "s;mail: ;;"

--- NEW FILE: newconfig.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##

if [ ".$1" = ".--showhelp" ]; then
	echo "Propogate changes made to Kolab templates"
	exit 0
	HASHELP
fi

@sbindir@/kolabconf

--- NEW FILE: services.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##


if [ ".$1" = ".--showhelp" ]; then
	echo "Display a list of services"
	exit 0
	HASHELP
fi


services=`ls @kolab_rcdir@/`
echo "${services}" | sed -e 's/rc\.//'



--- NEW FILE: showlog.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##

# can be removed (i think) won't be needed
# prefix=@prefix@

if [ ".$1" = ".--showhelp" ]; then
	echo "Display the Kolab server logs"
	exit 0
	HASHELP
fi

#list of logfiles, maintainers please update
logfiles="
@ftpserver_logfile@
@amavisd_logfile@
@fsl_logfile@
@sasl_logfile@
@resmgr_logfile@
@freebusy_logfile@
@clamav_logfile@
@imap_masterlogfile@
@imap_misclogfile@
@webserver_errorlogfile@
@webserver_accesslogfile@
@ldapserver_logfile@
@postfix_logfile@
"

if [ ".$PAGER" = "." ]; then
	PAGER=less
fi


if [ ".$1" = "." ]; then
	for log in $logfiles; do
		echo $log 
	done
	echo
	echo "To view a log please specify the  or \"-t \""
	echo "It is also possible to abbreviate the logname, for example:"
	echo "\"showlog postfix\" will display the postfix log."
else 
	if [ ".$1" = ".-t" ]; then
		PAGER="tail -f "
		if [ ".$2" = "." ]; then
			exit 0;
		else
			showme=$2
		fi
	else 
		showme=$1
	fi
		
	for log in $logfiles; do
		match=`echo $log | grep $showme`
		if [ ".$match" != "." ]; then
			$PAGER $log
		fi
	done
fi


--- NEW FILE: showuser.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##

if [ ".$1" = ".--showhelp" ]; then
	echo "Display information on a user"
	exit 0
	HASHELP
fi

server=127.0.0.1
binddn=`cat ${prefix}/etc/kolab/kolab.conf | grep "bind_dn :" | sed -e "s;bind_dn : ;;"`
bindpw=`cat ${prefix}/etc/kolab/kolab.conf | grep "bind_pw :" | sed -e "s;bind_pw : ;;"`
basedn=`cat ${prefix}/etc/kolab/kolab.conf | grep "base_dn :" | sed -e "s;base_dn : ;;"`


if [ ".$1" = "." ]; then
	echo "Please specify an email address"
	exit 2
fi

@bindir@/ldapsearch -x -LLL -b "$basedn" -D "$binddn" -w $bindpw -h $server "(&(objectClass=kolabInetOrgPerson)(mail=$1))"

--- NEW FILE: start.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##

prefix=@prefix@

if [ ".$1" = ".--showhelp" ]; then
	echo "Start the server"
	exit 0
	HASHELP
fi


${prefix}/bin/openpkg rc all start

--- NEW FILE: stop.in ---
##  Copyright (c) 2004  Code Fusion cc
##
##  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 .
##

prefix=@prefix@

if [ ".$1" = ".--showhelp" ]; then
	echo "Stop the server"
	exit 0
	HASHELP
fi


${prefix}/bin/openpkg rc all stop

--- adduser DELETED ---

--- deluser DELETED ---

--- listusers DELETED ---

--- newconfig DELETED ---

--- services DELETED ---

--- showlog DELETED ---

--- showuser DELETED ---

--- start DELETED ---

--- stop DELETED ---


From cvs at intevation.de  Tue Sep 13 16:38:24 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Sep 13 16:38:34 2005
Subject: steffen: server/kolabd/kolabd/namespace kolab.in, NONE, 1.1 kolab,
	1.3, NONE 
Message-ID: <20050913143824.4A530101F1C@lists.intevation.de>

Author: steffen

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

Added Files:
	kolab.in 
Removed Files:
	kolab 
Log Message:
kolabd autoconfiscated!

--- NEW FILE: kolab.in ---
#!@bash_exec@
##
##  Kolab Namespace tool 
##  Derived with acknowledgement from: openpkg -- OpenPKG Tool Chain
##
##  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 
##
##  Permission to use, copy, modify, and distribute this software for
##  any purpose with or without fee is hereby granted, provided that
##  the above copyright notice and this permission notice appear in all
##  copies.
##
##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
##  SUCH DAMAGE.
##

##
##  command line parsing
##

#   command line options defaults
opt_prefix=""
opt_tools=""
opt_version=no
opt_help=no

#   process command line options by iterating over arguments
for opt
do
    case "${opt}" in
        -*=*) arg=`echo "${opt}" | sed 's/^[-_a-zA-Z0-9]*=//'` ;;
           *) arg='' ;;
    esac
    case "${opt}" in
        -v|--version ) opt_version=yes;     shift ;;
        -h|--help    ) opt_help=yes;        shift ;;
        --prefix=*   ) opt_prefix="${arg}"; shift ;;
        --tools=*    ) opt_tools="${arg}";  shift ;;
        -* ) echo "kolab:ERROR: Invalid command-line option \"${opt}\"." 1>&2
             echo "kolab:ERROR: Run \"${0} --help\" for list of valid options" 1>&2; exit 1 ;;
        *  ) break ;;
    esac
done

##
##  determine OpenPKG locations
##

#   determine path to OpenPKG instance
openpkg_prefix="@prefix@"
if [ ".${OPENPKG_PREFIX}" != . ]; then
    openpkg_prefix="${OPENPKG_PREFIX}"
fi
# FIXME: to be removed
if [ ".${opt_prefix}" != . ]; then
    openpkg_prefix="${opt_prefix}"
fi
if [ -x "@bindir@/openpkg" -a -x "@libexecdir@/openpkg/rpm" ]; then
    #   OpenPKG 2.0 and higher
    true
elif [ -f "@bindir@/rpm" -a -x "@libdir@/openpkg/rpm" ]; then
    #   OpenPKG 1.x
    echo "kolab:ERROR: OpenPKG 1.x instance found under \"@prefix@\" (not supported)" 1>&2
    exit 1
else
    echo "kolab:ERROR: no OpenPKG instance found under \"@prefix@\"" 1>&2
    exit 1
fi

#   allow convenient all-in-one specification of OpenPKG Tool Chain locations
#   (assuming the filesystem layout of an uninstalled OpenPKG Tool Chain)
kolab_tools="${KOLAB_TOOLS}"
openpkg_tools="${OPENPKG_TOOLS}"
openpkg_tools_cmdpath="${OPENPKG_TOOLS_CMDPATH}"
openpkg_tools_apipath="${OPENPKG_TOOLS_APIPATH}"
if [ ".${opt_tool}" != . ]; then
    kolab_tools="${opt_tools}"
fi
if [ ".${openpkg_tools}" != . -a ".${openpkg_tools_cmdpath}" = . ]; then
    openpkg_tools_cmdpath="${openpkg_tools}/cmd:@"
fi
if [ ".${openpkg_tools}" != . -a ".${openpkg_tools_apipath}" = . ]; then
    openpkg_tools_apipath="${openpkg_tools}/api:@"
fi

#   determine path to Kolab Namespace commands
cmdpath="@libexecdir@/kolab"
if [ -d "@libexecdir@/kolab-tools" ]; then
    #   openpkg-tools package overrides
    cmdpath="@libexecdir@/kolab-tools:${cmdpath}"
fi
if [ ".${kolab_tools}" != . ]; then
    #   user supplied path overrides
    cmdpath=`echo "${kolab_tools}" | sed -e "s;@;${cmdpath};"`
fi
openpkg_tools_cmdpath=`echo "${cmdpath}" | sed -e 's/::/:/g' -e 's/^://' -e 's/:$//'`

#   determine path to OpenPKG Tool Chain API
apipath=""
if [ -d "@libdir@/openpkg-tools" ]; then
    #   openpkg-tools package overrides
    apipath="@libdir@/openpkg-tools:${apipath}"
fi
if [ ".${openpkg_tools_apipath}" != . ]; then
    #   user supplied path overrides
    apipath=`echo "${openpkg_tools_apipath}" | sed -e "s;@;${apipath};"`
fi
openpkg_tools_apipath=`echo "${apipath}" | sed -e 's/::/:/g' -e 's/^://' -e 's/:$//'`

##
##  execute stand-alone option commands in advance
##

#   implement stand-alone "--help" option
if [ ".${opt_help}" = .yes ]; then
    release=`@libexecdir@/openpkg/rpm -q kolab`
    echo ""
    echo "${release} "
    echo "Kolab Server Tool"
    echo ""
    echo "Copyright (c) 2004,2005 Code Fusion cc."
    echo ""
    echo "  \$ @bindir@/kolab [

 
June 20th, 2005
 »
 	Kolab 2 Groupware released!
@@ -55,10 +74,6 @@
 	in Karlsruhe.
 
 

-
-
-
- 
 
 
 


From cvs at intevation.de  Wed Jul 27 22:55:12 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Jul 27 22:55:13 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php, NONE, 1.1 
Message-ID: <20050727205512.1B461100161@lists.intevation.de>

Author: steffen

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

Added Files:
	deliver.php 
Log Message:
erh, I guess we need this in CVS...

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


From cvs at intevation.de  Wed Jul 27 23:03:24 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Jul 27 23:03:26 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php, NONE, 1.1.2.1 
Message-ID: <20050727210324.D4348100161@lists.intevation.de>

Author: steffen

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

Added Files:
      Tag: kolab_2_0_branch
	deliver.php 
Log Message:
erh, I guess we need this in CVS...

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


From cvs at intevation.de  Wed Jul 27 23:45:15 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Jul 27 23:45:16 2005
Subject: martin: doc/kolab-formats folders.sgml, 1.7, 1.8 kolabformat.sgml,
	1.15, 1.16 
Message-ID: <20050727214515.B64371005AF@lists.intevation.de>

Author: martin

Update of /kolabrepository/doc/kolab-formats
In directory doto:/tmp/cvs-serv6561

Modified Files:
	folders.sgml kolabformat.sgml 
Log Message:
MArtin Konold: Clarifications as discussed on the ml


Index: folders.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/folders.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- folders.sgml	7 Oct 2004 16:07:30 -0000	1.7
+++ folders.sgml	27 Jul 2005 21:45:13 -0000	1.8
@@ -11,11 +11,22 @@
 (i.e. folder name encoding is by RFC 3501).The INBOX is the default inbox of the user. The user can not
-change this default. The IMAP resource folders (one for events,
-one for contacts etc. ) are subfolders of the INBOX, and this location can
-not be set by the user.
+change this default. The account specific personal IMAP resource folders 
+are subfolders of the INBOX, and this location cannot be set by the user. 
+There is exactly one default resource folder for each type which means
 
-We will annotate all folders with an entry /vendor/kolab/folder-type
+one default calendar folder
+one default contact folder
+one default notes folder
+one default task folder
+one default journal folder
+
+The actual names of the folder as stored on the IMAP folder don't matter. E.g. it does
+not matter if the default calendar is called Calendar or Kalendar as long as exactly one default
+calendar folder does exist as a direct subfolder of the INBOX folder.
+
+
+All folders MUST be annotated with an entry /vendor/kolab/folder-type
 containing the attribute value.shared set to: [.] ]]>
 
 
@@ -26,20 +37,21 @@
 or junkemail (this one holds spam mails). For the other <type>s, it
 can only be default, or not set.
 
-For other types of folders supported by the clients, these
-should be prefixed with "k-" for KMail, "h-" for Horde and "o-" for Outlook,
-and look like for example "kolab.o-voicemail".
+There MUST NOT be two folders of a single type having the default subtype. E.g. it
+is forbidden to have two folders of the type calendar with the subtype default within one Kolab
+account.
 
-We will use "application/x-vnd.kolab.<type>" as the
-mimetype for the emails used for storage.
+For other client-specific non standardized types of folders, these
+MUST be prefixed with "k-" for KMail, "h-" for Horde, "o-" for Outlook with the 
+Toltec Connector and "ok-" for Outlook with the KONSEC Konnektor. E.g. "kolab.o-voicemail".
 
-The annotation must be set on creation, and can not be
-changed. For folders created with other IMAP clients, annotations must
-be preserved. If a folder has no annotation, Outlook and
-the Toltec connector will ignore it completely. This is not an option
-for Kontact and Horde, so we will by default consider them to hold
-mail.
+The mimetype of the messages stored on the Kolab server is "application/x-vnd.kolab.<type>".
 
+All annotation MUST be set during the initial creation of a folder and cannot be altered afterwards. 
+Clients are allowed to rely upon this requirement.
+
+For folders created with non Kolab IMAP clients, annotations must be preserved. 
+All Kolab clients MUST assume that folders without an explicit type set are email folders.
 
 
 Mail contents

Index: kolabformat.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- kolabformat.sgml	3 Jun 2005 08:45:39 -0000	1.15
+++ kolabformat.sgml	27 Jul 2005 21:45:13 -0000	1.16
@@ -25,7 +25,6 @@
  Martin Konold, martin.konold@erfrakon.de 
  Stephan Buys, s.buys@codefusion.co.za 
  Stuart Binge, s.binge@codefusion.co.za 
- www.kolab.org 
 
 
 June 3rd, 2005
@@ -38,21 +37,22 @@
 Windows XP,
 Microsoft Outlook
 are registered trademarks of Microsoft Corporation Inc.
-Toltec Connector
-K Desktop Environment and KDE
-are trademarks of the KDE e.V.
 
+ Toltec Connector is a trademark of Radley Network Technologies CC, South Africa.
+ KONSEC Konnektor is a trademark of KONSEC GmbH, Germany.
+
+K Desktop Environment and KDE are trademarks of the KDE e.V. 
 All other herein mentioned trademarks belong
-to their respective owners.  Use of a term in this book should not be regarded as 
+to their respective owners.  Use of a term in this document should not be regarded as 
 affecting the validity of any trademark or service mark.
 
-Finally, the authors of this book are not liable for any errors found as well
+Finally, the authors of this document are not liable for any errors found as well
 as anything that may cause a fault. However, if that does occur, please notify
 the authors so corrections can be made. Furthermore, the reader must also agree
-to use the information in this book at his/her own risk and relinquish the
-authors, from any mistakes due to this book. If not, please stop reading now.
+to use the information in this document at his/her own risk and relinquish the
+authors, from any mistakes due to this document. If not, please stop reading now.
 
 BECAUSE THE CONTENT IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE
@@ -127,6 +127,15 @@
 Distribution list have their own MIME-type now.
 
 
+
+
+2.0rc4
+July 26th, 2005
+
+Clarifications about keywords and folder annotations.
+
+
+
 
 

Index: kolabsearch.htm
===================================================================
RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabsearch.htm	18 May 2005 13:01:05 -0000	1.2
+++ kolabsearch.htm	11 Aug 2005 16:52:04 -0000	1.3
@@ -527,7 +527,7 @@
 Documentation

 Wiki

 Support Forums

-Kolab-Konsortium

+Kolab-Konsortium

 
 
 


From cvs at intevation.de  Thu Aug 11 19:49:47 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Aug 11 19:49:48 2005
Subject: bernhard: doc/www/src i18n.html.m4, NONE, 1.1 Makefile, 1.22,
	1.23 footer.html.m4, 1.33, 1.34 
Message-ID: <20050811174947.67658102BCC@lists.intevation.de>

Author: bernhard

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

Modified Files:
	Makefile footer.html.m4 
Added Files:
	i18n.html.m4 
Log Message:
Created a new page i18n.html to be able to list the supported languages.


--- NEW FILE: i18n.html.m4 ---
m4_define(`PAGE_TITLE',`Languages supported by Kolab')
m4_include(header.html.m4)

This page was updated on:
$Date: 2005/08/11 17:49:45 $



Supported Languages



Server: Webadmin


The web administration interface of the Kolab Server 
offers localisation support since Kolab2. 
Translations can be done easily.
Kolab Server 2.0.1rc1 comes with the following activated translations:



    
 
  • 
	Deutsch
 
  • 
	English
 
  • 
	Français
 
  •  	
 	Néerlandais




We expect more soon.



KDE Kolab Klient


Kontact has good support for about 30 languages,
with more then 30 additional languages in progress.
The languages listed above for the Webadmin are usually 
most uptodate for the client.


The KDE Kolab Client profits from 
KDE's internationalisation team,
as the efforts of the Kolab project on the KDE side have directly 
been done within KDE. 


Outlook with proprietary plugins


Most of ther user interface will come from Outlook itself
and thus available in 
all languages that Outlook supports.


The plugins itself do not contain many texts, but they are at least
available in German and English.

m4_include(footer.html.m4)

Index: Makefile
===================================================================
RCS file: /kolabrepository/doc/www/src/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	4 Aug 2005 13:49:46 -0000	1.22
+++ Makefile	11 Aug 2005 17:49:45 -0000	1.23
@@ -15,6 +15,7 @@
     kolab-plugins.html \
     kolabsearch.html \
     documentation.html \
+    i18n.html \
     webclient.html
 
 all:

Index: footer.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/footer.html.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- footer.html.m4	11 Aug 2005 16:52:04 -0000	1.33
+++ footer.html.m4	11 Aug 2005 17:49:45 -0000	1.34
@@ -41,6 +41,7 @@
 
Support

 

 LINK(`documentation.html', `Documentation')
+LINK(`i18n.html',`Languages/Localisation')
 LINK(`http://wiki.kolab.org/',`Wiki')
 Support Forums

 Kolab-Konsortium



From cvs at intevation.de  Thu Aug 11 21:00:46 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Aug 11 21:00:46 2005
Subject: bh: server release-notes.txt,1.16,1.17 
Message-ID: <20050811190046.174E6101EF1@lists.intevation.de>

Author: bh

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

Modified Files:
	release-notes.txt 
Log Message:
Prepare for a snapshot release


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- release-notes.txt	20 Jun 2005 16:25:21 -0000	1.16
+++ release-notes.txt	11 Aug 2005 19:00:44 -0000	1.17
@@ -1,19 +1,71 @@
 Release notes Kolab2 Server
-(Version 20050620, Kolab server 2.0 final)
+(Version 20050811, Kolab Server pre 2.1)
 
+This is a development snapshot of the kolab server leading up to a 2.1
+release.  At this point an upgrade from 2.0 is not recommended.
 
 For upgrading and installation instructions, please refer to the
 1st.README file in the source directory.
 
 
-Changes since RC 4, 20050617:
+Changes since 2.0 final:
 
+    - Simple multi-domain support
 
-    - kolab-webadmin 20050530 -> 20050616
+      The Kolab server can now accept mail for multiple email domains.
+      There is also a new class of maintainers which are only allowed to
+      manage settings for a subset of the mail domains of the kolab
+      server.
+
+    - Switch to OpenPKG 2.4.  As a result of this, practically all
+      packages have been updated.
+
+      Up to now the Kolab server used OpenPKG 2.2.  The current release
+      of OpenPKG is 2.4, though, and the OpenPKG project only provides
+      security advisories and updates for the most recent release and
+      its immediate predecessor.  Therefore moving to OpenPKG 2.4 is
+      necessary to benefit from the OpenPKG updates.
+
+      The db package has not been updated to the version from OpenPKG
+      2.4 yet to avoid potential stability problems with OpenLDAP.
+
+    - A new clamav package fixing a buffer overflow. 
+      This is the package mentioned in the kolab security advisory 02
+      http://kolab.org/security/kolab-vendor-notice-02.txt
+
+    - better deletion handling.  Now more objects are deleted using
+      kolabDeleteFlag (issues 845 and 855)
+
+    - perl-kolab 5.8.5-20050530 -> 5.8.7-20050728
+
+      Uses autoperl now
 
       * Fixing:
-      	  Issue813 (password entry not of type password)
-	  Issue810 (Cannot delete addressbook entry)
+          Issue855 (make shared folder and external deletion same as users)
+
+    - kolab-resource-handlers 20050615 -> 20050719
+
+      * Fixing:
+          Issue825 (Errorhandling for multiple recipients)
+
+
+    - kolabd 1.9.4-20050615 -> 2.0.0-20050729
+
+      * Fixing:
+          Issue824 (Enable delivery to multiple recipients)
+          Issue851 (kolabquotawarn uses system sendmail)
+          Issue791 (automatic invitation handling uses http instead of https)
+          Issue845 (groupOfNames cleanup handling)
+          Issue855 (make shared folder and external deletion same as users)
+
+
+    - kolab-webadmin 20050620 -> 20050724
+
+      * Fixing:
+          Issue820 (dist list lookup error)
+          Issue845 (groupOfNames cleanup handling)
+          Issue855 (make shared folder and external deletion same as users)
+
 
 
 $Id$


From cvs at intevation.de  Thu Aug 11 21:04:12 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Aug 11 21:04:13 2005
Subject: bh: server release-notes.txt,1.17,1.18 
Message-ID: <20050811190412.54138101EF1@lists.intevation.de>

Author: bh

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

Modified Files:
	release-notes.txt 
Log Message:
add information about known bugs in this release


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- release-notes.txt	11 Aug 2005 19:00:44 -0000	1.17
+++ release-notes.txt	11 Aug 2005 19:04:10 -0000	1.18
@@ -2,10 +2,17 @@
 (Version 20050811, Kolab Server pre 2.1)
 
 This is a development snapshot of the kolab server leading up to a 2.1
-release.  At this point an upgrade from 2.0 is not recommended.
+release.  At this point an upgrade from 2.0 is not recommended (one of
+the problems is Issue875)
 
 For upgrading and installation instructions, please refer to the
 1st.README file in the source directory.
+
+
+Known Bugs:
+
+      Issue875 (domain is "$mydomain" after upgrade to 2.1)
+      Issue873 (.../maintainer.php was not found on this server)
 
 
 Changes since 2.0 final:


From cvs at intevation.de  Thu Aug 11 21:05:39 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Aug 11 21:05:40 2005
Subject: bh: server README.1st,1.26,1.27 
Message-ID: <20050811190539.544B7101EF1@lists.intevation.de>

Author: bh

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

Modified Files:
	README.1st 
Log Message:
add a note that an upgrade is not recommended yet


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- README.1st	11 Aug 2005 15:51:13 -0000	1.26
+++ README.1st	11 Aug 2005 19:05:37 -0000	1.27
@@ -228,8 +228,12 @@
 
 There's nothing special to be done.
 
+
 Upgrade from Kolab 2.0 to pre-2.1-snapshots
 -------------------------------------------
+
+These instructions are incomplete.  An upgrade from 2.0 to a 2.1
+snapshot is not recommended.
 
 Manually add two LDAP objects:
 


From cvs at intevation.de  Fri Aug 12 11:35:26 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Aug 12 11:35:28 2005
Subject: bernhard: doc/raw-howtos freebusy-troubleshooting.txt,1.1,1.2 
Message-ID: <20050812093526.D8D6B101F14@lists.intevation.de>

Author: bernhard

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

Modified Files:
	freebusy-troubleshooting.txt 
Log Message:
Added hint that %25 will work like % in dhe kde retrieval URL.
Added hint to use konqueror and IE to check proxy and certificate.


Index: freebusy-troubleshooting.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/freebusy-troubleshooting.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebusy-troubleshooting.txt	20 May 2005 13:57:26 -0000	1.1
+++ freebusy-troubleshooting.txt	12 Aug 2005 09:35:24 -0000	1.2
@@ -20,7 +20,8 @@
 Settings|Configure Contact... in the part Organizer|Free/busy on the tab
 Retrieve.
 
-Server URL: https://kolabserver.domain/freebusy/%25EMAIL%25.ifb
+Server URL: https://kolabserver.domain/freebusy/%EMAIL%.ifb
+(Note that "%25" will also work instead of "%".)
 Check "Use full email address for retrieval"
 Check "Retrieve other people's free/busy information automatically"
 
@@ -36,12 +37,23 @@
 
 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.).
+for client.domain, user2, example.com, etc. matching your setup.).
 
-  client.domain - user1 [20/May/2005:12:58:56 +0200] "GET /freebusy/user2%40kolabserver.ifb HTTP/1.1" 200 395
+  client.domain - user1 [20/May/2005:12:58:56 +0200] "GET /freebusy/user2%40example.com.ifb HTTP/1.1" 200 395
+
+Retrieval does not work?
+------------------------
+Try the retrieval with a regular browser of the operating system:
+	KDE -> Konqueror
+	Windows -> IE
+Those browsers will use the same proxy and certificate settings as the clients.
+
+
+Triggering
+----------
 
 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
+The triggering is done with https 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
@@ -77,8 +89,6 @@
 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/
-
-
 
 
 


From cvs at intevation.de  Fri Aug 12 11:37:33 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Aug 12 11:37:35 2005
Subject: bernhard: doc/raw-howtos freebusy-troubleshooting.txt,1.2,1.3 
Message-ID: <20050812093733.BA4DD1006A6@lists.intevation.de>

Author: bernhard

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

Modified Files:
	freebusy-troubleshooting.txt 
Log Message:
Noted that outlook can only work if there is no certificate doubt.


Index: freebusy-troubleshooting.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/freebusy-troubleshooting.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusy-troubleshooting.txt	12 Aug 2005 09:35:24 -0000	1.2
+++ freebusy-troubleshooting.txt	12 Aug 2005 09:37:31 -0000	1.3
@@ -47,6 +47,7 @@
 	KDE -> Konqueror
 	Windows -> IE
 Those browsers will use the same proxy and certificate settings as the clients.
+For Outlook to work, this test must not bring up a https certificate question.
 
 
 Triggering


From cvs at intevation.de  Fri Aug 12 17:50:23 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Aug 12 17:50:25 2005
Subject: bernhard: doc/raw-howtos freebusy-troubleshooting.txt,1.3,1.4 
Message-ID: <20050812155023.EE9E5101F0E@lists.intevation.de>

Author: bernhard

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

Modified Files:
	freebusy-troubleshooting.txt 
Log Message:
More improvements: 
	Explain the macros.
	Explain what URL to use for the Browser test.


Index: freebusy-troubleshooting.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/freebusy-troubleshooting.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freebusy-troubleshooting.txt	12 Aug 2005 09:37:31 -0000	1.3
+++ freebusy-troubleshooting.txt	12 Aug 2005 15:50:21 -0000	1.4
@@ -20,16 +20,18 @@
 Settings|Configure Contact... in the part Organizer|Free/busy on the tab
 Retrieve.
 
-Server URL: https://kolabserver.domain/freebusy/%EMAIL%.ifb
-(Note that "%25" will also work instead of "%".)
+Retrieval Server URL: https://kolabserver.domain/freebusy/%EMAIL%.ifb
+	The macro will be expanded by the client with the email address
+	for the person we want to see the fb information for.
+	(Note that "%25" will also work instead of "%".)
+
 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.
+If you configure kontact with the kolabwizard, the settings should be OK.
 
 
 Check the server
@@ -43,11 +45,12 @@
 
 Retrieval does not work?
 ------------------------
-Try the retrieval with a regular browser of the operating system:
+Try the retrieval URL from above (macros expaned) 
+with a regular browser of the operating system:
 	KDE -> Konqueror
 	Windows -> IE
 Those browsers will use the same proxy and certificate settings as the clients.
-For Outlook to work, this test must not bring up a https certificate question.
+For Outlook to work, this test must not bring up a certificate trust question.
 
 
 Triggering


From cvs at intevation.de  Fri Aug 12 18:48:53 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Aug 12 18:48:55 2005
Subject: bernhard: doc/proko2-doc freebusyconfiguration-publishtab.png, NONE,
	1.1 doc2.sxw, 1.65, 1.66 
Message-ID: <20050812164853.C68BB101F0E@lists.intevation.de>

Author: bernhard

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

Modified Files:
	doc2.sxw 
Added Files:
	freebusyconfiguration-publishtab.png 
Log Message:
Added freebusyconfiguration-publishtab.png to the fb configuration.
It shall demonstrate that "publishing" must be off!


--- NEW FILE: freebusyconfiguration-publishtab.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.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
Binary files /tmp/cvsNQLQtZ and /tmp/cvsoKIcTS differ


From cvs at intevation.de  Mon Aug 15 15:44:25 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 15 15:44:26 2005
Subject: bernhard: doc/raw-howtos email-split-setup.txt,NONE,1.1 
Message-ID: <20050815134425.34BAE1005BC@lists.intevation.de>

Author: bernhard

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

Added Files:
	email-split-setup.txt 
Log Message:
Added this new raw-howto on how to setup an email split with 
an existing MTA that "owns" the same email domain.


--- NEW FILE: email-split-setup.txt ---
Kolab Server Mailsplit Setup
============================
$Id: email-split-setup.txt,v 1.1 2005/08/15 13:44:23 bernhard Exp $

Tested with Kolab Server 2.0 .

Aim: You want to set up a Kolab Server to be responsible for a fraction
     of your users, but continue to run the other email server.
     Interesting for tests and gradual migration.

Flow of emails:
	
   Incoming -------->    Other MTA  -------->  Outgoing
                           |    ^
           (optional:    <-+    |
            keep a copy)   |    |
	                   |    |
                           v    |
                        Kolab Server

What to do when you have an mail transport agent (MTA) 
which feels responsible for real.example.com 
and want to have _some_ users on the Kolab Server?

Make the MTA (e.g. exchange) rewrite the envelope addresses to
@tokolab.real.example.com and fowarded it to the Kolab Server.
Optionally you can keep a copy on this MTA as a backup.

The email arrives at the Kolab Server.
And we need to rewrite the envelope back within Postfix:

   main.cf (use the template to make the change):
        virtual_maps = hash:/kolab/etc/postfix/virtual, ldap:ldapdistlist, ldap:ldapvirtual

   in /kolab/etc/postfix/virtual (use the template to make the change):
        @tokolab.example.com @real.example.com

To accept emails within example.com though they are not on the server,
we need to switch of the check for unlisted recipients.
Do not set local_recipient_maps and 
Remove "reject_unlisted_recipient," from smtpd_recipient_restrictions:

   main.cf
	local_recipient_maps =

	smtpd_recipient_restrictions = permit_mynetworks,
			permit_sasl_authenticated, 
			reject_unauth_destination, 
			check_policy_service unix:private/kolabpolicy


Next it must be decided 
whether to keep the email because the user is on this server
or to send it back to the other MTA.
Postfix can do an ldap request to determine the transportation path.

More main.cf settings (use template):

    transport_maps = ldap:ldaptransport, ldap:ldapkolabmailboxfilter, hash:/kolab/etc/postfix/transport

    ldapkolabmailboxfilter_domain = @@@postfix-mydomain@@@
    ldapkolabmailboxfilter = @@@ldap_uri@@@
    ldapkolabmailboxfilter_search_base = @@@user_dn_list@@@
    ldapkolabmailboxfilter_query_filter = (&(mail=%s)(objectClass=kolabInetOrgPerson)(!(cn:dn:=external)))
    ldapkolabmailboxfilter_result_attribute = mail
    ldapkolabmailboxfilter_result_filter = kolabmailboxfilter
    ldapkolabmailboxfilter_search_timeout = 15
    ldapkolabmailboxfilter_scope = sub
    ldapkolabmailboxfilter_bind = yes
    ldapkolabmailboxfilter_bind_dn = @@@php_dn@@@
    ldapkolabmailboxfilter_bind_pw = @@@php_pw@@@
    ldapkolabmailboxfilter_version = 3

and /kolab/etc/postfix/transport (use template):
    real.example.com     smtp:[outgoingsmptserver]

Note the interesting query_filter to exclude the external addressbook.


From cvs at intevation.de  Thu Aug 18 15:16:51 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Aug 18 15:16:52 2005
Subject: bernhard: doc/raw-howtos moving-mailboxes.txt,1.3,1.4 
Message-ID: <20050818131651.0BD171006B6@lists.intevation.de>

Author: bernhard

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

Modified Files:
	moving-mailboxes.txt 
Log Message:
Added hit about which user to run cyrreconstruct with .
	(Suggested by Michael Mrosek.)
Added hint that cyrquota is the name of the command in an Kolab installation.


Index: moving-mailboxes.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/moving-mailboxes.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- moving-mailboxes.txt	7 Jun 2005 15:59:37 -0000	1.3
+++ moving-mailboxes.txt	18 Aug 2005 13:16:48 -0000	1.4
@@ -24,12 +24,14 @@
 
 - change the KolabHomeServer attribute so that it points to the target server
 
-- run cyrus reconstruct on the target server
+- run cyrus reconstruct on the target server. 
+  (Hint: You need to run cyrreconstruct as the right user, e.g. su - kolab-r.)
 
 - 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
+  run quota(8) (cyrquota) with the -f switch or the specific mailbox-prefix 
+  in order to fix the quota root files
 
 - delete original contents of the users mailbox
 


From cvs at intevation.de  Fri Aug 19 15:50:30 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Fri Aug 19 15:50:31 2005
Subject: bernhard: doc/architecture kolab2-how-to-make-an-appointment.sk,
	NONE, 1.1 
Message-ID: <20050819135030.67974101FC8@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/architecture
In directory doto:/tmp/cvs-serv4963

Added Files:
	kolab2-how-to-make-an-appointment.sk 
Log Message:
Added draft diagram to show the internal and external ways of making
an appointment.


--- NEW FILE: kolab2-how-to-make-an-appointment.sk ---
##Sketch 1 2
document()
layout('A4',1)
layer('Ebene 1',1,1,0,0,(0,0,0))
fp((0.941,0.902,0.549))
lw(1)
r(141.732,0,0,-70.8661,184.252,340.158)
fp((0.306,0.933,0.58))
lw(1)
r(141.732,0,0,-70.8661,651.969,552.756,0.2,0.4)
fp((0.941,0.902,0.549))
lw(1)
r(141.732,0,0,-70.8661,496.063,340.157)
lw(1)
e(-198.425,0,0,14.1732,411.024,198.425)
lw(1)
b()
bs(212.598,198.425,0)
bs(212.598,42.5197,0)
lw(1)
b()
bs(609.449,198.425,0)
bs(609.449,42.5197,0)
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
Fs(18)
txt('User A',(212.598,297.638))
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
Fs(18)
txt('User A',(255.118,145.638))
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
Fs(18)
txt('Calendar',(311.811,103.119))
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
Fs(18)
txt(' User B',(524.409,297.638))
lw(2.83465)
la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
b()
bs(563.811,358.324,0)
bc(563.811,358.324,470.253,383.61,399.452,383.61,2)
bc(328.651,383.61,237.621,355.796,237.621,355.796,2)
lw(2.83465)
la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
b()
bs(595.276,354.331,0)
bc(595.276,354.331,496.063,396.85,496.063,453.543,2)
bc(496.063,510.236,637.795,510.236,637.795,510.236,2)
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
Fs(18)
txt('external User',(680.315,499.969))
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
Fs(18)
txt('non-Kolab',(680.315,526.289))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(24)
txt('iCalendar',(666.142,368.504))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(24)
txt('external',(1.19434e-15,1,-1,1.19434e-15,108.418,368.504))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(24)
txt('internal',(1.19434e-15,1,-1,1.19434e-15,108.418,176.422))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(24)
txt('Kolab XML',(666.142,141.732))
fp((0.2,0.2,0.2))
lp((0.2,0.2,0.2))
lw(1.13386)
e(7.08661,0,0,-7.08662,240.945,155.906)
lp((0.2,0.2,0.2))
lw(2.83465)
b()
bs(240.945,155.906,0)
bs(240.945,70.8661,0)
bs(240.945,127.559,0)
lp((0.2,0.2,0.2))
lw(2.83465)
b()
bs(240.945,113.386,0)
bs(297.638,113.386,0)
fp((0.5,0.5,0))
lp((0.5,0.5,0))
lw(4.25197)
ld((1, 1))
la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
b()
bs(340.157,127.559,0)
bs(297.638,255.118,0)
fp((0.5,0.5,0))
lp((0.5,0.5,0))
lw(4.25197)
ld((1, 1))
la1(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
b()
bs(368.504,127.559,0)
bs(524.409,255.118,0)
G()
fp((0.478,0.773,0.804))
lw(1)
b()
bs(404.686,480.954,0)
bc(368.746,477.954,353.466,446.413,392.795,432.878,0)
bc(396.105,418.045,410.805,396.495,436.686,423.269,0)
bc(434.335,409.482,487.526,389.936,480.063,422.919,0)
bc(490.122,409.5,523.533,416.109,507.517,442.681,0)
bc(523.627,436.804,540.029,491.878,496.439,489.809,0)
bc(514.502,519.54,445.296,513.509,448.036,492.799,0)
bc(440.983,505.036,402.999,524.443,404.686,480.954,0)
bC()
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
Fs(18)
txt('Internet',(411.024,453.543))
G_()
fp((0,0,0))
le()
lw(1)
Fn('Times-Roman')
txt('$Id: kolab2-how-to-make-an-appointment.sk,v 1.1 2005/08/19 13:50:28 bernhard Exp $',(19.4776,14.611))
guidelayer('Hilfslinien',1,0,0,1,(0,0,1))
grid((0,0,14.1732,14.1732),0,(0,0,1),'Gitter')


From cvs at intevation.de  Thu Aug 25 14:35:58 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Thu Aug 25 14:36:01 2005
Subject: bh: doc/www/src mirrors.html.m4,1.6,1.7 
Message-ID: <20050825123558.C5BB5101F1B@lists.intevation.de>

Author: bh

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

Modified Files:
	mirrors.html.m4 
Log Message:
added university of belgrade http and ftp mirrors


Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mirrors.html.m4	28 Jun 2005 13:31:30 -0000	1.6
+++ mirrors.html.m4	25 Aug 2005 12:35:56 -0000	1.7
@@ -19,6 +19,10 @@
   Linjection

   via
   http
+
  • 
+  University of Belgrade
    
+  via http |
+  ftp
 
 
 
    How to become a mirror?
    


From cvs at intevation.de  Mon Aug 29 06:53:51 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 06:53:54 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.php, 1.37, 1.38 pfb.php, 1.21, 1.22 
Message-ID: <20050829045351.EC8FA1005C9@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.php pfb.php 
Log Message:
Fix for Issue878 (case-sensitivity in username for freebusy)

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- freebusy.php	6 Jun 2005 20:35:24 -0000	1.37
+++ freebusy.php	29 Aug 2005 04:53:49 -0000	1.38
@@ -67,7 +67,7 @@
   exit;
 }
 
-
+$user = strtolower($user);
 $cache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache', $req_extended );
 $collector =& new FreeBusyCollector( $user );
 
@@ -127,4 +127,4 @@
 }
 
 echo $vfb;
-?>
\ 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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pfb.php	14 Jun 2005 14:46:20 -0000	1.21
+++ pfb.php	29 Aug 2005 04:53:49 -0000	1.22
@@ -64,6 +64,11 @@
   // error
   notFound( _('No such folder ').htmlentities($req_folder) );
 }
+
+// Make sure email address is in lowercase
+$folder[0] = strtolower($folder[0]);
+$req_folder = implode('/', $folder);
+
 $uinfo = $ldap->userInfo($folder[0]);
 $owner = $uinfo['MAIL'];
 $homeserver = $uinfo['HOMESERVER'];  


From cvs at intevation.de  Mon Aug 29 06:53:51 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 06:53:55 2005
Subject: steffen: server/kolab-resource-handlers Makefile, 1.9,
	1.10 kolab-resource-handlers.spec, 1.129, 1.130 
Message-ID: <20050829045351.E54901005C6@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab-resource-handlers.spec 
Log Message:
Fix for Issue878 (case-sensitivity in username for freebusy)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	4 Nov 2004 12:31:07 -0000	1.9
+++ Makefile	29 Aug 2005 04:53:49 -0000	1.10
@@ -1,5 +1,5 @@
 RPM = /kolab/bin/openpkg rpm
-VERSION = 0.3.9
+VERSION = 0.4.1
 PEARVERSION = 1.3
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- kolab-resource-handlers.spec	28 Jul 2005 02:14:38 -0000	1.129
+++ kolab-resource-handlers.spec	29 Aug 2005 04:53:49 -0000	1.130
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050719
+Release:	20050828
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Mon Aug 29 06:53:54 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 06:53:57 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.126.2.1, 1.126.2.2 
Message-ID: <20050829045354.4EA511006A3@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolab-resource-handlers.spec 
Log Message:
Fix for Issue878 (case-sensitivity in username for freebusy)

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.126.2.1
retrieving revision 1.126.2.2
diff -u -d -r1.126.2.1 -r1.126.2.2
--- kolab-resource-handlers.spec	28 Jul 2005 02:46:33 -0000	1.126.2.1
+++ kolab-resource-handlers.spec	29 Aug 2005 04:53:52 -0000	1.126.2.2
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050727
+Release:	20050828
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Mon Aug 29 06:53:54 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 06:53:58 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.php, 1.37, 1.37.2.1 pfb.php, 1.21, 1.21.2.1 
Message-ID: <20050829045354.582911006A8@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	freebusy.php pfb.php 
Log Message:
Fix for Issue878 (case-sensitivity in username for freebusy)

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- freebusy.php	6 Jun 2005 20:35:24 -0000	1.37
+++ freebusy.php	29 Aug 2005 04:53:52 -0000	1.37.2.1
@@ -68,6 +68,7 @@
 }
 
 
+$user = strtolower($user);
 $cache =& new FreeBusyCache( $params['kolab_prefix'].'/var/kolab/www/freebusy/cache', $req_extended );
 $collector =& new FreeBusyCollector( $user );
 
@@ -127,4 +128,4 @@
 }
 
 echo $vfb;
-?>
\ 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.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- pfb.php	14 Jun 2005 14:46:20 -0000	1.21
+++ pfb.php	29 Aug 2005 04:53:52 -0000	1.21.2.1
@@ -64,6 +64,11 @@
   // error
   notFound( _('No such folder ').htmlentities($req_folder) );
 }
+
+// Make sure email address is in lowercase
+$folder[0] = strtolower($folder[0]);
+$req_folder = implode('/', $folder);
+
 $uinfo = $ldap->userInfo($folder[0]);
 $owner = $uinfo['MAIL'];
 $homeserver = $uinfo['HOMESERVER'];  


From cvs at intevation.de  Mon Aug 29 06:55:42 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 06:55:44 2005
Subject: steffen: server/imapd cyradm.annotate.patch,1.1,1.2 
Message-ID: <20050829045542.C60441005C9@lists.intevation.de>

Author: steffen

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

Modified Files:
	cyradm.annotate.patch 
Log Message:
docs for cyradm mbxcfg /annotation blah

Index: cyradm.annotate.patch
===================================================================
RCS file: /kolabrepository/server/imapd/cyradm.annotate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cyradm.annotate.patch	28 Jun 2005 12:51:38 -0000	1.1
+++ cyradm.annotate.patch	29 Aug 2005 04:55:40 -0000	1.2
@@ -1,6 +1,34 @@
+diff -upr ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html ./doc/man/cyradm.1.html
+--- ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html	2005-02-14 19:02:26.000000000 +0100
++++ ./doc/man/cyradm.1.html	2005-08-29 04:35:21.000000000 +0200
+@@ -191,6 +191,10 @@ Indicates that the mailbox should have a
+ 
    
+ Sets an email address to which messages injected into the server via NNTP 
+ will be sent.
++
    
++
    /explicit/annotation
    
++
    
++Sets the annotation /explicit/annotation on mailbox to value.
+ 
    
+ 
    renamemailbox [--partition partition] oldname newname
    
+ 
    
+diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh ./perl/imap/cyradm.sh
+--- ../cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh	2004-01-15 15:35:34.000000000 +0100
++++ ./perl/imap/cyradm.sh	2005-08-29 04:28:51.000000000 +0200
+@@ -225,6 +225,10 @@ Indicates that the mailbox should have a
+ Sets an email address to which messages injected into the server via NNTP 
+ will be sent.
+ 
++=item C
++
++Sets the annotation I on I to I. 
++
+ =back 
+ 
+ =item C [C<--partition> I] I I
 diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm ./perl/imap/IMAP/Admin.pm
 --- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm	2004-02-19 23:50:12.000000000 +0100
-+++ ./perl/imap/IMAP/Admin.pm	2005-06-28 14:23:46.000000000 +0200
++++ ./perl/imap/IMAP/Admin.pm	2005-08-29 04:02:38.000000000 +0200
 @@ -789,12 +789,12 @@ sub mboxconfig {
      return undef;
    }
@@ -20,7 +48,7 @@
    $value = undef if($value eq "none");
 diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm ./perl/imap/IMAP/Shell.pm
 --- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm	2004-01-15 15:35:35.000000000 +0100
-+++ ./perl/imap/IMAP/Shell.pm	2005-06-28 14:24:46.000000000 +0200
++++ ./perl/imap/IMAP/Shell.pm	2005-08-29 04:02:38.000000000 +0200
 @@ -126,7 +126,7 @@ my %builtins = (exit =>
  		  [\&_sc_info, '[mailbox]',
  		   'display mailbox/server metadata'],


From cvs at intevation.de  Mon Aug 29 09:14:08 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 09:14:09 2005
Subject: steffen: server/imapd Makefile, 1.22.2.1, 1.22.2.2 kolab.patch,
	1.22.2.1, 1.22.2.2 
Message-ID: <20050829071408.52B0B1005CA@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
cyradm mbxcfg /annotation blah

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- Makefile	19 Jul 2005 21:00:59 -0000	1.22.2.1
+++ Makefile	29 Aug 2005 07:14:06 -0000	1.22.2.2
@@ -17,6 +17,7 @@
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
+	cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
 	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

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- kolab.patch	19 Jul 2005 21:00:59 -0000	1.22.2.1
+++ kolab.patch	29 Aug 2005 07:14:06 -0000	1.22.2.2
@@ -32,14 +32,15 @@
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +56,10 @@ Source3:      imapd.conf
+@@ -50,6 +56,11 @@ 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
++Patch3:       kolab-ldap.patch
++Patch4:       imapd.group2.patch
 +Patch5:       imapd-goodchars.patch
++Patch6:       cyradm.annotate.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -75,7 +76,7 @@
 +%if "%{with_goodchars}" == "yes"
 +    %patch -p1 -P 5
 +%endif
-+
++    %patch -p0 -P 6
      %{l_shtool} subst \
          -e 's;-L/usr/local/lib;;g' \
          -e 's;-I/usr/local/include;;g' \


From cvs at intevation.de  Mon Aug 29 23:28:30 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 23:28:31 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php, 1.12, 1.13 
Message-ID: <20050829212830.9A4911006AF@lists.intevation.de>

Author: steffen

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

Modified Files:
	addr.php 
Log Message:
Fix for Issue915 (encoding problem)

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- addr.php	28 Jul 2005 02:14:38 -0000	1.12
+++ addr.php	29 Aug 2005 21:28:28 -0000	1.13
@@ -85,7 +85,7 @@
   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 
    ');
+	  $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision 
    ');
 	}
   }
   return $str;


From cvs at intevation.de  Mon Aug 29 23:28:30 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 23:28:33 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.22, 1.23 mysmarty.php, 1.9, 1.10 
Message-ID: <20050829212830.A3D981006B6@lists.intevation.de>

Author: steffen

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

Modified Files:
	form.class.php mysmarty.php 
Log Message:
Fix for Issue915 (encoding problem)

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- form.class.php	24 Jul 2005 21:47:41 -0000	1.22
+++ form.class.php	29 Aug 2005 21:28:28 -0000	1.23
@@ -77,11 +77,11 @@
 		$str .= '
    • ';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '';
+		  $str .= '';
 		} else {
-		  $str .= '';
+		  $str .= '';
 		}
 		$str .= '';
 		$str .= ''."\n";
@@ -91,21 +91,21 @@
 		$str .= '';
 		list($uname,$domain) = split('@',$value['value']);
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '';
+		  $str .= '';
 		} else {
-		  $str .= '';
+			$str .= '';
+			$str .= '@'.MySmarty::htmlentities($value['domains'][0]).'';
 		  } else {
 			$str .= '@';
 			$str .= '';
@@ -125,9 +125,9 @@
 		$str .= '';
 		$str .= '';
 		if( ereg( 'readonly', $value['attrs'] ) ) {
-		  $str .= '';
+		  $str .= '';
 		} else {
-		  $str .= '';
+		  $str .= '';
 		}
 		$str .= '';
 		$str .= ''."\n";
@@ -153,8 +153,8 @@
 		  foreach( $value['options'] as $opt ) {
 			$checked = ( in_array($opt ,$value['value'] ))?"checked":"";
 			debug("Checking if $opt is in ".join(",",$value['value'])." :$checked");
-			$str .= '';
+			$str .= '';
 		  }
 		  $str .= '
    
 
  
 
 
 
    '.$value['name'].'
    '.htmlentities($value['value']).'
    '.MySmarty::htmlentities($value['value']).'
    		'.$value['comment'].'
    '.$value['name'].'
    '.htmlentities($value['value']).'
    '.MySmarty::htmlentities($value['value']).'
    		';
 		  if( count($value['domains']) == 1 ) {
-			$str .= '';
-			$str .= '@'.htmlentities($value['domains'][0]).'
    '.$value['name'].'
    '.htmlentities($value['value']).'
    '.MySmarty::htmlentities($value['value']).'
    		'.$value['comment'].'
    "
-			  .htmlentities($opt).'
    "
+			  .MySmarty::htmlentities($opt).'
    '.$value['name'].'
    '.htmlentities($value['options'][$value['value']]).
-			'
    '.MySmarty::htmlentities($value['options'][$value['value']]).
+			'
    		';
 		  $str .= '
    '.$value['name'].''.htmlentities($value['user']).' '.$value['perm'].''.MySmarty::htmlentities($value['user']).' '.$value['perm'].'';
+			.MySmarty::htmlentities($value['user']).'" '.$value['attrs'].' />';
 		  $str .= '
    ';
 			if( $user == 'anyone' ) $str .= '
    '._('Anyone').'
    ';
-			else $str .= '
    '.htmlentities($user).'
    ';
-			$str .= '
    '.htmlentities($policies[$pol]).'
    '.MySmarty::htmlentities($policies[$pol]).'
    ';
 			if( $user == 'anyone' ) {
-			  $str .= _('Anyone').'';
+			  $str .= _('Anyone').'';
 			} else {
 			  $str .= '';
+				.'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
 			}
 			$str .= '';
+		$str .= '';
       }
     }
     $str .= '';

Index: mysmarty.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mysmarty.php	10 Aug 2005 07:40:08 -0000	1.9
+++ mysmarty.php	29 Aug 2005 21:28:28 -0000	1.10
@@ -67,6 +67,12 @@
 											 'code' => 'nl_NL' )  
 									  ));
   }
+
+
+  /** UTF-8 friendly htmlentities() */
+  /* static */ function htmlentities( $str ) {	
+	return htmlentities( $str, ENT_QUOTES, "UTF-8");
+  }
 };
 
 /*


From cvs at intevation.de  Mon Aug 29 23:28:30 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 23:28:34 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php, 1.1, 1.2 forward.php, 1.11, 1.12 user.php, 1.65,
	1.66 vacation.php, 1.17, 1.18 
Message-ID: <20050829212830.A616C1006B8@lists.intevation.de>

Author: steffen

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

Modified Files:
	deliver.php forward.php user.php vacation.php 
Log Message:
Fix for Issue915 (encoding problem)

Index: deliver.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- deliver.php	27 Jul 2005 20:55:10 -0000	1.1
+++ deliver.php	29 Aug 2005 21:28:28 -0000	1.2
@@ -64,7 +64,7 @@
 	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 		$errors[] = $res->getMessage();
 		$errors[] = _('Script was:');
-		$errors[] = '
    '.htmlentities($script).'
    ';
+		$errors[] = '
    '.MySmarty::htmlentities($script).'
    ';
 	  }
 	  if( !$active && $sieve->getActive() === $scriptname ) {
 		$sieve->setActive( '' );

Index: forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- forward.php	11 Mar 2005 09:11:15 -0000	1.11
+++ forward.php	29 Aug 2005 21:28:28 -0000	1.12
@@ -68,7 +68,7 @@
 	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 		$errors[] = $res->getMessage();
 		$errors[] = _('Script was:');
-		$errors[] = '
    '.htmlentities($script).'
    ';
+		$errors[] = '
    '.MySmarty::htmlentities($script).'
    ';
 	  }
 	  if( !$active && $sieve->getActive() === $scriptname ) {
 		$sieve->setActive( '' );

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- user.php	14 Jul 2005 23:07:30 -0000	1.65
+++ user.php	29 Aug 2005 21:28:28 -0000	1.66
@@ -93,7 +93,7 @@
   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 
    ');
+	  $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision 
    ');
 	}
   }
   return $str;
@@ -109,7 +109,7 @@
   $str = '';
   foreach( $lst as $uid ) {
     if( $ldap->countMail( $_SESSION['base_dn'], $uid, $excludedn ) > 0 ) {
-      $str .= _('UID ').htmlentities($uid)._(' collision 
    ');
+      $str .= _('UID ').MySmarty::htmlentities($uid)._(' collision 
    ');
     }
   }
   return $str;

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- vacation.php	19 May 2005 23:51:17 -0000	1.17
+++ vacation.php	29 Aug 2005 21:28:28 -0000	1.18
@@ -50,7 +50,7 @@
 	if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 	  $errors[] = $res->getMessage();
 	  $errors[] = 'Script was:';
-	  $errors[] = '
    '.htmlentities($script).'
    ';
+	  $errors[] = '
    '.MySmarty::htmlentities($script).'
    ';
 	}
 	if( !$active && $sieve->getActive() === $scriptname ) {
 	  $sieve->setActive( '' );


From cvs at intevation.de  Mon Aug 29 23:28:52 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 23:28:54 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.18.2.1, 1.18.2.2 mysmarty.php, 1.8.2.1, 1.8.2.2 
Message-ID: <20050829212852.841011006B8@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	form.class.php mysmarty.php 
Log Message:
Backport of fix for Issue915 (encoding problem)

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- form.class.php	28 Jul 2005 01:45:41 -0000	1.18.2.1
+++ form.class.php	29 Aug 2005 21:28:50 -0000	1.18.2.2
@@ -82,11 +82,11 @@
 		$str .= '
    '.$value['name'].'
    '.htmlentities($value['value']).'
    '.MySmarty::htmlentities($value['value']).'
    		'.$value['comment'].'
    '.$value['name'].'
    '.htmlentities($value['value']).'
    '.MySmarty::htmlentities($value['value']).'
    		'.$value['comment'].'
    '.$value['name'].'
    '.htmlentities($value['options'][$value['value']]).
-			'
    '.MySmarty::htmlentities($value['options'][$value['value']]).
+			'
    		';
 		  $str .= '
    '.$value['name'].''.htmlentities($value['user']).' '.$value['perm'].''.MySmarty::htmlentities($value['user']).' '.$value['perm'].'';
+			.MySmarty::htmlentities($value['user']).'" '.$value['attrs'].' />';
 		  $str .= '
    ';
 			if( $user == 'anyone' ) $str .= '
    '._('Anyone').'
    ';
-			else $str .= '
    '.htmlentities($user).'
    ';
-			$str .= '
    '.htmlentities($policies[$pol]).'
    '.MySmarty::htmlentities($policies[$pol]).'
    ';
 			if( $user == 'anyone' ) {
-			  $str .= _('Anyone').'';
+			  $str .= _('Anyone').'';
 			} else {
 			  $str .= '';
+				.'" value="'.MySmarty::htmlentities($user).'" '.$value['attrs'].' />';
 			}
 			$str .= '';
+		$str .= '';
       }
     }
     $str .= '';

Index: mysmarty.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- mysmarty.php	11 Aug 2005 15:28:26 -0000	1.8.2.1
+++ mysmarty.php	29 Aug 2005 21:28:50 -0000	1.8.2.2
@@ -67,6 +67,11 @@
 											 'code' => 'nl_NL' )  
 									  ));
   }
+
+  /** UTF-8 friendly htmlentities() */
+  /* static */ function htmlentities( $str ) {	
+	return htmlentities( $str, ENT_QUOTES, "UTF-8");
+  }
 };
 
 /*


From cvs at intevation.de  Mon Aug 29 23:28:52 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 23:28:55 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php, 1.10.2.1, 1.10.2.2 
Message-ID: <20050829212852.81F341006B6@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	addr.php 
Log Message:
Backport of fix for Issue915 (encoding problem)

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- addr.php	28 Jul 2005 01:45:41 -0000	1.10.2.1
+++ addr.php	29 Aug 2005 21:28:50 -0000	1.10.2.2
@@ -85,7 +85,7 @@
   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 
    ');
+	  $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision 
    ');
 	}
   }
   return $str;


From cvs at intevation.de  Mon Aug 29 23:28:52 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 23:28:56 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	deliver.php, 1.1.2.1, 1.1.2.2 forward.php, 1.11,
	1.11.2.1 user.php, 1.62, 1.62.2.1 vacation.php, 1.17, 1.17.2.1 
Message-ID: <20050829212852.971A11006BA@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	deliver.php forward.php user.php vacation.php 
Log Message:
Backport of fix for Issue915 (encoding problem)

Index: deliver.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- deliver.php	27 Jul 2005 21:03:22 -0000	1.1.2.1
+++ deliver.php	29 Aug 2005 21:28:50 -0000	1.1.2.2
@@ -64,7 +64,7 @@
 	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 		$errors[] = $res->getMessage();
 		$errors[] = _('Script was:');
-		$errors[] = '
    '.htmlentities($script).'
    ';
+		$errors[] = '
    '.MySmarty::htmlentities($script).'
    ';
 	  }
 	  if( !$active && $sieve->getActive() === $scriptname ) {
 		$sieve->setActive( '' );

Index: forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- forward.php	11 Mar 2005 09:11:15 -0000	1.11
+++ forward.php	29 Aug 2005 21:28:50 -0000	1.11.2.1
@@ -68,7 +68,7 @@
 	  if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 		$errors[] = $res->getMessage();
 		$errors[] = _('Script was:');
-		$errors[] = '
    '.htmlentities($script).'
    ';
+		$errors[] = '
    '.MySmarty::htmlentities($script).'
    ';
 	  }
 	  if( !$active && $sieve->getActive() === $scriptname ) {
 		$sieve->setActive( '' );

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -u -d -r1.62 -r1.62.2.1
--- user.php	30 May 2005 11:53:35 -0000	1.62
+++ user.php	29 Aug 2005 21:28:50 -0000	1.62.2.1
@@ -83,7 +83,7 @@
   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 
    ');
+	  $str .= _('Email address ').MySmarty::htmlentities($alias)._(' collision 
    ');
 	}
   }
   return $str;
@@ -99,7 +99,7 @@
   $str = '';
   foreach( $lst as $uid ) {
     if( $ldap->countMail( $_SESSION['base_dn'], $uid, $excludedn ) > 0 ) {
-      $str .= _('UID ').htmlentities($uid)._(' collision 
    ');
+      $str .= _('UID ').MySmarty::htmlentities($uid)._(' collision 
    ');
     }
   }
   return $str;

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- vacation.php	19 May 2005 23:51:17 -0000	1.17
+++ vacation.php	29 Aug 2005 21:28:50 -0000	1.17.2.1
@@ -50,7 +50,7 @@
 	if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
 	  $errors[] = $res->getMessage();
 	  $errors[] = 'Script was:';
-	  $errors[] = '
    '.htmlentities($script).'
    ';
+	  $errors[] = '
    '.MySmarty::htmlentities($script).'
    ';
 	}
 	if( !$active && $sieve->getActive() === $scriptname ) {
 	  $sieve->setActive( '' );


From cvs at intevation.de  Mon Aug 29 23:32:17 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Mon Aug 29 23:32:19 2005
Subject: steffen: server/imapd cyradm.annotate.patch,NONE,1.2.2.1 
Message-ID: <20050829213217.4DB881006B8@lists.intevation.de>

Author: steffen

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

Added Files:
      Tag: kolab_2_0_branch
	cyradm.annotate.patch 
Log Message:
cyradm mbxcfg /annotation blah

--- NEW FILE: cyradm.annotate.patch ---
diff -upr ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html ./doc/man/cyradm.1.html
--- ../cyrus-imapd-2.2.12.orig/doc/man/cyradm.1.html	2005-02-14 19:02:26.000000000 +0100
+++ ./doc/man/cyradm.1.html	2005-08-29 04:35:21.000000000 +0200
@@ -191,6 +191,10 @@ Indicates that the mailbox should have a
 
    
 Sets an email address to which messages injected into the server via NNTP 
 will be sent.
+
    
+
    /explicit/annotation
    
+
    
+Sets the annotation /explicit/annotation on mailbox to value.
 
    
 
    renamemailbox [--partition partition] oldname newname
    
 
    
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh ./perl/imap/cyradm.sh
--- ../cyrus-imapd-2.2.12.orig/perl/imap/cyradm.sh	2004-01-15 15:35:34.000000000 +0100
+++ ./perl/imap/cyradm.sh	2005-08-29 04:28:51.000000000 +0200
@@ -225,6 +225,10 @@ Indicates that the mailbox should have a
 Sets an email address to which messages injected into the server via NNTP 
 will be sent.
 
+=item C
+
+Sets the annotation I on I to I. 
+
 =back 
 
 =item C [C<--partition> I] I I
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm ./perl/imap/IMAP/Admin.pm
--- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Admin.pm	2004-02-19 23:50:12.000000000 +0100
+++ ./perl/imap/IMAP/Admin.pm	2005-08-29 04:02:38.000000000 +0200
@@ -789,12 +789,12 @@ sub mboxconfig {
     return undef;
   }
 
-  if(!exists($values{$entry})) {
-    $self->{error} = "Unknown parameter $entry";
+  if(exists($values{$entry})) {
+    $entry = $values{$entry};    
+  } else {
+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
   }
 
-  $entry = $values{$entry};
-
   my ($rc, $msg);
 
   $value = undef if($value eq "none");
diff -upr ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm ./perl/imap/IMAP/Shell.pm
--- ../cyrus-imapd-2.2.12.orig/perl/imap/IMAP/Shell.pm	2004-01-15 15:35:35.000000000 +0100
+++ ./perl/imap/IMAP/Shell.pm	2005-08-29 04:02:38.000000000 +0200
@@ -126,7 +126,7 @@ my %builtins = (exit =>
 		  [\&_sc_info, '[mailbox]',
 		   'display mailbox/server metadata'],
 		mboxcfg =>
-		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
+		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/] value',
 		   'configure mailbox'],
 		mboxconfig => 'mboxcfg',
 		reconstruct =>
@@ -1339,7 +1339,7 @@ sub _sc_mboxcfg {
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1348,7 +1348,7 @@ sub _sc_mboxcfg {
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";


From cvs at intevation.de  Tue Aug 30 01:52:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 01:52:37 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar
	iCalendar.php, 1.6, 1.7 
Message-ID: <20050829235236.5F79F1006AF@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar
In directory doto:/tmp/cvs-serv11596/kolab-resource-handlers/fbview/fbview/framework/iCalendar

Modified Files:
	iCalendar.php 
Log Message:
Fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)

Index: iCalendar.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar/iCalendar.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- iCalendar.php	26 Jan 2005 07:32:31 -0000	1.6
+++ iCalendar.php	29 Aug 2005 23:52:34 -0000	1.7
@@ -14,6 +14,7 @@
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
+
 class Horde_iCalendar {
 
     var $_container = null;
@@ -288,12 +289,23 @@
         // Unfold any folded lines.
         $vCal = preg_replace ('/(\r|\n)+ /', '', $vCal);
 
+        // Unfold "quoted printable" folded lines like:
+        //  BODY;ENCODING=QUOTED-PRINTABLE:=
+        //  another=20line=
+        //  last=20line
+        if (preg_match_all('/^([^:]+;\s*ENCODING=QUOTED-PRINTABLE(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches)) {
+            foreach ($matches[1] as $s) {
+                $r = preg_replace('/=\r?\n/', '', $s);
+                $vCal = str_replace($s, $r, $vCal);
+            }
+        }
+
         // Parse the remaining attributes.
-        if (preg_match_all('/(.*):(.*)(\r|\n)+/', $vCal, $matches)) {
+		if (preg_match_all('/(.*):([^\r\n]*)[\r\n]+/', $vCal, $matches)) {
             foreach ($matches[0] as $attribute) {
-                preg_match('/([^;^:]*)((;[^:]*)?):(.*)/', $attribute, $parts);
+                preg_match('/([^;^:]*)((;.*)?|(;[^:;=]+=(".*"|[^:;=]*))+):([^\r\n]*)[\r\n]*/', $attribute, $parts);
                 $tag = $parts[1];
-                $value = $parts[4];
+                $value = $parts[6];
                 $params = array();
 
                 if (!empty($parts[2])) {


From cvs at intevation.de  Tue Aug 30 01:52:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 01:52:39 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.130, 1.131 
Message-ID: <20050829235236.596F81006A9@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab-resource-handlers.spec 
Log Message:
Fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- kolab-resource-handlers.spec	29 Aug 2005 04:53:49 -0000	1.130
+++ kolab-resource-handlers.spec	29 Aug 2005 23:52:34 -0000	1.131
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050828
+Release:	20050829
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Tue Aug 30 01:52:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 01:52:40 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
	day.php, 1.4, 1.5 month.php, 1.3, 1.4 week.php, 1.5,
	1.6 workweek.php, 1.5, 1.6 
Message-ID: <20050829235236.6FE141006B6@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv11596/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView

Modified Files:
	day.php month.php week.php workweek.php 
Log Message:
Fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)

Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- day.php	11 Nov 2004 15:08:48 -0000	1.4
+++ day.php	29 Aug 2005 23:52:34 -0000	1.5
@@ -11,6 +11,7 @@
  * @author  Mike Cochrane 
  * @package Kronolith
  */
+
 class Kronolith_FreeBusy_View_day extends Kronolith_FreeBusy_View {
 
     var $_startStamp;
@@ -28,8 +29,8 @@
                 $right = max(0, 100 * (($end - $this->_startStamp) / ($this->_endStamp - $this->_startStamp)));
                 $width = $right - $left;
 
-                $template->set('left', $left);
-                $template->set('width', min($width, 100 - $left) );
+                $template->set('left', sprintf("%F", $left));
+                $template->set('width', sprintf("%F", min($width, 100 - $left)) );
                 $template->set('top', $count++ * 15);
                 $template->set('evclick', '');
                 $template->set('label', '');

Index: month.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/month.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- month.php	21 Dec 2004 23:59:57 -0000	1.3
+++ month.php	29 Aug 2005 23:52:34 -0000	1.4
@@ -210,8 +210,8 @@
 		  }
 		}
                 if (($right - $left) != 0) {
-                    $template->set('left', $left);
-                    $template->set('width', $right - $left);
+				    $template->set('left', sprintf("%F",$left));
+                    $template->set('width', sprintf("%F",$right - $left));
                     $template->set('top', $count++ * 15);
                     $template->set('label', $label);
                     $template->set('evclick', '');
@@ -256,7 +256,7 @@
             $left  = 0;
 
             $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -279,8 +279,8 @@
             }
             $right  = 100;
 
-            $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('left', sprintf("%F",$left));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');

Index: week.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- week.php	21 Dec 2004 23:59:57 -0000	1.5
+++ week.php	29 Aug 2005 23:52:34 -0000	1.6
@@ -224,8 +224,8 @@
 		  }
 		}
                 if ( ($right - $left) != 0.) {
-                    $template->set('left', $left);
-                    $template->set('width', $right - $left);
+				    $template->set('left', sprintf("%F",$left));
+					$template->set('width', sprintf("%F",$right - $left));
                     $template->set('top', $count++ * 15);
                     $template->set('label', $label);
                     $template->set('evclick', '');
@@ -270,7 +270,7 @@
             $left  = 0;
 
             $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -293,8 +293,8 @@
             }
             $right  = 100;
 
-            $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('left', sprintf("%F",$left));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');

Index: workweek.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- workweek.php	21 Dec 2004 23:59:57 -0000	1.5
+++ workweek.php	29 Aug 2005 23:52:34 -0000	1.6
@@ -220,8 +220,8 @@
 		    $right += 1;
 		  }
 		}
-                $template->set('left', $left);
-                $template->set('width', $right - $left);
+		        $template->set('left', sprintf("%F",$left));
+                $template->set('width', sprintf("%F",$right - $left));
                 $template->set('top', $count++ * 15);
                 $template->set('label', $label);
                 $template->set('evclick', '');
@@ -265,7 +265,7 @@
             $left  = 0;
 
             $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -288,8 +288,8 @@
             }
             $right  = 100;
 
-            $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('left', sprintf("%F",$left));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');


From cvs at intevation.de  Tue Aug 30 01:53:21 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 01:53:22 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.126.2.2, 1.126.2.3 
Message-ID: <20050829235321.03C681006AF@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolab-resource-handlers.spec 
Log Message:
Backport from HAED of fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.126.2.2
retrieving revision 1.126.2.3
diff -u -d -r1.126.2.2 -r1.126.2.3
--- kolab-resource-handlers.spec	29 Aug 2005 04:53:52 -0000	1.126.2.2
+++ kolab-resource-handlers.spec	29 Aug 2005 23:53:18 -0000	1.126.2.3
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050828
+Release:	20050829
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Tue Aug 30 01:53:21 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 01:53:23 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar
	iCalendar.php, 1.6, 1.6.2.1 
Message-ID: <20050829235321.048761006B6@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar
In directory doto:/tmp/cvs-serv11685/kolab-resource-handlers/fbview/fbview/framework/iCalendar

Modified Files:
      Tag: kolab_2_0_branch
	iCalendar.php 
Log Message:
Backport from HAED of fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)

Index: iCalendar.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/framework/iCalendar/iCalendar.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- iCalendar.php	26 Jan 2005 07:32:31 -0000	1.6
+++ iCalendar.php	29 Aug 2005 23:53:18 -0000	1.6.2.1
@@ -14,6 +14,7 @@
  * @since   Horde 3.0
  * @package Horde_iCalendar
  */
+
 class Horde_iCalendar {
 
     var $_container = null;
@@ -288,12 +289,23 @@
         // Unfold any folded lines.
         $vCal = preg_replace ('/(\r|\n)+ /', '', $vCal);
 
+        // Unfold "quoted printable" folded lines like:
+        //  BODY;ENCODING=QUOTED-PRINTABLE:=
+        //  another=20line=
+        //  last=20line
+        if (preg_match_all('/^([^:]+;\s*ENCODING=QUOTED-PRINTABLE(.*=\r?\n)+(.*[^=])?\r?\n)/mU', $vCal, $matches)) {
+            foreach ($matches[1] as $s) {
+                $r = preg_replace('/=\r?\n/', '', $s);
+                $vCal = str_replace($s, $r, $vCal);
+            }
+        }
+
         // Parse the remaining attributes.
-        if (preg_match_all('/(.*):(.*)(\r|\n)+/', $vCal, $matches)) {
+		if (preg_match_all('/(.*):([^\r\n]*)[\r\n]+/', $vCal, $matches)) {
             foreach ($matches[0] as $attribute) {
-                preg_match('/([^;^:]*)((;[^:]*)?):(.*)/', $attribute, $parts);
+                preg_match('/([^;^:]*)((;.*)?|(;[^:;=]+=(".*"|[^:;=]*))+):([^\r\n]*)[\r\n]*/', $attribute, $parts);
                 $tag = $parts[1];
-                $value = $parts[4];
+                $value = $parts[6];
                 $params = array();
 
                 if (!empty($parts[2])) {


From cvs at intevation.de  Tue Aug 30 01:53:21 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 01:53:24 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
	day.php, 1.4, 1.4.2.1 month.php, 1.3, 1.3.2.1 week.php, 1.5,
	1.5.2.1 workweek.php, 1.5, 1.5.2.1 
Message-ID: <20050829235321.0E1A21006B9@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv11685/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView

Modified Files:
      Tag: kolab_2_0_branch
	day.php month.php week.php workweek.php 
Log Message:
Backport from HAED of fix for Issue666 (fbview wrong) and Issue869 (insane freebusy...)

Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- day.php	11 Nov 2004 15:08:48 -0000	1.4
+++ day.php	29 Aug 2005 23:53:19 -0000	1.4.2.1
@@ -11,6 +11,7 @@
  * @author  Mike Cochrane 
  * @package Kronolith
  */
+
 class Kronolith_FreeBusy_View_day extends Kronolith_FreeBusy_View {
 
     var $_startStamp;
@@ -28,8 +29,8 @@
                 $right = max(0, 100 * (($end - $this->_startStamp) / ($this->_endStamp - $this->_startStamp)));
                 $width = $right - $left;
 
-                $template->set('left', $left);
-                $template->set('width', min($width, 100 - $left) );
+                $template->set('left', sprintf("%F", $left));
+                $template->set('width', sprintf("%F", min($width, 100 - $left)) );
                 $template->set('top', $count++ * 15);
                 $template->set('evclick', '');
                 $template->set('label', '');

Index: month.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/month.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- month.php	21 Dec 2004 23:59:57 -0000	1.3
+++ month.php	29 Aug 2005 23:53:19 -0000	1.3.2.1
@@ -210,8 +210,8 @@
 		  }
 		}
                 if (($right - $left) != 0) {
-                    $template->set('left', $left);
-                    $template->set('width', $right - $left);
+				    $template->set('left', sprintf("%F",$left));
+                    $template->set('width', sprintf("%F",$right - $left));
                     $template->set('top', $count++ * 15);
                     $template->set('label', $label);
                     $template->set('evclick', '');
@@ -256,7 +256,7 @@
             $left  = 0;
 
             $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -279,8 +279,8 @@
             }
             $right  = 100;
 
-            $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('left', sprintf("%F",$left));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');

Index: week.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- week.php	21 Dec 2004 23:59:57 -0000	1.5
+++ week.php	29 Aug 2005 23:53:19 -0000	1.5.2.1
@@ -224,8 +224,8 @@
 		  }
 		}
                 if ( ($right - $left) != 0.) {
-                    $template->set('left', $left);
-                    $template->set('width', $right - $left);
+				    $template->set('left', sprintf("%F",$left));
+					$template->set('width', sprintf("%F",$right - $left));
                     $template->set('top', $count++ * 15);
                     $template->set('label', $label);
                     $template->set('evclick', '');
@@ -270,7 +270,7 @@
             $left  = 0;
 
             $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -293,8 +293,8 @@
             }
             $right  = 100;
 
-            $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('left', sprintf("%F",$left));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');

Index: workweek.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- workweek.php	21 Dec 2004 23:59:57 -0000	1.5
+++ workweek.php	29 Aug 2005 23:53:19 -0000	1.5.2.1
@@ -220,8 +220,8 @@
 		    $right += 1;
 		  }
 		}
-                $template->set('left', $left);
-                $template->set('width', $right - $left);
+		        $template->set('left', sprintf("%F",$left));
+                $template->set('width', sprintf("%F",$right - $left));
                 $template->set('top', $count++ * 15);
                 $template->set('label', $label);
                 $template->set('evclick', '');
@@ -265,7 +265,7 @@
             $left  = 0;
 
             $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');
@@ -288,8 +288,8 @@
             }
             $right  = 100;
 
-            $template->set('left', $left);
-            $template->set('width', min($right - $left, 100));
+            $template->set('left', sprintf("%F",$left));
+            $template->set('width', sprintf("%F",min($right - $left, 100)));
             $template->set('top', $count++ * 15);
 
             $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/unknownblock.tpl');


From cvs at intevation.de  Tue Aug 30 20:50:58 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 20:51:00 2005
Subject: steffen: server/imapd kolab.patch,1.24,1.25 
Message-ID: <20050830185058.CBD191006BD@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab.patch 
Log Message:
Fix for Issue901 (wrong reconstruct and quota binaries called)

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- kolab.patch	22 Jul 2005 22:36:14 -0000	1.24
+++ kolab.patch	30 Aug 2005 18:50:56 -0000	1.25
@@ -1,6 +1,6 @@
---- ../imapd.orig/imapd.spec	2005-02-21 18:02:27.000000000 +0100
-+++ imapd.spec	2005-06-10 04:00:13.000000000 +0200
-@@ -3,6 +3,9 @@
+--- ../imapd.orig/imapd.spec	2005-06-15 20:55:40.000000000 +0200
++++ imapd.spec	2005-08-30 02:09:35.000000000 +0200
+@@ -2,6 +2,9 @@
  ##  imapd.spec -- OpenPKG RPM Package Specification
  ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. 
  ##  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,16 @@ Class:        BASE
+@@ -33,13 +36,16 @@ Class:        BASE
  Group:        Mail
  License:      BSD
  Version:      2.2.12
@@ -32,7 +32,7 @@
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +56,11 @@ Source3:      imapd.conf
+@@ -49,6 +55,11 @@ Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
@@ -44,7 +44,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -62,6 +72,10 @@ PreReq:       sasl, db >= 4.2.52, openss
+@@ -61,6 +72,10 @@ PreReq:       sasl, db >= 4.2.52, openss
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -55,7 +55,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -88,6 +102,7 @@ AutoReqProv:  no
+@@ -87,6 +102,7 @@ AutoReqProv:  no
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
@@ -63,7 +63,7 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -95,10 +110,21 @@ AutoReqProv:  no
+@@ -94,10 +110,21 @@ AutoReqProv:  no
      sleep 1
      touch configure
  %endif
@@ -85,4 +85,16 @@
 +	-e 's;-l\$dbname;%{l_prefix}/lib/lib$dbname.a;g' \
          configure
  
-     #   ensure local com_err can be used
+     #   ensure local et/com_err can be found
+@@ -158,6 +185,11 @@ AutoReqProv:  no
+         -e '/config_init/s;"deliver";"cyrdeliver";' \
+         imap/deliver.c
+ 
++    %{l_shtool} subst \
++	-e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \
++	-e '/snprintf(buf, sizeof(buf), "%s/s;/quota";/cyrquota";' \
++	imap/imapd.c
++
+ %build
+     cflags="%{l_cppflags}"
+ %if "%{with_atvdom}" == "yes"


From cvs at intevation.de  Tue Aug 30 20:51:08 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 20:51:09 2005
Subject: steffen: server/imapd kolab.patch,1.22.2.2,1.22.2.3 
Message-ID: <20050830185108.9D8AA1006BE@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolab.patch 
Log Message:
Backport from HEAD: Fix for Issue901 (wrong reconstruct and quota binaries called)

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -d -r1.22.2.2 -r1.22.2.3
--- kolab.patch	29 Aug 2005 07:14:06 -0000	1.22.2.2
+++ kolab.patch	30 Aug 2005 18:51:06 -0000	1.22.2.3
@@ -1,6 +1,6 @@
---- ../imapd.orig/imapd.spec	2005-02-21 18:02:27.000000000 +0100
-+++ imapd.spec	2005-06-10 04:00:13.000000000 +0200
-@@ -3,6 +3,9 @@
+--- ../imapd.orig/imapd.spec	2005-06-15 20:55:40.000000000 +0200
++++ imapd.spec	2005-08-30 20:36:16.000000000 +0200
+@@ -2,6 +2,9 @@
  ##  imapd.spec -- OpenPKG RPM Package Specification
  ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. 
  ##  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,16 @@ Class:        BASE
+@@ -33,13 +36,16 @@ Class:        BASE
  Group:        Mail
  License:      BSD
  Version:      2.2.12
@@ -32,7 +32,7 @@
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +56,11 @@ Source3:      imapd.conf
+@@ -49,6 +55,11 @@ Source3:      imapd.conf
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
@@ -44,7 +44,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -62,6 +72,10 @@ PreReq:       sasl, db >= 4.2.52, openss
+@@ -61,6 +72,10 @@ PreReq:       sasl, db >= 4.2.52, openss
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -55,7 +55,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -88,6 +102,7 @@ AutoReqProv:  no
+@@ -87,6 +102,7 @@ AutoReqProv:  no
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
@@ -63,7 +63,7 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -95,10 +110,21 @@ AutoReqProv:  no
+@@ -94,10 +110,21 @@ AutoReqProv:  no
      sleep 1
      touch configure
  %endif
@@ -85,4 +85,16 @@
 +	-e 's;-l\$dbname;%{l_prefix}/lib/lib$dbname.a;g' \
          configure
  
-     #   ensure local com_err can be used
+     #   ensure local et/com_err can be found
+@@ -158,6 +185,11 @@ AutoReqProv:  no
+         -e '/config_init/s;"deliver";"cyrdeliver";' \
+         imap/deliver.c
+ 
++    %{l_shtool} subst \
++        -e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \
++        -e '/snprintf(buf, sizeof(buf), "%s/s;/quota";/cyrquota";' \
++        imap/imapd.c
++
+ %build
+     cflags="%{l_cppflags}"
+ %if "%{with_atvdom}" == "yes"


From cvs at intevation.de  Tue Aug 30 21:03:19 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 21:03:22 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	resmgr.php, 1.69, 1.70 
Message-ID: <20050830190319.ED9271006C0@lists.intevation.de>

Author: steffen

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

Modified Files:
	resmgr.php 
Log Message:
removed excessive debug output

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- resmgr.php	31 May 2005 00:20:01 -0000	1.69
+++ resmgr.php	30 Aug 2005 19:03:17 -0000	1.70
@@ -975,7 +975,7 @@
 	$recurrence->setRangetype('none');
       }
       $exclusions = $itip->getAttribute('EXDATE');
-      myLog("exslusions=".print_r($exclusions,true), RM_LOG_DEBUG);
+      //myLog("exclusions=".print_r($exclusions,true), RM_LOG_DEBUG);
       if( !is_a( $exclusions, 'PEAR_Error' ) ) {
 	if( !is_array( $exclusions ) ) $exclusions = array( $exclusions );
 	foreach( $exclusions as $ex ) {


From cvs at intevation.de  Tue Aug 30 21:03:37 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Tue Aug 30 21:03:38 2005
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	resmgr.php, 1.69, 1.69.2.1 
Message-ID: <20050830190337.3E9001006C2@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	resmgr.php 
Log Message:
removed excessive debug output

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.69
retrieving revision 1.69.2.1
diff -u -d -r1.69 -r1.69.2.1
--- resmgr.php	31 May 2005 00:20:01 -0000	1.69
+++ resmgr.php	30 Aug 2005 19:03:35 -0000	1.69.2.1
@@ -975,7 +975,7 @@
 	$recurrence->setRangetype('none');
       }
       $exclusions = $itip->getAttribute('EXDATE');
-      myLog("exslusions=".print_r($exclusions,true), RM_LOG_DEBUG);
+      //myLog("exclusions=".print_r($exclusions,true), RM_LOG_DEBUG);
       if( !is_a( $exclusions, 'PEAR_Error' ) ) {
 	if( !is_array( $exclusions ) ) $exclusions = array( $exclusions );
 	foreach( $exclusions as $ex ) {


From cvs at intevation.de  Wed Aug 31 03:55:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Aug 31 03:55:38 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.126.2.3, 1.126.2.4 
Message-ID: <20050831015536.B4A3E1006BE@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	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.126.2.3
retrieving revision 1.126.2.4
diff -u -d -r1.126.2.3 -r1.126.2.4
--- kolab-resource-handlers.spec	29 Aug 2005 23:53:18 -0000	1.126.2.3
+++ kolab-resource-handlers.spec	31 Aug 2005 01:55:34 -0000	1.126.2.4
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050829
+Release:	20050830
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Wed Aug 31 03:55:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Aug 31 03:55:39 2005
Subject: steffen: server obmtool.conf,1.174.2.10,1.174.2.11 
Message-ID: <20050831015536.B463C1006BD@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
versions

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.10
retrieving revision 1.174.2.11
diff -u -d -r1.174.2.10 -r1.174.2.11
--- obmtool.conf	9 Aug 2005 09:17:19 -0000	1.174.2.10
+++ obmtool.conf	31 Aug 2005 01:55:34 -0000	1.174.2.11
@@ -15,7 +15,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.0.1-snapshot-20050728";
+    kolab_version="pre-2.0.1-snapshot-20050831";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -89,7 +89,7 @@
     @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
-    @install ${altloc}imapd-2.2.12-2.4.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
+    @install ${altloc}imapd-2.2.12-2.4.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
     @install ${loc}libiconv-1.9.2-2.4.0
     @install ${loc}autoconf-2.59-2.4.0
     @install ${loc}automake-1.9.5-2.4.0
@@ -134,8 +134,8 @@
     @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-2.0_20050727
     @install ${altloc}kolabd-1.9.4-20050801 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-0.4.0-20050728 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20050727 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-0.4.0-20050831 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.3.9-20050830 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then


From cvs at intevation.de  Wed Aug 31 03:55:36 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Aug 31 03:55:40 2005
Subject: steffen: server/imapd kolab.patch,1.22.2.3,1.22.2.4 
Message-ID: <20050831015536.B84BB1006C0@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolab.patch 
Log Message:
versions

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -r1.22.2.3 -r1.22.2.4
--- kolab.patch	30 Aug 2005 18:51:06 -0000	1.22.2.3
+++ kolab.patch	31 Aug 2005 01:55:34 -0000	1.22.2.4
@@ -15,7 +15,7 @@
  License:      BSD
  Version:      2.2.12
 -Release:      2.4.0
-+Release:      2.4.0_kolab
++Release:      2.4.0_kolab2
  
  #   package options
 -%option       with_fsl    yes


From cvs at intevation.de  Wed Aug 31 03:56:00 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Aug 31 03:56:01 2005
Subject: steffen: server obmtool.conf,1.189,1.190 
Message-ID: <20050831015600.7BBB81006BB@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
versions

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- obmtool.conf	30 Jul 2005 01:01:53 -0000	1.189
+++ obmtool.conf	31 Aug 2005 01:55:58 -0000	1.190
@@ -15,7 +15,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="pre-2.1-snapshot-20050719";
+    kolab_version="pre-2.1-snapshot-20050831";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -89,7 +89,7 @@
     @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
-    @install ${altloc}imapd-2.2.12-2.4.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
+    @install ${altloc}imapd-2.2.12-2.4.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars
     @install ${loc}libiconv-1.9.2-2.4.0
     @install ${loc}autoconf-2.59-2.4.0
     @install ${loc}automake-1.9.5-2.4.0
@@ -133,9 +133,9 @@
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20050728
-    @install ${altloc}kolabd-1.9.4-20050729 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-0.4.0-20050724 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20050719 --define kolab_version=$kolab_version
+    @install ${altloc}kolabd-2.0.0-20050729 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-0.4.9-20050831 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.4.1-20050830 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then


From cvs at intevation.de  Wed Aug 31 03:56:00 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Aug 31 03:56:02 2005
Subject: steffen: server/imapd kolab.patch,1.25,1.26 
Message-ID: <20050831015600.7E1141006BE@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab.patch 
Log Message:
versions

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- kolab.patch	30 Aug 2005 18:50:56 -0000	1.25
+++ kolab.patch	31 Aug 2005 01:55:58 -0000	1.26
@@ -15,7 +15,7 @@
  License:      BSD
  Version:      2.2.12
 -Release:      2.4.0
-+Release:      2.4.0_kolab
++Release:      2.4.0_kolab2
  
  #   package options
 -%option       with_fsl    yes


From cvs at intevation.de  Wed Aug 31 03:56:00 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Aug 31 03:56:04 2005
Subject: steffen: server/kolab-resource-handlers
	kolab-resource-handlers.spec, 1.131, 1.132 
Message-ID: <20050831015600.82E201006C0@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv27977/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.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- kolab-resource-handlers.spec	29 Aug 2005 23:52:34 -0000	1.131
+++ kolab-resource-handlers.spec	31 Aug 2005 01:55:58 -0000	1.132
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen  (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20050829
+Release:	20050830
 Class:		JUNK
 License:	GPL
 Group:		MAIL


From cvs at intevation.de  Wed Aug 31 23:48:50 2005
From: cvs at intevation.de (cvs@intevation.de)
Date: Wed Aug 31 23:48:51 2005
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	domainmaintainerlistall.tpl, 1.1, 1.2 
Message-ID: <20050831214850.C906B1005AD@lists.intevation.de>

Author: steffen

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

Modified Files:
	domainmaintainerlistall.tpl 
Log Message:
Fix for Issue873 (grrr, broken domainmaintainer link)

Index: domainmaintainerlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/domainmaintainerlistall.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- domainmaintainerlistall.tpl	5 Jul 2005 10:31:51 -0000	1.1
+++ domainmaintainerlistall.tpl	31 Aug 2005 21:48:48 -0000	1.2
@@ -20,8 +20,8 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   
    		{tr msg="Object Deleted, awaiting cleanup..."}{tr msg="Modify"}{tr msg="Delete"}{tr msg="Modify"}{tr msg="Delete"}
    
+
+
+
    September 14th, 2005»
+	Kolab Server update: 2.0.1 fixes bugs and security
+
    
+
    
+	The now published 2.0.1 edition of the Kolab Server is based on 
+	OpenPKG 2.4 and contains a few security updates from OpenPKG. 
+	In addition a few bugs have been fixed.
+	We recommend to update!
+
    
+
    
+
+
+
    + +
    July 27th, 2005 » Security Advisory for Kolab Server @@ -50,10 +67,6 @@ Advisory 02 for details.

    - - - - From cvs at intevation.de Wed Sep 14 22:59:00 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Sep 14 22:59:00 2005 Subject: bernhard: doc/www/src i18n.html.m4,1.1,1.2 Message-ID: <20050914205900.0CFBD1006D4@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22638 Modified Files: i18n.html.m4 Log Message: Changed 2.0.1rc1 to 2.0.1 server. Index: i18n.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/i18n.html.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- i18n.html.m4 11 Aug 2005 17:49:45 -0000 1.1 +++ i18n.html.m4 14 Sep 2005 20:58:58 -0000 1.2 @@ -9,7 +9,7 @@ The web administration interface of the Kolab Server offers localisation support since Kolab2. Translations can be done easily. -Kolab Server 2.0.1rc1 comes with the following activated translations: +Kolab Server 2.0.1 comes with the following activated translations:
      From cvs at intevation.de Wed Sep 14 23:04:48 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Sep 14 23:04:49 2005 Subject: bernhard: doc/www/src roadmap.html.m4,1.2,1.3 Message-ID: <20050914210448.846AF1006C7@lists.intevation.de> Author: bernhard Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22705 Modified Files: roadmap.html.m4 Log Message: Updated roadmap to reflect 2.0.1 server release. Index: roadmap.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- roadmap.html.m4 11 Aug 2005 15:07:02 -0000 1.2 +++ roadmap.html.m4 14 Sep 2005 21:04:46 -0000 1.3 @@ -20,21 +20,19 @@

      Kolab Server 2.0 release series

      -Current release is: 2.0.0 (June 20th, 2005) +Current release is: 2.0.1 (September 14th, 2005) -

      Upcoming Server release 2.0.1

      +

      Upcoming Server release 2.0.2

      -Expected: August 2005 +Expected: Oktober 2005
        -
      • Switch to OpenPKG 2.4 -
      • Additional language for web-admin: Italian. -
      • Improved deletion handling +
      • critical bug fixes for stability
      For more details see the release notes in CVS. -

      Post Server 2.0.1 releases

      +

      Post Server 2.0.2 releases

      The maintenance of the 2.0-branch includes security fixes and possible upgrades of OpenPKG. @@ -45,8 +43,9 @@

      Upcoming Kolab Server 2.1 release series

      -This development takes place in HEAD. So far -no release has been created. +This development takes place in HEAD. +Sometimes development releases are made +to help testing the new feature, e.g. development-2.1-20050811.

      Upcoming Server release 2.1beta1

      From cvs at intevation.de Thu Sep 15 09:22:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 09:22:11 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn,1.3.2.1,1.3.2.2 Message-ID: <20050915072210.85A1A1006AD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv31873 Modified Files: Tag: kolab_2_0_branch kolabquotawarn Log Message: patch from Issue851 Index: kolabquotawarn =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolabquotawarn,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- kolabquotawarn 22 Jul 2005 22:56:03 -0000 1.3.2.1 +++ kolabquotawarn 15 Sep 2005 07:22:08 -0000 1.3.2.2 @@ -34,6 +34,7 @@ use IO::File; use DB_File; use Mail::Message; +use Mail::Transport::SMTP; use Cyrus::IMAP::Admin; use Kolab; use Kolab::Util; From cvs at intevation.de Thu Sep 15 10:01:31 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 10:01:32 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn,1.3.2.2,1.3.2.3 Message-ID: <20050915080131.3BDF91006AD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv32293 Modified Files: Tag: kolab_2_0_branch kolabquotawarn Log Message: Lets try if this solved the encoding issue (Issue779) Index: kolabquotawarn =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolabquotawarn,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -d -r1.3.2.2 -r1.3.2.3 --- kolabquotawarn 15 Sep 2005 07:22:08 -0000 1.3.2.2 +++ kolabquotawarn 15 Sep 2005 08:01:29 -0000 1.3.2.3 @@ -131,7 +131,7 @@ my $mail = Mail::Message->build( From => "MAILER-DAEMON", To => $user, Subject => "Quota warning", - Charset => "utf-8", + "Content-Type" => "text/plain charset=utf-8", data => $msg ); $mail->print if $opt_d; my $mailer = Mail::Transport::SMTP->new(); From cvs at intevation.de Thu Sep 15 10:02:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 10:02:54 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn.in,1.1,1.2 Message-ID: <20050915080253.939551006AB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv32354 Modified Files: kolabquotawarn.in Log Message: Lets try if this solves the encoding issue (Issue779) Index: kolabquotawarn.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolabquotawarn.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabquotawarn.in 15 Sep 2005 08:02:51 -0000 1.2 @@ -34,6 +34,7 @@ use IO::File; use DB_File; use Mail::Message; +use Mail::Transport::SMTP; use Cyrus::IMAP::Admin; use Kolab; use Kolab::Util; @@ -130,7 +131,7 @@ my $mail = Mail::Message->build( From => "MAILER-DAEMON", To => $user, Subject => "Quota warning", - Charset => "utf-8", + "Content-Type" => "text/plain; charset=utf-8", data => $msg ); $mail->print if $opt_d; my $mailer = Mail::Transport::SMTP->new(); From cvs at intevation.de Thu Sep 15 12:47:12 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 12:47:13 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn,1.3.2.3,1.3.2.4 Message-ID: <20050915104712.BA2431006AC@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv6718 Modified Files: Tag: kolab_2_0_branch kolabquotawarn Log Message: Fix for Issue826 Index: kolabquotawarn =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolabquotawarn,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -d -r1.3.2.3 -r1.3.2.4 --- kolabquotawarn 15 Sep 2005 08:01:29 -0000 1.3.2.3 +++ kolabquotawarn 15 Sep 2005 10:47:10 -0000 1.3.2.4 @@ -121,6 +121,7 @@ my ($user) = ( $mailbox =~ /.*\/(.*)/ ); + $pct = sprintf("%.0f",$pct); print "mailbox=$mailbox, user=$user, used=$used, pct=$pct\n" if $opt_d; $msg =~ s//$user/g; From cvs at intevation.de Thu Sep 15 12:47:28 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 12:47:29 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn.in,1.2,1.3 Message-ID: <20050915104728.BC82B101FC1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv6754 Modified Files: kolabquotawarn.in Log Message: Fix for Issue826 Index: kolabquotawarn.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolabquotawarn.in 15 Sep 2005 08:02:51 -0000 1.2 +++ kolabquotawarn.in 15 Sep 2005 10:47:26 -0000 1.3 @@ -121,6 +121,7 @@ my ($user) = ( $mailbox =~ /.*\/(.*)/ ); + $pct = sprintf("%.0f",$pct); print "mailbox=$mailbox, user=$user, used=$used, pct=$pct\n" if $opt_d; $msg =~ s//$user/g; From cvs at intevation.de Thu Sep 15 13:23:14 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 13:23:16 2005 Subject: steffen: server/kolabd Makefile,1.6,1.7 Message-ID: <20050915112314.BAB8D101FB6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv10880 Modified Files: Makefile Log Message: bootstrap script seems to have been b0rked by autoconfiscation Index: Makefile =================================================================== RCS file: /kolabrepository/server/kolabd/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 13 Sep 2005 14:38:22 -0000 1.6 +++ Makefile 15 Sep 2005 11:23:12 -0000 1.7 @@ -10,7 +10,7 @@ all: test -d $(KOLABRPMSRC)/$(RPMNAME) || mkdir $(KOLABRPMSRC)/$(RPMNAME) cd $(RPMNAME) && ./bootstrap && ./configure --prefix=/kolab --enable-dist=kolab \ - && make dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME) + && make clean dist && mv $(RPMNAME)-$(VERSION).tar.gz $(KOLABRPMSRC)/$(RPMNAME) cp $(RPMNAME)/$(RPMNAME).spec $(KOLABRPMSRC)/$(RPMNAME)/ cd $(KOLABRPMSRC)/$(RPMNAME) && $(RPM) -ba $(RPMNAME).spec --define 'kolab_version CVS' binary: From cvs at intevation.de Thu Sep 15 13:23:14 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 13:23:18 2005 Subject: steffen: server/kolabd/kolabd kolab_bootstrap.in,1.1,1.2 Message-ID: <20050915112314.C9376101FBA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv10880/kolabd Modified Files: kolab_bootstrap.in Log Message: bootstrap script seems to have been b0rked by autoconfiscation Index: kolab_bootstrap.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab_bootstrap.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolab_bootstrap.in 15 Sep 2005 11:23:12 -0000 1.2 @@ -1,6 +1,6 @@ #!@perl_exec@ -# (c) 2004 Steffen Hansen +# (c) 2004-2005 Steffen Hansen # (c) 2003,2004 Tassilo Erlewein # (c) 2003-2005 Martin Konold # (c) 2003 Achim Frank @@ -206,21 +206,21 @@ my $backupdir="@sysconfdir@/kolab/backup".$epochseconds; mkdir($backupdir,0700) || die "cannot mkdir : $!"; print "creating backup of LDAP repository\n"; - system("cp -pRP "@ldapserver_dir@ .$backupdir."/openldap-data"); - system("rm -f @ldapserver_dir@/*"); + system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\""); + system("rm -f \"@ldapserver_dir@/*\""); print "creating backup of CA data\n"; - system(mv @sysconfdir@/kolab/ca .$backupdir); - system(mv @sysconfdir@/kolab/*.pem .$backupdir); - system("mv $kolab_config $backupdir"); + system("mv \"@sysconfdir@/kolab/ca\" \"$backupdir\""); + system("mv \"@sysconfdir@/kolab/*.pem\" \"$backupdir\""); + system("mv \"$kolab_config\" \"$backupdir\""); print "Cleaning up LDAP\n"; - system(rm -f @ldapserver_dir@/*"); + system("rm -f \"@ldapserver_dir@/*\""); } else { print "LDAP repository is empty - assuming fresh install\n"; } # fetch fresh template -copy(@sysconfdir@/kolab/templates/kolab.conf.template, $kolab_config); +copy("@sysconfdir@/kolab/templates/kolab.conf.template", $kolab_config); my $fd = IO::File->new($kolab_config, "r") || die "could not open $kolab_config"; From cvs at intevation.de Thu Sep 15 13:59:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 13:59:27 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/templates distlistall.tpl, 1.1, 1.1.2.1 Message-ID: <20050915115925.F274D101FB6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates In directory doto:/tmp/cvs-serv14653/kolab-webadmin/php/admin/templates Modified Files: Tag: kolab_2_0_branch distlistall.tpl Log Message: Backport of fix for Issue820 (distribution list errors "Multiple...") Index: distlistall.tpl =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/distlistall.tpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- distlistall.tpl 11 Mar 2005 09:59:05 -0000 1.1 +++ distlistall.tpl 15 Sep 2005 11:59:23 -0000 1.1.2.1 @@ -20,7 +20,7 @@ {else}
    {/if} - {if $entries[id].deleted eq "TRUE"} + {if $entries[id].deleted neq "FALSE"} {else} From cvs at intevation.de Thu Sep 15 13:59:26 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 15 13:59:28 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.16.2.1, 1.16.2.2 Message-ID: <20050915115926.082E4101FCA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist In directory doto:/tmp/cvs-serv14653/kolab-webadmin/www/admin/distributionlist Modified Files: Tag: kolab_2_0_branch list.php Log Message: Backport of fix for Issue820 (distribution list errors "Multiple...") Index: list.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -u -d -r1.16.2.1 -r1.16.2.2 --- list.php 28 Jul 2005 01:45:41 -0000 1.16.2.1 +++ list.php 15 Sep 2005 11:59:23 -0000 1.16.2.2 @@ -270,37 +270,31 @@ } break; case 'modify': - $result = $ldap->search( $dn, '(objectClass=kolabGroupOfNames)' ); - if( $result ) { - $ldap_object = ldap_get_entries( $ldap->connection, $result ); - if( $ldap_object['count'] == 1 ) { - fill_form_for_modify( $form, $ldap_object[0] ); - $form->entries['action']['value'] = 'save'; - $form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn ); - $form->entries['cn']['attrs'] = 'readonly'; - $heading = _('Modify Distribution List'); - $content = $form->outputForm(); - } else { - array_push($errors, _("Error: Multiple results returned for DN '$dn'")); - } + $ldap_object = $ldap->read( $dn ); + if( $ldap_object ) { + fill_form_for_modify( $form, $ldap_object ); + $form->entries['action']['value'] = 'save'; + $form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn ); + $form->entries['cn']['attrs'] = 'readonly'; + $heading = _('Modify Distribution List'); + $content = $form->outputForm(); + } else { + array_push($errors, _("Error: No results returned for DN '$dn'")); } break; case 'delete': - $result = $ldap->search( $dn, '(objectClass=kolabGroupOfNames)' ); - if( $result ) { - $ldap_object = ldap_get_entries( $ldap->connection, $result ); - if( $ldap_object['count'] == 1 ) { - fill_form_for_modify( $form, $ldap_object[0] ); - $form->entries['action']['value'] = 'kill'; - foreach( $form->entries as $key => $val ) { - $form->entries[$key]['attrs'] = 'readonly'; - } - $form->submittext = _('Delete'); - $heading = _('Delete Distribution List'); - $content = $form->outputForm(); - } else { - array_push($errors, _("Error: Multiple results returned for DN '$dn'")); + $ldap_object = $ldap->read( $dn ); + if( $ldap_object ) { + fill_form_for_modify( $form, $ldap_object ); + $form->entries['action']['value'] = 'kill'; + foreach( $form->entries as $key => $val ) { + $form->entries[$key]['attrs'] = 'readonly'; } + $form->submittext = _('Delete'); + $heading = _('Delete Distribution List'); + $content = $form->outputForm(); + } else { + array_push($errors, _("Error: No results returned for DN '$dn'")); } break; case 'kill': From cvs at intevation.de Fri Sep 16 14:37:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 14:37:38 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.91.2.4,1.91.2.5 Message-ID: <20050916123737.015751006A1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv2637 Modified Files: Tag: kolab_2_0_branch perl-kolab.spec Log Message: new conf file for policy daemon. Fixes Issue832 for kolab 2.0 Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/Attic/perl-kolab.spec,v retrieving revision 1.91.2.4 retrieving revision 1.91.2.5 diff -u -d -r1.91.2.4 -r1.91.2.5 --- perl-kolab.spec 12 Sep 2005 19:56:09 -0000 1.91.2.4 +++ perl-kolab.spec 16 Sep 2005 12:37:34 -0000 1.91.2.5 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 2.0_20050912 +Release: 2.0_20050916 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Fri Sep 16 14:37:37 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 14:37:39 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.55.2.2,1.55.2.3 Message-ID: <20050916123737.085461006CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv2637/Kolab-Conf Modified Files: Tag: kolab_2_0_branch Conf.pm Log Message: new conf file for policy daemon. Fixes Issue832 for kolab 2.0 Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.55.2.2 retrieving revision 1.55.2.3 diff -u -d -r1.55.2.2 -r1.55.2.3 --- Conf.pm 12 Sep 2005 22:14:13 -0000 1.55.2.2 +++ Conf.pm 16 Sep 2005 12:37:34 -0000 1.55.2.3 @@ -566,6 +566,7 @@ "$templatedir/amavisd.conf.template" => "$prefix/etc/amavisd/amavisd.conf", "$templatedir/main.cf.template" => "$prefix/etc/postfix/main.cf", "$templatedir/master.cf.template" => "$prefix/etc/postfix/master.cf", + "$templatedir/kolab_smtpdpolicy.conf.template" => "$prefix/etc/kolab/kolab_smtpdpolicy.conf", "$templatedir/saslauthd.conf.template" => "$prefix/etc/sasl/saslauthd.conf", "$templatedir/imapd.conf.template" => "$prefix/etc/imapd/imapd.conf", "$templatedir/httpd.conf.template" => "$prefix/etc/apache/apache.conf", @@ -588,6 +589,7 @@ "$prefix/etc/resmgr/resmgr.conf" => 0640, "$prefix/etc/postfix/main.cf" => 0640, "$prefix/etc/postfix/master.cf" => 0640, + "$prefix/etc/kolab/kolab_smtpdpolicy.conf" => 0640, "$prefix/etc/clamav/clamd.conf" => 0640, "$prefix/etc/clamav/freshclam.conf" => 0640, "$prefix/etc/amavisd/amavisd.conf" => 0640, @@ -612,6 +614,7 @@ "$prefix/etc/resmgr/resmgr.conf" => "kolab:kolab-n", "$prefix/etc/postfix/main.cf" => "kolab:kolab-r", "$prefix/etc/postfix/master.cf" => "kolab:kolab-r", + "$prefix/etc/kolab/kolab_smtpdpolicy.conf" => "kolab:kolab-n", "$prefix/etc/clamav/clamd.conf" => "kolab:kolab-r", "$prefix/etc/clamav/freshclam.conf" => "kolab:kolab-r", "$prefix/etc/amavisd/amavisd.conf" => "kolab:kolab-r", From cvs at intevation.de Fri Sep 16 14:37:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 14:37:55 2005 Subject: steffen: server/kolabd/kolabd/templates kolab_smtpdpolicy.conf.template, NONE, 1.1.2.1 master.cf.template, 1.11.2.1, 1.11.2.2 Message-ID: <20050916123753.AAC87101EEB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv2704/kolabd/templates Modified Files: Tag: kolab_2_0_branch master.cf.template Added Files: Tag: kolab_2_0_branch kolab_smtpdpolicy.conf.template Log Message: new conf file for policy daemon. Fixes Issue832 for kolab 2.0 --- NEW FILE: kolab_smtpdpolicy.conf.template --- # (c) 2005 Steffen Hansen (Klaralvdalens Datakonsult AB) # # 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 # manual additions are lost unless made to the template in the Kolab config directory ldap_uri: @@@ldap_uri@@@ basedn: @@@user_dn_list@@@ binddn: @@@php_dn@@@ bindpw: @@@php_pw@@@ domain: @@@postfix-mydomain@@@ @@@if postfix-allow-unauthenticated@@@ allow_unauth: 1 @@@else@@@ allow_unauth: 0 @@@endif@@@ permithosts: @@@kolabhost|join,@@@ Index: master.cf.template =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/master.cf.template,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -d -r1.11.2.1 -r1.11.2.2 --- master.cf.template 26 Jul 2005 01:37:57 -0000 1.11.2.1 +++ master.cf.template 16 Sep 2005 12:37:51 -0000 1.11.2.2 @@ -76,15 +76,6 @@ -o smtpd_soft_error_limit=1001 -o smtpd_hard_error_limit=1000 kolabpolicy unix - n n - - spawn user=@l_nusr@ argv=@l_prefix@/etc/kolab/kolab_smtpdpolicy - -ldap @@@ldap_uri@@@ - -basedn @@@user_dn_list@@@ - -binddn @@@php_dn@@@ - -bindpw @@@php_pw@@@ - -domain @@@postfix-mydomain@@@ -@@@if postfix-allow-unauthenticated@@@ - -allow-unauth -@@@endif@@@ - -permithosts @@@kolabhost|join,@@@ kolabfilter unix - n n - - pipe user=@l_nusr@ flags=n argv=@l_prefix@/bin/php -c @l_prefix@/etc/apache/php.ini From cvs at intevation.de Fri Sep 16 14:37:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 14:37:56 2005 Subject: steffen: server/kolabd kolabd.spec,1.57.2.3,1.57.2.4 Message-ID: <20050916123753.A41D01006CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv2704 Modified Files: Tag: kolab_2_0_branch kolabd.spec Log Message: new conf file for policy daemon. Fixes Issue832 for kolab 2.0 Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/Attic/kolabd.spec,v retrieving revision 1.57.2.3 retrieving revision 1.57.2.4 diff -u -d -r1.57.2.3 -r1.57.2.4 --- kolabd.spec 1 Aug 2005 20:37:43 -0000 1.57.2.3 +++ kolabd.spec 16 Sep 2005 12:37:51 -0000 1.57.2.4 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050801 +Release: 20050916 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Fri Sep 16 14:37:53 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 14:37:58 2005 Subject: steffen: server/kolabd/kolabd kolab_smtpdpolicy,1.6,1.6.2.1 Message-ID: <20050916123753.ADFA4101EF5@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv2704/kolabd Modified Files: Tag: kolab_2_0_branch kolab_smtpdpolicy Log Message: new conf file for policy daemon. Fixes Issue832 for kolab 2.0 Index: kolab_smtpdpolicy =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolab_smtpdpolicy,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- kolab_smtpdpolicy 21 Feb 2005 13:25:28 -0000 1.6 +++ kolab_smtpdpolicy 16 Sep 2005 12:37:51 -0000 1.6.2.1 @@ -26,6 +26,9 @@ use Net::LDAP::Entry; use Net::hostent; use Socket; +use Kolab::Util; + +my %conf; # # Usage: kolab_smtpd_policy.pl [-v] @@ -121,13 +124,13 @@ } sub ldap_connect { - my $ldapuri = URI->new($conf_ldapuri) || fatal_exit("error: could not parse given uri"); - $ldap = Net::LDAP->new($conf_ldapuri) || fatal_exit("could not connect ldap server"); + my $ldapuri = URI->new($conf_ldapuri) || fatal_exit("error: could not parse given uri $conf_ldapuri"); + $ldap = Net::LDAP->new($conf_ldapuri) || fatal_exit("could not connect to ldap server $conf_ldapuri: $@"); if ($ldap) { if( $conf_binddn ) { - $ldap->bind( $conf_binddn, password => $conf_bindpw ) || fatal_exit( "could not bind as $conf_binddn" ); + $ldap->bind( $conf_binddn, password => $conf_bindpw ) || fatal_exit( "could not bind as $conf_binddn: $@" ); } else { - $ldap->bind || fatal_exit("could not bind"); + $ldap->bind || fatal_exit("could not bind: $@"); } } else { fatal_exit( "Could not contact LDAP server" ); @@ -302,9 +305,21 @@ openlog $0, $syslog_options, $syslog_facility; # -# We don't need getopt() for now. +# Read options from config-file # $conf_allowunauth = 0; +%conf = readConfig( %conf, "@l_prefix@/etc/kolab/kolab_smtpdpolicy.conf" ); +$conf_ldapuri = $conf{'ldap_uri'}; +$conf_basedn = $conf{'basedn'}; +$conf_bindn = $conf{'binddn'}; +$conf_bindpw = $conf{'bindpw'}; +$conf_domain = $conf{'domain'}; +$conf_allowunauth = 1 if( $conf{'allow_unauth'} ); +@conf_permithosts = split /\s*,\s*/, $conf{'permithosts'}; + +# +# Allow user to override on commandline +# while ($option = shift(@ARGV)) { if ($option eq "-v") { $verbose = 1; @@ -321,6 +336,7 @@ } elsif ($option eq '-allow-unauth') { $conf_allowunauth = 1; } elsif ($option eq '-permithosts') { + @conf_permithosts = (); for my $h (split /\s*,\s*/, shift(@ARGV)) { push @conf_permithosts, $h; } From cvs at intevation.de Fri Sep 16 14:50:56 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 14:50:58 2005 Subject: steffen: server/kolabd/kolabd Makefile.am, 1.1, 1.2 kolab_smtpdpolicy.in, 1.1, 1.2 Makefile.in, 1.1, NONE Message-ID: <20050916125056.F33F31006CF@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv2999/kolabd Modified Files: Makefile.am kolab_smtpdpolicy.in Removed Files: Makefile.in Log Message: new conf file for policy daemon plus a couple of fixed for stuff broken by the autoconfiscation process. Fixes Issue832 for kolab 2.1 Index: Makefile.am =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 13 Sep 2005 14:38:22 -0000 1.1 +++ Makefile.am 16 Sep 2005 12:50:54 -0000 1.2 @@ -43,6 +43,7 @@ templates/ldap.conf.template \ templates/main.cf.template \ templates/master.cf.template \ + templates/kolab_smtpdpolicy.conf.template \ templates/php.ini.template \ templates/proftpd.conf.template \ templates/rc.conf.template \ @@ -386,6 +387,12 @@ $(do_subst) <$(srcdir)/templates/master.cf.template.in >$@ CLEANFILES += templates/master.cf.template EXTRA_DIST += templates/master.cf.template.in + +templates/kolab_smtpdpolicy.conf.template: + @$(mkinstalldirs) templates + $(do_subst) <$(srcdir)/templates/kolab_smtpdpolicy.conf.template.in >$@ +CLEANFILES += templates/kolab_smtpdpolicy.conf.template +EXTRA_DIST += templates/kolab_smtpdpolicy.conf.template.in templates/php.ini.template: @$(mkinstalldirs) templates Index: kolab_smtpdpolicy.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab_smtpdpolicy.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolab_smtpdpolicy.in 16 Sep 2005 12:50:54 -0000 1.2 @@ -26,6 +26,7 @@ use Net::LDAP::Entry; use Net::hostent; use Socket; +use Kolab::Util; # # Usage: kolab_smtpd_policy.pl [-v] @@ -96,12 +97,13 @@ # NOTE: comment out the $syslog_socktype line if syslogging does not # work on your system. # -$syslog_socktype = 'unix'; # inet, unix, stream, console -$syslog_facility="mail"; -$syslog_options="pid"; -$syslog_priority="info"; +my %conf; +my $syslog_socktype = 'unix'; # inet, unix, stream, console +my $syslog_facility="mail"; +my $syslog_options="pid"; +my $syslog_priority="info"; -$ldap_max_tries = 5; +my $ldap_max_tries = 5; sub mylog { my $prio = shift; @@ -121,13 +123,14 @@ } sub ldap_connect { - my $ldapuri = URI->new($conf_ldapuri) || fatal_exit("error: could not parse given uri"); - $ldap = Net::LDAP->new($conf_ldapuri) || fatal_exit("could not connect ldap server"); + my $ldapuri = URI->new($conf_ldapuri) || fatal_exit("error: could not parse given uri $conf_ldapuri"); + $ldap = Net::LDAP->new($conf_ldapuri) || fatal_exit("could not connect ldap server $conf_ldapuri: $@"); if ($ldap) { if( $conf_binddn ) { - $ldap->bind( $conf_binddn, password => $conf_bindpw ) || fatal_exit( "could not bind as $conf_binddn" ); + $ldap->bind( $conf_binddn, password => $conf_bindpw ) + || fatal_exit( "could not bind as $conf_binddn: $@" ); } else { - $ldap->bind || fatal_exit("could not bind"); + $ldap->bind || fatal_exit("could not bind: $@"); } } else { fatal_exit( "Could not contact LDAP server" ); @@ -302,9 +305,21 @@ openlog $0, $syslog_options, $syslog_facility; # -# We don't need getopt() for now. +# Read options from config-file # $conf_allowunauth = 0; +%conf = readConfig( %conf, "@sysconfdir@/kolab/kolab_smtpdpolicy.conf" ); +$conf_ldapuri = $conf{'ldap_uri'}; +$conf_basedn = $conf{'basedn'}; +$conf_bindn = $conf{'binddn'}; +$conf_bindpw = $conf{'bindpw'}; +$conf_domain = $conf{'domain'}; +$conf_allowunauth = 1 if( $conf{'allow_unauth'} ); +@conf_permithosts = split /\s*,\s*/, $conf{'permithosts'}; + +# +# Allow user to override on commandline +# while ($option = shift(@ARGV)) { if ($option eq "-v") { $verbose = 1; @@ -321,6 +336,7 @@ } elsif ($option eq '-allow-unauth') { $conf_allowunauth = 1; } elsif ($option eq '-permithosts') { + @conf_permithosts = (); for my $h (split /\s*,\s*/, shift(@ARGV)) { push @conf_permithosts, $h; } --- Makefile.in DELETED --- From cvs at intevation.de Fri Sep 16 14:50:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 14:50:59 2005 Subject: steffen: server/kolabd/kolabd/templates kolab_smtpdpolicy.conf.template.in, NONE, 1.1 DB_CONFIG.slapd.template.in, 1.1, 1.2 master.cf.template.in, 1.1, 1.2 Message-ID: <20050916125057.0271B101EF1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv2999/kolabd/templates Modified Files: DB_CONFIG.slapd.template.in master.cf.template.in Added Files: kolab_smtpdpolicy.conf.template.in Log Message: new conf file for policy daemon plus a couple of fixed for stuff broken by the autoconfiscation process. Fixes Issue832 for kolab 2.1 --- NEW FILE: kolab_smtpdpolicy.conf.template.in --- KOLAB_META_START TARGET=@sysconfdir@/kolab/kolab_smtpdpolicy.conf PERMISSIONS=0640 OWNERSHIP=@kolab_musr@:@kolab_grp@ KOLAB_META_END # (c) 2005 Steffen Hansen (Klaralvdalens Datakonsult AB) # # 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 # manual additions are lost unless made to the template in the Kolab config directory ldap_uri: @@@ldap_uri@@@ basedn: @@@user_dn_list@@@ binddn: @@@php_dn@@@ bindpw: @@@php_pw@@@ domain: @@@postfix-mydomain@@@ @@@if postfix-allow-unauthenticated@@@ allow_unauth: 1 @@@else@@@ allow_unauth: 0 @@@endif@@@ permithosts: @@@kolabhost|join,@@@ Index: DB_CONFIG.slapd.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/DB_CONFIG.slapd.template.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- DB_CONFIG.slapd.template.in 13 Sep 2005 14:38:22 -0000 1.1 +++ DB_CONFIG.slapd.template.in 16 Sep 2005 12:50:54 -0000 1.2 @@ -1,7 +1,7 @@ KOLAB_META_START -TARGET=@l_prefix@/var/openldap/openldap-data/DB_CONFIG +TARGET=@ldapserver_dir@/DB_CONFIG PERMISSIONS=0640 -OWNERSHIP=@l_musr@:@l_rgrp@ +OWNERSHIP=@kolab_musr@:@kolab_rgrp@ KOLAB_META_END # (c) 2005 Klaraelvdalens Datakonsult AB # Written by Steffen Hansen Index: master.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- master.cf.template.in 13 Sep 2005 14:38:22 -0000 1.1 +++ master.cf.template.in 16 Sep 2005 12:50:54 -0000 1.2 @@ -81,15 +81,6 @@ -o smtpd_soft_error_limit=1001 -o smtpd_hard_error_limit=1000 kolabpolicy unix - n n - - spawn user=@emailserver_usr@ argv=@sysconfdir@/kolab/kolab_smtpdpolicy - -ldap @@@ldap_uri@@@ - -basedn @@@user_dn_list@@@ - -binddn @@@php_dn@@@ - -bindpw @@@php_pw@@@ - -domain @@@postfix-mydomain@@@ -@@@if postfix-allow-unauthenticated@@@ - -allow-unauth -@@@endif@@@ - -permithosts @@@kolabhost|join,@@@ kolabfilter unix - n n - - pipe user=@emailserver_usr@ flags=n argv=@bindir@/php -c @webserver_confdir@/php.ini From cvs at intevation.de Fri Sep 16 19:26:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 19:26:36 2005 Subject: bernhard: server release-notes.txt,1.15.2.7,1.15.2.8 Message-ID: <20050916172635.809D6100173@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv13076 Modified Files: Tag: kolab_2_0_branch release-notes.txt Log Message: Added that 2.0.1rc1 had fixed spamassassin (from OpenPKG-SA-2005.015). Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.15.2.7 retrieving revision 1.15.2.8 diff -u -d -r1.15.2.7 -r1.15.2.8 --- release-notes.txt 14 Sep 2005 17:57:58 -0000 1.15.2.7 +++ release-notes.txt 16 Sep 2005 17:26:33 -0000 1.15.2.8 @@ -67,8 +67,10 @@ The db package has not been updated to the version from OpenPKG 2.4 yet to avoid potential stability problems with OpenLDAP. - - Security update for OpenPKG 2.4: + - Security updates for OpenPKG 2.4: zlib-1.2.2-2.4.2 OpenPKG-SA-2005.014 and OpenPKG-SA-2005.013 + spamassassin-3.0.3-2.4.1 OpenPKG-SA-2005.015 + - A new clamav package fixing a buffer overflow. This is the package mentioned in the kolab security advisory 02 From cvs at intevation.de Fri Sep 16 19:33:42 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 16 19:33:43 2005 Subject: bernhard: server obmtool.conf,1.195,1.196 Message-ID: <20050916173342.B9A09100173@lists.intevation.de> Author: bernhard Update of /kolabrepository/server In directory doto:/tmp/cvs-serv13308 Modified Files: obmtool.conf Log Message: new fsl, old db-4.2, bumbed version number. Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.195 retrieving revision 1.196 diff -u -d -r1.195 -r1.196 --- obmtool.conf 13 Sep 2005 15:57:48 -0000 1.195 +++ obmtool.conf 16 Sep 2005 17:33:40 -0000 1.196 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.1-snapshot-20050913"; + kolab_version="pre-2.1-snapshot-20050915"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -41,7 +41,7 @@ @install ${loc}make-3.80-2.4.0 @install ${loc}binutils-2.16.1-2.4.0 @install ${loc}gcc-3.4.4-2.4.0 - @install ${loc}fsl-1.6.0-2.4.0 + @install ${loc}fsl-1.6.0-2.4.1 @install ${loc}mm-1.3.1-2.4.0 @install ${loc}perl-5.8.7-2.4.0 @install ${loc}perl-openpkg-5.8.7-2.4.0 @@ -75,7 +75,7 @@ @install ${loc}perl-www-5.8.7-2.4.0 @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate @install ${loc}procmail-3.22-2.4.0 - @install ${loc}db-4.3.28.0-2.4.0 + @install ${loc}db-4.2.52.2-2.2.0 @install ${altloc}openldap-2.2.27-2.4.0_kolab @install ${loc}m4-1.4.3-2.4.0 @install ${loc}bison-2.0-2.4.0 From cvs at intevation.de Sat Sep 17 14:22:01 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 14:22:01 2005 Subject: steffen: server/imapd imapd.morelogging.patch, NONE, 1.1 Makefile, 1.24, 1.25 kolab.patch, 1.26, 1.27 Message-ID: <20050917122201.07C831005D2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv5257 Modified Files: Makefile kolab.patch Added Files: imapd.morelogging.patch Log Message: applied morelogging patches from Issue928 --- NEW FILE: imapd.morelogging.patch --- diff -upr cyrus-imapd-2.2.12.orig/imap/append.c cyrus-imapd-2.2.12/imap/append.c --- cyrus-imapd-2.2.12.orig/imap/append.c 2004-05-22 05:45:48.000000000 +0200 +++ cyrus-imapd-2.2.12/imap/append.c 2005-09-17 13:32:48.000000000 +0200 @@ -549,6 +549,8 @@ int append_fromstage(struct appendstate lseek(mailbox->cache_fd, 0L, SEEK_END); /* Create message file */ + syslog(LOG_DEBUG, "append_fromstage: create message %s:%d", + as->m.name, message_index.uid); as->nummsg++; strlcpy(fname, mailbox->path, sizeof(fname)); strlcat(fname, "/", sizeof(fname)); diff -upr cyrus-imapd-2.2.12.orig/imap/imapd.c cyrus-imapd-2.2.12/imap/imapd.c --- cyrus-imapd-2.2.12.orig/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100 +++ cyrus-imapd-2.2.12/imap/imapd.c 2005-09-17 13:32:48.000000000 +0200 @@ -3635,6 +3635,9 @@ char *sequence; { int r; + syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s", + imapd_userid, imapd_mailbox->name, sequence ? sequence : "''"); + if (!(imapd_mailbox->myrights & ACL_DELETE)) r = IMAP_PERMISSION_DENIED; else if (sequence) { r = mailbox_expunge(imapd_mailbox, 1, index_expungeuidlist, sequence); diff -upr cyrus-imapd-2.2.12.orig/imap/lmtpd.c cyrus-imapd-2.2.12/imap/lmtpd.c --- cyrus-imapd-2.2.12.orig/imap/lmtpd.c 2004-12-17 17:32:15.000000000 +0100 +++ cyrus-imapd-2.2.12/imap/lmtpd.c 2005-09-17 13:29:16.000000000 +0200 @@ -299,7 +299,10 @@ int deliver_mailbox(struct protstream *m prot_rewind(msg); r = append_fromstage(&as, stage, now, (const char **) flag, nflags, !singleinstance); - if (!r) append_commit(&as, quotaoverride ? -1 : 0, NULL, &uid, NULL); + if (!r) { + append_commit(&as, quotaoverride ? -1 : 0, NULL, &uid, NULL); + syslog( LOG_INFO, "Delivered: %s to mailbox: %s", id, mailboxname ); + } else append_abort(&as); } diff -upr cyrus-imapd-2.2.12.orig/imap/lmtpproxyd.c cyrus-imapd-2.2.12/imap/lmtpproxyd.c --- cyrus-imapd-2.2.12.orig/imap/lmtpproxyd.c 2004-12-17 17:32:16.000000000 +0100 +++ cyrus-imapd-2.2.12/imap/lmtpproxyd.c 2005-09-17 13:29:41.000000000 +0200 @@ -471,6 +471,11 @@ static void runme(struct mydata *mydata, /* this is the only delivery we're attempting for this rcpt */ msg_setrcpt_status(msgdata, j, lt->rcpt[i].r); mydata->pend[j] = done; + + if (lt->rcpt[i].result == RCPT_GOOD) { + syslog (LOG_NOTICE, "Message: %s delivered to: %s@%s", + msgdata->id, d->to, d->server); + } break; case done: case s_done: diff -upr cyrus-imapd-2.2.12.orig/imap/lmtp_sieve.c cyrus-imapd-2.2.12/imap/lmtp_sieve.c --- cyrus-imapd-2.2.12.orig/imap/lmtp_sieve.c 2004-06-01 15:47:16.000000000 +0200 +++ cyrus-imapd-2.2.12/imap/lmtp_sieve.c 2005-09-17 12:07:52.000000000 +0200 @@ -339,6 +339,7 @@ static int sieve_redirect(void *ac, if (sievedb) duplicate_mark(buf, strlen(buf), sievedb, strlen(sievedb), time(NULL), 0); + syslog( LOG_INFO, "sieve redirected: %s to: %s", m->id, rc->addr); snmp_increment(SIEVE_REDIRECT, 1); return SIEVE_OK; } else { @@ -406,6 +407,7 @@ static int sieve_reject(void *ac, origreceip, sd->username, rc->msg, md->data)) == 0) { snmp_increment(SIEVE_REJECT, 1); + syslog( LOG_INFO, "sieve rejected: %s to: %s", md->id, md->return_path); return SIEVE_OK; } else { if (res == -1) { diff -upr cyrus-imapd-2.2.12.orig/imap/mailbox.c cyrus-imapd-2.2.12/imap/mailbox.c --- cyrus-imapd-2.2.12.orig/imap/mailbox.c 2005-02-14 07:39:57.000000000 +0100 +++ cyrus-imapd-2.2.12/imap/mailbox.c 2005-09-17 13:32:48.000000000 +0200 @@ -1911,6 +1911,8 @@ mailbox_expunge(struct mailbox *mailbox, /* Delete message files */ *fnametail++ = '/'; for (msgno = 0; msgno < numdeleted; msgno++) { + syslog(LOG_DEBUG, "mailbox_expunge: removing mail %s:%d", + mailbox->name, deleted[msgno]); if (iscurrentdir) { char shortfnamebuf[MAILBOX_FNAME_LEN]; mailbox_message_get_fname(mailbox, deleted[msgno], @@ -1925,6 +1927,11 @@ mailbox_expunge(struct mailbox *mailbox, } } + if (numdeleted > 0) { + syslog (LOG_NOTICE, "Deleted %d messages from %s", + numdeleted, mailbox->name); + } + free(buf); if (deleted) free(deleted); Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Makefile 22 Jul 2005 22:36:14 -0000 1.24 +++ Makefile 17 Sep 2005 12:21:58 -0000 1.25 @@ -19,13 +19,14 @@ cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/ + cp $(KOLABCVSDIR)/imapd.morelogging.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' --define 'with_goodchars 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' --define 'with_morelogging 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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- kolab.patch 31 Aug 2005 01:55:58 -0000 1.26 +++ kolab.patch 17 Sep 2005 12:21:58 -0000 1.27 @@ -1,5 +1,5 @@ --- ../imapd.orig/imapd.spec 2005-06-15 20:55:40.000000000 +0200 -+++ imapd.spec 2005-08-30 02:09:35.000000000 +0200 ++++ imapd.spec 2005-09-17 14:00:18.000000000 +0200 @@ -2,6 +2,9 @@ ## imapd.spec -- OpenPKG RPM Package Specification ## Copyright (c) 2000-2005 OpenPKG Foundation e.V. @@ -10,12 +10,12 @@ ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that -@@ -33,13 +36,16 @@ Class: BASE +@@ -33,13 +36,17 @@ Class: BASE Group: Mail License: BSD Version: 2.2.12 -Release: 2.4.0 -+Release: 2.4.0_kolab2 ++Release: 2.4.0_kolab3 # package options -%option with_fsl yes @@ -29,10 +29,11 @@ +%option with_annotate no +%option with_ldap no +%option with_goodchars no ++%option with_morelogging no # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz -@@ -49,6 +55,11 @@ Source3: imapd.conf +@@ -49,6 +56,12 @@ Source3: imapd.conf Source4: fsl.imapd Patch0: imapd.patch Patch1: imapd.patch.group @@ -41,10 +42,11 @@ +Patch4: imapd.group2.patch +Patch5: imapd-goodchars.patch +Patch6: cyradm.annotate.patch ++Patch7: imapd.morelogging.patch # build information Prefix: %{l_prefix} -@@ -61,6 +72,10 @@ PreReq: sasl, db >= 4.2.52, openss +@@ -61,6 +74,10 @@ PreReq: sasl, db >= 4.2.52, openss BuildPreReq: fsl >= 1.2.0 PreReq: fsl >= 1.2.0 %endif @@ -55,7 +57,7 @@ AutoReq: no AutoReqProv: no -@@ -87,6 +102,7 @@ AutoReqProv: no +@@ -87,6 +104,7 @@ AutoReqProv: no %{l_shtool} subst \ -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \ lib/auth_unix.c @@ -63,7 +65,7 @@ %endif %if "%{with_drac}" == "yes" %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch -@@ -94,10 +110,21 @@ AutoReqProv: no +@@ -94,10 +112,24 @@ AutoReqProv: no sleep 1 touch configure %endif @@ -77,6 +79,9 @@ + %patch -p1 -P 5 +%endif + %patch -p0 -P 6 ++%if "%{with_morelogging}" == "yes" ++ %patch -p1 -P 7 ++%endif %{l_shtool} subst \ -e 's;-L/usr/local/lib;;g' \ -e 's;-I/usr/local/include;;g' \ @@ -86,7 +91,7 @@ configure # ensure local et/com_err can be found -@@ -158,6 +185,11 @@ AutoReqProv: no +@@ -158,6 +190,11 @@ AutoReqProv: no -e '/config_init/s;"deliver";"cyrdeliver";' \ imap/deliver.c From cvs at intevation.de Sat Sep 17 16:21:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 16:21:26 2005 Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.18,1.19 Message-ID: <20050917142125.46A791005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv7430 Modified Files: perl-kolab.spec.in Log Message: Fix for Issue801 (lowercase value of mail attr) Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- perl-kolab.spec.in 29 Jul 2005 02:15:52 -0000 1.18 +++ perl-kolab.spec.in 17 Sep 2005 14:21:23 -0000 1.19 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050728 +Release: 20050917 # list of sources Source0: perl-kolab-@VERSION@.tar.gz From cvs at intevation.de Sat Sep 17 16:21:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 16:21:28 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.62,1.63 Message-ID: <20050917142125.4CD401005D2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv7430/Kolab-Conf Modified Files: Conf.pm Log Message: Fix for Issue801 (lowercase value of mail attr) Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- Conf.pm 29 Jul 2005 02:15:52 -0000 1.62 +++ Conf.pm 17 Sep 2005 14:21:23 -0000 1.63 @@ -528,7 +528,7 @@ if ($mesg->code <= 0) { foreach $ldapobject ($mesg->entries) { #my $group = $ldapobject->get_value('cn') . '@'.join('.',reverse(@dn)) . ":*:$count:"; - my $group = $ldapobject->get_value('mail').":*:$count:"; + my $group = lc($ldapobject->get_value('mail')).":*:$count:"; my $userlist = $ldapobject->get_value('member', asref => 1); foreach (@$userlist) { my $uid = $_; @@ -539,7 +539,7 @@ my $mail; ($mail = $umesg->entry(0)->get_value('mail')) or ($mail = $umesg->entry(0)->get_value('uid')); - $group .= $mail.','; + $group .= lc($mail).','; } } $group =~ s/,$//; From cvs at intevation.de Sat Sep 17 16:21:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 16:21:29 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.36,1.37 Message-ID: <20050917142125.4E66A1006A0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv7430/Kolab-LDAP Modified Files: LDAP.pm Log Message: Fix for Issue801 (lowercase value of mail attr) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- LDAP.pm 28 Jul 2005 02:14:38 -0000 1.36 +++ LDAP.pm 17 Sep 2005 14:21:23 -0000 1.37 @@ -240,7 +240,7 @@ # No action for groups or external return if( $objuidfield eq '' ); - my $uid = trim($object->get_value($objuidfield)) || 0; + my $uid = lc(trim($object->get_value($objuidfield))) || 0; return unless $uid; my $kolabhomeserver = lc($object->get_value('kolabhomeserver')); From cvs at intevation.de Sat Sep 17 16:32:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 16:32:26 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.37,1.38 Message-ID: <20050917143225.9A5DE1005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv7731 Modified Files: LDAP.pm Log Message: Fix for Issue801 (lowercase value of mail attr) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- LDAP.pm 17 Sep 2005 14:21:23 -0000 1.37 +++ LDAP.pm 17 Sep 2005 14:32:23 -0000 1.38 @@ -247,7 +247,7 @@ my $islocal = 1; my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1); if( ref($del) eq 'ARRAY' && @$del > 0 ) { - Kolab::log('L', "Kolab::LDAP::createObject() skipping object ".$object->get_value($objuidfield) + Kolab::log('L', "Kolab::LDAP::createObject() skipping object ".lc($object->get_value($objuidfield)) ." because it is deleted"); return; } From cvs at intevation.de Sat Sep 17 16:32:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 16:32:48 2005 Subject: steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.55.2.3,1.55.2.4 Message-ID: <20050917143247.19B251005D2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-Conf In directory doto:/tmp/cvs-serv7767/Kolab-Conf Modified Files: Tag: kolab_2_0_branch Conf.pm Log Message: Fix for Issue801 (lowercase value of mail attr) Index: Conf.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v retrieving revision 1.55.2.3 retrieving revision 1.55.2.4 diff -u -d -r1.55.2.3 -r1.55.2.4 --- Conf.pm 16 Sep 2005 12:37:34 -0000 1.55.2.3 +++ Conf.pm 17 Sep 2005 14:32:45 -0000 1.55.2.4 @@ -405,12 +405,7 @@ my $count = 60000; if ($mesg->code <= 0) { foreach $ldapobject ($mesg->entries) { - my @dcs = split(/,/,$ldapobject->dn()); - my @dn; - while( pop( @dcs ) =~ /dc=(.*)/ ) { - push(@dn, $1); - } - my $group = $ldapobject->get_value('cn') . '@'.join('.',reverse(@dn)) . ":*:$count:"; + my $group = lc($ldapobject->get_value('cn')) . '@'.$Kolab::config{'postfix-mydomain'}; my $userlist = $ldapobject->get_value('member', asref => 1); foreach (@$userlist) { my $uid = $_; @@ -421,7 +416,7 @@ my $mail; ($mail = $umesg->entry(0)->get_value('mail')) or ($mail = $umesg->entry(0)->get_value('uid')); - $group .= $mail.','; + $group .= lc($mail).','; } } $group =~ s/,$//; From cvs at intevation.de Sat Sep 17 16:32:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 16:32:50 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.31.2.5,1.31.2.6 Message-ID: <20050917143247.206341006A0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv7767/Kolab-LDAP Modified Files: Tag: kolab_2_0_branch LDAP.pm Log Message: Fix for Issue801 (lowercase value of mail attr) Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.31.2.5 retrieving revision 1.31.2.6 diff -u -d -r1.31.2.5 -r1.31.2.6 --- LDAP.pm 12 Sep 2005 22:14:13 -0000 1.31.2.5 +++ LDAP.pm 17 Sep 2005 14:32:45 -0000 1.31.2.6 @@ -240,14 +240,14 @@ # No action for groups or external return if( $objuidfield eq '' ); - my $uid = trim($object->get_value($objuidfield)) || 0; + my $uid = lc(trim($object->get_value($objuidfield))) || 0; return unless $uid; my $kolabhomeserver = lc($object->get_value('kolabhomeserver')); my $islocal = 1; my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1); if( ref($del) eq 'ARRAY' && @$del > 0 ) { - Kolab::log('L', "Kolab::LDAP::createObject() skipping object ".$object->get_value($objuidfield) + Kolab::log('L', "Kolab::LDAP::createObject() skipping object ".lc($object->get_value($objuidfield)) ." because it is deleted"); return; } From cvs at intevation.de Sat Sep 17 17:01:25 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sat Sep 17 17:01:26 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.66, 1.67 Message-ID: <20050917150125.AF2381005CA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv8365/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: Something for Issue848 (dist list problem when deleting users) Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- user.php 29 Aug 2005 21:28:28 -0000 1.66 +++ user.php 17 Sep 2005 15:01:23 -0000 1.67 @@ -760,12 +760,21 @@ // 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' ) ); + array( 'dn', 'cn', 'mail', 'member' ) ); $distlists = $ldap->getEntries(); + unset($distlists['count']); foreach( $distlists as $distlist ) { + $dlmail = $distlist['mail'][0]; + if( $dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff if( $distlist['member']['count'] == 1 ) { - $dlcn = $distlist['cn'][0]; - $errors[] = _("Account could not be deleted, distribution list '$dlcn' depends on it."); + $errors[] = _("Account could not be deleted, distribution list '$dlmail' depends on it."); + } else { + if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) { + $messages[] = _("Account removed from distribution list '$dlmail'."); + } else { + $errors[] = _("Failure to remove account from distribution list '$dlmail', account will not be deleted."); + break; + } } } From cvs at intevation.de Sun Sep 18 00:02:54 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 00:02:55 2005 Subject: steffen: server/imapd imapd.morelogging.patch,1.1,1.2 Message-ID: <20050917220254.31ED41005B7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv17293 Modified Files: imapd.morelogging.patch Log Message: Change the location of the syslog calls in BHs patch (Issue928) Index: imapd.morelogging.patch =================================================================== RCS file: /kolabrepository/server/imapd/imapd.morelogging.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- imapd.morelogging.patch 17 Sep 2005 12:21:58 -0000 1.1 +++ imapd.morelogging.patch 17 Sep 2005 22:02:52 -0000 1.2 @@ -1,31 +1,33 @@ diff -upr cyrus-imapd-2.2.12.orig/imap/append.c cyrus-imapd-2.2.12/imap/append.c --- cyrus-imapd-2.2.12.orig/imap/append.c 2004-05-22 05:45:48.000000000 +0200 -+++ cyrus-imapd-2.2.12/imap/append.c 2005-09-17 13:32:48.000000000 +0200 -@@ -549,6 +549,8 @@ int append_fromstage(struct appendstate - lseek(mailbox->cache_fd, 0L, SEEK_END); ++++ cyrus-imapd-2.2.12/imap/append.c 2005-09-17 19:45:53.000000000 +0200 +@@ -636,6 +636,9 @@ int append_fromstage(struct appendstate + /* ok, we've successfully added a message */ + as->quota_used += message_index.size; - /* Create message file */ -+ syslog(LOG_DEBUG, "append_fromstage: create message %s:%d", -+ as->m.name, message_index.uid); - as->nummsg++; - strlcpy(fname, mailbox->path, sizeof(fname)); - strlcat(fname, "/", sizeof(fname)); ++ syslog(LOG_DEBUG, "append_fromstage: message %d added to %s", ++ message_index.uid, mailbox->name ); ++ + return 0; + } + +Only in cyrus-imapd-2.2.12/imap: append.c~ diff -upr cyrus-imapd-2.2.12.orig/imap/imapd.c cyrus-imapd-2.2.12/imap/imapd.c --- cyrus-imapd-2.2.12.orig/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100 -+++ cyrus-imapd-2.2.12/imap/imapd.c 2005-09-17 13:32:48.000000000 +0200 -@@ -3635,6 +3635,9 @@ char *sequence; - { - int r; ++++ cyrus-imapd-2.2.12/imap/imapd.c 2005-09-17 23:29:45.000000000 +0200 +@@ -3652,6 +3652,8 @@ char *sequence; + else { + prot_printf(imapd_out, "%s OK %s\r\n", tag, + error_message(IMAP_OK_COMPLETED)); ++ syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s", ++ imapd_userid, imapd_mailbox->name, sequence ? sequence : "''"); + } + } -+ syslog(LOG_DEBUG, "cmd_expunge: user %s, mailbox %s, sequence %s", -+ imapd_userid, imapd_mailbox->name, sequence ? sequence : "''"); -+ - if (!(imapd_mailbox->myrights & ACL_DELETE)) r = IMAP_PERMISSION_DENIED; - else if (sequence) { - r = mailbox_expunge(imapd_mailbox, 1, index_expungeuidlist, sequence); +Only in cyrus-imapd-2.2.12/imap: imapd.c~ diff -upr cyrus-imapd-2.2.12.orig/imap/lmtpd.c cyrus-imapd-2.2.12/imap/lmtpd.c --- cyrus-imapd-2.2.12.orig/imap/lmtpd.c 2004-12-17 17:32:15.000000000 +0100 -+++ cyrus-imapd-2.2.12/imap/lmtpd.c 2005-09-17 13:29:16.000000000 +0200 ++++ cyrus-imapd-2.2.12/imap/lmtpd.c 2005-09-17 19:41:05.000000000 +0200 @@ -299,7 +299,10 @@ int deliver_mailbox(struct protstream *m prot_rewind(msg); r = append_fromstage(&as, stage, now, @@ -40,7 +42,7 @@ diff -upr cyrus-imapd-2.2.12.orig/imap/lmtpproxyd.c cyrus-imapd-2.2.12/imap/lmtpproxyd.c --- cyrus-imapd-2.2.12.orig/imap/lmtpproxyd.c 2004-12-17 17:32:16.000000000 +0100 -+++ cyrus-imapd-2.2.12/imap/lmtpproxyd.c 2005-09-17 13:29:41.000000000 +0200 ++++ cyrus-imapd-2.2.12/imap/lmtpproxyd.c 2005-09-17 19:41:05.000000000 +0200 @@ -471,6 +471,11 @@ static void runme(struct mydata *mydata, /* this is the only delivery we're attempting for this rcpt */ msg_setrcpt_status(msgdata, j, lt->rcpt[i].r); @@ -55,7 +57,7 @@ case s_done: diff -upr cyrus-imapd-2.2.12.orig/imap/lmtp_sieve.c cyrus-imapd-2.2.12/imap/lmtp_sieve.c --- cyrus-imapd-2.2.12.orig/imap/lmtp_sieve.c 2004-06-01 15:47:16.000000000 +0200 -+++ cyrus-imapd-2.2.12/imap/lmtp_sieve.c 2005-09-17 12:07:52.000000000 +0200 ++++ cyrus-imapd-2.2.12/imap/lmtp_sieve.c 2005-09-17 19:41:05.000000000 +0200 @@ -339,6 +339,7 @@ static int sieve_redirect(void *ac, if (sievedb) duplicate_mark(buf, strlen(buf), sievedb, strlen(sievedb), time(NULL), 0); @@ -74,7 +76,7 @@ if (res == -1) { diff -upr cyrus-imapd-2.2.12.orig/imap/mailbox.c cyrus-imapd-2.2.12/imap/mailbox.c --- cyrus-imapd-2.2.12.orig/imap/mailbox.c 2005-02-14 07:39:57.000000000 +0100 -+++ cyrus-imapd-2.2.12/imap/mailbox.c 2005-09-17 13:32:48.000000000 +0200 ++++ cyrus-imapd-2.2.12/imap/mailbox.c 2005-09-17 19:41:05.000000000 +0200 @@ -1911,6 +1911,8 @@ mailbox_expunge(struct mailbox *mailbox, /* Delete message files */ *fnametail++ = '/'; From cvs at intevation.de Sun Sep 18 00:21:40 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 00:21:41 2005 Subject: steffen: server/imapd Makefile, 1.22.2.2, 1.22.2.3 kolab.patch, 1.22.2.4, 1.22.2.5 Message-ID: <20050917222140.A312E1006C0@lists.intevation.de> Author: steffen Update of /kolabrepository/server/imapd In directory doto:/tmp/cvs-serv17778 Modified Files: Tag: kolab_2_0_branch Makefile kolab.patch Log Message: Backport of morelogging patches from Issue928 Index: Makefile =================================================================== RCS file: /kolabrepository/server/imapd/Makefile,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -u -d -r1.22.2.2 -r1.22.2.3 --- Makefile 29 Aug 2005 07:14:06 -0000 1.22.2.2 +++ Makefile 17 Sep 2005 22:21:38 -0000 1.22.2.3 @@ -19,13 +19,14 @@ cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/ cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/ + cp $(KOLABCVSDIR)/imapd.morelogging.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' --define 'with_goodchars 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' --define 'with_morelogging 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.22.2.4 retrieving revision 1.22.2.5 diff -u -d -r1.22.2.4 -r1.22.2.5 --- kolab.patch 31 Aug 2005 01:55:34 -0000 1.22.2.4 +++ kolab.patch 17 Sep 2005 22:21:38 -0000 1.22.2.5 @@ -1,5 +1,5 @@ --- ../imapd.orig/imapd.spec 2005-06-15 20:55:40.000000000 +0200 -+++ imapd.spec 2005-08-30 20:36:16.000000000 +0200 ++++ imapd.spec 2005-09-17 14:00:18.000000000 +0200 @@ -2,6 +2,9 @@ ## imapd.spec -- OpenPKG RPM Package Specification ## Copyright (c) 2000-2005 OpenPKG Foundation e.V. @@ -10,12 +10,12 @@ ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that -@@ -33,13 +36,16 @@ Class: BASE +@@ -33,13 +36,17 @@ Class: BASE Group: Mail License: BSD Version: 2.2.12 -Release: 2.4.0 -+Release: 2.4.0_kolab2 ++Release: 2.4.0_kolab3 # package options -%option with_fsl yes @@ -29,10 +29,11 @@ +%option with_annotate no +%option with_ldap no +%option with_goodchars no ++%option with_morelogging no # list of sources Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz -@@ -49,6 +55,11 @@ Source3: imapd.conf +@@ -49,6 +56,12 @@ Source3: imapd.conf Source4: fsl.imapd Patch0: imapd.patch Patch1: imapd.patch.group @@ -41,10 +42,11 @@ +Patch4: imapd.group2.patch +Patch5: imapd-goodchars.patch +Patch6: cyradm.annotate.patch ++Patch7: imapd.morelogging.patch # build information Prefix: %{l_prefix} -@@ -61,6 +72,10 @@ PreReq: sasl, db >= 4.2.52, openss +@@ -61,6 +74,10 @@ PreReq: sasl, db >= 4.2.52, openss BuildPreReq: fsl >= 1.2.0 PreReq: fsl >= 1.2.0 %endif @@ -55,7 +57,7 @@ AutoReq: no AutoReqProv: no -@@ -87,6 +102,7 @@ AutoReqProv: no +@@ -87,6 +104,7 @@ AutoReqProv: no %{l_shtool} subst \ -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \ lib/auth_unix.c @@ -63,7 +65,7 @@ %endif %if "%{with_drac}" == "yes" %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch -@@ -94,10 +110,21 @@ AutoReqProv: no +@@ -94,10 +112,24 @@ AutoReqProv: no sleep 1 touch configure %endif @@ -77,6 +79,9 @@ + %patch -p1 -P 5 +%endif + %patch -p0 -P 6 ++%if "%{with_morelogging}" == "yes" ++ %patch -p1 -P 7 ++%endif %{l_shtool} subst \ -e 's;-L/usr/local/lib;;g' \ -e 's;-I/usr/local/include;;g' \ @@ -86,7 +91,7 @@ configure # ensure local et/com_err can be found -@@ -158,6 +185,11 @@ AutoReqProv: no +@@ -158,6 +190,11 @@ AutoReqProv: no -e '/config_init/s;"deliver";"cyrdeliver";' \ imap/deliver.c From cvs at intevation.de Sun Sep 18 00:30:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 00:30:16 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.62.2.1, 1.62.2.2 Message-ID: <20050917223015.F23B71005B7@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv17919 Modified Files: Tag: kolab_2_0_branch user.php Log Message: Backport of fix for Issue848 (dist list problem when deleting users) Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.62.2.1 retrieving revision 1.62.2.2 diff -u -d -r1.62.2.1 -r1.62.2.2 --- user.php 29 Aug 2005 21:28:50 -0000 1.62.2.1 +++ user.php 17 Sep 2005 22:30:13 -0000 1.62.2.2 @@ -744,12 +744,20 @@ // 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' ) ); + array( 'dn', 'cn', 'mail', 'member' ) ); $distlists = $ldap->getEntries(); foreach( $distlists as $distlist ) { + $dlmail = $distlist['mail'][0]; + if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff if( $distlist['member']['count'] == 1 ) { - $dlcn = $distlist['cn'][0]; - $errors[] = _("Account could not be deleted, distribution list '$dlcn' depends on it."); + $errors[] = _("Account could not be deleted, distribution list '$dlmail' depends on it."); + } else { + if( ldap_mod_del( $ldap->connection, $distlist['dn'], array('member' => $dn ) ) ) { + $messages[] = _("Account removed from distribution list '$dlmail'."); + } else { + $errors[] = _("Failure to remove account from distribution list '$dlmail', account will not be deleted."); + break; + } } } From cvs at intevation.de Sun Sep 18 00:31:19 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 00:31:21 2005 Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.67, 1.68 Message-ID: <20050917223119.C8CF81006BD@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user In directory doto:/tmp/cvs-serv17964/kolab-webadmin/www/admin/user Modified Files: user.php Log Message: problem with fix for Issue848 found during backport... Index: user.php =================================================================== RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- user.php 17 Sep 2005 15:01:23 -0000 1.67 +++ user.php 17 Sep 2005 22:31:17 -0000 1.68 @@ -765,7 +765,7 @@ unset($distlists['count']); foreach( $distlists as $distlist ) { $dlmail = $distlist['mail'][0]; - if( $dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff + if( !$dlmail ) $dlmail = $distlist['cn'][0]; # Compatibility with old stuff if( $distlist['member']['count'] == 1 ) { $errors[] = _("Account could not be deleted, distribution list '$dlmail' depends on it."); } else { From cvs at intevation.de Sun Sep 18 12:47:50 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 12:47:51 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.133, 1.134 Message-ID: <20050918104750.9ACD61005AA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv31664/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.133 retrieving revision 1.134 diff -u -d -r1.133 -r1.134 --- kolab-resource-handlers.spec 12 Sep 2005 22:46:12 -0000 1.133 +++ kolab-resource-handlers.spec 18 Sep 2005 10:47:48 -0000 1.134 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050912 +Release: 20050918 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Sun Sep 18 12:47:50 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 12:47:54 2005 Subject: steffen: server obmtool.conf,1.196,1.197 Message-ID: <20050918104750.92F5E1005A9@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv31664 Modified Files: obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.196 retrieving revision 1.197 diff -u -d -r1.196 -r1.197 --- obmtool.conf 16 Sep 2005 17:33:40 -0000 1.196 +++ obmtool.conf 18 Sep 2005 10:47:48 -0000 1.197 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.1-snapshot-20050915"; + kolab_version="pre-2.1-snapshot-20050918"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -89,7 +89,7 @@ @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.7-2.4.0 @install ${loc}perl-db-5.8.7-2.4.0 - @install ${altloc}imapd-2.2.12-2.4.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars + @install ${altloc}imapd-2.2.12-2.4.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging # Drop morelogging if you dont want/need it @install ${loc}libiconv-1.9.2-2.4.0 @install ${loc}autoconf-2.59-2.4.0 @install ${loc}automake-1.9.5-2.4.0 @@ -132,10 +132,10 @@ @install ${altloc}clamav-0.86.2-20050726 # @install ${loc}vim-6.3.78-2.4.0 # @install ${plusloc}dcron-2.9-2.4.0 - @install ${altloc}perl-kolab-5.8.7-20050728 - @install ${altloc}kolabd-2.0.0-20050913 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.9-20050913 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.4.1-20050830 --define kolab_version=$kolab_version + @install ${altloc}perl-kolab-5.8.7-20050918 + @install ${altloc}kolabd-2.0.0-20050918 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.9-20050918 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.4.1-20050918 --define kolab_version=$kolab_version @check if test ! -e "/usr/bin/kolab" ; then From cvs at intevation.de Sun Sep 18 12:47:50 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 12:47:55 2005 Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.19,1.20 Message-ID: <20050918104750.9FA7F1005DB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv31664/perl-kolab Modified Files: perl-kolab.spec.in Log Message: versions Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- perl-kolab.spec.in 17 Sep 2005 14:21:23 -0000 1.19 +++ perl-kolab.spec.in 18 Sep 2005 10:47:48 -0000 1.20 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050917 +Release: 20050918 # list of sources Source0: perl-kolab-@VERSION@.tar.gz From cvs at intevation.de Sun Sep 18 13:14:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 13:14:07 2005 Subject: steffen: server obmtool.conf,1.174.2.15,1.174.2.16 Message-ID: <20050918111404.C1C0F1005A9@lists.intevation.de> Author: steffen Update of /kolabrepository/server In directory doto:/tmp/cvs-serv32170 Modified Files: Tag: kolab_2_0_branch obmtool.conf Log Message: versions Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.174.2.15 retrieving revision 1.174.2.16 diff -u -d -r1.174.2.15 -r1.174.2.16 --- obmtool.conf 14 Sep 2005 15:01:36 -0000 1.174.2.15 +++ obmtool.conf 18 Sep 2005 11:14:02 -0000 1.174.2.16 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.0.1-snapshot-20050912"; + kolab_version="pre-2.0.1-snapshot-20050918"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -89,7 +89,7 @@ @install ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl @install ${loc}perl-ldap-5.8.7-2.4.0 @install ${loc}perl-db-5.8.7-2.4.0 - @install ${altloc}imapd-2.2.12-2.4.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars + @install ${altloc}imapd-2.2.12-2.4.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging @install ${loc}libiconv-1.9.2-2.4.0 @install ${loc}autoconf-2.59-2.4.0 @install ${loc}automake-1.9.5-2.4.0 @@ -132,10 +132,10 @@ @install ${altloc}clamav-0.86.2-20050726 @install ${loc}vim-6.3.78-2.4.0 @install ${plusloc}dcron-2.9-2.4.0 - @install ${altloc}perl-kolab-5.8.7-2.0_20050912 - @install ${altloc}kolabd-1.9.4-20050801 --define kolab_version=$kolab_version - @install ${altloc}kolab-webadmin-0.4.0-20050831 --define kolab_version=$kolab_version - @install ${altloc}kolab-resource-handlers-0.3.9-20050912 --define kolab_version=$kolab_version + @install ${altloc}perl-kolab-5.8.7-2.0_20050918 + @install ${altloc}kolabd-1.9.4-20050918 --define kolab_version=$kolab_version + @install ${altloc}kolab-webadmin-0.4.0-20050918 --define kolab_version=$kolab_version + @install ${altloc}kolab-resource-handlers-0.3.9-20050918 --define kolab_version=$kolab_version @check if test ! -e "/usr/bin/kolab" ; then From cvs at intevation.de Sun Sep 18 13:14:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 13:14:08 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.126.2.5, 1.126.2.6 Message-ID: <20050918111404.C78671005AA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv32170/kolab-resource-handlers Modified Files: Tag: kolab_2_0_branch 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.126.2.5 retrieving revision 1.126.2.6 diff -u -d -r1.126.2.5 -r1.126.2.6 --- kolab-resource-handlers.spec 12 Sep 2005 22:43:33 -0000 1.126.2.5 +++ kolab-resource-handlers.spec 18 Sep 2005 11:14:02 -0000 1.126.2.6 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050912 +Release: 20050918 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Sun Sep 18 13:14:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 13:14:10 2005 Subject: steffen: server/kolabd kolabd.spec,1.57.2.4,1.57.2.5 Message-ID: <20050918111404.CC5551005DB@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv32170/kolabd Modified Files: Tag: kolab_2_0_branch kolabd.spec Log Message: versions Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/Attic/kolabd.spec,v retrieving revision 1.57.2.4 retrieving revision 1.57.2.5 diff -u -d -r1.57.2.4 -r1.57.2.5 --- kolabd.spec 16 Sep 2005 12:37:51 -0000 1.57.2.4 +++ kolabd.spec 18 Sep 2005 11:14:02 -0000 1.57.2.5 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050916 +Release: 20050918 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Sun Sep 18 13:14:04 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Sun Sep 18 13:14:11 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.91.2.5,1.91.2.6 Message-ID: <20050918111404.CDE721006A6@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv32170/perl-kolab Modified Files: Tag: kolab_2_0_branch perl-kolab.spec Log Message: versions Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/Attic/perl-kolab.spec,v retrieving revision 1.91.2.5 retrieving revision 1.91.2.6 diff -u -d -r1.91.2.5 -r1.91.2.6 --- perl-kolab.spec 16 Sep 2005 12:37:34 -0000 1.91.2.5 +++ perl-kolab.spec 18 Sep 2005 11:14:02 -0000 1.91.2.6 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 2.0_20050916 +Release: 2.0_20050918 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Tue Sep 20 21:41:57 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 20 21:41:58 2005 Subject: bernhard: server/kolabd/kolabd kolab_bootstrap.in,1.2,1.3 Message-ID: <20050920194157.7241C101EFD@lists.intevation.de> Author: bernhard Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv19030 Modified Files: kolab_bootstrap.in Log Message: Changing ps call to POSIX standard options. Index: kolab_bootstrap.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab_bootstrap.in 15 Sep 2005 11:23:12 -0000 1.2 +++ kolab_bootstrap.in 20 Sep 2005 19:41:55 -0000 1.3 @@ -381,7 +381,7 @@ ."Please stop any running ldap server and bootstrap again\n"; tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n" ."Please stop any running kolabd and bootstrap again\n"; - if( `ps aux|grep slurpd|grep -v grep` ) { + if( `ps -elf|grep slurpd|grep -v grep` ) { print "Error: Detected running slurpd processes.\n"; print "Please make sure the OpenLDAP server is stopped properly!\n"; exit 1; @@ -693,7 +693,7 @@ ."Please stop any running ldap server and bootstrap again\n"; tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n" ."Please stop any running kolabd and bootstrap again\n"; - if( `ps aux|grep slurpd|grep -v grep` ) { + if( `ps -elf|grep slurpd|grep -v grep` ) { print "WARNING: Detected running slurpd processes.\n"; print " Please make sure the OpenLDAP server is stopped properly!\n"; } From cvs at intevation.de Wed Sep 21 18:18:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Sep 21 18:18:48 2005 Subject: thomas: doc/www/src/security kolab-vendor-notice-03.txt,NONE,1.1 Message-ID: <20050921161847.2642A1006BA@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv22064 Added Files: kolab-vendor-notice-03.txt Log Message: Add security advisory for remotely exploitable clamav vulnerabilities. --- NEW FILE: kolab-vendor-notice-03.txt --- Kolab Security Issue 03 20050921 ================================ Package: Kolab Server Vulnerability: buffer overflow, DOS, remotely exploitable Kolab Specific: no Dependent Packages: none Summary ------- The Clam AntiVirus package contains a boundary condition error and fails to handle exceptional conditions, which can be exploited remotely. Affected Versions ----------------- This affects all servers which have ClamAV 0.86.2 or earlier versions running. Kolab Server 2.0.1 and previous releases of the 2.0 branch are affected. Fixes ----- Upgrade to ClamAV 0.87. A new ClamAV RPM is available from the Kolab download mirrors as security-updates/20050921/clamav-0.87-20050916.src.rpm A binary RPM for Debian woody (ix86) is available as security-updates/20050921/clamav-0.87-20050916.ix86-debian3.0-kolab.rpm The mirrors are listed on http://kolab.org/mirrors.html While the mirrors are catching up, you can also get the package via rsync: # rsync -tzv rsync://rsync.kolab.org/kolab/server/security-updates/20050921/clamav-0.87-20050916.src.rpm This package can be installed on your Kolab Server with # /kolab/bin/openpkg rpm --rebuild clamav-0.87-20050916.src.rpm # /kolab/bin/openpkg rpm \ -Uvh /kolab/RPM/PKG/clamav-0.87-20050916.--kolab.rpm A new /kolab/etc/clamav/clamav.conf will probably be written, remove the clamav.conf.rpmsave file, run kolabconf and make sure clamav starts: # rm /kolab/etc/clamav/clamav.conf # /kolab/sbin/kolabconf # /kolab/etc/rc clamav start ##optional # /kolab/bin/freshclam Details ------- http://www.securityfocus.com/bid/14866 ClamAV UPX Compressed Executable Buffer Overflow Vulnerability http://www.securityfocus.com/bid/14867 ClamAV FSG Compressed Executable Infinite Loop DOS Vulnerability Timeline -------- 20050916 clamav vendor released combined security and functional update 20050921 kolab update and security advisory published From cvs at intevation.de Wed Sep 21 18:22:32 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Sep 21 18:22:34 2005 Subject: thomas: doc/www/src/security kolab-vendor-notice-03.txt,1.1,1.2 Message-ID: <20050921162232.CF50F101EEB@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv22141 Modified Files: kolab-vendor-notice-03.txt Log Message: gpg signed security advisory 03 Index: kolab-vendor-notice-03.txt =================================================================== RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-03.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kolab-vendor-notice-03.txt 21 Sep 2005 16:18:44 -0000 1.1 +++ kolab-vendor-notice-03.txt 21 Sep 2005 16:22:30 -0000 1.2 @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + Kolab Security Issue 03 20050921 ================================ @@ -8,21 +11,21 @@ Summary -------- +- ------- The Clam AntiVirus package contains a boundary condition error and fails to handle exceptional conditions, which can be exploited remotely. Affected Versions ------------------ +- ----------------- This affects all servers which have ClamAV 0.86.2 or earlier versions running. Kolab Server 2.0.1 and previous releases of the 2.0 branch are affected. Fixes ------ +- ----- Upgrade to ClamAV 0.87. @@ -56,7 +59,7 @@ Details -------- +- ------- http://www.securityfocus.com/bid/14866 ClamAV UPX Compressed Executable Buffer Overflow Vulnerability @@ -66,6 +69,13 @@ Timeline --------- +- -------- 20050916 clamav vendor released combined security and functional update 20050921 kolab update and security advisory published +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFDMYieW7P1GVgWeRoRAoOJAJwLwDGX4bg0hUk++ktlQxMt1lstjwCeJSBW ++OED+DbflnlF/3DzCq6diP4= +=auE1 +-----END PGP SIGNATURE----- From cvs at intevation.de Wed Sep 21 18:26:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Sep 21 18:26:16 2005 Subject: thomas: doc/www/src/security kolab-vendor-notice-03.txt,1.2,1.3 Message-ID: <20050921162615.5A237101FAB@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src/security In directory doto:/tmp/cvs-serv22320 Modified Files: kolab-vendor-notice-03.txt Log Message: corrected rsync instructions Index: kolab-vendor-notice-03.txt =================================================================== RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-03.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- kolab-vendor-notice-03.txt 21 Sep 2005 16:22:30 -0000 1.2 +++ kolab-vendor-notice-03.txt 21 Sep 2005 16:26:13 -0000 1.3 @@ -38,7 +38,7 @@ The mirrors are listed on http://kolab.org/mirrors.html While the mirrors are catching up, you can also get the package via rsync: -# rsync -tzv rsync://rsync.kolab.org/kolab/server/security-updates/20050921/clamav-0.87-20050916.src.rpm +# rsync -tzv rsync://rsync.kolab.org/kolab/server/security-updates/20050921/clamav-0.87-20050916.src.rpm . This package can be installed on your Kolab Server with @@ -75,7 +75,7 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFDMYieW7P1GVgWeRoRAoOJAJwLwDGX4bg0hUk++ktlQxMt1lstjwCeJSBW -+OED+DbflnlF/3DzCq6diP4= -=auE1 +iD8DBQFDMYl6W7P1GVgWeRoRAo6iAJ0ZndefDteZzd7ttmDXNQKLe/G3wgCgjjHN +evPGzFN7HEX+9fuLWreb2rU= +=IiNI -----END PGP SIGNATURE----- From cvs at intevation.de Wed Sep 21 18:33:31 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Sep 21 18:33:33 2005 Subject: thomas: doc/www/src index.html.m4,1.61,1.62 Message-ID: <20050921163331.6FCDE101EEB@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22511 Modified Files: index.html.m4 Log Message: Added Security Advisory for Kolab Server 03 to news on main page. Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- index.html.m4 14 Sep 2005 20:54:13 -0000 1.61 +++ index.html.m4 21 Sep 2005 16:33:29 -0000 1.62 @@ -37,6 +37,23 @@
    June 20th, 2005{tr msg="Public"}{tr msg="Folder deleted, awaiting cleanup..."}{tr msg="Modify"}
    + + +
    September 21nd, 2005» + Security Advisory for Kolab Server +
    +

    + The Clam AntiVirus package contains a boundary condition error and + fails to handle exceptional conditions, which can be exploited + remotely. A new ClamAV RPM with a fix is available. See the + Kolab Security + Advisory 03 for details. +
    +

    + + + +
    September 14th, 2005 » Kolab Server update: 2.0.1 fixes bugs and security @@ -49,9 +66,6 @@ We recommend to update!

    - - - From cvs at intevation.de Wed Sep 21 18:35:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Wed Sep 21 18:35:11 2005 Subject: thomas: doc/www/src index.html.m4,1.62,1.63 Message-ID: <20050921163510.749D4101FAB@lists.intevation.de> Author: thomas Update of /kolabrepository/doc/www/src In directory doto:/tmp/cvs-serv22739 Modified Files: index.html.m4 Log Message: 21st, not 21nd Index: index.html.m4 =================================================================== RCS file: /kolabrepository/doc/www/src/index.html.m4,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- index.html.m4 21 Sep 2005 16:33:29 -0000 1.62 +++ index.html.m4 21 Sep 2005 16:35:08 -0000 1.63 @@ -37,7 +37,7 @@
    July 27th, 2005
    - + From cvs at intevation.de Tue Sep 27 10:34:24 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 10:34:25 2005 Subject: thomas: server README.1st,1.23.2.5,1.23.2.6 Message-ID: <20050927083424.5D1A91005B8@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3783 Modified Files: Tag: kolab_2_0_branch README.1st Log Message: Backported changes to README.1st from HEAD. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.23.2.5 retrieving revision 1.23.2.6 diff -u -d -r1.23.2.5 -r1.23.2.6 --- README.1st 14 Sep 2005 18:28:46 -0000 1.23.2.5 +++ README.1st 27 Sep 2005 08:34:22 -0000 1.23.2.6 @@ -11,13 +11,26 @@ 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" +Check the www.openpkg.org documentation for your platform. +E.g. some platforms need gettext installed +or the locale set to C during installation, like: + LC_ALL=C + LC_MESSAGES=C + LANG=C + SUPPORTED=C + export LC_ALL LC_MESSAGES LANG SUPPORTED + +Make sure the locale you want to set is supported by your c-library. +Otherwise the webadmin interface might only be in English. + 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 +# ./obmtool kolab 2>&1 | tee kolab-build.log to build and install packages in /kolab. +By default, the Kolab Server will now be started at boottime. After the build/install is complete, please run # /kolab/etc/kolab/kolab_bootstrap -b @@ -203,7 +216,7 @@ Upgrade from RC3 ---------------- -Nothing special really, only a note to avoid confusion. This release +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. From cvs at intevation.de Tue Sep 27 10:35:35 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 10:35:36 2005 Subject: thomas: server README.1st,1.27,1.28 Message-ID: <20050927083535.13FCC1005B8@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv3855 Modified Files: README.1st Log Message: Cleanup of spaces and tabs. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- README.1st 11 Aug 2005 19:05:37 -0000 1.27 +++ README.1st 27 Sep 2005 08:35:33 -0000 1.28 @@ -3,7 +3,6 @@ For more information on Kolab, see http://www.kolab.org - Quick install instructions -------------------------- @@ -15,7 +14,7 @@ Check the www.openpkg.org documentation for your platform. E.g. some platforms need gettext installed or the locale set to C during installation, like: - LC_ALL=C + LC_ALL=C LC_MESSAGES=C LANG=C SUPPORTED=C @@ -30,7 +29,7 @@ # ./obmtool kolab 2>&1 | tee kolab-build.log -to build and install packages in /kolab. +to build and install packages in /kolab. By default, the Kolab Server will now be started at boottime. After the build/install is complete, please run @@ -117,8 +116,8 @@ Then list the folders with "lm": localhost> lm -user.common@kolabdomain (\HasNoChildren) -user/some.user/Calendar@kolabdomain (\HasNoChildren) +user.common@kolabdomain (\HasNoChildren) +user/some.user/Calendar@kolabdomain (\HasNoChildren) ... The folders starting with "user." are the shared folders. Rename them @@ -182,7 +181,7 @@ Upgrade from Beta5 ------------------ -Again, the openldap configuration has changed a bit. +Again, the openldap configuration has changed a bit. Rerun kolabconf and restart openldap. Distribution lists now have a mail attribute. Use an LDAP editor @@ -210,7 +209,7 @@ ---------------- clamav will send an email Warning with unresolved configuration file conflicts. -In /kolab/etc/clamav/ you can safely 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 Tue Sep 27 11:11:15 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 11:11:17 2005 Subject: thomas: server README.1st,1.23.2.6,1.23.2.7 Message-ID: <20050927091115.8E9F91006C0@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4834 Modified Files: Tag: kolab_2_0_branch README.1st Log Message: Clarify version numbers. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.23.2.6 retrieving revision 1.23.2.7 diff -u -d -r1.23.2.6 -r1.23.2.7 --- README.1st 27 Sep 2005 08:34:22 -0000 1.23.2.6 +++ README.1st 27 Sep 2005 09:11:13 -0000 1.23.2.7 @@ -68,7 +68,7 @@ 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. +pre 2.0beta1 releases. Upgrading from earlier versions @@ -82,8 +82,8 @@ configuration files are regenerated from your templates. -Upgrade from versions older than Beta 1 ---------------------------------------- +Upgrade from a 2.0 development snapshot to 2.0beta1 +--------------------------------------------------- If you are running a development version of Kolab2, please make sure to remove the old package named kolab if you have this @@ -100,13 +100,13 @@ original names after upgrading. -Upgrade from Beta 1 -------------------- +Upgrade from 2.0beta1 to 2.0beta2 +--------------------------------- -Between Beta 1 and Beta 2 the names the imap folders of global shared +Between Beta1 and Beta2 the names the imap folders of global shared folders, i.e. those managed by the web admin interface, were changed. The prefix they use for the imap folders has changed from "user." to -"shared." in Beta 2. You can rename them with the cyradm tool. First, +"shared." in Beta2. You can rename them with the cyradm tool. First, login with cyradm (the imap server must be running for this): # /kolab/bin/cyradm --user manager localhost @@ -129,8 +129,8 @@ -Upgrade from Beta2 ------------------- +Upgrade from 2.0beta2 to 2.0beta3 +--------------------------------- The compile time options of apache and php have changed a little to enable multibyte strings. Unfortunately, obmtool will not automatically @@ -144,8 +144,8 @@ rm /kolab/RPM/PKG/php-4* -Upgrade from Beta3 ------------------- +Upgrade from 2.0beta3 to 2.0beta4 +--------------------------------- Starting with Beta4, OpenLDAP is configured to use more indexes. When upgrading from an earlier version of Kolab, these indexes need to be @@ -159,8 +159,8 @@ with a fully stopped server. -Upgrade from Beta4 ------------------- +Upgrade from 2.0beta4 to 2.0beta5 +--------------------------------- Beta5 has a new openldap package. Installing this will replace one of its configuration files, /kolab/etc/openldap/slapd.conf, with a default @@ -178,8 +178,8 @@ able to log in to the web-admin interface. -Upgrade from Beta5 ------------------- +Upgrade from 2.0beta5 to 2.0rc1 +------------------------------- Again, the openldap configuration has changed a bit. Rerun kolabconf and restart openldap. @@ -189,8 +189,8 @@ the email address of the distribution list. -Upgrade from RC1 ----------------- +Upgrade from 2.0rc1 to 2.0rc2 +----------------------------- The openldap package has been updated. For how to deal with an update of the openldap package, see the instructions for the upgrade from @@ -200,21 +200,21 @@ 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. +2.0rc1 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. -Upgrade from RC2 ----------------- +Upgrade from 2.0rc2 to 2.0rc3 +----------------------------- 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 ----------------- +Upgrade from 2.0rc3 to 2.0rc4 +----------------------------- 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 @@ -222,20 +222,20 @@ initial install and is not required for an update. -Upgrade from RC4 ----------------- +Upgrade from 2.0rc4 to 2.0 +-------------------------- There's nothing special to be done. -Upgrade from 2.0 ----------------- +Upgrade from 2.0 to 2.0.1rc1 +---------------------------- Nothing special to be done for this update. -Upgrade from 2.0.1rc1 ---------------------- +Upgrade from 2.0.1rc1 to 2.0.1 +------------------------------ If you upgrade from 2.0, there's nothing special to be done. The rest of the notes for this release are only relevant when updating from From cvs at intevation.de Tue Sep 27 11:14:18 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 11:14:20 2005 Subject: thomas: server README.1st,1.28,1.29 Message-ID: <20050927091418.E61881006C0@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv4925 Modified Files: README.1st Log Message: Removed 2.0 specific upgrade instructions and point to its README.1st instead. Index: README.1st =================================================================== RCS file: /kolabrepository/server/README.1st,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- README.1st 27 Sep 2005 08:35:33 -0000 1.28 +++ README.1st 27 Sep 2005 09:14:16 -0000 1.29 @@ -68,7 +68,7 @@ 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. +pre Beta1 releases. Upgrading from earlier versions @@ -82,157 +82,12 @@ configuration files are regenerated from your templates. -Upgrade from versions older than Beta 1 ---------------------------------------- - -If you are running a development version of Kolab2, please make sure -to remove the old package named kolab if you have this -installed. Check for existence with - -/kolab/bin/openpkg rpm -qi kolab - -and if it is there, run - -/kolab/bin/openpkg rpm -e kolab kolab-webadmin kolab-resource-handlers - -to remove it. After removing the package, make a copy of the .rpmsave -files that were produced during uninstall and copy those back to their -original names after upgrading. - - -Upgrade from Beta 1 -------------------- - -Between Beta 1 and Beta 2 the names the imap folders of global shared -folders, i.e. those managed by the web admin interface, were changed. -The prefix they use for the imap folders has changed from "user." to -"shared." in Beta 2. You can rename them with the cyradm tool. First, -login with cyradm (the imap server must be running for this): - -# /kolab/bin/cyradm --user manager localhost -IMAP Password: -localhost> - -Then list the folders with "lm": - -localhost> lm -user.common@kolabdomain (\HasNoChildren) -user/some.user/Calendar@kolabdomain (\HasNoChildren) -... - -The folders starting with "user." are the shared folders. Rename them -with the rename command so that they have the prefix "shared.": - -localhost> rename user.common@kolabdomain shared.common@kolabdomain - -Repeat this for all shared folders. - - - -Upgrade from Beta2 ------------------- - -The compile time options of apache and php have changed a little to -enable multibyte strings. Unfortunately, obmtool will not automatically -recompile the packages for you. - -To make sure the packages are recompiled, you need to uninstall the -packages and remove the binary RPMs from /kolab/RPM/PKG: - -/kolab/bin/openpkg rpm -e --nodeps apache php -rm /kolab/RPM/PKG/apache-* -rm /kolab/RPM/PKG/php-4* - - -Upgrade from Beta3 ------------------- - -Starting with Beta4, OpenLDAP is configured to use more indexes. When -upgrading from an earlier version of Kolab, these indexes need to be -created once: - -/kolab/bin/openpkg rc openldap stop -/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. - - -Upgrade from Beta4 ------------------- - -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. - -Make sure to run kolabconf as described above. Otherwise you may not be -able to log in to the web-admin interface. - - -Upgrade from Beta5 ------------------- - -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 -the email address of the distribution list. - - -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. - - -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. - - -Upgrade from RC4 ----------------- - -There's nothing special to be done. - - -Upgrade from Kolab 2.0 to pre-2.1-snapshots -------------------------------------------- +Upgrade from 2.0 releases to pre-2.1-snapshots +---------------------------------------------- -These instructions are incomplete. An upgrade from 2.0 to a 2.1 -snapshot is not recommended. +An upgrade from a 2.0 release to a 2.1 snapshot is not yet recommended. +These instructions are incomplete. Please take a look at README.1st from +the latest 2.0 release, too. Manually add two LDAP objects: From cvs at intevation.de Tue Sep 27 18:35:40 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 18:35:41 2005 Subject: thomas: server obmtool.conf,1.197,1.198 Message-ID: <20050927163540.97A6D101F09@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv18713 Modified Files: obmtool.conf Log Message: Bumped kolab_version to pre-2.1-snapshot-20050926, new clamav package. Index: obmtool.conf =================================================================== RCS file: /kolabrepository/server/obmtool.conf,v retrieving revision 1.197 retrieving revision 1.198 diff -u -d -r1.197 -r1.198 --- obmtool.conf 18 Sep 2005 10:47:48 -0000 1.197 +++ obmtool.conf 27 Sep 2005 16:35:38 -0000 1.198 @@ -15,7 +15,7 @@ %kolab echo "---- boot/build ${NODE} %${CMD} ----" - kolab_version="pre-2.1-snapshot-20050918"; + kolab_version="pre-2.1-snapshot-20050926"; PREFIX=/${CMD}; loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path plusloc='+' @@ -129,7 +129,7 @@ @install ${loc}spamassassin-3.0.3-2.4.1 @install ${plusloc}amavisd-2.3.1-2.4.0 @install ${loc}curl-7.14.0-2.4.0 - @install ${altloc}clamav-0.86.2-20050726 + @install ${altloc}clamav-0.87-20050916 # @install ${loc}vim-6.3.78-2.4.0 # @install ${plusloc}dcron-2.9-2.4.0 @install ${altloc}perl-kolab-5.8.7-20050918 From cvs at intevation.de Tue Sep 27 18:49:23 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 18:49:24 2005 Subject: thomas: server release-notes.txt,1.18,1.19 Message-ID: <20050927164923.47966101F0F@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv19742 Modified Files: release-notes.txt Log Message: Updated for snapshot 2.1-20050926 Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- release-notes.txt 11 Aug 2005 19:04:10 -0000 1.18 +++ release-notes.txt 27 Sep 2005 16:49:21 -0000 1.19 @@ -1,5 +1,5 @@ Release notes Kolab2 Server -(Version 20050811, Kolab Server pre 2.1) +(Version 20050926, Kolab Server pre 2.1) This is a development snapshot of the kolab server leading up to a 2.1 release. At this point an upgrade from 2.0 is not recommended (one of @@ -12,10 +12,9 @@ Known Bugs: Issue875 (domain is "$mydomain" after upgrade to 2.1) - Issue873 (.../maintainer.php was not found on this server) -Changes since 2.0 final: +Differences between Kolab 2.0.x and 2.1: - Simple multi-domain support @@ -24,54 +23,77 @@ manage settings for a subset of the mail domains of the kolab server. - - Switch to OpenPKG 2.4. As a result of this, practically all - packages have been updated. - Up to now the Kolab server used OpenPKG 2.2. The current release - of OpenPKG is 2.4, though, and the OpenPKG project only provides - security advisories and updates for the most recent release and - its immediate predecessor. Therefore moving to OpenPKG 2.4 is - necessary to benefit from the OpenPKG updates. +Changes since 2.1-20050811: - The db package has not been updated to the version from OpenPKG - 2.4 yet to avoid potential stability problems with OpenLDAP. + - security fixes from OpenPKG: + pcre-6.0-2.4.1 OpenPKG-SA-2005.018 + fsl-1.6.0-2.4.1 OpenPKG-SA-2005.018 + proftpd-1.3.0rc1-2.4.1 OpenPKG-SA-2005.020 + apache-1.3.33-2.4.1_kolab OpenPKG-SA-2005.017 - - A new clamav package fixing a buffer overflow. - This is the package mentioned in the kolab security advisory 02 - http://kolab.org/security/kolab-vendor-notice-02.txt + because of the dependencies, some other packages were also updated. + Others need to be explicitely rebuild because of static linking + and the same version number: - - better deletion handling. Now more objects are deleted using - kolabDeleteFlag (issues 845 and 855) + dbtool-1.6-2.4.0 + grep-2.5.1a-2.4.0 + openldap-2.2.27-2.4.0_kolab + php-4.3.11-2.4.0_kolab + postfix-2.2.3-2.4.1_kolab + procmail-3.22-2.4.0 + sasl-2.1.21-2.4.0 + spamassassin-3.0.3-2.4.1 - - perl-kolab 5.8.5-20050530 -> 5.8.7-20050728 + - clamav 0.86.2-20050726 -> 0.87-20050916 - Uses autoperl now + * Security Update: + The Clam AntiVirus package contains a boundary condition error and + fails to handle exceptional conditions, which can be exploited + remotely. - * Fixing: - Issue855 (make shared folder and external deletion same as users) + References: + http://kolab.org/security/kolab-vendor-notice-03.txt + http://www.securityfocus.com/bid/14866 + http://www.securityfocus.com/bid/14867 - - kolab-resource-handlers 20050615 -> 20050719 + - imapd 2.2.12-2.4.0_kolab -> 2.2.12-2.4.0_kolab3 * Fixing: - Issue825 (Errorhandling for multiple recipients) + Issue782 (setinfo for mailboxes in Admin.pm for Cyrus) + Issue901 (reconstruct in Admin.pm or imapd calls wrong binaries) + Issue928 (imapd logging for mail deletion/creation) + - kolab-resource-handlers 0.3.9-20050719 -> 0.4.1-20050918 - - kolabd 1.9.4-20050615 -> 2.0.0-20050729 + * Fixing: + Issue878 (fb retrieval only works with lowercase email addresses) + Issue869 (Insane freebusy on invitations of resource with recurrance) + Issue832 (separate template for kolab_smtpdpolicy.conf) + - kolab-webadmin 0.4.0-20050724 -> 0.4.9-20050918 + + * Added italian translation + * Patch for $PHP_SELF from Andreas Hasenack * Fixing: - Issue824 (Enable delivery to multiple recipients) - Issue851 (kolabquotawarn uses system sendmail) - Issue791 (automatic invitation handling uses http instead of https) - Issue845 (groupOfNames cleanup handling) - Issue855 (make shared folder and external deletion same as users) + Issue915 (non-ascii not handled correctly in webadmin interface) + Issue873 (broken domainmaintainer link) + Issue848 (prevent deleting a user who is in a distribution list) + - kolabd 2.0.0-20050729 -> 2.0.0-20050918 - - kolab-webadmin 20050620 -> 20050724 + * Uses autoconf now + * Work around a bug in some versions of mod_auth_ldap by increasing idle + timeout in slapd.conf.template + * Use POSIX standard options for ps call in kolab_bootstrap + * Fixing: + Issue779 (quota warning translation) + Issue826 (quota warning has too long percentage level) + + - perl-kolab 5.8.7-20050728 -> 5.8.7-20050918 * Fixing: - Issue820 (dist list lookup error) - Issue845 (groupOfNames cleanup handling) - Issue855 (make shared folder and external deletion same as users) + Issue801 (ldap mail: and alias: must be lower case) From cvs at intevation.de Tue Sep 27 22:55:28 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 22:55:29 2005 Subject: thomas: server release-notes.txt,1.19,1.20 Message-ID: <20050927205528.7DB571005A0@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23207 Modified Files: release-notes.txt Log Message: The POSIX ps change is not yet present in the released snapshot. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- release-notes.txt 27 Sep 2005 16:49:21 -0000 1.19 +++ release-notes.txt 27 Sep 2005 20:55:26 -0000 1.20 @@ -85,7 +85,6 @@ * Uses autoconf now * Work around a bug in some versions of mod_auth_ldap by increasing idle timeout in slapd.conf.template - * Use POSIX standard options for ps call in kolab_bootstrap * Fixing: Issue779 (quota warning translation) Issue826 (quota warning has too long percentage level) From cvs at intevation.de Tue Sep 27 22:58:38 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Tue Sep 27 22:58:39 2005 Subject: thomas: server release-notes.txt,1.20,1.21 Message-ID: <20050927205838.197431005A0@lists.intevation.de> Author: thomas Update of /kolabrepository/server In directory doto:/tmp/cvs-serv23274 Modified Files: release-notes.txt Log Message: Added ps POSIX change for future release notes. Index: release-notes.txt =================================================================== RCS file: /kolabrepository/server/release-notes.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- release-notes.txt 27 Sep 2005 20:55:26 -0000 1.20 +++ release-notes.txt 27 Sep 2005 20:58:36 -0000 1.21 @@ -95,5 +95,11 @@ Issue801 (ldap mail: and alias: must be lower case) +Changes since 2.1-20050926: + + - kolabd 2.0.0-20050918 -> 2.0.0-2005???? + * Use POSIX standard options for ps call in kolab_bootstrap + + $Id$ From cvs at intevation.de Thu Sep 29 10:50:09 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 10:50:11 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.134, 1.135 Message-ID: <20050929085009.E05E6101F05@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv509 Modified Files: kolab-resource-handlers.spec Log Message: Fix for issue952 (mailto: missing) Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- kolab-resource-handlers.spec 18 Sep 2005 10:47:48 -0000 1.134 +++ kolab-resource-handlers.spec 29 Sep 2005 08:50:07 -0000 1.135 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050918 +Release: 20050929 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Thu Sep 29 10:50:09 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 10:50:13 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr olhacks.php, 1.7, 1.8 Message-ID: <20050929085009.E55FB101F06@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv509/kolab-resource-handlers/resmgr Modified Files: olhacks.php Log Message: Fix for issue952 (mailto: missing) Index: olhacks.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- olhacks.php 4 May 2005 14:32:44 -0000 1.7 +++ olhacks.php 29 Sep 2005 08:50:07 -0000 1.8 @@ -85,7 +85,7 @@ #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_email = 'mailto:'.$adrs[0]->mailbox.'@'.$adrs[0]->host; $org_name = $adrs[0]->personal; if( $org_name ) $vevent->setAttribute( 'ORGANIZER', $org_email, array( 'CN' => $org_name), false ); From cvs at intevation.de Thu Sep 29 10:50:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 10:50:49 2005 Subject: steffen: server/kolab-resource-handlers kolab-resource-handlers.spec, 1.126.2.6, 1.126.2.7 Message-ID: <20050929085047.DE5AC101F05@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers In directory doto:/tmp/cvs-serv571 Modified Files: Tag: kolab_2_0_branch kolab-resource-handlers.spec Log Message: Backport of fix for issue952 (mailto: missing) Index: kolab-resource-handlers.spec =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v retrieving revision 1.126.2.6 retrieving revision 1.126.2.7 diff -u -d -r1.126.2.6 -r1.126.2.7 --- kolab-resource-handlers.spec 18 Sep 2005 11:14:02 -0000 1.126.2.6 +++ kolab-resource-handlers.spec 29 Sep 2005 08:50:45 -0000 1.126.2.7 @@ -8,7 +8,7 @@ URL: http://www.kolab.org/ Packager: Steffen Hansen (Klaraelvdalens Datakonsult AB) Version: %{V_kolab_reshndl} -Release: 20050918 +Release: 20050929 Class: JUNK License: GPL Group: MAIL From cvs at intevation.de Thu Sep 29 10:50:47 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 10:50:51 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr olhacks.php, 1.7, 1.7.2.1 Message-ID: <20050929085047.E0BEA101F06@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr In directory doto:/tmp/cvs-serv571/kolab-resource-handlers/resmgr Modified Files: Tag: kolab_2_0_branch olhacks.php Log Message: Backport of fix for issue952 (mailto: missing) Index: olhacks.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- olhacks.php 4 May 2005 14:32:44 -0000 1.7 +++ olhacks.php 29 Sep 2005 08:50:45 -0000 1.7.2.1 @@ -85,7 +85,7 @@ #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_email = 'mailto:'.$adrs[0]->mailbox.'@'.$adrs[0]->host; $org_name = $adrs[0]->personal; if( $org_name ) $vevent->setAttribute( 'ORGANIZER', $org_email, array( 'CN' => $org_name), false ); From cvs at intevation.de Thu Sep 29 16:44:20 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 16:44:21 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees attendees.inc, 1.5, 1.6 Message-ID: <20050929144420.81961101F1A@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees In directory doto:/tmp/cvs-serv6382/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees Modified Files: attendees.inc Log Message: Fix for issue666. This fixed the problem described in the issue, but the overall layout of the week-view just sucks, and I failed to make it any better... Index: attendees.inc =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees/attendees.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- attendees.inc 2 Dec 2004 22:50:37 -0000 1.5 +++ attendees.inc 29 Sep 2005 14:44:18 -0000 1.6 @@ -34,7 +34,7 @@
    -
    September 21nd, 2005
    September 21st, 2005 » Security Advisory for Kolab Server
    +
    @@ -69,7 +69,7 @@

    -
    +
    hasMethod('contacts/search')): ?> @@ -93,7 +93,7 @@ = 1): ?>

    -
       /> " />
    +

    @@ -110,7 +110,7 @@

    - +
    " onclick="switchView('day')" /> From cvs at intevation.de Thu Sep 29 16:44:20 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 16:44:24 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.6, 1.7 week.php, 1.6, 1.7 workweek.php, 1.6, 1.7 Message-ID: <20050929144420.8442C101F1B@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView In directory doto:/tmp/cvs-serv6382/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView Modified Files: day.php week.php workweek.php Log Message: Fix for issue666. This fixed the problem described in the issue, but the overall layout of the week-view just sucks, and I failed to make it any better... Index: day.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- day.php 12 Sep 2005 22:46:12 -0000 1.6 +++ day.php 29 Sep 2005 14:44:18 -0000 1.7 @@ -128,7 +128,8 @@ $hours_html = ''; $step = 1; - $width = 100 / ($endHour - $startHour); + $width = 100.0 / ($endHour - $startHour); + $width_str = sprintf("%F",$width); for ($i = $startHour; $i < $endHour; $i+= $step) { $t = mktime($i); if( $prefs->getValue('twentyFour') ) { @@ -137,9 +138,9 @@ $hour = intval(strftime("%I", $t)) . strftime(" %p", $t); } if ($i > $startHour) { - $hours_html .= ""; + $hours_html .= ""; } else { - $hours_html .= ""; + $hours_html .= ""; } } $hours_html .= '
    $hour$hour$hour$hour
    '; Index: week.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- week.php 29 Aug 2005 23:52:34 -0000 1.6 +++ week.php 29 Sep 2005 14:44:18 -0000 1.7 @@ -70,13 +70,16 @@ $hours_html = ''; $dayWidth = 100 / 7; + $dayWidth_str = sprintf("%F",$dayWidth); for ($i = 0; $i < 7; $i++) { $t = mktime(0, 0, 0, date('n', $day), date('j', $day) + $i, date('Y', $day)); - $day_label = strftime("%A, %d %B", $t); + $day_label = strftime("%a, %d %b", $t); if ($i > 0) { - $hours_html .= ""; + #$hours_html .= ""; + $hours_html .= ""; } else { - $hours_html .= ""; + #$hours_html .= ""; + $hours_html .= ""; } } @@ -92,9 +95,11 @@ $hour = intval(strftime("%I", $t)) . strftime(" %p", $t); } if( $h==0 && $h+$i > 0 ) { - $hours_html .= ""; + $hours_html .= ""; + #$hours_html .= ""; } else { - $hours_html .= ""; + $hours_html .= ""; + #$hours_html .= ""; } } } @@ -192,13 +197,12 @@ $start_min = intval(strftime('%M', $start)); $left = $dayWidth * $start_day; - /* if ($start_hour >= 9 && $start_hour < 18) { - $left += ($start_hour - 9) * ($dayWidth / 9); - $left += ($start_min / 60) * ($dayWidth / 9); - } elseif ($start_hour >= 18) { - $left += $dayWidth; - }*/ + $left += ($start_hour - 9) * ($dayWidth / 9); + $left += ($start_min / 60) * ($dayWidth / 9); + } elseif ($start_hour >= 18) { + $left += $dayWidth; + } $left = min(100., max(0., $left)); $end_day = floor(($end - $this->_startStamp) / (24. * 3600.)); @@ -206,13 +210,12 @@ $end_min = intval(strftime('%M', $end)); $right = $dayWidth * $end_day; - /* if ($end_hour >= 9 && $end_hour < 18) { - $right += ($end_hour - 9) * ($dayWidth / 9); - $right += ($end_min / 60) * ($dayWidth / 9); - } elseif ($end_hour >= 18) { - $right += $dayWidth; - }*/ + $right += ($end_hour - 9) * ($dayWidth / 9); + $right += ($end_min / 60) * ($dayWidth / 9); + } elseif ($end_hour >= 18) { + $right += $dayWidth; + } $right = min(100., $right); if( $left == $right ) { @@ -224,8 +227,8 @@ } } if ( ($right - $left) != 0.) { - $template->set('left', sprintf("%F",$left)); - $template->set('width', sprintf("%F",$right - $left)); + $template->set('left', sprintf("%F",$left)); + $template->set('width', sprintf("%F",$right - $left)); $template->set('top', $count++ * 15); $template->set('label', $label); $template->set('evclick', ''); Index: workweek.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- workweek.php 29 Aug 2005 23:52:34 -0000 1.6 +++ workweek.php 29 Sep 2005 14:44:18 -0000 1.7 @@ -71,7 +71,7 @@ $hours_html = '
    $day_label$day_label$day_label$day_label$day_label$day_label$hour$hour$hour$hour$hour$hour
    '; for ($i = 0; $i < 5; $i++) { $t = mktime(0, 0, 0, date('n', $day), date('j', $day) + $i, date('Y', $day)); - $day_label = strftime("%A, %d %B", $t); + $day_label = strftime("%a, %d %b", $t); if ($i > 0) { $hours_html .= ""; } else { @@ -220,7 +220,7 @@ $right += 1; } } - $template->set('left', sprintf("%F",$left)); + $template->set('left', sprintf("%F",$left)); $template->set('width', sprintf("%F",$right - $left)); $template->set('top', $count++ * 15); $template->set('label', $label); From cvs at intevation.de Thu Sep 29 16:44:20 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 16:44:25 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView linesblock.tpl, 1.2, 1.3 Message-ID: <20050929144420.863FD101F1E@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView In directory doto:/tmp/cvs-serv6382/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView Modified Files: linesblock.tpl Log Message: Fix for issue666. This fixed the problem described in the issue, but the overall layout of the week-view just sucks, and I failed to make it any better... Index: linesblock.tpl =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView/linesblock.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- linesblock.tpl 21 Dec 2004 23:59:57 -0000 1.2 +++ linesblock.tpl 29 Sep 2005 14:44:18 -0000 1.3 @@ -1,34 +1,34 @@
    $day_label
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            
    From cvs at intevation.de Thu Sep 29 16:45:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 16:45:12 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees attendees.inc, 1.5, 1.5.2.1 Message-ID: <20050929144510.C2DB4101F1A@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees In directory doto:/tmp/cvs-serv6474/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees Modified Files: Tag: kolab_2_0_branch attendees.inc Log Message: Backport of: Fix for issue666. This fixed the problem described in the issue, but the overall layout of the week-view just sucks, and I failed to make it any better... Index: attendees.inc =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/attendees/attendees.inc,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- attendees.inc 2 Dec 2004 22:50:37 -0000 1.5 +++ attendees.inc 29 Sep 2005 14:45:08 -0000 1.5.2.1 @@ -34,7 +34,7 @@
    - +
    @@ -69,7 +69,7 @@

    -
    +
    hasMethod('contacts/search')): ?> @@ -93,7 +93,7 @@ = 1): ?>

    -
       /> " />
    +

    @@ -110,7 +110,7 @@

    - +
    " onclick="switchView('day')" /> From cvs at intevation.de Thu Sep 29 16:45:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 16:45:14 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.4.2.2, 1.4.2.3 week.php, 1.5.2.1, 1.5.2.2 workweek.php, 1.5.2.1, 1.5.2.2 Message-ID: <20050929144510.C6D2F101F1E@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView In directory doto:/tmp/cvs-serv6474/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView Modified Files: Tag: kolab_2_0_branch day.php week.php workweek.php Log Message: Backport of: Fix for issue666. This fixed the problem described in the issue, but the overall layout of the week-view just sucks, and I failed to make it any better... Index: day.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -d -r1.4.2.2 -r1.4.2.3 --- day.php 12 Sep 2005 22:43:33 -0000 1.4.2.2 +++ day.php 29 Sep 2005 14:45:08 -0000 1.4.2.3 @@ -128,7 +128,8 @@ $hours_html = ''; $step = 1; - $width = 100 / ($endHour - $startHour); + $width = 100.0 / ($endHour - $startHour); + $width_str = sprintf("%F",$width); for ($i = $startHour; $i < $endHour; $i+= $step) { $t = mktime($i); if( $prefs->getValue('twentyFour') ) { @@ -137,9 +138,9 @@ $hour = intval(strftime("%I", $t)) . strftime(" %p", $t); } if ($i > $startHour) { - $hours_html .= ""; + $hours_html .= ""; } else { - $hours_html .= ""; + $hours_html .= ""; } } $hours_html .= '
    $hour$hour$hour$hour
    '; Index: week.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- week.php 29 Aug 2005 23:53:19 -0000 1.5.2.1 +++ week.php 29 Sep 2005 14:45:08 -0000 1.5.2.2 @@ -70,13 +70,16 @@ $hours_html = ''; $dayWidth = 100 / 7; + $dayWidth_str = sprintf("%F",$dayWidth); for ($i = 0; $i < 7; $i++) { $t = mktime(0, 0, 0, date('n', $day), date('j', $day) + $i, date('Y', $day)); - $day_label = strftime("%A, %d %B", $t); + $day_label = strftime("%a, %d %b", $t); if ($i > 0) { - $hours_html .= ""; + #$hours_html .= ""; + $hours_html .= ""; } else { - $hours_html .= ""; + #$hours_html .= ""; + $hours_html .= ""; } } @@ -92,9 +95,11 @@ $hour = intval(strftime("%I", $t)) . strftime(" %p", $t); } if( $h==0 && $h+$i > 0 ) { - $hours_html .= ""; + $hours_html .= ""; + #$hours_html .= ""; } else { - $hours_html .= ""; + $hours_html .= ""; + #$hours_html .= ""; } } } @@ -192,13 +197,12 @@ $start_min = intval(strftime('%M', $start)); $left = $dayWidth * $start_day; - /* if ($start_hour >= 9 && $start_hour < 18) { - $left += ($start_hour - 9) * ($dayWidth / 9); - $left += ($start_min / 60) * ($dayWidth / 9); - } elseif ($start_hour >= 18) { - $left += $dayWidth; - }*/ + $left += ($start_hour - 9) * ($dayWidth / 9); + $left += ($start_min / 60) * ($dayWidth / 9); + } elseif ($start_hour >= 18) { + $left += $dayWidth; + } $left = min(100., max(0., $left)); $end_day = floor(($end - $this->_startStamp) / (24. * 3600.)); @@ -206,13 +210,12 @@ $end_min = intval(strftime('%M', $end)); $right = $dayWidth * $end_day; - /* if ($end_hour >= 9 && $end_hour < 18) { - $right += ($end_hour - 9) * ($dayWidth / 9); - $right += ($end_min / 60) * ($dayWidth / 9); - } elseif ($end_hour >= 18) { - $right += $dayWidth; - }*/ + $right += ($end_hour - 9) * ($dayWidth / 9); + $right += ($end_min / 60) * ($dayWidth / 9); + } elseif ($end_hour >= 18) { + $right += $dayWidth; + } $right = min(100., $right); if( $left == $right ) { @@ -224,8 +227,8 @@ } } if ( ($right - $left) != 0.) { - $template->set('left', sprintf("%F",$left)); - $template->set('width', sprintf("%F",$right - $left)); + $template->set('left', sprintf("%F",$left)); + $template->set('width', sprintf("%F",$right - $left)); $template->set('top', $count++ * 15); $template->set('label', $label); $template->set('evclick', ''); Index: workweek.php =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- workweek.php 29 Aug 2005 23:53:19 -0000 1.5.2.1 +++ workweek.php 29 Sep 2005 14:45:08 -0000 1.5.2.2 @@ -71,7 +71,7 @@ $hours_html = '
    $day_label$day_label$day_label$day_label$day_label$day_label$hour$hour$hour$hour$hour$hour
    '; for ($i = 0; $i < 5; $i++) { $t = mktime(0, 0, 0, date('n', $day), date('j', $day) + $i, date('Y', $day)); - $day_label = strftime("%A, %d %B", $t); + $day_label = strftime("%a, %d %b", $t); if ($i > 0) { $hours_html .= ""; } else { @@ -220,7 +220,7 @@ $right += 1; } } - $template->set('left', sprintf("%F",$left)); + $template->set('left', sprintf("%F",$left)); $template->set('width', sprintf("%F",$right - $left)); $template->set('top', $count++ * 15); $template->set('label', $label); From cvs at intevation.de Thu Sep 29 16:45:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 16:45:15 2005 Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView linesblock.tpl, 1.2, 1.2.2.1 Message-ID: <20050929144510.C7FA1101FA1@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView In directory doto:/tmp/cvs-serv6474/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView Modified Files: Tag: kolab_2_0_branch linesblock.tpl Log Message: Backport of: Fix for issue666. This fixed the problem described in the issue, but the overall layout of the week-view just sucks, and I failed to make it any better... Index: linesblock.tpl =================================================================== RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/templates/weekView/linesblock.tpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- linesblock.tpl 21 Dec 2004 23:59:57 -0000 1.2 +++ linesblock.tpl 29 Sep 2005 14:45:08 -0000 1.2.2.1 @@ -1,34 +1,34 @@
    $day_label
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                            
    From cvs at intevation.de Thu Sep 29 22:03:10 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Thu Sep 29 22:03:13 2005 Subject: martin: server/kolabd/kolabd/templates main.cf.template.in, 1.1, 1.2 Message-ID: <20050929200310.E407D1006B9@lists.intevation.de> Author: martin Update of /kolabrepository/server/kolabd/kolabd/templates In directory doto:/tmp/cvs-serv11115 Modified Files: main.cf.template.in Log Message: Martin Konold: Add alias_maps to local_recipient_maps Index: main.cf.template.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- main.cf.template.in 13 Sep 2005 14:38:22 -0000 1.1 +++ main.cf.template.in 29 Sep 2005 20:03:08 -0000 1.2 @@ -59,7 +59,7 @@ alias_maps = hash:@emailserver_confdir@/aliases alias_database = hash:@emailserver_confdir@/aliases #virtual_mailbox_maps = $virtual_maps -local_recipient_maps = $virtual_maps +local_recipient_maps = $virtual_maps, $alias_maps # local delivery recipient_delimiter = + From cvs at intevation.de Fri Sep 30 12:50:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 12:50:22 2005 Subject: steffen: server/perl-kolab perl-kolab.spec.in,1.20,1.21 Message-ID: <20050930105021.026AF101F10@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv27341 Modified Files: perl-kolab.spec.in Log Message: Fix for Issue882, make me wonder why the (uid=*) was removed from the code... Gotta test a bit with 2.0 before backporting Index: perl-kolab.spec.in =================================================================== RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- perl-kolab.spec.in 18 Sep 2005 10:47:48 -0000 1.20 +++ perl-kolab.spec.in 30 Sep 2005 10:50:18 -0000 1.21 @@ -37,7 +37,7 @@ Group: Language License: GPL/Artistic Version: @VERSION@ -Release: 20050918 +Release: 20050930 # list of sources Source0: perl-kolab-@VERSION@.tar.gz From cvs at intevation.de Fri Sep 30 12:50:21 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 12:50:25 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.38,1.39 Message-ID: <20050930105021.03FD9101FAA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv27341/Kolab-LDAP Modified Files: LDAP.pm Log Message: Fix for Issue882, make me wonder why the (uid=*) was removed from the code... Gotta test a bit with 2.0 before backporting Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- LDAP.pm 17 Sep 2005 14:32:23 -0000 1.38 +++ LDAP.pm 30 Sep 2005 10:50:18 -0000 1.39 @@ -484,7 +484,7 @@ } %newuid_db = (); - syncBasic($cyrus, 'user', '', 0); + syncBasic($cyrus, 'user', '(uid=*)', 0); syncBasic($cyrus, 'sf', '', 1); syncBasic($cyrus, 'group', '', 0); From cvs at intevation.de Fri Sep 30 13:11:50 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 13:11:52 2005 Subject: steffen: server/perl-kolab perl-kolab.spec,1.91.2.6,1.91.2.7 Message-ID: <20050930111150.74D34101F10@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab In directory doto:/tmp/cvs-serv27812 Modified Files: Tag: kolab_2_0_branch perl-kolab.spec Log Message: Backport of fix for Issue882 (mailbox creation for external users). Doesnt really fix anything here, but does no harm either Index: perl-kolab.spec =================================================================== RCS file: /kolabrepository/server/perl-kolab/Attic/perl-kolab.spec,v retrieving revision 1.91.2.6 retrieving revision 1.91.2.7 diff -u -d -r1.91.2.6 -r1.91.2.7 --- perl-kolab.spec 18 Sep 2005 11:14:02 -0000 1.91.2.6 +++ perl-kolab.spec 30 Sep 2005 11:11:48 -0000 1.91.2.7 @@ -48,7 +48,7 @@ Group: Language License: GPL/Artistic Version: %{V_perl} -Release: 2.0_20050918 +Release: 2.0_20050930 # list of sources Source0: http://www.cpan.org/authors/id/S/ST/STEPHANB/Kolab-%{V_kolab}.tar.gz From cvs at intevation.de Fri Sep 30 13:11:50 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 13:11:54 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.31.2.6,1.31.2.7 Message-ID: <20050930111150.7AF83101FAA@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv27812/Kolab-LDAP Modified Files: Tag: kolab_2_0_branch LDAP.pm Log Message: Backport of fix for Issue882 (mailbox creation for external users). Doesnt really fix anything here, but does no harm either Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.31.2.6 retrieving revision 1.31.2.7 diff -u -d -r1.31.2.6 -r1.31.2.7 --- LDAP.pm 17 Sep 2005 14:32:45 -0000 1.31.2.6 +++ LDAP.pm 30 Sep 2005 11:11:48 -0000 1.31.2.7 @@ -483,7 +483,7 @@ } %newuid_db = (); - syncBasic($cyrus, 'user', '', 0); + syncBasic($cyrus, 'user', '(uid=*)', 0); syncBasic($cyrus, 'sf', '', 1); syncBasic($cyrus, 'group', '', 0); From cvs at intevation.de Fri Sep 30 14:42:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 14:42:37 2005 Subject: steffen: server/kolabd kolabd.spec,1.57.2.5,1.57.2.6 Message-ID: <20050930124236.B7174101F10@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd In directory doto:/tmp/cvs-serv29801 Modified Files: Tag: kolab_2_0_branch kolabd.spec Log Message: Fix for Issue921 (uninitialised warnpct in quotawarn) Index: kolabd.spec =================================================================== RCS file: /kolabrepository/server/kolabd/Attic/kolabd.spec,v retrieving revision 1.57.2.5 retrieving revision 1.57.2.6 diff -u -d -r1.57.2.5 -r1.57.2.6 --- kolabd.spec 18 Sep 2005 11:14:02 -0000 1.57.2.5 +++ kolabd.spec 30 Sep 2005 12:42:34 -0000 1.57.2.6 @@ -40,7 +40,7 @@ Group: Mail License: GPL Version: 1.9.4 -Release: 20050918 +Release: 20050930 # list of sources Source0: kolabd-1.9.4.tar.gz From cvs at intevation.de Fri Sep 30 14:42:36 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 14:42:39 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn,1.3.2.4,1.3.2.5 Message-ID: <20050930124236.B8DE8101FA2@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv29801/kolabd Modified Files: Tag: kolab_2_0_branch kolabquotawarn Log Message: Fix for Issue921 (uninitialised warnpct in quotawarn) Index: kolabquotawarn =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/Attic/kolabquotawarn,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -d -r1.3.2.4 -r1.3.2.5 --- kolabquotawarn 15 Sep 2005 10:47:10 -0000 1.3.2.4 +++ kolabquotawarn 30 Sep 2005 12:42:34 -0000 1.3.2.5 @@ -67,7 +67,7 @@ my $text = sprintf( "kolabquotawarn: $fmt", @_ ); - #print STDERR "$text\n"; + print STDERR "$text\n"; syslog $prio, $text; } @@ -93,6 +93,10 @@ my $warninterval = 60*60*24; # seconds between warnings my $warnmessage = ''; my $quotawarnpct = $Kolab::config{'cyrus-quotawarn'}; +fatal_exit( "Can't read configuration, please make sure that kolabquotawarn runs with sufficient privileges") + unless $quotawarnpct + && $Kolab::config{'cyrus_admin'} + && $Kolab::config{'cyrus_admin_pw'}; my %quotawarn_db; my $warnh = new IO::File "< $prefix/etc/kolab/quotawarning.txt"; if( defined($warnh) ) { From cvs at intevation.de Fri Sep 30 14:44:19 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 14:44:20 2005 Subject: steffen: server/kolabd/kolabd kolabquotawarn.in,1.3,1.4 Message-ID: <20050930124419.08FA2101F10@lists.intevation.de> Author: steffen Update of /kolabrepository/server/kolabd/kolabd In directory doto:/tmp/cvs-serv29890/kolabd Modified Files: kolabquotawarn.in Log Message: Forwardport of: Fix for Issue921 (uninitialised warnpct in quotawarn) Index: kolabquotawarn.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kolabquotawarn.in 15 Sep 2005 10:47:26 -0000 1.3 +++ kolabquotawarn.in 30 Sep 2005 12:44:16 -0000 1.4 @@ -83,7 +83,8 @@ # sub fatal_exit { my($first) = shift(@_); - #printf( STDERR "fatal: $first", @_ ); + printf( STDERR "fatal: $first", @_ ); + printf( STDERR "\n" ); mylog("err", "fatal: $first", @_); exit 1; } @@ -93,6 +94,10 @@ my $warninterval = 60*60*24; # seconds between warnings my $warnmessage = ''; my $quotawarnpct = $Kolab::config{'cyrus-quotawarn'}; +fatal_exit( "Can't read configuration, please make sure that kolabquotawarn runs with sufficient privileges") + unless $quotawarnpct + && $Kolab::config{'cyrus_admin'} + && $Kolab::config{'cyrus_admin_pw'}; my %quotawarn_db; my $warnh = new IO::File "< @sysconfdir@/kolab/quotawarning.txt"; if( defined($warnh) ) { From cvs at intevation.de Fri Sep 30 23:01:43 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 23:01:44 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.31.2.7,1.31.2.8 Message-ID: <20050930210143.5EAC91005D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv7149/Kolab-LDAP Modified Files: Tag: kolab_2_0_branch LDAP.pm Log Message: Fix for Issue882, take two (mailbox creation for external users). First attemtp reverted because it had ill sideeffects Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.31.2.7 retrieving revision 1.31.2.8 diff -u -d -r1.31.2.7 -r1.31.2.8 --- LDAP.pm 30 Sep 2005 11:11:48 -0000 1.31.2.7 +++ LDAP.pm 30 Sep 2005 21:01:41 -0000 1.31.2.8 @@ -242,6 +242,7 @@ return if( $objuidfield eq '' ); my $uid = lc(trim($object->get_value($objuidfield))) || 0; return unless $uid; + return if( $objuidfield eq 'mail' && !$object->get_value('uid') ); my $kolabhomeserver = lc($object->get_value('kolabhomeserver')); my $islocal = 1; @@ -483,7 +484,7 @@ } %newuid_db = (); - syncBasic($cyrus, 'user', '(uid=*)', 0); + syncBasic($cyrus, 'user', '', 0); syncBasic($cyrus, 'sf', '', 1); syncBasic($cyrus, 'group', '', 0); From cvs at intevation.de Fri Sep 30 23:02:17 2005 From: cvs at intevation.de (cvs@intevation.de) Date: Fri Sep 30 23:02:18 2005 Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm,1.39,1.40 Message-ID: <20050930210217.85BBD1005D9@lists.intevation.de> Author: steffen Update of /kolabrepository/server/perl-kolab/Kolab-LDAP In directory doto:/tmp/cvs-serv7192/Kolab-LDAP Modified Files: LDAP.pm Log Message: Forwardport of: Fix for Issue882, take two (mailbox creation for external users). First attemtp reverted because it had ill sideeffects Index: LDAP.pm =================================================================== RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- LDAP.pm 30 Sep 2005 10:50:18 -0000 1.39 +++ LDAP.pm 30 Sep 2005 21:02:15 -0000 1.40 @@ -242,6 +242,7 @@ return if( $objuidfield eq '' ); my $uid = lc(trim($object->get_value($objuidfield))) || 0; return unless $uid; + return if( $objuidfield eq 'mail' && !$object->get_value('uid') ); my $kolabhomeserver = lc($object->get_value('kolabhomeserver')); my $islocal = 1; @@ -484,7 +485,7 @@ } %newuid_db = (); - syncBasic($cyrus, 'user', '(uid=*)', 0); + syncBasic($cyrus, 'user', '', 0); syncBasic($cyrus, 'sf', '', 1); syncBasic($cyrus, 'group', '', 0);