From cvs at kolab.org  Fri Jan  5 20:36:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  5 Jan 2007 20:36:41 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.18, 1.19 
Message-ID: <20070105193641.33AB51005D9@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv11482

Modified Files:
	messages.po 
Log Message:
Changed beheerder to administrator as 'beheerder' will other wise be
mentioned twice in the top menu.
Some cosmetic changes capital to lower.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- messages.po	21 Dec 2006 11:03:52 -0000	1.18
+++ messages.po	5 Jan 2007 19:36:39 -0000	1.19
@@ -1733,7 +1733,7 @@
 #: ../../../www/admin/administrator/admin.php:266
 #: ../../../www/admin/administrator/admin.php:316
 msgid "Modify Administrator"
-msgstr "Wijzig Administrator"
+msgstr "Wijzig administrator"
 
 #: ../../../www/admin/administrator/admin.php:267
 #: ../../../www/admin/administrator/admin.php:289
@@ -1744,16 +1744,16 @@
 #: ../../../www/admin/administrator/admin.php:296
 #: ../../../www/admin/administrator/admin.php:307 ../include/menu.php:71
 msgid "Create New Administrator"
-msgstr "Creëer nieuwe Administrator"
+msgstr "Nieuwe administrator aanmaken"
 
 #: ../../../www/admin/administrator/admin.php:322
 msgid "Delete Administrator"
-msgstr "Verwijder Administrator"
+msgstr "Verwijder administrator"
 
 #: ../../../www/admin/administrator/admin.php:336
 msgid "Error: you need administrative permissions to delete administrators"
 msgstr ""
-"Fout :  je hebt administratieve toegangsrechten nodig om administrators te "
+"Fout: je hebt administratieve toegangsrechten nodig om administrators te "
 "verwijderen"
 
 #: ../../../www/admin/administrator/admin.php:340
@@ -1767,7 +1767,7 @@
 
 #: ../../../www/admin/administrator/index.php:60
 msgid "Manage Administrators ("
-msgstr "Beheer Administrators ("
+msgstr "Beheer administrators ("
 
 #: ../../../www/admin/administrator/index.php:60
 msgid " Administrators)"
@@ -2002,11 +2002,11 @@
 
 #: ../include/menu.php:67
 msgid "Administrators"
-msgstr "Beheerders"
+msgstr "Administrators"
 
 #: ../include/menu.php:69
 msgid "Manage Administrators"
-msgstr "Beheer Administrators"
+msgstr "Beheer administrators"
 
 #: ../include/menu.php:73
 msgid "Domain Maintainers"



From cvs at kolab.org  Sat Jan  6 22:36:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  6 Jan 2007 22:36:22 +0100 (CET)
Subject: martin: server/perl-kolab/Kolab-Conf Changes, 1.1, 1.2 Conf.pm.in, 1.9,
	1.10 
Message-ID: <20070106213622.6A30210015A@lists.intevation.de>

Author: martin

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

Modified Files:
	Changes Conf.pm.in 
Log Message:
Martin Konold: Applied patch from Joergen Fjeld <jhf at linpro.no> which fixes the masquerade problem https://intevation.de/roundup/kolab/issue1550


Index: Changes
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Changes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Changes	31 Mar 2004 15:36:42 -0000	1.1
+++ Changes	6 Jan 2007 21:36:20 -0000	1.2
@@ -3,4 +3,5 @@
 0.01  Thu Nov  6 14:07:19 2003
 	- original version; created by h2xs 1.22 with options
 		-XA -n Kolab::Conf
-
+0.02 Sa 6. Jan 22:35:25 2007
+        - fixes order of domains see also https://intevation.de/roundup/kolab/issue1550

Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Conf.pm.in	4 Dec 2006 13:31:48 -0000	1.9
+++ Conf.pm.in	6 Jan 2007 21:36:20 -0000	1.10
@@ -4,12 +4,12 @@
 ##  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bingë <s.binge at codefusion.co.za>
+##    Written by Stuart Bingë <s.binge at codefusion.co.za>
 ##    Portions based on work by the following people:
 ##
-##      (c) 2003  Tassilo Erlewein  <tassilo.erlewein at erfrakon.de>
-##      (c) 2003  Martin Konold     <martin.konold at erfrakon.de>
-##      (c) 2003  Achim Frank       <achim.frank at erfrakon.de>
+##      (c) 2003       Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+##      (c) 2003-2006  Martin Konold    <martin.konold at erfrakon.de>
+##      (c) 2003       Achim Frank      <achim.frank at erfrakon.de>
 ##
 ##
 ##  This  program is free  software; you can redistribute  it and/or
@@ -25,7 +25,7 @@
 ##  You can view the  GNU General Public License, online, at the GNU
 ##  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 ##
-
+## Version 0.02
 use 5.008;
 use strict;
 use warnings;
@@ -277,11 +277,16 @@
 		} else {
 		  # Modifier functions
 		SWITCH: {
-		    # Join function
+		    # Join function 
 		    $fct eq 'join' && do {
-		      $val = join $args, (ref $Kolab::config{$attr} eq "ARRAY")
-			?@{$Kolab::config{$attr}}
-			  :($Kolab::config{$attr});
+                      if (ref $Kolab::config{$attr} eq "ARRAY") {
+                          my @vals = @{$Kolab::config{$attr}} ;
+			  # We want to make sure subdomain.domain.tld comes before domain.tld
+                          my @length_sorted_vals = sort {length $a cmp length $b} @vals;
+                          $val = join ($args, @length_sorted_vals) ;
+                      } else {
+                          $val = $Kolab::config{$attr};
+                      }
 		      last SWITCH;
 		    };
 		    # Quote function



From cvs at kolab.org  Mon Jan  8 02:02:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Jan 2007 02:02:41 +0100 (CET)
Subject: steffen: server/kolabd/kolabd/templates httpd.conf.template.in, 1.5,
	1.6 
Message-ID: <20070108010241.BFF021005BE@lists.intevation.de>

Author: steffen

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

Modified Files:
	httpd.conf.template.in 
Log Message:
use @webserver_web_prefix@ in restrictions

Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- httpd.conf.template.in	21 Nov 2006 22:07:59 -0000	1.5
+++ httpd.conf.template.in	8 Jan 2007 01:02:39 -0000	1.6
@@ -134,18 +134,18 @@
 #DirectoryIndex index.html 
 AccessFileName .htaccess
 
-<Location />
-  ErrorDocument 403 https://@@@fqdnhostname@@@/admin/
+<Location @webserver_web_prefix@/>
+  ErrorDocument 403 https://@@@fqdnhostname@@@/@webserver_web_prefix@/admin/
 </Location>
-<Location /fbview/*.php>
+<Location @webserver_web_prefix@/fbview/*.php>
     Deny from all
-    ErrorDocument 403 https://@@@fqdnhostname@@@/fbview/
+    ErrorDocument 403 https://@@@fqdnhostname@@@/@webserver_web_prefix@/fbview/
 </Location>
-<Location /fbview/index.php>
+<Location @webserver_web_prefix@/fbview/index.php>
     Order allow,deny
     Allow from all
 </Location>
-<Location /fbview/login.php>
+<Location @webserver_web_prefix@/fbview/login.php>
     Order allow,deny
 	Allow from all
 </Location>



From cvs at kolab.org  Mon Jan  8 02:18:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Jan 2007 02:18:07 +0100 (CET)
Subject: steffen: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.7,
	1.8 
Message-ID: <20070108011807.8E5441005BE@lists.intevation.de>

Author: steffen

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

Modified Files:
	amavisd.conf.template.in 
Log Message:
support multiple mynetworks in amavisd.conf (issue1487)

Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- amavisd.conf.template.in	15 Dec 2006 07:55:04 -0000	1.7
+++ amavisd.conf.template.in	8 Jan 2007 01:18:05 -0000	1.8
@@ -1504,7 +1504,7 @@
 # local sender addresses can be trusted -- for example by requireing
 # authentication before letting the users send with their local address.
 
- at mynetworks = qw( @@@postfix-mynetworks@@@ );
+ at mynetworks = qw( @@@postfix-mynetworks|join( )@@@ );
 
 $policy_bank{'MYUSERS'} = {  # mail from authenticated users on this system
   # Bounce only to local users



From cvs at kolab.org  Mon Jan  8 02:29:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Jan 2007 02:29:31 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.10, 1.11 
Message-ID: <20070108012931.C3D5D1005BE@lists.intevation.de>

Author: steffen

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

Modified Files:
	user.php.in 
Log Message:
workaround for issue1262 (32-bit quota limit)

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- user.php.in	8 Dec 2006 22:02:35 -0000	1.10
+++ user.php.in	8 Jan 2007 01:29:29 -0000	1.11
@@ -162,6 +162,16 @@
   return '';
 }
 
+// Due to a cyrus imapd bug we can't currently
+// support quotas over 4095 MB, see issue1262
+function checkquota( $form, $key, $value )
+{
+	if( empty($value) ) return ''; // OK
+	else if( $value >= 4096 ) return _('Quota must be smaller than 4096');
+	else if( $value < 0 ) return _('Quota can not be negative');
+	else return '';
+}
+
 function policy2number( $pol, $default = 3 )
 {
   // Translate policy to number
@@ -436,7 +446,8 @@
 $entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number') );
 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') );
+									   'comment' => _('Leave blank for unlimited'),
+									   'validation' => 'checkquota');
 } else {
   $entries['givenname']['attrs'] = 'readonly';
   $entries['sn']['attrs'] = 'readonly';



From cvs at kolab.org  Mon Jan  8 05:01:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Jan 2007 05:01:45 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	auth.class.php.in, 1.1, 1.2 
Message-ID: <20070108040145.6FEB51005BE@lists.intevation.de>

Author: steffen

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

Modified Files:
	auth.class.php.in 
Log Message:
not being logged in is not really an error (issue1555)

Index: auth.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- auth.class.php.in	30 Dec 2005 11:07:17 -0000	1.1
+++ auth.class.php.in	8 Jan 2007 04:01:43 -0000	1.2
@@ -89,8 +89,9 @@
 					$this->gotoLoginPage(); 
 				}
 			} else {
-				$this->error_string = _('Please log in as a valid user');
+				//$this->error_string = _('Please log in as a valid user');
 				$this->gotoLoginPage();
+				// noreturn
 			}
 		} else {
 			// All OK, user already logged in
@@ -101,7 +102,7 @@
 	function logout() {
 		session_unset();
 		session_destroy();
-		$this->error_string = "";
+		$this->error_string = false;
 		//$this->gotoLoginPage();
 		Header("Location: @webserver_web_prefix@/admin/");
 	}
@@ -122,7 +123,7 @@
 		$smarty->assign( 'group', '' );
 		$smarty->assign( 'page_title', _('Login') );
 		$smarty->assign( 'menuitems', array() );
-		$smarty->assign( 'errors', array( $this->error() ) );
+		if( $this->error() ) $smarty->assign( 'errors', array( $this->error() ) );
 		$smarty->assign( 'maincontent', 'login.tpl' );
 		$smarty->display('page.tpl');
 		exit();



From cvs at kolab.org  Mon Jan  8 22:28:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Jan 2007 22:28:16 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.85,1.86 
Message-ID: <20070108212816.822891005AD@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Changed emailserver_transport_usr to emailserver_tables_usr
Some cosmetic changes to transport.template.in and virtual.template.in



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- ChangeLog	15 Dec 2006 07:55:04 -0000	1.85
+++ ChangeLog	8 Jan 2007 21:28:14 -0000	1.86
@@ -1,3 +1,9 @@
+2007-01-08 Richard Bos <richard at radoeka.nl>
+	* dist_conf/suse, dist_conf/kolab, dist_conf/common,
+	  dist_conf/gentoo, templates/virtual.template.in,
+          templates/transport.template.in: changed emailserver_transport_usr
+	  to emailserver_tables_usr.
+
 2006-12-15  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* templates/amavisd.conf.template.in: 



From cvs at kolab.org  Mon Jan  8 22:28:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Jan 2007 22:28:16 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.33, 1.34 gentoo, 1.7,
	1.8 kolab, 1.40, 1.41 suse, 1.54, 1.55 
Message-ID: <20070108212816.8BBCC1005B9@lists.intevation.de>

Author: richard

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

Modified Files:
	common gentoo kolab suse 
Log Message:
Changed emailserver_transport_usr to emailserver_tables_usr
Some cosmetic changes to transport.template.in and virtual.template.in



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- common	14 Nov 2006 21:34:22 -0000	1.33
+++ common	8 Jan 2007 21:28:14 -0000	1.34
@@ -51,7 +51,7 @@
 	-e 's,[@]emailserver_rpm[@],$(emailserver_rpm),g' \
 	-e 's,[@]emailserver_setgid_grp[@],$(emailserver_setgid_grp),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
-	-e 's,[@]emailserver_transport_usr[@],$(emailserver_transport_usr),g' \
+	-e 's,[@]emailserver_tables_usr[@],$(emailserver_tables_usr),g' \
 	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
 	-e 's,[@]freebusy_cachedir[@],$(freebusy_cachedir),g' \

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gentoo	14 Dec 2006 14:39:02 -0000	1.7
+++ gentoo	8 Jan 2007 21:28:14 -0000	1.8
@@ -97,7 +97,7 @@
 emailserver_setgid_grp=postdrop
 emailserver_master_usr=${kolab_grp}
 emailserver_default_privs=nobody
-emailserver_transport_usr=root
+emailserver_tables_usr=root
 
 ### -> files
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- kolab	14 Nov 2006 21:34:22 -0000	1.40
+++ kolab	8 Jan 2007 21:28:14 -0000	1.41
@@ -81,7 +81,7 @@
 emailserver_default_privs=kolab-n
 emailserver_master_usr=kolab-n
 emailserver_rpm=postfix
-emailserver_transport_usr=root
+emailserver_tables_usr=root
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/proftpd/proftpd.log

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- suse	14 Nov 2006 21:34:22 -0000	1.54
+++ suse	8 Jan 2007 21:28:14 -0000	1.55
@@ -62,7 +62,7 @@
 emailserver_default_privs=kolab
 emailserver_master_usr=kolab
 emailserver_rpm=postfix
-emailserver_transport_usr=root
+emailserver_tables_usr=root
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/log/proftpd.log



From cvs at kolab.org  Mon Jan  8 22:28:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  8 Jan 2007 22:28:16 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates transport.template.in, 1.5,
	1.6 virtual.template.in, 1.5, 1.6 
Message-ID: <20070108212816.92D621005C3@lists.intevation.de>

Author: richard

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

Modified Files:
	transport.template.in virtual.template.in 
Log Message:
Changed emailserver_transport_usr to emailserver_tables_usr
Some cosmetic changes to transport.template.in and virtual.template.in



Index: transport.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/transport.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- transport.template.in	14 Nov 2006 21:34:22 -0000	1.5
+++ transport.template.in	8 Jan 2007 21:28:14 -0000	1.6
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/transport
 PERMISSIONS=0640
-OWNERSHIP=@emailserver_transport_usr@:@emailserver_grp@
+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>
@@ -9,7 +9,6 @@
 # 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
-
-# manual additions are lost unless made to the template in the Kolab config directory
-# the template is  @sysconfdir@/kolab/templates/transport.template
+# manual additions are lost unless made to the template in the Kolab config
+# directory
+# The template is  @sysconfdir@/kolab/templates/transport.template

Index: virtual.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/virtual.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- virtual.template.in	14 Nov 2006 21:34:22 -0000	1.5
+++ virtual.template.in	8 Jan 2007 21:28:14 -0000	1.6
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/virtual
 PERMISSIONS=0640
-OWNERSHIP=@emailserver_transport_usr@:@emailserver_grp@
+OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>
@@ -9,8 +9,7 @@
 # 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
-
-# manual additions are lost unless made to the template in the Kolab config directory
-# the template is  @sysconfdir@/kolab/templates/virtual.template
+# manual additions are lost unless made to the template in the Kolab config
+# directory
+# The template is  @sysconfdir@/kolab/templates/virtual.template
 



From cvs at kolab.org  Wed Jan 10 11:05:32 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 11:05:32 +0100 (CET)
Subject: wilde: server release-notes.txt,1.58,1.59 
Message-ID: <20070110100532.692E11005D3@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Added fix of kolab/issue1550 to release notes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- release-notes.txt	21 Dec 2006 17:53:03 -0000	1.58
+++ release-notes.txt	10 Jan 2007 10:05:30 -0000	1.59
@@ -65,23 +65,27 @@
 
 Changes since 2.1 beta 3:
 
-    - kolabd-2.0.99-2006????
+    - kolabd-2.0.99-2007????
 
 	Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
 	now named LDAPGenerateHomedir(Prefix).
 
-    - kolab-resource-handlers-2.0.99-2006????
+    - kolab-resource-handlers-2.0.99-2007????
 
 	kolab/issue1512 (No FB information for resource accounts)
 	kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
 
-    - kolab-webadmin-2.0.99-2006????
+    - kolab-webadmin-2.0.99-2007????
 
 	kolab/issue1540 (Typo on kolab/admin/service page)
 
-    - kolabd-2.0.99-2006????
+    - kolabd-2.0.99-2007????
 
 	kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab)
+	
+    - perl-kolab-5.8.7-2007????
+
+        kolab/issue1550 (Masquerade problem)
 
 
 Changes since 2.1 beta 2:



From cvs at kolab.org  Wed Jan 10 11:34:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 11:34:26 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.11, 1.12 
Message-ID: <20070110103426.5F2751005AF@lists.intevation.de>

Author: wilde

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

Modified Files:
	user.php.in 
Log Message:
Fixed code formatting.


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- user.php.in	8 Jan 2007 01:29:29 -0000	1.11
+++ user.php.in	10 Jan 2007 10:34:24 -0000	1.12
@@ -446,8 +446,8 @@
 $entries['facsimileTelephoneNumber_0'] = array( 'name' => _('Fax Number') );
 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'),
-									   'validation' => 'checkquota');
+				       'comment' => _('Leave blank for unlimited'),
+				       'validation' => 'checkquota');
 } else {
   $entries['givenname']['attrs'] = 'readonly';
   $entries['sn']['attrs'] = 'readonly';



From cvs at kolab.org  Wed Jan 10 11:36:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 11:36:20 +0100 (CET)
Subject: wilde: server release-notes.txt,1.59,1.60 
Message-ID: <20070110103620.DDA0F1005AF@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Added workaround of kolab/issue1550 to release notes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- release-notes.txt	10 Jan 2007 10:05:30 -0000	1.59
+++ release-notes.txt	10 Jan 2007 10:36:18 -0000	1.60
@@ -77,6 +77,7 @@
 
     - kolab-webadmin-2.0.99-2007????
 
+        Workaround for kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
 	kolab/issue1540 (Typo on kolab/admin/service page)
 
     - kolabd-2.0.99-2007????



From cvs at kolab.org  Wed Jan 10 11:47:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 11:47:16 +0100 (CET)
Subject: wilde: server release-notes.txt,1.60,1.61 
Message-ID: <20070110104716.EE6711005B7@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Added fix of kolab/issue1555 to release notes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- release-notes.txt	10 Jan 2007 10:36:18 -0000	1.60
+++ release-notes.txt	10 Jan 2007 10:47:14 -0000	1.61
@@ -79,6 +79,7 @@
 
         Workaround for kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
 	kolab/issue1540 (Typo on kolab/admin/service page)
+	kolab/issue1555 (Login screen shows error msg for no good reason)
 
     - kolabd-2.0.99-2007????
 



From cvs at kolab.org  Wed Jan 10 13:25:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 13:25:45 +0100 (CET)
Subject: marcus: server/kolab-webadmin/kolab-webadmin ChangeLog,1.24,1.25 
Message-ID: <20070110122545.9B35F1005A3@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
added __toString() method (see issue1558 for details)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ChangeLog	19 Dec 2006 19:57:32 -0000	1.24
+++ ChangeLog	10 Jan 2007 12:25:43 -0000	1.25
@@ -1,3 +1,7 @@
+2007-01-10 Marcus Hüwe <suse-tux at gmx.de>
+	* php/admin/include/form.class.php: added a __toString() method otherwise
+	  it will not work with php 5.2.0 (see issue1558)
+
 2006-12-19 Richard Bos <richard at radoeka.nl>
 	* php/admin/templates/service.tpl: spelling error Privileged is correct
 	  and removed an inconsistency: non-authorized -> unauthorized.



From cvs at kolab.org  Wed Jan 10 13:25:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 13:25:45 +0100 (CET)
Subject: marcus: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.28, 1.29 
Message-ID: <20070110122545.A34031005AF@lists.intevation.de>

Author: marcus

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

Modified Files:
	form.class.php 
Log Message:
added __toString() method (see issue1558 for details)

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- form.class.php	8 Dec 2006 22:02:35 -0000	1.28
+++ form.class.php	10 Jan 2007 12:25:43 -0000	1.29
@@ -45,6 +45,14 @@
     }
   }
 
+  /*
+   * this function will be called if an instance of KolabForm will be treated
+   * as a string
+   */
+  function __toString() {
+    return sprintf("Debuginformation for class: %s; name: %s; template: %s;", get_class($this), $this->name, $this->template);
+   }
+
   /*private*/function comment_helper( &$value ) {
 	  $ast = '';
 	  if( isset($value['validation'])){



From cvs at kolab.org  Wed Jan 10 17:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:00:00 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.12, 1.13 
Message-ID: <20070110160000.57D2D1005A3@lists.intevation.de>

Author: wilde

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

Modified Files:
	user.php.in 
Log Message:
Create SSHA (instead of plain SHA1) password hashes.  (fixes kolab/issue1013)


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- user.php.in	10 Jan 2007 10:34:24 -0000	1.12
+++ user.php.in	10 Jan 2007 15:59:58 -0000	1.13
@@ -11,6 +11,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
 require_once('@kolab_php_module_prefix at admin/include/form.class.php');
+require_once('@kolab_php_module_prefix at admin/include/passwd.php');
 
 /**** Functions ***/
 function comment( $s ) {
@@ -491,8 +492,7 @@
        $ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
 	   $ldap_object['givenName'] = trim($_POST['givenname']);
        if( !empty( $_POST['password_0'] ) ) {
-		 $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', 
-																	sha1( $_POST['password_0'])));
+	         $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt());
 		 if( $action == 'save' && $auth->dn() == $dn ) {
 		   // We are editing our own password, let's update the session!
 		   $auth->setPassword($_POST['password_0']);



From cvs at kolab.org  Wed Jan 10 17:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:00:00 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
	maintainer.php.in, 1.3, 1.4 
Message-ID: <20070110160000.6FEBB1005A3@lists.intevation.de>

Author: wilde

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

Modified Files:
	maintainer.php.in 
Log Message:
Create SSHA (instead of plain SHA1) password hashes.  (fixes kolab/issue1013)


Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- maintainer.php.in	17 May 2006 23:15:32 -0000	1.3
+++ maintainer.php.in	10 Jan 2007 15:59:58 -0000	1.4
@@ -23,6 +23,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
 require_once('@kolab_php_module_prefix at admin/include/form.class.php');
+require_once('@kolab_php_module_prefix at admin/include/passwd.php');
 
 /**** Functions ***/
 function comment( $s ) {
@@ -202,8 +203,7 @@
        $ldap_object['sn'] = trim($_POST['lastname']);
        $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
        if( !empty( $_POST['password_0'] ) ) {
-		 $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', 
-																	sha1( $_POST['password_0'])));
+		 $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt());
        }
        if( $action == 'firstsave' ) $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
 



From cvs at kolab.org  Wed Jan 10 17:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:00:00 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, 1.3, 1.4 
Message-ID: <20070110160000.7A4B91005B7@lists.intevation.de>

Author: wilde

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

Modified Files:
	domainmaintainer.php.in 
Log Message:
Create SSHA (instead of plain SHA1) password hashes.  (fixes kolab/issue1013)


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- domainmaintainer.php.in	17 May 2006 23:15:32 -0000	1.3
+++ domainmaintainer.php.in	10 Jan 2007 15:59:58 -0000	1.4
@@ -23,6 +23,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
 require_once('@kolab_php_module_prefix at admin/include/form.class.php');
+require_once('@kolab_php_module_prefix at admin/include/passwd.php');
 
 /**** Functions ***/
 function comment( $s ) {
@@ -186,8 +187,7 @@
        $ldap_object['sn'] = trim($_POST['lastname']);
        $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
        if( !empty( $_POST['password_0'] ) ) {
-		 $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', 
-																	sha1( $_POST['password_0'])));
+		 $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt());
        }
        if( $action == 'firstsave' ) $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
 



From cvs at kolab.org  Wed Jan 10 17:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:00:00 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/include
	passwd.php, NONE, 1.1 
Message-ID: <20070110160000.7FCBB1005D0@lists.intevation.de>

Author: wilde

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

Added Files:
	passwd.php 
Log Message:
Create SSHA (instead of plain SHA1) password hashes.  (fixes kolab/issue1013)


--- NEW FILE: passwd.php ---
<?php
/* -------------------------------------------------------------------
   Copyright (C) 2007 by Intevation GmbH
   Author(s):
   Sascha Wilde <wilde at intevation.de>

   This program is free software under the GNU GPL (>=v2)
   Read the file COPYING coming with the software for details.
   ------------------------------------------------------------------- */

// Generate OpenLDAP style SSHA password strings
function ssha($string, $salt)
{
  return "{SSHA}" . base64_encode(pack("H*", sha1($string . $salt)) . $salt);
}

// return 4 random bytes
function gensalt()
{
  $salt = '';
  while (strlen($salt) < 4)
    $salt = $salt . chr(mt_rand(0,255));
  return $salt;
}

?>


From cvs at kolab.org  Wed Jan 10 17:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:00:00 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
	admin.php.in, 1.2, 1.3 
Message-ID: <20070110160000.7E2591005B9@lists.intevation.de>

Author: wilde

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

Modified Files:
	admin.php.in 
Log Message:
Create SSHA (instead of plain SHA1) password hashes.  (fixes kolab/issue1013)


Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- admin.php.in	9 Mar 2006 21:27:22 -0000	1.2
+++ admin.php.in	10 Jan 2007 15:59:58 -0000	1.3
@@ -23,6 +23,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once('@kolab_php_module_prefix at admin/include/authenticate.php');
 require_once('@kolab_php_module_prefix at admin/include/form.class.php');
+require_once('@kolab_php_module_prefix at admin/include/passwd.php');
 
 /**** Functions ***/
 function comment( $s ) {
@@ -205,8 +206,7 @@
        $ldap_object['sn'] = trim($_POST['lastname']);
        $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
        if( !empty( $_POST['password_0'] ) ) {
-		 $ldap_object['userPassword'] = '{sha}'.base64_encode( pack('H*', 
-																	sha1( $_POST['password_0'])));
+		 $ldap_object['userPassword'] = ssha( $_POST['password_0'], gensalt());
        }
        if( $action == 'firstsave' ) $ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
 



From cvs at kolab.org  Wed Jan 10 17:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:00:00 +0100 (CET)
Subject: wilde: server release-notes.txt,1.61,1.62 
Message-ID: <20070110160000.AA1ED1005B7@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Create SSHA (instead of plain SHA1) password hashes.  (fixes kolab/issue1013)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- release-notes.txt	10 Jan 2007 10:47:14 -0000	1.61
+++ release-notes.txt	10 Jan 2007 15:59:58 -0000	1.62
@@ -77,6 +77,7 @@
 
     - kolab-webadmin-2.0.99-2007????
 
+   	kolab/issue1013 (user passwords sha1 encoded without salt)
         Workaround for kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
 	kolab/issue1540 (Typo on kolab/admin/service page)
 	kolab/issue1555 (Login screen shows error msg for no good reason)



From cvs at kolab.org  Wed Jan 10 17:00:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:00:00 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin Makefile.am,1.36,1.37 
Message-ID: <20070110160000.96BCE1005A3@lists.intevation.de>

Author: wilde

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

Modified Files:
	Makefile.am 
Log Message:
Create SSHA (instead of plain SHA1) password hashes.  (fixes kolab/issue1013)


Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am	31 Jul 2006 02:03:09 -0000	1.36
+++ Makefile.am	10 Jan 2007 15:59:58 -0000	1.37
@@ -103,7 +103,8 @@
 	php/admin/include/sieveutils.class.php \
 	php/admin/include/authenticate.php \
 	php/admin/include/locale.php \
-	php/admin/include/Sieve.php
+	php/admin/include/Sieve.php \
+	php/admin/include/passwd.php
 
 phpincludesdir = $(phpkolabdir)/include
 phpincludes_DATA = $(PHP_INCLUDES) \



From cvs at kolab.org  Wed Jan 10 17:25:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:25:27 +0100 (CET)
Subject: thomas: server release-notes.txt,1.62,1.63 
Message-ID: <20070110162527.D87311005A3@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
openldap-2.3.29-2.20061110: New upstream version, fixes CVE-2006-5779 (Bugtraq ID 20939)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- release-notes.txt	10 Jan 2007 15:59:58 -0000	1.62
+++ release-notes.txt	10 Jan 2007 16:25:25 -0000	1.63
@@ -85,7 +85,11 @@
     - kolabd-2.0.99-2007????
 
 	kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab)
-	
+
+    - openldap-2.3.29-2.20061110
+
+	New upstream version, fixes CVE-2006-5779 (Bugtraq ID 20939)
+
     - perl-kolab-5.8.7-2007????
 
         kolab/issue1550 (Masquerade problem)



From cvs at kolab.org  Wed Jan 10 17:25:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:25:27 +0100 (CET)
Subject: thomas: server/openldap Makefile,1.17,1.18 kolab.patch,1.10,1.11 
Message-ID: <20070110162527.DD5931005B7@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile kolab.patch 
Log Message:
openldap-2.3.29-2.20061110: New upstream version, fixes CVE-2006-5779 (Bugtraq ID 20939)


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	6 Nov 2006 13:22:36 -0000	1.17
+++ Makefile	10 Jan 2007 16:25:25 -0000	1.18
@@ -12,9 +12,9 @@
 endif
 
 PACKAGE=openldap
-VERSION=2.3.27
-RELEASE=2.20061018
-KOLABRELEASE=2.20061018_kolab
+VERSION=2.3.29
+RELEASE=2.20061110
+KOLABRELEASE=2.20061110_kolab
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab.patch	24 Oct 2006 13:22:18 -0000	1.10
+++ kolab.patch	10 Jan 2007 16:25:25 -0000	1.11
@@ -3,9 +3,9 @@
 @@ -33,7 +33,7 @@
  Group:        LDAP
  License:      GPL
- Version:      2.3.27
--Release:      2.20061018
-+Release:      2.20061018_kolab
+ Version:      2.3.29
+-Release:      2.20061110
++Release:      2.20061110_kolab
  
  #   package options
  %option       with_fsl      yes



From cvs at kolab.org  Wed Jan 10 17:34:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:34:44 +0100 (CET)
Subject: thomas: server release-notes.txt,1.63,1.64 
Message-ID: <20070110163444.46E631005A3@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
tab/space cleanups


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- release-notes.txt	10 Jan 2007 16:25:25 -0000	1.63
+++ release-notes.txt	10 Jan 2007 16:34:42 -0000	1.64
@@ -39,7 +39,7 @@
     - Retrieving the free/busy information isn't working, unless you use
       the following workaround on the server:
 
-        cd /kolab && ln -s . kolab
+	cd /kolab && ln -s . kolab
 
       See kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
       for details. Be careful when creating backups of your /kolab directory
@@ -77,8 +77,8 @@
 
     - kolab-webadmin-2.0.99-2007????
 
-   	kolab/issue1013 (user passwords sha1 encoded without salt)
-        Workaround for kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
+	kolab/issue1013 (user passwords sha1 encoded without salt)
+	Workaround for kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
 	kolab/issue1540 (Typo on kolab/admin/service page)
 	kolab/issue1555 (Login screen shows error msg for no good reason)
 
@@ -92,7 +92,7 @@
 
     - perl-kolab-5.8.7-2007????
 
-        kolab/issue1550 (Masquerade problem)
+	kolab/issue1550 (Masquerade problem)
 
 
 Changes since 2.1 beta 2:



From cvs at kolab.org  Wed Jan 10 17:50:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:50:45 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.13, 1.14 
Message-ID: <20070110165045.64A221005DD@lists.intevation.de>

Author: wilde

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

Modified Files:
	user.php.in 
Log Message:
Code cleanup: moved the redundant function `checkpw' to include/passwd.php.


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- user.php.in	10 Jan 2007 15:59:58 -0000	1.13
+++ user.php.in	10 Jan 2007 16:50:43 -0000	1.14
@@ -144,25 +144,6 @@
   return '';
 }
 
-// Check that password match
-function checkpw( $form, $key, $value ) {
-  global $action;
-  if( $action == 'firstsave' ) {
-    if( $key == 'password_0' ) {
-      if( $value == '' ) return _('Password is empty');
-    } else if( $key == 'password_1' ) {
-      if( $value != $_POST['password_0'] ) {
-        return _('Passwords dont match');
-      }
-    }
-  } else {
-    if( $value != $_POST['password_0'] ) {
-      return _('Passwords dont match');
-    }
-  }
-  return '';
-}
-
 // Due to a cyrus imapd bug we can't currently
 // support quotas over 4095 MB, see issue1262
 function checkquota( $form, $key, $value )



From cvs at kolab.org  Wed Jan 10 17:50:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:50:45 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
	maintainer.php.in, 1.4, 1.5 
Message-ID: <20070110165045.757C81006A4@lists.intevation.de>

Author: wilde

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

Modified Files:
	maintainer.php.in 
Log Message:
Code cleanup: moved the redundant function `checkpw' to include/passwd.php.


Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- maintainer.php.in	10 Jan 2007 15:59:58 -0000	1.4
+++ maintainer.php.in	10 Jan 2007 16:50:43 -0000	1.5
@@ -53,24 +53,6 @@
   }
 }
 
-// Check that password match
-function checkpw( $form, $key, $value ) {
-  global $action;
-  if( $action == "firstsave" ) {
-    if( $key == 'password_0' ) {
-      if( $value == '' ) return _('Password is empty');
-    } else if( $key == 'password_1' ) {
-      if( $value != $_POST['password_0'] ) {
-        return _('Passwords dont match');
-      }
-    }
-  } else {
-    if( $value != $_POST['password_0'] ) {
-      return _('Passwords dont match');
-    }
-  }
-  return '';
-}
 function fill_form_for_modify( &$form, &$ldap_object ) {
   global $auth;
   if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0];



From cvs at kolab.org  Wed Jan 10 17:50:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:50:45 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, 1.4, 1.5 
Message-ID: <20070110165045.78F871006A5@lists.intevation.de>

Author: wilde

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

Modified Files:
	domainmaintainer.php.in 
Log Message:
Code cleanup: moved the redundant function `checkpw' to include/passwd.php.


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- domainmaintainer.php.in	10 Jan 2007 15:59:58 -0000	1.4
+++ domainmaintainer.php.in	10 Jan 2007 16:50:43 -0000	1.5
@@ -53,24 +53,6 @@
   }
 }
 
-// Check that password match
-function checkpw( $form, $key, $value ) {
-  global $action;
-  if( $action == "firstsave" ) {
-    if( $key == 'password_0' ) {
-      if( $value == '' ) return _('Password is empty');
-    } else if( $key == 'password_1' ) {
-      if( $value != $_POST['password_0'] ) {
-        return _('Passwords dont match');
-      }
-    }
-  } else {
-    if( $value != $_POST['password_0'] ) {
-      return _('Passwords dont match');
-    }
-  }
-  return '';
-}
 function fill_form_for_modify( &$form, &$ldap_object ) {
   global $auth;
   global $ldap;



From cvs at kolab.org  Wed Jan 10 17:50:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:50:45 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/include
	passwd.php, 1.1, 1.2 
Message-ID: <20070110165045.856C01006AB@lists.intevation.de>

Author: wilde

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

Modified Files:
	passwd.php 
Log Message:
Code cleanup: moved the redundant function `checkpw' to include/passwd.php.


Index: passwd.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/passwd.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- passwd.php	10 Jan 2007 15:59:58 -0000	1.1
+++ passwd.php	10 Jan 2007 16:50:43 -0000	1.2
@@ -1,8 +1,10 @@
 <?php
 /* -------------------------------------------------------------------
+   Copyright (c) 2004 Klaraelvdalens Datakonsult AB
    Copyright (C) 2007 by Intevation GmbH
    Author(s):
    Sascha Wilde <wilde at intevation.de>
+   Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
 
    This program is free software under the GNU GPL (>=v2)
    Read the file COPYING coming with the software for details.
@@ -21,6 +23,25 @@
   while (strlen($salt) < 4)
     $salt = $salt . chr(mt_rand(0,255));
   return $salt;
+}
+
+// Check that passwords from form input match
+function checkpw( $form, $key, $value ) {
+  global $action;
+  if( $action == 'firstsave' ) {
+    if( $key == 'password_0' ) {
+      if( $value == '' ) return _('Password is empty');
+    } else if( $key == 'password_1' ) {
+      if( $value != $_POST['password_0'] ) {
+        return _('Passwords dont match');
+      }
+    }
+  } else {
+    if( $value != $_POST['password_0'] ) {
+      return _('Passwords dont match');
+    }
+  }
+  return '';
 }
 
 ?>



From cvs at kolab.org  Wed Jan 10 17:50:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 17:50:45 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
	admin.php.in, 1.3, 1.4 
Message-ID: <20070110165045.819A11006AA@lists.intevation.de>

Author: wilde

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

Modified Files:
	admin.php.in 
Log Message:
Code cleanup: moved the redundant function `checkpw' to include/passwd.php.


Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- admin.php.in	10 Jan 2007 15:59:58 -0000	1.3
+++ admin.php.in	10 Jan 2007 16:50:43 -0000	1.4
@@ -53,24 +53,6 @@
   }
 }
 
-// Check that password match
-function checkpw( $form, $key, $value ) {
-  global $action;
-  if( $action == "firstsave" ) {
-    if( $key == 'password_0' ) {
-      if( $value == '' ) return _('Password is empty');
-    } else if( $key == 'password_1' ) {
-      if( $value != $_POST['password_0'] ) {
-        return _('Passwords dont match');
-      }
-    }
-  } else {
-    if( $value != $_POST['password_0'] ) {
-      return _('Passwords dont match');
-    }
-  }
-  return '';
-}
 function fill_form_for_modify( &$form, &$ldap_object ) {
   if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0];
   else $lastname = $ldap_object['sn'];



From cvs at kolab.org  Wed Jan 10 18:02:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 18:02:46 +0100 (CET)
Subject: thomas: server release-notes.txt,1.64,1.65 
Message-ID: <20070110170246.44DCB1006AE@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- release-notes.txt	10 Jan 2007 16:34:42 -0000	1.64
+++ release-notes.txt	10 Jan 2007 17:02:44 -0000	1.65
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 2006????, Kolab Server 2.1 cvs)
+(Version 2007????, Kolab Server 2.1 cvs)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
@@ -70,27 +70,35 @@
 	Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
 	now named LDAPGenerateHomedir(Prefix).
 
+	Set imapidlepoll to 5 seconds in imapd.conf.template.in.
+
+	kolab/issue1433 (Some files in /kolab/etc/postfix have wrong ownership)
+	kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab)
+	kolab/issue1487 (amavisd.conf mynetworks incomplete)
+	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
+	kolab/issue1531 (amavisd.conf local_domains only contains primary domain)
+
     - kolab-resource-handlers-2.0.99-2007????
 
-	kolab/issue1512 (No FB information for resource accounts)
 	kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
+	kolab/issue1512 (No FB information for resource accounts)
+	kolab/issue1558 (kolab-webadmin and php 5.2.0)
 
     - kolab-webadmin-2.0.99-2007????
 
 	kolab/issue1013 (user passwords sha1 encoded without salt)
-	Workaround for kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
+	kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
+	kolab/issue1418 (fields visible even when attribute_access is "hidden" in session_vars.php)
 	kolab/issue1540 (Typo on kolab/admin/service page)
 	kolab/issue1555 (Login screen shows error msg for no good reason)
 
-    - kolabd-2.0.99-2007????
-
-	kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab)
-
-    - openldap-2.3.29-2.20061110
+    - openldap-2.3.29-2.20061110_kolab
 
 	New upstream version, fixes CVE-2006-5779 (Bugtraq ID 20939)
 
     - perl-kolab-5.8.7-2007????
+
+	Only print warning about missing configuration variable if relevant.
 
 	kolab/issue1550 (Masquerade problem)
 



From cvs at kolab.org  Wed Jan 10 18:09:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 18:09:14 +0100 (CET)
Subject: thomas: server release-notes.txt,1.65,1.66 
Message-ID: <20070110170914.505C11006AF@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Removed issue1490 and issue1262 from known problems section. Fixed typo.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- release-notes.txt	10 Jan 2007 17:02:44 -0000	1.65
+++ release-notes.txt	10 Jan 2007 17:09:12 -0000	1.66
@@ -36,15 +36,6 @@
 
 Known problems:
 
-    - Retrieving the free/busy information isn't working, unless you use
-      the following workaround on the server:
-
-	cd /kolab && ln -s . kolab
-
-      See kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
-      for details. Be careful when creating backups of your /kolab directory
-      to not follow symbolic links, because this is a recursive one.
-
     - Under some circumstance the Kolab server may not update create
       users or update the configuration after changes have been made in
       the web interface.  This happens most often immediately after the
@@ -53,14 +44,11 @@
 	/kolab/bin/openpkg rc kolabd restart
 
       See kolab/issue1068 (Mailboxes are not created until kolabd restart)
-      and kolab/ssue1098 (Changes in the service tab are not accepted after
+      and kolab/issue1098 (Changes in the service tab are not accepted after
       bootstrap) for details.
 
     - If modifying or deleting of address book entries doesn't work,
       restarting openldap can help, see kolab/issue854 for details.
-
-    - Setting Cyrus IMAP quota to 4096MB or more breaks delivery to this user.
-      Setting to unlimited works though. See kolab/issue1262 for details.
 
 
 Changes since 2.1 beta 3:



From cvs at kolab.org  Wed Jan 10 18:31:48 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 18:31:48 +0100 (CET)
Subject: thomas: server obmtool.conf,1.234,1.235 release-notes.txt,1.66,1.67 
Message-ID: <20070110173148.2FFDE1005D1@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf release-notes.txt 
Log Message:
Updated obmtool.conf and release-notes.txt


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- obmtool.conf	10 Nov 2006 18:55:49 -0000	1.234
+++ obmtool.conf	10 Jan 2007 17:31:46 -0000	1.235
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1beta3";
+    kolab_version="2.1beta3cvs";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -91,7 +91,7 @@
     @trigger ${altloc}imap-2004g-2.5.0_kolab --with=annotate
     @install ${loc}procmail-3.22-2.5.0
     @install ${loc}db-4.3.29.0-2.5.0
-    @install ${altloc}openldap-2.3.27-2.20061018_kolab
+    @install ${altloc}openldap-2.3.29-2.20061110_kolab
     @install ${loc}m4-1.4.3-2.5.0
     @install ${loc}bison-2.1-2.5.0
     @install ${loc}flex-2.5.31-2.5.0
@@ -145,7 +145,7 @@
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
     @trigger ${loc}curl-7.15.0-2.5.2
-    @install ${altloc}clamav-0.88.5-2.20061018
+    @install ${altloc}clamav-0.88.7-20061211
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20061110

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- release-notes.txt	10 Jan 2007 17:09:12 -0000	1.66
+++ release-notes.txt	10 Jan 2007 17:31:46 -0000	1.67
@@ -53,6 +53,12 @@
 
 Changes since 2.1 beta 3:
 
+    - clamav-0.88.7-20061211
+
+	bypass virus detection (CVE-2006-6406),
+	denial of service, remotely exploitable (CVE-2006-6481)
+	(http://kolab.org/security/kolab-vendor-notice-14.txt)
+
     - kolabd-2.0.99-2007????
 
 	Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
@@ -73,6 +79,8 @@
 	kolab/issue1558 (kolab-webadmin and php 5.2.0)
 
     - kolab-webadmin-2.0.99-2007????
+
+	Revised "About Kolab" pages.
 
 	kolab/issue1013 (user passwords sha1 encoded without salt)
 	kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)



From cvs at kolab.org  Wed Jan 10 18:34:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 18:34:42 +0100 (CET)
Subject: thomas: server release-notes.txt,1.67,1.68 
Message-ID: <20070110173442.AA4D21006A4@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Use kolab/issue1486 instead of free form text for "About Kolab" fixes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- release-notes.txt	10 Jan 2007 17:31:46 -0000	1.67
+++ release-notes.txt	10 Jan 2007 17:34:40 -0000	1.68
@@ -80,11 +80,10 @@
 
     - kolab-webadmin-2.0.99-2007????
 
-	Revised "About Kolab" pages.
-
 	kolab/issue1013 (user passwords sha1 encoded without salt)
 	kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
 	kolab/issue1418 (fields visible even when attribute_access is "hidden" in session_vars.php)
+	kolab/issue1486 ("About Kolab" in Webinterface needs work over)
 	kolab/issue1540 (Typo on kolab/admin/service page)
 	kolab/issue1555 (Login screen shows error msg for no good reason)
 



From cvs at kolab.org  Wed Jan 10 19:30:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 19:30:03 +0100 (CET)
Subject: thomas: server README.1st,1.40,1.41 
Message-ID: <20070110183003.866011005D1@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Added section for upgrades from 2.1-beta-3


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- README.1st	15 Nov 2006 17:57:01 -0000	1.40
+++ README.1st	10 Jan 2007 18:30:01 -0000	1.41
@@ -38,19 +38,6 @@
 and follow the instructions.
 
 
-Workaround for problem in free/busy cache generation
-----------------------------------------------------
-
-Retrieving the free/busy information isn't working, unless you use
-the following workaround on the server:
-
-  cd /kolab && ln -s . kolab
-
-See kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
-for details. Be careful when creating backups of your /kolab directory
-to not follow symbolic links, because this is a recursive one.
-
-
 General update instructions
 ---------------------------
 
@@ -250,6 +237,18 @@
 
 See http://wiki.kolab.org/index.php/Kolab2_IMAPD_annotations.db_Problems
 for details about this topic.
+
+
+Upgrade from 2.1-beta-3
+-----------------------
+
+1. Symlink from /kolab/kolab to /kolab no longer needed:
+
+Due to kolab/issue1490 a symbolic link was needed to fix a packaging
+problem which otherwise disturbed free/busy cache generation.
+It is no longer needed and may optionally be removed:
+
+  rm /kolab/kolab
 
 
 $Id$



From cvs at kolab.org  Wed Jan 10 19:31:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 19:31:27 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates imapd.conf.template.in, 1.9,
	1.10 
Message-ID: <20070110183127.0A0DD1005D1@lists.intevation.de>

Author: thomas

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

Modified Files:
	imapd.conf.template.in 
Log Message:
Set "duplicatesuppression: 0" in imapd.conf.template (kolab/issue1532)
with warning about this in README.1st


Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- imapd.conf.template.in	18 Dec 2006 22:04:26 -0000	1.9
+++ imapd.conf.template.in	10 Jan 2007 18:31:25 -0000	1.10
@@ -83,8 +83,11 @@
 annotation_db: berkeley
 mboxlist_db: berkeley
 
-# The interval (in seconds) for polling the mailbox for changes while running the IDLE command.  
+# Don't discard emails with identical message-id header (enabled by default):
+duplicatesuppression: 0
+
+# The interval (in seconds) for polling the mailbox for changes while running the IDLE command.
 # This option is used when  idled  can not be contacted or when polling is used exclusively.
-# The minimum value is 1.  A value of 0 will disable polling (and disable IDLE if polling is 
+# The minimum value is 1.  A value of 0 will disable polling (and disable IDLE if polling is
 # the only method available).
 imapidlepoll: 5



From cvs at kolab.org  Wed Jan 10 19:31:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 10 Jan 2007 19:31:27 +0100 (CET)
Subject: thomas: server README.1st,1.41,1.42 release-notes.txt,1.68,1.69 
Message-ID: <20070110183127.0D63F1006AA@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st release-notes.txt 
Log Message:
Set "duplicatesuppression: 0" in imapd.conf.template (kolab/issue1532)
with warning about this in README.1st


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- README.1st	10 Jan 2007 18:30:01 -0000	1.41
+++ README.1st	10 Jan 2007 18:31:24 -0000	1.42
@@ -251,4 +251,17 @@
   rm /kolab/kolab
 
 
+2. imapd: emails with identical message-id header:
+
+In all previous releases the imap server discarded emails with identical
+message-ids received within three days. This caused multiple problems
+mentioned in kolab/issue1532.
+
+This change may cause duplicate messages in mailboxes due to cross postings,
+distribution lists or possible bugs in imap clients. If you want to revert
+to the old behaviour, please comment out or remove the line
+"duplicatesuppression: 0" in /kolab/etc/kolab/templates/imapd.conf.template
+or set the value to 1.
+
+
 $Id$

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- release-notes.txt	10 Jan 2007 17:34:40 -0000	1.68
+++ release-notes.txt	10 Jan 2007 18:31:24 -0000	1.69
@@ -71,6 +71,7 @@
 	kolab/issue1487 (amavisd.conf mynetworks incomplete)
 	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
 	kolab/issue1531 (amavisd.conf local_domains only contains primary domain)
+	kolab/issue1532 (Set "duplicatesuppression: 0" in imapd.conf.template?)
 
     - kolab-resource-handlers-2.0.99-2007????
 



From cvs at kolab.org  Thu Jan 11 20:20:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 11 Jan 2007 20:20:55 +0100 (CET)
Subject: bernhard: utils/testing print_events_start_end.py,NONE,1.1 
Message-ID: <20070111192055.C9B871006AA@lists.intevation.de>

Author: bernhard

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

Added Files:
	print_events_start_end.py 
Log Message:
Added script to find events without start or end tags.


--- NEW FILE: print_events_start_end.py ---
#!/usr/bin/env python
"""Decodes Kolab event email files and prints out contained start + end dates.

Will search the current working directory for files like [1-9][0-9]*.
WARNING: This is an experimental script to run manually for analysis purposes.

Usage: %(basename)  

Example: python $(basename) | grep '!!!' | wc

Options:
    -h / --help     Print this message and exit.

Roughly testing with Python2.3.5 on sarge (needs python-xml).
"""

#initial 20070111 Bernhard <bernhard at intevation.de>
#  derived from remove_kolab_doubles.py rev1.1
#
# This program is free software under the GNU GPL (>=v2)
# Read the file COPYING coming with the software for details.

__version__="$Revision: 1.1 $"[10:-1]

import sys
import os
import getopt
import errno
import mimetypes
import email

import re

import xml.dom.minidom


# verbose = 0 (only summary messages), 1 (diagonstics per file)
#           2 (verbose infos on per file operations)
#           3 (debug per file operations)
verbose = 1
def usage(code, msg=''):
    print >> sys.stderr, __doc__
    if msg:
        print >> sys.stderr, msg
    sys.exit(code)

def main():
    try:
        opts, args = getopt.getopt(sys.argv[1:], 'h', ['help'])
    except getopt.error, msg:
        usage(1, msg)

    for opt, arg in opts:
        if opt in ('-h', '--help'):
            usage(0)


    # read all files from standard directory and only 
    matchobject = re.compile("^[1-9][0-9]*\\.$")
    allfiles = os.listdir(".")
    filelist = filter(matchobject.match, allfiles)

    #filelist=["19367.", "19374.",  "19375.",  "19376." ]

    print "Scanning %d files:" % len(filelist)


    for file in filelist:

#        if verbose > 1: print 'Dealing with "%s"' % file
        print file, ":",

        fp = open(file)
        msg = email.message_from_file(fp)
        fp.close()

        if not "X-Kolab-Type" in msg:
            if verbose > 0:
                sys.stderr.write(
                    "File %s not X-Kolab-Type, ignoring.\n" % file)
            continue

        try:
            kolabeventxml=extractkolabeventxml(msg)
        except:
            sys.stderr.write("Something wrong with file %s!\n" % file)
            raise

        if not kolabeventxml: continue

        # We want to print out the values of start-date and end-date tags

        dateelements = return_date_elements(kolabeventxml)

        print dateelements,
        # two elements are normal, otherwise we "!!!"!
        if len(dateelements)!=2:
            print "!!!"
        else:
            print ""


def extractkolabeventxml(msg):
    """Returns string contaning the x-vnd.kolab.event part of an emailobject.

    Will raise IndexError, if two mime parts of application/x-vnd.kolab.event
    are found.
    """

    kolabxmlpart = None
    for part in msg.walk():
        if part.get_content_type() == 'application/x-vnd.kolab.event':
            if not kolabxmlpart:
                kolabxmlpart=part
            else:
                sys.stderr.write("Arg, found second kolabxml part!\n")
                raise IndexError

    if kolabxmlpart:
        kolabxml = kolabxmlpart.get_payload(decode=1)
    else:
        return None

    if verbose > 3: print kolabxml

    return kolabxml


def return_date_elements(kolabxml):
    """Return contents of start-date and end-date tags if they are there.

    The result is a list containing tuple with (tagname, value).
    """

    result = []

    dom = xml.dom.minidom.parseString(kolabxml)
    event=dom.firstChild
    for child in event.childNodes:
        if child.nodeType == dom.ELEMENT_NODE:
            if child.tagName in ['start-date', 'end-date']:
                result.append((child.tagName.encode("latin-1"), 
                            child.firstChild.data.encode("latin-1")))
    dom.unlink()

    return result

if __name__ == '__main__':
    main()



From cvs at kolab.org  Fri Jan 12 10:34:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Jan 2007 10:34:12 +0100 (CET)
Subject: gunnar: server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/FBView
	week.php, 1.1, 1.2 
Message-ID: <20070112093412.B6EE91006AC@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv23491

Modified Files:
	week.php 
Log Message:
2007-01-12  Gunnar Wrobel  <wrobel at pardus.de>

	* week.php: Fixed the position calculation since the day is
	diplayed completely and not beginning at 9. Slightly improves
	kolab issue 666.


Index: week.php
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/kronolith/lib/FBView/week.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- week.php	31 Oct 2005 11:43:18 -0000	1.1
+++ week.php	12 Jan 2007 09:34:10 -0000	1.2
@@ -69,7 +69,7 @@
         $html = $template->fetch(KRONOLITH_TEMPLATES . '/fbview/header.tpl');
 
         $hours_html = '<table width="100%" cellpadding="0" cellspacing="0" style="text-align:center"><tr>';
-        $dayWidth = 100 / 7;
+        $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));
@@ -185,24 +185,18 @@
     function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
     {
         $template = &new Horde_Template();
-
         $count = 0.;
         $blocks = '';
-        $dayWidth = 100. / 7.;
+        $dayWidth = 100 / 7;
         foreach ($periods as $start => $end) {
             if ($start < $this->_endStamp && $end > $this->_startStamp) {
-
                 $start_day = floor(($start - $this->_startStamp) / (24. * 3600.));
                 $start_hour = intval(strftime('%H', $start));
                 $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 * ($dayWidth / 24.);
+                $left += $start_min  * ($dayWidth / 1440.);
                 $left = min(100., max(0., $left));
 
                 $end_day = floor(($end - $this->_startStamp) / (24. * 3600.));
@@ -210,22 +204,18 @@
                 $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 * ($dayWidth / 24.);
+                $right += $end_min  * ($dayWidth / 1440.);
                 $right = min(100., $right);
 
-		if( $left == $right ) { 
-		  // This is the minimum interval we can display
-		  if( $left > 0 ) {
-		    $left -= 1;
-		  } else {
-		    $right += 1;
-		  }
-		}
+                if( $right - $left < 2  ) { 
+                    // This is the minimum interval we can display
+                    if( $right < 98 ) {
+                        $right += 2;
+                    } else {
+                        $left -= 2;
+                    }
+                }
                 if ( ($right - $left) != 0.) {
 		    $template->set('left', sprintf("%F",$left));
 		    $template->set('width', sprintf("%F",$right - $left));



From cvs at kolab.org  Fri Jan 12 18:18:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Jan 2007 18:18:50 +0100 (CET)
Subject: thomas: server release-notes.txt,1.69,1.70 
Message-ID: <20070112171850.35AFB1005C5@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Added kolab-horde-fbview-2.0.99-2007????, removed kolab/issue1486


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- release-notes.txt	10 Jan 2007 18:31:24 -0000	1.69
+++ release-notes.txt	12 Jan 2007 17:18:48 -0000	1.70
@@ -73,6 +73,10 @@
 	kolab/issue1531 (amavisd.conf local_domains only contains primary domain)
 	kolab/issue1532 (Set "duplicatesuppression: 0" in imapd.conf.template?)
 
+    - kolab-horde-fbview-2.0.99-2007????
+
+	Improvements to the week view (see kolab/issue666)
+
     - kolab-resource-handlers-2.0.99-2007????
 
 	kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
@@ -84,7 +88,6 @@
 	kolab/issue1013 (user passwords sha1 encoded without salt)
 	kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
 	kolab/issue1418 (fields visible even when attribute_access is "hidden" in session_vars.php)
-	kolab/issue1486 ("About Kolab" in Webinterface needs work over)
 	kolab/issue1540 (Typo on kolab/admin/service page)
 	kolab/issue1555 (Login screen shows error msg for no good reason)
 



From cvs at kolab.org  Fri Jan 12 19:12:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Jan 2007 19:12:35 +0100 (CET)
Subject: thomas: server release-notes.txt,1.70,1.71 
Message-ID: <20070112181235.BB8011005C5@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Bump kolab-horde-fbview version number

This fixes the last bit of kolab/issue1507 (Public viewable phpinfo() and
more in Server default installation), because without a new version number
the offending files won't be removed.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- release-notes.txt	12 Jan 2007 17:18:48 -0000	1.70
+++ release-notes.txt	12 Jan 2007 18:12:33 -0000	1.71
@@ -77,6 +77,8 @@
 
 	Improvements to the week view (see kolab/issue666)
 
+	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
+
     - kolab-resource-handlers-2.0.99-2007????
 
 	kolab/issue1490 (freebusy cache written to /kolab/kolab/...)



From cvs at kolab.org  Fri Jan 12 19:12:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Jan 2007 19:12:35 +0100 (CET)
Subject: thomas: server/kolab-horde-fbview Makefile, 1.2,
	1.3 kolab-horde-fbview.spec, 1.3, 1.4 
Message-ID: <20070112181235.C56E71005CB@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-horde-fbview
In directory doto:/tmp/cvs-serv4168/kolab-horde-fbview

Modified Files:
	Makefile kolab-horde-fbview.spec 
Log Message:
Bump kolab-horde-fbview version number

This fixes the last bit of kolab/issue1507 (Public viewable phpinfo() and
more in Server default installation), because without a new version number
the offending files won't be removed.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	20 Dec 2005 19:49:27 -0000	1.2
+++ Makefile	12 Jan 2007 18:12:33 -0000	1.3
@@ -4,7 +4,7 @@
 
 PACKAGE = kolab-horde-fbview
 VERSION = 2.0.99
-RELEASE = 20051220
+RELEASE = 20070112
 KOLABRELEASE = $(RELEASE)
 
 RPM = /kolab/bin/openpkg rpm

Index: kolab-horde-fbview.spec
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab-horde-fbview.spec	20 Dec 2005 19:49:27 -0000	1.3
+++ kolab-horde-fbview.spec	12 Jan 2007 18:12:33 -0000	1.4
@@ -7,7 +7,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_fbview}
-Release:	20051220
+Release:	20070112
 Class:		JUNK
 License:	GPL
 Group:		MAIL



From cvs at kolab.org  Fri Jan 12 19:20:37 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 12 Jan 2007 19:20:37 +0100 (CET)
Subject: thomas: server release-notes.txt,1.71,1.72 
Message-ID: <20070112182037.E63301005C5@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Make clear that issue1507 and issue666 are only partly fixed.
(and issue1507 was listed under kolabd, too)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- release-notes.txt	12 Jan 2007 18:12:33 -0000	1.71
+++ release-notes.txt	12 Jan 2007 18:20:35 -0000	1.72
@@ -69,15 +69,14 @@
 	kolab/issue1433 (Some files in /kolab/etc/postfix have wrong ownership)
 	kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab)
 	kolab/issue1487 (amavisd.conf mynetworks incomplete)
-	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
 	kolab/issue1531 (amavisd.conf local_domains only contains primary domain)
 	kolab/issue1532 (Set "duplicatesuppression: 0" in imapd.conf.template?)
 
-    - kolab-horde-fbview-2.0.99-2007????
+    - kolab-horde-fbview-2.0.99-20070112
 
-	Improvements to the week view (see kolab/issue666)
+	Improvements to the week view (part of kolab/issue666)
 
-	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
+	Removed dangerous php scripts (part of kolab/issue1507)
 
     - kolab-resource-handlers-2.0.99-2007????
 



From cvs at kolab.org  Wed Jan 17 14:41:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 17 Jan 2007 14:41:30 +0100 (CET)
Subject: thomas: server release-notes.txt,1.72,1.73 README.1st,1.42,1.43 
Message-ID: <20070117134130.13AB01006AE@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt README.1st 
Log Message:
Updated release notes and README for 2.1beta4 release.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- release-notes.txt	12 Jan 2007 18:20:35 -0000	1.72
+++ release-notes.txt	17 Jan 2007 13:41:27 -0000	1.73
@@ -1,15 +1,16 @@
 Release notes Kolab2 Server
-(Version 2007????, Kolab Server 2.1 cvs)
+(Version 20070117, Kolab Server 2.1 beta 4)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
 the 1st.README file in the source directory.
 
-WARNING, these topics need testing in 2.1 beta 3:
+WARNING, these topics need testing in 2.1 beta 4:
 
- - Instructions for upgrading from Kolab server 2.0 in 1st.README.
+ - Upgrades from Kolab server 2.0, see 1st.README and UPGRADING.20-21.
  - Changed imapd database format for annotations.db and mailboxes.db
- - New free/busy code (see section "Known problems")
+ - New free/busy code
+ - Duplicate suppression is disabled, see kolab/issue1532
 
 
 Differences between Kolab 2.0.x and 2.1:
@@ -50,6 +51,16 @@
     - If modifying or deleting of address book entries doesn't work,
       restarting openldap can help, see kolab/issue854 for details.
 
+    - Users can't be deleted by the corresponding Domain Maintainer, see
+      kolab/issue1559 for details.
+
+    - There is a report that the manager can only see users in the primary
+      domain, see kolab/issue1485. We can't reproduce this problem, please
+      tell us if you can.
+
+    - There may be a locking issue which can cause losing meeting requests
+      under high server load, see kolab/issue1335 and kolab/issue1563.
+
 
 Changes since 2.1 beta 3:
 
@@ -59,7 +70,7 @@
 	denial of service, remotely exploitable (CVE-2006-6481)
 	(http://kolab.org/security/kolab-vendor-notice-14.txt)
 
-    - kolabd-2.0.99-2007????
+    - kolabd-2.0.99-20070117
 
 	Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
 	now named LDAPGenerateHomedir(Prefix).
@@ -78,13 +89,13 @@
 
 	Removed dangerous php scripts (part of kolab/issue1507)
 
-    - kolab-resource-handlers-2.0.99-2007????
+    - kolab-resource-handlers-2.0.99-20070117
 
 	kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
 	kolab/issue1512 (No FB information for resource accounts)
 	kolab/issue1558 (kolab-webadmin and php 5.2.0)
 
-    - kolab-webadmin-2.0.99-2007????
+    - kolab-webadmin-2.0.99-20070117
 
 	kolab/issue1013 (user passwords sha1 encoded without salt)
 	kolab/issue1262 (Setting quota to 4096+ MB breaks message delivery)
@@ -96,7 +107,7 @@
 
 	New upstream version, fixes CVE-2006-5779 (Bugtraq ID 20939)
 
-    - perl-kolab-5.8.7-2007????
+    - perl-kolab-5.8.7-20070117
 
 	Only print warning about missing configuration variable if relevant.
 

Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- README.1st	10 Jan 2007 18:31:24 -0000	1.42
+++ README.1st	17 Jan 2007 13:41:27 -0000	1.43
@@ -1,5 +1,5 @@
-Kolab2 Server Important Information
-===================================
+Kolab2 Server Install and Upgrade Information
+=============================================
 
 For more information on Kolab, see http://www.kolab.org
 
@@ -12,7 +12,7 @@
 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 
+E.g. some platforms need gettext installed
 or the locale set to C during installation, like:
         LC_ALL=C
         LC_MESSAGES=C
@@ -132,7 +132,7 @@
 You need to make two small changes are required for the openldap
 configuration file /kolab/etc/openldap/slapd.conf:
 
-  - comment out the line 
+  - comment out the line
 
      require        none
 



From cvs at kolab.org  Wed Jan 17 14:47:07 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 17 Jan 2007 14:47:07 +0100 (CET)
Subject: thomas: server obmtool.conf,1.235,1.236 
Message-ID: <20070117134707.E68DA1006AE@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf 
Log Message:
Updated obmtool.conf for 2.1beta4 release


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- obmtool.conf	10 Jan 2007 17:31:46 -0000	1.235
+++ obmtool.conf	17 Jan 2007 13:47:05 -0000	1.236
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1beta3cvs";
+    kolab_version="2.1beta4";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -148,12 +148,12 @@
     @install ${altloc}clamav-0.88.7-20061211
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20061110
-    @install ${altloc}kolabd-2.0.99-20061110 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20061110 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20070117
+    @install ${altloc}kolabd-2.0.99-20070117 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20070117 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20061110 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20070117 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then



From cvs at kolab.org  Thu Jan 18 12:53:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Jan 2007 12:53:16 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.104,1.105 
Message-ID: <20070118115316.77E4F1005AB@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Added news for server 2.1 beta 4, moved "latest block"


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- index.html.m4	21 Dec 2006 15:11:04 -0000	1.104
+++ index.html.m4	18 Jan 2007 11:53:14 -0000	1.105
@@ -47,6 +47,20 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">January 17th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.1 Beta 4 released
+</td></tr>
+</table>
+<div class="newsb">
+  This release fixes more than 20 problems found in Beta 3 and
+  includes the security updates published until now.  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000046.html">
+  announcement</a> for details.
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">December 19th, 2006</td>
 <td class="newsh">&raquo;
 	Security Advisory 14 for Kolab Server (ClamAV)
@@ -60,6 +74,14 @@
 </div>
 <p>
 
+
+</div> <!-- END LATEST BLOCK -->
+
+
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
 <table>
 <tr><td class="newsd">November 16th, 2006</td>
 <td class="newsh">&raquo;
@@ -75,6 +97,7 @@
   Server 2.0 to 2.1.
 </div>
 <p>
+
 <table>
 <tr><td class="newsd">November 14th - 16th, 2006</td>
 <td class="newsh">&raquo;
@@ -90,7 +113,6 @@
 </div>
 <p>
 
-
 <table>
 <tr><td class="newsd">November 2nd, 2006</td>
 <td class="newsh">&raquo;
@@ -114,14 +136,6 @@
 	The release notes contain the full list.
 </div>
 <p>
-
-
-</div> <!-- END LATEST BLOCK -->
-
-
-
-<!-- BEGIN NEWS BLOCK --> <div class="news">
-
 
 <table>
 <tr><td class="newsd">October 23th - 27th, 2006</td>



From cvs at kolab.org  Thu Jan 18 14:11:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Jan 2007 14:11:21 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
	sf.php.in, 1.5, 1.6 
Message-ID: <20070118131121.14A481006AC@lists.intevation.de>

Author: gunnar

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

Modified Files:
	sf.php.in 
Log Message:
2007-01-18  Gunnar Wrobel  <wrobel at pardus.de>

	* www/admin/sharedfolder/sf.php.in: 

	Allow modification of the shared folder type.
	
	Fix for issue1479 (https://intevation.de/roundup/kolab/issue1479).


Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sf.php.in	11 Jul 2006 16:02:24 -0000	1.5
+++ sf.php.in	18 Jan 2007 13:11:18 -0000	1.6
@@ -274,7 +274,6 @@
 	  $form->entries['cn']['comment'] = '';
 	  $form->entries['kolabhomeserver']['attrs'] = 'readonly';
 	  $form->entries['kolabhomeserver']['comment'] = '';
-          $form->entries['foldertype']['attrs'] = 'readonly';
           $form->entries['foldertype']['comment'] = '';
 	  $heading = _('Modify Shared Folder');
 	  $content = $form->outputForm();



From cvs at kolab.org  Thu Jan 18 14:11:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Jan 2007 14:11:21 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.25,1.26 
Message-ID: <20070118131121.122571006AA@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
2007-01-18  Gunnar Wrobel  <wrobel at pardus.de>

	* www/admin/sharedfolder/sf.php.in: 

	Allow modification of the shared folder type.
	
	Fix for issue1479 (https://intevation.de/roundup/kolab/issue1479).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ChangeLog	10 Jan 2007 12:25:43 -0000	1.25
+++ ChangeLog	18 Jan 2007 13:11:19 -0000	1.26
@@ -1,3 +1,11 @@
+2007-01-18  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* www/admin/sharedfolder/sf.php.in: 
+
+	Allow modification of the shared folder type.
+	
+	Fix for issue1479 (https://intevation.de/roundup/kolab/issue1479).
+
 2007-01-10 Marcus Hüwe <suse-tux at gmx.de>
 	* php/admin/include/form.class.php: added a __toString() method otherwise
 	  it will not work with php 5.2.0 (see issue1558)



From cvs at kolab.org  Thu Jan 18 14:42:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Jan 2007 14:42:05 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.26,1.27 
Message-ID: <20070118134205.A9C051006AC@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
2007-01-18  Gunnar Wrobel  <wrobel at pardus.de>

	* php/admin/locale/de/LC_MESSAGES/messages.po: 

	Added the german translation for recent patch to
	systemaliasnagscreen.tpl (http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-webadmin/kolab-webadmin/php/admin/templates/systemaliasnagscreen.tpl.diff?r1=1.1&r2=1.2)

	See issue1539 (https://intevation.de/roundup/kolab/issue1539)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	18 Jan 2007 13:11:19 -0000	1.26
+++ ChangeLog	18 Jan 2007 13:42:03 -0000	1.27
@@ -1,5 +1,12 @@
 2007-01-18  Gunnar Wrobel  <wrobel at pardus.de>
 
+	* php/admin/locale/de/LC_MESSAGES/messages.po: 
+
+	Added the german translation for recent patch to
+	systemaliasnagscreen.tpl (http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-webadmin/kolab-webadmin/php/admin/templates/systemaliasnagscreen.tpl.diff?r1=1.1&r2=1.2)
+
+	See issue1539 (https://intevation.de/roundup/kolab/issue1539)
+	
 	* www/admin/sharedfolder/sf.php.in: 
 
 	Allow modification of the shared folder type.



From cvs at kolab.org  Thu Jan 18 14:42:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Jan 2007 14:42:05 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.18, 1.19 
Message-ID: <20070118134205.9DFA31006A5@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv11224/php/admin/locale/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
2007-01-18  Gunnar Wrobel  <wrobel at pardus.de>

	* php/admin/locale/de/LC_MESSAGES/messages.po: 

	Added the german translation for recent patch to
	systemaliasnagscreen.tpl (http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-webadmin/kolab-webadmin/php/admin/templates/systemaliasnagscreen.tpl.diff?r1=1.1&r2=1.2)

	See issue1539 (https://intevation.de/roundup/kolab/issue1539)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- messages.po	21 Dec 2006 11:03:53 -0000	1.18
+++ messages.po	18 Jan 2007 13:42:03 -0000	1.19
@@ -497,11 +497,21 @@
 #: tpl_messages.php:94
 msgid ""
 "No account is configured to receive mail for administrative addresses. If "
-"you have not yet created an account for this, please do so and then go"
+"you have not yet created an account for this, "
 msgstr ""
 "Es wurde kein Konto zum Empfang von Nachrichten an administrative Adressen "
-"konfiguriert. Wenn Sie hierfür noch kein Konto angelegt haben, dann tun Sie "
-"das bitte jetzt und gehen dann nach"
+"konfiguriert. Wenn Sie hierfür noch kein Konto angelegt haben, "
+
+#: tpl_messages.php:94_a
+msgid ""
+"please do so"
+msgstr ""
+"dann tun Sie das bitte jetzt"
+#: tpl_messages.php:94_a
+msgid ""
+"and then go"
+msgstr ""
+"und gehen dann nach"
 
 #: tpl_messages.php:95
 msgid "here"



From cvs at kolab.org  Thu Jan 18 15:06:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 18 Jan 2007 15:06:45 +0100 (CET)
Subject: thomas: server README.1st, 1.43, 1.44 obmtool.conf, 1.236,
	1.237 release-notes.txt, 1.73, 1.74 
Message-ID: <20070118140645.73A571006AC@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st obmtool.conf release-notes.txt 
Log Message:
Updated README.1st, obmtool.conf and release-notes.txt for current CVS


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- README.1st	17 Jan 2007 13:41:27 -0000	1.43
+++ README.1st	18 Jan 2007 14:06:43 -0000	1.44
@@ -264,4 +264,10 @@
 or set the value to 1.
 
 
+Upgrade from 2.1-beta-4
+-----------------------
+
+Nothing special has to be done for this upgrade.
+
+
 $Id$

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- obmtool.conf	17 Jan 2007 13:47:05 -0000	1.236
+++ obmtool.conf	18 Jan 2007 14:06:43 -0000	1.237
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1beta4";
+    kolab_version="2.1cvs";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- release-notes.txt	17 Jan 2007 13:41:27 -0000	1.73
+++ release-notes.txt	18 Jan 2007 14:06:43 -0000	1.74
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 20070117, Kolab Server 2.1 beta 4)
+(Version 2007????, Kolab Server 2.1 cvs)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
@@ -60,6 +60,14 @@
 
     - There may be a locking issue which can cause losing meeting requests
       under high server load, see kolab/issue1335 and kolab/issue1563.
+
+
+Changes since 2.1 beta 4:
+
+    - kolab-webadmin-2.0.99-2007????
+
+	kolab/issue1479 ("Type" of shared folder can only be modified in 2nd try)
+	kolab/issue1539 (extension to the opening text, when the manager logs in for the 1st time)
 
 
 Changes since 2.1 beta 3:



From cvs at kolab.org  Wed Jan 24 18:47:32 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Jan 2007 18:47:32 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin index.php.in,
	1.2, 1.3 
Message-ID: <20070124174732.DE1F01005C5@lists.intevation.de>

Author: martin

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

Modified Files:
	index.php.in 
Log Message:
Martin K.. Fix issue #1551. Using patch from Jørgen H. Fjeld


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	22 Feb 2006 00:36:27 -0000	1.2
+++ index.php.in	24 Jan 2007 17:47:30 -0000	1.3
@@ -43,7 +43,7 @@
 		!exists_group( 'postmaster@'.$domain ) ||
 		!exists_group( 'abuse@'.$domain ) ||
 		!exists_group( 'virusalert@'.$domain ) ||
-		!exists_group( 'MAILER-DAEMON@'.$domain ) ) {
+		!exists_group( 'mailer-daemon@'.$domain ) ) {
 	  // Ok, user did not set up system aliases
 	  $maincontent = 'systemaliasnagscreen.tpl';
 	}



From cvs at kolab.org  Wed Jan 24 18:47:32 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Jan 2007 18:47:32 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/service
	index.php.in, 1.2, 1.3 
Message-ID: <20070124174732.DFA181005CB@lists.intevation.de>

Author: martin

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

Modified Files:
	index.php.in 
Log Message:
Martin K.. Fix issue #1551. Using patch from Jørgen H. Fjeld


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	22 Feb 2006 00:36:27 -0000	1.2
+++ index.php.in	24 Jan 2007 17:47:30 -0000	1.3
@@ -99,7 +99,7 @@
 	if( !$dn ) {
 	  $errors[] = sprintf(_("No account found for email address %s"), $mail);
 	} else {
-	  foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) {
+	  foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'mailer-daemon' ) as $group ) {
 		$gadr = $group.'@'.$domain;
 		$attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ),
 						'cn' => $gadr,
@@ -327,7 +327,7 @@
 		!exists_group( 'postmaster@'.$domain ) ||
 		!exists_group( 'abuse@'.$domain ) ||
 		!exists_group( 'virusalert@'.$domain ) ||
-		!exists_group( 'MAILER-DAEMON@'.$domain ) ) {
+		!exists_group( 'mailer-daemon@'.$domain ) ) {
 	  // Ok, user did not set up system aliases
 	  $systemaliasconf[] = array( 'n'=>$domain_count, 'domain'=>$domain );
 	}



From cvs at kolab.org  Wed Jan 24 18:47:32 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 24 Jan 2007 18:47:32 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	service.tpl, 1.12, 1.13 
Message-ID: <20070124174732.D9E981005AF@lists.intevation.de>

Author: martin

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

Modified Files:
	service.tpl 
Log Message:
Martin K.. Fix issue #1551. Using patch from Jørgen H. Fjeld


Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- service.tpl	19 Dec 2006 19:57:32 -0000	1.12
+++ service.tpl	24 Jan 2007 17:47:30 -0000	1.13
@@ -10,7 +10,7 @@
 <a name="systemaliasconf"></a>
 <h2>{tr msg="Administrative email addresses"}</h2>
 <div class="contentsimple">
-<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-DAEMON at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
+<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, mailer-daemon at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
 {section name=id loop=$systemaliasconf}
 <div class="contentform">
 <form name="systemalias_{$systemaliasconf[id].n}" method="post">



From cvs at kolab.org  Thu Jan 25 11:33:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 25 Jan 2007 11:33:44 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	service.tpl, 1.13, 1.14 
Message-ID: <20070125103344.E303C1005AB@lists.intevation.de>

Author: thomas

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

Modified Files:
	service.tpl 
Log Message:
Reverting martin's commit from 24 Jan 2007 17:47:30

Reasons:
- It is not clear that this is what we want (I think it isn't)
- It only fixes the trigger, not the problem.
- It will cause problems when upgrading.
- It may cause other interactions, nobody checked.
- Commit message doesn't say what is changed.


Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- service.tpl	24 Jan 2007 17:47:30 -0000	1.13
+++ service.tpl	25 Jan 2007 10:33:42 -0000	1.14
@@ -10,7 +10,7 @@
 <a name="systemaliasconf"></a>
 <h2>{tr msg="Administrative email addresses"}</h2>
 <div class="contentsimple">
-<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, mailer-daemon at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
+<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-DAEMON at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
 {section name=id loop=$systemaliasconf}
 <div class="contentform">
 <form name="systemalias_{$systemaliasconf[id].n}" method="post">



From cvs at kolab.org  Thu Jan 25 11:33:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 25 Jan 2007 11:33:44 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin index.php.in,
	1.3, 1.4 
Message-ID: <20070125103344.E8BA51005BE@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
Reverting martin's commit from 24 Jan 2007 17:47:30

Reasons:
- It is not clear that this is what we want (I think it isn't)
- It only fixes the trigger, not the problem.
- It will cause problems when upgrading.
- It may cause other interactions, nobody checked.
- Commit message doesn't say what is changed.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in	24 Jan 2007 17:47:30 -0000	1.3
+++ index.php.in	25 Jan 2007 10:33:42 -0000	1.4
@@ -43,7 +43,7 @@
 		!exists_group( 'postmaster@'.$domain ) ||
 		!exists_group( 'abuse@'.$domain ) ||
 		!exists_group( 'virusalert@'.$domain ) ||
-		!exists_group( 'mailer-daemon@'.$domain ) ) {
+		!exists_group( 'MAILER-DAEMON@'.$domain ) ) {
 	  // Ok, user did not set up system aliases
 	  $maincontent = 'systemaliasnagscreen.tpl';
 	}



From cvs at kolab.org  Thu Jan 25 11:33:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 25 Jan 2007 11:33:44 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/service
	index.php.in, 1.3, 1.4 
Message-ID: <20070125103344.ED55B1005D9@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
Reverting martin's commit from 24 Jan 2007 17:47:30

Reasons:
- It is not clear that this is what we want (I think it isn't)
- It only fixes the trigger, not the problem.
- It will cause problems when upgrading.
- It may cause other interactions, nobody checked.
- Commit message doesn't say what is changed.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in	24 Jan 2007 17:47:30 -0000	1.3
+++ index.php.in	25 Jan 2007 10:33:42 -0000	1.4
@@ -99,7 +99,7 @@
 	if( !$dn ) {
 	  $errors[] = sprintf(_("No account found for email address %s"), $mail);
 	} else {
-	  foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'mailer-daemon' ) as $group ) {
+	  foreach( array( 'postmaster', 'hostmaster', 'abuse', 'virusalert', 'MAILER-DAEMON' ) as $group ) {
 		$gadr = $group.'@'.$domain;
 		$attrs = array( 'objectClass' => array( 'top', 'kolabGroupOfNames' ),
 						'cn' => $gadr,
@@ -327,7 +327,7 @@
 		!exists_group( 'postmaster@'.$domain ) ||
 		!exists_group( 'abuse@'.$domain ) ||
 		!exists_group( 'virusalert@'.$domain ) ||
-		!exists_group( 'mailer-daemon@'.$domain ) ) {
+		!exists_group( 'MAILER-DAEMON@'.$domain ) ) {
 	  // Ok, user did not set up system aliases
 	  $systemaliasconf[] = array( 'n'=>$domain_count, 'domain'=>$domain );
 	}



From cvs at kolab.org  Thu Jan 25 22:49:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 25 Jan 2007 22:49:57 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.4,
	1.5 
Message-ID: <20070125214957.D64A61006C1@lists.intevation.de>

Author: martin

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
Martin Konold: Merged in the newer stuff from the freebusy tree.


Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freebusy.conf.template.in	1 Nov 2006 14:00:07 -0000	1.4
+++ freebusy.conf.template.in	25 Jan 2007 21:49:55 -0000	1.5
@@ -44,10 +44,10 @@
 // does not supply credentials? This account should
 // have access to the calendar mailbox of all the users for which free/busy
 // information is to be retrieved.
-//$params['calendar_user'] = '@ @@cyrus-admins@@@';
+$params['calendar_user'] = '@@@cyrus-admins@@@';
 
 // What password should we use with the above account?
-//$params['calendar_pass'] = '@ @@bind_pw@@@';
+$params['calendar_pass'] = '@@@bind_pw@@@';
 
 // What is the name of the users' calendar mailbox?
 $params['calendar_store'] = 'Calendar';
@@ -81,21 +81,25 @@
 $params['send_content_disposition'] = false;
 
 // Where are we logging to?
-$params['log'] = 'file:@freebusy_logfile@';                // File...
+$params['log'] = 'file:@freebusy_logfile@';        // File...
 // $params['log'] = 'syslog:cons, pid';            // Or syslog...
 
 // What level of output should we log? Higher levels give more verbose output.
 // One of: 0 (RM_LOG_SILENT); 1 (RM_LOG_ERROR); 2 (RM_LOG_WARN); 3 (RM_LOG_INFO) or 4 (RM_LOG_DEBUG).
 $params['log_level'] = 4;
 
+// What db type to use for freebusy caches
+$params['dbtype'] = 'gdbm';
+
 // IMAP options passed to imap_open
 //$params['imap_options'] = "/notls/secure/readonly";
 $params['imap_options'] = "/notls/readonly";
 
-$params['pfb_dbformat'] = "";          // default: gdbm
+$params['pfb_dbformat'] = 'gdbm';          // default: gdbm
 
 // Location of the cache files
 $params['cache_dir'] = '@freebusy_cachedir@';
 
 // don't change this if you don't have to
-//$params['ldap_classname_suffix'] = "_dummy";
+$params['ldap_uri'] = "";
+$params['ldap_classname_suffix'] = "_dummy";



From cvs at kolab.org  Sun Jan 28 16:29:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 28 Jan 2007 16:29:20 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates slapd.conf.template.in, 1.9,
	1.10 
Message-ID: <20070128152920.C5F951005B4@lists.intevation.de>

Author: martin

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

Modified Files:
	slapd.conf.template.in 
Log Message:
Martin Konold: Added refint and unique overlays to OpenLDAP configuration as proposed in https://intevation.de/roundup/kolab/issue1575.
Tested with Kolab 2.1 beta4


Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- slapd.conf.template.in	21 Dec 2006 17:48:57 -0000	1.9
+++ slapd.conf.template.in	28 Jan 2007 15:29:18 -0000	1.10
@@ -4,7 +4,7 @@
 OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003-2005 Martin Konold <martin.konold at erfrakon.de>
+# (c) 2003-2007 Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
 # This program is Free Software under the GNU General Public License (>=v2).
 # Read the file COPYING that comes with this packages for details.
@@ -62,6 +62,16 @@
         binddn="cn=replicator"
         bindmethod=simple 
 	credentials=secret
+
+#### Using overlays to improve data consistency
+# Ensure that we never get dangling member attributes
+# Checked on rename and delete
+overlay refint
+refint_attributes member
+
+# The mail and the uid attribute must be unique.
+overlay unique
+unique_attributes mail uid
 
 index   objectClass     pres,eq
 index   uid             approx,sub,pres,eq



From cvs at kolab.org  Mon Jan 29 01:04:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Jan 2007 01:04:55 +0100 (CET)
Subject: martin: server/kolabd/kolabd kolab2.schema,1.20,1.21 
Message-ID: <20070129000455.44D8B1005B4@lists.intevation.de>

Author: martin

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

Modified Files:
	kolab2.schema 
Log Message:
Martin Konold: rfc2252 only allows a single space character in continuation lines


Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- kolab2.schema	8 Aug 2006 16:18:32 -0000	1.20
+++ kolab2.schema	29 Jan 2007 00:04:52 -0000	1.21
@@ -1,6 +1,6 @@
 # $Id$
 # (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003-2006  Martin Konold <martin.konold at erfrakon.de>
+# (c) 2003-2007  Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
 #
 # Redistribution and use in source and binary forms, with or without 
@@ -46,27 +46,27 @@
 # helper attribute to make the kolab root easily findable in 
 # a big ldap directory
 attributetype ( 1.3.6.1.4.1.19414.2.1.1
-  NAME ( 'k' 'kolab' )
-  DESC 'Kolab attribute'
-  SUP name )
+ NAME ( 'k' 'kolab' )
+ DESC 'Kolab attribute'
+ SUP name )
 
 # kolabDeleteflag used to be a boolean but describes with Kolab 2 
 # the fqdn of the server which is requested to delete this objects
 # in its local store
 attributetype ( 1.3.6.1.4.1.19414.2.1.2
-  NAME 'kolabDeleteflag'
-  DESC 'Per host deletion status'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'kolabDeleteflag'
+ DESC 'Per host deletion status'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # alias used to provide alternative rfc822 email addresses for kolab users
 attributetype ( 1.3.6.1.4.1.19414.2.1.3
-  NAME 'alias'
-  DESC 'RFC1274: RFC822 Mailbox'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'alias'
+ DESC 'RFC1274: RFC822 Mailbox'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # kolabEncryptedPassword is an asymmetrically (RSA) encrypted copy of the
 # cleartext password. This is required in order to pass the password from
@@ -76,50 +76,50 @@
 # calendar user dn: cn=calendar,cn=internal,dc=yourcompany,dc=com access to 
 # the respective calendar folder using IMAP ACLs.
 attributetype ( 1.3.6.1.4.1.19419.2.1.4
-  NAME 'kolabEncryptedPassword'
-  DESC 'base64 encoded public key encrypted Password'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ NAME 'kolabEncryptedPassword'
+ DESC 'base64 encoded public key encrypted Password'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 # hostname including the domain name like kolab-master.yourcompany.com
 attributetype ( 1.3.6.1.4.1.19414.2.1.5
-  NAME ( 'fqhostname' 'fqdnhostname' )
-  DESC 'Fully qualified Hostname including full domain component'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME ( 'fqhostname' 'fqdnhostname' )
+ DESC 'Fully qualified Hostname including full domain component'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fqdn of all hosts in a multi-location or cluster setup
 attributetype ( 1.3.6.1.4.1.19414.2.1.6
-  NAME 'kolabHost'
-  DESC 'Multivalued -- list of hostnames in a Kolab setup'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'kolabHost'
+ DESC 'Multivalued -- list of hostnames in a Kolab setup'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fqdn of the server containg the actual user mailbox
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.1
-  NAME 'kolabHomeServer'
-  DESC 'server which keeps the users mailbox'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'kolabHomeServer'
+ DESC 'server which keeps the users mailbox'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # flag for allowing unrestriced length of mails
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.2
-  NAME 'unrestrictedMailSize'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'unrestrictedMailSize'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # Specifies the email delegates.
 # An email delegate can send email on behalf of the account  
 # which means using the "from" of the account.
 # Delegates are specified by the syntax of rfc822 email addresses.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.3
-  NAME 'kolabDelegate'
-  DESC 'Kolab user allowed to act as delegates - RFC822 Mailbox/Alias'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'kolabDelegate'
+ DESC 'Kolab user allowed to act as delegates - RFC822 Mailbox/Alias'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # For user, group and resource Kolab accounts
 # Describes how to respond to invitations
@@ -135,40 +135,40 @@
 # address followed by a colon like
 # user at domain.tld: ACT_ALWAYS_ACCEPT
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.4
-  NAME ( 'kolabInvitationPolicy' 'kolabResourceAction' )
-  DESC 'defines how to respond to invitations'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME ( 'kolabInvitationPolicy' 'kolabResourceAction' )
+ DESC 'defines how to respond to invitations'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # time span from now to the future used for the free busy data
 # measured in days
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.5
-  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 
-  SINGLE-VALUE )
+ 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 
+ SINGLE-VALUE )
 
 # time span from now to the past used for the free busy data
 # measured in days
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.6
-  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
-  SINGLE-VALUE )
+ 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
+ SINGLE-VALUE )
 
 # fqdn of the server as the default SMTP MTA
 # not used in Kolab 2 currently as in Kolab 2 the
 # default MTA is equivalent to the kolabHomeServer
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.7
-  NAME 'kolabHomeMTA'
-  DESC 'fqdn of default MTA'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-  SINGLE-VALUE )
+ NAME 'kolabHomeMTA'
+ DESC 'fqdn of default MTA'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ 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 
@@ -181,11 +181,11 @@
 # see also: rfc 2252.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.8
-  NAME 'kolabVacationBeginDateTime'
-  DESC 'Begin date of vacation'
-  EQUALITY generalizedTimeMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-  SINGLE-VALUE )
+ NAME 'kolabVacationBeginDateTime'
+ DESC 'Begin date of vacation'
+ EQUALITY generalizedTimeMatch
+ 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
@@ -198,21 +198,21 @@
 # see also: rfc 2252.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.9
-  NAME 'kolabVacationEndDateTime'
-  DESC 'End date of vacation'
-  EQUALITY generalizedTimeMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-  SINGLE-VALUE )
+ NAME 'kolabVacationEndDateTime'
+ DESC 'End date of vacation'
+ EQUALITY generalizedTimeMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+ SINGLE-VALUE )
 
 # Intervall in days after which senders get 
 # another vacation message.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.10
-  NAME 'kolabVacationResendInterval'
-  DESC 'Vacation notice interval in days'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
-  SINGLE-VALUE )
+ NAME 'kolabVacationResendInterval'
+ DESC 'Vacation notice interval in days'
+ EQUALITY integerMatch
+ 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
@@ -221,22 +221,22 @@
 # email aliases of the kolabInetOrgPerson.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.11
-  NAME 'kolabVacationAddress'
-  DESC 'Email address for vacation to response upon'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'kolabVacationAddress'
+ DESC 'Email address for vacation to response upon'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # Enable sending vacation notices in reaction
 # unsolicited commercial email.
 # Default is no.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.12
-  NAME 'kolabVacationReplyToUCE'
-  DESC 'Enable vacation notices to UCE'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
+ NAME 'kolabVacationReplyToUCE'
+ DESC 'Enable vacation notices to UCE'
+ EQUALITY booleanMatch
+ 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
@@ -244,11 +244,11 @@
 # Default is to handle all domains.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.13
-  NAME 'kolabVacationReactDomain'
-  DESC 'Multivalued -- Email domain for vacation to response upon'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )  
+ NAME 'kolabVacationReactDomain'
+ DESC 'Multivalued -- Email domain for vacation to response upon'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )  
 
 # Forward all incoming emails except UCE if kolabForwardUCE
 # is not set to this email address.
@@ -256,32 +256,32 @@
 # each kolabInetOrgPerson.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.14
-  NAME 'kolabForwardAddress'
-  DESC 'Forward email to this address'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'kolabForwardAddress'
+ DESC 'Forward email to this address'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # Keep local copy when forwarding emails to list of
 # kolabForwardAddress. 
 # Default is no.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.15
-  NAME 'kolabForwardKeepCopy'
-  DESC 'Keep copy when forwarding'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
-  SINGLE-VALUE )
+ NAME 'kolabForwardKeepCopy'
+ DESC 'Keep copy when forwarding'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
+ SINGLE-VALUE )
 
 # Enable forwarding of UCE. 
 # Default is yes.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.16
-  NAME 'kolabForwardUCE'
-  DESC 'Enable forwarding of mails known as UCE'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
-  SINGLE-VALUE )
+ NAME 'kolabForwardUCE'
+ DESC 'Enable forwarding of mails known as UCE'
+ EQUALITY booleanMatch
+ 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
@@ -290,11 +290,11 @@
 # with an ISO 8601 date string e.g 200604301458Z. All times must 
 # be in zulu timezone.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.17
-  NAME 'kolabComment'
-  DESC 'multi-value comment'
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
+ NAME 'kolabComment'
+ DESC 'multi-value comment'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
 # kolabFolderType describes the kind of Kolab folder
 # as defined in the kolab format specification. 
@@ -313,145 +313,145 @@
 # We then use the ANNOTATEMORE IMAP extension to 
 # associate the folder type with a folder.
 attributetype ( 1.3.6.1.4.1.19414.2.1.7
-  NAME 'kolabFolderType'
-  DESC 'type of a kolab folder'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-  SINGLE-VALUE )
+ NAME 'kolabFolderType'
+ DESC 'type of a kolab folder'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+ SINGLE-VALUE )
 
 ######################
 # postfix attributes #
 ######################
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.501
-  NAME 'postfix-mydomain'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-mydomain'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.502
-  NAME 'postfix-relaydomains'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-relaydomains'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.503
-  NAME 'postfix-mydestination'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-mydestination'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.504
-  NAME 'postfix-mynetworks'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-mynetworks'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.505
-  NAME 'postfix-relayhost'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-relayhost'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.506
-  NAME 'postfix-transport'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-transport'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 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 
-  SINGLE-VALUE )
+ NAME 'postfix-enable-virus-scan'
+ EQUALITY booleanMatch
+ 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 
-  SINGLE-VALUE )
+ NAME 'postfix-allow-unauthenticated'
+ EQUALITY booleanMatch
+ 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'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-virtual'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.510
-  NAME 'postfix-relayport'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'postfix-relayport'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 ##########################
 # cyrus imapd attributes #
 ##########################
 
 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 
-  SINGLE-VALUE )
+ NAME 'cyrus-autocreatequota'
+ EQUALITY integerMatch
+ 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'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'cyrus-admins'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # enable plain imap without ssl 
 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 
-  SINGLE-VALUE )
+ NAME 'cyrus-imap'
+ EQUALITY booleanMatch
+ 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
-  NAME 'cyrus-pop3'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'cyrus-pop3'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # user specific quota on the cyrus imap server
 attributetype ( 1.3.6.1.4.1.19414.2.1.605
-  NAME 'cyrus-userquota'
-  DESC 'Mailbox hard quota limit in MB'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+ NAME 'cyrus-userquota'
+ DESC 'Mailbox hard quota limit in MB'
+ EQUALITY integerMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 # cyrus imapd access control list
 # acls work with users and groups
 attributetype ( 1.3.6.1.4.1.19414.2.1.651
-  NAME 'acl'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+ NAME 'acl'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # enable secure imap 
 attributetype ( 1.3.6.1.4.1.19414.2.1.606
-  NAME 'cyrus-imaps'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'cyrus-imaps'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # enable secure pop3
 attributetype ( 1.3.6.1.4.1.19414.2.1.607
-  NAME 'cyrus-pop3s'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'cyrus-pop3s'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # enable sieve support (required for forward and vacation services)
 attributetype ( 1.3.6.1.4.1.19414.2.1.608
-  NAME 'cyrus-sieve'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'cyrus-sieve'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # installation wide percentage which determines when to send a 
 # warning to the user
 attributetype ( 1.3.6.1.4.1.19414.2.1.609
-  NAME 'cyrus-quotawarn'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+ NAME 'cyrus-quotawarn'
+ EQUALITY integerMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 #############################
 # apache and php attributes #
@@ -459,15 +459,15 @@
 
 # enable plain http (no ssl)
 attributetype ( 1.3.6.1.4.1.19414.2.1.701
-  NAME 'apache-http'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'apache-http'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # Allow freebusy download without authenticating first
 attributetype ( 1.3.6.1.4.1.19414.2.1.702
-  NAME 'apache-allow-unauthenticated-fb'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'apache-allow-unauthenticated-fb'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 ##########################
 # kolabfilter attributes #
@@ -475,41 +475,41 @@
 
 # enable trustable From:
 attributetype ( 1.3.6.1.4.1.19414.2.1.750
-  NAME 'kolabfilter-verify-from-header'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'kolabfilter-verify-from-header'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # should Sender header be allowed instead of From
 # when present?
 attributetype ( 1.3.6.1.4.1.19414.2.1.751
-  NAME 'kolabfilter-allow-sender-header'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'kolabfilter-allow-sender-header'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # Should reject messages with From headers that dont match
 # the envelope? Default is to rewrite the header
 attributetype ( 1.3.6.1.4.1.19414.2.1.752
-  NAME 'kolabfilter-reject-forged-from-header'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'kolabfilter-reject-forged-from-header'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 ######################
 # proftpd attributes #
 ######################
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.901
-  NAME 'proftpd-defaultquota'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+ NAME 'proftpd-defaultquota'
+ EQUALITY integerMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.902
-  NAME 'proftpd-ftp'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+ NAME 'proftpd-ftp'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.903
-  NAME 'proftpd-userPassword'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ NAME 'proftpd-userPassword'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 ########################
 # kolab object classes #
@@ -519,40 +519,40 @@
 # storing global values and user specific default values
 # like kolabFreeBusyFuture and kolabFreeBusyPast
 objectclass ( 1.3.6.1.4.1.19414.2.2.1 
-  NAME 'kolab'
-  DESC 'Kolab server configuration'
-  SUP top STRUCTURAL
-  MUST k
-  MAY ( kolabHost $
-        postfix-mydomain $
-        postfix-relaydomains $
-        postfix-mydestination $
-        postfix-mynetworks $
-        postfix-relayhost $
-        postfix-relayport $
-        postfix-transport $
-        postfix-virtual $
-        postfix-enable-virus-scan $
-        postfix-allow-unauthenticated $
-        cyrus-quotawarn $
-        cyrus-autocreatequota $
-        cyrus-admins $
-        cyrus-imap $
-        cyrus-pop3 $
-        cyrus-imaps $
-        cyrus-pop3s $
-        cyrus-sieve $
-        apache-http $
-        apache-allow-unauthenticated-fb $
-        kolabfilter-verify-from-header $
-        kolabfilter-allow-sender-header $
-        kolabfilter-reject-forged-from-header $
-        proftpd-ftp $
-        proftpd-defaultquota $
-        kolabFreeBusyFuture $
-        kolabFreeBusyPast $
-        uid $
-        userPassword ) )
+ NAME 'kolab'
+ DESC 'Kolab server configuration'
+ SUP top STRUCTURAL
+ MUST k
+ MAY ( kolabHost $
+ postfix-mydomain $
+ postfix-relaydomains $
+ postfix-mydestination $
+ postfix-mynetworks $
+ postfix-relayhost $
+ postfix-relayport $
+ postfix-transport $
+ postfix-virtual $
+ postfix-enable-virus-scan $
+ postfix-allow-unauthenticated $
+ cyrus-quotawarn $
+ cyrus-autocreatequota $
+ cyrus-admins $
+ cyrus-imap $
+ cyrus-pop3 $
+ cyrus-imaps $
+ cyrus-pop3s $
+ cyrus-sieve $
+ apache-http $
+ apache-allow-unauthenticated-fb $
+ kolabfilter-verify-from-header $
+ kolabfilter-allow-sender-header $
+ kolabfilter-reject-forged-from-header $
+ proftpd-ftp $
+ proftpd-defaultquota $
+ kolabFreeBusyFuture $
+ kolabFreeBusyPast $
+ uid $
+ userPassword ) )
 
 # public folders are typically visible to everyone subscribed to 
 # the server without the need for an extra login. Subfolders are
@@ -560,16 +560,16 @@
 # that the term public folder is prefered to shared folder because 
 # normal user mailboxes can also share folders using acls.
 objectclass ( 1.3.6.1.4.1.19414.2.2.9 
-  NAME 'kolabSharedFolder'
-  DESC 'Kolab public shared folder'
-  SUP top STRUCTURAL
-  MUST cn
-  MAY ( acl $
-        alias $
-        cyrus-userquota $
-        kolabHomeServer $
-        kolabFolderType $
-        kolabDeleteflag ) )
+ NAME 'kolabSharedFolder'
+ DESC 'Kolab public shared folder'
+ SUP top STRUCTURAL
+ MUST cn
+ MAY ( acl $
+ alias $
+ cyrus-userquota $
+ kolabHomeServer $
+ kolabFolderType $
+ kolabDeleteflag ) )
 
 # kolabNamedObject is used as a plain node for the LDAP tree. 
 # In contrast to unix filesystem directories LDAP nodes can 
@@ -577,9 +577,9 @@
 # kolabNamedObject in order to put some structure in the 
 # LDAP directory tree.
 objectclass ( 1.3.6.1.4.1.5322.13.1.1 
-  NAME 'kolabNamedObject'
-  SUP top STRUCTURAL
-  MAY (cn $ ou) )
+ NAME 'kolabNamedObject'
+ SUP top STRUCTURAL
+ MAY (cn $ ou) )
 
 # kolab account
 # we use an auxiliary in order to ease integration
@@ -588,51 +588,51 @@
 # attribute in the schema but is mandatory for
 # Kolab 
 objectclass ( 1.3.6.1.4.1.19414.3.2.2
-  NAME 'kolabInetOrgPerson'
-  DESC 'Kolab Internet Organizational Person'
-  SUP top AUXILIARY
-  MAY ( c $
-        alias $
-        kolabHomeServer $
-        kolabHomeMTA $
-        unrestrictedMailSize $
-        kolabDelegate $
-        kolabEncryptedPassword $
-        cyrus-userquota $
-        kolabInvitationPolicy $
-        kolabFreeBusyFuture $
-        calFBURL $
-	kolabVacationBeginDateTime $
-	kolabVacationEndDateTime $
-	kolabVacationResendInterval $
-	kolabVacationAddress $
-	kolabVacationReplyToUCE $
-	kolabVacationReactDomain $
-	kolabForwardAddress $
-	kolabForwardKeepCopy $
-        kolabForwardUCE $
-        kolabDeleteflag $
-        kolabComment ) )
+ NAME 'kolabInetOrgPerson'
+ DESC 'Kolab Internet Organizational Person'
+ SUP top AUXILIARY
+ MAY ( c $
+ alias $
+ kolabHomeServer $
+ kolabHomeMTA $
+ unrestrictedMailSize $
+ kolabDelegate $
+ kolabEncryptedPassword $
+ cyrus-userquota $
+ kolabInvitationPolicy $
+ kolabFreeBusyFuture $
+ calFBURL $
+ kolabVacationBeginDateTime $
+ kolabVacationEndDateTime $
+ kolabVacationResendInterval $
+ kolabVacationAddress $
+ kolabVacationReplyToUCE $
+ kolabVacationReactDomain $
+ kolabForwardAddress $
+ kolabForwardKeepCopy $
+ kolabForwardUCE $
+ kolabDeleteflag $
+ kolabComment ) )
 
 # kolab organization with country support
 objectclass ( 1.3.6.1.4.1.19414.3.2.3 
-  NAME 'kolabOrganization'
-  DESC 'RFC2256: a Kolab organization'
-  SUP organization STRUCTURAL
-  MAY ( c $
-        mail $
-        kolabDeleteflag $
-        alias ) )
+ NAME 'kolabOrganization'
+ DESC 'RFC2256: a Kolab organization'
+ SUP organization STRUCTURAL
+ MAY ( c $
+ mail $
+ kolabDeleteflag $
+ alias ) )
 
 # kolab organizational unit with country support
 objectclass ( 1.3.6.1.4.1.19414.3.2.4 
-  NAME 'kolabOrganizationalUnit'
-  DESC 'a Kolab organizational unit'
-  SUP organizationalUnit STRUCTURAL
-  MAY ( c $
-        mail $
-        kolabDeleteflag $
-        alias ) )
+ NAME 'kolabOrganizationalUnit'
+ DESC 'a Kolab organizational unit'
+ SUP organizationalUnit STRUCTURAL
+ MAY ( c $
+ mail $
+ kolabDeleteflag $
+ alias ) )
 
 # kolab groupOfNames with extra kolabDeleteflag and the required 
 # attribute mail.    
@@ -642,8 +642,8 @@
 # E.g cn at kolabdomain (e.g. employees at mydomain.com). The    
 # mail attribute MUST be globally unique.    
 objectclass ( 1.3.6.1.4.1.19414.3.2.5    
-  NAME 'kolabGroupOfNames'    
-  DESC 'Kolab group of names (DNs) derived from RFC2256'    
-  SUP groupOfNames STRUCTURAL    
-  MAY ( mail $    
-        kolabDeleteflag ) )
+ NAME 'kolabGroupOfNames'    
+ DESC 'Kolab group of names (DNs) derived from RFC2256'    
+ SUP groupOfNames STRUCTURAL    
+ MAY ( mail $    
+ kolabDeleteflag ) )



From cvs at kolab.org  Mon Jan 29 11:45:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 29 Jan 2007 11:45:47 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates main.cf.template.in, 1.12,
	1.13 
Message-ID: <20070129104547.CF2C01005AB@lists.intevation.de>

Author: martin

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

Modified Files:
	main.cf.template.in 
Log Message:
Martin Konold: Patch from Jørgen H. Fjeld for issue#1550


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- main.cf.template.in	26 Sep 2006 18:22:42 -0000	1.12
+++ main.cf.template.in	29 Jan 2007 10:45:45 -0000	1.13
@@ -46,7 +46,7 @@
 @@@endif@@@
 
 # 
-masquerade_domains = $mydomain
+masquerade_domains = @@@postfix-mydestination|join( )@@@
 #       Kolab Server does _not_ want to forward to local machines by default,
 #       so we can add "envelope_recipient" to masquerade_classes:
 masquerade_classes = envelope_sender, envelope_recipient,



From cvs at kolab.org  Thu Feb  1 16:48:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Feb 2007 16:48:30 +0100 (CET)
Subject: wilde: doc/kolab-formats kolabformat.sgml,1.19,1.20 
Message-ID: <20070201154830.CD4241006A5@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolabformat.sgml 
Log Message:
Fixed authorgroup block. (was totally broken and stopped printing lately)
Including some ugly kludge to get email printed in generated documents.


Index: kolabformat.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolabformat.sgml	27 Nov 2006 15:01:18 -0000	1.19
+++ kolabformat.sgml	1 Feb 2007 15:48:28 -0000	1.20
@@ -18,14 +18,30 @@
 <subtitle>2.0rc5</subtitle>
 <!--<subtitle>Draft CVS</subtitle>-->
 <authorgroup>
-<othercredit>
-<othername> Bo Thorsen, bo at sonofthor.dk </othername>
-<othername> David Faure, dfaure at klaralvdalens-datakonsult.se </othername>
-<othername> Joon Radley, joon at radleys.co.za </othername>
-<othername> Martin Konold, martin.konold at erfrakon.de </othername>
-<othername> Stephan Buys, s.buys at codefusion.co.za </othername>
-<othername> Stuart Binge, s.binge at codefusion.co.za </othername>
-</othercredit>
+<author> 
+  <firstname>Bo</firstname> <surname>Thorsen</surname> 
+  <affiliation><address><email>bo at sonofthor.dk</email></address></affiliation>
+</author>
+<author>
+  <firstname>David</firstname> <surname>Faure</surname>
+  <affiliation><address><email>dfaure at klaralvdalens-datakonsult.se</email></address></affiliation>
+</author>
+<author>
+  <firstname>Joon</firstname> <surname>Radley</surname>
+  <affiliation><address><email>joon at radleys.co.za</email></address></affiliation>
+</author>
+<author>
+  <firstname>Martin</firstname> <surname>Konold</surname>
+  <affiliation><address><email>martin.konold at erfrakon.de</email></address></affiliation>
+</author>
+<author>
+  <firstname>Stephan</firstname> <surname>Buys</surname>
+  <affiliation><address><email>s.buys at codefusion.co.za</email></address></affiliation>
+</author>
+<author>
+  <firstname>Stuart</firstname> <surname>Binge</surname>
+  <affiliation><address><email>s.binge at codefusion.co.za</email></address></affiliation>
+</author>
 </authorgroup>
 <pubdate>November 16th, 2006</pubdate>
 <!--<pubdate>CVS $Date$ $Revision$</pubdate>-->



From cvs at kolab.org  Thu Feb  1 21:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Feb 2007 21:34:40 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.27,1.28 
Message-ID: <20070201203440.938371006B7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* www/admin/user/user.php.in (inMaintainerDomain): 

	New function to support checking if a given user lies in the
	domains of the current domain-maintainer. Should fix issue 1559
	(https://intevation.de/roundup/kolab/issue1559)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	18 Jan 2007 13:42:03 -0000	1.27
+++ ChangeLog	1 Feb 2007 20:34:38 -0000	1.28
@@ -1,3 +1,11 @@
+2007-02-01  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* www/admin/user/user.php.in (inMaintainerDomain): 
+
+	New function to support checking if a given user lies in the
+	domains of the current domain-maintainer. Should fix issue 1559
+	(https://intevation.de/roundup/kolab/issue1559)
+	
 2007-01-18  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* php/admin/locale/de/LC_MESSAGES/messages.po: 



From cvs at kolab.org  Thu Feb  1 21:34:40 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  1 Feb 2007 21:34:40 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.14, 1.15 
Message-ID: <20070201203440.908F81006B5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	user.php.in 
Log Message:
	* www/admin/user/user.php.in (inMaintainerDomain): 

	New function to support checking if a given user lies in the
	domains of the current domain-maintainer. Should fix issue 1559
	(https://intevation.de/roundup/kolab/issue1559)


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- user.php.in	10 Jan 2007 16:50:43 -0000	1.14
+++ user.php.in	1 Feb 2007 20:34:38 -0000	1.15
@@ -51,6 +51,40 @@
   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub );
 }
 
+// check if the given dn is maintainable by the current user
+function inMaintainerDomain($dn) {
+
+  global $ldap;
+  global $auth;
+
+  // both groups have full access
+  if ($auth->group() == 'maintainer' || $auth->group() == 'admin') {
+	return true;
+  }
+
+  // user may not maintain anything
+  if ($auth->group() == 'user') {
+	return false;
+  }
+  
+  // we have a domain maintainer. Get his domains
+  $domains = $ldap->domainsForMaintainerDn($auth->dn());
+
+  // retrieve the mail for the current dn
+  $mail = $ldap->mailForDn($dn);
+
+  $ok = false;
+
+  // Check if the mail is within that domain
+  foreach( $domains as $domain ) {
+        if( endsWith( $mail, '@'.$domain ) ) {
+          $ok = true;
+        }
+  }
+
+  return true;
+}
+
 // Check that a uid is unique
 function checkuniquemail( $form, $key, $value ) {
   debug("checkuniquemail( $form, $key, $value )");
@@ -350,7 +384,9 @@
     !($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 (!inMaintainerDomain($dn)) {
+    array_push($errors, _("Error: You don't have the required Permissions") );
+  }
 }
 
 
@@ -767,9 +803,15 @@
    $content = $form->outputForm();
    break;
  case 'kill':
-   if (!$dn) array_push($errors, _("Error: need DN for delete operation"));
-   elseif ($auth->group() != "maintainer" && $auth->group() != "admin") 
-     array_push($errors, _("Error: you need administrative permissions to delete users"));
+   if (!$dn) {
+	 array_push($errors, _("Error: need DN for delete operation"));
+   } elseif ( $auth->group() == 'domain-maintainer' ) {
+	 if (!inMaintainerDomain($dn)) {
+	   array_push($errors, _("Error: You don't have the required Permissions") );
+	 }
+   } elseif ($auth->group() != "maintainer" && $auth->group() != "admin") {     
+	 array_push($errors, _("Error: you need administrative permissions to delete users"));
+   }
 
    // Check for distribution lists with only this user as member
    $ldap->search( $_SESSION['base_dn'], 



From cvs at kolab.org  Fri Feb  2 12:26:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 12:26:26 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin ChangeLog,1.28,1.29 
Message-ID: <20070202112626.DCABF1006CB@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Fixed about/versions pages in web interface.  (issue 1486)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	1 Feb 2007 20:34:38 -0000	1.28
+++ ChangeLog	2 Feb 2007 11:26:24 -0000	1.29
@@ -1,3 +1,8 @@
+2007-02-02  Sascha Wilde  <wilde at intevation.de>
+
+	* php/admin/templates/kolab.tpl, www/admin/kolab/versions.php.in:
+	Corrected version information, fixing last parts of issue 1486.
+
 2007-02-01  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* www/admin/user/user.php.in (inMaintainerDomain): 



From cvs at kolab.org  Fri Feb  2 12:26:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 12:26:26 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	kolab.tpl, 1.4, 1.5 
Message-ID: <20070202112626.DB2991006B7@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab.tpl 
Log Message:
Fixed about/versions pages in web interface.  (issue 1486)


Index: kolab.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kolab.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab.tpl	19 Dec 2006 11:11:36 -0000	1.4
+++ kolab.tpl	2 Feb 2007 11:26:24 -0000	1.5
@@ -13,7 +13,7 @@
 <p>
 {tr msg="Kolab builds upon many other Free Software projects, namely:"}
 <ul>
- <li><a href="http://www.amavis.org/">AMaViS</a> {tr msg="(Mail Scanner)"}</li>
+ <li><a href="http://www.ijs.si/software/amavisd/">amavisd-new</a> {tr msg="(Mail Scanner)"}</li>
  <li><a href="http://www.apache.org/">Apache</a> {tr msg="(HTTP Server)"}</li>
  <li><a href="http://www.clamav.net/">ClamAV</a> {tr msg="(Virus Scanner)"}</li>
  <li><a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus</a> {tr msg="(IMAP Server)"}</li>



From cvs at kolab.org  Fri Feb  2 12:26:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 12:26:26 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.4, 1.5 
Message-ID: <20070202112626.D56261005AB@lists.intevation.de>

Author: wilde

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

Modified Files:
	versions.php.in 
Log Message:
Fixed about/versions pages in web interface.  (issue 1486)


Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- versions.php.in	18 Dec 2006 22:04:26 -0000	1.4
+++ versions.php.in	2 Feb 2007 11:26:24 -0000	1.5
@@ -3,6 +3,7 @@
  (c) 2004 Klarälvdalens Datakonsult AB
  (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
  (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
+ (c) 2007 Intevation GmbH
  This program is Free Software under the GNU General Public License (>=v2).
  Read the file COPYING that comes with this packages for details.
 */
@@ -24,7 +25,7 @@
 
 // Remember to keep this list up to date when patching packages!
 $kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_resource_handlers_rpm@ @kolab_webadmin_rpm@" );
-$kolabpatchedversions = shell_exec("@RPM@ -q @amavisd_rpm@ @webserver_rpm@ @imap_rpm@ @emailserver_rpm@" );
+$kolabpatchedversions = shell_exec("@RPM@ -q -qa|grep 'kolab[0-9]*$'" );
 
 # This is an openpkg test, difficult to see after make.
 # but visible in the vanilla sources.
@@ -58,7 +59,7 @@
   mode: php
   indent-tabs-mode: t
   tab-width: 4
-  buffer-file-coding-system: utf-8
+  coding: utf-8
   End:
 */
  ?>



From cvs at kolab.org  Fri Feb  2 15:39:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 15:39:03 +0100 (CET)
Subject: wilde: server release-notes.txt,1.74,1.75 
Message-ID: <20070202143903.ED4361006AD@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Updated list of fixed issues.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- release-notes.txt	18 Jan 2007 14:06:43 -0000	1.74
+++ release-notes.txt	2 Feb 2007 14:39:01 -0000	1.75
@@ -58,16 +58,20 @@
       domain, see kolab/issue1485. We can't reproduce this problem, please
       tell us if you can.
 
-    - There may be a locking issue which can cause losing meeting requests
-      under high server load, see kolab/issue1335 and kolab/issue1563.
-
 
 Changes since 2.1 beta 4:
 
+    - kolabd-2.0.99-2007????
+
+	kolab/issue1335 (pfbcache.db locking problems)
+	kolab/issue1563 (freebusy.conf template doesn't match freebusy.conf from package)
+
     - kolab-webadmin-2.0.99-2007????
 
 	kolab/issue1479 ("Type" of shared folder can only be modified in 2nd try)
+	kolab/issue1486 ("About Kolab" in Webinterface needs work over)
 	kolab/issue1539 (extension to the opening text, when the manager logs in for the 1st time)
+	kolab/issue1559 (Domain Maintainer cannot delete "his" users)
 
 
 Changes since 2.1 beta 3:



From cvs at kolab.org  Fri Feb  2 15:47:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 15:47:45 +0100 (CET)
Subject: bernhard: doc/architecture client_server.sgml,1.24,1.25 
Message-ID: <20070202144745.CC02B1006A5@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/doc/architecture
In directory doto:/tmp/cvs-serv30629

Modified Files:
	client_server.sgml 
Log Message:
Typo fixed.


Index: client_server.sgml
===================================================================
RCS file: /kolabrepository/doc/architecture/client_server.sgml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- client_server.sgml	23 Nov 2005 17:14:37 -0000	1.24
+++ client_server.sgml	2 Feb 2007 14:47:43 -0000	1.25
@@ -252,7 +252,7 @@
 </para>
 
 <para>
-The incidencesfor annotation are used for calendars and tasks.
+The incidences-for annotation is used for calendars and tasks.
 </para>
 
 <para>



From cvs at kolab.org  Fri Feb  2 15:50:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 15:50:27 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.5, 1.6 
Message-ID: <20070202145027.923621006A5@lists.intevation.de>

Author: wilde

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

Modified Files:
	versions.php.in 
Log Message:
Removed redundant `-q' option from rpm command.


Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- versions.php.in	2 Feb 2007 11:26:24 -0000	1.5
+++ versions.php.in	2 Feb 2007 14:50:25 -0000	1.6
@@ -25,7 +25,7 @@
 
 // Remember to keep this list up to date when patching packages!
 $kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_resource_handlers_rpm@ @kolab_webadmin_rpm@" );
-$kolabpatchedversions = shell_exec("@RPM@ -q -qa|grep 'kolab[0-9]*$'" );
+$kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
 
 # This is an openpkg test, difficult to see after make.
 # but visible in the vanilla sources.



From cvs at kolab.org  Fri Feb  2 15:59:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 15:59:26 +0100 (CET)
Subject: thomas: server release-notes.txt,1.75,1.76 
Message-ID: <20070202145926.DD39D1006A5@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated fixed and known issues in the release notes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- release-notes.txt	2 Feb 2007 14:39:01 -0000	1.75
+++ release-notes.txt	2 Feb 2007 14:59:24 -0000	1.76
@@ -51,20 +51,27 @@
     - If modifying or deleting of address book entries doesn't work,
       restarting openldap can help, see kolab/issue854 for details.
 
-    - Users can't be deleted by the corresponding Domain Maintainer, see
-      kolab/issue1559 for details.
-
     - There is a report that the manager can only see users in the primary
       domain, see kolab/issue1485. We can't reproduce this problem, please
       tell us if you can.
 
+    - Calendar folders for group/resource accounts can't be created for
+      domains which were added after bootstrap, i.e. via the web admin
+      interface. See kolab/issue1313 for details.
+
+    - When deleting domains via the web admin interface, the corresponding
+      LDAP data and IMAP spool stay on the server and have to be deleted
+      manually. See kolab/issue1571 and kolab/issue1576 for details.
+
 
 Changes since 2.1 beta 4:
 
     - kolabd-2.0.99-2007????
 
 	kolab/issue1335 (pfbcache.db locking problems)
+	kolab/issue1550 (Masquerade problem, corrected template)
 	kolab/issue1563 (freebusy.conf template doesn't match freebusy.conf from package)
+	kolab/issue1575 (Openldap enhanced data integrity)
 
     - kolab-webadmin-2.0.99-2007????
 



From cvs at kolab.org  Fri Feb  2 16:16:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 16:16:47 +0100 (CET)
Subject: thomas: server/kolabd/kolabd kolab2.schema,1.21,1.22 
Message-ID: <20070202151647.998CA1005C7@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab2.schema 
Log Message:
Reverting martin's commit from Mon, 29 Jan 2007 01:04:55 +0100 (CET)
(changing spacing in kolab2.schema)

Reasons:
- RFC 2252 doesn't talk about files, just about the protocol on the wire.
- Everyone else uses tabs and not a single space, so this change doesn't
  make the schema file more uniform with others.
- This will cause inconveniences for people merging in their own changes.
  (And there are such changes as mentioned on kolab lists)


Index: kolab2.schema
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab2.schema,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolab2.schema	29 Jan 2007 00:04:52 -0000	1.21
+++ kolab2.schema	2 Feb 2007 15:16:45 -0000	1.22
@@ -1,6 +1,6 @@
 # $Id$
 # (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003-2007  Martin Konold <martin.konold at erfrakon.de>
+# (c) 2003-2006  Martin Konold <martin.konold at erfrakon.de>
 # (c) 2003 Achim Frank <achim.frank at erfrakon.de>
 #
 # Redistribution and use in source and binary forms, with or without 
@@ -46,27 +46,27 @@
 # helper attribute to make the kolab root easily findable in 
 # a big ldap directory
 attributetype ( 1.3.6.1.4.1.19414.2.1.1
- NAME ( 'k' 'kolab' )
- DESC 'Kolab attribute'
- SUP name )
+  NAME ( 'k' 'kolab' )
+  DESC 'Kolab attribute'
+  SUP name )
 
 # kolabDeleteflag used to be a boolean but describes with Kolab 2 
 # the fqdn of the server which is requested to delete this objects
 # in its local store
 attributetype ( 1.3.6.1.4.1.19414.2.1.2
- NAME 'kolabDeleteflag'
- DESC 'Per host deletion status'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'kolabDeleteflag'
+  DESC 'Per host deletion status'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # alias used to provide alternative rfc822 email addresses for kolab users
 attributetype ( 1.3.6.1.4.1.19414.2.1.3
- NAME 'alias'
- DESC 'RFC1274: RFC822 Mailbox'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'alias'
+  DESC 'RFC1274: RFC822 Mailbox'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # kolabEncryptedPassword is an asymmetrically (RSA) encrypted copy of the
 # cleartext password. This is required in order to pass the password from
@@ -76,50 +76,50 @@
 # calendar user dn: cn=calendar,cn=internal,dc=yourcompany,dc=com access to 
 # the respective calendar folder using IMAP ACLs.
 attributetype ( 1.3.6.1.4.1.19419.2.1.4
- NAME 'kolabEncryptedPassword'
- DESC 'base64 encoded public key encrypted Password'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+  NAME 'kolabEncryptedPassword'
+  DESC 'base64 encoded public key encrypted Password'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 # hostname including the domain name like kolab-master.yourcompany.com
 attributetype ( 1.3.6.1.4.1.19414.2.1.5
- NAME ( 'fqhostname' 'fqdnhostname' )
- DESC 'Fully qualified Hostname including full domain component'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME ( 'fqhostname' 'fqdnhostname' )
+  DESC 'Fully qualified Hostname including full domain component'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fqdn of all hosts in a multi-location or cluster setup
 attributetype ( 1.3.6.1.4.1.19414.2.1.6
- NAME 'kolabHost'
- DESC 'Multivalued -- list of hostnames in a Kolab setup'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'kolabHost'
+  DESC 'Multivalued -- list of hostnames in a Kolab setup'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fqdn of the server containg the actual user mailbox
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.1
- NAME 'kolabHomeServer'
- DESC 'server which keeps the users mailbox'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'kolabHomeServer'
+  DESC 'server which keeps the users mailbox'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # flag for allowing unrestriced length of mails
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.2
- NAME 'unrestrictedMailSize'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'unrestrictedMailSize'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # Specifies the email delegates.
 # An email delegate can send email on behalf of the account  
 # which means using the "from" of the account.
 # Delegates are specified by the syntax of rfc822 email addresses.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.3
- NAME 'kolabDelegate'
- DESC 'Kolab user allowed to act as delegates - RFC822 Mailbox/Alias'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'kolabDelegate'
+  DESC 'Kolab user allowed to act as delegates - RFC822 Mailbox/Alias'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # For user, group and resource Kolab accounts
 # Describes how to respond to invitations
@@ -135,40 +135,40 @@
 # address followed by a colon like
 # user at domain.tld: ACT_ALWAYS_ACCEPT
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.4
- NAME ( 'kolabInvitationPolicy' 'kolabResourceAction' )
- DESC 'defines how to respond to invitations'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME ( 'kolabInvitationPolicy' 'kolabResourceAction' )
+  DESC 'defines how to respond to invitations'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # time span from now to the future used for the free busy data
 # measured in days
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.5
- 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 
- SINGLE-VALUE )
+  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 
+  SINGLE-VALUE )
 
 # time span from now to the past used for the free busy data
 # measured in days
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.6
- 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
- SINGLE-VALUE )
+  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
+  SINGLE-VALUE )
 
 # fqdn of the server as the default SMTP MTA
 # not used in Kolab 2 currently as in Kolab 2 the
 # default MTA is equivalent to the kolabHomeServer
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.7
- NAME 'kolabHomeMTA'
- DESC 'fqdn of default MTA'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
- SINGLE-VALUE )
+  NAME 'kolabHomeMTA'
+  DESC 'fqdn of default MTA'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  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 
@@ -181,11 +181,11 @@
 # see also: rfc 2252.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.8
- NAME 'kolabVacationBeginDateTime'
- DESC 'Begin date of vacation'
- EQUALITY generalizedTimeMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
- SINGLE-VALUE )
+  NAME 'kolabVacationBeginDateTime'
+  DESC 'Begin date of vacation'
+  EQUALITY generalizedTimeMatch
+  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
@@ -198,21 +198,21 @@
 # see also: rfc 2252.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.9
- NAME 'kolabVacationEndDateTime'
- DESC 'End date of vacation'
- EQUALITY generalizedTimeMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
- SINGLE-VALUE )
+  NAME 'kolabVacationEndDateTime'
+  DESC 'End date of vacation'
+  EQUALITY generalizedTimeMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+  SINGLE-VALUE )
 
 # Intervall in days after which senders get 
 # another vacation message.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.10
- NAME 'kolabVacationResendInterval'
- DESC 'Vacation notice interval in days'
- EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
- SINGLE-VALUE )
+  NAME 'kolabVacationResendInterval'
+  DESC 'Vacation notice interval in days'
+  EQUALITY integerMatch
+  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
@@ -221,22 +221,22 @@
 # email aliases of the kolabInetOrgPerson.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.11
- NAME 'kolabVacationAddress'
- DESC 'Email address for vacation to response upon'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'kolabVacationAddress'
+  DESC 'Email address for vacation to response upon'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # Enable sending vacation notices in reaction
 # unsolicited commercial email.
 # Default is no.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.12
- NAME 'kolabVacationReplyToUCE'
- DESC 'Enable vacation notices to UCE'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
- SINGLE-VALUE )
+  NAME 'kolabVacationReplyToUCE'
+  DESC 'Enable vacation notices to UCE'
+  EQUALITY booleanMatch
+  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
@@ -244,11 +244,11 @@
 # Default is to handle all domains.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.13
- NAME 'kolabVacationReactDomain'
- DESC 'Multivalued -- Email domain for vacation to response upon'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )  
+  NAME 'kolabVacationReactDomain'
+  DESC 'Multivalued -- Email domain for vacation to response upon'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )  
 
 # Forward all incoming emails except UCE if kolabForwardUCE
 # is not set to this email address.
@@ -256,32 +256,32 @@
 # each kolabInetOrgPerson.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.14
- NAME 'kolabForwardAddress'
- DESC 'Forward email to this address'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'kolabForwardAddress'
+  DESC 'Forward email to this address'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # Keep local copy when forwarding emails to list of
 # kolabForwardAddress. 
 # Default is no.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.15
- NAME 'kolabForwardKeepCopy'
- DESC 'Keep copy when forwarding'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
- SINGLE-VALUE )
+  NAME 'kolabForwardKeepCopy'
+  DESC 'Keep copy when forwarding'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
+  SINGLE-VALUE )
 
 # Enable forwarding of UCE. 
 # Default is yes.
 # Currently this attribute is not used in Kolab.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.16
- NAME 'kolabForwardUCE'
- DESC 'Enable forwarding of mails known as UCE'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 
- SINGLE-VALUE )
+  NAME 'kolabForwardUCE'
+  DESC 'Enable forwarding of mails known as UCE'
+  EQUALITY booleanMatch
+  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
@@ -290,11 +290,11 @@
 # with an ISO 8601 date string e.g 200604301458Z. All times must 
 # be in zulu timezone.
 attributetype ( 1.3.6.1.4.1.19419.1.1.1.17
- NAME 'kolabComment'
- DESC 'multi-value comment'
- EQUALITY caseIgnoreMatch
- SUBSTR caseIgnoreSubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
+  NAME 'kolabComment'
+  DESC 'multi-value comment'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
 # kolabFolderType describes the kind of Kolab folder
 # as defined in the kolab format specification. 
@@ -313,145 +313,145 @@
 # We then use the ANNOTATEMORE IMAP extension to 
 # associate the folder type with a folder.
 attributetype ( 1.3.6.1.4.1.19414.2.1.7
- NAME 'kolabFolderType'
- DESC 'type of a kolab folder'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
- SINGLE-VALUE )
+  NAME 'kolabFolderType'
+  DESC 'type of a kolab folder'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
+  SINGLE-VALUE )
 
 ######################
 # postfix attributes #
 ######################
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.501
- NAME 'postfix-mydomain'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-mydomain'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.502
- NAME 'postfix-relaydomains'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-relaydomains'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.503
- NAME 'postfix-mydestination'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-mydestination'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.504
- NAME 'postfix-mynetworks'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-mynetworks'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.505
- NAME 'postfix-relayhost'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-relayhost'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.506
- NAME 'postfix-transport'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-transport'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 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 
- SINGLE-VALUE )
+  NAME 'postfix-enable-virus-scan'
+  EQUALITY booleanMatch
+  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 
- SINGLE-VALUE )
+  NAME 'postfix-allow-unauthenticated'
+  EQUALITY booleanMatch
+  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'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-virtual'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.510
- NAME 'postfix-relayport'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'postfix-relayport'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 ##########################
 # cyrus imapd attributes #
 ##########################
 
 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 
- SINGLE-VALUE )
+  NAME 'cyrus-autocreatequota'
+  EQUALITY integerMatch
+  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'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'cyrus-admins'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # enable plain imap without ssl 
 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 
- SINGLE-VALUE )
+  NAME 'cyrus-imap'
+  EQUALITY booleanMatch
+  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
- NAME 'cyrus-pop3'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'cyrus-pop3'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # user specific quota on the cyrus imap server
 attributetype ( 1.3.6.1.4.1.19414.2.1.605
- NAME 'cyrus-userquota'
- DESC 'Mailbox hard quota limit in MB'
- EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+  NAME 'cyrus-userquota'
+  DESC 'Mailbox hard quota limit in MB'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 # cyrus imapd access control list
 # acls work with users and groups
 attributetype ( 1.3.6.1.4.1.19414.2.1.651
- NAME 'acl'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+  NAME 'acl'
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # enable secure imap 
 attributetype ( 1.3.6.1.4.1.19414.2.1.606
- NAME 'cyrus-imaps'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'cyrus-imaps'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # enable secure pop3
 attributetype ( 1.3.6.1.4.1.19414.2.1.607
- NAME 'cyrus-pop3s'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'cyrus-pop3s'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # enable sieve support (required for forward and vacation services)
 attributetype ( 1.3.6.1.4.1.19414.2.1.608
- NAME 'cyrus-sieve'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'cyrus-sieve'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # installation wide percentage which determines when to send a 
 # warning to the user
 attributetype ( 1.3.6.1.4.1.19414.2.1.609
- NAME 'cyrus-quotawarn'
- EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+  NAME 'cyrus-quotawarn'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 #############################
 # apache and php attributes #
@@ -459,15 +459,15 @@
 
 # enable plain http (no ssl)
 attributetype ( 1.3.6.1.4.1.19414.2.1.701
- NAME 'apache-http'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'apache-http'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # Allow freebusy download without authenticating first
 attributetype ( 1.3.6.1.4.1.19414.2.1.702
- NAME 'apache-allow-unauthenticated-fb'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'apache-allow-unauthenticated-fb'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 ##########################
 # kolabfilter attributes #
@@ -475,41 +475,41 @@
 
 # enable trustable From:
 attributetype ( 1.3.6.1.4.1.19414.2.1.750
- NAME 'kolabfilter-verify-from-header'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'kolabfilter-verify-from-header'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # should Sender header be allowed instead of From
 # when present?
 attributetype ( 1.3.6.1.4.1.19414.2.1.751
- NAME 'kolabfilter-allow-sender-header'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'kolabfilter-allow-sender-header'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 # Should reject messages with From headers that dont match
 # the envelope? Default is to rewrite the header
 attributetype ( 1.3.6.1.4.1.19414.2.1.752
- NAME 'kolabfilter-reject-forged-from-header'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'kolabfilter-reject-forged-from-header'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 ######################
 # proftpd attributes #
 ######################
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.901
- NAME 'proftpd-defaultquota'
- EQUALITY integerMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+  NAME 'proftpd-defaultquota'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.902
- NAME 'proftpd-ftp'
- EQUALITY booleanMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
+  NAME 'proftpd-ftp'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
 attributetype ( 1.3.6.1.4.1.19414.2.1.903
- NAME 'proftpd-userPassword'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+  NAME 'proftpd-userPassword'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 ########################
 # kolab object classes #
@@ -519,40 +519,40 @@
 # storing global values and user specific default values
 # like kolabFreeBusyFuture and kolabFreeBusyPast
 objectclass ( 1.3.6.1.4.1.19414.2.2.1 
- NAME 'kolab'
- DESC 'Kolab server configuration'
- SUP top STRUCTURAL
- MUST k
- MAY ( kolabHost $
- postfix-mydomain $
- postfix-relaydomains $
- postfix-mydestination $
- postfix-mynetworks $
- postfix-relayhost $
- postfix-relayport $
- postfix-transport $
- postfix-virtual $
- postfix-enable-virus-scan $
- postfix-allow-unauthenticated $
- cyrus-quotawarn $
- cyrus-autocreatequota $
- cyrus-admins $
- cyrus-imap $
- cyrus-pop3 $
- cyrus-imaps $
- cyrus-pop3s $
- cyrus-sieve $
- apache-http $
- apache-allow-unauthenticated-fb $
- kolabfilter-verify-from-header $
- kolabfilter-allow-sender-header $
- kolabfilter-reject-forged-from-header $
- proftpd-ftp $
- proftpd-defaultquota $
- kolabFreeBusyFuture $
- kolabFreeBusyPast $
- uid $
- userPassword ) )
+  NAME 'kolab'
+  DESC 'Kolab server configuration'
+  SUP top STRUCTURAL
+  MUST k
+  MAY ( kolabHost $
+        postfix-mydomain $
+        postfix-relaydomains $
+        postfix-mydestination $
+        postfix-mynetworks $
+        postfix-relayhost $
+        postfix-relayport $
+        postfix-transport $
+        postfix-virtual $
+        postfix-enable-virus-scan $
+        postfix-allow-unauthenticated $
+        cyrus-quotawarn $
+        cyrus-autocreatequota $
+        cyrus-admins $
+        cyrus-imap $
+        cyrus-pop3 $
+        cyrus-imaps $
+        cyrus-pop3s $
+        cyrus-sieve $
+        apache-http $
+        apache-allow-unauthenticated-fb $
+        kolabfilter-verify-from-header $
+        kolabfilter-allow-sender-header $
+        kolabfilter-reject-forged-from-header $
+        proftpd-ftp $
+        proftpd-defaultquota $
+        kolabFreeBusyFuture $
+        kolabFreeBusyPast $
+        uid $
+        userPassword ) )
 
 # public folders are typically visible to everyone subscribed to 
 # the server without the need for an extra login. Subfolders are
@@ -560,16 +560,16 @@
 # that the term public folder is prefered to shared folder because 
 # normal user mailboxes can also share folders using acls.
 objectclass ( 1.3.6.1.4.1.19414.2.2.9 
- NAME 'kolabSharedFolder'
- DESC 'Kolab public shared folder'
- SUP top STRUCTURAL
- MUST cn
- MAY ( acl $
- alias $
- cyrus-userquota $
- kolabHomeServer $
- kolabFolderType $
- kolabDeleteflag ) )
+  NAME 'kolabSharedFolder'
+  DESC 'Kolab public shared folder'
+  SUP top STRUCTURAL
+  MUST cn
+  MAY ( acl $
+        alias $
+        cyrus-userquota $
+        kolabHomeServer $
+        kolabFolderType $
+        kolabDeleteflag ) )
 
 # kolabNamedObject is used as a plain node for the LDAP tree. 
 # In contrast to unix filesystem directories LDAP nodes can 
@@ -577,9 +577,9 @@
 # kolabNamedObject in order to put some structure in the 
 # LDAP directory tree.
 objectclass ( 1.3.6.1.4.1.5322.13.1.1 
- NAME 'kolabNamedObject'
- SUP top STRUCTURAL
- MAY (cn $ ou) )
+  NAME 'kolabNamedObject'
+  SUP top STRUCTURAL
+  MAY (cn $ ou) )
 
 # kolab account
 # we use an auxiliary in order to ease integration
@@ -588,51 +588,51 @@
 # attribute in the schema but is mandatory for
 # Kolab 
 objectclass ( 1.3.6.1.4.1.19414.3.2.2
- NAME 'kolabInetOrgPerson'
- DESC 'Kolab Internet Organizational Person'
- SUP top AUXILIARY
- MAY ( c $
- alias $
- kolabHomeServer $
- kolabHomeMTA $
- unrestrictedMailSize $
- kolabDelegate $
- kolabEncryptedPassword $
- cyrus-userquota $
- kolabInvitationPolicy $
- kolabFreeBusyFuture $
- calFBURL $
- kolabVacationBeginDateTime $
- kolabVacationEndDateTime $
- kolabVacationResendInterval $
- kolabVacationAddress $
- kolabVacationReplyToUCE $
- kolabVacationReactDomain $
- kolabForwardAddress $
- kolabForwardKeepCopy $
- kolabForwardUCE $
- kolabDeleteflag $
- kolabComment ) )
+  NAME 'kolabInetOrgPerson'
+  DESC 'Kolab Internet Organizational Person'
+  SUP top AUXILIARY
+  MAY ( c $
+        alias $
+        kolabHomeServer $
+        kolabHomeMTA $
+        unrestrictedMailSize $
+        kolabDelegate $
+        kolabEncryptedPassword $
+        cyrus-userquota $
+        kolabInvitationPolicy $
+        kolabFreeBusyFuture $
+        calFBURL $
+	kolabVacationBeginDateTime $
+	kolabVacationEndDateTime $
+	kolabVacationResendInterval $
+	kolabVacationAddress $
+	kolabVacationReplyToUCE $
+	kolabVacationReactDomain $
+	kolabForwardAddress $
+	kolabForwardKeepCopy $
+        kolabForwardUCE $
+        kolabDeleteflag $
+        kolabComment ) )
 
 # kolab organization with country support
 objectclass ( 1.3.6.1.4.1.19414.3.2.3 
- NAME 'kolabOrganization'
- DESC 'RFC2256: a Kolab organization'
- SUP organization STRUCTURAL
- MAY ( c $
- mail $
- kolabDeleteflag $
- alias ) )
+  NAME 'kolabOrganization'
+  DESC 'RFC2256: a Kolab organization'
+  SUP organization STRUCTURAL
+  MAY ( c $
+        mail $
+        kolabDeleteflag $
+        alias ) )
 
 # kolab organizational unit with country support
 objectclass ( 1.3.6.1.4.1.19414.3.2.4 
- NAME 'kolabOrganizationalUnit'
- DESC 'a Kolab organizational unit'
- SUP organizationalUnit STRUCTURAL
- MAY ( c $
- mail $
- kolabDeleteflag $
- alias ) )
+  NAME 'kolabOrganizationalUnit'
+  DESC 'a Kolab organizational unit'
+  SUP organizationalUnit STRUCTURAL
+  MAY ( c $
+        mail $
+        kolabDeleteflag $
+        alias ) )
 
 # kolab groupOfNames with extra kolabDeleteflag and the required 
 # attribute mail.    
@@ -642,8 +642,8 @@
 # E.g cn at kolabdomain (e.g. employees at mydomain.com). The    
 # mail attribute MUST be globally unique.    
 objectclass ( 1.3.6.1.4.1.19414.3.2.5    
- NAME 'kolabGroupOfNames'    
- DESC 'Kolab group of names (DNs) derived from RFC2256'    
- SUP groupOfNames STRUCTURAL    
- MAY ( mail $    
- kolabDeleteflag ) )
+  NAME 'kolabGroupOfNames'    
+  DESC 'Kolab group of names (DNs) derived from RFC2256'    
+  SUP groupOfNames STRUCTURAL    
+  MAY ( mail $    
+        kolabDeleteflag ) )



From cvs at kolab.org  Fri Feb  2 17:12:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:12:19 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates httpd.conf.template.in, 1.6,
	1.7 
Message-ID: <20070202161219.9C5AA1006B5@lists.intevation.de>

Author: wilde

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Fixed restrictions on /fbview.  Fixes issue 1507.


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- httpd.conf.template.in	8 Jan 2007 01:02:39 -0000	1.6
+++ httpd.conf.template.in	2 Feb 2007 16:12:17 -0000	1.7
@@ -135,19 +135,15 @@
 AccessFileName .htaccess
 
 <Location @webserver_web_prefix@/>
-  ErrorDocument 403 https://@@@fqdnhostname@@@/@webserver_web_prefix@/admin/
+  ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/admin/
 </Location>
-<Location @webserver_web_prefix@/fbview/*.php>
+<Location "@webserver_web_prefix@/fbview">
     Deny from all
-    ErrorDocument 403 https://@@@fqdnhostname@@@/@webserver_web_prefix@/fbview/
+    ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/
 </Location>
-<Location @webserver_web_prefix@/fbview/index.php>
+<Location ~ "@webserver_web_prefix@/fbview/(index.php|login.php)?$">
     Order allow,deny
     Allow from all
-</Location>
-<Location @webserver_web_prefix@/fbview/login.php>
-    Order allow,deny
-	Allow from all
 </Location>
 
 <Files ~ "^\.ht">



From cvs at kolab.org  Fri Feb  2 17:12:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:12:19 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin ChangeLog,1.29,1.30 
Message-ID: <20070202161219.A62B31006B7@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Fixed restrictions on /fbview.  Fixes issue 1507.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	2 Feb 2007 11:26:24 -0000	1.29
+++ ChangeLog	2 Feb 2007 16:12:17 -0000	1.30
@@ -1,5 +1,10 @@
 2007-02-02  Sascha Wilde  <wilde at intevation.de>
 
+	* php/admin/templates/kolab.tpl: Restrict access to /fbview* to
+	save us from attacks against any of the various horde files.
+	Fixes issue 1507.  And fixed minor bug in the usage of
+	@webserver_web_prefix at .
+
 	* php/admin/templates/kolab.tpl, www/admin/kolab/versions.php.in:
 	Corrected version information, fixing last parts of issue 1486.
 



From cvs at kolab.org  Fri Feb  2 17:18:16 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:18:16 +0100 (CET)
Subject: wilde: server release-notes.txt,1.76,1.77 
Message-ID: <20070202161816.52F5A1006B5@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Updated list of fixed issues.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- release-notes.txt	2 Feb 2007 14:59:24 -0000	1.76
+++ release-notes.txt	2 Feb 2007 16:18:14 -0000	1.77
@@ -69,6 +69,7 @@
     - kolabd-2.0.99-2007????
 
 	kolab/issue1335 (pfbcache.db locking problems)
+	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
 	kolab/issue1550 (Masquerade problem, corrected template)
 	kolab/issue1563 (freebusy.conf template doesn't match freebusy.conf from package)
 	kolab/issue1575 (Openldap enhanced data integrity)



From cvs at kolab.org  Fri Feb  2 17:21:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:21:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.5, 1.6 
Message-ID: <20070202162134.21C061005C7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
In directory doto:/tmp/cvs-serv811/es/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- messages.po	21 Dec 2006 11:03:53 -0000	1.5
+++ messages.po	2 Feb 2007 16:21:32 -0000	1.6
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-14 11:07+0200\n"
+"POT-Creation-Date: 2007-02-02 17:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,75 +17,92 @@
 "Content-Transfer-Encoding: 8bit\n"
 
[...2505 lines suppressed...]
-msgid "Error searching for DN for Mail=%s"
-msgstr ""
-
-#: ../include/ldap.class.php:260
-#, php-format
-msgid "Error searching for DN for alias=%s: %s"
-msgstr ""
-
-#: ../include/ldap.class.php:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
+#: ../include/passwd.php:33
+msgid "Password is empty"
 msgstr ""
 
-#: ../include/ldap.class.php:336
-msgid "LDAP Error: Can't read maintainers group: "
+#: ../include/passwd.php:36 ../include/passwd.php:41
+msgid "Passwords dont match"
 msgstr ""



From cvs at kolab.org  Fri Feb  2 17:21:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:21:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.11, 1.12 
Message-ID: <20070202162134.2CEC11005CC@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
In directory doto:/tmp/cvs-serv811/fr/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- messages.po	21 Dec 2006 11:03:53 -0000	1.11
+++ messages.po	2 Feb 2007 16:21:32 -0000	1.12
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-17 12:50+0200\n"
+"POT-Creation-Date: 2007-02-02 17:12+0100\n"
 "PO-Revision-Date: 2006-10-17 13:36+0100\n"
 "Last-Translator: Jean-Michel LACROIX <jm-lacroix at savigny.org>\n"
 "Language-Team:  <fr at li.org>\n"
@@ -21,12 +21,8 @@
 msgid "The address with DN"
 msgstr "L'adresse de messagerie avec le DN"
[...1813 lines suppressed...]
 #~ msgid "Server error, no ldap object!"
 #~ msgstr "Erreur serveur, pas d'objet ldap!"
+
 #~ msgid "Could not bind to LDAP server: "
 #~ msgstr "Impossible de se connecter au serveur LDAP: "
+
 #~ msgid "Could not bind to LDAP server"
 #~ msgstr "Impossible de se connecter au serveur LDAP"
+
 #~ msgid "Wrong username or password"
 #~ msgstr "Mauvais utilisateur ou mot de passe"
+
 #~ msgid "Please log in as a valid user"
 #~ msgstr "Veuillez vous connecter un nom d'utilisateur valide"
+
 #~ msgid "Enable MX lookup for relayhost (if in doubt, leave it off)"
 #~ msgstr ""
 #~ "Active la vérification du MX pour le serveur relais (si vous hésitez, "
 #~ "laisser le désactivé)"
-



From cvs at kolab.org  Fri Feb  2 17:21:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:21:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.8, 1.9 
Message-ID: <20070202162134.445321006B5@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
In directory doto:/tmp/cvs-serv811/it/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- messages.po	21 Dec 2006 11:03:52 -0000	1.8
+++ messages.po	2 Feb 2007 16:21:32 -0000	1.9
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-14 11:07+0200\n"
+"POT-Creation-Date: 2007-02-02 17:12+0100\n"
 "PO-Revision-Date: 2005-10-14 23:43+0100\n"
 "Last-Translator: Yvette Agostini <yvette at yvetteagostini.it>\n"
 "Language-Team:  <fr at li.org>\n"
@@ -16,81 +16,85 @@
 "X-Generator: KBabel 1.9.1\n"
 
[...3265 lines suppressed...]
+#~ msgstr "Non è possibile il collegamento con il server LDAP:"
 
-#: ../include/ldap.class.php:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Errore nella ricerca del DN per la mail o l'alias: "
+#~ msgid "Could not bind to LDAP server"
+#~ msgstr "Il collegamento con il server LDAP non è possibile"
 
-#: ../include/ldap.class.php:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "Errore LDAP: è impossibile leggere il gruppo dei maintainer:"
+#~ msgid "Wrong username or password"
+#~ msgstr "Nome utente o password errati"
+
+#~ msgid "Please log in as a valid user"
+#~ msgstr "Effettuare la login con un utente valido"
 
 #~ msgid "Enable MX lookup for relayhost (if in doubt, leave it off)"
 #~ msgstr ""



From cvs at kolab.org  Fri Feb  2 17:21:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:21:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.19, 1.20 
Message-ID: <20070202162134.47DAE1005CC@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv811/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- messages.po	5 Jan 2007 19:36:39 -0000	1.19
+++ messages.po	2 Feb 2007 16:21:32 -0000	1.20
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-14 11:07+0200\n"
+"POT-Creation-Date: 2007-02-02 17:12+0100\n"
 "PO-Revision-Date: 2005-12-11 20:40+0100\n"
 "Last-Translator: Richard Bos <richard at radoeka.nl>\n"
 "Language-Team:  <nl at li.org>\n"
@@ -18,82 +18,85 @@
 "X-Generator: KBabel 1.11\n"
 
[...3271 lines suppressed...]
+#~ msgstr "Serverfout, geen LDAP object"
 
-#: ../include/ldap.class.php:273
-#, php-format
-msgid "Error searching for DN for mail or alias %s: %s"
-msgstr "Fout kan DN voor mail or alias %s: %s niet vinden"
+#~ msgid "Could not bind to LDAP server: "
+#~ msgstr "Kon geen verbinding maken met LDAP server: "
 
-#: ../include/ldap.class.php:336
-msgid "LDAP Error: Can't read maintainers group: "
-msgstr "LDAP fout: Can't read maintainers group"
+#~ msgid "Could not bind to LDAP server"
+#~ msgstr "Kon geen verbinding maken met LDAP server"
 
+#~ msgid "Wrong username or password"
+#~ msgstr "Verkeerde gebruikersnaam of wachtwoord"
+
+#~ msgid "Please log in as a valid user"
+#~ msgstr "Gelieve aan te melden als een geldige gebruiker"



From cvs at kolab.org  Fri Feb  2 17:21:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:21:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.19, 1.20 
Message-ID: <20070202162134.36AB01005C7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv811/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Ran kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- messages.po	18 Jan 2007 13:42:03 -0000	1.19
+++ messages.po	2 Feb 2007 16:21:31 -0000	1.20
@@ -9,9 +9,10 @@
 msgstr ""
 "Project-Id-Version: messages-2.1-new_de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-14 11:07+0200\n"
+"POT-Creation-Date: 2007-02-02 17:12+0100\n"
 "PO-Revision-Date: 2005-10-17 09:23+0200\n"
-"Last-Translator: Matthias Kalle Dalheimer <kalle at klaralvdalens-datakonsult.se>\n"
+"Last-Translator: Matthias Kalle Dalheimer <kalle at klaralvdalens-datakonsult."
+"se>\n"
 "Language-Team: deutsch <kde-i18n-de at kde.org>\n"
 "MIME-Version: 1.0\n"
[...3316 lines suppressed...]
 
-msgid "Enable MX lookup for relayhost (if in doubt, leave it off)"
-msgstr ""
-"MX-Suche für Relayhost einschalten (wenn Sie sich nicht sicher sind, "
-"verwenden Sie diese Option nicht)"
+#~ msgid "Wrong username or password"
+#~ msgstr "Falscher Benutzername oder falsches Passwort"
 
-msgid "React to spam"
-msgstr "Auf Spam reagieren"
+#~ msgid "Please log in as a valid user"
+#~ msgstr "Bitte melden Sie sich als ein gültiger Benutzer an"
+
+#~ msgid "Enable MX lookup for relayhost (if in doubt, leave it off)"
+#~ msgstr ""
+#~ "MX-Suche für Relayhost einschalten (wenn Sie sich nicht sicher sind, "
+#~ "verwenden Sie diese Option nicht)"
 
+#~ msgid "React to spam"
+#~ msgstr "Auf Spam reagieren"



From cvs at kolab.org  Fri Feb  2 17:43:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 17:43:52 +0100 (CET)
Subject: wilde: server obmtool.conf,1.237,1.238 
Message-ID: <20070202164352.461AF1005CC@lists.intevation.de>

Author: wilde

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

Modified Files:
	obmtool.conf 
Log Message:
Updated main version to 2.1rc1 and the related package versions.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- obmtool.conf	18 Jan 2007 14:06:43 -0000	1.237
+++ obmtool.conf	2 Feb 2007 16:43:50 -0000	1.238
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1cvs";
+    kolab_version="2.1rc1";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -149,8 +149,8 @@
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20070117
-    @install ${altloc}kolabd-2.0.99-20070117 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20070117 --define kolab_version=$kolab_version
+    @install ${altloc}kolabd-2.0.99-20070202 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20070202 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-2.0.99-20070117 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version



From cvs at kolab.org  Fri Feb  2 18:13:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:13:30 +0100 (CET)
Subject: wilde: server release-notes.txt,1.77,1.78 
Message-ID: <20070202171330.585311005C7@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Updated for rc 1.  (Yes, we are finally aiming for the first RC.  Hurray!)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- release-notes.txt	2 Feb 2007 16:18:14 -0000	1.77
+++ release-notes.txt	2 Feb 2007 17:13:28 -0000	1.78
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 2007????, Kolab Server 2.1 cvs)
+(Version 20070202, Kolab Server 2.1 rc 1)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
@@ -66,7 +66,7 @@
 
 Changes since 2.1 beta 4:
 
-    - kolabd-2.0.99-2007????
+    - kolabd-2.0.99-20070202
 
 	kolab/issue1335 (pfbcache.db locking problems)
 	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
@@ -74,7 +74,7 @@
 	kolab/issue1563 (freebusy.conf template doesn't match freebusy.conf from package)
 	kolab/issue1575 (Openldap enhanced data integrity)
 
-    - kolab-webadmin-2.0.99-2007????
+    - kolab-webadmin-2.0.99-20070202
 
 	kolab/issue1479 ("Type" of shared folder can only be modified in 2nd try)
 	kolab/issue1486 ("About Kolab" in Webinterface needs work over)



From cvs at kolab.org  Fri Feb  2 18:19:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:19:00 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale
	extract_messages, 1.4, 1.5 
Message-ID: <20070202171900.EE3FE1005C7@lists.intevation.de>

Author: thomas

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

Modified Files:
	extract_messages 
Log Message:
Fixed extract_messages for taking *.php.in and *.tpl.in files into account.


Index: extract_messages
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- extract_messages	15 Jun 2005 20:48:21 -0000	1.4
+++ extract_messages	2 Feb 2007 17:18:58 -0000	1.5
@@ -45,7 +45,7 @@
 
 print OUTFILE "<?php\n";
 
- at tplFiles = `find $templatesDir -name "*.tpl" 2> /dev/null`;
+ at tplFiles = `find $templatesDir -name "*.tpl" -o -name "*.tpl.in" 2> /dev/null`;
 
 foreach $tpl (@tplFiles)
 {
@@ -75,9 +75,9 @@
 #
 # Get all the php files recursively in www/admin and in the includes
 #
- at phpFiles = `find $phpDir -name "*.php" 2> /dev/null`;
+ at phpFiles = `find $phpDir -name "*.php" -o -name "*.php.in" 2> /dev/null`;
 foreach (@phpFiles) { chomp; }
- at includeFiles = `find $includeDir -name "*.php" 2> /dev/null`;
+ at includeFiles = `find $includeDir -name "*.php" -o -name "*.php.in" 2> /dev/null`;
 foreach (@includeFiles) { chomp; }
 #print join(" ", @phpFiles);
 #print join(" ", @includeFiles);



From cvs at kolab.org  Fri Feb  2 18:22:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:22:12 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.20, 1.21 
Message-ID: <20070202172212.A8F291006AF@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv2289/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Rerun fixed kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- messages.po	2 Feb 2007 16:21:31 -0000	1.20
+++ messages.po	2 Feb 2007 17:22:10 -0000	1.21
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: messages-2.1-new_de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 17:12+0100\n"
+"POT-Creation-Date: 2007-02-02 18:19+0100\n"
 "PO-Revision-Date: 2005-10-17 09:23+0200\n"
 "Last-Translator: Matthias Kalle Dalheimer <kalle at klaralvdalens-datakonsult."
 "se>\n"
@@ -26,7 +26,7 @@
 msgstr "Die Adresse mit DN"
 
[...2630 lines suppressed...]
+msgstr "Passwörter stimmen nicht überein"
+
+#~ msgid "Kolab Hosts"
+#~ msgstr "Kolab-Hosts"
+
+#~ msgid "One Email address per line"
+#~ msgstr "Eine E-Mail-Adresse per Zeile"
+
+#~ msgid ""
+#~ "Could not read resource encryption public key file://%s/etc/kolab/res_pub."
+#~ "pem: "
+#~ msgstr ""
+#~ "Konnte die Datei mit dem öffentlichen Verschlüsselungsschlüssel file://%s/"
+#~ "etc/kolab/res_pub.pem nicht lesen: "
+
+#~ msgid "Error: Multiple results returned for DN %s"
+#~ msgstr "Fehler: Mehrfache Ergebnisse wurden für DN %s zurückgegeben"
 
 #~ msgid "Please log in as a valid user"
 #~ msgstr "Bitte melden Sie sich als ein gültiger Benutzer an"



From cvs at kolab.org  Fri Feb  2 18:22:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:22:12 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.12, 1.13 
Message-ID: <20070202172212.B2E4B1005C7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
In directory doto:/tmp/cvs-serv2289/fr/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Rerun fixed kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- messages.po	2 Feb 2007 16:21:32 -0000	1.12
+++ messages.po	2 Feb 2007 17:22:10 -0000	1.13
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 17:12+0100\n"
+"POT-Creation-Date: 2007-02-02 18:19+0100\n"
 "PO-Revision-Date: 2006-10-17 13:36+0100\n"
 "Last-Translator: Jean-Michel LACROIX <jm-lacroix at savigny.org>\n"
 "Language-Team:  <fr at li.org>\n"
@@ -22,7 +22,7 @@
 msgstr "L'adresse de messagerie avec le DN"
 
[...2616 lines suppressed...]
+msgstr "<b>Version</b>"
 
-#~ msgid "Wrong username or password"
-#~ msgstr "Mauvais utilisateur ou mot de passe"
+#: ../include/passwd.php:33
+msgid "Password is empty"
+msgstr "Le mot de passe est vide"
+
+#: ../include/passwd.php:36 ../include/passwd.php:41
+msgid "Passwords dont match"
+msgstr "Les mots de passe ne correspondent pas"
+
+#~ msgid "Kolab Hosts"
+#~ msgstr "Serveurs Kolab"
+
+#~ msgid "One Email address per line"
+#~ msgstr "Une adresse par ligne"
 
 #~ msgid "Please log in as a valid user"
 #~ msgstr "Veuillez vous connecter un nom d'utilisateur valide"



From cvs at kolab.org  Fri Feb  2 18:22:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:22:12 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.20, 1.21 
Message-ID: <20070202172212.C09831006AF@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv2289/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Rerun fixed kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- messages.po	2 Feb 2007 16:21:32 -0000	1.20
+++ messages.po	2 Feb 2007 17:22:10 -0000	1.21
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 17:12+0100\n"
+"POT-Creation-Date: 2007-02-02 18:19+0100\n"
 "PO-Revision-Date: 2005-12-11 20:40+0100\n"
 "Last-Translator: Richard Bos <richard at radoeka.nl>\n"
 "Language-Team:  <nl at li.org>\n"
@@ -22,7 +22,7 @@
 msgstr "Het adres met DN"
 
[...2591 lines suppressed...]
+#: ../include/passwd.php:36 ../include/passwd.php:41
+msgid "Passwords dont match"
+msgstr "Wachtwoorden stemmen niet overeen"
+
+#~ msgid "Kolab Hosts"
+#~ msgstr "Kolab Hosts"
+
+#~ msgid "One Email address per line"
+#~ msgstr "Eén E-mail adres per lijn"
+
+#~ msgid ""
+#~ "Could not read resource encryption public key file://%s/etc/kolab/res_pub."
+#~ "pem: "
+#~ msgstr "Kon de publieke sleutel file://%s/etc/kolab/res_pub.pem niet lezen"
+
+#~ msgid "Error: Multiple results returned for DN %s"
+#~ msgstr "Fout: er zijn meerdere resultaten voor DN %s"
 
 #~ msgid "Please log in as a valid user"
 #~ msgstr "Gelieve aan te melden als een geldige gebruiker"



From cvs at kolab.org  Fri Feb  2 18:22:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:22:12 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.9, 1.10 
Message-ID: <20070202172212.C1D8F1006B5@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
In directory doto:/tmp/cvs-serv2289/it/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Rerun fixed kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- messages.po	2 Feb 2007 16:21:32 -0000	1.9
+++ messages.po	2 Feb 2007 17:22:10 -0000	1.10
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 17:12+0100\n"
+"POT-Creation-Date: 2007-02-02 18:19+0100\n"
 "PO-Revision-Date: 2005-10-14 23:43+0100\n"
 "Last-Translator: Yvette Agostini <yvette at yvetteagostini.it>\n"
 "Language-Team:  <fr at li.org>\n"
@@ -20,7 +20,7 @@
 msgstr "L'indirizzo con il DN"
 
[...2602 lines suppressed...]
+msgid "Password is empty"
+msgstr "La password è vuota"
+
+#: ../include/passwd.php:36 ../include/passwd.php:41
+msgid "Passwords dont match"
+msgstr "Le password non corrispondono"
+
+#~ msgid "Kolab Hosts"
+#~ msgstr "Server Kolab"
+
+#~ msgid "One Email address per line"
+#~ msgstr "Un indirizzo email per linea"
+
+#~ msgid ""
+#~ "Could not read resource encryption public key file://%s/etc/kolab/res_pub."
+#~ "pem: "
+#~ msgstr "Non è possibile leggere il file con la chiave pubblica"
 
 #~ msgid "Please log in as a valid user"
 #~ msgstr "Effettuare la login con un utente valido"



From cvs at kolab.org  Fri Feb  2 18:22:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:22:12 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.6, 1.7 
Message-ID: <20070202172212.9EF501005C7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
In directory doto:/tmp/cvs-serv2289/es/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Rerun fixed kolab-webadmin/kolab-webadmin/php/admin/locale/extract_messages


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- messages.po	2 Feb 2007 16:21:32 -0000	1.6
+++ messages.po	2 Feb 2007 17:22:10 -0000	1.7
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 17:12+0100\n"
+"POT-Creation-Date: 2007-02-02 18:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -21,7 +21,7 @@
 msgstr ""
 
[...1761 lines suppressed...]
 msgid "Manage Domain Maintainers"
 msgstr ""
 
-#: ../include/menu.php:80 ../include/menu.php:97
-msgid "Create New Domain Maintainer"
-msgstr ""
-
 #: ../include/menu.php:82 ../include/menu.php:90
 msgid "Maintainers"
 msgstr ""
 
 #: ../include/menu.php:84
 msgid "Manage Maintainers"
-msgstr ""
-
-#: ../include/menu.php:86
-msgid "Create New Maintainer"
 msgstr ""
 
 #: ../include/menu.php:92



From cvs at kolab.org  Fri Feb  2 18:41:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 18:41:02 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.21, 1.22 
Message-ID: <20070202174102.DA46E1005C7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv2667/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Updated German translation


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- messages.po	2 Feb 2007 17:22:10 -0000	1.21
+++ messages.po	2 Feb 2007 17:41:00 -0000	1.22
@@ -4,6 +4,7 @@
 # This file is distributed under the same license as Kolab-Webadmin.
 # Copyright (C)
 # Matthias Kalle Dalheimer <kalle at klaralvdalens-datakonsult.se>, 2005.
+# Thomas Arendsen Hein <thomas at intevation.de>, 2007.
 #
 msgid ""
 msgstr ""
@@ -11,14 +12,11 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-02-02 18:19+0100\n"
 "PO-Revision-Date: 2005-10-17 09:23+0200\n"
-"Last-Translator: Matthias Kalle Dalheimer <kalle at klaralvdalens-datakonsult."
-"se>\n"
+"Last-Translator: Thomas Arendsen Hein <thomas at intevation.de>\n"
 "Language-Team: deutsch <kde-i18n-de at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"se>\n"
-"se>\n"
 "X-Generator: KBabel 1.10.1\n"
 
 #: tpl_messages.php:2
@@ -346,17 +344,14 @@
 msgstr "Liste gelöscht, warte auf Aufräumaktion..."
 
 #: tpl_messages.php:75
-#, fuzzy
 msgid "The distribution list with DN"
-msgstr "Der Administrator mit DN"
+msgstr "Die Verteilerliste mit DN"
 
 #: tpl_messages.php:77
-#, fuzzy
 msgid "Back to list of distribution lists"
-msgstr "Zurück zur Liste der Administratoren"
+msgstr "Zurück zur Liste der Verteilerlisten"
 
 #: tpl_messages.php:84
-#, fuzzy
 msgid ""
 "Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
 "\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
@@ -489,7 +484,6 @@
 "willkommen heißen."
 
 #: tpl_messages.php:100
-#, fuzzy
 msgid ""
 "<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
 "growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
@@ -530,7 +524,7 @@
 
 #: tpl_messages.php:106
 msgid "(Virus Scanner)"
-msgstr ""
+msgstr "(Virenscanner)"
 
 #: tpl_messages.php:107
 msgid "(IMAP Server)"
@@ -549,9 +543,8 @@
 msgstr "(FTP-Server)"
 
 #: tpl_messages.php:111
-#, fuzzy
 msgid "(SPAM Filter)"
-msgstr "Filter"
+msgstr "(Spamfilter)"
 
 #: tpl_messages.php:112
 msgid ""
@@ -692,7 +685,7 @@
 
 #: tpl_messages.php:124
 msgid "Enter UID and password to login"
-msgstr "Geben Sie Ihre UID und Ihr Paßwort ein, um sich anzumelden"
+msgstr "Geben Sie Ihre UID und Ihr Passwort ein, um sich anzumelden"
 
 #: tpl_messages.php:125
 msgid "Username:"
@@ -764,7 +757,6 @@
 "anderen Verteilerliste"
 
 #: tpl_messages.php:146
-#, fuzzy
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
@@ -801,13 +793,12 @@
 "(dies ist von Haus aus eingestellt und kann nicht deaktiviert werden)."
 
 #: tpl_messages.php:151
-#, fuzzy
 msgid ""
 "Further details with regards to security considerations might be available "
 "from the <a href=\"http://www.kolab.org\">Kolab Project</a>."
 msgstr ""
-"Weitere Details zu Sicherheitsfragen finden Sie im Internet beim <a href="
-"\"http://www.kolab.org\">Kolab</a>-Webserver."
+"Weitere Details zu Sicherheitsfragen können Sie beim "
+"<a href=\"http://www.kolab.org\">Kolab Projekt</a> finden."
 
 #: tpl_messages.php:152 ../include/menu.php:106
 msgid "Services"
@@ -883,7 +874,6 @@
 msgstr "Nachrichten aus dem Internet akzeptieren"
 
 #: tpl_messages.php:173
-#, fuzzy
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
 "enabled if you want to use the Kolab Server to receive mail from other "
@@ -892,7 +882,9 @@
 msgstr ""
 "Nachrichten aus anderen Domänen über nicht-authentifiziertes SMTP "
 "akzeptieren. Dies muß eingeschaltet werden, wenn der Kolab-Server "
-"Nachrichten aus anderen Internet-Domänen empfangen können soll."
+"Nachrichten aus anderen Internet-Domänen empfangen können soll. "
+"Wenn dies ausgeschaltet ist, werden E-Mails nur von SMTP-Servern in den "
+"privilegierten Netzwerken angenommen."
 
 #: tpl_messages.php:175
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:139
@@ -953,25 +945,23 @@
 
 #: tpl_messages.php:187
 msgid "Kolab Hostnames (for Master and Slaves)"
-msgstr ""
+msgstr "Kolab-Rechnernamen (für Master- und Slaveserver)"
 
 #: tpl_messages.php:188
 msgid "Host"
 msgstr "Host"
 
 #: tpl_messages.php:192
-#, fuzzy
 msgid "The shared folder with DN"
-msgstr "Der Benutzer mit DN"
+msgstr "Der gemeinsam genutzte Ordner mit DN"
 
 #: tpl_messages.php:194
-#, fuzzy
 msgid "Back to list of shared folders"
-msgstr "Zurück zur Liste der Benutzer"
+msgstr "Zurück zur Liste der gemeinsam genutzten Ordner"
 
 #: tpl_messages.php:195
 msgid "Shared folders"
-msgstr "Gemeinsam genutzte Ordner "
+msgstr "Gemeinsam genutzte Ordner"
 
 #: tpl_messages.php:197
 msgid "Server"
@@ -1070,7 +1060,7 @@
 
 #: tpl_messages.php:236
 msgid "(one address per line)"
-msgstr "(Eine Adresse per Zeile)"
+msgstr "(Eine Adresse pro Zeile)"
 
 #: tpl_messages.php:237
 msgid "Do not send vacation replies to spam messages"
@@ -1164,7 +1154,7 @@
 #: ../../../www/admin/addressbook/addr.php.in:123
 #: ../../../www/admin/user/user.php.in:449
 msgid "One address per line"
-msgstr "Eine Adresse per Zeile"
+msgstr "Eine Adresse pro Zeile"
 
 #: ../../../www/admin/addressbook/addr.php.in:128
 msgid "Post Box"
@@ -1182,15 +1172,16 @@
 msgstr "Externe Adresse hinzufügen"
 
 #: ../../../www/admin/addressbook/addr.php.in:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Addressbook entry DN could not be modified, distribution list <a "
 "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first "
 "remove it from the distribution list."
 msgstr ""
-"Der DN des Kontos konnte nicht verändert werden; Verteilerliste <a href='/"
-"admin/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> hängt davon "
+"Der DN der Adresse konnte nicht verändert werden; Verteilerliste <a "
+"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"action=modify&dn=%s'>'%s'</a> hängt davon "
 "ab. Um dieses Konto zu verändern, müssen Sie es erst aus der Verteilerliste "
 "entfernen."
 
@@ -1245,9 +1236,9 @@
 
 #: ../../../www/admin/addressbook/addr.php.in:267
 #: ../../../www/admin/addressbook/addr.php.in:287
-#, fuzzy, php-format
+#, php-format
 msgid "Error: No entry with DN %s found"
-msgstr "Adressbucheintrag mit DN %s wurde gelöscht"
+msgstr "Fehler: Kein Eintrag mit DN %s gefunden"
 
 #: ../../../www/admin/addressbook/addr.php.in:284
 msgid "Delete External Address"
@@ -1262,17 +1253,17 @@
 "ab."
 
 #: ../../../www/admin/addressbook/addr.php.in:308
-#, fuzzy, php-format
+#, php-format
 msgid "Addressbook entry removed from distribution list '%s'."
-msgstr "Das Konto wurde von der Verteilerliste '%s' entfernt."
+msgstr "Die Adresse wurde von der Verteilerliste '%s' entfernt."
 
 #: ../../../www/admin/addressbook/addr.php.in:310
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Failure to remove addressbook entry from distribution list '%s', entry will "
 "not be deleted."
 msgstr ""
-"Konnte das Konto nicht aus der Verteilerliste entfernen; das Konto wird "
+"Konnte die Adresse nicht aus der Verteilerliste entfernen; der Eintrag wird "
 "nicht gelöscht."
 
 #: ../../../www/admin/addressbook/addr.php.in:318
@@ -1293,15 +1284,13 @@
 
 #: ../../../www/admin/addressbook/index.php.in:124
 #: ../../../www/admin/user/index.php.in:186
-#, fuzzy
 msgid "Email"
 msgstr "E-Mail"
 
 #: ../../../www/admin/addressbook/index.php.in:125
 #: ../../../www/admin/user/index.php.in:188
-#, fuzzy
 msgid "contains"
-msgstr "Domänen"
+msgstr "enthält"
 
 #: ../../../www/admin/addressbook/index.php.in:126
 #: ../../../www/admin/user/index.php.in:189
@@ -1755,39 +1744,37 @@
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:214
 msgid "Unspecified"
-msgstr ""
+msgstr "Unspezifiziert"
 
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:214
-#, fuzzy
 msgid "Mails"
 msgstr "E-Mail"
 
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:214
 msgid "Tasks"
-msgstr ""
+msgstr "Aufgaben"
 
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:215
 msgid "Journals"
-msgstr ""
+msgstr "Journal"
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:215
 msgid "Events"
-msgstr ""
+msgstr "Kalender"
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:216
-#, fuzzy
 msgid "Contacts"
-msgstr "enthält"
+msgstr "Kontakte"
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:216
 msgid "Notes"
-msgstr ""
+msgstr "Notizen"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:59
 #: ../../../www/admin/sharedfolder/sf.php.in:66
@@ -1814,9 +1801,8 @@
 msgstr "Nicht-flüchtig"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:127
-#, fuzzy
 msgid "Folder Type"
-msgstr "Ordnername"
+msgstr "Ordnertyp"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:131
 msgid "Quota Limit"
@@ -1934,9 +1920,9 @@
 msgstr "Benutzer-ID "
 
 #: ../../../www/admin/user/user.php.in:162
-#, fuzzy, php-format
+#, php-format
 msgid "Email-Delegate %s does not exist"
-msgstr "Delegierter %s existiert nicht"
+msgstr "Bevollmächtigter %s existiert nicht"
 
 #: ../../../www/admin/user/user.php.in:175
 #, php-format
@@ -2011,18 +1997,16 @@
 msgstr "E-Mail-Aliasnamen"
 
 #: ../../../www/admin/user/user.php.in:450
-#, fuzzy
 msgid "Email-Delegates"
-msgstr "Delegierungen"
+msgstr "Bevollmächtigte"
 
 #: ../../../www/admin/user/user.php.in:453
 msgid "Others allowed to send emails with a \"from\" address of this account."
 msgstr ""
 
 #: ../../../www/admin/user/user.php.in:454
-#, fuzzy
 msgid "One email address per line."
-msgstr "Eine E-Mail-Adresse pro Zeile"
+msgstr "Eine E-Mail-Adresse pro Zeile."
 
 #: ../../../www/admin/user/user.php.in:466
 msgid "User Quota in MBytes"
@@ -2041,15 +2025,15 @@
 msgstr "Konnte Passwort nicht verschlüsseln: "
 
 #: ../../../www/admin/user/user.php.in:630
-#, fuzzy, php-format
 msgid ""
 "Account DN could not be modified, distribution list <a "
 "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, first "
 "remove it from the distribution list."
 msgstr ""
-"Der DN des Kontos konnte nicht verändert werden; Verteilerliste <a href='/"
-"admin/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> hängt davon "
+"Der DN des Kontos konnte nicht verändert werden; Verteilerliste <a "
+"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"action=modify&dn=%s'>'%s'</a> hängt davon "
 "ab. Um dieses Konto zu verändern, müssen Sie es erst aus der Verteilerliste "
 "entfernen."
 
@@ -2097,12 +2081,12 @@
 msgstr "Das Konto wurde von der Verteilerliste '%s' entfernt."
 
 #: ../../../www/admin/user/user.php.in:835
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Failure to remove account from distribution list '%s', account will not be "
 "deleted."
 msgstr ""
-"Konnte das Konto nicht aus der Verteilerliste entfernen; das Konto wird "
+"Konnte das Konto nicht aus der Verteilerliste '%s' entfernen; das Konto wird "
 "nicht gelöscht."
 
 #: ../../../www/admin/user/user.php.in:843
@@ -2116,7 +2100,7 @@
 
 #: ../../../www/admin/user/vacation.php.in:43
 msgid "Days must be at least one"
-msgstr ""
+msgstr "Der Tage-Wert muss mindestens 1 sein"
 
 #: ../../../www/admin/user/vacation.php.in:65
 msgid "Vacation message successfully activated"
@@ -2233,9 +2217,8 @@
 msgstr "Alle"
 
 #: ../include/form.class.php:331
-#, fuzzy
 msgid "* Required field."
-msgstr "Obligatorisches Feld "
+msgstr "* Obligatorisches Feld"
 
 #: ../include/form.class.php:352 ../include/form.class.php:355
 msgid "Required field "
@@ -2365,7 +2348,6 @@
 msgstr "Maintainer verwalten"
 
 #: ../include/menu.php:103
-#, fuzzy
 msgid "Manage Domain Maintainer"
 msgstr "Domänen-Verwalter verwalten"
 
@@ -2408,30 +2390,3 @@
 #: ../include/passwd.php:36 ../include/passwd.php:41
 msgid "Passwords dont match"
 msgstr "Passwörter stimmen nicht überein"
-
-#~ msgid "Kolab Hosts"
-#~ msgstr "Kolab-Hosts"
-
-#~ msgid "One Email address per line"
-#~ msgstr "Eine E-Mail-Adresse per Zeile"
-
-#~ msgid ""
-#~ "Could not read resource encryption public key file://%s/etc/kolab/res_pub."
-#~ "pem: "
-#~ msgstr ""
-#~ "Konnte die Datei mit dem öffentlichen Verschlüsselungsschlüssel file://%s/"
-#~ "etc/kolab/res_pub.pem nicht lesen: "
-
-#~ msgid "Error: Multiple results returned for DN %s"
-#~ msgstr "Fehler: Mehrfache Ergebnisse wurden für DN %s zurückgegeben"
-
-#~ msgid "Please log in as a valid user"
-#~ msgstr "Bitte melden Sie sich als ein gültiger Benutzer an"
-
-#~ msgid "Enable MX lookup for relayhost (if in doubt, leave it off)"
-#~ msgstr ""
-#~ "MX-Suche für Relayhost einschalten (wenn Sie sich nicht sicher sind, "
-#~ "verwenden Sie diese Option nicht)"
-
-#~ msgid "React to spam"
-#~ msgstr "Auf Spam reagieren"



From cvs at kolab.org  Fri Feb  2 19:01:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 19:01:24 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.21, 1.22 
Message-ID: <20070202180124.73DA01005CC@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv3153/nl/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Fixed unneeded fuzz and minor things in it and nl translations.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- messages.po	2 Feb 2007 17:22:10 -0000	1.21
+++ messages.po	2 Feb 2007 18:01:22 -0000	1.22
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 18:19+0100\n"
+"POT-Creation-Date: 2007-02-02 18:49+0100\n"
 "PO-Revision-Date: 2005-12-11 20:40+0100\n"
 "Last-Translator: Richard Bos <richard at radoeka.nl>\n"
 "Language-Team:  <nl at li.org>\n"
@@ -1263,15 +1263,13 @@
 
 #: ../../../www/admin/addressbook/index.php.in:124
 #: ../../../www/admin/user/index.php.in:186
-#, fuzzy
 msgid "Email"
 msgstr "E-mail"
 
 #: ../../../www/admin/addressbook/index.php.in:125
 #: ../../../www/admin/user/index.php.in:188
-#, fuzzy
 msgid "contains"
-msgstr "Domeinen"
+msgstr "bevat"
 
 #: ../../../www/admin/addressbook/index.php.in:126
 #: ../../../www/admin/user/index.php.in:189



From cvs at kolab.org  Fri Feb  2 19:01:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 19:01:24 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.10, 1.11 
Message-ID: <20070202180124.6CDFF1005C7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
In directory doto:/tmp/cvs-serv3153/it/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Fixed unneeded fuzz and minor things in it and nl translations.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- messages.po	2 Feb 2007 17:22:10 -0000	1.10
+++ messages.po	2 Feb 2007 18:01:22 -0000	1.11
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 18:19+0100\n"
+"POT-Creation-Date: 2007-02-02 18:49+0100\n"
 "PO-Revision-Date: 2005-10-14 23:43+0100\n"
 "Last-Translator: Yvette Agostini <yvette at yvetteagostini.it>\n"
 "Language-Team:  <fr at li.org>\n"
@@ -1157,7 +1157,7 @@
 #: ../../../www/admin/addressbook/addr.php.in:142
 #: ../../../www/admin/distributionlist/list.php.in:135
 #: ../../../www/admin/sharedfolder/sf.php.in:146
-#, fuzzy, php-format
+#, php-format
 msgid "Error: DN required for %s operation"
 msgstr "Errore: per l'operazione di cancellazione è necessario il DN"
 
@@ -1177,13 +1177,13 @@
 "href='/admin/distributionlist/list.php?action=modify&dn="
 
 #: ../../../www/admin/addressbook/addr.php.in:208
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not rename %s to %s: %s"
 msgstr "Errore LDAP: impossibile rinominare"
 
 #: ../../../www/admin/addressbook/addr.php.in:211
 #: ../../../www/admin/addressbook/addr.php.in:224
-#, fuzzy, php-format
+#, php-format
 msgid "%s successfully updated"
 msgstr " creato con successo"
 
@@ -1192,7 +1192,7 @@
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:228
 #: ../../../www/admin/maintainer/maintainer.php.in:236
 #: ../../../www/admin/sharedfolder/sf.php.in:230
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not read %s: %s"
 msgstr "Errore LDAP: è impossibile leggere"
 
@@ -1201,7 +1201,7 @@
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:232
 #: ../../../www/admin/maintainer/maintainer.php.in:240
 #: ../../../www/admin/sharedfolder/sf.php.in:234
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not modify object %s: %s"
 msgstr "Errore LDAP: è impossibile modificare l'oggetto"
 
@@ -1211,12 +1211,12 @@
 #: ../../../www/admin/maintainer/maintainer.php.in:262
 #: ../../../www/admin/sharedfolder/sf.php.in:244
 #: ../../../www/admin/user/user.php.in:727
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not add object %s: %s"
 msgstr "Errore LDAP: non è possibile aggiungere l'oggetto"
 
 #: ../../../www/admin/addressbook/addr.php.in:236
-#, fuzzy, php-format
+#, php-format
 msgid "%s successfully added"
 msgstr " creato con successo"
 
@@ -1237,7 +1237,7 @@
 
 #: ../../../www/admin/addressbook/addr.php.in:301
 #: ../../../www/admin/user/user.php.in:826
-#, fuzzy, php-format
+#, php-format
 msgid "Account could not be deleted, distribution list '%s' depends on it."
 msgstr ""
 "Il DN dell'account non può essere modificato, la lista di distribuzione <a "
@@ -1258,7 +1258,7 @@
 "sarà cancellato."
 
 #: ../../../www/admin/addressbook/addr.php.in:318
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not delete %s: %s"
 msgstr "Errore LDAP: è impossibile cancellare"
 
@@ -1269,21 +1269,19 @@
 msgstr "Voce Cancellata"
 
 #: ../../../www/admin/addressbook/addr.php.in:322
-#, fuzzy, php-format
+#, php-format
 msgid "Address book entry with DN %s was deleted"
 msgstr "La voce di Rubrica è stata cancellata"
 
 #: ../../../www/admin/addressbook/index.php.in:124
 #: ../../../www/admin/user/index.php.in:186
-#, fuzzy
 msgid "Email"
-msgstr "E-mail"
+msgstr "Email"
 
 #: ../../../www/admin/addressbook/index.php.in:125
 #: ../../../www/admin/user/index.php.in:188
-#, fuzzy
 msgid "contains"
-msgstr "Domini"
+msgstr "contiene"
 
 #: ../../../www/admin/addressbook/index.php.in:126
 #: ../../../www/admin/user/index.php.in:189
@@ -1333,7 +1331,7 @@
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:151
 #: ../../../www/admin/maintainer/maintainer.php.in:166
 #: ../../../www/admin/user/user.php.in:487
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: No such dn: %s: %s"
 msgstr "Errore LDAP: non esiste un dn "
 
@@ -1341,28 +1339,28 @@
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:197
 #: ../../../www/admin/maintainer/maintainer.php.in:212
 #: ../../../www/admin/sharedfolder/sf.php.in:224
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not rename %1$s to %2$s: %3$s"
 msgstr "Errore LDAP: è impossibile rinominare"
 
 #: ../../../www/admin/administrator/admin.php.in:219
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:201
 #: ../../../www/admin/maintainer/maintainer.php.in:216
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not remove old entry %s: %s"
 msgstr "Errore LDAP: è impossibile cancellare"
 
 #: ../../../www/admin/administrator/admin.php.in:229
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:211
 #: ../../../www/admin/maintainer/maintainer.php.in:226
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not add new group entry %s: %s"
 msgstr "Errore LDAP: non è possibile aggiungere l'oggetto"
 
 #: ../../../www/admin/administrator/admin.php.in:234
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:216
 #: ../../../www/admin/maintainer/maintainer.php.in:231
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not remove old group entry %s: %s"
 msgstr "Errore LDAP: è impossibile modificare l'oggetto"
 
@@ -1385,7 +1383,7 @@
 #: ../../../www/admin/administrator/admin.php.in:267
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:262
 #: ../../../www/admin/maintainer/maintainer.php.in:266
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not add object %s to maintainer group: %s"
 msgstr "Errore LDAP: non è possibile aggiungere l'oggetto"
 
@@ -1420,7 +1418,7 @@
 "amministratori"
 
 #: ../../../www/admin/administrator/admin.php.in:322
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not remove %s from admin group: %s"
 msgstr ""
 "Errore LDAP: la rimozione dal gruppo degli amministratori non è possibile:"
@@ -1428,7 +1426,7 @@
 #: ../../../www/admin/administrator/admin.php.in:327
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:323
 #: ../../../www/admin/maintainer/maintainer.php.in:327
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not mark %s for deletion: %s"
 msgstr "Errore LDAP: è impossibile cancellare"
 
@@ -1445,7 +1443,7 @@
 msgstr " Amministratori)"
 
 #: ../../../www/admin/distributionlist/index.php.in:53
-#, fuzzy, php-format
+#, php-format
 msgid "Manage Distribution Lists (%d Lists)"
 msgstr "Gestione Liste di Distribuzione"
 
@@ -1458,7 +1456,7 @@
 msgstr "Aggiungere almeno un membro"
 
 #: ../../../www/admin/distributionlist/list.php.in:50
-#, fuzzy, php-format
+#, php-format
 msgid "No user with email address, UID or alias %s"
 msgstr "Nessun utente presente con questo indirizzo email, UID o alias "
 
@@ -1496,14 +1494,14 @@
 msgstr "Aggiungi una Lista di Distribuzione"
 
 #: ../../../www/admin/distributionlist/list.php.in:179
-#, fuzzy, php-format
+#, php-format
 msgid "No user with address %s"
 msgstr "Non sono presenti utenti con questo indirizzo"
 
 #: ../../../www/admin/distributionlist/list.php.in:195
 #: ../../../www/admin/user/user.php.in:660
 #: ../../../www/admin/user/user.php.in:664
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not rename %1$s to %2$s: %3$s"
 msgstr "Errore LDAP: è impossibile rinominare"
 
@@ -1514,7 +1512,7 @@
 
 #: ../../../www/admin/distributionlist/list.php.in:201
 #: ../../../www/admin/user/user.php.in:675
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not read %s: %s"
 msgstr "Errore LDAP: è impossibile leggere"
 
@@ -1524,23 +1522,23 @@
 #: ../../../www/admin/user/user.php.in:700
 #: ../../../www/admin/user/user.php.in:737
 #: ../../../www/admin/user/user.php.in:752
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not modify object %s: %s"
 msgstr "Errore LDAP: è impossibile modificare l'oggetto"
 
 #: ../../../www/admin/distributionlist/list.php.in:216
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not add object %s: %s"
 msgstr "Errore LDAP: non è possibile aggiungere l'oggetto"
 
 #: ../../../www/admin/distributionlist/list.php.in:237
 #: ../../../www/admin/user/user.php.in:740
-#, fuzzy, php-format
+#, php-format
 msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
 msgstr "Collisione. L'indirizzo email è stato rinominato"
 
 #: ../../../www/admin/distributionlist/list.php.in:245
-#, fuzzy, php-format
+#, php-format
 msgid "Distribution List '%s' added"
 msgstr "Lista di Distribuzione aggiornata"
 
@@ -1570,7 +1568,7 @@
 msgstr " cancellata"
 
 #: ../../../www/admin/distributionlist/list.php.in:300
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not delete %s: %s"
 msgstr "Errore LDAP: è impossibile cancellare"
 
@@ -1612,7 +1610,7 @@
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:317
 #: ../../../www/admin/maintainer/maintainer.php.in:321
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not remove %s from maintainer group: %s"
 msgstr "Errore LDAP: è impossibile la rimozione dal gruppo dei maintainer:"
 
@@ -1656,18 +1654,18 @@
 msgstr "Maintainer Cancellato"
 
 #: ../../../www/admin/service/index.php.in:100
-#, fuzzy, php-format
+#, php-format
 msgid "No account found for email address %s"
 msgstr "Nessun account è stato trovato per l'indirizzo email "
 
 #: ../../../www/admin/service/index.php.in:109
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Failed to add distribution list %s: %s"
 msgstr ""
 "Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
 
 #: ../../../www/admin/service/index.php.in:111
-#, fuzzy, php-format
+#, php-format
 msgid "Successfully created distribution list %s"
 msgstr "Crea liste di distribuzione"
 
@@ -1683,13 +1681,13 @@
 #: ../../../www/admin/service/index.php.in:238
 #: ../../../www/admin/service/index.php.in:255
 #: ../../../www/admin/service/index.php.in:268
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: failed to modify kolab configuration object: %s"
 msgstr ""
 "Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
 
 #: ../../../www/admin/service/index.php.in:226
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Failed to delete domain object %s: %s"
 msgstr ""
 "Errore LDAP: errore nella modifica dell'oggetto di configurazione kolab: "
@@ -1729,7 +1727,7 @@
 msgstr "Servizio di verifica Email Amavis (Virus/Spam)"
 
 #: ../../../www/admin/sharedfolder/index.php.in:53
-#, fuzzy, php-format
+#, php-format
 msgid "Manage Shared Folders (%d Folders)"
 msgstr "Gestione Cartelle Condivise"
 
@@ -1761,9 +1759,8 @@
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:216
-#, fuzzy
 msgid "Contacts"
-msgstr "contiene"
+msgstr ""
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:216
@@ -1776,7 +1773,7 @@
 msgstr "Permessi per UID/messaggio/GID"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:100
-#, fuzzy, php-format
+#, php-format
 msgid "No UID or GID %s"
 msgstr "Nessun UID o GID "
 
@@ -1821,7 +1818,7 @@
 msgstr "La cartella condivisa è stata aggiornata"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:246
-#, fuzzy, php-format
+#, php-format
 msgid "Shared folder '%s' added"
 msgstr "La cartella condivisa è stata aggiornata"
 
@@ -1843,7 +1840,7 @@
 msgstr " segnata per la cancellazione"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:307
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not mark %s for deletion: %s"
 msgstr "Errore LDAP: è impossibile cancellare"
 
@@ -1868,12 +1865,12 @@
 msgstr "Lo script era:"
 
 #: ../../../www/admin/user/deliver.php.in:74
-#, fuzzy, php-format
+#, php-format
 msgid "Delivery to '%s' successfully activated"
 msgstr "Messagio di assenza attivato con successo"
 
 #: ../../../www/admin/user/deliver.php.in:75
-#, fuzzy, php-format
+#, php-format
 msgid "Delivery to '%s' successfully deactivated"
 msgstr "Messagio di assenza disattivato con successo"
 
@@ -1891,22 +1888,22 @@
 msgstr "Si prega di inserire un indirizzo email"
 
 #: ../../../www/admin/user/forward.php.in:78
-#, fuzzy, php-format
+#, php-format
 msgid "Forwarding to '%s' successfully activated"
 msgstr "Messaggio di assenza attivato con successo"
 
 #: ../../../www/admin/user/forward.php.in:79
-#, fuzzy, php-format
+#, php-format
 msgid "Forwarding to '%s' successfully deactivated"
 msgstr "Messaggio di assenza disattivato con successo"
 
 #: ../../../www/admin/user/index.php.in:122
-#, fuzzy, php-format
+#, php-format
 msgid "Manage Email User (%d Users)"
 msgstr "Gestione Utenti Email"
 
 #: ../../../www/admin/user/user.php.in:111
-#, fuzzy, php-format
+#, php-format
 msgid "Email address %1$s not in domains %2$s"
 msgstr "L'indirizzo email non è nel dominio "
 
@@ -1920,7 +1917,7 @@
 msgstr "Il delegato non esiste"
 
 #: ../../../www/admin/user/user.php.in:175
-#, fuzzy, php-format
+#, php-format
 msgid "Illegal user or group %s"
 msgstr "Utente o gruppo non lecito "
 
@@ -2032,13 +2029,13 @@
 "href='/admin/distributionlist/list.php?action=modify&dn="
 
 #: ../../../www/admin/user/user.php.in:669
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: Could not remove old entry %s,%s: %s"
 msgstr "Errore LDAP: è impossibile rinominare"
 
 #: ../../../www/admin/user/user.php.in:703
 #: ../../../www/admin/user/user.php.in:755
-#, fuzzy, php-format
+#, php-format
 msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
 msgstr "Collisione. L'alias è stato rinominato "
 
@@ -2048,7 +2045,7 @@
 msgstr "Modifica utente"
 
 #: ../../../www/admin/user/user.php.in:709
-#, fuzzy, php-format
+#, php-format
 msgid "User '%s' successfully modified"
 msgstr "L'utente è stato modificato con successo"
 
@@ -2068,7 +2065,7 @@
 msgstr "Cancella Utente"
 
 #: ../../../www/admin/user/user.php.in:833
-#, fuzzy, php-format
+#, php-format
 msgid "Account removed from distribution list '%s'."
 msgstr "L'account è stato rimosso dalla lista di distribuzione"
 
@@ -2082,7 +2079,7 @@
 "sarà cancellato."
 
 #: ../../../www/admin/user/user.php.in:843
-#, fuzzy, php-format
+#, php-format
 msgid "LDAP Error: could not mark '%s' for deletion: %s"
 msgstr "Errore LDAP: è impossibile cancellare"
 



From cvs at kolab.org  Fri Feb  2 19:56:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Feb 2007 19:56:26 +0100 (CET)
Subject: thomas: server release-notes.txt,1.78,1.79 
Message-ID: <20070202185626.ADF791005C7@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- release-notes.txt	2 Feb 2007 17:13:28 -0000	1.78
+++ release-notes.txt	2 Feb 2007 18:56:24 -0000	1.79
@@ -80,6 +80,7 @@
 	kolab/issue1486 ("About Kolab" in Webinterface needs work over)
 	kolab/issue1539 (extension to the opening text, when the manager logs in for the 1st time)
 	kolab/issue1559 (Domain Maintainer cannot delete "his" users)
+	kolab/issue1586 ("Required field" not translated to German in web admin)
 
 
 Changes since 2.1 beta 3:



From cvs at kolab.org  Mon Feb  5 14:51:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 14:51:44 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/include
	locale.php, 1.9, 1.10 
Message-ID: <20070205135144.7FF951006B6@lists.intevation.de>

Author: thomas

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

Modified Files:
	locale.php 
Log Message:
Fix kolab/issue1592 (LANGUAGE variable overrides web admin language selection)
fbview already used putenv to set LANGUAGE to the desired value, doing the
same in kolab-webadmin/kolab-webadmin/php/admin/include/locale.php now.


Index: locale.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/locale.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- locale.php	13 Oct 2005 08:38:49 -0000	1.9
+++ locale.php	5 Feb 2007 13:51:42 -0000	1.10
@@ -103,6 +103,7 @@
 // I18N support information
 $language = getLanguage();
 putenv("LANG=$language"); 
+putenv("LANGUAGE=$language"); 
 setlocale(LC_ALL, $language);
 
 $domain = "messages";



From cvs at kolab.org  Mon Feb  5 14:55:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 14:55:45 +0100 (CET)
Subject: thomas: server release-notes.txt,1.79,1.80 obmtool.conf,1.238,1.239 
Message-ID: <20070205135545.5B1A61006C1@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt obmtool.conf 
Log Message:
Updated kolabd and kolab-webadmin version numbers and fixes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- release-notes.txt	2 Feb 2007 18:56:24 -0000	1.79
+++ release-notes.txt	5 Feb 2007 13:55:43 -0000	1.80
@@ -1,11 +1,11 @@
 Release notes Kolab2 Server
-(Version 20070202, Kolab Server 2.1 rc 1)
+(Version 20070205, Kolab Server 2.1 rc 1)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
 the 1st.README file in the source directory.
 
-WARNING, these topics need testing in 2.1 beta 4:
+These topics need testing in 2.1 rc 1:
 
  - Upgrades from Kolab server 2.0, see 1st.README and UPGRADING.20-21.
  - Changed imapd database format for annotations.db and mailboxes.db
@@ -66,7 +66,7 @@
 
 Changes since 2.1 beta 4:
 
-    - kolabd-2.0.99-20070202
+    - kolabd-2.0.99-20070205
 
 	kolab/issue1335 (pfbcache.db locking problems)
 	kolab/issue1507 (Public viewable phpinfo() and more in Server default installation)
@@ -74,13 +74,14 @@
 	kolab/issue1563 (freebusy.conf template doesn't match freebusy.conf from package)
 	kolab/issue1575 (Openldap enhanced data integrity)
 
-    - kolab-webadmin-2.0.99-20070202
+    - kolab-webadmin-2.0.99-20070205
 
 	kolab/issue1479 ("Type" of shared folder can only be modified in 2nd try)
 	kolab/issue1486 ("About Kolab" in Webinterface needs work over)
 	kolab/issue1539 (extension to the opening text, when the manager logs in for the 1st time)
 	kolab/issue1559 (Domain Maintainer cannot delete "his" users)
 	kolab/issue1586 ("Required field" not translated to German in web admin)
+	kolab/issue1592 (LANGUAGE variable overrides web admin language selection)
 
 
 Changes since 2.1 beta 3:

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- obmtool.conf	2 Feb 2007 16:43:50 -0000	1.238
+++ obmtool.conf	5 Feb 2007 13:55:43 -0000	1.239
@@ -149,8 +149,8 @@
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20070117
-    @install ${altloc}kolabd-2.0.99-20070202 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20070202 --define kolab_version=$kolab_version
+    @install ${altloc}kolabd-2.0.99-20070205 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20070205 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-2.0.99-20070117 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version



From cvs at kolab.org  Mon Feb  5 15:29:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 15:29:54 +0100 (CET)
Subject: thomas: server README.1st,1.44,1.45 release-notes.txt,1.80,1.81 
Message-ID: <20070205142954.90FBD1006B6@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st release-notes.txt 
Log Message:
Moved "Known Problems" section to README.1st


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- README.1st	18 Jan 2007 14:06:43 -0000	1.44
+++ README.1st	5 Feb 2007 14:29:52 -0000	1.45
@@ -3,6 +3,7 @@
 
 For more information on Kolab, see http://www.kolab.org
 
+
 Quick install instructions
 --------------------------
 
@@ -268,6 +269,36 @@
 -----------------------
 
 Nothing special has to be done for this upgrade.
+
+
+Known problems and workarounds
+------------------------------
+
+    - Under some circumstance the Kolab server may not update create
+      users or update the configuration after changes have been made in
+      the web interface.  This happens most often immediately after the
+      bootstrap.  In that case restart the kolabd:
+
+        /kolab/bin/openpkg rc kolabd restart
+
+      See kolab/issue1068 (Mailboxes are not created until kolabd restart)
+      and kolab/issue1098 (Changes in the service tab are not accepted after
+      bootstrap) for details.
+
+    - If modifying or deleting of address book entries doesn't work,
+      restarting openldap can help, see kolab/issue854 for details.
+
+    - There is a report that the manager can only see users in the primary
+      domain, see kolab/issue1485. We can't reproduce this problem, please
+      tell us if you can.
+
+    - Calendar folders for group/resource accounts can't be created for
+      domains which were added after bootstrap, i.e. via the web admin
+      interface. See kolab/issue1313 for details.
+
+    - When deleting domains via the web admin interface, the corresponding
+      LDAP data and IMAP spool stay on the server and have to be deleted
+      manually. See kolab/issue1571 and kolab/issue1576 for details.
 
 
 $Id$

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- release-notes.txt	5 Feb 2007 13:55:43 -0000	1.80
+++ release-notes.txt	5 Feb 2007 14:29:52 -0000	1.81
@@ -35,35 +35,6 @@
       For details see kolab/issue1089.
 
 
-Known problems:
-
-    - Under some circumstance the Kolab server may not update create
-      users or update the configuration after changes have been made in
-      the web interface.  This happens most often immediately after the
-      bootstrap.  In that case restart the kolabd:
-
-	/kolab/bin/openpkg rc kolabd restart
-
-      See kolab/issue1068 (Mailboxes are not created until kolabd restart)
-      and kolab/issue1098 (Changes in the service tab are not accepted after
-      bootstrap) for details.
-
-    - If modifying or deleting of address book entries doesn't work,
-      restarting openldap can help, see kolab/issue854 for details.
-
-    - There is a report that the manager can only see users in the primary
-      domain, see kolab/issue1485. We can't reproduce this problem, please
-      tell us if you can.
-
-    - Calendar folders for group/resource accounts can't be created for
-      domains which were added after bootstrap, i.e. via the web admin
-      interface. See kolab/issue1313 for details.
-
-    - When deleting domains via the web admin interface, the corresponding
-      LDAP data and IMAP spool stay on the server and have to be deleted
-      manually. See kolab/issue1571 and kolab/issue1576 for details.
-
-
 Changes since 2.1 beta 4:
 
     - kolabd-2.0.99-20070205



From cvs at kolab.org  Mon Feb  5 15:56:10 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 15:56:10 +0100 (CET)
Subject: thomas: server README.1st,1.45,1.46 
Message-ID: <20070205145610.B6DDC1005AF@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Minor cleanups to README.1st and move locales discussion to known problems.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- README.1st	5 Feb 2007 14:29:52 -0000	1.45
+++ README.1st	5 Feb 2007 14:56:08 -0000	1.46
@@ -1,28 +1,19 @@
 Kolab2 Server Install and Upgrade Information
 =============================================
 
-For more information on Kolab, see http://www.kolab.org
+For more information about Kolab, see http://kolab.org/
 
 
 Quick install instructions
 --------------------------
 
-For a fresh install /kolab needs to be an empty directory with enough space.
-You can use a symlink, but do _not_ use an NFS mounted drive.
+For a fresh install /kolab needs to be an empty directory with at least 1GB of
+free disk space. You can use a symlink, but do _not_ use an NFS mounted drive.
 Make sure that the following names are not in /etc/passwd or /etc/groups,
 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.
+Check http://www.openpkg.org/documentation/ for additional documentation
+for the OpenPKG packaging system.
 
 To install the Kolab2 server, you need to download the files from the
 directory containing this file (1st.README) to some local directory,
@@ -273,6 +264,13 @@
 
 Known problems and workarounds
 ------------------------------
+
+    - Your system (C library) has to support all languages you want to have
+      available in the web admin interface and fbview. For most languages you
+      have to use the non-UTF-8 and non-euro locales, i.e. de_DE, fr_FR,
+      it_IT, nl_NL instead of e.g. de_DE at euro. For fbview some languages need
+      a UTF-8 locale, e.g. ja_JP.UTF-8 for Japanese.
+      See kolab/issue881 and kolab/issue1585 for details.
 
     - Under some circumstance the Kolab server may not update create
       users or update the configuration after changes have been made in



From cvs at kolab.org  Mon Feb  5 15:57:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 15:57:02 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates httpd.conf.template.in, 1.7,
	1.8 
Message-ID: <20070205145702.687511005AF@lists.intevation.de>

Author: wilde

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Fixed the fix for the fix for issue1507.
Actually the last fix was a bit to secure...


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- httpd.conf.template.in	2 Feb 2007 16:12:17 -0000	1.7
+++ httpd.conf.template.in	5 Feb 2007 14:57:00 -0000	1.8
@@ -145,6 +145,14 @@
     Order allow,deny
     Allow from all
 </Location>
+<Location ~ "@webserver_web_prefix@/fbview/services/(javascript.php|css.php)$">
+    Order allow,deny
+    Allow from all
+</Location>
+<Location ~ "@webserver_web_prefix@/fbview/(kronolith|graphics)/">
+    Order allow,deny
+    Allow from all
+</Location>
 
 <Files ~ "^\.ht">
     Order allow,deny



From cvs at kolab.org  Mon Feb  5 16:16:54 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 16:16:54 +0100 (CET)
Subject: thomas: server README.1st,1.46,1.47 
Message-ID: <20070205151654.E7FAC1005BA@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Added more hints on rpmsave files (suggested by Johannes Graumann) and
remove obsolete information about checking file permissions.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- README.1st	5 Feb 2007 14:56:08 -0000	1.46
+++ README.1st	5 Feb 2007 15:16:52 -0000	1.47
@@ -50,22 +50,22 @@
 # ./obmtool kolab
 
 obmtool will usually automatically determine which packages need to be
-built.  If you have made changes to the configuration files in
-/kolab/etc/kolab/templates/ and the new release has a new kolabd package
-you may need to transfer your changes from the backups created by rpm
-(the *.rpmsave) files to the new template files.  Then regenerate the
-configuration with
+built.  If you have made changes to configuration files or an updated
+package includes configuration files which are usually regenerated from
+files in /kolab/etc/kolab/templates/ the old configuration file will be
+saved with the extension .rpmsave.  For files generated from templates
+you just have to remove the rpmsave file, because services will refuse
+to start if there still is an rpmsave file, e.g.:
 
-# /kolab/sbin/kolabconf
+# rm /kolab/etc/clamav/*.conf.rpmsave
 
+For other changed files (e.g. the template files themselves) you may
+want to transfer your changes from the .rpmsave backup to the new files.
 
-You may want to check the permissions of your files in /kolab/etc/kolab/
-after installing or upgrading, as there have been problems with this in
-the past.  Especially kolab.conf and copies shall only be readable to
-the owner (usually "kolab").  The installation and configuration scripts
-should make sure that the permissions are correct but there's a chance
-that the permissions can still go wrong, especially if you upgrade from
-pre Beta1 releases.
+Then regenerate the configuration and restart Kolab with:
+
+# /kolab/sbin/kolabconf
+# /kolab/bin/openpkg rc all restart
 
 
 Upgrading from earlier versions



From cvs at kolab.org  Mon Feb  5 17:44:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 17:44:50 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/include
	mysmarty.php.in, 1.8, 1.9 
Message-ID: <20070205164450.B877D1006B3@lists.intevation.de>

Author: thomas

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

Modified Files:
	mysmarty.php.in 
Log Message:
Disabled Spanish language selection from web admin interface,
because of missing translation.

The trailing comma in mysmarty.php.in is intentional to make changing
the set of active languages easier in the code. php allows this.


Index: mysmarty.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mysmarty.php.in	26 Mar 2006 13:45:23 -0000	1.8
+++ mysmarty.php.in	5 Feb 2007 16:44:48 -0000	1.9
@@ -67,8 +67,8 @@
 											 'code' => 'it_IT' ),
 									  array( 'name' => 'Nederlands',
 											 'code' => 'nl_NL' ),
-									  array( 'name' => 'Español',
-											 'code' => 'es_ES' )
+									//  array( 'name' => 'Español',
+									//		 'code' => 'es_ES' ),
 									  ));
   }
 



From cvs at kolab.org  Mon Feb  5 17:44:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 17:44:50 +0100 (CET)
Subject: thomas: server release-notes.txt,1.81,1.82 
Message-ID: <20070205164450.B5DD71006AC@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Disabled Spanish language selection from web admin interface,
because of missing translation.

The trailing comma in mysmarty.php.in is intentional to make changing
the set of active languages easier in the code. php allows this.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- release-notes.txt	5 Feb 2007 14:29:52 -0000	1.81
+++ release-notes.txt	5 Feb 2007 16:44:48 -0000	1.82
@@ -47,6 +47,9 @@
 
     - kolab-webadmin-2.0.99-20070205
 
+	Disabled Spanish language selection from web admin interface, because
+	of missing translation.
+
 	kolab/issue1479 ("Type" of shared folder can only be modified in 2nd try)
 	kolab/issue1486 ("About Kolab" in Webinterface needs work over)
 	kolab/issue1539 (extension to the opening text, when the manager logs in for the 1st time)



From cvs at kolab.org  Mon Feb  5 18:23:13 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 18:23:13 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.5,
	1.6 
Message-ID: <20070205172313.E67CD1006B3@lists.intevation.de>

Author: wilde

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
Fix: Freebusy was broken after merge of the configuration files.
Just kept the gdbm specific settings, reverted the obscure rest.


Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freebusy.conf.template.in	25 Jan 2007 21:49:55 -0000	1.5
+++ freebusy.conf.template.in	5 Feb 2007 17:23:11 -0000	1.6
@@ -44,10 +44,10 @@
 // does not supply credentials? This account should
 // have access to the calendar mailbox of all the users for which free/busy
 // information is to be retrieved.
-$params['calendar_user'] = '@@@cyrus-admins@@@';
+//$params['calendar_user'] = '@ @@cyrus-admins@@@';
 
 // What password should we use with the above account?
-$params['calendar_pass'] = '@@@bind_pw@@@';
+//$params['calendar_pass'] = '@ @@bind_pw@@@';
 
 // What is the name of the users' calendar mailbox?
 $params['calendar_store'] = 'Calendar';
@@ -81,7 +81,7 @@
 $params['send_content_disposition'] = false;
 
 // Where are we logging to?
-$params['log'] = 'file:@freebusy_logfile@';        // File...
+$params['log'] = 'file:@freebusy_logfile@';                // File...
 // $params['log'] = 'syslog:cons, pid';            // Or syslog...
 
 // What level of output should we log? Higher levels give more verbose output.
@@ -101,5 +101,4 @@
 $params['cache_dir'] = '@freebusy_cachedir@';
 
 // don't change this if you don't have to
-$params['ldap_uri'] = "";
-$params['ldap_classname_suffix'] = "_dummy";
+//$params['ldap_classname_suffix'] = "_dummy";



From cvs at kolab.org  Mon Feb  5 19:24:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 19:24:21 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.105,1.106 
Message-ID: <20070205182421.74ED01006C7@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
News: Kolab Server 2.1 Release Candidate 1 released


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- index.html.m4	18 Jan 2007 11:53:14 -0000	1.105
+++ index.html.m4	5 Feb 2007 18:24:19 -0000	1.106
@@ -47,6 +47,20 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">February 5th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.1 Release Candidate 1 released
+</td></tr>
+</table>
+<div class="newsb">
+  This release fixes more than 10 problems found in Beta 4 and
+  includes the security updates published until now.  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000047.html">
+  announcement</a> for details.
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">January 17th, 2007</td>
 <td class="newsh">&raquo;
   Kolab Server 2.1 Beta 4 released



From cvs at kolab.org  Mon Feb  5 19:34:51 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  5 Feb 2007 19:34:51 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4, 1.106, 1.107 newsarchive.html.m4,
	1.12, 1.13 
Message-ID: <20070205183451.C61411006C7@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 newsarchive.html.m4 
Log Message:
Moved old news to the archive, moved marker to newest entry.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- index.html.m4	5 Feb 2007 18:24:19 -0000	1.106
+++ index.html.m4	5 Feb 2007 18:34:49 -0000	1.107
@@ -60,6 +60,11 @@
 </div>
 <p>
 
+</div> <!-- END LATEST BLOCK -->
+
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
 <table>
 <tr><td class="newsd">January 17th, 2007</td>
 <td class="newsh">&raquo;
@@ -88,14 +93,6 @@
 </div>
 <p>
 
-
-</div> <!-- END LATEST BLOCK -->
-
-
-
-<!-- BEGIN NEWS BLOCK --> <div class="news">
-
-
 <table>
 <tr><td class="newsd">November 16th, 2006</td>
 <td class="newsh">&raquo;
@@ -162,294 +159,6 @@
 	business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
 	shows the Kolab-based Univention Groupware Server (UGS).<br />
 	(hall 3 - booth A3.441-12)
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">October 19th, 2006</td>
-<td class="newsh">&raquo;
-	Security Advisory 13 for Kolab Server (ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
-	Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
-	A new ClamAV RPM with a fix is available.  See the
-	<a href="security/kolab-vendor-notice-13.txt">Kolab Security
-	Issue 13</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">October 9th, 2006</td>
-<td class="newsh">&raquo;
-  Security Advisory 12 for Kolab Server (openssl)	
-</td></tr>
-</table>
-<div class="newsb">
-  The last Kolab Security Advisory contained an incorrect fix for one of
-  the OpenSSL problems.  A new OpenSSL RPM for Kolab Server 2.0.4 is
-  available.  The 2.1 branch update is not affected.  See
-  the <a href="security/kolab-vendor-notice-12.txt">Kolab Security
-  Advisory 12</a> for details.
-</div> 
-<p>
-
-<table>
-<tr><td class="newsd">October 2nd, 2006</td>
-<td class="newsh">&raquo;
-  Security Advisory 11 for Kolab Server (openssl)	
-</td></tr>
-</table>
-<div class="newsb">
-  Several critical problems were discovered in in the cryptography
-  toolkit OpenSSL.  A new OpenSSL RPM is available.  See
-  the <a href="security/kolab-vendor-notice-11.txt">Kolab Security
-  Advisory 11</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">August 22th, 2006</td>
-<td class="newsh">&raquo;
-	New version 2.1.4 of proko2 KDE client is available
-</td></tr>
-</table>
-<div class="newsb">
-        This release contains a fix for a bug introduced in 2.1.3.  The
-        bug makes kontact much harder to use when accessing the same
-        kolab account from multiple machines.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">August 18th, 2006</td>
-<td class="newsh">&raquo;
-	New version 2.1.3 of proko2 KDE client is available
-</td></tr>
-</table>
-<div class="newsb">
-	This release contains a few new features and several bug fixes.
-	A detailed list of the changes can be found in the download
-	section.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">August 11th, 2006</td>
-<td class="newsh">&raquo;
-        Stable server 2.0.4 maintenance release.
-</td></tr>
-</table>
-<div class="newsb">
-	This release contains some security fixes, including the one for
-	Kolab Security Advisory 10 and bug fixes, most notably several
-	for the resource manager.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">August 10th, 2006</td>
-<td class="newsh">&raquo;
-	Security Advisory 10 for Kolab Server (CVE-2006-4018, ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
-	The Clam AntiVirus package's freshclam has a buffer overflow defect
-	that can be exploited remotely.
-	A new ClamAV RPM with a fix is available.  See the
-	<a href="security/kolab-vendor-notice-10.txt">Kolab Security
-	Advisory 10</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">June 26th, 2006</td>
-<td class="newsh">&raquo;
-	New version 2.1.2 of proko2 KDE client is available
-</td></tr>
-</table>
-<div class="newsb">
-	One month after the last release we are happy to announce that a
-	new Proko2 KDE client is out. This is mainly a bugfix release.<br>
-	Take a look at the release notes in the download section
-   for a detailed view of all applied changes.
-   <p>
-	Here is a short overview of the new features and bugfixes.
-	<ul>
-		<li>New: Show quota information in the folder tooltip</li>
-		<li>New: Allow ";" as additional address separator</li>
-		<li>New: Show detailed information about recurrences of events
-		in the invitation mail</li>
-		<li>Fixed: Ressource colors doesn't disappear when deleting an
-		event from the calendar.</li>
-		<li>Fixed: Groupwarefolders are now unsubscribed for online imap
-		after setup with kolabwizard. 
-	</ul>
-   Take a look on the <a href="download.html">download</a> section to get the new release.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">June 3rd, 2006</td>
-<td class="newsh">&raquo;
-	Kolab at LinuxWorld, Seoul, Korea
-</td></tr>
-</table>
-<div class="newsb">
-	If you happen to visit Seoul from the 5th to the 7th of June,
-	drop by the 
-	<a href="http://www.linuxworldkorea.com/">LWCE</a>
-	and visit the Kolab booth (H34). On the 7th Bernhard Reiter will
-	give a talk about Kolab on the afternoon.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">May 18th, 2006</td>
-<td class="newsh">&raquo;
-	New version 2.1.1 of proko2 KDE client is available	
-</td></tr>
-</table>
-<div class="newsb">
-	This release is a bugfix release decorated with some nice new
-	features which are mainly backports from the KDE 3.5 branch.
-	<br>Take a look at the release notes in the download section
-   for a detailed view of all applied changes.
-   <p>
-	A short excerpt of the included features and bugfixes.
-	<ul>
-		<li>New: Coloring of different calendar ressources</li>
-		<li>New: Speed Improvements on large calenders</li>
-		<li>New: Better support for online/offline working</li>
-		<li>Fixed: Many issues related to groupwarefolders in a
-		dIMAP/IMAP environment. </li>
-	</ul>
-   Take a look on the <a href="download.html">download</a> section to get the new release.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">May 16th, 2006</td>
-<td class="newsh">&raquo;
-	Security Advisory 09 for Kolab Server (CVE-2006-1989, ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
-	The Clam AntiVirus package's freshclam has a buffer overflow defect
-	that can be exploited remotely.
-	A new ClamAV RPM with a fix is available.  See the
-	<a href="security/kolab-vendor-notice-09.txt">Kolab Security
-	Advisory 09</a> for details.
-</div>
-<p>
-
-
-
-<table>
-<tr><td class="newsd">May 2nd, 2006</td>
-<td class="newsh">&raquo;
-        Kolab at LinuxTag in Wiesbaden, Germany
-</td></tr>
-</table>
-<div class="newsb">
-      Kolab Groupware will be present at the LinuxTag Expo and
-      Conference held in Wiesbaden, Germany, from May 3rd to 6th.  You
-      can find the Kolab-Konsortium at the Intevation Booth (Hall 9,
-      booth 930)
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">April 7th, 2006</td>
-<td class="newsh">&raquo;
-       KDE Client 2.1.0 Feature Release.
-</td></tr>
-</table>
-<div class="newsb">
-     Six months after the last release we are happy to announce that a
-     new release of the Kolab 2 KDE Client is ready for download. 
-     We call it 2.1.0 as it includes some new features and a lot of 
-     bug fixes.
-     <br>Take a look at the release notes in the download section
-     for a detailed view of all applied changes.
-     <p>
-     Here some of the new features coming with the new release:
-     <ul>
-       <li> Support for online and offline mailfolders. Choose which
-       part of your mails escort you to your offline journeys
-       <li>Implemented offline support of your LDAP addressbook</li>
-       <li>Support for displaying Quota information</li> 
-       <li>Improved detection and protection against ghost messages in case of a crash</li>
-       <li>Sync with Palm devices in KPilot is significantly improved after resolving 
-       many KPilot bugs. One known problem remains. Please look in the release notes.</li> 
-     </ul>
-     Take a look on the <a href="download.html">download</a> section to get the new release.
-     </p>
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">February 10th, 2006</td>
-<td class="newsh">&raquo;
-        Kolab at CeBIT 2006 Fair in Hannover, Germany
-</td></tr>
-</table>
-<div class="newsb">
-      Kolab Groupware will be at the world largest computer fair
-      CeBIT (March 9th &minus; 15th, 2006).
-      Visit Kolab in hall 5 (KDE booth somewhere close to F56), 
-      hall 5 F58/2 and hall 4, booth F52.
-      On selected days,
-      someone from the Kolab-Konsortium will visit the fair. So if you 
-      want to talk to KK: Schedule an appointment in advance.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">January 13th, 2006</td>
-<td class="newsh">&raquo;
-	Security Advisory 08 for Kolab Server
-</td></tr>
-</table>
-<div class="newsb">
-        With the default configuration of the Kolab server, passwords
-	used for authenticated SMTP are written to a logfile in some
-	circumstances.  See the
-	<a href="security/kolab-vendor-notice-08.txt">Kolab Security
-	Advisory 08</a> for details.  Note that the new stable server
-	release, 2.0.3 already contains the fix for this problem.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">January 11th, 2006</td>
-<td class="newsh">&raquo;
-	Stable server 2.0.3 security release.
-</td></tr>
-</table>
-<div class="newsb">
-	Three critical problems came up basically at the same time and
-	triggered the release of Kolab Server 2.0.3 fixing them.  See
-	the <a href="security/kolab-vendor-notice-08.txt">Kolab Security
-	Advisory 08</a> for details on one of the problems fixed by this
-	release.  If you run a Kolab Server, we strongly recommend
-	updating.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">January 11th, 2006</td>
-<td class="newsh">&raquo;
-	Stable server 2.0.2 maintenance release.
-</td></tr>
-</table>
-<div class="newsb">
-	Accumulating the recent security fixes and a couple of minor
-	bugfixes done over the last months, Kolab Server edition 2.0.2
-	is now available from your favourite mirror.
 </div>
 <p>
 

Index: newsarchive.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- newsarchive.html.m4	31 Oct 2006 10:45:27 -0000	1.12
+++ newsarchive.html.m4	5 Feb 2007 18:34:49 -0000	1.13
@@ -12,6 +12,289 @@
 <div class="news">
 
 <table>
+<tr><td class="newsd">October 19th, 2006</td>
+<td class="newsh">&raquo;
+	Security Advisory 13 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+	Two remotely exploitable vulnerabilities were found in the Clam AntiVirus package.
+	A new ClamAV RPM with a fix is available.  See the
+	<a href="security/kolab-vendor-notice-13.txt">Kolab Security
+	Issue 13</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">October 9th, 2006</td>
+<td class="newsh">&raquo;
+  Security Advisory 12 for Kolab Server (openssl)	
+</td></tr>
+</table>
+<div class="newsb">
+  The last Kolab Security Advisory contained an incorrect fix for one of
+  the OpenSSL problems.  A new OpenSSL RPM for Kolab Server 2.0.4 is
+  available.  The 2.1 branch update is not affected.  See
+  the <a href="security/kolab-vendor-notice-12.txt">Kolab Security
+  Advisory 12</a> for details.
+</div> 
+<p>
+
+<table>
+<tr><td class="newsd">October 2nd, 2006</td>
+<td class="newsh">&raquo;
+  Security Advisory 11 for Kolab Server (openssl)	
+</td></tr>
+</table>
+<div class="newsb">
+  Several critical problems were discovered in in the cryptography
+  toolkit OpenSSL.  A new OpenSSL RPM is available.  See
+  the <a href="security/kolab-vendor-notice-11.txt">Kolab Security
+  Advisory 11</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">August 22th, 2006</td>
+<td class="newsh">&raquo;
+	New version 2.1.4 of proko2 KDE client is available
+</td></tr>
+</table>
+<div class="newsb">
+        This release contains a fix for a bug introduced in 2.1.3.  The
+        bug makes kontact much harder to use when accessing the same
+        kolab account from multiple machines.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">August 18th, 2006</td>
+<td class="newsh">&raquo;
+	New version 2.1.3 of proko2 KDE client is available
+</td></tr>
+</table>
+<div class="newsb">
+	This release contains a few new features and several bug fixes.
+	A detailed list of the changes can be found in the download
+	section.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">August 11th, 2006</td>
+<td class="newsh">&raquo;
+        Stable server 2.0.4 maintenance release.
+</td></tr>
+</table>
+<div class="newsb">
+	This release contains some security fixes, including the one for
+	Kolab Security Advisory 10 and bug fixes, most notably several
+	for the resource manager.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">August 10th, 2006</td>
+<td class="newsh">&raquo;
+	Security Advisory 10 for Kolab Server (CVE-2006-4018, ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+	The Clam AntiVirus package's freshclam has a buffer overflow defect
+	that can be exploited remotely.
+	A new ClamAV RPM with a fix is available.  See the
+	<a href="security/kolab-vendor-notice-10.txt">Kolab Security
+	Advisory 10</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">June 26th, 2006</td>
+<td class="newsh">&raquo;
+	New version 2.1.2 of proko2 KDE client is available
+</td></tr>
+</table>
+<div class="newsb">
+	One month after the last release we are happy to announce that a
+	new Proko2 KDE client is out. This is mainly a bugfix release.<br>
+	Take a look at the release notes in the download section
+   for a detailed view of all applied changes.
+   <p>
+	Here is a short overview of the new features and bugfixes.
+	<ul>
+		<li>New: Show quota information in the folder tooltip</li>
+		<li>New: Allow ";" as additional address separator</li>
+		<li>New: Show detailed information about recurrences of events
+		in the invitation mail</li>
+		<li>Fixed: Ressource colors doesn't disappear when deleting an
+		event from the calendar.</li>
+		<li>Fixed: Groupwarefolders are now unsubscribed for online imap
+		after setup with kolabwizard. 
+	</ul>
+   Take a look on the <a href="download.html">download</a> section to get the new release.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">June 3rd, 2006</td>
+<td class="newsh">&raquo;
+	Kolab at LinuxWorld, Seoul, Korea
+</td></tr>
+</table>
+<div class="newsb">
+	If you happen to visit Seoul from the 5th to the 7th of June,
+	drop by the 
+	<a href="http://www.linuxworldkorea.com/">LWCE</a>
+	and visit the Kolab booth (H34). On the 7th Bernhard Reiter will
+	give a talk about Kolab on the afternoon.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">May 18th, 2006</td>
+<td class="newsh">&raquo;
+	New version 2.1.1 of proko2 KDE client is available	
+</td></tr>
+</table>
+<div class="newsb">
+	This release is a bugfix release decorated with some nice new
+	features which are mainly backports from the KDE 3.5 branch.
+	<br>Take a look at the release notes in the download section
+   for a detailed view of all applied changes.
+   <p>
+	A short excerpt of the included features and bugfixes.
+	<ul>
+		<li>New: Coloring of different calendar ressources</li>
+		<li>New: Speed Improvements on large calenders</li>
+		<li>New: Better support for online/offline working</li>
+		<li>Fixed: Many issues related to groupwarefolders in a
+		dIMAP/IMAP environment. </li>
+	</ul>
+   Take a look on the <a href="download.html">download</a> section to get the new release.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">May 16th, 2006</td>
+<td class="newsh">&raquo;
+	Security Advisory 09 for Kolab Server (CVE-2006-1989, ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+	The Clam AntiVirus package's freshclam has a buffer overflow defect
+	that can be exploited remotely.
+	A new ClamAV RPM with a fix is available.  See the
+	<a href="security/kolab-vendor-notice-09.txt">Kolab Security
+	Advisory 09</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">May 2nd, 2006</td>
+<td class="newsh">&raquo;
+        Kolab at LinuxTag in Wiesbaden, Germany
+</td></tr>
+</table>
+<div class="newsb">
+      Kolab Groupware will be present at the LinuxTag Expo and
+      Conference held in Wiesbaden, Germany, from May 3rd to 6th.  You
+      can find the Kolab-Konsortium at the Intevation Booth (Hall 9,
+      booth 930)
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">April 7th, 2006</td>
+<td class="newsh">&raquo;
+       KDE Client 2.1.0 Feature Release.
+</td></tr>
+</table>
+<div class="newsb">
+     Six months after the last release we are happy to announce that a
+     new release of the Kolab 2 KDE Client is ready for download. 
+     We call it 2.1.0 as it includes some new features and a lot of 
+     bug fixes.
+     <br>Take a look at the release notes in the download section
+     for a detailed view of all applied changes.
+     <p>
+     Here some of the new features coming with the new release:
+     <ul>
+       <li> Support for online and offline mailfolders. Choose which
+       part of your mails escort you to your offline journeys
+       <li>Implemented offline support of your LDAP addressbook</li>
+       <li>Support for displaying Quota information</li> 
+       <li>Improved detection and protection against ghost messages in case of a crash</li>
+       <li>Sync with Palm devices in KPilot is significantly improved after resolving 
+       many KPilot bugs. One known problem remains. Please look in the release notes.</li> 
+     </ul>
+     Take a look on the <a href="download.html">download</a> section to get the new release.
+     </p>
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">February 10th, 2006</td>
+<td class="newsh">&raquo;
+        Kolab at CeBIT 2006 Fair in Hannover, Germany
+</td></tr>
+</table>
+<div class="newsb">
+      Kolab Groupware will be at the world largest computer fair
+      CeBIT (March 9th &minus; 15th, 2006).
+      Visit Kolab in hall 5 (KDE booth somewhere close to F56), 
+      hall 5 F58/2 and hall 4, booth F52.
+      On selected days,
+      someone from the Kolab-Konsortium will visit the fair. So if you 
+      want to talk to KK: Schedule an appointment in advance.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">January 13th, 2006</td>
+<td class="newsh">&raquo;
+	Security Advisory 08 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+        With the default configuration of the Kolab server, passwords
+	used for authenticated SMTP are written to a logfile in some
+	circumstances.  See the
+	<a href="security/kolab-vendor-notice-08.txt">Kolab Security
+	Advisory 08</a> for details.  Note that the new stable server
+	release, 2.0.3 already contains the fix for this problem.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">January 11th, 2006</td>
+<td class="newsh">&raquo;
+	Stable server 2.0.3 security release.
+</td></tr>
+</table>
+<div class="newsb">
+	Three critical problems came up basically at the same time and
+	triggered the release of Kolab Server 2.0.3 fixing them.  See
+	the <a href="security/kolab-vendor-notice-08.txt">Kolab Security
+	Advisory 08</a> for details on one of the problems fixed by this
+	release.  If you run a Kolab Server, we strongly recommend
+	updating.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">January 11th, 2006</td>
+<td class="newsh">&raquo;
+	Stable server 2.0.2 maintenance release.
+</td></tr>
+</table>
+<div class="newsb">
+	Accumulating the recent security fixes and a couple of minor
+	bugfixes done over the last months, Kolab Server edition 2.0.2
+	is now available from your favourite mirror.
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">December 22nd, 2005</td>
 <td class="newsh">&raquo;
 	Security Advisory 07 for Kolab Server



From cvs at kolab.org  Tue Feb  6 15:53:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Feb 2007 15:53:45 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.86,1.87 
Message-ID: <20070206145345.AB2AB1005AB@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
fix the path to the freebusy directory



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- ChangeLog	8 Jan 2007 21:28:14 -0000	1.86
+++ ChangeLog	6 Feb 2007 14:53:43 -0000	1.87
@@ -1,4 +1,8 @@
 2007-01-08 Richard Bos <richard at radoeka.nl>
+	* templates/resmgr.conf.template.in: fix the path to the freebusy
+	  directory
+
+2007-01-08 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse, dist_conf/kolab, dist_conf/common,
 	  dist_conf/gentoo, templates/virtual.template.in,
           templates/transport.template.in: changed emailserver_transport_usr



From cvs at kolab.org  Tue Feb  6 15:53:45 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  6 Feb 2007 15:53:45 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.5,
	1.6 
Message-ID: <20070206145345.ADC911005BA@lists.intevation.de>

Author: richard

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
fix the path to the freebusy directory



Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resmgr.conf.template.in	21 Dec 2006 10:59:22 -0000	1.5
+++ resmgr.conf.template.in	6 Feb 2007 14:53:43 -0000	1.6
@@ -72,7 +72,7 @@
 $params['calendar_store'] = 'Calendar';
 
 // Where can we get free/busy information from?
-$params['freebusy_url'] = 'https://@@@fqdnhostname@@@/freebusy/${USER}.xfb';
+$params['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
  
 // PFB url to trigger creation of pfb
 $params['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.xpfb';



From cvs at kolab.org  Sun Feb 11 15:47:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 11 Feb 2007 15:47:53 +0100 (CET)
Subject: marcus: server/kolabd/kolabd/dist_conf common, 1.34, 1.35 gentoo, 1.8,
	1.9 kolab, 1.41, 1.42 suse, 1.55, 1.56 
Message-ID: <20070211144753.A1F5D1006C8@lists.intevation.de>

Author: marcus

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

Modified Files:
	common gentoo kolab suse 
Log Message:

* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
  dist_conf/gentoo: Added new variable TAR
* kolab_bootstrap.in: Added a condition to the slave setup so that
  it won't try to edit the @sysconfdir@/rc.conf file if kolabd was built
  with --without-openpkg

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- common	8 Jan 2007 21:28:14 -0000	1.34
+++ common	11 Feb 2007 14:47:51 -0000	1.35
@@ -18,6 +18,7 @@
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
 	-e 's,[@]RPM[@],$(RPM),g' \
+	-e 's,[@]TAR[@],$(TAR),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
 	-e 's,[@]aliases_file[@],$(aliases_file),g' \

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gentoo	8 Jan 2007 21:28:14 -0000	1.8
+++ gentoo	11 Feb 2007 14:47:51 -0000	1.9
@@ -34,6 +34,7 @@
 KOLABRC=${bindir}/openpkg
 
 RPM=${KOLABRC} rpm
+TAR=/bin/tar
 
 # Define the deamons that are executed with openpkg rc
 LDAPD=openldap

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kolab	8 Jan 2007 21:28:14 -0000	1.41
+++ kolab	11 Feb 2007 14:47:51 -0000	1.42
@@ -22,6 +22,7 @@
 PHP=${bindir}/php
 KOLABRC=${bindir}/openpkg
 RPM=${KOLABRC} rpm
+TAR=${libdir}/openpkg/tar
 
 # Define the deamons that are executed with openpkg rc
 LDAPD=openldap

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- suse	8 Jan 2007 21:28:14 -0000	1.55
+++ suse	11 Feb 2007 14:47:51 -0000	1.56
@@ -13,6 +13,7 @@
 PERL=${bindir}/perl
 PHP=${bindir}/php
 RPM=/bin/rpm
+TAR=/bin/bar
 
 # Define the deamons that are launched from /etc/init.d
 LDAPD=ldap



From cvs at kolab.org  Sun Feb 11 15:47:53 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 11 Feb 2007 15:47:53 +0100 (CET)
Subject: marcus: server/kolabd/kolabd ChangeLog, 1.87, 1.88 kolab_bootstrap.in,
	1.24, 1.25 
Message-ID: <20070211144753.955311006B6@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:

* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
  dist_conf/gentoo: Added new variable TAR
* kolab_bootstrap.in: Added a condition to the slave setup so that
  it won't try to edit the @sysconfdir@/rc.conf file if kolabd was built
  with --without-openpkg

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- ChangeLog	6 Feb 2007 14:53:43 -0000	1.87
+++ ChangeLog	11 Feb 2007 14:47:51 -0000	1.88
@@ -1,3 +1,10 @@
+2007-02-11 Marcus Hüwe <suse-tux at gmx.de>
+	* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
+	  dist_conf/gentoo: Added new variable TAR
+	* kolab_bootstrap.in: Added a condition to the slave setup so that
+	  it won't try to edit the "@sysconfdir@/rc.conf" file if kolabd was built
+	  with "--without-openpkg"
+
 2007-01-08 Richard Bos <richard at radoeka.nl>
 	* templates/resmgr.conf.template.in: fix the path to the freebusy
 	  directory

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- kolab_bootstrap.in	10 Nov 2006 18:06:20 -0000	1.24
+++ kolab_bootstrap.in	11 Feb 2007 14:47:51 -0000	1.25
@@ -840,23 +840,27 @@
 of kolabhosts on the master before proceeding.
 EOS
   kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ stop");
-  kolab_system("ssh -CA $master_host @libdir@/openpkg/tar -C @ldapserver_statedir@ -pcf - openldap-data | @libdir@/openpkg/tar -C @ldapserver_statedir@ -pxf -");
+  kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
   kolab_system("ssh -CA $master_host @KOLABRC@ rc @LDAPD@ start");
 
-  print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
-  my $cfg;
-  open(FH, "<@sysconfdir@/rc.conf") || die;
-  $cfg .= $_ while (<FH>);
-  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;
+  # FIXME: we should get rid of this construct because it makes the code hard to read.
+  #        A if (-e @sysconfdir@/rc.conf) statement should be enough.
+  if ("@WITHOPENPKG@" eq "yes") {
+    print "Updating configuration, please ignore any initial errors from kolabconf\n\n";
+    my $cfg;
+    open(FH, "<@sysconfdir@/rc.conf") || die;
+    $cfg .= $_ while (<FH>);
+    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



From cvs at kolab.org  Tue Feb 13 14:32:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 14:32:23 +0100 (CET)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.4,
	1.5 
Message-ID: <20070213133223.F329A1006CE@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Backup after stopping the server, disable cron jobs to ensure consistency.


Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_2.0_to_2.1_upgrade_instructions.txt	15 Nov 2006 17:37:40 -0000	1.4
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 13:32:21 -0000	1.5
@@ -13,17 +13,21 @@
 Preparation for the Upgrade
 ---------------------------
 
-1. Backup the old installation.
-
+1. Stop the Kolab Server and related cronjobs:
 
-2. Stop the Kolab Server
+    Comment out all OpenPKG entries in /etc/crontab, then run:
 
     /kolab/bin/openpkg rc all stop
 
-3. Extract ldap data
+2. Backup the old installation:
 
-Copy the contents of the openldap database (use a different output
-filename if you want):
+    You could use rsync on the running server and then rsync again
+    to transfer only changed files to keep the downtime short.
+
+3. Extract ldap data:
+
+    Copy the contents of the openldap database (use a different output
+    filename if you want):
 
     /kolab/sbin/slapcat > ~/kolab-2.0.ldif
 



From cvs at kolab.org  Tue Feb 13 14:58:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 14:58:02 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.13, 1.14 
Message-ID: <20070213135802.747BF1006D9@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
In directory doto:/tmp/cvs-serv4574

Modified Files:
	messages.po 
Log Message:
Updated French translation from Jean-Michel LACROIX


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- messages.po	2 Feb 2007 17:22:10 -0000	1.13
+++ messages.po	13 Feb 2007 13:58:00 -0000	1.14
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-02 18:19+0100\n"
-"PO-Revision-Date: 2006-10-17 13:36+0100\n"
+"POT-Creation-Date: 2007-02-13 14:52+0100\n"
+"PO-Revision-Date: 2007-02-13 14:35+0100\n"
 "Last-Translator: Jean-Michel LACROIX <jm-lacroix at savigny.org>\n"
 "Language-Team:  <fr at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,6 @@
 msgstr "Filtre"
 
 #: tpl_messages.php:17
-#, fuzzy
 msgid "Entry deleted, awaiting cleanup..."
 msgstr "Répertoire effacé, en attente de nettoyage..."
 
@@ -338,22 +337,18 @@
 msgstr "Publique"
 
 #: tpl_messages.php:72
-#, fuzzy
 msgid "List deleted, awaiting cleanup..."
 msgstr "Utilisateur effacé, en attente du nettoyage..."
 
 #: tpl_messages.php:75
-#, fuzzy
 msgid "The distribution list with DN"
 msgstr "L'administrateur avec le DN"
 
 #: tpl_messages.php:77
-#, fuzzy
 msgid "Back to list of distribution lists"
 msgstr "Retour à la liste des administrateurs"
 
 #: tpl_messages.php:84
-#, fuzzy
 msgid ""
 "Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
 "\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
@@ -480,7 +475,6 @@
 "les groupes USENET, et des canaux IRC auquel nous convions tout le monde."
 
 #: tpl_messages.php:100
-#, fuzzy
 msgid ""
 "<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
 "growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
@@ -516,7 +510,7 @@
 
 #: tpl_messages.php:104
 msgid "(Mail Scanner)"
-msgstr ""
+msgstr "(Scanner de courrier)"
 
 #: tpl_messages.php:105
 msgid "(HTTP Server)"
@@ -524,7 +518,7 @@
 
 #: tpl_messages.php:106
 msgid "(Virus Scanner)"
-msgstr ""
+msgstr "(Scanner de virus)"
 
 #: tpl_messages.php:107
 msgid "(IMAP Server)"
@@ -543,9 +537,8 @@
 msgstr "(Serveur FTP)"
 
 #: tpl_messages.php:111
-#, fuzzy
 msgid "(SPAM Filter)"
-msgstr "Filtre"
+msgstr "(Filtre anti-spam)"
 
 #: tpl_messages.php:112
 msgid ""
@@ -704,27 +697,27 @@
 msgid "Back to list of maintainers"
 msgstr "Retour à la liste des mainteneurs"
 
-#: tpl_messages.php:137
+#: tpl_messages.php:137 tpl_messages.php:246
 msgid "User:"
 msgstr "Utilisateur:"
 
-#: tpl_messages.php:138
+#: tpl_messages.php:138 tpl_messages.php:247
 msgid "Role:"
 msgstr "Rôle:"
 
-#: tpl_messages.php:139
+#: tpl_messages.php:139 tpl_messages.php:248
 msgid "Logout"
 msgstr "Se déconnecter"
 
-#: tpl_messages.php:140
+#: tpl_messages.php:140 tpl_messages.php:249
 msgid "Not logged in"
 msgstr "pas connecté"
 
-#: tpl_messages.php:141
+#: tpl_messages.php:141 tpl_messages.php:250
 msgid "Errors:"
 msgstr "Erreurs:"
 
-#: tpl_messages.php:142
+#: tpl_messages.php:142 tpl_messages.php:251
 msgid "Message:"
 msgstr "Message:"
 
@@ -755,7 +748,6 @@
 "liste de distribution"
 
 #: tpl_messages.php:146
-#, fuzzy
 msgid ""
 "Email address of account that should receive administrative mail for domain "
 msgstr ""
@@ -793,7 +785,6 @@
 "ne peut être désactivé )."
 
 #: tpl_messages.php:151
-#, fuzzy
 msgid ""
 "Further details with regards to security considerations might be available "
 "from the <a href=\"http://www.kolab.org\">Kolab Project</a>."
@@ -864,7 +855,6 @@
 msgstr "serveur relais smtp"
 
 #: tpl_messages.php:170
-#, fuzzy
 msgid ""
 "Smarthost (and optional port) to use to send outgoing mail (host.domain."
 "tld). Leave empty for no relayhost."
@@ -877,7 +867,6 @@
 msgstr "Accepter les messages venant internet"
 
 #: tpl_messages.php:173
-#, fuzzy
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
 "enabled if you want to use the Kolab Server to receive mail from other "
@@ -890,7 +879,6 @@
 
 #: tpl_messages.php:175
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:139
-#, fuzzy
 msgid "Domains"
 msgstr "contient"
 
@@ -913,7 +901,6 @@
 "réel."
 
 #: tpl_messages.php:182
-#, fuzzy
 msgid ""
 "Use the Sender header instead of From for the above checks if Sender is "
 "present."
@@ -932,12 +919,10 @@
 "est réécrite pour en informer le destinataire."
 
 #: tpl_messages.php:184
-#, fuzzy
 msgid "Always reject the message."
 msgstr "Toujours rejeter"
 
 #: tpl_messages.php:185
-#, fuzzy
 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 "
@@ -959,12 +944,10 @@
 msgstr "Serveur"
 
 #: tpl_messages.php:192
-#, fuzzy
 msgid "The shared folder with DN"
 msgstr "L'utilisateur avec le DN"
 
 #: tpl_messages.php:194
-#, fuzzy
 msgid "Back to list of shared folders"
 msgstr "Retour à la liste des utilisateurs"
 
@@ -993,7 +976,6 @@
 msgstr "Note:"
 
 #: tpl_messages.php:205
-#, fuzzy
 msgid ""
 "No account is configured to receive mail for administrative addresses. If "
 "you have not yet created an account for this, "
@@ -1004,11 +986,11 @@
 
 #: tpl_messages.php:206
 msgid "please do so"
-msgstr ""
+msgstr "veuillez le faire"
 
 #: tpl_messages.php:207
 msgid "and then go"
-msgstr ""
+msgstr "et ensuite aller"
 
 #: tpl_messages.php:208
 msgid "here"
@@ -1192,7 +1174,7 @@
 #: ../../../www/admin/addressbook/addr.php.in:208
 #, fuzzy, php-format
 msgid "LDAP Error: could not rename %s to %s: %s"
-msgstr "Erreur LDAP: impossible de renommer"
+msgstr "Erreur LDAP: impossible de renommer  %s en %s: %s"
 
 #: ../../../www/admin/addressbook/addr.php.in:211
 #: ../../../www/admin/addressbook/addr.php.in:224
@@ -1207,7 +1189,7 @@
 #: ../../../www/admin/sharedfolder/sf.php.in:230
 #, fuzzy, php-format
 msgid "LDAP Error: could not read %s: %s"
-msgstr "Erreur LDAP: Impossible de lire"
+msgstr "Erreur LDAP: Impossible de lire  %s: %s"
 
 #: ../../../www/admin/addressbook/addr.php.in:221
 #: ../../../www/admin/administrator/admin.php.in:243
@@ -1242,7 +1224,7 @@
 #: ../../../www/admin/addressbook/addr.php.in:287
 #, php-format
 msgid "Error: No entry with DN %s found"
-msgstr ""
+msgstr "Erreur: Aucune entré avec le DN %s n'a été trouvé"
 
 #: ../../../www/admin/addressbook/addr.php.in:284
 msgid "Delete External Address"
@@ -1267,6 +1249,8 @@
 "Failure to remove addressbook entry from distribution list '%s', entry will "
 "not be deleted."
 msgstr ""
+"Echec lors de la suppression de l'entré du carnet d'adresse de la liste de "
+"distribution '%s'. Elle ne sera pas supprimée."
 
 #: ../../../www/admin/addressbook/addr.php.in:318
 #, fuzzy, php-format
@@ -1282,7 +1266,7 @@
 #: ../../../www/admin/addressbook/addr.php.in:322
 #, php-format
 msgid "Address book entry with DN %s was deleted"
-msgstr ""
+msgstr "L'entré du carnet d'adresse avec le DN %s à été supprimé."
 
 #: ../../../www/admin/addressbook/index.php.in:124
 #: ../../../www/admin/user/index.php.in:186
@@ -1473,7 +1457,7 @@
 #: ../../../www/admin/distributionlist/list.php.in:50
 #, php-format
 msgid "No user with email address, UID or alias %s"
-msgstr ""
+msgstr "Pas d'utilisateur avec l'adresse email, l'UID ou l'alias %s"
 
 #: ../../../www/admin/distributionlist/list.php.in:62
 msgid "User or distribution list with this email address already exists"
@@ -1512,7 +1496,7 @@
 #: ../../../www/admin/distributionlist/list.php.in:179
 #, php-format
 msgid "No user with address %s"
-msgstr ""
+msgstr "Pas d'utilisateur avec %s"
 
 #: ../../../www/admin/distributionlist/list.php.in:195
 #: ../../../www/admin/user/user.php.in:660
@@ -1551,7 +1535,7 @@
 #: ../../../www/admin/user/user.php.in:740
 #, php-format
 msgid "Mid-air collision detected, email address %1$s renamed to %2$s"
-msgstr ""
+msgstr "Un collision a été détecté, l'adresse email %1$s a été renommé %2$s"
 
 #: ../../../www/admin/distributionlist/list.php.in:245
 #, fuzzy, php-format
@@ -1589,8 +1573,9 @@
 msgstr "Erreur LDAP: impossible d'effacer"
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:141
+#, fuzzy
 msgid "Check domains this domain maintainer should be able to maintain"
-msgstr ""
+msgstr "Vérifier les domaines que ce mainteneur doit être capable de maintenir"
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:293
@@ -1679,7 +1664,7 @@
 #: ../../../www/admin/service/index.php.in:100
 #, php-format
 msgid "No account found for email address %s"
-msgstr ""
+msgstr "Pas de compte trouvé pour l'adresse email %s"
 
 #: ../../../www/admin/service/index.php.in:109
 #, fuzzy, php-format
@@ -1803,7 +1788,7 @@
 #: ../../../www/admin/sharedfolder/sf.php.in:100
 #, php-format
 msgid "No UID or GID %s"
-msgstr ""
+msgstr "Pas de UID ou GID %s"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:116
 msgid "Folder Name"
@@ -1888,6 +1873,8 @@
 "Suggest your system administrator to run \"@bindir@/pear install http://pear."
 "php.net/get/Net_Sieve\" on the server"
 msgstr ""
+"Suggérez à votre administrateur système de lancer \"@bindir@/pear install "
+"http://pear.php.net/get/Net_Sieve\" sur le serveur"
 
 #: ../../../www/admin/user/deliver.php.in:66
 #: ../../../www/admin/user/forward.php.in:70
@@ -1935,7 +1922,7 @@
 #: ../../../www/admin/user/user.php.in:111
 #, php-format
 msgid "Email address %1$s not in domains %2$s"
-msgstr ""
+msgstr "L'adresse email %1$s n'est pas dans les domaines %2$s"
 
 #: ../../../www/admin/user/user.php.in:147
 msgid "UID "
@@ -1944,20 +1931,20 @@
 #: ../../../www/admin/user/user.php.in:162
 #, php-format
 msgid "Email-Delegate %s does not exist"
-msgstr ""
+msgstr "L'adresse email délégué %s n'existe pas"
 
 #: ../../../www/admin/user/user.php.in:175
 #, php-format
 msgid "Illegal user or group %s"
-msgstr ""
+msgstr "Nom d'utilisateur ou de groupe interdit : %s"
 
 #: ../../../www/admin/user/user.php.in:186
 msgid "Quota must be smaller than 4096"
-msgstr ""
+msgstr "Le quota doit être inférieur à 4096"
 
 #: ../../../www/admin/user/user.php.in:187
 msgid "Quota can not be negative"
-msgstr ""
+msgstr "Le quota ne peut pas être négatif"
 
 #: ../../../www/admin/user/user.php.in:427
 msgid "Unique Identity (UID)"
@@ -2026,6 +2013,8 @@
 #: ../../../www/admin/user/user.php.in:453
 msgid "Others allowed to send emails with a \"from\" address of this account."
 msgstr ""
+"Ceux qui sont autorisé à envoyer un email avec une adresse \"expéditeur\" de "
+"ce compte."
 
 #: ../../../www/admin/user/user.php.in:454
 #, fuzzy
@@ -2068,7 +2057,7 @@
 #: ../../../www/admin/user/user.php.in:755
 #, php-format
 msgid "Mid-air collision detected, alias %1$s renamed to %2$s"
-msgstr ""
+msgstr "Un collision a été détecté, l'alias %1$s a été renommé %2$s"
 
 #: ../../../www/admin/user/user.php.in:708
 #: ../../../www/admin/user/user.php.in:788
@@ -2106,6 +2095,8 @@
 "Failure to remove account from distribution list '%s', account will not be "
 "deleted."
 msgstr ""
+"Echec lors de la tentative de suppresion du compte de la liste '%s', le "
+"compte ne sera pas supprimé."
 
 #: ../../../www/admin/user/user.php.in:843
 #, fuzzy, php-format
@@ -2118,7 +2109,7 @@
 
 #: ../../../www/admin/user/vacation.php.in:43
 msgid "Days must be at least one"
-msgstr ""
+msgstr "Le nombre de jour doit au moins être égal à un"
 
 #: ../../../www/admin/user/vacation.php.in:65
 msgid "Vacation message successfully activated"
@@ -2172,7 +2163,7 @@
 #: ../../../www/admin/user/vacation.php.in:95
 #, php-format
 msgid "-- \r\n"
-msgstr ""
+msgstr "-- \r\n"
 
 #: ../../../www/admin/user/vacation.php.in:96
 #, php-format



From cvs at kolab.org  Tue Feb 13 15:08:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 15:08:20 +0100 (CET)
Subject: thomas: server release-notes.txt,1.82,1.83 
Message-ID: <20070213140820.88DBA1006D9@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- release-notes.txt	5 Feb 2007 16:44:48 -0000	1.82
+++ release-notes.txt	13 Feb 2007 14:08:18 -0000	1.83
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 20070205, Kolab Server 2.1 rc 1)
+(Version 20070???, Kolab Server 2.1 rc 1 + CVS)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
@@ -33,6 +33,21 @@
       kolabconf. For new installations the new default setting is recommended
       because it's more efficient especially when you have many mailboxes.
       For details see kolab/issue1089.
+
+
+Changes since 2.1 rc 1:
+
+    - kolabd-2.1.0-20070???
+
+	Fix the path to the freebusy directory for non-OpenPKG installations.
+
+    - kolab-horde-fbview-2.1.0-20070???
+
+    - kolab-resource-handlers-2.1.0-20070???
+
+    - kolab-webadmin-2.1.0-20070???
+
+	kolab/issue1457 (updated French translation)
 
 
 Changes since 2.1 beta 4:



From cvs at kolab.org  Tue Feb 13 15:10:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 15:10:59 +0100 (CET)
Subject: wilde: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.5,
	1.6 
Message-ID: <20070213141059.01E8D1006D9@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Added instructions on converting cyrus databases to berkeley format.


Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 13:32:21 -0000	1.5
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 14:10:56 -0000	1.6
@@ -84,6 +84,30 @@
 https://intevation.de/roundup/kolab/issue1089
 
 
+The default database format for /kolab/var/imapd/annotations.db and
+/kolab/var/imapd/mailboxes.db has changed from skiplist to berkeley db.
+
+If you want to keep the old format, comment out or remove the lines
+"annotation_db: berkeley" and "mboxlist_db: berkeley" in the file
+"/kolab/etc/kolab/templates/imapd.conf.template" and make sure the file
+"/kolab/etc/imapd/imapd.conf" reflects this, too.
+
+To convert the databases to berkeley db format, execute as root:
+
+su - kolab-r
+cd /kolab/var/imapd/
+mv annotations.db annotations.db-skiplist
+/kolab/bin/cvt_cyrusdb /kolab/var/imapd/annotations.db-skiplist skiplist \
+                       /kolab/var/imapd/annotations.db berkeley
+mv mailboxes.db mailboxes.db-skiplist
+/kolab/bin/cvt_cyrusdb /kolab/var/imapd/mailboxes.db-skiplist skiplist \
+                       /kolab/var/imapd/mailboxes.db berkeley
+exit
+
+See http://wiki.kolab.org/index.php/Kolab2_IMAPD_annotations.db_Problems
+for details about this topic.
+
+
 3. LDAP
 
 You need to make two small changes to the configuration file



From cvs at kolab.org  Tue Feb 13 15:15:43 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 15:15:43 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/dist_conf suse,1.56,1.57 
Message-ID: <20070213141543.3170D1006D9@lists.intevation.de>

Author: thomas

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

Modified Files:
	suse 
Log Message:
Corrected typo in kolabd/dist_conf/suse: /bin/bar -> /bin/tar


Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- suse	11 Feb 2007 14:47:51 -0000	1.56
+++ suse	13 Feb 2007 14:15:41 -0000	1.57
@@ -13,7 +13,7 @@
 PERL=${bindir}/perl
 PHP=${bindir}/php
 RPM=/bin/rpm
-TAR=/bin/bar
+TAR=/bin/tar
 
 # Define the deamons that are launched from /etc/init.d
 LDAPD=ldap



From cvs at kolab.org  Tue Feb 13 15:17:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 15:17:31 +0100 (CET)
Subject: thomas: server release-notes.txt,1.83,1.84 
Message-ID: <20070213141731.5C1781006AC@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- release-notes.txt	13 Feb 2007 14:08:18 -0000	1.83
+++ release-notes.txt	13 Feb 2007 14:17:29 -0000	1.84
@@ -41,6 +41,9 @@
 
 	Fix the path to the freebusy directory for non-OpenPKG installations.
 
+	Fix usage of tar and modification of rc.conf during slave setup for
+	non-OpenPKG installations.
+
     - kolab-horde-fbview-2.1.0-20070???
 
     - kolab-resource-handlers-2.1.0-20070???



From cvs at kolab.org  Tue Feb 13 15:19:24 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 15:19:24 +0100 (CET)
Subject: wilde: server README.1st,1.47,1.48 
Message-ID: <20070213141924.504A01006B7@lists.intevation.de>

Author: wilde

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

Modified Files:
	README.1st 
Log Message:
Small change in the 2.0 to 2.1 section:
As the 2.0 to 2.1 upgrade instructions given in
kolab_2.0_to_2.1_upgrade_instructions.txt should be mostly self
contained by now, I reduced the strength of the demand to read all the
update instructions in the README.1st a bit.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- README.1st	5 Feb 2007 15:16:52 -0000	1.47
+++ README.1st	13 Feb 2007 14:19:22 -0000	1.48
@@ -91,8 +91,8 @@
 http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt
 
 Please read carefully all the following update instructions in this
-file, while some of the information might be redundant there are
-additional notes which are essential for an successful update.
+file, while some of the information will be redundant there are might
+be additional notes which are essential for an successful update.
 
 
 Upgrade from pre-2.1-snapshot-20051130



From cvs at kolab.org  Tue Feb 13 15:33:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 15:33:31 +0100 (CET)
Subject: thomas: server README.1st,1.48,1.49 
Message-ID: <20070213143331.DB6481006C9@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Fixed typo in README.1st


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- README.1st	13 Feb 2007 14:19:22 -0000	1.48
+++ README.1st	13 Feb 2007 14:33:29 -0000	1.49
@@ -91,7 +91,7 @@
 http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt
 
 Please read carefully all the following update instructions in this
-file, while some of the information will be redundant there are might
+file, while some of the informations will be redundant there might
 be additional notes which are essential for an successful update.
 
 



From cvs at kolab.org  Tue Feb 13 15:45:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 15:45:02 +0100 (CET)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.6,
	1.7 
Message-ID: <20070213144502.F24541006C9@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
upgrade-ldap.py is named convert-ldif-21.py


Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 14:10:56 -0000	1.6
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 14:45:00 -0000	1.7
@@ -138,7 +138,7 @@
    python convert-ldif-21.py ~/kolab-2.0.ldif ~/kolab-2.1.ldif
 
 
-Then restore the openldap data using the output from upgrade-ldap.py:
+Then restore the openldap data using the output from convert-ldif-21.py:
 
    rm /kolab/var/openldap/openldap-data/*
    /kolab/sbin/slapadd -l ~/kolab-2.1.ldif



From cvs at kolab.org  Tue Feb 13 16:57:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 16:57:59 +0100 (CET)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.7,
	1.8 
Message-ID: <20070213155759.8CF5C1006AC@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Hint for python-ldap and typo.


Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 14:45:00 -0000	1.7
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 15:57:57 -0000	1.8
@@ -133,7 +133,8 @@
 
   http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/utils/admin/convert-ldif-21.py
 
-The script works on the ldif data that was exported with slapcat earlier:
+The script works on the ldif data that was exported with slapcat earlier,
+it requires python-ldap:
 
    python convert-ldif-21.py ~/kolab-2.0.ldif ~/kolab-2.1.ldif
 
@@ -154,7 +155,7 @@
     /kolab/sbin/kolabconf
 
 
-Kolabconf will might complain about be some files ending .rpmnew under
+Kolabconf might complain about be some files ending .rpmnew under
 /kolab/etc.  Check those files and move them out of the way.  It's
 likely that you can simply remove them.
 



From cvs at kolab.org  Tue Feb 13 22:36:39 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 13 Feb 2007 22:36:39 +0100 (CET)
Subject: thomas: server README.1st,1.49,1.50 
Message-ID: <20070213213639.004B61006AE@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
"information" is an uncountable noun (found by Marcus Hüwe)


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- README.1st	13 Feb 2007 14:33:29 -0000	1.49
+++ README.1st	13 Feb 2007 21:36:36 -0000	1.50
@@ -91,7 +91,7 @@
 http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt
 
 Please read carefully all the following update instructions in this
-file, while some of the informations will be redundant there might
+file, while some of the information will be redundant there might
 be additional notes which are essential for an successful update.
 
 



From cvs at kolab.org  Wed Feb 14 14:01:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Feb 2007 14:01:57 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.8,
	1.9 
Message-ID: <20070214130157.0471D1006A9@lists.intevation.de>

Author: thomas

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

Modified Files:
	amavisd.conf.template.in 
Log Message:
Don't pass notifications and quarantined mails through amavisd-new twice.

This breaks mail loops when quarantined mails are sent to an email address,
where setting spam_lovers was enough in older releases.


Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- amavisd.conf.template.in	8 Jan 2007 01:18:05 -0000	1.8
+++ amavisd.conf.template.in	14 Feb 2007 13:01:54 -0000	1.9
@@ -102,7 +102,7 @@
 # (set host and port number as required; host can be specified
 # as IP address or DNS name (A or CNAME, but MX is ignored)
 $forward_method = 'smtp:127.0.0.1:10026';  # where to forward checked mail
-#$notify_method = $forward_method;          # where to submit notifications
+$notify_method = $forward_method;          # where to submit notifications
 
 # NOTE: The defaults (above) are good for Postfix or dual-sendmail. You MUST
 #       uncomment the appropriate settings below if using other setups!



From cvs at kolab.org  Wed Feb 14 15:56:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Feb 2007 15:56:22 +0100 (CET)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.8,
	1.9 
Message-ID: <20070214145622.854CB1006D0@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Added missing reactivation of cron jobs to 2.0->2.1 upgrading docs.


Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab_2.0_to_2.1_upgrade_instructions.txt	13 Feb 2007 15:57:57 -0000	1.8
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	14 Feb 2007 14:56:20 -0000	1.9
@@ -186,5 +186,7 @@
    otherwise deprecated cronjobs will be run and generate mails with
    error messages to the kolab administrator.
 
+3. Activate the entries for OpenPKG in /etc/crontab again.
+
 
 $Id$



From cvs at kolab.org  Wed Feb 14 18:42:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Feb 2007 18:42:00 +0100 (CET)
Subject: thomas: server/clamav - New directory 
Message-ID: <20070214174200.28DD01006C7@lists.intevation.de>

Author: thomas

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

Log Message:
Directory /kolabrepository/server/clamav added to the repository




From cvs at kolab.org  Wed Feb 14 18:44:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Feb 2007 18:44:19 +0100 (CET)
Subject: thomas: server obmtool.conf,1.239,1.240 release-notes.txt,1.84,1.85 
Message-ID: <20070214174419.568A91006C7@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf release-notes.txt 
Log Message:
Added clamav 0.90 with new config templates, release-notes and obmtool.conf


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- obmtool.conf	5 Feb 2007 13:55:43 -0000	1.239
+++ obmtool.conf	14 Feb 2007 17:44:17 -0000	1.240
@@ -145,12 +145,10 @@
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
     @trigger ${loc}curl-7.15.0-2.5.2
-    @install ${altloc}clamav-0.88.7-20061211
-#    @install ${loc}vim-6.3.78-2.4.0
-#    @install ${plusloc}dcron-2.9-2.4.0
+    @install ${altloc}clamav-0.90-20070214_kolab
     @install ${altloc}perl-kolab-5.8.7-20070117
-    @install ${altloc}kolabd-2.0.99-20070205 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20070205 --define kolab_version=$kolab_version
+    @install ${altloc}kolabd-2.0.99-20070214 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20070214 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
     @install ${altloc}kolab-resource-handlers-2.0.99-20070117 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- release-notes.txt	13 Feb 2007 14:17:29 -0000	1.84
+++ release-notes.txt	14 Feb 2007 17:44:17 -0000	1.85
@@ -37,12 +37,20 @@
 
 Changes since 2.1 rc 1:
 
+    - clamav-0.90-20070214_kolab
+
+	New upstream version.
+
     - kolabd-2.1.0-20070???
 
 	Fix the path to the freebusy directory for non-OpenPKG installations.
 
 	Fix usage of tar and modification of rc.conf during slave setup for
 	non-OpenPKG installations.
+
+	Don't pass notifications and quarantined mails through amavisd-new.
+
+	Updated configuration templates for ClamAV 0.90
 
     - kolab-horde-fbview-2.1.0-20070???
 



From cvs at kolab.org  Wed Feb 14 18:44:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Feb 2007 18:44:19 +0100 (CET)
Subject: thomas: server/clamav Makefile,NONE,1.1 kolab.patch,NONE,1.1 
Message-ID: <20070214174419.73FFA1006D0@lists.intevation.de>

Author: thomas

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

Added Files:
	Makefile kolab.patch 
Log Message:
Added clamav 0.90 with new config templates, release-notes and obmtool.conf


--- NEW FILE: Makefile ---
ifeq "x$(KOLABPKGURI)" "x"
  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC/EVAL/
endif
ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
  KOLABRPMPKG = /kolab/RPM/PKG
endif
ifeq "x$(KOLABCVSDIR)" "x"
  KOLABCVSDIR = $(CURDIR)
endif

PACKAGE=clamav
VERSION=0.90
RELEASE=20070214
KOLABRELEASE=20070214_kolab

RPM=/kolab/bin/openpkg rpm
KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`

all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm

$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab.patch
	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/
	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec 
	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

dist: all
	cp -p $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/

clean:
	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)

--- NEW FILE: kolab.patch ---
--- clamav.spec.orig	2007-02-14 06:54:23.000000000 +0100
+++ clamav.spec	2007-02-14 17:54:29.000000000 +0100
@@ -33,7 +33,7 @@
 Group:        AntiVirus
 License:      GPL
 Version:      0.90
-Release:      20070214
+Release:      20070214_kolab
 
 #   package options
 %option       with_milter  no
@@ -46,8 +46,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2
+PreReq:       OpenPKG, openpkg >= 2.4.3
 BuildPreReq:  zlib, curl, gmp
 PreReq:       zlib, curl, gmp
 %if "%{with_milter}" == "yes"
@@ -84,6 +84,7 @@
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
+    LIBS="-lintl -liconv" \
     GREP="grep" \
     ./configure \
         --prefix=%{l_prefix} \
@@ -121,10 +122,10 @@
     %{l_shtool} install -c -m 644 \
         -e 's;^\(Example\);#\1;' \
         -e 's;^#\(LogFile\) /.*;\1 %{l_prefix}/var/clamav/clamd.log;' \
-        -e 's;^#\(LogTime\).*;\1;' \
+        -e 's;^#\(LogTime.*\);\1;' \
         -e 's;^#\(PidFile\).*;\1 %{l_prefix}/var/clamav/clamd.pid;' \
         -e 's;^\(LocalSocket\).*;\1 %{l_prefix}/var/clamav/clamd.sock;' \
-        -e 's;^#\(FixStaleSocket\).*;\1;' \
+        -e 's;^#\(FixStaleSocket.*\);\1;' \
         -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
         -e 's;^#\(User\).*;\1 %{l_rusr};' \
         etc/clamd.conf \



From cvs at kolab.org  Wed Feb 14 18:44:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Feb 2007 18:44:19 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates clamd.conf.template.in, 1.1,
	1.2 freshclam.conf.template.in, 1.1, 1.2 
Message-ID: <20070214174419.7B3C91006D9@lists.intevation.de>

Author: thomas

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

Modified Files:
	clamd.conf.template.in freshclam.conf.template.in 
Log Message:
Added clamav 0.90 with new config templates, release-notes and obmtool.conf


Index: clamd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/clamd.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- clamd.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ clamd.conf.template.in	14 Feb 2007 17:44:17 -0000	1.2
@@ -25,10 +25,10 @@
 # copy the configuration file, change the LogFile variable, and run
 # the daemon with --config-file option).
 # This option disables log file locking.
-# Default: disabled
-#LogFileUnlock
+# Default: no
+#LogFileUnlock yes
 
-# Maximal size of the log file.
+# Maximum size of the log file.
 # Value of 0 disables the limit.
 # You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)
 # and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size
@@ -37,17 +37,17 @@
 #LogFileMaxSize 2M
 
 # Log time with each message.
-# Default: disabled
-LogTime
+# Default: no
+LogTime yes
 
 # Also log clean files. Useful in debugging but drastically increases the
 # log size.
-# Default: disabled
-#LogClean
+# Default: no
+#LogClean yes
 
 # Use system logger (can work together with LogFile).
-# Default: disabled
-#LogSyslog
+# Default: no
+#LogSyslog yes
 
 # Specify the type of syslog messages - please refer to 'man syslog'
 # for facility names.
@@ -55,8 +55,8 @@
 #LogFacility LOG_MAIL
 
 # Enable verbose logging.
-# Default: disabled
-#LogVerbose
+# Default: no
+#LogVerbose yes
 
 # This option allows you to save a process identifier of the listening
 # daemon (main thread).
@@ -75,22 +75,22 @@
 # recommend the local mode.
 
 # Path to a local socket file the daemon will listen on.
-# Default: disabled
+# Default: disabled (must be specified by a user)
 LocalSocket @clamav_socket@
 
 # Remove stale socket after unclean shutdown.
-# Default: disabled
-FixStaleSocket
+# Default: no
+FixStaleSocket yes
 
 # TCP port address.
-# Default: disabled
+# Default: no
 #TCPSocket 3310
 
 # TCP address.
 # By default we bind to INADDR_ANY, probably not wise.
 # Enable the following to provide some degree of protection
 # from the outside world.
-# Default: disabled
+# Default: no
 #TCPAddr 127.0.0.1
 
 # Maximum length the queue of pending connections may grow to.
@@ -101,8 +101,8 @@
 # If you are using clamav-milter to balance load between remote clamd daemons
 # on firewall servers you may need to tune the options below.
 
-# Close the connection if this limit is exceeded.
-# The value should match your MTA's limit for a maximal attachment size.
+# Close the connection when the data size limit is exceeded.
+# The value should match your MTA's limit for a maximum attachment size.
 # Default: 10M
 #StreamMaxLength 20M
 
@@ -112,7 +112,7 @@
 # Default: 2048
 #StreamMaxPort 32000
 
-# Maximal number of threads running at the same time.
+# Maximum number of threads running at the same time.
 # Default: 10
 #MaxThreads 20
 
@@ -125,105 +125,146 @@
 # Default: 30
 #IdleTimeout 60
 
-# Maximal depth directories are scanned at.
+# Maximum depth directories are scanned at.
 # Default: 15
 #MaxDirectoryRecursion 20
 
 # Follow directory symlinks.
-# Default: disabled
-#FollowDirectorySymlinks
+# Default: no
+#FollowDirectorySymlinks yes
 
 # Follow regular file symlinks.
-# Default: disabled
-#FollowFileSymlinks
+# Default: no
+#FollowFileSymlinks yes
 
-# Perform internal sanity check (database integrity and freshness).
+# Perform a database check.
 # Default: 1800 (30 min)
 #SelfCheck 600
 
 # Execute a command when virus is found. In the command string %v will
-# be replaced by a virus name.
-# Default: disabled
-#VirusEvent @bindir@/send_sms 123456789 "VIRUS ALERT: %v"
+# be replaced with the virus name.
+# Default: no
+#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %v"
 
-# Run as a selected user (clamd must be started by root).
-# Default: disabled
+# Run as another user (clamd must be started by root to make this option
+# working).
+# Default: don't drop privileges
 User @clamav_rusr@
 
 # Initialize supplementary group access (clamd must be started by root).
-# Default: disabled
-#AllowSupplementaryGroups
+# Default: no
+#AllowSupplementaryGroups no
 
 # Stop daemon when libclamav reports out of memory condition.
-#ExitOnOOM
+#ExitOnOOM yes
 
 # Don't fork into background.
-# Default: disabled
-#Foreground
+# Default: no
+#Foreground yes
 
 # Enable debug messages in libclamav.
-# Default: disabled
-#Debug
+# Default: no
+#Debug yes
 
 # Do not remove temporary files (for debug purposes).
-# Default: disabled
-#LeaveTemporaryFiles
-
+# Default: no
+#LeaveTemporaryFiles yes
 
-# By default clamd uses scan options recommended by libclamav. This option
-# disables recommended options and allows you to enable selected ones below.
-# DO NOT TOUCH IT unless you know what you are doing.
-# Default: disabled
-#DisableDefaultScanOptions
+# In some cases (eg. complex malware, exploits in graphic files, and others),
+# ClamAV uses special algorithms to provide accurate detection. This option
+# controls the algorithmic detection.
+# Default: yes
+#AlgorithmicDetection yes
 
 ##
 ## Executable files
 ##
 
 # PE stands for Portable Executable - it's an executable file format used
-# in all 32-bit versions of Windows operating systems. This option allows
+# in all 32 and 64-bit versions of Windows operating systems. This option allows
 # ClamAV to perform a deeper analysis of executable files and it's also
 # required for decompression of popular executable packers such as UPX, FSG,
 # and Petite.
-# Default: enabled
-#ScanPE
+# Default: yes
+#ScanPE yes
 
-# With this option clamav will try to detect broken executables and mark
-# them as Broken.Executable
-# Default: disabled
-#DetectBrokenExecutables
+# Executable and Linking Format is a standard format for UN*X executables.
+# This option allows you to control the scanning of ELF files.
+# Default: yes
+#ScanELF yes
+
+# With this option clamav will try to detect broken executables (both PE and
+# ELF) and mark them as Broken.Executable.
+# Default: no
+#DetectBrokenExecutables yes
 
 
 ##
 ## Documents
 ##
 
-# This option enables scanning of Microsoft Office document macros.
-# Default: enabled
-#ScanOLE2
+# This option enables scanning of OLE2 files, such as Microsoft Office
+# documents and .msi files.
+# Default: yes
+#ScanOLE2 yes
 
 ##
 ## Mail files
 ##
 
 # Enable internal e-mail scanner.
-# Default: enabled
-#ScanMail
+# Default: yes
+#ScanMail yes
 
 # If an email contains URLs ClamAV can download and scan them.
 # WARNING: This option may open your system to a DoS attack.
 #	   Never use it on loaded servers.
-# Default: disabled
-#MailFollowURLs
+# Default: no
+#MailFollowURLs no
+
+# Recursion level limit for the mail scanner.
+# Default: 64
+#MailMaxRecursion 128
+
+# With this option enabled ClamAV will try to detect phishing attempts by using
+# signatures.
+# Default: yes
+#PhishingSignatures yes
 
 
+# Scan urls found in mails for phishing attempts.
+# (available in experimental builds only) 
+# Default: yes
+#PhishingScanURLs yes
+
+# Use phishing detection only for domains listed in the .pdb database. It is
+# not recommended to have this option turned off, because scanning of all
+# domains may lead to many false positives!
+# (available in experimental builds only)
+# Default: yes
+#PhishingRestrictedScan yes
+
+# Always block SSL mismatches in URLs, even if the URL isn't in the database.
+# This can lead to false positives.
+# (available in experimental builds only)
+#
+# Default: no
+#PhishingAlwaysBlockSSLMismatch no
+
+# Always block cloaked URLs, even if URL isn't in database.
+# This can lead to false positives.
+# (available in experimental builds only)
+#
+# Default: no
+#PhishingAlwaysBlockCloak no
+
 ##
 ## HTML
 ##
 
 # Perform HTML normalisation and decryption of MS Script Encoder code.
-# Default: enabled
-#ScanHTML
+# Default: yes
+#ScanHTML yes
 
 
 ##
@@ -231,15 +272,8 @@
 ##
 
 # ClamAV can scan within archives and compressed files.
-# Default: enabled
-#ScanArchive
-
-# Due to license issues libclamav does not support RAR 3.0 archives (only the
-# old 2.0 format is supported). Because some users report stability problems
-# with unrarlib it's disabled by default and you must uncomment the directive
-# below to enable RAR 2.0 support.
-# Default: disabled
-#ScanRAR
+# Default: yes
+#ScanArchive yes
 
 # The options below protect your system against Denial of Service attacks
 # using archive bombs.
@@ -251,10 +285,10 @@
 
 # Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
 # file, all files within it will also be scanned. This options specifies how
-# deep the process should be continued.
+# deeply the process should be continued.
 # Value of 0 disables the limit.
-# Default: 8 
-#ArchiveMaxRecursion 9
+# Default: 8
+#ArchiveMaxRecursion 10
 
 # Number of files to be scanned within an archive.
 # Value of 0 disables the limit.
@@ -269,18 +303,22 @@
 
 # Use slower but memory efficient decompression algorithm.
 # only affects the bzip2 decompressor.
-# Default: disabled
-#ArchiveLimitMemoryUsage
+# Default: no
+#ArchiveLimitMemoryUsage yes
 
 # Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
-# Default: disabled
-#ArchiveBlockEncrypted
+# Default: no
+#ArchiveBlockEncrypted no
 
 # Mark archives as viruses (e.g. RAR.ExceededFileSize, Zip.ExceededFilesLimit)
 # if ArchiveMaxFiles, ArchiveMaxFileSize, or ArchiveMaxRecursion limit is
 # reached.
-# Default: disabled
-#ArchiveBlockMax
+# Default: no
+#ArchiveBlockMax no
+
+# Enable support for Sensory Networks' NodalCore hardware accelerator.
+# Default: no
+#NodalCoreAcceleration yes
 
 
 ##
@@ -290,16 +328,16 @@
 ##
 
 # Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.
-# Default: disabled
-#ClamukoScanOnAccess
+# Default: no
+#ClamukoScanOnAccess yes
 
 # Set access mask for Clamuko.
-# Default: disabled
-#ClamukoScanOnOpen
-#ClamukoScanOnClose
-#ClamukoScanOnExec
+# Default: no
+#ClamukoScanOnOpen yes
+#ClamukoScanOnClose yes
+#ClamukoScanOnExec yes
 
-# Set the include paths (all files in them will be scanned). You can have
+# Set the include paths (all files inside them will be scanned). You can have
 # multiple ClamukoIncludePath directives but each directory must be added
 # in a seperate line.
 # Default: disabled
@@ -308,7 +346,7 @@
 
 # Set the exclude paths. All subdirectories are also excluded.
 # Default: disabled
-#ClamukoExcludePath /home/guru
+#ClamukoExcludePath /home/bofh
 
 # Don't scan files larger than ClamukoMaxFileSize
 # Value of 0 disables the limit.

Index: freshclam.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freshclam.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freshclam.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ freshclam.conf.template.in	14 Feb 2007 17:44:17 -0000	1.2
@@ -8,7 +8,6 @@
 ##
 ## Example config file for freshclam
 ## Please read the freshclam.conf(5) manual before editing this file.
-## This file may be optionally merged with clamd.conf.
 ##
 
 
@@ -25,12 +24,12 @@
 UpdateLogFile @freshclam_logfile@
 
 # Enable verbose logging.
-# Default: disabled
-#LogVerbose
+# Default: no
+#LogVerbose yes
 
 # Use system logger (can work together with UpdateLogFile).
-# Default: disabled
-#LogSyslog
+# Default: no
+#LogSyslog yes
 
 # Specify the type of syslog messages - please refer to 'man syslog'
 # for facility names.
@@ -47,18 +46,19 @@
 #DatabaseOwner clamav
 
 # Initialize supplementary group access (freshclam must be started by root).
-# Default: disabled
-#AllowSupplementaryGroups
+# Default: no
+#AllowSupplementaryGroups yes
 
 # Use DNS to verify virus database version. Freshclam uses DNS TXT records
 # to verify database and software versions. With this directive you can change
 # the database verification domain.
-# Default: enabled, pointing to current.cvd.clamav.net
+# WARNING: Do not touch it unless you're configuring freshclam to use your
+# own database verification domain.
+# Default: current.cvd.clamav.net
 #DNSDatabaseInfo current.cvd.clamav.net
 
 # Uncomment the following line and replace XY with your country
 # code. See http://www.iana.org/cctld/cctld-whois.htm for the full list.
-# Default: There is no default, which results in an error when running freshclam
 #DatabaseMirror db.XY.clamav.net
 
 # database.clamav.net is a round-robin record which points to our most 
@@ -71,6 +71,10 @@
 # Default: 3 (per mirror)
 #MaxAttempts 5
 
+# With this option you can control scripted updates. It's highly recommended
+# to keep it enabled.
+#ScriptedUpdates yes
+
 # Number of database checks per day.
 # Default: 12 (every two hours)
 #Checks 24
@@ -82,16 +86,19 @@
 #HTTPProxyUsername myusername
 #HTTPProxyPassword mypass
 
+# If your servers are behind a firewall/proxy which applies User-Agent
+# filtering you can use this option to force the use of a different
+# User-Agent header.
+# Default: clamav/version_number
+#HTTPUserAgent SomeUserAgentIdString
+
 # Use aaa.bbb.ccc.ddd as client address for downloading databases. Useful for
 # multi-homed systems.
 # Default: Use OS'es default outgoing IP address.
 #LocalIPAddress aaa.bbb.ccc.ddd
 
 # Send the RELOAD command to clamd.
-# Default: disabled
-#NotifyClamd @clamav_confdir@/clamd.conf
-# By default it uses the hardcoded configuration file but you can force an
-# another one.
+# Default: no
 NotifyClamd @clamav_confdir@/clamd.conf
 
 # Run command after successful database update.
@@ -102,10 +109,23 @@
 # Default: disabled
 #OnErrorExecute command
 
-# Don't fork into background.
+# Run command when freshclam reports outdated version.
+# In the command string %v will be replaced by the new version number.
 # Default: disabled
-#Foreground
+#OnOutdatedExecute command
+
+# Don't fork into background.
+# Default: no
+#Foreground yes
 
 # Enable debug messages in libclamav.
-# Default: disabled
-#Debug
+# Default: no
+#Debug yes
+
+# Timeout in seconds when connecting to database server.
+# Default: 30
+#ConnectTimeout 60
+
+# Timeout in seconds when reading from database server.
+# Default: 30
+#ReceiveTimeout 60



From cvs at kolab.org  Wed Feb 14 18:46:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 14 Feb 2007 18:46:42 +0100 (CET)
Subject: thomas: server Makefile,1.12,1.13 
Message-ID: <20070214174642.287C31006C7@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Added building of clamav to top-level Makefile.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	6 Nov 2006 13:22:36 -0000	1.12
+++ Makefile	14 Feb 2007 17:46:40 -0000	1.13
@@ -2,6 +2,7 @@
 	rm -rf stage
 	mkdir stage
 	cd file && make dist
+	cd clamav && make dist
 	cd imap && make dist
 	cd apache && make dist
 	cd php && make dist



From cvs at kolab.org  Thu Feb 15 13:47:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Feb 2007 13:47:35 +0100 (CET)
Subject: schreiber: doc/www/src index.html.m4,1.107,1.108 
Message-ID: <20070215124735.0D77C101EE1@lists.intevation.de>

Author: schreiber

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

Modified Files:
	index.html.m4 
Log Message:
news entry for kolab client 2.1.6


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- index.html.m4	5 Feb 2007 18:34:49 -0000	1.107
+++ index.html.m4	15 Feb 2007 12:47:32 -0000	1.108
@@ -46,12 +46,23 @@
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
+ <table>
+    <tr><td class="newsd">February 12th 2007</td>
+    <td class="newsh">&raquo;New KDE Kolab Client released, revision 'proko2.1.6'.</td</tr></table><p>
+<div class="newsb">
+    This release contains several fixes and a few new features.
+    See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html" target="_blank">announcement</a> for details.
+  </div> 
+<p>
+
+
 <table>
 <tr><td class="newsd">February 5th, 2007</td>
 <td class="newsh">&raquo;
   Kolab Server 2.1 Release Candidate 1 released
 </td></tr>
 </table>
+<p>
 <div class="newsb">
   This release fixes more than 10 problems found in Beta 4 and
   includes the security updates published until now.  See the



From cvs at kolab.org  Sat Feb 17 11:31:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 17 Feb 2007 11:31:21 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.9,
	1.10 
Message-ID: <20070217103121.775C61005B8@lists.intevation.de>

Author: thomas

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

Modified Files:
	amavisd.conf.template.in 
Log Message:
Keep the original @local_domains_acl/$mydomain example in amavisd.conf.template.in

I thought about just removing the "$mydomain and its subdomains" comment,
but having an additional example isn't bad.


Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- amavisd.conf.template.in	14 Feb 2007 13:01:54 -0000	1.9
+++ amavisd.conf.template.in	17 Feb 2007 10:31:19 -0000	1.10
@@ -178,11 +178,12 @@
 # a union of domains specified in: $mydestination, $virtual_alias_domains,
 # $virtual_mailbox_domains, and $relay_domains.
 #
- at local_domains_acl = ( ".@@@postfix-mydestination|join(", ".)@@@" );  # $mydomain and its subdomains
+# @local_domains_acl = ( ".$mydomain" );  # $mydomain and its subdomains
 # @local_domains_acl = qw();  # default is empty, no recipient treated as local
 # @local_domains_acl = qw( .example.com );
 # @local_domains_acl = qw( .example.com !host.sub.example.net .sub.example.net );
 # @local_domains_acl = ( ".$mydomain", '.example.com', 'sub.example.net' );
+ at local_domains_acl = ( ".@@@postfix-mydestination|join(", ".)@@@" );
 
 # or alternatively(A), using a Perl hash lookup table, which may be assigned
 # directly, or read from a file, one domain per line; comments and empty lines



From cvs at kolab.org  Sat Feb 17 17:32:37 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 17 Feb 2007 17:32:37 +0100 (CET)
Subject: thomas: server/kolabd/kolabd kolabd.spec.in,1.4,1.5 
Message-ID: <20070217163237.6F6481006A1@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolabd.spec.in 
Log Message:
As the clamav templates are for 0.90, require at least this version.


Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolabd.spec.in	14 Jan 2006 22:16:20 -0000	1.4
+++ kolabd.spec.in	17 Feb 2007 16:32:35 -0000	1.5
@@ -59,7 +59,7 @@
 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
+PreReq:	      clamav >= 0.90-20070214
 AutoReq:      no
 AutoReqProv:  no
 



From cvs at kolab.org  Tue Feb 20 15:23:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 15:23:46 +0100 (CET)
Subject: wilde: utils/admin convert-ldif-21.py,1.1,1.2 
Message-ID: <20070220142346.1247D101EEA@lists.intevation.de>

Author: wilde

Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv1527

Modified Files:
	convert-ldif-21.py 
Log Message:
Added new option --list-resources, needed to find old resource accounts,
which might need cyrus acl updates.


Index: convert-ldif-21.py
===================================================================
RCS file: /kolabrepository/utils/admin/convert-ldif-21.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- convert-ldif-21.py	12 Oct 2006 16:18:10 -0000	1.1
+++ convert-ldif-21.py	20 Feb 2007 14:23:43 -0000	1.2
@@ -15,7 +15,7 @@
 
 Usage:
 
-   convert-ldif-21.py [--normalize] [INFILE [OUTFILE]]
+   convert-ldif-21.py [--normalize|--list-resources] [INFILE [OUTFILE]]
 
 The program reads the kolab ldap data from INFILE and writes the
 converted data to OUTFILE.  The data should be in ldif format as
@@ -27,6 +27,9 @@
 written out again without any further modification.  The output data
 will differ only in formatting with.  This can be useful when doing
 comparisons with diff.
+
+When the --list-resources option is given, only a list of all resource
+accounts is printed to stdout.
 """
 
 __version__ = "$Revision$"
@@ -100,6 +103,10 @@
     if record.has_key("kolabEncryptedPassword"):
         del record["kolabEncryptedPassword"]
 
+def print_resource_accounts(dn, record, kolab_config):
+    """Prints out resource accounts"""
+    if record.has_key("kolabEncryptedPassword"):
+        print record["uid"][0]
 
 found_domains_object = 0
 def find_domains_object(dn, record, kolab_config):
@@ -131,10 +138,12 @@
 def main():
     action = "upgrade"
 
-    opts, rest = getopt.getopt(sys.argv[1:], '', ['normalize', 'help'])
+    opts, rest = getopt.getopt(sys.argv[1:], '', ['normalize', 'list-resources', 'help'])
     for optchar, value in opts:
         if optchar == "--normalize":
             action = "normalize"
+        elif optchar == "--list-resources":
+            action = "list-resources"
         elif optchar == "--help":
             print __doc__
             sys.exit(0)
@@ -159,6 +168,9 @@
                     ]
     elif action == "normalize":
         handlers = []
+    elif action == "list-resources":
+        handlers = [print_resource_accounts]
+        outfile = open("/dev/null", "w")
     else:
         print >>sys.stderr, "unknown action %r" % (action,)
         sys.exit(1)



From cvs at kolab.org  Tue Feb 20 15:35:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 15:35:35 +0100 (CET)
Subject: wilde: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.9,
	1.10 
Message-ID: <20070220143535.01165101EE4@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Added section on setting ACLs for resource folders.


Index: kolab_2.0_to_2.1_upgrade_instructions.txt
===================================================================
RCS file: /kolabrepository/doc/raw-howtos/kolab_2.0_to_2.1_upgrade_instructions.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab_2.0_to_2.1_upgrade_instructions.txt	14 Feb 2007 14:56:20 -0000	1.9
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	20 Feb 2007 14:35:32 -0000	1.10
@@ -168,6 +168,38 @@
     /kolab/bin/openpkg rc all start
 
 
+Resource Accounts
+-----------------
+
+With server version 2.1 the way in which the kolab resource manager
+accesses the calender folders of resources has changed.  To make old
+resource accounts work after the upgrade, you have to grant access to
+the resources imap folders to the so called calender user.
+
+First you have to identify the existing resource accounts, this can be
+done using the convert-ldif-21.py script, which was introduced in the
+section on converting the LDAP data.
+
+  python convert-ldif-21.py --list-resources ~/kolab-2.0.ldif
+
+lists the UIDs (normally the email addresses) of all resource accounts.
+
+Now you have to add ACLs to the mailboxes of the resources, which
+allow the calendar user to access them.  Per default the calendar user
+is calendar at YOUR_DOMAIN:
+
+Connect with cyradm to the Kolab imap server as user manager:
+
+  /kolab/bin/cyradm -u manager localhost
+
+Then use the `setaclmailbox' command (sam) to set the necessary
+permissions.  You can generate a list of commands which should do the
+right thing on most standard installations with:
+
+  python convert-ldif-21.py --list-resources ~/kolab-2.0.ldif | \
+  sed 's-\(.*\)\(@.*\)-sam */\1*\2 calendar\2 all-'
+
+
 Final Steps
 -----------
 



From cvs at kolab.org  Tue Feb 20 16:42:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 16:42:41 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.30,1.31 
Message-ID: <20070220154241.17AC2101EFB@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
2007-02-20  Gunnar Wrobel  <wrobel at pardus.de>

	* www/admin/user/user.php.in (fill_form_for_modify): 

	Fixed typo (issue 1612;
	https://intevation.de/roundup/kolab/issue1612). This should allow
	to select the user account type again.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	2 Feb 2007 16:12:17 -0000	1.30
+++ ChangeLog	20 Feb 2007 15:42:39 -0000	1.31
@@ -1,3 +1,11 @@
+2007-02-20  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* www/admin/user/user.php.in (fill_form_for_modify): 
+
+	Fixed typo (issue 1612;
+	https://intevation.de/roundup/kolab/issue1612). This should allow
+	to select the user account type again.
+
 2007-02-02  Sascha Wilde  <wilde at intevation.de>
 
 	* php/admin/templates/kolab.tpl: Restrict access to /fbview* to



From cvs at kolab.org  Tue Feb 20 16:42:41 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 16:42:41 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.15, 1.16 
Message-ID: <20070220154241.13C64101EF9@lists.intevation.de>

Author: gunnar

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

Modified Files:
	user.php.in 
Log Message:
2007-02-20  Gunnar Wrobel  <wrobel at pardus.de>

	* www/admin/user/user.php.in (fill_form_for_modify): 

	Fixed typo (issue 1612;
	https://intevation.de/roundup/kolab/issue1612). This should allow
	to select the user account type again.


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- user.php.in	1 Feb 2007 20:34:38 -0000	1.15
+++ user.php.in	20 Feb 2007 15:42:39 -0000	1.16
@@ -257,7 +257,7 @@
   if(array_key_exists('uid',$form->entries))  $form->entries['uid']['value'] = $uid;
   // accttype
   $dncomp = split( ',', $dn );
-  if(array_key_exists('acctype',$form->entries)) {
+  if(array_key_exists('accttype',$form->entries)) {
 	  if( in_array('cn=groups',$dncomp) ) {
 		  $form->entries['accttype']['value'] = 2;
 	  } else if( in_array('cn=resources',$dncomp) ) {



From cvs at kolab.org  Tue Feb 20 16:44:14 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 16:44:14 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.31,1.32 
Message-ID: <20070220154414.3D748101EF9@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
Forgot to add submitters name.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	20 Feb 2007 15:42:39 -0000	1.31
+++ ChangeLog	20 Feb 2007 15:44:12 -0000	1.32
@@ -4,7 +4,8 @@
 
 	Fixed typo (issue 1612;
 	https://intevation.de/roundup/kolab/issue1612). This should allow
-	to select the user account type again.
+	to select the user account type again. Patch submitted by TIm
+	Gerundt.
 
 2007-02-02  Sascha Wilde  <wilde at intevation.de>
 



From cvs at kolab.org  Tue Feb 20 18:36:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 18:36:01 +0100 (CET)
Subject: bernhard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.22, 1.23 
Message-ID: <20070220173601.3755C101F0F@lists.intevation.de>

Author: bernhard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv8952/php/admin/locale/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
php/admin/locale/de/LC_MESSAGES/messages.po: Translated two more strings.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- messages.po	2 Feb 2007 17:41:00 -0000	1.22
+++ messages.po	20 Feb 2007 17:35:59 -0000	1.23
@@ -1931,11 +1931,11 @@
 
 #: ../../../www/admin/user/user.php.in:186
 msgid "Quota must be smaller than 4096"
-msgstr ""
+msgstr "Plattenplatz muss kleiner sein als 4096"
 
 #: ../../../www/admin/user/user.php.in:187
 msgid "Quota can not be negative"
-msgstr ""
+msgstr "Plattenplatz kann nicht negativ sein"
 
 #: ../../../www/admin/user/user.php.in:427
 msgid "Unique Identity (UID)"



From cvs at kolab.org  Tue Feb 20 18:36:01 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 18:36:01 +0100 (CET)
Subject: bernhard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.32,1.33 
Message-ID: <20070220173601.34C83101F0E@lists.intevation.de>

Author: bernhard

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

Modified Files:
	ChangeLog 
Log Message:
php/admin/locale/de/LC_MESSAGES/messages.po: Translated two more strings.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog	20 Feb 2007 15:44:12 -0000	1.32
+++ ChangeLog	20 Feb 2007 17:35:59 -0000	1.33
@@ -1,3 +1,8 @@
+2007-02-20 Bernhard Reiter <bernhard at intevation.de>
+
+	* php/admin/locale/de/LC_MESSAGES/messages.po: 
+	Translated two more strings.
+
 2007-02-20  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* www/admin/user/user.php.in (fill_form_for_modify): 



From cvs at kolab.org  Tue Feb 20 20:11:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 20:11:58 +0100 (CET)
Subject: thomas: server release-notes.txt,1.85,1.86 
Message-ID: <20070220191158.2F0DB101F15@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated stupid German translation caused by missing context.
"und gehen dann nach hier ..."


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- release-notes.txt	14 Feb 2007 17:44:17 -0000	1.85
+++ release-notes.txt	20 Feb 2007 19:11:56 -0000	1.86
@@ -58,7 +58,10 @@
 
     - kolab-webadmin-2.1.0-20070???
 
+	updated German translation.
+
 	kolab/issue1457 (updated French translation)
+	kolab/issue1612 (modify user ignores account type)
 
 
 Changes since 2.1 beta 4:



From cvs at kolab.org  Tue Feb 20 20:11:58 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 20:11:58 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.23, 1.24 
Message-ID: <20070220191158.359F9101F17@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv17014/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES

Modified Files:
	messages.po 
Log Message:
Updated stupid German translation caused by missing context.
"und gehen dann nach hier ..."


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- messages.po	20 Feb 2007 17:35:59 -0000	1.23
+++ messages.po	20 Feb 2007 19:11:56 -0000	1.24
@@ -997,7 +997,7 @@
 
 #: tpl_messages.php:207
 msgid "and then go"
-msgstr "und gehen dann nach"
+msgstr "und richten Sie danach"
 
 #: tpl_messages.php:208
 msgid "here"
@@ -1006,8 +1006,7 @@
 #: tpl_messages.php:209
 msgid "to set up forwarding of mail to administrative email addresses."
 msgstr ""
-"um die Weiterleitung von Nachrichten an administrative E-Mail-Adressen "
-"einzurichten."
+"die Weiterleitung von Nachrichten an administrative E-Mail-Adressen ein."
 
 #: tpl_messages.php:210
 msgid "The user with DN"



From cvs at kolab.org  Tue Feb 20 20:48:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Feb 2007 20:48:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.22, 1.23 
Message-ID: <20070220194826.A5052101F17@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv17690

Modified Files:
	messages.po 
Log Message:
Updated Dutch translation



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- messages.po	2 Feb 2007 18:01:22 -0000	1.22
+++ messages.po	20 Feb 2007 19:48:24 -0000	1.23
@@ -3,19 +3,19 @@
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Vincent Seynhaeve <vincent at opensides.be>, 2005.
-# Richard Bos <richard at radoeka.nl>, 2005.
+# Richard Bos <richard at radoeka.nl>, 2005, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-02-02 18:49+0100\n"
-"PO-Revision-Date: 2005-12-11 20:40+0100\n"
+"PO-Revision-Date: 2007-02-20 20:45+0100\n"
 "Last-Translator: Richard Bos <richard at radoeka.nl>\n"
 "Language-Team:  <nl at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: tpl_messages.php:2
 msgid "The address with DN"
@@ -277,8 +277,7 @@
 
 #: tpl_messages.php:58
 msgid "check here to make this users address <br/> visible in the address book"
-msgstr ""
-"hier aankruisen om dit gebruikersadres zichtbaar te maken in het adresboek"
+msgstr "hier aankruisen om dit gebruikersadres zichtbaar te maken in het adresboek"
 
 #: tpl_messages.php:59
 msgid "User Quota in KB"
@@ -340,17 +339,14 @@
 msgstr "Gebruiker verwijderd, wacht op opruiming..."
 
 #: tpl_messages.php:75
-#, fuzzy
 msgid "The distribution list with DN"
-msgstr "De beheerder met DN"
+msgstr "De distributielijst met DN"
 
 #: tpl_messages.php:77
-#, fuzzy
 msgid "Back to list of distribution lists"
 msgstr "Terug naar de lijst van de beheerders"
 
 #: tpl_messages.php:84
-#, fuzzy
 msgid ""
 "Kolab's architecture was done by <a href=\"http://www.erfrakon.com"
 "\">erfrakon</a>; the company also designed and implemented the Kolab 1 "
@@ -358,10 +354,10 @@
 "providing consulting for the implementation of the Kolab 2 server and the "
 "Kolab 2 clients."
 msgstr ""
-"De Kolab concept werd gerealiseerd door <a href=\"http://www.erfrakon.com"
-"\">erfrakon</a>; het bedrijf ontwierp en implementeerde de Kolab 1 server en "
-"ontwierp en bouwde de kolab 2 server en op het levert advies over het "
-"implementeren van de Kolab 2 server en Kolab 2 clients."
+"Het Kolab concept is gerealiseerd door <a href=\"http://www.erfrakon.com"
+"\">erfrakon</a>; het bedrijf ontwierp en implementeerde de Kolab -1 server en "
+"ontwierp en bouwde de kolab-2 server en levert advies over het "
+"implementeren van de Kolab-2 server en Kolab-2 clients."
 
 #: tpl_messages.php:85
 msgid ""
@@ -424,10 +420,8 @@
 msgstr "De volgende mensen hebben op Kolab gewerkt voor Intevation:"
 
 #: tpl_messages.php:95
-msgid ""
-"The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
-msgstr ""
-"The Kolab 1 KDE client en de Kolab 2 KDE client (Kontact) werd ontworpen door"
+msgid "The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"
+msgstr "The Kolab 1 KDE client en de Kolab 2 KDE client (Kontact) werd ontworpen door"
 
 #: tpl_messages.php:96
 msgid ""
@@ -444,8 +438,7 @@
 "implementatie van de huidige Kolab 2 server."
 
 #: tpl_messages.php:97
-msgid ""
-"The following people worked on Kolab for Klar&auml;lvdalens Datakonsult AB:"
+msgid "The following people worked on Kolab for Klar&auml;lvdalens Datakonsult AB:"
 msgstr ""
 "De volgende mensen hebben aan Kolab gewerkt van Klar&auml;lvdalens "
 "Datakonsult AB:"
@@ -477,7 +470,6 @@
 "nieuwsgroepen, en IRC kanalen waarop iedereen uitgenodigd en welkom is."
 
 #: tpl_messages.php:100
-#, fuzzy
 msgid ""
 "<b>KDE</b> is a mature desktop suite providing a solid basis to an ever "
 "growing number of <a href=\"http://www.kde-apps.org\">applications</a> for "
@@ -511,7 +503,7 @@
 
 #: tpl_messages.php:104
 msgid "(Mail Scanner)"
-msgstr ""
+msgstr "E-mail Scanner"
 
 #: tpl_messages.php:105
 msgid "(HTTP Server)"
@@ -519,7 +511,7 @@
 
 #: tpl_messages.php:106
 msgid "(Virus Scanner)"
-msgstr ""
+msgstr "Virus scanner"
 
 #: tpl_messages.php:107
 msgid "(IMAP Server)"
@@ -538,9 +530,8 @@
 msgstr "(FTP Server)"
 
 #: tpl_messages.php:111
-#, fuzzy
 msgid "(SPAM Filter)"
-msgstr "Filter"
+msgstr "(spam filter)"
 
 #: tpl_messages.php:112
 msgid ""
@@ -750,10 +741,8 @@
 "distributielijst."
 
 #: tpl_messages.php:146
-#, fuzzy
-msgid ""
-"Email address of account that should receive administrative mail for domain "
-msgstr "E-mailadres van de account die de administratieve mail moet ontvangen:"
+msgid "Email address of account that should receive administrative mail for domain "
+msgstr "Het E-mailadres van de account die de administratieve E-mail van dit domein moet ontvangen:"
 
 #: tpl_messages.php:147
 msgid "Create Distribution Lists"
@@ -778,13 +767,13 @@
 "clients. Under all other circumstances it is advised to use the server-side "
 "freebusy creation feature over secure HTTP instead (this is enabled by "
 "default and may not be deactivated)."
-msgstr ""
+msgstr "Het verouderde Freebusy support (gebaseerd op ftp en http) is alleen nodig voor Outlook200 clients.  Onder alle omstandigheden is het beter om de frrebusy informatie aan te laten maken op de server middels https (dit is default aktief en kan niet worden uitgezet)."
 
 #: tpl_messages.php:151
 msgid ""
 "Further details with regards to security considerations might be available "
 "from the <a href=\"http://www.kolab.org\">Kolab Project</a>."
-msgstr ""
+msgstr "Meer informatie betreffende security is beschikbaat op <a href=\"http://www.kolab.org\">Kolab Project</a>."
 
 #: tpl_messages.php:152 ../include/menu.php:106
 msgid "Services"
@@ -817,8 +806,7 @@
 
 #: tpl_messages.php:161
 msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-"Laat een niet geautentificeerde downloading toe van vrij/bezig informatie  "
+msgstr "Laat een niet geautentificeerde downloading toe van vrij/bezig informatie  "
 
 #: tpl_messages.php:163
 msgid "When creating free/busy lists, include data from"
@@ -859,15 +847,14 @@
 msgstr "Internet mail aanvaarden"
 
 #: tpl_messages.php:173
-#, fuzzy
 msgid ""
 "Accept mail from other domains over unauthenticated SMTP. This must be "
 "enabled if you want to use the Kolab Server to receive mail from other "
 "internet domains directly. Leave disabled to accept mail only from SMTP "
 "gateways that are within the privileged network."
 msgstr ""
-"Aanvaard mail van andere domeinen via niet geautentificeerde SMTP. Dat moet "
-"ingeschakeld zijn wanneer je de Kolab server wil gebruiken om mail te "
+"Aanvaard mail van andere domeinen via niet geautenticeerde SMTP. Dat moet "
+"ingeschakeld zijn wanneer U de Kolab server wil gebruiken om mail te "
 "ontvangen via andere internetdomeinen. "
 
 #: tpl_messages.php:175
@@ -889,8 +876,7 @@
 
 #: tpl_messages.php:181
 msgid "Check messages for mismatching From header and envelope from."
-msgstr ""
-"Controleer berichten op niet overeenkomstige From header en envelope from"
+msgstr "Controleer berichten op niet overeenkomstige From header en envelope from"
 
 #: tpl_messages.php:182
 msgid ""
@@ -925,19 +911,17 @@
 
 #: tpl_messages.php:187
 msgid "Kolab Hostnames (for Master and Slaves)"
-msgstr ""
+msgstr "Kolab hostnamen (voor Master en Slaves)"
 
 #: tpl_messages.php:188
 msgid "Host"
 msgstr "Host"
 
 #: tpl_messages.php:192
-#, fuzzy
 msgid "The shared folder with DN"
-msgstr "De gebruiker met DN"
+msgstr "De gedeelde folder met DN"
 
 #: tpl_messages.php:194
-#, fuzzy
 msgid "Back to list of shared folders"
 msgstr "Terug naar de lijst van de gebruikers"
 
@@ -966,22 +950,21 @@
 msgstr "OPMERKING:"
 
 #: tpl_messages.php:205
-#, fuzzy
 msgid ""
 "No account is configured to receive mail for administrative addresses. If "
 "you have not yet created an account for this, "
 msgstr ""
 "Geen enkel acount is ingesteld om mail te ontvangen voor administratieve "
 "adressen. Als je daarvoor nog geen account aangemaakt hebt, gelieve er één "
-"aan te maken en ga dan verder"
+"aan te maken en ga dan verder "
 
 #: tpl_messages.php:206
 msgid "please do so"
-msgstr ""
+msgstr "doe dat"
 
 #: tpl_messages.php:207
 msgid "and then go"
-msgstr ""
+msgstr "en ga dan naar"
 
 #: tpl_messages.php:208
 msgid "here"
@@ -989,8 +972,7 @@
 
 #: tpl_messages.php:209
 msgid "to set up forwarding of mail to administrative email addresses."
-msgstr ""
-"Om het doorsturen van mail naar administratieve E-mailadressen in te stellen."
+msgstr "Om het doorsturen van mail naar administratieve E-mailadressen in te stellen."
 
 #: tpl_messages.php:210
 msgid "The user with DN"
@@ -1152,7 +1134,7 @@
 msgstr "Extern adres toevoegen"
 
 #: ../../../www/admin/addressbook/addr.php.in:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Addressbook entry DN could not be modified, distribution list <a "
 "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
@@ -1215,9 +1197,9 @@
 
 #: ../../../www/admin/addressbook/addr.php.in:267
 #: ../../../www/admin/addressbook/addr.php.in:287
-#, fuzzy, php-format
+#, php-format
 msgid "Error: No entry with DN %s found"
-msgstr "Adresboek entry met DN %s is verwijderd"
+msgstr "Fout: geen ingang met DN %s gevonden"
 
 #: ../../../www/admin/addressbook/addr.php.in:284
 msgid "Delete External Address"
@@ -1232,12 +1214,12 @@
 "afhankelijk."
 
 #: ../../../www/admin/addressbook/addr.php.in:308
-#, fuzzy, php-format
+#, php-format
 msgid "Addressbook entry removed from distribution list '%s'."
 msgstr "Account is verwijderd van distributielijst '%s'."
 
 #: ../../../www/admin/addressbook/addr.php.in:310
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Failure to remove addressbook entry from distribution list '%s', entry will "
 "not be deleted."
@@ -1560,8 +1542,7 @@
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:141
 msgid "Check domains this domain maintainer should be able to maintain"
-msgstr ""
-"Controleer domein, deze domein beheerder moet in staat zijn om te onderhouden"
+msgstr "Controleer domein, deze domein beheerder moet in staat zijn om te onderhouden"
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:243
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:293
@@ -1633,8 +1614,7 @@
 #: ../../../www/admin/maintainer/maintainer.php.in:317
 #: ../../../www/admin/user/user.php.in:813
 msgid "Error: you need administrative permissions to delete users"
-msgstr ""
-"Fout: er zijn administratieve rechten nodig om gebruikers te verwijderen"
+msgstr "Fout: er zijn administratieve rechten nodig om gebruikers te verwijderen"
 
 #: ../../../www/admin/maintainer/maintainer.php.in:333
 msgid "Maintainer Deleted"
@@ -1698,8 +1678,7 @@
 
 #: ../../../www/admin/service/index.php.in:282
 msgid "FTP FreeBusy Service (Legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-"FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
+msgstr "FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
 
 #: ../../../www/admin/service/index.php.in:284
 msgid "HTTP FreeBusy Service (Legacy)"
@@ -1717,39 +1696,37 @@
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:214
 msgid "Unspecified"
-msgstr ""
+msgstr "Niet gespecificeerd"
 
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:214
-#, fuzzy
 msgid "Mails"
-msgstr "E-mail"
+msgstr "E-mails"
 
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:214
 msgid "Tasks"
-msgstr ""
+msgstr "Taken"
 
 #: ../../../www/admin/sharedfolder/index.php.in:64
 #: ../include/form.class.php:215
 msgid "Journals"
-msgstr ""
+msgstr "Journalen"
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:215
 msgid "Events"
-msgstr ""
+msgstr "Gebeurtenissen"
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:216
-#, fuzzy
 msgid "Contacts"
-msgstr "bevat"
+msgstr "Contacten"
 
 #: ../../../www/admin/sharedfolder/index.php.in:65
 #: ../include/form.class.php:216
 msgid "Notes"
-msgstr ""
+msgstr "Aantekeningen"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:59
 #: ../../../www/admin/sharedfolder/sf.php.in:66
@@ -1776,9 +1753,8 @@
 msgstr "permanent"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:127
-#, fuzzy
 msgid "Folder Type"
-msgstr "Map naam"
+msgstr "Map naam "
 
 #: ../../../www/admin/sharedfolder/sf.php.in:131
 msgid "Quota Limit"
@@ -1829,8 +1805,7 @@
 msgstr "LDAP fout: kon %s niet voor verwijdereing markeren: %s"
 
 #: ../../../www/admin/user/deliver.php.in:37
-msgid ""
-"Net/Sieve.php is missing. Without that, filter settings are not available"
+msgid "Net/Sieve.php is missing. Without that, filter settings are not available"
 msgstr ""
 "Net/Sieve.php ontbreekt. Zonder daardoor <ijn de filter instellingen niet "
 "beschikbaar"
@@ -1842,6 +1817,8 @@
 "Suggest your system administrator to run \"@bindir@/pear install http://pear."
 "php.net/get/Net_Sieve\" on the server"
 msgstr ""
+"Stel Uw systeem administrator voor om \"@bindir@/pear install http://pear."
+"php.net/get/Net_Sieve\" uit te voeren op de server"
 
 #: ../../../www/admin/user/deliver.php.in:66
 #: ../../../www/admin/user/forward.php.in:70
@@ -1860,10 +1837,8 @@
 
 #: ../../../www/admin/user/forward.php.in:38
 #: ../../../www/admin/user/vacation.php.in:17
-msgid ""
-"Net/Sieve.php is missing. Without that, vacation settings are not available"
-msgstr ""
-"Net/Sieve.php ontbreekt. Vakantie instellingen zijn daardoor niet beschikbaar"
+msgid "Net/Sieve.php is missing. Without that, vacation settings are not available"
+msgstr "Net/Sieve.php ontbreekt. Vakantie instellingen zijn daardoor niet beschikbaar"
 
 #: ../../../www/admin/user/forward.php.in:64
 #: ../../../www/admin/user/user.php.in:94
@@ -1895,7 +1870,7 @@
 msgstr "UID"
 
 #: ../../../www/admin/user/user.php.in:162
-#, fuzzy, php-format
+#, php-format
 msgid "Email-Delegate %s does not exist"
 msgstr "Delegate %s bestaat niet"
 
@@ -1906,11 +1881,11 @@
 
 #: ../../../www/admin/user/user.php.in:186
 msgid "Quota must be smaller than 4096"
-msgstr ""
+msgstr "Quota moet kleiner zijn dan 4096"
 
 #: ../../../www/admin/user/user.php.in:187
 msgid "Quota can not be negative"
-msgstr ""
+msgstr "Quota kan niet negatief zijn"
 
 #: ../../../www/admin/user/user.php.in:427
 msgid "Unique Identity (UID)"
@@ -1945,8 +1920,7 @@
 msgstr "Hulpbron account"
 
 #: ../../../www/admin/user/user.php.in:438
-msgid ""
-"NOTE: An internal user is a user that will not be visible in the address book"
+msgid "NOTE: An internal user is a user that will not be visible in the address book"
 msgstr "Opmerking: een interne gebruiker is niet zichtbaar in het adresboek"
 
 #: ../../../www/admin/user/user.php.in:439
@@ -1970,16 +1944,14 @@
 msgstr "E-mail Aliases"
 
 #: ../../../www/admin/user/user.php.in:450
-#, fuzzy
 msgid "Email-Delegates"
 msgstr "Gemachtigde"
 
 #: ../../../www/admin/user/user.php.in:453
 msgid "Others allowed to send emails with a \"from\" address of this account."
-msgstr ""
+msgstr "Anderen toestaan om email te sturen met een \"from\" adres van dit account."
 
 #: ../../../www/admin/user/user.php.in:454
-#, fuzzy
 msgid "One email address per line."
 msgstr "Eén E-mailadres per lijn"
 
@@ -2000,7 +1972,7 @@
 msgstr "Kon wachtwoord niet versleutelen:"
 
 #: ../../../www/admin/user/user.php.in:630
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Account DN could not be modified, distribution list <a "
 "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
@@ -2054,7 +2026,7 @@
 msgstr "Account is verwijderd van distributielijst '%s'."
 
 #: ../../../www/admin/user/user.php.in:835
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Failure to remove account from distribution list '%s', account will not be "
 "deleted."
@@ -2065,7 +2037,7 @@
 #: ../../../www/admin/user/user.php.in:843
 #, php-format
 msgid "LDAP Error: could not mark '%s' for deletion: %s"
-msgstr "LDAP fout: kon '%s' niet voor verwijdereing markeren: %s"
+msgstr "LDAP fout: kon '%s' niet voor verwijdering markeren: %s"
 
 #: ../../../www/admin/user/user.php.in:846
 msgid "User Deleted"
@@ -2073,7 +2045,7 @@
 
 #: ../../../www/admin/user/vacation.php.in:43
 msgid "Days must be at least one"
-msgstr ""
+msgstr "Tenminste 1 dag"
 
 #: ../../../www/admin/user/vacation.php.in:65
 msgid "Vacation message successfully activated"
@@ -2189,9 +2161,8 @@
 msgstr "Iemand"
 
 #: ../include/form.class.php:331
-#, fuzzy
 msgid "* Required field."
-msgstr "Vereiste veld"
+msgstr "Vereist veld"
 
 #: ../include/form.class.php:352 ../include/form.class.php:355
 msgid "Required field "
@@ -2202,8 +2173,7 @@
 msgstr " is leeg"
 
 #: ../include/ldap.class.php:54
-msgid ""
-"Error setting LDAP protocol to v3. Please contact your system administrator"
+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 "
@@ -2321,7 +2291,6 @@
 msgstr "Beheer maintainer"
 
 #: ../include/menu.php:103
-#, fuzzy
 msgid "Manage Domain Maintainer"
 msgstr "Beheer maintainers"
 
@@ -2365,19 +2334,3 @@
 msgid "Passwords dont match"
 msgstr "Wachtwoorden stemmen niet overeen"
 
-#~ msgid "Kolab Hosts"
-#~ msgstr "Kolab Hosts"
-
-#~ msgid "One Email address per line"
-#~ msgstr "Eén E-mail adres per lijn"
-
-#~ msgid ""
-#~ "Could not read resource encryption public key file://%s/etc/kolab/res_pub."
-#~ "pem: "
-#~ msgstr "Kon de publieke sleutel file://%s/etc/kolab/res_pub.pem niet lezen"
-
-#~ msgid "Error: Multiple results returned for DN %s"
-#~ msgstr "Fout: er zijn meerdere resultaten voor DN %s"
-
-#~ msgid "Please log in as a valid user"
-#~ msgstr "Gelieve aan te melden als een geldige gebruiker"



From cvs at kolab.org  Tue Feb 27 19:01:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Feb 2007 19:01:05 +0100 (CET)
Subject: thomas: server release-notes.txt,1.86,1.87 
Message-ID: <20070227180105.DA4F11005AB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Make "database monitor" the second database and restrict access to manager.

kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab) was caused
by having "database monitor" before the real database.

The ACL which should restrict access to cn=Monitor was only applied to the
real database, moved it directly below "database monitor" to the end of the
file.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- release-notes.txt	20 Feb 2007 19:11:56 -0000	1.86
+++ release-notes.txt	27 Feb 2007 18:01:03 -0000	1.87
@@ -52,6 +52,8 @@
 
 	Updated configuration templates for ClamAV 0.90
 
+	Updated openldap monitor configuration.
+
     - kolab-horde-fbview-2.1.0-20070???
 
     - kolab-resource-handlers-2.1.0-20070???



From cvs at kolab.org  Tue Feb 27 19:01:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Feb 2007 19:01:05 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates slapd.conf.template.in, 1.10,
	1.11 
Message-ID: <20070227180105.DBDB81005BC@lists.intevation.de>

Author: thomas

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

Modified Files:
	slapd.conf.template.in 
Log Message:
Make "database monitor" the second database and restrict access to manager.

kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab) was caused
by having "database monitor" before the real database.

The ACL which should restrict access to cn=Monitor was only applied to the
real database, moved it directly below "database monitor" to the end of the
file.


Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- slapd.conf.template.in	28 Jan 2007 15:29:18 -0000	1.10
+++ slapd.conf.template.in	27 Feb 2007 18:01:03 -0000	1.11
@@ -42,8 +42,6 @@
 
 loglevel	0
 
-database        monitor
-
 database	bdb
 suffix		"@@@base_dn@@@"
 cachesize       10000
@@ -97,10 +95,6 @@
 	by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
 	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 attrs=userPassword
    	by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" =wx
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" =wx
@@ -193,3 +187,11 @@
 	by * read stop
 
 include @ldapserver_confdir@/slapd.replicas
+
+
+database	monitor
+
+access to *
+	by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
+	by * none stop
+



From cvs at kolab.org  Tue Feb 27 19:20:05 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Feb 2007 19:20:05 +0100 (CET)
Subject: thomas: doc/www/src cvs-kolab.html.m4,1.12,1.13 
Message-ID: <20070227182005.BC68D1005AB@lists.intevation.de>

Author: thomas

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

Modified Files:
	cvs-kolab.html.m4 
Log Message:
cvs-kolab.html.m4: kolab/issue1629 (CVS main module is "utils" not "util")
(patch from Tim Gerundt)


Index: cvs-kolab.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/cvs-kolab.html.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cvs-kolab.html.m4	10 Nov 2006 10:40:17 -0000	1.12
+++ cvs-kolab.html.m4	27 Feb 2007 18:20:03 -0000	1.13
@@ -35,7 +35,7 @@
 <b>Main Modules</b>
     server: The Kolab Server
     doc:    Documentation
-    util:   Various utilities
+    utils:  Various utilities
 </pre>
 </p>
 



From cvs at kolab.org  Wed Feb 28 18:58:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Feb 2007 18:58:52 +0100 (CET)
Subject: thomas: server release-notes.txt,1.87,1.88 
Message-ID: <20070228175852.4B3801006AB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Fix kolab/issue1630 (Domain maintainer can see distribution lists from other domains)
(Patch from Tim Gerundt <gerundt at montanhydraulik.com>)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- release-notes.txt	27 Feb 2007 18:01:03 -0000	1.87
+++ release-notes.txt	28 Feb 2007 17:58:50 -0000	1.88
@@ -64,6 +64,7 @@
 
 	kolab/issue1457 (updated French translation)
 	kolab/issue1612 (modify user ignores account type)
+	kolab/issue1630 (Domain maintainer can see distribution lists from other domains)
 
 
 Changes since 2.1 beta 4:



From cvs at kolab.org  Wed Feb 28 18:58:52 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Feb 2007 18:58:52 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
	index.php.in, 1.2, 1.3 
Message-ID: <20070228175852.5164B1006AC@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
Fix kolab/issue1630 (Domain maintainer can see distribution lists from other domains)
(Patch from Tim Gerundt <gerundt at montanhydraulik.com>)


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php.in	12 Jun 2006 18:52:51 -0000	1.2
+++ index.php.in	28 Feb 2007 17:58:50 -0000	1.3
@@ -46,7 +46,17 @@
 if( !$errors ) {
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
-  $filter = "(&(!(cn=domains))(objectclass=kolabGroupOfNames))";
+  $domains = $ldap->domainsForMaintainerDn($auth->dn());
+  if( is_array($domains) ) {
+  	$domainfilter='';
+  	foreach( $domains as $dom ) {
+  	  $domainfilter .= '(cn=*@'.$ldap->escape($dom).')';
+  	}
+  	if( $domainfilter ) $domainfilter = "(|$domainfilter)";
+  } else {
+  	$domainfilter= "";
+  }
+  $filter = "(&(!(cn=domains))$domainfilter(objectclass=kolabGroupOfNames))";
   $result = ldap_search($ldap->connection, $base_dn, $filter);
   if( $result ) {
 	$count = ldap_count_entries($ldap->connection, $result);



From cvs at kolab.org  Fri Mar  2 05:32:32 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:32:32 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.php.in, 1.7, 1.8 freebusycache.class.php.in, 1.8, 1.9 
Message-ID: <20070302043232.0B5001006B4@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.php.in freebusycache.class.php.in 
Log Message:
switch to db4

Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusy.php.in	22 Nov 2006 17:05:18 -0000	1.7
+++ freebusy.php.in	2 Mar 2007 04:32:29 -0000	1.8
@@ -92,6 +92,8 @@
   notFound($pfb->error);
 }
 
+//myLog("Found pfbs: ".join(",",$pfbs)." for $user",RM_LOG_DEBUG);
+
 if( $req_extended ) {
   // Get accessing users groups
   $imapgroups = $ldap->distlists( $ldap->dn( $imapuser ) );
@@ -138,4 +140,4 @@
 }
 
 echo $vfb;
-?>
\ No newline at end of file
+?>

Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- freebusycache.class.php.in	22 Nov 2006 15:49:59 -0000	1.8
+++ freebusycache.class.php.in	2 Mar 2007 04:32:29 -0000	1.9
@@ -165,7 +165,10 @@
     } else {
       $db = dba_open( $this->basedir.'/pfbcache.db', 'cd' );
     }
-    if( $db === false ) return false;
+    if( $db === false ) {
+	myLog("dba_open(".$this->basedir.'/pfbcache.db'.") failed", RM_LOG_ERROR);
+	return false;
+    }
     for( $uid = dba_firstkey($db); $uid !== false; $uid = dba_nextkey($db)) {
       $lst = dba_fetch( $uid, $db );
       $lst = $this->decodeList( $lst );
@@ -184,7 +187,10 @@
     } else {
       $db = dba_open( $this->basedir.'/pfbcache.db', 'rd' );
     }
-    if( $db === false ) return false;
+    if( $db === false ) {
+	myLog("dba_open(".$this->basedir.'/pfbcache.db'.") failed", RM_LOG_ERROR);
+	return false;
+    }
     $uids = $groups;
     for( $i = 0; $i < count($uids); $i++ ) $uids[$i] = 'group:'.$uids[$i];
     $uids[] = $uid;
@@ -319,6 +325,7 @@
   }
 
   function decodeList( $str ) {
+    myLog("FreeBusyCache::decodeList($str)", RM_LOG_DEBUG);
     return split( ',', $str );
   }
   function encodeList( $lst ) {
@@ -348,4 +355,4 @@
   var $error;
 };
 
-?>
\ No newline at end of file
+?>



From cvs at kolab.org  Fri Mar  2 05:33:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:33:02 +0100 (CET)
Subject: steffen: server/apache Makefile,1.23,1.24 
Message-ID: <20070302043302.A656C1006B4@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
switch to db4 for php

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	6 Nov 2006 13:22:36 -0000	1.23
+++ Makefile	2 Mar 2007 04:33:00 -0000	1.24
@@ -34,7 +34,7 @@
 		--define 'with_mod_dav yes' \
 		--define 'with_mod_php yes' \
 		--define 'with_mod_php_zlib yes' \
-		--define 'with_mod_php_gdbm yes' \
+		--define 'with_mod_php_bdb yes' \
 		--define 'with_mod_php_gettext yes' \
 		--define 'with_mod_php_imap yes' \
 		--define 'with_mod_php_openldap yes' \



From cvs at kolab.org  Fri Mar  2 05:33:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:33:19 +0100 (CET)
Subject: steffen: server/php Makefile,1.5,1.6 
Message-ID: <20070302043319.2ED6D1006B4@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
switch to db4 for php

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	6 Nov 2006 13:22:36 -0000	1.5
+++ Makefile	2 Mar 2007 04:33:17 -0000	1.6
@@ -26,13 +26,13 @@
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
 $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpam
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 		--define 'with_zlib yes' \
-		--define 'with_gdbm yes' \
+		--define 'with_bdb yes' \
 		--define 'with_gettext yes' \
 		--define 'with_imap yes' \
 		--define 'with_openldap yes' \



From cvs at kolab.org  Fri Mar  2 05:34:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:34:36 +0100 (CET)
Subject: steffen: server/clamav kolab.patch,1.1,1.2 
Message-ID: <20070302043436.4939F1006B4@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab.patch 
Log Message:
patch was outdated, works again now

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch	14 Feb 2007 17:44:17 -0000	1.1
+++ kolab.patch	2 Mar 2007 04:34:34 -0000	1.2
@@ -1,6 +1,6 @@
---- clamav.spec.orig	2007-02-14 06:54:23.000000000 +0100
-+++ clamav.spec	2007-02-14 17:54:29.000000000 +0100
-@@ -33,7 +33,7 @@
+--- clamav.spec.orig	2007-02-23 11:30:31.000000000 +0100
++++ clamav.spec	2007-02-23 11:30:59.000000000 +0100
+@@ -33,7 +33,7 @@ Class:        EVAL
  Group:        AntiVirus
  License:      GPL
  Version:      0.90
@@ -9,18 +9,18 @@
  
  #   package options
  %option       with_milter  no
-@@ -46,8 +46,8 @@
+@@ -46,8 +46,8 @@ Patch0:       clamav.patch
  #   build information
  Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
--BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2
+-BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc, bzip2, pkgconfig, bc
 -PreReq:       OpenPKG, openpkg >= 20060823
-+BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2
++BuildPreReq:  OpenPKG, openpkg >= 2.4.3, gcc, bzip2, pkgconfig, bc
 +PreReq:       OpenPKG, openpkg >= 2.4.3
- BuildPreReq:  zlib, curl, gmp
- PreReq:       zlib, curl, gmp
+ BuildPreReq:  zlib, bzip2, curl, gmp, libiconv, openssl
+ PreReq:       zlib, bzip2, curl, gmp, libiconv, openssl
  %if "%{with_milter}" == "yes"
-@@ -84,6 +84,7 @@
+@@ -84,6 +84,7 @@ AutoReqProv:  no
      CFLAGS="%{l_cflags -O}" \
      CPPFLAGS="%{l_cppflags}" \
      LDFLAGS="%{l_ldflags}" \
@@ -28,16 +28,3 @@
      GREP="grep" \
      ./configure \
          --prefix=%{l_prefix} \
-@@ -121,10 +122,10 @@
-     %{l_shtool} install -c -m 644 \
-         -e 's;^\(Example\);#\1;' \
-         -e 's;^#\(LogFile\) /.*;\1 %{l_prefix}/var/clamav/clamd.log;' \
--        -e 's;^#\(LogTime\).*;\1;' \
-+        -e 's;^#\(LogTime.*\);\1;' \
-         -e 's;^#\(PidFile\).*;\1 %{l_prefix}/var/clamav/clamd.pid;' \
-         -e 's;^\(LocalSocket\).*;\1 %{l_prefix}/var/clamav/clamd.sock;' \
--        -e 's;^#\(FixStaleSocket\).*;\1;' \
-+        -e 's;^#\(FixStaleSocket.*\);\1;' \
-         -e 's;^#\(DatabaseDirectory\).*;\1 %{l_prefix}/share/clamav;' \
-         -e 's;^#\(User\).*;\1 %{l_rusr};' \
-         etc/clamd.conf \



From cvs at kolab.org  Fri Mar  2 05:35:22 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:35:22 +0100 (CET)
Subject: steffen: server obmtool.conf,1.240,1.241 
Message-ID: <20070302043522.865811006B4@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
new build options for bdb in php and a couple of new clamav deps

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- obmtool.conf	14 Feb 2007 17:44:17 -0000	1.240
+++ obmtool.conf	2 Mar 2007 04:35:20 -0000	1.241
@@ -99,7 +99,7 @@
     @trigger ${loc}sasl-2.1.21-2.5.0 --with=ldap --with=login
     @install ${loc}getopt-20051005-2.5.0
     @trigger ${loc}proftpd-1.3.0rc2-2.5.0 --with=ldap
-    @install ${loc}gdbm-1.8.3-2.5.0
+    #@install ${loc}gdbm-1.8.3-2.5.0
     @install ${plusloc}dbtool-1.6-2.5.0
     @trigger ${altloc}postfix-2.2.5-2.5.0_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.5.0
@@ -121,7 +121,7 @@
 	--with=mod_dav \
 	--with=mod_php \
 	--with=mod_php_zlib \
-	--with=mod_php_gdbm \
+	--with=mod_php_bdb \
 	--with=mod_php_gettext \
 	--with=mod_php_imap \
 	--with=mod_php_openldap \
@@ -131,7 +131,7 @@
 	--with=mod_php_mbstring
     @trigger ${altloc}php-4.4.0-2.5.2_kolab \
 	--with=zlib \
-	--with=gdbm \
+	--with=bdb \
 	--with=gettext \
 	--with=imap \
 	--with=openldap \
@@ -145,12 +145,14 @@
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
     @trigger ${loc}curl-7.15.0-2.5.2
+	@install ${loc}bc-1.06-2.5.0
+    @install ${loc}pkgconfig-0.19-2.5.0
     @install ${altloc}clamav-0.90-20070214_kolab
     @install ${altloc}perl-kolab-5.8.7-20070117
-    @install ${altloc}kolabd-2.0.99-20070214 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20070214 --define kolab_version=$kolab_version
+    @install ${altloc}kolabd-2.0.99-20070223 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20070223 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20070117 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20070223 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version
     @check
 



From cvs at kolab.org  Fri Mar  2 05:37:12 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:37:12 +0100 (CET)
Subject: steffen: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.6,
	1.7 
Message-ID: <20070302043712.460191006B4@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
switch to db4 for php fb

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusy.conf.template.in	5 Feb 2007 17:23:11 -0000	1.6
+++ freebusy.conf.template.in	2 Mar 2007 04:37:10 -0000	1.7
@@ -89,13 +89,13 @@
 $params['log_level'] = 4;
 
 // What db type to use for freebusy caches
-$params['dbtype'] = 'gdbm';
+$params['dbtype'] = 'db4';
 
 // IMAP options passed to imap_open
 //$params['imap_options'] = "/notls/secure/readonly";
 $params['imap_options'] = "/notls/readonly";
 
-$params['pfb_dbformat'] = 'gdbm';          // default: gdbm
+$params['pfb_dbformat'] = 'db4';          // default: db4
 
 // Location of the cache files
 $params['cache_dir'] = '@freebusy_cachedir@';



From cvs at kolab.org  Fri Mar  2 05:39:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:39:42 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.conf, 1.3, 1.4 
Message-ID: <20070302043942.95E591006A0@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.conf 
Log Message:
conf example updated

Index: freebusy.conf
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freebusy.conf	25 Oct 2006 02:28:57 -0000	1.3
+++ freebusy.conf	2 Mar 2007 04:39:40 -0000	1.4
@@ -64,7 +64,7 @@
 $params['send_content_disposition'] = false;
 
 // What db type to use for freebusy caches 
-$params['dbtype'] = 'gdbm';
+$params['dbtype'] = 'db4';
 
 // Logging
 $params['log'] = "syslog:";
@@ -77,7 +77,7 @@
 $params['kolab_prefix'] = "";
 $params['cache_dir'] = "/datastore/freebusy";          // default: /var/kolab/www/freebusy/cache
 
-$params['pfb_dbformat'] = "";          // default: gdbm
+$params['pfb_dbformat'] = "db4";
 
 // don't change this if you don't have to
 +$params['ldap_uri'] = "";



From cvs at kolab.org  Fri Mar  2 05:40:23 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  2 Mar 2007 05:40:23 +0100 (CET)
Subject: steffen: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.7,
	1.8 
Message-ID: <20070302044023.2347C1006A0@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
no default really

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusy.conf.template.in	2 Mar 2007 04:37:10 -0000	1.7
+++ freebusy.conf.template.in	2 Mar 2007 04:40:21 -0000	1.8
@@ -95,7 +95,7 @@
 //$params['imap_options'] = "/notls/secure/readonly";
 $params['imap_options'] = "/notls/readonly";
 
-$params['pfb_dbformat'] = 'db4';          // default: db4
+$params['pfb_dbformat'] = 'db4';
 
 // Location of the cache files
 $params['cache_dir'] = '@freebusy_cachedir@';



From cvs at kolab.org  Thu Mar  8 10:08:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  8 Mar 2007 10:08:31 +0100 (CET)
Subject: thomas: server README.1st,1.50,1.51 
Message-ID: <20070308090831.430971006C4@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
README: Mention that deleting users sometimes doesn't work before kolabd restart


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- README.1st	13 Feb 2007 21:36:36 -0000	1.50
+++ README.1st	8 Mar 2007 09:08:29 -0000	1.51
@@ -272,7 +272,7 @@
       a UTF-8 locale, e.g. ja_JP.UTF-8 for Japanese.
       See kolab/issue881 and kolab/issue1585 for details.
 
-    - Under some circumstance the Kolab server may not update create
+    - Under some circumstance the Kolab server may not create or delete
       users or update the configuration after changes have been made in
       the web interface.  This happens most often immediately after the
       bootstrap.  In that case restart the kolabd:



From cvs at kolab.org  Mon Mar 12 12:11:42 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 12:11:42 +0100 (CET)
Subject: bernhard: doc/www/src roadmap.html.m4,1.9,1.10 
Message-ID: <20070312111142.CA9261005DF@lists.intevation.de>

Author: bernhard

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

Modified Files:
	roadmap.html.m4 
Log Message:
Updated roadmap.


Index: roadmap.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/roadmap.html.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- roadmap.html.m4	24 Aug 2006 14:39:25 -0000	1.9
+++ roadmap.html.m4	12 Mar 2007 11:11:40 -0000	1.10
@@ -18,20 +18,8 @@
 
 <p>
 
-<h2>Kolab Server 2.0 release series</h2>
-
-Current release is: 2.0.4 (20060811)
-
-<h3>Further Server 2.0.x releases</h3>
-
-The maintenance of the 2.0-branch will include security or
-other important fixes.
 
-<p>
-Other fixes and some feature improvemtents (perhaps backports from
-HEAD) may occur depending on the needs of the users.
-
-<h2>Upcoming Kolab Server 2.1 release series</h2>
+<h2>Kolab Server 2.1 release series</h2>
 
 <ul>
 <li> Simple version of multi-email-domain support<br>
@@ -43,28 +31,53 @@
 <li> Code cleanups.
 </ul>
 
-On June the 20th, a Beta version Server 2.1-beta2 was released.
+On February the 5th, Server 2.1-rc1 was released.
+This series is already used in production since more then a year
+at some sites. You may need to watch the issue tracker and do
+some more test, but if you set a new server, this is the right version to use.
 
-<h3>Upcoming Server release 2.1-rc1</h3>
+<h3>Upcoming Server release 2.1-rc2</h3>
 
-Expected: August 2006
+Expected: End of March, 2007.
 
 <ul>
-<li> Minor Bugs fixed from beta2.
+<li> Release critical problems fixed. 
 </ul>
 
+<h3>Upcoming Server release 2.1.0</h3>
+
+Expected: April, 2007.
+
+<ul>
+<li> Similiar to 2.1-rc2.
+</ul>
+
+
+<h2>Kolab Server 2.0 old release series</h2>
+
+Current release is: 2.0.4 (20060811)
+
+<h3>Further Server 2.0.x releases</h3>
+
+The maintenance of the 2.0-branch will only include high priority
+security or other fixes.
+
 
 <h2>Future Kolab Server 3.0 release series</h2>
 
-Actual development has not startet yet.
+The goals for Kolab Server 3 are not fixed yet
+and will be determined by the community (which includes
+the companies, like the Kolab-Konsortium).
+The issue tracker has some ideas and proposals already.
 
 <p>
-Expected: Start of development Q2 2007
+Expected: Start of development Q1 2008
 
 <ul>
 <li> Full multi-email-domain support<br>
      (LDAP structure to have subtrees for each domain etc.)
-<li> Fully supported Web-Client
+<li> Fully supported Web-Client (might be an optional module and 
+     available earlier as well).
 </ul>
 
 m4_include(footer.html.m4)



From cvs at kolab.org  Mon Mar 12 13:33:47 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 13:33:47 +0100 (CET)
Subject: steffen: server obmtool.conf,1.241,1.242 
Message-ID: <20070312123347.E772E1005DF@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
updated fsl version

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- obmtool.conf	2 Mar 2007 04:35:20 -0000	1.241
+++ obmtool.conf	12 Mar 2007 12:33:45 -0000	1.242
@@ -55,7 +55,7 @@
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.1
     @install ${loc}gcc-4.0.2-2.5.0
-    @install ${loc}fsl-1.6.1-2.5.0
+    @install ${loc}fsl-1.7.0-20070302
     @install ${loc}mm-1.4.0-2.5.0
     @install ${loc}perl-5.8.7-2.5.1
     @install ${loc}perl-openpkg-5.8.7-2.5.0
@@ -148,11 +148,11 @@
 	@install ${loc}bc-1.06-2.5.0
     @install ${loc}pkgconfig-0.19-2.5.0
     @install ${altloc}clamav-0.90-20070214_kolab
-    @install ${altloc}perl-kolab-5.8.7-20070117
-    @install ${altloc}kolabd-2.0.99-20070223 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20070223 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20070302
+    @install ${altloc}kolabd-2.0.99-20070302 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20070302 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20070223 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20070302 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20070112 --define kolab_version=$kolab_version
     @check
 



From cvs at kolab.org  Mon Mar 12 14:10:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 14:10:31 +0100 (CET)
Subject: schreiber: doc/www/src Makefile,1.23,1.24 index.html.m4,1.108,1.109 
Message-ID: <20070312131031.412A81005DF@lists.intevation.de>

Author: schreiber

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

Modified Files:
	Makefile index.html.m4 
Log Message:
added newsentries for Cebit events


Index: Makefile
===================================================================
RCS file: /kolabrepository/doc/www/src/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	11 Aug 2005 17:49:45 -0000	1.23
+++ Makefile	12 Mar 2007 13:10:29 -0000	1.24
@@ -22,14 +22,14 @@
 	mkdir -p ../html/images ../html/howtos/amavis_spamassassin_sophos \
 		../html/howtos/amavis_spamassassin_clam ../html/security \
 		../html/news
-	cp -u howtos/amavis_spamassassin_sophos/*.* \
+	cp howtos/amavis_spamassassin_sophos/*.* \
 		../html/howtos/amavis_spamassassin_sophos
-	cp -u howtos/amavis_spamassassin_clam/*.* \
+	cp howtos/amavis_spamassassin_clam/*.* \
 		../html/howtos/amavis_spamassassin_clam
-	cp -u images/*.png ../html/images/
-	cp -u *.css *.ico *.htm ../html/
-	cp -u security/*.txt ../html/security
-	cp -u news/*.html ../html/news/
+	cp images/*.png ../html/images/
+	cp *.css *.ico *.htm ../html/
+	cp security/*.txt ../html/security
+	cp news/*.html ../html/news/
 
 	for f in $(HTML_FILES); \
 	do \

Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- index.html.m4	15 Feb 2007 12:47:32 -0000	1.108
+++ index.html.m4	12 Mar 2007 13:10:29 -0000	1.109
@@ -47,6 +47,25 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
  <table>
+    <tr><td class="newsd">March 15th - 21st, 2007</td>
+    <td class="newsh">&raquo;CeBIT 2007 - Kolab based events</td</tr></table><p>
+<div class="newsb">
+   
+<ul>
+<li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
+<em>CeBIT, March 16th, 3.15pm - 4.30pm</em>
+<br><br>
+
+<li>The Kolab-Konsortium Business Partner <strong>Univention</strong> will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.<br>
+<em>CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover  </em><br>
+<br><strong>Univention</strong> will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.<br><em>CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</em>
+</li></ul>
+  </div> 
+<p>
+
+
+
+ <table>
     <tr><td class="newsd">February 12th 2007</td>
     <td class="newsh">&raquo;New KDE Kolab Client released, revision 'proko2.1.6'.</td</tr></table><p>
 <div class="newsb">



From cvs at kolab.org  Mon Mar 12 15:06:03 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:06:03 +0100 (CET)
Subject: thomas: server obmtool.conf,1.242,1.243 release-notes.txt,1.88,1.89 
Message-ID: <20070312140603.1C5FA1006B0@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf release-notes.txt 
Log Message:
Updated fsl-1.7.0-2.20070303 in obmtool.conf and release-notes.txt

fsl-1.7.0-2.20070303.src.rpm is from upcoming stable instead of current:
ftp://ftp.openpkg.org/stable/2/SRC/CORE/


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- obmtool.conf	12 Mar 2007 12:33:45 -0000	1.242
+++ obmtool.conf	12 Mar 2007 14:06:01 -0000	1.243
@@ -55,7 +55,7 @@
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.1
     @install ${loc}gcc-4.0.2-2.5.0
-    @install ${loc}fsl-1.7.0-20070302
+    @install ${loc}fsl-1.7.0-20070303
     @install ${loc}mm-1.4.0-2.5.0
     @install ${loc}perl-5.8.7-2.5.1
     @install ${loc}perl-openpkg-5.8.7-2.5.0

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- release-notes.txt	28 Feb 2007 17:58:50 -0000	1.88
+++ release-notes.txt	12 Mar 2007 14:06:01 -0000	1.89
@@ -41,6 +41,12 @@
 
 	New upstream version.
 
+    - fsl-1.7.0-20070303
+
+	New upstream version.
+
+	kolab/issue1172 (Cyrus Imapd dies when logfile exceeds 2 GiB)
+
     - kolabd-2.1.0-20070???
 
 	Fix the path to the freebusy directory for non-OpenPKG installations.



From cvs at kolab.org  Mon Mar 12 15:31:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:33 +0100 (CET)
Subject: thomas: server .cvsignore,NONE,1.1 
Message-ID: <20070312143133.B550E1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
stage



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/clamav .cvsignore,NONE,1.1 
Message-ID: <20070312143134.0D3661006B5@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/file .cvsignore,NONE,1.1 
Message-ID: <20070312143134.1833B1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:33 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:33 +0100 (CET)
Subject: thomas: server/apache .cvsignore,NONE,1.1 
Message-ID: <20070312143133.F038E1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/imap .cvsignore,NONE,1.1 
Message-ID: <20070312143134.518961006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers
	.cvsignore, NONE, 1.1 
Message-ID: <20070312143134.8C27F1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
COPYING
INSTALL
Makefile
Makefile.in
README
aclocal.m4
autom4te.cache
config.log
config.status
configure
dist_conf
install-sh
kolab-resource-handlers.spec
missing



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/imapd .cvsignore,NONE,1.1 
Message-ID: <20070312143134.59D661006B5@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin .cvsignore,NONE,1.1 
Message-ID: <20070312143134.A207F1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
? COPYING
? INSTALL
? Makefile
? Makefile.in
? README
? aclocal.m4
? autom4te.cache
? config.log
? config.status
? configure
? dist_conf
? install-sh
? kolab-webadmin.spec
? missing



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	.cvsignore, NONE, 1.1 
Message-ID: <20070312143134.AE60E1006B5@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
In directory doto:/tmp/cvs-serv3346/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
messages.mo



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	.cvsignore, NONE, 1.1 
Message-ID: <20070312143134.DA5541006B5@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
In directory doto:/tmp/cvs-serv3346/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
messages.mo



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/doc .cvsignore,NONE,1.1 
Message-ID: <20070312143135.182D21006B7@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
README.amavisd
README.webgui



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	.cvsignore, NONE, 1.1 
Message-ID: <20070312143134.E18F11006B7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
In directory doto:/tmp/cvs-serv3346/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
messages.mo



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	.cvsignore, NONE, 1.1 
Message-ID: <20070312143134.E50221006C2@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
In directory doto:/tmp/cvs-serv3346/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
messages.mo



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	.cvsignore, NONE, 1.1 
Message-ID: <20070312143135.05CFB1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
page.tpl



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/namespace/libexec .cvsignore,NONE,1.1 
Message-ID: <20070312143135.2F5A21006C2@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
start
stop



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/openldap .cvsignore,NONE,1.1 
Message-ID: <20070312143135.343B61006C4@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/php .cvsignore,NONE,1.1 
Message-ID: <20070312143135.3DB3C1006B5@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:34 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:34 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	.cvsignore, NONE, 1.1 
Message-ID: <20070312143134.CDF291006B0@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
In directory doto:/tmp/cvs-serv3346/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
messages.mo



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/kolabd/kolabd .cvsignore,NONE,1.1 
Message-ID: <20070312143135.0D3071006B5@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
INSTALL
Makefile
Makefile.in
README
aclocal.m4
autom4te.cache
config.log
config.status
configure
install-sh
kolabcheckperm
kolabd.spec
missing



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/postfix .cvsignore,NONE,1.1 
Message-ID: <20070312143135.5AA3C1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
*.src.rpm



From cvs at kolab.org  Mon Mar 12 15:31:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:31:35 +0100 (CET)
Subject: thomas: server/perl-kolab .cvsignore,NONE,1.1 
Message-ID: <20070312143135.3C27C1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore everything that is generated during build


--- NEW FILE: .cvsignore ---
COPYING
INSTALL
Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.log
config.status
configure
dist_conf
install-sh
missing
perl-kolab.spec



From cvs at kolab.org  Mon Mar 12 15:35:21 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:35:21 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin .cvsignore,1.1,1.2 
Message-ID: <20070312143521.67C961006B0@lists.intevation.de>

Author: thomas

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

Modified Files:
	.cvsignore 
Log Message:
Removed extra '? ' from generating .cvsignore


Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	12 Mar 2007 14:31:32 -0000	1.1
+++ .cvsignore	12 Mar 2007 14:35:19 -0000	1.2
@@ -1,14 +1,14 @@
-? COPYING
-? INSTALL
-? Makefile
-? Makefile.in
-? README
-? aclocal.m4
-? autom4te.cache
-? config.log
-? config.status
-? configure
-? dist_conf
-? install-sh
-? kolab-webadmin.spec
-? missing
+COPYING
+INSTALL
+Makefile
+Makefile.in
+README
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+dist_conf
+install-sh
+kolab-webadmin.spec
+missing



From cvs at kolab.org  Mon Mar 12 15:50:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:50:44 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale
	.cvsignore, NONE, 1.1 
Message-ID: <20070312145044.A01DB1006B0@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore 
Log Message:
Ignore messages.pot generated by extract_messages, too.


--- NEW FILE: .cvsignore ---
messages.pot



From cvs at kolab.org  Mon Mar 12 15:54:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:54:46 +0100 (CET)
Subject: thomas: server release-notes.txt,1.89,1.90 
Message-ID: <20070312145446.2E1861005B5@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated clamav package


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- release-notes.txt	12 Mar 2007 14:06:01 -0000	1.89
+++ release-notes.txt	12 Mar 2007 14:54:44 -0000	1.90
@@ -37,7 +37,7 @@
 
 Changes since 2.1 rc 1:
 
-    - clamav-0.90-20070214_kolab
+    - clamav-0.90.1-20070302_kolab
 
 	New upstream version.
 



From cvs at kolab.org  Mon Mar 12 15:54:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 12 Mar 2007 15:54:46 +0100 (CET)
Subject: thomas: server/clamav Makefile,1.1,1.2 kolab.patch,1.2,1.3 
Message-ID: <20070312145446.3163A1006B0@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Updated clamav package


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	14 Feb 2007 17:44:17 -0000	1.1
+++ Makefile	12 Mar 2007 14:54:44 -0000	1.2
@@ -12,9 +12,9 @@
 endif
 
 PACKAGE=clamav
-VERSION=0.90
-RELEASE=20070214
-KOLABRELEASE=20070214_kolab
+VERSION=0.90.1
+RELEASE=20070302
+KOLABRELEASE=20070302_kolab
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/kolab.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.patch	2 Mar 2007 04:34:34 -0000	1.2
+++ kolab.patch	12 Mar 2007 14:54:44 -0000	1.3
@@ -3,9 +3,9 @@
 @@ -33,7 +33,7 @@ Class:        EVAL
  Group:        AntiVirus
  License:      GPL
- Version:      0.90
--Release:      20070214
-+Release:      20070214_kolab
+ Version:      0.90.1
+-Release:      20070302
++Release:      20070302_kolab
  
  #   package options
  %option       with_milter  no



From cvs at kolab.org  Thu Mar 15 15:12:46 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Mar 2007 15:12:46 +0100 (CET)
Subject: steffen: server/apache Makefile,1.24,1.25 kolab.patch,1.10,1.11 
Message-ID: <20070315141246.45DC51006B7@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
remove dep on gdbm

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	2 Mar 2007 04:33:00 -0000	1.24
+++ Makefile	15 Mar 2007 14:12:44 -0000	1.25
@@ -14,7 +14,7 @@
 PACKAGE=apache
 VERSION=1.3.33
 RELEASE=2.5.6
-KOLABRELEASE=2.5.6_kolab
+KOLABRELEASE=2.5.6_kolab2
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
@@ -30,6 +30,7 @@
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
+		--define 'with_gdbm_ndbm no' \
 		--define 'with_mod_auth_ldap yes' \
 		--define 'with_mod_dav yes' \
 		--define 'with_mod_php yes' \

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab.patch	3 Nov 2006 17:55:45 -0000	1.10
+++ kolab.patch	15 Mar 2007 14:12:44 -0000	1.11
@@ -1,15 +1,15 @@
---- apache.spec.orig	2006-11-03 18:36:39.283198000 +0100
-+++ apache.spec	2006-11-03 18:36:54.491277155 +0100
-@@ -65,7 +65,7 @@
+--- apache.spec.orig	2007-03-15 14:43:36.000000000 +0100
++++ apache.spec	2007-03-15 14:47:40.000000000 +0100
+@@ -65,7 +65,7 @@ Class:        BASE
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
 -Release:      2.5.6
-+Release:      2.5.6_kolab
++Release:      2.5.6_kolab2
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -214,6 +214,10 @@
+@@ -214,6 +214,10 @@ Patch1:       apache.patch.modowa
  Patch2:       apache.patch.php
  Patch3:       http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
  Patch4:       apache.patch.suphp
@@ -20,7 +20,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -527,6 +531,9 @@
+@@ -527,6 +531,9 @@ AutoReqProv:  no
  %if "%{with_mod_php_hardened}" == "yes"
        %patch -p1 -P 3
  %endif
@@ -30,7 +30,7 @@
      ) || exit $?
  %endif
  %if "%{with_mod_dav}" == "yes"
-@@ -561,6 +568,7 @@
+@@ -561,6 +568,7 @@ AutoReqProv:  no
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14
@@ -38,3 +38,11 @@
  %endif
  %if "%{with_mod_auth_radius}" == "yes"
      %setup -q -T -D -a 15
+@@ -1129,6 +1137,7 @@ AutoReqProv:  no
+ %if "%{with_mod_dav}" == "yes"
+           --activate-module=src/modules/dav/libdav.a \
+ %endif
++          --disable-module=auth_dbm \
+           --disable-rule=EXPAT \
+ %if "%{with_shared_core}" == "yes"
+           --enable-rule=SHARED_CORE \



From cvs at kolab.org  Thu Mar 15 16:25:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Mar 2007 16:25:36 +0100 (CET)
Subject: bernhard: utils/testing kmail-send-test-email-aegyptenissue743-1.py,
	NONE, 1.1 
Message-ID: <20070315152536.189C41006B2@lists.intevation.de>

Author: bernhard

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

Added Files:
	kmail-send-test-email-aegyptenissue743-1.py 
Log Message:
Adding test script for aegpyten/issue743.


--- NEW FILE: kmail-send-test-email-aegyptenissue743-1.py ---
#!/usr/bin/env python
"""Send Email to reproduce https://intevation.de/roundup/aegypten/issue734 .

Usage $progname <recipientemailaddress>

aegypten/issue734 is
(Moving email in dimap breaks signature, because lines removed)

In the source you can give smtp-server, password 
and you can enable debug output.

This script is Free Software under the GNU General Public License >=v2.
bernhard at intevation.de
"""
#20070315 Bernhard initial
__version__="$Revision: 1.1 $"[10:-1]

import sys

import smtplib
import string

msg="""Subject: Eine signierte Mail
From: Sascha Wilde <wilde at intevation.de>
Date: Thu, 15 Mar 2007 15:16:02 +0100
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=


Hallo Bernhard

hier also die mail....
jetzt kommt gleich der Anhang...
3 ...
2 ...
1 ...
BOOOM


--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=x.txt
Content-Transfer-Encoding: quoted-printable
Content-Description: Anhang


Ein Anhang mit Text.
Weil das wohl auch in der urspr=FCnglichen Mail so war

und nicht ein wenig mehr Text, damit es nicht so langweilig ist...



--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable


und hier geht der Text weiter...
sch=F6n mit Umlaut, wie besprochen!

Und das ganz nat=FCrlich signiert...

und? hilft's?
sascha
=2D-=20
Sascha Wilde                                      OpenPGP key: 4BB86568
Intevation GmbH, Osnabr=FCck             http://www.intevation.de/~wilde/
Amtsgericht Osnabr=FCck, HR B 18998             http://www.intevation.de/
Gesch=E4ftsf=FChrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner

--=-=-=--

--==-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFF+VUtuyGFFEu4ZWgRApmZAKCGHUi440uPEggdKZoE1WHWO0ah6QCfaqLv
HYelJfvqQQJkoW99SKRUVec=
=AmlK
-----END PGP SIGNATURE-----
--==-=-=--
"""

toadd = [sys.argv[1]]
#toadd = ["test.account at example.org"] # list of to addresses
smtpserver='localhost'
# if you set a loginname, aconnection via TLS and authentification is tried
loginname = None
password  = None


fromadd="nobody at example.org"
basemsg=("From: %s\r\nTo: %s\r\n%%s\r\n" % (fromadd, string.join(toadd, ", ")))

server=smtplib.SMTP(smtpserver)
#server.set_debuglevel(1)

if loginname != None and password != None:
    server.starttls()
    server.login(loginname,password)

server.sendmail(fromadd,toadd,msg)

server.quit()



From cvs at kolab.org  Thu Mar 15 16:28:59 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Mar 2007 16:28:59 +0100 (CET)
Subject: bernhard: utils/testing kmail-send-test-email-aegyptenissue734-1.py,
	NONE, 1.1 kmail-send-test-email-aegyptenissue743-1.py, 1.1, NONE 
Message-ID: <20070315152859.0857E1006B2@lists.intevation.de>

Author: bernhard

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

Added Files:
	kmail-send-test-email-aegyptenissue734-1.py 
Removed Files:
	kmail-send-test-email-aegyptenissue743-1.py 
Log Message:
Renamed file. (means: remove old, add with new name).


--- NEW FILE: kmail-send-test-email-aegyptenissue734-1.py ---
#!/usr/bin/env python
"""Send Email to reproduce https://intevation.de/roundup/aegypten/issue734 .

Usage $progname <recipientemailaddress>

aegypten/issue734 is
(Moving email in dimap breaks signature, because lines removed)

In the source you can give smtp-server, password 
and you can enable debug output.

This script is Free Software under the GNU General Public License >=v2.
bernhard at intevation.de
"""
#20070315 Bernhard initial
__version__="$Revision: 1.1 $"[10:-1]

import sys

import smtplib
import string

msg="""Subject: Test for aegpyten/issue734-1, OpenPGP signed
From: Sascha Wilde <wilde at intevation.de>
Date: Thu, 15 Mar 2007 15:16:02 +0100
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=


Hallo Bernhard

hier also die mail....
jetzt kommt gleich der Anhang...
3 ...
2 ...
1 ...
BOOOM


--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=x.txt
Content-Transfer-Encoding: quoted-printable
Content-Description: Anhang


Ein Anhang mit Text.
Weil das wohl auch in der urspr=FCnglichen Mail so war

und nicht ein wenig mehr Text, damit es nicht so langweilig ist...



--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable


und hier geht der Text weiter...
sch=F6n mit Umlaut, wie besprochen!

Und das ganz nat=FCrlich signiert...

und? hilft's?
sascha
=2D-=20
Sascha Wilde                                      OpenPGP key: 4BB86568
Intevation GmbH, Osnabr=FCck             http://www.intevation.de/~wilde/
Amtsgericht Osnabr=FCck, HR B 18998             http://www.intevation.de/
Gesch=E4ftsf=FChrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner

--=-=-=--

--==-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFF+VUtuyGFFEu4ZWgRApmZAKCGHUi440uPEggdKZoE1WHWO0ah6QCfaqLv
HYelJfvqQQJkoW99SKRUVec=
=AmlK
-----END PGP SIGNATURE-----
--==-=-=--
"""

toadd = [sys.argv[1]]
#toadd = ["test.account at example.org"] # list of to addresses
smtpserver='localhost'
# if you set a loginname, aconnection via TLS and authentification is tried
loginname = None
password  = None


fromadd="nobody at example.org"
basemsg=("From: %s\r\nTo: %s\r\n%%s\r\n" % (fromadd, string.join(toadd, ", ")))

server=smtplib.SMTP(smtpserver)
#server.set_debuglevel(1)

if loginname != None and password != None:
    server.starttls()
    server.login(loginname,password)

server.sendmail(fromadd,toadd,msg)

server.quit()

--- kmail-send-test-email-aegyptenissue743-1.py DELETED ---



From cvs at kolab.org  Thu Mar 15 22:44:35 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 15 Mar 2007 22:44:35 +0100 (CET)
Subject: steffen: server obmtool.conf,1.243,1.244 
Message-ID: <20070315214435.A63371006AF@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
make apache build without gdbm

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- obmtool.conf	12 Mar 2007 14:06:01 -0000	1.243
+++ obmtool.conf	15 Mar 2007 21:44:33 -0000	1.244
@@ -52,10 +52,15 @@
       $PREFIX/bin/openpkg register --mode=post --user=$USERNAME
       $PREFIX/bin/openpkg register --printstatus && echo "Please associate the instance now. Then RETURN to continue." && read DUMMY
     fi
+	# Get rid of gdbm
+	@wiperpm gdbm-1.8.3-2.5.0
+	@wiperpm dbtool-1.6-2.5.0
+	$PREFIX/bin/openpkg rpm -e --nodeps gdbm dbtool
+
     @install ${loc}make-3.80-2.5.0
     @install ${loc}binutils-2.16.1-2.5.1
     @install ${loc}gcc-4.0.2-2.5.0
-    @install ${loc}fsl-1.7.0-20070303
+    @install ${altloc}fsl-1.7.0-2.20070303
     @install ${loc}mm-1.4.0-2.5.0
     @install ${loc}perl-5.8.7-2.5.1
     @install ${loc}perl-openpkg-5.8.7-2.5.0
@@ -100,7 +105,7 @@
     @install ${loc}getopt-20051005-2.5.0
     @trigger ${loc}proftpd-1.3.0rc2-2.5.0 --with=ldap
     #@install ${loc}gdbm-1.8.3-2.5.0
-    @install ${plusloc}dbtool-1.6-2.5.0
+    #@install ${plusloc}dbtool-1.6-2.5.0
     @trigger ${altloc}postfix-2.2.5-2.5.0_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.5.0
     @install ${loc}perl-db-5.8.7-2.5.1
@@ -116,7 +121,8 @@
     @install ${loc}sed-4.1.4-2.5.0
     @install ${loc}libxml-2.6.22-2.5.0
     @install ${loc}libxslt-1.1.15-2.5.1 # WARNING: Remove libgcrypt before building!
-    @trigger ${altloc}apache-1.3.33-2.5.6_kolab \
+    @trigger ${altloc}apache-1.3.33-2.5.6_kolab2 \
+	--without=gdbm_ndbm \
 	--with=mod_auth_ldap \
 	--with=mod_dav \
 	--with=mod_php \



From cvs at kolab.org  Fri Mar 16 02:50:27 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 02:50:27 +0100 (CET)
Subject: steffen: utils/testing send_filtertest_emails.py,1.11,1.12 
Message-ID: <20070316015027.099B81006C7@lists.intevation.de>

Author: steffen

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

Modified Files:
	send_filtertest_emails.py 
Log Message:
make sure we are all using the same test script

Index: send_filtertest_emails.py
===================================================================
RCS file: /kolabrepository/utils/testing/send_filtertest_emails.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- send_filtertest_emails.py	30 Nov 2005 02:53:04 -0000	1.11
+++ send_filtertest_emails.py	16 Mar 2007 01:50:24 -0000	1.12
@@ -49,11 +49,11 @@
 	if loginname != None and password != None:
 	    server.starttls()
 	    server.login(loginname,password)
-        #server.set_debuglevel(1)
+        server.set_debuglevel(1)
 
         server.sendmail(envelope_from,envelope_to,msg)
-        #sys.stdout.write(".")
-        #sys.stdout.flush()
+        sys.stdout.write(".")
+        sys.stdout.flush()
 
         server.quit()
     except:
@@ -216,6 +216,12 @@
     # issue783 (envelope header from check has problems with mailinglists)
     send_mail("x-commits-bounces-+y=malinglist.org at example.org", envelope_to, 
               header_from, header_to, 12,
+              smtp_host = smtp_host, smtp_port = smtp_port,
+              text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten")
+
+    # 12.1: delivered, no Invalid From: header in postfix log:
+    send_mail("blah at example.org", envelope_to,
+              "\"\\\\blah\\\"\" <steffen.hansen at sulaco.hrhansen.dk>", header_to, 12.1,
               smtp_host = smtp_host, smtp_port = smtp_port,
               text = "Kolab filter testmail.\nExpected result: delivery, from header rewritten")
 



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.16, 1.17 
Message-ID: <20070316121726.B665A1006CD@lists.intevation.de>

Author: gunnar

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

Modified Files:
	user.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- user.php.in	20 Feb 2007 15:42:39 -0000	1.16
+++ user.php.in	16 Mar 2007 12:17:24 -0000	1.17
@@ -656,22 +656,30 @@
 			   unset($explodeddn['count']);
 			   unset($explodeddn[0]);
 			   $tmpbasedn = join(",",$explodeddn);			   
-			   if ( !$errors && !ldap_rename($ldap->connection,$dn,$tmprdn,$tmpbasedn,false) ) {
-				 array_push($errors, sprintf(_("LDAP Error: Could not rename %1\$s to %2\$s: %3\$s"), $dn, $tmprdn,
-											 ldap_error($ldap->connection)));
-			   }
-			   if ( !$errors && !ldap_add($ldap->connection,$newdn, $ldap_object) ) {
-				 array_push($errors, sprintf(_("LDAP Error: Could not rename %1\$s to %2\$s: %3\$s"), $dn, $newdn,
-											 ldap_error($ldap->connection)));
-			   }
-			   if( !$errors ) {
-				 if( !ldap_delete($ldap->connection,$tmprdn.','.$tmpbasedn)) {
-				   array_push($errors, sprintf(_("LDAP Error: Could not remove old entry %s,%s: %s"), 
-											   $tmprdn, $tmpbasedn,
-											   ldap_error($ldap->connection)));
+
+			   if ( !$errors ) {
+				 // Try to rename the object
+				 if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $domain_dn, true)) {
+				   array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+											   $newdn, ldap_error($ldap->connection)));
+				 }
+				 if( !$errors ) {
+				   // Renaming was ok, now try to modify the object accordingly
+				   if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+					 // While this should not happen, in case it does, we need to revert the
+					 // renaming
+					 array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+												 ldap_error($ldap->connection)));
+					 $old_dn = substr($dn, 0, strlen($dn) - strlen($domain_dn) - 1);
+					 ldap_rename($ldap->connection, $newdn, $old_dn, $domain_dn, true);
+				   } else {
+					 // everything is fine and we can move on
+					 $messages[] = sprintf( _("%s successfully updated"), $newdn);
+					 $dn = $newdn;
+				   }
 				 }
+				 $dn = $newdn;
 			   }
-			   $dn = $newdn;
 			 } else array_push($errors, sprintf(_("LDAP Error: Could not read %s: %s"), $dn,
 												ldap_error($ldap->connection)));
 		   } else {



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
	sf.php.in, 1.6, 1.7 
Message-ID: <20070316121726.BC27B1006D5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	sf.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sf.php.in	18 Jan 2007 13:11:18 -0000	1.6
+++ sf.php.in	16 Mar 2007 12:17:24 -0000	1.7
@@ -219,13 +219,28 @@
 			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
 				  ($entry=ldap_first_entry($ldap->connection,$result)) &&
 				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
-				if (!ldap_add($ldap->connection,$newdn, $ldap_object) 
-					|| !ldap_delete($ldap->connection,$dn)) {
-				  array_push($errors, sprintf(_("LDAP Error: could not rename %1\$s to %2\$s: %3\$s"), $dn, $newdn,
-											  ldap_error($ldap->connection)));
-				} else {
-				  $messages[] = _('Shared folder updated');
+
+				// Try to rename the object
+				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $sf_root, true)) {
+				  array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+											  $newdn, ldap_error($ldap->connection)));
 				}
+				if( !$errors ) {
+				  // Renaming was ok, now try to modify the object accordingly
+				  if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+					// While this should not happen, in case it does, we need to revert the
+					// renaming
+					array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+												ldap_error($ldap->connection)));
+					$old_dn = substr($dn, 0, strlen($dn) - strlen($sf_root) - 1);
+					ldap_rename($ldap->connection, $newdn, $old_dn, $sf_root, true);
+				  } else {
+					// everything is fine and we can move on
+					$messages[] = _('Shared folder updated');
+					$dn = $newdn;
+				  }
+				}
+
 				$dn = $newdn;
 			  } else array_push($errors, sprintf(_("LDAP Error: could not read %s: %s"), $dn,
 												ldap_error($ldap->connection)));



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
	admin.php.in, 1.4, 1.5 
Message-ID: <20070316121726.CC21C1006D9@lists.intevation.de>

Author: gunnar

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

Modified Files:
	admin.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: admin.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- admin.php.in	10 Jan 2007 16:50:43 -0000	1.4
+++ admin.php.in	16 Mar 2007 12:17:24 -0000	1.5
@@ -211,31 +211,27 @@
 			   $ldap_object['uid'] = $oldattrs['uid'][0];
 			   if( empty($ldap_object['userPassword']) )
 				 $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
-			   if (!ldap_add($ldap->connection,$newdn, $ldap_object) )
-				 array_push($errors, sprintf( _("LDAP Error: could not rename %1\$s to %2\$s: %3\$s"), $dn, 
-											  $newdn, ldap_error($ldap->connection)));
+
+			   // Try to rename the object
+			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) {
+				 array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+											 $newdn, ldap_error($ldap->connection)));
+			   }
 			   if( !$errors ) {
-				 if( !ldap_delete($ldap->connection,$dn)) {
-				   array_push($errors, sprintf(_("LDAP Error: could not remove old entry %s: %s"), $dn, 
+				 // Renaming was ok, now try to modify the object accordingly
+				 if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+				   // While this should not happen, in case it does, we need to revert the
+				   // renaming
+				   array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
 											   ldap_error($ldap->connection)));
+				   $old_dn = substr($dn, 0, strlen($dn) - strlen("cn=internal,".$domain_dn) - 1);
+				   ldap_rename($ldap->connection, $newdn, $old_dn, "cn=internal,".$domain_dn, true);
+				 } else {
+				   // everything is fine and we can move on
+				   $messages[] = sprintf( _("%s successfully updated"), $newdn);
+				   $dn = $newdn;
 				 }
 			   }
-			   if( !$errors ) {
-				 // Update admin group
-				 $groupdn = 'cn=admin,cn=internal,'.$domain_dn;
-				 if( !ldap_mod_add( $ldap->connection,
-											   $groupdn,
-											   array( 'member' => $newdn ) ) ) {
-				   $errors[] = sprintf(_("LDAP Error: Could not add new group entry %s: %s"), $newdn,
-									   ldap_error($ldap->connection));
-				 }
-				 if( !$errors && !ldap_mod_del($ldap->connection,$groupdn,
-									  array( 'member' => $dn ) ) ) {
-				   $errors[] = sprintf( _("LDAP Error: Could not remove old group entry %s: %s"), $dn, 
-										ldap_error($ldap->connection));
-				 }
-			   }			   
-			   $dn = $newdn;
 			 } else array_push($errors,sprintf(_("LDAP Error: could not read %s: %s"), $dn,
 											   ldap_error($ldap->connection)));
 		   } else {



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist
	list.php.in, 1.3, 1.4 
Message-ID: <20070316121726.D26581006D5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	list.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: list.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- list.php.in	9 Mar 2006 21:27:22 -0000	1.3
+++ list.php.in	16 Mar 2007 12:17:24 -0000	1.4
@@ -190,13 +190,28 @@
 			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
 				  ($entry=ldap_first_entry($ldap->connection,$result)) &&
 				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
-				if (!ldap_add($ldap->connection,$newdn, $ldap_object) 
-					|| !ldap_delete($ldap->connection,$dn)) {
-				  array_push($errors, sprintf( _("LDAP Error: Could not rename %1\$s to %2\$s: %3\$s"), $dn, $newdn,
-											   ldap_error($ldap->connection)));
-				} else {
-				  $messages[] = _('Distribution List updated');
+
+				// Try to rename the object
+				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $dl_root, true)) {
+				  array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+											  $newdn, ldap_error($ldap->connection)));
 				}
+				if( !$errors ) {
+				  // Renaming was ok, now try to modify the object accordingly
+				  if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+					// While this should not happen, in case it does, we need to revert the
+					// renaming
+					array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+												ldap_error($ldap->connection)));
+					$old_dn = substr($dn, 0, strlen($dn) - strlen($dl_root) - 1);
+					ldap_rename($ldap->connection, $newdn, $old_dn, $dl_root, true);
+				  } else {
+					// everything is fine and we can move on
+					$messages[] = _('Distribution List updated');
+					$dn = $newdn;
+				  }
+				}
+
 				$dn = $newdn;
 			  } else array_push($errors, sprintf( _("LDAP Error: Could not read %s: %s"), $dn,
 												  ldap_error($ldap->connection)));



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.33,1.34 
Message-ID: <20070316121726.D3A311006DA@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ChangeLog	20 Feb 2007 17:35:59 -0000	1.33
+++ ChangeLog	16 Mar 2007 12:17:24 -0000	1.34
@@ -1,3 +1,22 @@
+2007-03-16  Gunnar Wrobel  <p at rdus.de>
+
+	* www/admin/user/user.php.in: 
+	* www/admin/sharedfolder/sf.php.in: 
+	* www/admin/maintainer/maintainer.php.in: 
+	* www/admin/domainmaintainer/domainmaintainer.php.in: 
+	* www/admin/distributionlist/list.php.in: 
+	* www/admin/administrator/admin.php.in: 
+	* www/admin/addressbook/addr.php.in: 
+
+	Fixed for the new LDAP overlays introduced in
+	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10
+
+	Tries to fix the following issues:
+
+	https://intevation.de/roundup/kolab/issue1614
+	https://intevation.de/roundup/kolab/issue1652
+	https://intevation.de/roundup/kolab/issue1654
+	
 2007-02-20 Bernhard Reiter <bernhard at intevation.de>
 
 	* php/admin/locale/de/LC_MESSAGES/messages.po: 



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php.in, 1.4, 1.5 
Message-ID: <20070316121726.D0F7C1006CD@lists.intevation.de>

Author: gunnar

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

Modified Files:
	addr.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- addr.php.in	29 Mar 2006 10:52:14 -0000	1.4
+++ addr.php.in	16 Mar 2007 12:17:24 -0000	1.5
@@ -204,13 +204,28 @@
 					($entry=ldap_first_entry($ldap->connection,$result)) &&
 					($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
 				  foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
-				  if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
+
+				  // Try to rename the object
+				  if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $addressbook_root, true)) {
 					array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 												$newdn, ldap_error($ldap->connection)));
-				  } else {
-					$messages[] = sprintf( _("%s successfully updated"), $newdn);
 				  }
-				  $dn = $newdn;
+				  if( !$errors ) {
+					// Renaming was ok, now try to modify the object accordingly
+					if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+					  // While this should not happen, in case it does, we need to revert the
+					  // renaming
+					  array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+												  ldap_error($ldap->connection)));
+					  $old_dn = substr($dn, 0, strlen($dn) - strlen($addressbook_root) - 1);
+					  ldap_rename($ldap->connection, $newdn, $old_dn, $addressbook_root, true);
+					} else {
+					  // everything is fine and we can move on
+					  $messages[] = sprintf( _("%s successfully updated"), $newdn);
+					  $dn = $newdn;
+					}
+				  }
+
 				} else {
 				  array_push($errors,sprintf(_("LDAP Error: could not read %s: %s"), $dn,
 											 ldap_error($ldap->connection)));



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
	maintainer.php.in, 1.5, 1.6 
Message-ID: <20070316121726.C0FB51006D6@lists.intevation.de>

Author: gunnar

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

Modified Files:
	maintainer.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- maintainer.php.in	10 Jan 2007 16:50:43 -0000	1.5
+++ maintainer.php.in	16 Mar 2007 12:17:24 -0000	1.6
@@ -208,31 +208,27 @@
 			   $ldap_object['uid'] = $oldattrs['uid'][0];
 			   if( empty($ldap_object['userPassword']) )
 				 $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
-			   if (!ldap_add($ldap->connection,$newdn, $ldap_object) )
-				 array_push($errors, sprintf(_("LDAP Error: could not rename %1\$s to %2\$s: %3\$s"), $dn, $newdn,
-											 ldap_error($ldap->connection)));
+
+			   // Try to rename the object
+			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) {
+				 array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+											 $newdn, ldap_error($ldap->connection)));
+			   }
 			   if( !$errors ) {
-				 if( !ldap_delete($ldap->connection,$dn)) {
-				   array_push($errors, sprintf(_("LDAP Error: could not remove old entry %s: %s"), $dn,
+				 // Renaming was ok, now try to modify the object accordingly
+				 if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+				   // While this should not happen, in case it does, we need to revert the
+				   // renaming
+				   array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
 											   ldap_error($ldap->connection)));
+				   $old_dn = substr($dn, 0, strlen($dn) - strlen("cn=internal,".$domain_dn) - 1);
+				   ldap_rename($ldap->connection, $newdn, $old_dn, "cn=internal,".$domain_dn, true);
+				 } else {
+				   // everything is fine and we can move on
+				   $messages[] = sprintf( _("%s successfully updated"), $newdn);
+				   $dn = $newdn;
 				 }
 			   }
-			   if( !$errors ) {
-				 // Update maintainer group
-				 $groupdn = 'cn=maintainer,cn=internal,'.$domain_dn;
-				 if( !ldap_mod_add( $ldap->connection,
-											   $groupdn,
-											   array( 'member' => $newdn ) ) ) {
-				   $errors[] = sprintf(_("LDAP Error: Could not add new group entry %s: %s"), $newdn,
-									   ldap_error($ldap->connection));
-				 }
-				 if( !$errors && !ldap_mod_del($ldap->connection,$groupdn,
-									  array( 'member' => $dn ) ) ) {
-				   $errors[] = sprintf(_("LDAP Error: Could not remove old group entry %s: %s"), $dn,
-									   ldap_error($ldap->connection));
-				 }
-			   }			   
-			   $dn = $newdn;
 			 } else array_push($errors, sprintf(_("LDAP Error: could not read %s: %s"), $dn,
 												ldap_error($ldap->connection)));
 		   } else {



From cvs at kolab.org  Fri Mar 16 13:17:26 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 13:17:26 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, 1.5, 1.6 
Message-ID: <20070316121726.C59CA1006D7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	domainmaintainer.php.in 
Log Message:
2007-03-16  Gunnar Wrobel  <p at rdus.de>

	* www/admin/user/user.php.in: 
	* www/admin/sharedfolder/sf.php.in: 
	* www/admin/maintainer/maintainer.php.in: 
	* www/admin/domainmaintainer/domainmaintainer.php.in: 
	* www/admin/distributionlist/list.php.in: 
	* www/admin/administrator/admin.php.in: 
	* www/admin/addressbook/addr.php.in: 

	Fixed for the new LDAP overlays introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/slapd.conf.template.in.diff?r1=1.9&r2=1.10

	Tries to fix the following issues:

	https://intevation.de/roundup/kolab/issue1614
	https://intevation.de/roundup/kolab/issue1652
	https://intevation.de/roundup/kolab/issue1654


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- domainmaintainer.php.in	10 Jan 2007 16:50:43 -0000	1.5
+++ domainmaintainer.php.in	16 Mar 2007 12:17:24 -0000	1.6
@@ -193,29 +193,28 @@
 			   $ldap_object['uid'] = $oldattrs['uid'][0];
 			   if( empty($ldap_object['userPassword']) )
 				 $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
-			   if (!ldap_add($ldap->connection,$newdn, $ldap_object) )
-				 array_push($errors, sprintf( _("LDAP Error: could not rename %1\$s to %2\$s: %3\$s"), $dn, $newdn,
-											  ldap_error($ldap->connection)));
+
+			   // Try to rename the object
+			   if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], "cn=internal,".$domain_dn, true)) {
+				 array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
+											 $newdn, ldap_error($ldap->connection)));
+			   }
 			   if( !$errors ) {
-				 if( !ldap_delete($ldap->connection,$dn)) {
-				   array_push($errors, sprintf( _("LDAP Error: could not remove old entry %s: %s"), $dn,
-												ldap_error($ldap->connection)));
+				 // Renaming was ok, now try to modify the object accordingly
+				 if (!ldap_modify($ldap->connection, $newdn, $ldap_object)) {
+				   // While this should not happen, in case it does, we need to revert the
+				   // renaming
+				   array_push($errors, sprintf(_("LDAP Error: could not modify %s to %s: %s"), $newdn,
+											   ldap_error($ldap->connection)));
+				   $old_dn = substr($dn, 0, strlen($dn) - strlen("cn=internal,".$domain_dn) - 1);
+				   ldap_rename($ldap->connection, $newdn, $old_dn, "cn=internal,".$domain_dn, true);
+				 } else {
+				   // everything is fine and we can move on
+				   $messages[] = sprintf( _("%s successfully updated"), $newdn);
 				 }
 			   }
+
 			   if( !$errors ) {
-				 // Update maintainer group
-				 $groupdn = 'cn=domain-maintainer,cn=internal,'.$domain_dn;
-				 if( !ldap_mod_add( $ldap->connection,
-									$groupdn,
-									array( 'member' => $newdn ) ) ) {
-				   $errors[] = sprintf( _("LDAP Error: Could not add new group entry %s: %s"), $newdn,
-										ldap_error($ldap->connection));
-				 }
-				 if( !$errors && !ldap_mod_del($ldap->connection,$groupdn,
-									  array( 'member' => $dn ) ) ) {
-				   $errors[] = sprintf( _("LDAP Error: Could not remove old group entry %s: %s"), $dn,
-										ldap_error($ldap->connection));
-				 }
 				 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
 				   if( !$errors ) {
 					 $domains = $ldap->domainsForMaintainerDn($dn);



From cvs at kolab.org  Fri Mar 16 14:07:11 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 16 Mar 2007 14:07:11 +0100 (CET)
Subject: schreiber: doc/www/src index.html.m4,1.109,1.110 
Message-ID: <20070316130711.5032E1006CD@lists.intevation.de>

Author: schreiber

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

Modified Files:
	index.html.m4 
Log Message:
added links to news


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- index.html.m4	12 Mar 2007 13:10:29 -0000	1.109
+++ index.html.m4	16 Mar 2007 13:07:09 -0000	1.110
@@ -53,12 +53,14 @@
    
 <ul>
 <li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
-<em>CeBIT, March 16th, 3.15pm - 4.30pm</em>
+<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation" target="_blank">CeBIT, March 16th, 3.15pm - 4.30pm</a>
 <br><br>
 
 <li>The Kolab-Konsortium Business Partner <strong>Univention</strong> will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.<br>
-<em>CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover  </em><br>
-<br><strong>Univention</strong> will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.<br><em>CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</em>
+<a href="http://www.univention.de/termin_veranstaltung.html" target="_blank">CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover</a>(in German)
+<br>
+<br><strong>Univention</strong> will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.<br>
+<a href="http://www.univention.de/vortraege_cebit_2007.html" target="_blank">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
 </li></ul>
   </div> 
 <p>



From cvs at kolab.org  Mon Mar 19 15:19:00 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 19 Mar 2007 15:19:00 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4,1.110,1.111 
Message-ID: <20070319141900.4EDDB1005C3@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 
Log Message:
Added booth information for CeBit Panel discussion.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- index.html.m4	16 Mar 2007 13:07:09 -0000	1.110
+++ index.html.m4	19 Mar 2007 14:18:57 -0000	1.111
@@ -53,7 +53,7 @@
    
 <ul>
 <li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
-<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation" target="_blank">CeBIT, March 16th, 3.15pm - 4.30pm</a>
+<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation" target="_blank">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
 <br><br>
 
 <li>The Kolab-Konsortium Business Partner <strong>Univention</strong> will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.<br>



From cvs at kolab.org  Tue Mar 20 17:20:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Mar 2007 17:20:57 +0100 (CET)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.30, 1.31 
Message-ID: <20070320162057.B4B811005B5@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Don't assume that all day events only last exactly one day, fixes issue1659.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	23 Nov 2006 17:34:33 -0000	1.30
+++ ChangeLog	20 Mar 2007 16:20:55 -0000	1.31
@@ -1,3 +1,8 @@
+2007-03-20  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* freebusy/freebusy.class.php.in: Don't assume that all day events
+	only last exactly one day, fixes issue1659.
+
 2006-11-23  Sascha Wilde  <wilde at intevation.de>
 
 	* freebusy/freebusy.class.php.in: Reset error stack in



From cvs at kolab.org  Tue Mar 20 17:20:57 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Mar 2007 17:20:57 +0100 (CET)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, 1.10, 1.11 
Message-ID: <20070320162057.BBF301006A4@lists.intevation.de>

Author: thomas

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

Modified Files:
	freebusy.class.php.in 
Log Message:
Don't assume that all day events only last exactly one day, fixes issue1659.


Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- freebusy.class.php.in	23 Nov 2006 17:34:33 -0000	1.10
+++ freebusy.class.php.in	20 Mar 2007 16:20:55 -0000	1.11
@@ -262,7 +262,7 @@
       $initial_start = $event['start-date'];
       $initial_end = $event['end-date'];
       if( $event['allday'] ) {
-	$initial_end = strtotime( '+1 day', $initial_start );
+	$initial_end = strtotime( '+1 day', $initial_end );
 	myLog("Detected all-day event $uid", RM_LOG_DEBUG);
       }
       $extra = array( 'X-UID'     => base64_encode($uid) );
@@ -453,8 +453,7 @@
     
     // Convert our date-time values to timestamps
     if( strpos( $event_hash['start-date'], 'T' ) === false &&
-	strpos( $event_hash['end-date'], 'T' ) === false &&
-	$event_hash['start-date'] == $event_hash['end-date'] ) {
+	strpos( $event_hash['end-date'], 'T' ) === false ) {
       $event_hash['allday'] = true;
     } else {
       $event_hash['allday'] = false;      
@@ -489,4 +488,4 @@
   var $imap_serverstring;  
 };
 
-?>
\ No newline at end of file
+?>



From cvs at kolab.org  Tue Mar 20 17:22:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 20 Mar 2007 17:22:04 +0100 (CET)
Subject: thomas: server release-notes.txt,1.90,1.91 
Message-ID: <20070320162204.0C5161006A4@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- release-notes.txt	12 Mar 2007 14:54:44 -0000	1.90
+++ release-notes.txt	20 Mar 2007 16:22:02 -0000	1.91
@@ -60,13 +60,20 @@
 
 	Updated openldap monitor configuration.
 
+	kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
+
     - kolab-horde-fbview-2.1.0-20070???
 
     - kolab-resource-handlers-2.1.0-20070???
 
+	Improved logging for opening pfbcache.db
+
+	kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
+	kolab/issue1659 (Freebusy assumes that all day events last exactly one day)
+
     - kolab-webadmin-2.1.0-20070???
 
-	updated German translation.
+	Updated Dutch and German translations.
 
 	kolab/issue1457 (updated French translation)
 	kolab/issue1612 (modify user ignores account type)



From cvs at kolab.org  Wed Mar 21 18:39:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Mar 2007 18:39:44 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.34,1.35 
Message-ID: <20070321173944.9EB541006D0@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* www/admin/domainmaintainer/domainmaintainer.php.in: 

	Added check for empty set of selected domains when creating or
	modifying a domain maintainer.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	16 Mar 2007 12:17:24 -0000	1.34
+++ ChangeLog	21 Mar 2007 17:39:42 -0000	1.35
@@ -1,3 +1,10 @@
+2007-03-21  Gunnar Wrobel  <p at rdus.de>
+
+	* www/admin/domainmaintainer/domainmaintainer.php.in: 
+
+	Added check for empty set of selected domains when creating or
+	modifying a domain maintainer.
+
 2007-03-16  Gunnar Wrobel  <p at rdus.de>
 
 	* www/admin/user/user.php.in: 



From cvs at kolab.org  Wed Mar 21 18:39:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Mar 2007 18:39:44 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, 1.6, 1.7 
Message-ID: <20070321173944.9C2E91005B5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	domainmaintainer.php.in 
Log Message:
	* www/admin/domainmaintainer/domainmaintainer.php.in: 

	Added check for empty set of selected domains when creating or
	modifying a domain maintainer.


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- domainmaintainer.php.in	16 Mar 2007 12:17:24 -0000	1.6
+++ domainmaintainer.php.in	21 Mar 2007 17:39:42 -0000	1.7
@@ -138,6 +138,7 @@
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
   $entries['domains'] = array( 'name' => _("Domains"),
 							   'type' => "checklist",
+							   'validation' => 'notempty',
 							   'comment' => _("Check domains this domain maintainer should be able to maintain"),
 							   'options' => $ldap->domains());
  }



From cvs at kolab.org  Wed Mar 21 18:39:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Mar 2007 18:39:44 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.91,1.92 
Message-ID: <20070321173944.A58441006DD@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
	* www/admin/domainmaintainer/domainmaintainer.php.in: 

	Added check for empty set of selected domains when creating or
	modifying a domain maintainer.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- release-notes.txt	20 Mar 2007 16:22:02 -0000	1.91
+++ release-notes.txt	21 Mar 2007 17:39:42 -0000	1.92
@@ -75,6 +75,7 @@
 
 	Updated Dutch and German translations.
 
+	kolab/issue1663 (prevent creation of domain maintainers without domains)
 	kolab/issue1457 (updated French translation)
 	kolab/issue1612 (modify user ignores account type)
 	kolab/issue1630 (Domain maintainer can see distribution lists from other domains)



From cvs at kolab.org  Wed Mar 21 19:06:19 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 21 Mar 2007 19:06:19 +0100 (CET)
Subject: thomas: server release-notes.txt,1.92,1.93 
Message-ID: <20070321180619.EEA1B1005B5@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Reordered and adjusted text to issue1663's title


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- release-notes.txt	21 Mar 2007 17:39:42 -0000	1.92
+++ release-notes.txt	21 Mar 2007 18:06:17 -0000	1.93
@@ -75,10 +75,10 @@
 
 	Updated Dutch and German translations.
 
-	kolab/issue1663 (prevent creation of domain maintainers without domains)
 	kolab/issue1457 (updated French translation)
 	kolab/issue1612 (modify user ignores account type)
 	kolab/issue1630 (Domain maintainer can see distribution lists from other domains)
+	kolab/issue1663 (It is possible to create domain maintainers without domains)
 
 
 Changes since 2.1 beta 4:



From cvs at kolab.org  Thu Mar 22 12:51:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Mar 2007 12:51:44 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.6,
	1.7 
Message-ID: <20070322115144.6B7961005B5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
	* templates/resmgr.conf.template.in: 

	Prevent error messages like "No configuration variable
	corresponding to `kolabfilter-verify-from-header' exists" within
	the kolabconf log. Resolves:
	kolab/issue1638 (https://intevation.de/roundup/kolab/issue1638)


Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- resmgr.conf.template.in	6 Feb 2007 14:53:43 -0000	1.6
+++ resmgr.conf.template.in	22 Mar 2007 11:51:42 -0000	1.7
@@ -27,14 +27,26 @@
 
 // Should we make sure that the sender and From header match for mail
 // that origins on this server?
+@@@if kolabfilter-verify-from-header@@@
 $params['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
+@@@else@@@
+$params['verify_from_header'] = false;
+@@@endif@@@
 
 // Should the Sender: header be used over From: if present?
+@@@if kolabfilter-allow-sender-header@@@
 $params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
+@@@else@@@
+$params['allow_sender_header'] = false;
+@@@endif@@@
 
 // Should reject messages with From headers that dont match
 // the envelope? Default is to rewrite the header
+@@@if kolabfilter-reject-forged-from-header@@@
 $params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
+@@@else@@@
+$params['reject_forged_from_header'] = false;
+@@@endif@@@
 
 // Should we allow forwarded ical messages from Outlook
 // by encapsulating them in a MIME multipart



From cvs at kolab.org  Thu Mar 22 12:51:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Mar 2007 12:51:44 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.93,1.94 
Message-ID: <20070322115144.7F03B101EE6@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
	* templates/resmgr.conf.template.in: 

	Prevent error messages like "No configuration variable
	corresponding to `kolabfilter-verify-from-header' exists" within
	the kolabconf log. Resolves:
	kolab/issue1638 (https://intevation.de/roundup/kolab/issue1638)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- release-notes.txt	21 Mar 2007 18:06:17 -0000	1.93
+++ release-notes.txt	22 Mar 2007 11:51:42 -0000	1.94
@@ -61,6 +61,7 @@
 	Updated openldap monitor configuration.
 
 	kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
+	kolab/issue1638 (kolabconf generates broken resmgr.conf)
 
     - kolab-horde-fbview-2.1.0-20070???
 



From cvs at kolab.org  Thu Mar 22 12:51:44 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Mar 2007 12:51:44 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.88,1.89 
Message-ID: <20070322115144.73D141005DE@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* templates/resmgr.conf.template.in: 

	Prevent error messages like "No configuration variable
	corresponding to `kolabfilter-verify-from-header' exists" within
	the kolabconf log. Resolves:
	kolab/issue1638 (https://intevation.de/roundup/kolab/issue1638)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- ChangeLog	11 Feb 2007 14:47:51 -0000	1.88
+++ ChangeLog	22 Mar 2007 11:51:42 -0000	1.89
@@ -1,3 +1,12 @@
+2007-03-22  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/resmgr.conf.template.in: 
+
+	Prevent error messages like "No configuration variable
+	corresponding to `kolabfilter-verify-from-header' exists" within
+	the kolabconf log. Resolves:
+	kolab/issue1638 (https://intevation.de/roundup/kolab/issue1638)
+
 2007-02-11 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
 	  dist_conf/gentoo: Added new variable TAR



From cvs at kolab.org  Thu Mar 22 14:32:50 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Mar 2007 14:32:50 +0100 (CET)
Subject: schreiber: doc/www/src index.html.m4,1.111,1.112 
Message-ID: <20070322133250.20ABD1005DA@lists.intevation.de>

Author: schreiber

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

Modified Files:
	index.html.m4 
Log Message:
added news entry for sponsoring horde development


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- index.html.m4	19 Mar 2007 14:18:57 -0000	1.111
+++ index.html.m4	22 Mar 2007 13:32:48 -0000	1.112
@@ -47,8 +47,27 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
  <table>
+
+<tr><td class="newsd">March 22nd, 2007</td>
+<td>&raquo;KDAB sponsors Horde Development</td></tr></table><p>
+<div class="newsb">
+<ul>
+<li>
+In an effort to further increase the quality and usefulness of the Kolab 
+Groupware Solution, jointly developed by <strong>KDAB</strong> with its partners in the <strong>Kolab 
+Konsortium</strong>, KDAB now contracts Gunnar Wrobel of P at rdus to accelerate 
+development of the Horde web client, the preferred web client for the Kolab 
+solution. Gunnar will also maintain community relations on behalf of KDAB. 
+<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr" target="_blank">announcement</a>
+</li>
+</ul>
+</div>
+<p>
+
+
+<table>
     <tr><td class="newsd">March 15th - 21st, 2007</td>
-    <td class="newsh">&raquo;CeBIT 2007 - Kolab based events</td</tr></table><p>
+    <td class="newsh">&raquo;CeBIT 2007 - Kolab based events</td></tr></table><p>
 <div class="newsb">
    
 <ul>



From cvs at kolab.org  Thu Mar 22 19:12:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Mar 2007 19:12:55 +0100 (CET)
Subject: marcus: server/kolabd/kolabd/templates main.cf.template.in, 1.13,
	1.14 
Message-ID: <20070322181255.12EB7101F13@lists.intevation.de>

Author: marcus

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

Modified Files:
	main.cf.template.in 
Log Message:
No warnings when running postmap (expected format: key whitespace value)

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- main.cf.template.in	29 Jan 2007 10:45:45 -0000	1.13
+++ main.cf.template.in	22 Mar 2007 18:12:52 -0000	1.14
@@ -155,4 +155,4 @@
 # Support broken clients like Microsoft Outlook Express 4.x which expect AUTH=LOGIN instead of AUTH LOGIN
 broken_sasl_auth_clients = yes
 
-content_filter=kolabfilter
+content_filter = kolabfilter



From cvs at kolab.org  Thu Mar 22 19:12:55 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 22 Mar 2007 19:12:55 +0100 (CET)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.89,1.90 
Message-ID: <20070322181255.02CD8101F08@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
No warnings when running postmap (expected format: key whitespace value)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- ChangeLog	22 Mar 2007 11:51:42 -0000	1.89
+++ ChangeLog	22 Mar 2007 18:12:52 -0000	1.90
@@ -1,3 +1,9 @@
+2007-03-22  Marcus Hüwe    <suse-tux at gmx.de>
+
+	* templates/main.cf.template.in:
+
+	No warnings when running postmap (expected format: key whitespace value)
+
 2007-03-22  Gunnar Wrobel  <p at rdus.de>
 
 	* templates/resmgr.conf.template.in: 



From cvs at kolab.org  Fri Mar 23 11:56:36 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 23 Mar 2007 11:56:36 +0100 (CET)
Subject: thomas: doc/www/src footer.html.m4, 1.39, 1.40 kolabsearch.htm, 1.5,
	1.6 
Message-ID: <20070323105636.ABDDC101FA9@lists.intevation.de>

Author: thomas

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

Modified Files:
	footer.html.m4 kolabsearch.htm 
Log Message:
Mini-Howtows -> Mini-HOWTOs


Index: footer.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/footer.html.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- footer.html.m4	19 Sep 2006 16:17:36 -0000	1.39
+++ footer.html.m4	23 Mar 2007 10:56:34 -0000	1.40
@@ -66,7 +66,7 @@
 ><strong>Bug/Wish Tracker</strong></a><br />
 <br />
 LINK(`howtos.html', `HOWTOs')
-<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/raw-howtos/">Mini-Howtows in CVS</a><br />
+<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/raw-howtos/">Mini-HOWTOs in CVS</a><br />
 </div>
 
 <!-- DEVELOPERS -->

Index: kolabsearch.htm
===================================================================
RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabsearch.htm	19 Sep 2006 16:08:27 -0000	1.5
+++ kolabsearch.htm	23 Mar 2007 10:56:34 -0000	1.6
@@ -549,7 +549,7 @@
 ><strong>Bug/Wish Tracker</strong></a><br />
 <br />
 <a href="http://kolab.org/howtos.html">HOWTOs</a><br />
-<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/raw-howtos/">Mini-Howtows in CVS</a><br />
+<a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/raw-howtos/">Mini-HOWTOs in CVS</a><br />
 </div>
 
 <!-- DEVELOPERS -->



From cvs at kolab.org  Fri Mar 23 12:03:29 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 23 Mar 2007 12:03:29 +0100 (CET)
Subject: thomas: doc/www/src footer.html.m4, 1.40, 1.41 howtos.html.m4, 1.4,
	1.5 kolabsearch.htm, 1.6, 1.7 
Message-ID: <20070323110329.9C0F3101FB3@lists.intevation.de>

Author: thomas

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

Modified Files:
	footer.html.m4 howtos.html.m4 kolabsearch.htm 
Log Message:
Removed link to hopelessly outdated HOWTOs, changed hint on howtos page.


Index: footer.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/footer.html.m4,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- footer.html.m4	23 Mar 2007 10:56:34 -0000	1.40
+++ footer.html.m4	23 Mar 2007 11:03:27 -0000	1.41
@@ -64,8 +64,6 @@
 </small><br /><br />
 <a href="https://www.intevation.de/roundup/kolab/"
 ><strong>Bug/Wish Tracker</strong></a><br />
-<br />
-LINK(`howtos.html', `HOWTOs')
 <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/raw-howtos/">Mini-HOWTOs in CVS</a><br />
 </div>
 

Index: howtos.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/howtos.html.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- howtos.html.m4	10 Jun 2004 22:48:34 -0000	1.4
+++ howtos.html.m4	23 Mar 2007 11:03:27 -0000	1.5
@@ -2,11 +2,10 @@
 m4_include(header.html.m4)
 <div id="date">This page was updated on:<br />$Date$</div>
 
-<p class="hint">Have you done something cool with the Kolab server? Please
-share ;-) Articles or links can be sent to <a
-href="mailto:kolab at codefusion.co.za">kolab at codefusion.co.za</a> to be
-included in this page. Your submissions might even find their way into future
-releases of Kolab!</p>
+<p class="hint">This page is obsolete, please use the
+<a href="http://wiki.kolab.org/">Kolab Wiki</a> instead!</p>
+
+<hr />
 
 <p>
 Items of interest are:

Index: kolabsearch.htm
===================================================================
RCS file: /kolabrepository/doc/www/src/kolabsearch.htm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabsearch.htm	23 Mar 2007 10:56:34 -0000	1.6
+++ kolabsearch.htm	23 Mar 2007 11:03:27 -0000	1.7
@@ -547,8 +547,6 @@
 </small><br /><br />
 <a href="https://intevation.de/roundup/kolab/"
 ><strong>Bug/Wish Tracker</strong></a><br />
-<br />
-<a href="http://kolab.org/howtos.html">HOWTOs</a><br />
 <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/raw-howtos/">Mini-HOWTOs in CVS</a><br />
 </div>
 



From cvs at kolab.org  Fri Mar 23 15:17:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 23 Mar 2007 15:17:02 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	domainmaintainer.php.in, 1.7, 1.8 
Message-ID: <20070323141702.25FC51005B0@lists.intevation.de>

Author: gunnar

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

Modified Files:
	domainmaintainer.php.in 
Log Message:
	* www/admin/domainmaintainer/domainmaintainer.php.in: 

	Fixed update of the domain name after modification of a domain
	maintainer.

	Fixes
	kolab/issue1670 (https://intevation.de/roundup/kolab/issue1670)


Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- domainmaintainer.php.in	21 Mar 2007 17:39:42 -0000	1.7
+++ domainmaintainer.php.in	23 Mar 2007 14:17:00 -0000	1.8
@@ -217,11 +217,9 @@
 
 			   if( !$errors ) {
 				 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
-				   if( !$errors ) {
-					 $domains = $ldap->domainsForMaintainerDn($dn);
-					 $ldap->removeFromDomainGroups( $dn, $domains );
-					 $ldap->addToDomainGroups( $newdn, $_POST['domains'] );
-				   }
+				   $domains = $ldap->domainsForMaintainerDn($dn);
+				   $ldap->removeFromDomainGroups( $dn, $domains );
+				   $ldap->addToDomainGroups( $newdn, $_POST['domains'] );
 				 }
 			   }			   
 			   $dn = $newdn;
@@ -249,6 +247,9 @@
 		 }		 
 		 $form->entries['uid']['attrs'] = 'readonly';
 		 $form->entries['action']['value'] = 'save';
+		 $form->entries['dn'] = array( 'name' => 'dn',
+									   'type' => 'hidden',
+									   'value' => $dn );
        } else {
 		 // firstsave
 		 if (!$errors) {



From cvs at kolab.org  Fri Mar 23 15:17:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 23 Mar 2007 15:17:02 +0100 (CET)
Subject: gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog,1.35,1.36 
Message-ID: <20070323141702.498FE1005B0@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* www/admin/domainmaintainer/domainmaintainer.php.in: 

	Fixed update of the domain name after modification of a domain
	maintainer.

	Fixes
	kolab/issue1670 (https://intevation.de/roundup/kolab/issue1670)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- ChangeLog	21 Mar 2007 17:39:42 -0000	1.35
+++ ChangeLog	23 Mar 2007 14:17:00 -0000	1.36
@@ -1,3 +1,13 @@
+2007-03-23  Gunnar Wrobel  <p at rdus.de>
+
+	* www/admin/domainmaintainer/domainmaintainer.php.in: 
+
+	Fixed update of the domain name after modification of a domain
+	maintainer.
+
+	Fixes
+	kolab/issue1670 (https://intevation.de/roundup/kolab/issue1670)
+	
 2007-03-21  Gunnar Wrobel  <p at rdus.de>
 
 	* www/admin/domainmaintainer/domainmaintainer.php.in: 



From cvs at kolab.org  Fri Mar 23 15:17:02 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 23 Mar 2007 15:17:02 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.94,1.95 
Message-ID: <20070323141702.67AD010015A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
	* www/admin/domainmaintainer/domainmaintainer.php.in: 

	Fixed update of the domain name after modification of a domain
	maintainer.

	Fixes
	kolab/issue1670 (https://intevation.de/roundup/kolab/issue1670)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- release-notes.txt	22 Mar 2007 11:51:42 -0000	1.94
+++ release-notes.txt	23 Mar 2007 14:17:00 -0000	1.95
@@ -80,6 +80,7 @@
 	kolab/issue1612 (modify user ignores account type)
 	kolab/issue1630 (Domain maintainer can see distribution lists from other domains)
 	kolab/issue1663 (It is possible to create domain maintainers without domains)
+	kolab/issue1670 (Renaming a domain maintainer twice within the same form fails)
 
 
 Changes since 2.1 beta 4:



From cvs at kolab.org  Tue Mar 27 15:32:56 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Mar 2007 15:32:56 +0200 (CEST)
Subject: thomas: server/kolabd/kolabd kolab_smtpdpolicy.in,1.9,1.10 
Message-ID: <20070327133256.501321005B1@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_smtpdpolicy.in 
Log Message:
Improve debugging instructions and output of kolab_smtpdpolicy


Index: kolab_smtpdpolicy.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab_smtpdpolicy.in	28 Jul 2006 04:44:33 -0000	1.9
+++ kolab_smtpdpolicy.in	27 Mar 2007 13:32:54 -0000	1.10
@@ -30,7 +30,7 @@
 use Kolab::Util;
 
 #
-# Usage: kolab_smtpd_policy.pl [-v]
+# Usage: kolab_smtpdpolicy [-v]
 #
 # kolabdelegated Postfix SMTPD policy server for Kolab. This server implements
 # various policies for Kolab:
@@ -50,7 +50,7 @@
 # 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
+#      user=kolab-n argv=/usr/bin/perl /usr/libexec/postfix/kolab_smtpdpolicy
 #
 # To use this from Postfix SMTPD, use in /etc/postfix/main.cf:
 #
@@ -59,13 +59,20 @@
 #	reject_unauth_destination
 #	check_policy_service unix:private/policy
 #	...
+#    smtpd_sender_restrictions =
+#	...
+#	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:
+# To test this script by hand, execute kolab_smtpdpolicy, optionally
+# with the option -v to print debugging output.
+# Example for OpenPKG based installations:
 #
-#    % perl kolab_smtpd_policy
+#    # su - kolab
+#    $ /kolab/etc/kolab/kolab_smtpdpolicy -v
 #
 # 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:
@@ -89,7 +96,7 @@
 # The policy server script will answer in the same style, with an
 # attribute list followed by a empty line:
 #
-#    action=dunno
+#    action=DUNNO
 #    [empty line]
 #
 
@@ -209,7 +216,7 @@
   if( !$mesg->code && $mesg->count() > 0 ) {
     mylog($syslog_priority, "LDAP search returned ".$mesg->count()." objects") if $verbose;
     foreach my $entry ( $mesg->entries ) {
-      mylog($syslog_priority, lc($entry->get_value('uid')." is allowed to use ".$sender)) if $verbose;
+      mylog($syslog_priority, lc($entry->get_value('uid')." is the uid of ".$sender)) if $verbose;
       push @result, lc($entry->get_value('uid'));
       my $delegate;
       for $delegate ($entry->get_value('kolabDelegate')) {



From cvs at kolab.org  Tue Mar 27 16:55:17 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 27 Mar 2007 16:55:17 +0200 (CEST)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	resmgr.log, 1.1.1.1, NONE 
Message-ID: <20070327145517.9B1BD1005B1@lists.intevation.de>

Author: thomas

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

Removed Files:
	resmgr.log 
Log Message:
Removed resmgr.log which seems to have slipped into CVS years ago.


--- resmgr.log DELETED ---



From cvs at kolab.org  Wed Mar 28 03:48:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Mar 2007 03:48:31 +0200 (CEST)
Subject: steffen: server/perl-kolab/Kolab-Cyrus Cyrus.pm,1.8,1.9 
Message-ID: <20070328014831.069F51005B5@lists.intevation.de>

Author: steffen

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

Modified Files:
	Cyrus.pm 
Log Message:
debug option for verbose logging to stderr

Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Cyrus/Cyrus.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Cyrus.pm	26 Mar 2006 21:55:30 -0000	1.8
+++ Cyrus.pm	28 Mar 2007 01:48:28 -0000	1.9
@@ -3,7 +3,7 @@
 ##
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Written by Stuart Bing� <s.binge at codefusion.co.za>
+##    Written by Stuart Bingë <s.binge at codefusion.co.za>
 ##
 ##  This  program is free  software; you can redistribute  it and/or
 ##  modify it  under the terms of the GNU  General Public License as
@@ -99,6 +99,8 @@
         if (!$cyrus->create($cyruid)) {
             Kolab::log('Y', "Unable to create mailbox `$cyruid', Error = `" . $cyrus->error . "'", KOLAB_WARN);
         }
+    } else {
+        Kolab::log('Y', "Skipping mailbox creation for $uid (curuid='$cyruid', mailbox='".join(',',@{$mailbox})."'", KOLAB_DEBUG);
     }
 }
 
@@ -211,7 +213,7 @@
 
 =head1 AUTHOR
 
-Stuart Bing� E<lt>s.binge at codefusion.co.zaE<gt>
+Stuart Bingë E<lt>s.binge at codefusion.co.zaE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 



From cvs at kolab.org  Wed Mar 28 03:48:30 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Mar 2007 03:48:30 +0200 (CEST)
Subject: steffen: server/perl-kolab/Kolab Kolab.pm.in,1.5,1.6 
Message-ID: <20070328014830.F39E01005B1@lists.intevation.de>

Author: steffen

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

Modified Files:
	Kolab.pm.in 
Log Message:
debug option for verbose logging to stderr

Index: Kolab.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Kolab.pm.in	30 Jul 2006 21:20:43 -0000	1.5
+++ Kolab.pm.in	28 Mar 2007 01:48:28 -0000	1.6
@@ -94,7 +94,8 @@
     # Now read `kolab.conf', overwriting values read from `kolab.globals'
     %config = readConfig(\%config, "@sysconfdir@/kolab/kolab.conf");
 
-#    $config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
+    $config{'debug'} = 0 if (!exists $config{'debug'});
+    $config{'log_level'} = KOLAB_WARN if (!exists $config{'log_level'});
 
     &log('C', 'Reloading configuration');
 
@@ -468,7 +469,7 @@
         }
         syslog('info', "$text");
     }
-    #print STDERR "$text\n";
+    print STDERR "$text\n" if ($config{'debug'});
 }
 
 reloadConfig();
@@ -488,7 +489,7 @@
 
 =head1 AUTHOR
 
-Stuart Bing묠E<lt>s.binge at codefusion.co.zaE<gt>
+Stuart Bingë¬ E<lt>s.binge at codefusion.co.zaE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 



From cvs at kolab.org  Wed Mar 28 03:48:31 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Mar 2007 03:48:31 +0200 (CEST)
Subject: steffen: server/perl-kolab/Kolab-LDAP LDAP.pm.in,1.6,1.7 
Message-ID: <20070328014831.0C2B31005DE@lists.intevation.de>

Author: steffen

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

Modified Files:
	LDAP.pm.in 
Log Message:
debug option for verbose logging to stderr

Index: LDAP.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP/LDAP.pm.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LDAP.pm.in	30 Jul 2006 21:20:43 -0000	1.6
+++ LDAP.pm.in	28 Mar 2007 01:48:28 -0000	1.7
@@ -263,12 +263,13 @@
     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 ".lc($object->get_value($objuidfield))
-		 ." because it is deleted");
+		 ." because it is deleted", KOLAB_DEBUG);
       return;
     }
     if( $kolabhomeserver && $kolabhomeserver ne lc($Kolab::config{'fqdnhostname'}) ) {
       if( $p eq 'sf' ) {
 	# Dont create shared folders on other hosts than it's kolabhomeserver
+	Kolab::log('L', "Kolab::LDAP::createObject() skipping shared folder for other server $kolabhomeserver", KOLAB_DEBUG);
 	return;
       }
       Kolab::log('L', "Kolab::LDAP::createObject() for other server $kolabhomeserver. TODO: Create referral or something, for now we just create ", KOLAB_DEBUG);
@@ -303,7 +304,9 @@
         if ($olduid ne $uid) {
             # The mailbox changed; bitch
             Kolab::log('L', "Object `$uid' already exists as `$olduid'; refusing to create", KOLAB_WARN);
-        }
+        } else {
+            Kolab::log('L', "Object `$uid' already exists, skipping", KOLAB_DEBUG);
+	}
         # Nothing changed; nothing to do
         #Kolab::DirServ::genericRequest($object, "modify alias");
     } else {
@@ -376,6 +379,7 @@
 	  $quota_db{$guid} = $quota;
 	}
     }
+    Kolab::log('L', "createObject() done", KOLAB_DEBUG );
 }
 
 sub createMasterLDAP {
@@ -707,7 +711,7 @@
 
 =head1 AUTHOR
 
-Stuart Bing묠E<lt>s.binge at codefusion.co.zaE<gt>
+Stuart Bingë¬ E<lt>s.binge at codefusion.co.zaE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 



From cvs at kolab.org  Wed Mar 28 03:51:37 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Mar 2007 03:51:37 +0200 (CEST)
Subject: steffen: server/kolabd/kolabd kolab.globals, 1.2,
	1.3 kolab_smtpdpolicy.in, 1.10, 1.11 kolabd.spec.in, 1.5, 1.6 
Message-ID: <20070328015137.8F6381005B1@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolab.globals kolab_smtpdpolicy.in kolabd.spec.in 
Log Message:
make kolab_policy accept any sender from the outside if internet email is enabled (issue954)

Index: kolab.globals
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.globals	20 Apr 2005 22:13:32 -0000	1.2
+++ kolab.globals	28 Mar 2007 01:51:35 -0000	1.3
@@ -10,6 +10,7 @@
 gyard_deletion_period : 10080
 ldap_uri : ldap://127.0.0.1:389
 log_level : 2
+debug : 0
 postfix-mydestination : $mydomain
 proftpd-ftp : FALSE
 proftpd-userPassword :

Index: kolab_smtpdpolicy.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab_smtpdpolicy.in	27 Mar 2007 13:32:54 -0000	1.10
+++ kolab_smtpdpolicy.in	28 Mar 2007 01:51:35 -0000	1.11
@@ -277,7 +277,8 @@
 
   # First check if the sender is a privileged kolabhost
   # Kolab hosts use un-authenticated smtp currently
-  return "DUNNO" if( !$username && check_permithosts($client_addr) );
+  # We also just accept the email here is conf_allowunauth is set
+  return "DUNNO" if( !$username && ( $conf_allowunauth || check_permithosts($client_addr) ) );
 
   # Reject anything else from unauthenticated users
   # if conf_allowunauth is false

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabd.spec.in	17 Feb 2007 16:32:35 -0000	1.5
+++ kolabd.spec.in	28 Mar 2007 01:51:35 -0000	1.6
@@ -53,10 +53,9 @@
 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:       apache >= 1.3.31-2.2.0, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = 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 >= 0.90-20070214



From cvs at kolab.org  Wed Mar 28 04:00:20 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 28 Mar 2007 04:00:20 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.12, 1.13 
Message-ID: <20070328020020.10CE81005B1@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabfilter.php.in 
Log Message:
handle From rewriting slightly different when sender is not authenticated (issue954)

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolabfilter.php.in	1 Nov 2006 09:20:45 -0000	1.12
+++ kolabfilter.php.in	28 Mar 2007 02:00:18 -0000	1.13
@@ -165,14 +165,23 @@
 
 /** Returns the format string used to rewrite
     the From header for untrusted messages */
-function get_untrusted_subject_insert()
+function get_untrusted_subject_insert($sasluser,$sender)
 {
   global $params;
-  if( array_key_exists('untrusted_subject_insert', $params) ) {
-    return $param['untrusted_subject_insert'];
+  if( $sasluser ) {
+    if( array_key_exists('untrusted_subject_insert', $params) ) {
+      $fmt = $param['untrusted_subject_insert'];
+    } else {
+      $fmt = "(UNTRUSTED, sender is <%s>)";
+    }
   } else {
-    return "(UNTRUSTED, sender is <%s>)";
+    if( array_key_exists('unauthenticated_subject_insert', $params) ) {
+      $fmt = $param['unauthenticated_subject_insert'];
+    } else {
+      $fmt = "(UNTRUSTED, sender <%s> is not authenticated)";
+    }
   }
+  return sprintf($fmt,$sender);
 }
 
 /** Check that the From header is not trying
@@ -193,9 +202,7 @@
   if( $client_addr == '127.0.0.1' ) return true;
   $kolabhosts = split(',', $params['kolabhosts'] );
   $kolabhosts = array_map( "gethostbyname", $kolabhosts );
-  foreach( $kolabhosts as $ip ) {
-    if( $client_addr == $ip ) return true;
-  }
+  if( array_search( $client_addr, $kolabhosts ) !== false ) return true;
 
   if( is_array($params['email_domain']) ) {
     $domains = $params['email_domain'];
@@ -211,7 +218,7 @@
   } else {
     $allowed_addrs = false;
   }
-  $untrusted = sprintf(get_untrusted_subject_insert(), $sender);
+  $untrusted = get_untrusted_subject_insert($sasluser,$sender);
   $adrs = imap_rfc822_parse_adrlist($fromhdr, $params['email_domain'][0]);
   foreach ($adrs as $adr) {
     $from = $adr->mailbox.'@'.$adr->host;



From cvs at kolab.org  Fri Mar 30 13:49:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 30 Mar 2007 13:49:04 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd/namespace kolab.in,1.3,1.4 
Message-ID: <20070330114904.942551006C5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolab.in 
Log Message:
	* namespace/kolab.in (openpkg_tools_apipath): 

	Fixed --help call. See
	issue1680 (https://intevation.de/roundup/kolab/issue1680).

	Should fix
	issue1609 (https://intevation.de/roundup/kolab/issue1609)


Index: kolab.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/kolab.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.in	30 Dec 2005 10:25:21 -0000	1.3
+++ kolab.in	30 Mar 2007 11:49:02 -0000	1.4
@@ -165,7 +165,7 @@
 		    	#Try to get help
 			hashelp=`grep HASHELP ${openpkg_tools_cmdpath}/${name}`
 			if [ ".$hashelp" != "." ]; then
-				helpstring=`${openpkg_tools_cmdpath}/${name} --showhelp`
+				helpstring=`${openpkg_tools_cmdpath}/${name} --help`
 			fi
 			if [ ".$helpstring" = "." ]; then
 	                        echo "${name}" | awk '{ printf("  %-15s (no help provided)\n", $0); }'



From cvs at kolab.org  Fri Mar 30 13:49:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 30 Mar 2007 13:49:04 +0200 (CEST)
Subject: gunnar: server release-notes.txt,1.95,1.96 
Message-ID: <20070330114904.A13671006CC@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
	* namespace/kolab.in (openpkg_tools_apipath): 

	Fixed --help call. See
	issue1680 (https://intevation.de/roundup/kolab/issue1680).

	Should fix
	issue1609 (https://intevation.de/roundup/kolab/issue1609)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- release-notes.txt	23 Mar 2007 14:17:00 -0000	1.95
+++ release-notes.txt	30 Mar 2007 11:49:02 -0000	1.96
@@ -61,7 +61,9 @@
 	Updated openldap monitor configuration.
 
 	kolab/issue1607 (need to replace gdbm for pfbcache, because of license clash gdbm vs php)
+	kolab/issue1609 ("kolab --help" tries to execute *all* commands)
 	kolab/issue1638 (kolabconf generates broken resmgr.conf)
+	kolab/issue1680 (/kolab/bin/kolab fix)
 
     - kolab-horde-fbview-2.1.0-20070???
 



From cvs at kolab.org  Fri Mar 30 13:49:04 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 30 Mar 2007 13:49:04 +0200 (CEST)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.90,1.91 
Message-ID: <20070330114904.995EB1006CB@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* namespace/kolab.in (openpkg_tools_apipath): 

	Fixed --help call. See
	issue1680 (https://intevation.de/roundup/kolab/issue1680).

	Should fix
	issue1609 (https://intevation.de/roundup/kolab/issue1609)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- ChangeLog	22 Mar 2007 18:12:52 -0000	1.90
+++ ChangeLog	30 Mar 2007 11:49:02 -0000	1.91
@@ -1,3 +1,13 @@
+2007-03-30  Gunnar Wrobel  <p at rdus.de>
+
+	* namespace/kolab.in (openpkg_tools_apipath): 
+
+	Fixed --help call. See
+	issue1680 (https://intevation.de/roundup/kolab/issue1680).
+
+	Should fix
+	issue1609 (https://intevation.de/roundup/kolab/issue1609)
+
 2007-03-22  Marcus Hüwe    <suse-tux at gmx.de>
 
 	* templates/main.cf.template.in:



From cvs at kolab.org  Sat Mar 31 14:45:13 2007
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 31 Mar 2007 14:45:13 +0200 (CEST)
Subject: schreiber: doc/www/src index.html.m4,1.112,1.113 
Message-ID: <20070331124513.9D8C11005C3@lists.intevation.de>

Author: schreiber

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

Modified Files:
	index.html.m4 
Log Message:
modified external links


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- index.html.m4	22 Mar 2007 13:32:48 -0000	1.112
+++ index.html.m4	31 Mar 2007 12:45:11 -0000	1.113
@@ -58,7 +58,7 @@
 Konsortium</strong>, KDAB now contracts Gunnar Wrobel of P at rdus to accelerate 
 development of the Horde web client, the preferred web client for the Kolab 
 solution. Gunnar will also maintain community relations on behalf of KDAB. 
-<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr" target="_blank">announcement</a>
+<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr" target="_self">announcement</a>
 </li>
 </ul>
 </div>
@@ -72,14 +72,14 @@
    
 <ul>
 <li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
-<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation" target="_blank">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
+<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation" target="_self">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
 <br><br>
 
 <li>The Kolab-Konsortium Business Partner <strong>Univention</strong> will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.<br>
-<a href="http://www.univention.de/termin_veranstaltung.html" target="_blank">CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover</a>(in German)
+<a href="http://www.univention.de/termin_veranstaltung.html" target="_self">CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover</a>(in German)
 <br>
 <br><strong>Univention</strong> will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.<br>
-<a href="http://www.univention.de/vortraege_cebit_2007.html" target="_blank">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
+<a href="http://www.univention.de/vortraege_cebit_2007.html" target="_self">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
 </li></ul>
   </div> 
 <p>
@@ -91,7 +91,7 @@
     <td class="newsh">&raquo;New KDE Kolab Client released, revision 'proko2.1.6'.</td</tr></table><p>
 <div class="newsb">
     This release contains several fixes and a few new features.
-    See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html" target="_blank">announcement</a> for details.
+    See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html" target="_self">announcement</a> for details.
   </div> 
 <p>