From cvs at kolab.org  Mon Oct  2 19:27:02 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  2 Oct 2006 19:27:02 +0200 (CEST)
Subject: bh: doc/www/src index.html.m4,1.92,1.93 
Message-ID: <20061002172702.1A4BA1005CB@lists.intevation.de>

Author: bh

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

Modified Files:
	index.html.m4 
Log Message:
add security advisory 11 and corresponding news item


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- index.html.m4	22 Aug 2006 13:20:34 -0000	1.92
+++ index.html.m4	2 Oct 2006 17:27:00 -0000	1.93
@@ -46,6 +46,20 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <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



From cvs at kolab.org  Mon Oct  2 19:27:02 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  2 Oct 2006 19:27:02 +0200 (CEST)
Subject: bh: doc/www/src/security kolab-vendor-notice-11.txt,NONE,1.1 
Message-ID: <20061002172702.101441005C3@lists.intevation.de>

Author: bh

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

Added Files:
	kolab-vendor-notice-11.txt 
Log Message:
add security advisory 11 and corresponding news item


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

Kolab Security Issue 11 20061002
================================

Package:              openssl
Vulnerability:        denial of service
Kolab Specific:       no
Dependent Packages:   apache curl imap imapd openldap perl perl-crypto 
                      php postfix proftpd


Summary
- -------

According to a vendor security advisory, four security issues were
discovered in the cryptography toolkit OpenSSL: two denial of service
attacks when parsing ASN.1 structures, a buffer overflow when processing
a list of ciphers and an ssl client crash.



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

OpenPKG packages of openssl-0.9.8a-2.5.2 or earlier are affected.  
Kolab Server 2.0.4 and previous releases of the 2.0 branch as well as
Kolab Server 2.1 beta 2 and previous releases of the 2.1 branch are
affected.

You can check the installed version with:
/kolab/bin/openpkg rpm -q openssl


Fixes
- -----

Note: The fix described here is for Kolab server 2.0.4 and 2.1 beta 2.
If you still run an older version, please upgrade to 2.0.1 or 2.1 beta 2
depending on the branch you are using.

Updated OpenPKG package for openssl are available from the usual kolab
mirrors under the directory security-updates/20061002/ .  While the
mirrors are catching up, you can also get the files via rsync: 
# rsync -tzvr rsync://rsync.kolab.org/kolab/server/security-updates/20061002/ .

Under that directory you'll find the following directory tree:

   ./2.0/sources/
   ./2.0/ix86-debian3.1/
   ./2.0/ix86-debian3.0/
   ./2.1/sources/
   ./2.1/ix86-debian3.1/

There is one branch for the Kolab server 2.0 updates and one for the 2.1
updates.  In each branch is a sources directory and one or more binary
directories.

If you installed the Kolab server from sources, download the sources
directory for your kolab server branch.  If you installed from binaries,
download the appropriate binaries directory for your kolab server
branch.

All directories contain the new OpenSSL package plus obmtool and
obmtool.conf files like a kolab release.  In addition, the binaries
directories contain updated binaries of the dependent packages.

In any case, download all files in the appropriate directory, chdir into
the downloaded directory and run

  /kolab/bin/openpkg rc all stop
  ./obmtool kolab

This will install the new openssl package and rebuild/reinstall the
dependent packages.  Afterwards start the server again, making sure to
regenerate the config files as you would for a normal Kolab server
update.

For the Kolab server 2.1 branch, the upgrade of the postfix RPM requires
an additional manual step.  After the upgrade, the permissions of some
files in /kolab/etc/postfix are wrong and some .db files are missing.
An easy way to fix this after running kolabconf is to run the following
commands (as root):

    cd /kolab/etc/postfix
    chown root:kolab transport virtual
    make



Details
- -------

http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.021-openssl.html
	OpenPKG Security Advisory OpenPKG-SA-2006.021

http://www.openssl.org/news/secadv_20060928.txt 
	OpenSSL Security Advisory on the vendor's site

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-2937
	Common Vulnerabilities and Exposures (CVE): CAN-2006-2937

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-2940
	Common Vulnerabilities and Exposures (CVE): CAN-2006-2940

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-3738
	Common Vulnerabilities and Exposures (CVE): CAN-2006-3738

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4343
	Common Vulnerabilities and Exposures (CVE): CAN-2006-4343


Timeline
- --------
    20060928 OpenSSL vendor released patch and new versions containing the fix
    20060928 OpenPKG created new package containing the fix
    20061002 Kolab update and security advisory published
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFFIUob0vCiU5+ISsgRAp08AKD4tKqIEswPYI74aJ4NoIg4VJB9cwCeKA20
6q+dFN2jZ5ZYLsEJ7TPjG68=
=mIOs
-----END PGP SIGNATURE-----



From cvs at kolab.org  Mon Oct  2 19:32:01 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  2 Oct 2006 19:32:01 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd/templates slapd.conf.template.in, 1.7,
	1.8 
Message-ID: <20061002173201.698441005C3@lists.intevation.de>

Author: marcus

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

Modified Files:
	slapd.conf.template.in 
Log Message:
fixed issue1426

Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- slapd.conf.template.in	22 Sep 2006 11:48:58 -0000	1.7
+++ slapd.conf.template.in	2 Oct 2006 17:31:59 -0000	1.8
@@ -74,8 +74,6 @@
 index   kolabHomeServer pres,eq
 index   kolabDeleteflag pres,eq
 index   member          pres,eq
-index   kolabDelegate   approx,sub,pres,eq
-index   kolabDeleteflag pres,eq
 
 include @ldapserver_confdir@/slapd.access
 



From cvs at kolab.org  Tue Oct  3 12:50:56 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  3 Oct 2006 12:50:56 +0200 (CEST)
Subject: bernhard: doc/www/src/security kolab-vendor-notice-11.txt,1.1,1.2 
Message-ID: <20061003105056.93E301005D8@lists.intevation.de>

Author: bernhard

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

Modified Files:
	kolab-vendor-notice-11.txt 
Log Message:
New revision of kolab-vendor-notice-11, upgrade to lastest version 2.0.4.


Index: kolab-vendor-notice-11.txt
===================================================================
RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-11.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-vendor-notice-11.txt	2 Oct 2006 17:26:59 -0000	1.1
+++ kolab-vendor-notice-11.txt	3 Oct 2006 10:50:54 -0000	1.2
@@ -7,7 +7,7 @@
 Package:              openssl
 Vulnerability:        denial of service
 Kolab Specific:       no
-Dependent Packages:   apache curl imap imapd openldap perl perl-crypto 
+Dependent Packages:   apache curl imap imapd openldap perl perl-crypto
                       php postfix proftpd
 
 
@@ -24,7 +24,7 @@
 Affected Versions
 - -----------------
 
-OpenPKG packages of openssl-0.9.8a-2.5.2 or earlier are affected.  
+OpenPKG packages of openssl-0.9.8a-2.5.2 or earlier are affected.
 Kolab Server 2.0.4 and previous releases of the 2.0 branch as well as
 Kolab Server 2.1 beta 2 and previous releases of the 2.1 branch are
 affected.
@@ -37,12 +37,12 @@
 - -----
 
 Note: The fix described here is for Kolab server 2.0.4 and 2.1 beta 2.
-If you still run an older version, please upgrade to 2.0.1 or 2.1 beta 2
+If you still run an older version, please upgrade to 2.0.4 or 2.1 beta 2
 depending on the branch you are using.
 
 Updated OpenPKG package for openssl are available from the usual kolab
 mirrors under the directory security-updates/20061002/ .  While the
-mirrors are catching up, you can also get the files via rsync: 
+mirrors are catching up, you can also get the files via rsync:
 # rsync -tzvr rsync://rsync.kolab.org/kolab/server/security-updates/20061002/ .
 
 Under that directory you'll find the following directory tree:
@@ -95,7 +95,7 @@
 http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.021-openssl.html
 	OpenPKG Security Advisory OpenPKG-SA-2006.021
 
-http://www.openssl.org/news/secadv_20060928.txt 
+http://www.openssl.org/news/secadv_20060928.txt
 	OpenSSL Security Advisory on the vendor's site
 
 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-2937
@@ -117,9 +117,9 @@
     20060928 OpenPKG created new package containing the fix
     20061002 Kolab update and security advisory published
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFFIUob0vCiU5+ISsgRAp08AKD4tKqIEswPYI74aJ4NoIg4VJB9cwCeKA20
-6q+dFN2jZ5ZYLsEJ7TPjG68=
-=mIOs
+iD8DBQFFIkALh9ag3dpKERYRAuPBAJ9F9WoPFDVUjecfQTQpLk0cULzowQCfT6K1
+MXFi0VGEpWLldAlndKb2vcw=
+=bX/R
 -----END PGP SIGNATURE-----



From cvs at kolab.org  Tue Oct  3 14:49:44 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  3 Oct 2006 14:49:44 +0200 (CEST)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.80,1.81 
Message-ID: <20061003124944.6E4641006B0@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
sorry - forgot changelog entry

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- ChangeLog	27 Sep 2006 16:48:30 -0000	1.80
+++ ChangeLog	3 Oct 2006 12:49:42 -0000	1.81
@@ -1,3 +1,7 @@
+2006-10-02	Marcus Hüwe <suse-tux at gmx.de>
+	* templates/slapd.conf.template.in: fixed issue1426 - thanks
+	Gunnar!
+
 2006-09-27  Bernhard Reiter <bernhard at intevation.de>
 	* DB_CONFIG.slapd.template.in: Fixing set_lk_detect setting,
 	also adding the meaning from the documentation. Thanks



From cvs at kolab.org  Mon Oct  9 14:35:06 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Oct 2006 14:35:06 +0200 (CEST)
Subject: bernhard: doc/www/src mirrors.html.m4,1.16,1.17 
Message-ID: <20061009123506.906531005A3@lists.intevation.de>

Author: bernhard

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

Modified Files:
	mirrors.html.m4 
Log Message:
* Sorted alphabetical now.
* Added University of Belgrade etf again.


Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mirrors.html.m4	22 May 2006 09:19:22 -0000	1.16
+++ mirrors.html.m4	9 Oct 2006 12:35:04 -0000	1.17
@@ -5,10 +5,7 @@
 <h2>Kolab Downloads</h2>
 
 <ul>
-<li>
-  <b>erfrakon</b><br>
-  via <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/">http</a>
-  <!-- contact  martin.konold ,a, erfrakon.de -->
+
 <li>
   <b>Belnet</b><br>
   via <a href="http://ftp.belnet.be/packages/kolab/">http</a> |
@@ -16,10 +13,26 @@
   <!-- contact  ftpmaint ,a, belnet.be -->
 
 <li>
+  <b>erfrakon</b><br>
+  via <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/">http</a>
+  <!-- contact  martin.konold ,a, erfrakon.de -->
+
+<li>
   <b>Linjection</b> <br> 
   via
   <a href="http://kolab.linjection.org/">http</a>
   <!-- contact Markus Oliver Markert <email ,a, markus-markert.de> -->
+
+<li>
+  <b>University of Belgrade</b> <br>
+  via <a href="http://mirror.etf.bg.ac.yu/kolab/">http</a> |
+  <a href="ftp://mirror.etf.bg.ac.yu/kolab/">ftp</a> 
+  |
+  rsync://mirror.etf.bg.ac.yu/kolab
+  <!-- contact  mirroradmin ,a, etf.bg.ac.yu, 
+       RC ETF Admin <rc-admin ,a, etf.bg.ac.yu,
+       Marko Uskokovic System Administrator email: uskokovic ,a, etf.bg.ac.yu
+   -->
 </ul>
 
 <h2>How to become a mirror?</h2>



From cvs at kolab.org  Mon Oct  9 18:47:05 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Oct 2006 18:47:05 +0200 (CEST)
Subject: bh: doc/www/src index.html.m4,1.93,1.94 
Message-ID: <20061009164705.608FC1005A8@lists.intevation.de>

Author: bh

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

Modified Files:
	index.html.m4 
Log Message:
Added Kolab Security Issue 11 and corresponding news item.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- index.html.m4	2 Oct 2006 17:27:00 -0000	1.93
+++ index.html.m4	9 Oct 2006 16:47:03 -0000	1.94
@@ -46,6 +46,21 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <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)	



From cvs at kolab.org  Mon Oct  9 18:47:05 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  9 Oct 2006 18:47:05 +0200 (CEST)
Subject: bh: doc/www/src/security kolab-vendor-notice-12.txt,NONE,1.1 
Message-ID: <20061009164705.5AD8B1005A3@lists.intevation.de>

Author: bh

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

Added Files:
	kolab-vendor-notice-12.txt 
Log Message:
Added Kolab Security Issue 11 and corresponding news item.


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

Kolab Security Issue 12 20061009
================================

Package:              openssl
Vulnerability:        denial of service, may allow execution of arbitrary code
Kolab Specific:       no
Dependent Packages:   apache curl imap imapd openldap perl perl-crypto
                      php postfix proftpd


Summary
~~~~~~~

The openssl package for the Kolab Server 2.0 branch from the previous
Kolab Security Issue, No. 11 from 20061002, introduced a new problem
together with the fix for CVE-2006-2940.  The new problem is the
possible use of an uninitialized local variable which may lead to
program crashes and may allow execution of arbitrary code.


Affected Versions
~~~~~~~~~~~~~~~~~

The updated RPMs from Kolab Security Issue 11 for the Kolab Server 2.0
are affected.  More specifically, it affects the
openssl-0.9.7l-20061002_kolab RPM and dependent packages.

The updated RPMs for the Kolab Server 2.1 branch are NOT affected.  The
openssl RPM from OpenPKG used for that branch already contains the fix
for the new problem.


Fixes
~~~~~

Note: The fix described here is for Kolab Server 2.0.4.  If you still
run an older version, please upgrade to 2.0.4 first.  You do not need to
apply Kolab Security Issue 11 because this update completely replaces
it.

An updated OpenPKG package for openssl is available from the usual kolab
mirrors under the directory security-updates/20061009/ .  While the
mirrors are catching up, you can also get the files via rsync: 
# rsync -tzvr rsync://rsync.kolab.org/kolab/server/security-updates/20061009/ .

Under that directory there is one directory with the new source RPMs
(sources/) and one with updated RPMs for Debian sarge (ix86-debian3.1)
If you installed the Kolab Server from sources, download the sources
directory for your kolab Server branch.  If you installed from binaries,
download the appropriate binaries directory for your Kolab Server
branch.

Both directories contain the new OpenSSL package plus obmtool and
obmtool.conf files like a Kolab release.  In addition, the binary
directory contains updated binaries of the dependent packages.

In any case, download all files in the appropriate directory, chdir into
the downloaded directory and run

  /kolab/bin/openpkg rc all stop
  ./obmtool kolab

This will install the new openssl package and rebuild/reinstall the
dependent packages.  Afterwards start the server again, making sure to
regenerate the config files as you would for a normal Kolab Server
update.


Details
~~~~~~~
http://kolab.org/security/kolab-vendor-notice-11.txt
	Kolab Security Notice 11 with the updates

http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.021-openssl.html
	OpenPKG Security Advisory OpenPKG-SA-2006.021

http://www.openssl.org/news/secadv_20060928.txt
	OpenSSL Security Advisory on the vendor's site

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-2940
	Common Vulnerabilities and Exposures (CVE): CAN-2006-2940


Timeline
~~~~~~~~
    20060928 OpenSSL vendor released patch and new versions containing the fix
    20060928 OpenPKG created new package containing the fix
    20061002 Kolab update and security advisory 11 published
    20061009 Kolab update and security advisory 12 published

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFFKnph0vCiU5+ISsgRAkYXAKC51EsPh8uLW5tSZKQPY2Slo4YhrwCgsy7u
bhK7HbjKfbj+ZT+q9hV2KIQ=
=rCns
-----END PGP SIGNATURE-----



From cvs at kolab.org  Thu Oct 12 14:16:51 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Oct 2006 14:16:51 +0200 (CEST)
Subject: steffen: server obmtool.conf,1.223,1.224 
Message-ID: <20061012121651.EA0D61005A8@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
catching up with openpkg

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- obmtool.conf	20 Jun 2006 12:29:29 -0000	1.223
+++ obmtool.conf	12 Oct 2006 12:16:49 -0000	1.224
@@ -41,14 +41,14 @@
     fi
 
     # start from scratch or upgrade within 2.0.x
-    @install ${loc}openpkg-2.5.2-2.5.2 \
+    @install ${loc}openpkg-2.5.4-2.5.4 \
         --tag="kolab" \
         --prefix="${PREFIX}" \
         --user="${CMD}" --group="${CMD}" \
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
 
-    @install ${loc}openpkg-registry-0.2.7-20060223
+    #@install ${altloc}openpkg-registry-0.2.7-20060223
     if test -n "$USERNAME" ; then
       $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
@@ -80,7 +80,7 @@
     @install ${loc}perl-util-5.8.7-2.5.0
     @install ${loc}perl-parse-5.8.7-2.5.0
     @install ${loc}perl-sys-5.8.7-2.5.0
-    @install ${loc}openssl-0.9.8a-2.5.0
+    @install ${loc}openssl-0.9.8a-2.5.4
     @install ${loc}perl-mail-5.8.7-2.5.0
     @install ${loc}perl-crypto-5.8.7-2.5.0
     @install ${loc}perl-xml-5.8.7-2.5.0
@@ -149,11 +149,11 @@
     @install ${altloc}clamav-0.88.2-20060524
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20060619
-    @install ${altloc}kolabd-2.0.99-20060619 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20060620 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20061011
+    @install ${altloc}kolabd-2.0.99-20061011 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20061011 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20060619 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20061011 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version
     @check
 



From cvs at kolab.org  Thu Oct 12 18:18:13 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 12 Oct 2006 18:18:13 +0200 (CEST)
Subject: bh: utils/admin convert-ldif-21.py,NONE,1.1 
Message-ID: <20061012161813.38C9B1005DA@lists.intevation.de>

Author: bh

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

Added Files:
	convert-ldif-21.py 
Log Message:
Add a script to convert LDAP data from kolab server 2.0 to 2.1


--- NEW FILE: convert-ldif-21.py ---
#! /usr/bin/python
# Copyright (C) 2006 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
#
# This program is free software under the GPL (>=v2)
# Read the file COPYING coming with the software for details.

# Requirements:
#
# Python >= 2.1
# python-ldap >= 2.0

"""Upgrade kolab ldap data from server 2.0 to 2.1

Usage:

   convert-ldif-21.py [--normalize] [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
produced by e.g. slapcat and writes the output in the same format.  The
filenames are optional.  If omitted the program reads from stdin and
writes to stdout.

When the --normalize option is given, the data is only read, parsed and
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.
"""

__version__ = "$Revision: 1.1 $"
# $Id: convert-ldif-21.py,v 1.1 2006/10/12 16:18:10 bh Exp $


import sys
import getopt

import ldif

def joindn(split_dn):
    """Join a split dn again.  This is the inverse to splitdn"""
    return ",".join(split_dn)

def splitdn(dn):
    return dn.split(",")


class KolabConfig:

    dn_prefix = "k=kolab,"

    def __init__(self, dn, record):
        self.base_dn = dn[len(self.dn_prefix):]
        self.domain = record["postfix-mydomain"][0]


class KolabLDAPUpgrader(ldif.LDIFParser):

    def __init__(self, inputstream, writer, handlers):
        self.__writer = writer
        self.__handlers = handlers
        self.kolab_config = None
        ldif.LDIFParser.__init__(self, inputstream)

    def handle(self, dn, record):
        self.extract_kolab_config(dn, record)
        for handler in self.__handlers:
            newdn = handler(dn, record, self.kolab_config)
            if newdn:
                dn = newdn
        self.__writer.unparse(dn, record)

    def extract_kolab_config(self, dn, record):
        if dn.startswith(KolabConfig.dn_prefix):
            self.kolab_config = KolabConfig(dn, record)

def upgrade_k(dn, record, kolab_config):
    """Upgrades the main kolab record"""
    if dn.startswith("k=kolab,"):
        record["postfix-mydestination"] = record["postfix-mydomain"]

def upgrade_distribution_list(dn, record, kolab_config):
    """Upgrades a distribution list record"""
    if "kolabGroupOfNames" in record["objectClass"] and record.has_key("mail"):
        assert dn.startswith("cn=")
        record["cn"] = record["mail"]
        return joindn(["cn=" + record["cn"][0]] + splitdn(dn)[1:])

def upgrade_shared_folder(dn, record, kolab_config):
    """Upgrades a distribution list record"""
    if "kolabSharedFolder" in record["objectClass"]:
        assert dn.startswith("cn=")
        mail = record["cn"][0] + "@" + kolab_config.domain
        record["cn"] = [mail]
        return joindn(["cn=" + record["cn"][0]] + splitdn(dn)[1:])

def remove_kolabEncryptedPassword(dn, record, kolab_config):
    """Removes kolabEncryptedPassword attributes"""
    if record.has_key("kolabEncryptedPassword"):
        del record["kolabEncryptedPassword"]


found_domains_object = 0
def find_domains_object(dn, record, kolab_config):
    global found_domains_object
    if dn.startswith("dn: cn=domains,cn=internal,"):
        found_domains_object = 1


def write_domains_objects(writer, kolab_config):
    if not kolab_config:
        return
    domain = kolab_config.domain
    base_dn = kolab_config.base_dn
    manager = "cn=manager,cn=internal," + base_dn

    writer.unparse("cn=domain-maintainer,cn=internal," + base_dn,
                   {"objectClass": ["top", "kolabGroupOfNames"],
                    "cn": ["domain-maintainer"],
                    "member": [manager]})
    writer.unparse("cn=domains,cn=internal," + base_dn,
                   {"objectClass": ["top", "kolabNamedObject"],
                    "cn": ["domains"]})
    writer.unparse("cn=" + domain + ",cn=domains,cn=internal," + base_dn,
                   {"objectClass": ["top", "kolabGroupOfNames"],
                    "cn": [domain],
                    "member": [manager]})


def main():
    action = "upgrade"

    opts, rest = getopt.getopt(sys.argv[1:], '', ['normalize', 'help'])
    for optchar, value in opts:
        if optchar == "--normalize":
            action = "normalize"
        elif optchar == "--help":
            print __doc__
            sys.exit(0)
        else:
            print >>sys.stderr, "unknown option %r" % optchar
            sys.exit(1)

    if len(rest) >= 1:
        infile = open(rest[0])
    else:
        infile = sys.stdin
    if len(rest) >= 2:
        outfile = open(rest[1], "w")
    else:
        outfile = sys.stdout

    if action == "upgrade":
        handlers = [upgrade_k,
                    upgrade_distribution_list,
                    upgrade_shared_folder,
                    remove_kolabEncryptedPassword,
                    ]
    elif action == "normalize":
        handlers = []
    else:
        print >>sys.stderr, "unknown action %r" % (action,)
        sys.exit(1)

    writer = ldif.LDIFWriter(outfile)
    upgrader = KolabLDAPUpgrader(infile, writer, handlers)
    upgrader.parse()

    if action == "upgrade":
        if not found_domains_object:
            write_domains_objects(writer, upgrader.kolab_config)

main()



From cvs at kolab.org  Tue Oct 17 21:23:15 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Oct 2006 21:23:15 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf centos-clarkconnect, NONE,
	1.1 
Message-ID: <20061017192315.8F694101F02@lists.intevation.de>

Author: richard

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

Added Files:
	centos-clarkconnect 
Log Message:
Just adding the dist_conf file that comes with the clarkconnect
distribtion (http://www.clarkconnect.com).  Clarkconnect is build
upon Centos, which is basically Red-Hat, and that is basically Fedora.
Some hopefully some users of Centos, Red-Hat or Fedora find this
dist_conf usefull!



--- NEW FILE: centos-clarkconnect ---
kolab_usr=kolab-n
kolab_grp=kolab-n
kolab_musr=kolab
kolab_mgrp=kolab
kolab_uid=414
kolab_gid=414
kolab_rusr=kolab-r
kolab_rgrp=kolab-r
kolab_susr=root

BASHELL=/bin/bash
KOLABRC=${sbindir}/kolabsrv
PERL=${bindir}/perl
# TODO: ${bindir}/php for CentOS/RHEL
PHP=${bindir}/engine
RPM=/bin/rpm

# Define the deamons that are launched from /etc/init.d
LDAPD=ldap

kolab_rcdir=${sysconfdir}/rc.d/init.d
pkgdocdir=${datadir}/doc/kolab-2.1

# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
perllib=/usr/lib/perl5/vendor_perl/5.8.5

sysrundir=${localstatedir}/run

#--------------------------------------------------------------------
# Amavis
#--------------------------------------------------------------------
# - Amavis is not included in standard CentOS/RHEL.

amavisd_conffile=${sysconfdir}/amavisd.conf
amavisd_templatedir=${sysconfdir}/amavisd/templates
amavisd_logfile=${localstatedir}/log/maillog
amavisd_home=${localstatedir}/lib/amavis
amavisd_rusr=amavis
amavisd_usr=root
amavisd_grp=amavis
amavisd_rpm=amavisd-new

# TODO: what is this? 
fsl_logfile=/var/log/fsl/fsl.log

#--------------------------------------------------------------------
# ClamAV
#--------------------------------------------------------------------
# - ClamAV is not included in standard CentOS/RHEL.

clamav_confdir=${sysconfdir}
clamav_socket=${localstatedir}/run/clamav/clamd.sock
clamav_logfile=${localstatedir}/log/maillog
clamav_pidfile=${sysrundir}/clamd.pid
clamav_datadir=${localstatedir}/lib/clamav
freshclam_logfile=${localstatedir}/log/maillog
freshclam_pidfile=${sysrundir}/freshclam.pid
clamav_rusr=clamav
clamav_usr=root
clamav_grp=clamav

# TODO: are these unused?
emailscan_usr=root
emailscan_grp=root

#--------------------------------------------------------------------
# Postfix
#--------------------------------------------------------------------
# CentOS/RHEL: ClarkConnect uses custom mail filters (kolabfilter and 
# kolabmailboxfilter) with the "filter" user.  Adjustments may be 
# required for the following:
#
# - emailserver_master_usr=kolab-n

emailserver_confdir=${sysconfdir}/postfix
emailserver_socket=${localstatedir}/lib/imap/socket/lmtp
emailserver_localstatedir=${localstatedir}/spool/postfix
emailserver_logfile=${localstatedir}/log/maillog
emailserver_usr=root
emailserver_grp=root
emailserver_mail_owner=postfix
emailserver_setgid_grp=postdrop
emailserver_default_privs=nobody
emailserver_master_usr=kolab-n
emailserver_rpm=postfix

# TODO: is this still used?
emailserver_musr=is_this_still_used

#--------------------------------------------------------------------
# Proftp
#--------------------------------------------------------------------
# TODO

ftpserver_scoreboardfile=/var/state/score
ftpserver_logfile=/var/log/xferlog
ftpserver_confdir=/etc
ftpserver_pidfile=/var/run/proftpd.pid
ftpserver_musr=root
ftpserver_usr=ftp
ftpserver_grp=ftp
ftpserver_uid=14
ftpserver_gid=50

#--------------------------------------------------------------------
# Cyrus IMAP
#--------------------------------------------------------------------
# TODO: is imap_lmtp still used?

imap_confdir=${sysconfdir}
imap_confperm=0640
imap_usr=cyrus
imap_grp=mail
imap_masterlogfile=${localstatedir}/log/maillog
imap_misclogfile=${localstatedir}/log/maillog
imap_statedir=${localstatedir}/lib/imap
imap_spool=${localstatedir}/spool/imap
imap_sievedir=${localstatedir}/lib/imap/sieve
imap_lmtp=${imap_statedir}/socket/lmtp
imap_rpm=cyrus-imapd

#--------------------------------------------------------------------
# Kolab
#--------------------------------------------------------------------
# CentOS/RHEL: ClarkConnect uses custom mail filters (kolabfilter and 
# kolabmailboxfilter) with the "filter" user.  Adjustments may be 
# required for the following:
#
# - kolab_smtpdpolicy_conffile_usr=kolab
# - kolab_smtpdpolicy_conffile_grp=filter

kolab_statedir=${localstatedir}/lib/kolab
kolab_logdir=${localstatedir}/log/kolab
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
kolab_rpm=kolabd
kolab_resource_handlers_rpm=kolab-resource-handlers
kolab_webadmin_rpm=kolab-webadmin
perl_kolab_rpm=perl-kolab
kolab_smtpdpolicy_conffile_usr=kolab
kolab_smtpdpolicy_conffile_grp=filter
kolab_scriptsdir=${datadir}/kolab/scripts
#kolab_php_module_prefix=kolab/
kolab_php_module_prefix=
kolab_php_smarty_prefix=Smarty

#--------------------------------------------------------------------
# OpenLDAP
#--------------------------------------------------------------------
# TODO: is ldapserver_rundir still used?

ldapserver_statedir=${localstatedir}/lib/ldap
ldapserver_dir=${localstatedir}/lib/ldap
ldapserver_replogfile=${localstatedir}/lib/ldap/replog
ldapserver_argsfile=${localstatedir}/run/slapd.args
ldapserver_logfile=${localstatedir}/log/messages
ldapserver_rundir=/bob
ldapserver_pidfile=${sysrundir}/slapd.pid
ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
ldapserver_schemadir=${sysconfdir}/openldap/schema
ldapserver_confdir=${sysconfdir}/openldap
ldapserver_usr=root
ldapserver_grp=ldap
ldapserver_rgrp=ldap
ldapserver_rusr=ldap

#--------------------------------------------------------------------
# Apache Web Server
#--------------------------------------------------------------------
# CentOS/RHEL: ClarkConnect does not use the Kolab web interface.
# Adjustments will be required in this section.

webserver_document_root=${localstatedir}/webconfig/htdocs
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/webconfig/tmp
webserver_logdir=${localstatedir}/log
webserver_acceptlock=not_used
# TODO: add to httpd.conf
webserver_runtime_status=/var/run/webconfig.scoreboard
webserver_errorlogfile=${webserver_logdir}/error_log
webserver_accesslogfile=${webserver_logdir}/access.log
webserver_pidfile=/var/run/webconfig.pid
webserver_mime_magicfile=/usr/webconfig/conf/magic
webserver_mime_typesfile=/usr/webconfig/conf/mime.types
webserver_web_prefix=/kolab
webserver_musr=kolab
webserver_usr=root
webserver_grp=root
webserver_rpm=httpd
webserver_confdir=/usr/webconfig/etc
webserver_sslmutex=${webserver_logdir}/ssl_mutex
webserver_sslscache=/var/cache/mod_ssl/scache
phplibdir=/usr/webconfig/include
phplibdir2=/usr/webconfig/include
phppeardir=/usr/webconfig/pear

# is /var/run/httpd.scoreboard required?
# revisit webserver_musr

#--------------------------------------------------------------------
# Saslauth
#--------------------------------------------------------------------

sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
sasl_authdconffile=${sysconfdir}/saslauthd.conf
sasl_logfile=${localstatedir}/log/messages

#--------------------------------------------------------------------
# Resource manager
#--------------------------------------------------------------------
# - log file was changed to syslog (to keep it consistent with RHEL) 
# 
# CentOS/RHEL: watch out for resmgr_conffile_usr

#*************************************** HERE ************************************************************
resmgr_logfile=${localstatedir}/log/maillog
resmgr_confdir=${sysconfdir}/resmgr
resmgr_conffile_usr=filter
resmgr_conffile_grp=root
resmgr_filterdir=${localstatedir}/spool/resmgr
resmgr_usr=root
resmgr_grp=root
resmgr_scriptsdir=/usr/sbin

fbview_logfile=/var/lib/resmgr/fbview.log
freebusy_logfile=/var/log/resmgr/freebusy.log
freebusy_cachedir=${webserver_document_root}/kolab/freebusy/cache

# Total guess
freebusy_usr=root
freebusy_grp=webconfig


graveyard_uidcache=/var/lib/kolab/graveyard_uidcache.db
graveyard_tscache=/var/lib/kolab/graveyard_tscache.db

backupdir=/usr/share/kolab/backup



From cvs at kolab.org  Tue Oct 17 21:24:26 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 17 Oct 2006 21:24:26 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf centos-clarkconnect,1.1,1.2 
Message-ID: <20061017192426.E73FC101F0D@lists.intevation.de>

Author: richard

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

Modified Files:
	centos-clarkconnect 
Log Message:
Added some explanation about clarkconnect to the file



Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- centos-clarkconnect	17 Oct 2006 19:23:13 -0000	1.1
+++ centos-clarkconnect	17 Oct 2006 19:24:24 -0000	1.2
@@ -1,3 +1,8 @@
+#--------------------------------------------------------------------
+# dist_conf file that comes with the clarkconnect
+# distribtion (http://www.clarkconnect.com).  Clarkconnect is build
+# upon Centos, which is basically Red-Hat, and that is basically Fedora.
+#--------------------------------------------------------------------
 kolab_usr=kolab-n
 kolab_grp=kolab-n
 kolab_musr=kolab



From cvs at kolab.org  Wed Oct 18 18:35:33 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 18 Oct 2006 18:35:33 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf centos-clarkconnect,1.2,1.3 
Message-ID: <20061018163533.D3DE1101FB1@lists.intevation.de>

Author: richard

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

Modified Files:
	centos-clarkconnect 
Log Message:
Add license information


Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- centos-clarkconnect	17 Oct 2006 19:24:24 -0000	1.2
+++ centos-clarkconnect	18 Oct 2006 16:35:31 -0000	1.3
@@ -2,6 +2,7 @@
 # dist_conf file that comes with the clarkconnect
 # distribtion (http://www.clarkconnect.com).  Clarkconnect is build
 # upon Centos, which is basically Red-Hat, and that is basically Fedora.
+# License: gpl
 #--------------------------------------------------------------------
 kolab_usr=kolab-n
 kolab_grp=kolab-n



From cvs at kolab.org  Thu Oct 19 03:49:23 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 03:49:23 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.6, 1.7 
Message-ID: <20061019014923.677771005CC@lists.intevation.de>

Author: steffen

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

Modified Files:
	messages.po 
Log Message:
updated french translation (issue1457, thanks jml)

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- messages.po	12 Dec 2005 00:37:05 -0000	1.6
+++ messages.po	19 Oct 2006 01:49:21 -0000	1.7
@@ -1,4 +1,4 @@
-# translation of messages.po to 
+# translation of messages.po to 
 # translation of messages.po to
 # translation of messages.po to
 # translation of messages.po to
@@ -9,14 +9,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Benoit Mortier <benoit.mortier at opensides.be>, 2005.
+# Jean-Michel LACROIX <jm-lacroix at savigny.org>, 2006
 #
[...3310 lines suppressed...]
+#~ "administrateurs"
+
+#, fuzzy
+#~ msgid "Domain Maintainer Deleted"
+#~ msgstr "Mainteneur effacé"
+#~ 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  Thu Oct 19 03:49:58 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 03:49:58 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.1.2.1, 1.1.2.2 
Message-ID: <20061019014958.C9A3C1005CC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	messages.po 
Log Message:
updated french translation (issue1457, thanks jml)

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- messages.po	13 Oct 2005 01:50:24 -0000	1.1.2.1
+++ messages.po	19 Oct 2006 01:49:56 -0000	1.1.2.2
@@ -14,9 +14,9 @@
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-13 01:19+0200\n"
-"PO-Revision-Date: 2005-06-13 18:10+0200\n"
-"Last-Translator: Benoit Mortier <benoit.mortier at opensides.be>\n"
+"POT-Creation-Date: 2006-10-17 14:09+0200\n"
+"PO-Revision-Date: 2006-10-17 14:37+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"
[...1699 lines suppressed...]
 
@@ -2180,17 +1971,14 @@
 
 #~ msgid "Distribution List "
 #~ msgstr "Liste de distribution"
-
 #~ msgid " deleted"
 #~ msgstr " effacé"
-
 #~ msgid "Shared folder "
 #~ msgstr "Dossier partagé"
-
 #~ msgid " is empty"
 #~ msgstr "est vide"
-
 #~ 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  Thu Oct 19 04:30:54 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 04:30:54 +0200 (CEST)
Subject: steffen: server/file - New directory 
Message-ID: <20061019023054.E3D151005CC@lists.intevation.de>

Author: steffen

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

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




From cvs at kolab.org  Thu Oct 19 04:31:32 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 04:31:32 +0200 (CEST)
Subject: steffen: server/file Makefile, NONE, 1.1 kolab-filemagic.patch, NONE,
	1.1 kolab.patch, NONE, 1.1 
Message-ID: <20061019023132.AB9C11005CC@lists.intevation.de>

Author: steffen

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

Added Files:
	Makefile kolab-filemagic.patch kolab.patch 
Log Message:
custom file package (issue1458)

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

PACKAGE=file
VERSION=4.15
RELEASE=2.5.0
KOLABRELEASE=2.5.0_kolab

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

all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

	cp $(KOLABCVSDIR)/kolab-filemagic.patch $(KOLABRPMSRC)/$(PACKAGE)/
	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for file.spec
	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec 

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

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

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

--- NEW FILE: kolab-filemagic.patch ---
diff -upr ../file-4.15.orig/magic/Magdir/msdos ./magic/Magdir/msdos
--- ../file-4.15.orig/magic/Magdir/msdos	2005-08-18 17:00:48.000000000 +0200
+++ ./magic/Magdir/msdos	2006-10-19 04:15:45.000000000 +0200
@@ -255,15 +255,16 @@
 # Uncommenting only the first two lines will cover about 2/3 of COM files,
 # but it isn't feasible to match all COM files since there must be at least
 # two dozen different one-byte "magics".
-0	byte		0xe9		MS-DOS executable (COM)
->6	string		SFX\ of\ LHarc	(%s)
-0	byte		0x8c		MS-DOS executable (COM)
+# Those one-byte patterns are too dangerous for Kolab
+#0	byte		0xe9		MS-DOS executable (COM)
+#>6	string		SFX\ of\ LHarc	(%s)
+#0	byte		0x8c		MS-DOS executable (COM)
 # 0xeb conflicts with "sequent" magic
-0	byte		0xeb		MS-DOS executable (COM)
->4	string		\ $ARX		\b, ARX self-extracting archive
->4	string		\ $LHarc	\b, LHarc self-extracting archive
->0x20e	string		SFX\ by\ LARC	\b, LARC self-extracting archive
-0	byte		0xb8		COM executable for MS-DOS
+#0	byte		0xeb		MS-DOS executable (COM)
+#>4	string		\ $ARX		\b, ARX self-extracting archive
+#>4	string		\ $LHarc	\b, LHarc self-extracting archive
+#>0x20e	string		SFX\ by\ LARC	\b, LARC self-extracting archive
+#0	byte		0xb8		COM executable for MS-DOS
 # many compressed/converted COMs start with a copy loop instead of a jump
 0x6	search/0xa	\xfc\x57\xf3\xa5\xc3	COM executable for MS-DOS
 0x6	search/0xa	\xfc\x57\xf3\xa4\xc3	COM executable for MS-DOS

--- NEW FILE: kolab.patch ---
--- file.spec.orig	2006-10-19 04:17:54.000000000 +0200
+++ file.spec	2006-10-19 04:20:49.000000000 +0200
@@ -37,7 +37,7 @@ Class:        BASE
 Group:        Filesystem
 License:      BSD
 Version:      %{V_api_c}
-Release:      2.5.0
+Release:      2.5.0_kolab
 
 #   package options
 %option       with_perl  no
@@ -46,6 +46,9 @@ Release:      2.5.0
 Source0:      ftp://ftp.astron.com/pub/file/file-%{V_api_c}.tar.gz
 Source1:      http://www.cpan.org/modules/by-module/File/File-LibMagic-%{V_api_pl}.tgz
 
+#   list of patches
+Patch0:       kolab-filemagic.patch
+
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
@@ -79,6 +82,7 @@ AutoReqProv:  no
 %prep
     %setup -q
     %setup -q -D -T -a 1
+    %patch -p0
 
 %build
     ACLOCAL=true \



From cvs at kolab.org  Thu Oct 19 04:33:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 04:33:24 +0200 (CEST)
Subject: steffen: server obmtool.conf,1.224,1.225 
Message-ID: <20061019023324.36A8A1005CC@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
custom file package (issue1458)

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- obmtool.conf	12 Oct 2006 12:16:49 -0000	1.224
+++ obmtool.conf	19 Oct 2006 02:33:22 -0000	1.225
@@ -111,7 +111,7 @@
     @install ${loc}autoconf-2.59-2.5.0
     @install ${loc}automake-1.9.6-2.5.0
     @install ${loc}gettext-0.14.5-2.5.0
-    @install ${loc}file-4.15-2.5.0
+    @install ${loc}file-4.15-2.5.0_kolab
     @install ${loc}openpkg-tools-0.8.47-2.5.0
     @install ${loc}patch-2.5.9-2.5.0
     @install ${loc}sed-4.1.4-2.5.0



From cvs at kolab.org  Thu Oct 19 05:54:04 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 05:54:04 +0200 (CEST)
Subject: steffen: server/amavisd undecipherable_subject.patch,NONE,1.1 
Message-ID: <20061019035404.DAEBF1005CB@lists.intevation.de>

Author: steffen

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

Added Files:
	undecipherable_subject.patch 
Log Message:
patch for UNCHECKED subject marker (issue1447). Not in use currently

--- NEW FILE: undecipherable_subject.patch ---
--- amavisd.orig	2006-10-19 05:25:38.000000000 +0200
+++ amavisd	2006-10-19 05:47:08.000000000 +0200
@@ -8078,7 +8078,7 @@ sub add_forwarding_header_edits_per_reci
         my($entity) = $msginfo->mime_entity;
         if (defined $entity && defined $entity->head->get('Subject',0)) {
           $hdr_edits->edit_header('Subject',
-                    sub { $_[1]=~/^([ \t]?)(.*)\z/s; ' '.$subject_insert.$2 });
+                    sub { $_[1]=~/^([ \t]?)(.*)\z/s; my $subj = $2; $subj=~s/\Q$subject_insert\E//sg; ' '.$subject_insert.$subj });
         } else {  # no Subject header field present, insert one
           $subject_insert =~ s/[ \t]+\z//;  # trim
           $hdr_edits->append_header('Subject', $subject_insert);



From cvs at kolab.org  Thu Oct 19 17:20:07 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 17:20:07 +0200 (CEST)
Subject: thomas: doc/www/src/security kolab-vendor-notice-13.txt,NONE,1.1 
Message-ID: <20061019152007.837D91006C5@lists.intevation.de>

Author: thomas

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

Added Files:
	kolab-vendor-notice-13.txt 
Log Message:
Added Kolab Security Issue


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

Kolab Security Issue 13 20061019
================================

Package:              Kolab Server, ClamAV
Vulnerability:        heap overflow, remotely exploitable (CVE-2006-4182),
                      denial of service, remotely exploitable (CVE-2006-5295)
Kolab Specific:       no
Dependent Packages:   none


Summary
~~~~~~~

CVE-2006-4182

    Damian Put discovered a heap overflow error in the script to rebuild
    PE files, which could lead to the execution of arbitrary code.

CVE-2006-5295

    Damian Put discovered that missing input sanitising in the CHM
    handling code might lead to denial of service.


Affected Versions
~~~~~~~~~~~~~~~~~

This affects versions of ClamAV up to version 0.88.4.
Kolab Server 2.0.4 and Kolab Server 2.1beta2 are vulnerable.
Previous releases are affected.


Fix
~~~

Upgrade to ClamAV 0.88.5.

The ClamAV source RPM is available from the Kolab download mirrors as:
security-updates/20061019/clamav-0.88.5-2.20061018.src.rpm

A binary RPM for Kolab Server 2.0.4 (ix86 Debian GNU/Linux Sarge) is available:
security-updates/20061019/clamav-0.88.5-2.20061018.ix86-debian3.1-kolab.rpm

All other Server versions: Please build from the src.rpm.


The mirrors are listed on http://kolab.org/mirrors.html
While the mirrors are catching up, you can also get the package via rsync:
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/security-updates/20061019/clamav-0.88.5-2.20061018.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/security-updates/20061019/clamav-0.88.5-2.20061018.ix86-debian3.1-kolab.rpm .

MD5 sums:
d449d8970698e3bd3dd30eac7a1e4579  clamav-0.88.5-2.20061018.src.rpm
4c819dcaffe3602a927965115ff328d5  clamav-0.88.5-2.20061018.ix86-debian3.1-kolab.rpm

The package can be installed on your Kolab Server with

# /kolab/bin/openpkg rpm --rebuild clamav-0.88.5-2.20061018.src.rpm
# /kolab/bin/openpkg rpm \
  -Uvh /kolab/RPM/PKG/clamav-0.88.5-2.20061018.<ARCH>-<OS>-kolab.rpm


Details
~~~~~~~

http://sourceforge.net/project/shownotes.php?release_id=455799
	ClamAV 0.88.5 release notes

http://www.securityfocus.com/bid/20535
	Clam Anti-Virus PE Rebuilding Heap Buffer Overflow Vulnerability
	(CVE-2006-4182)

http://www.securityfocus.com/bid/20537
	Clam Anti-Virus CHM Unpacker Denial Of Service Vulnerability
	(CVE-2006-5295)


Timeline
~~~~~~~~
    20061015 ClamAV release 0.88.5.
    20061018 OpenPKG 0.88.5 package release.
    20061019 Kolab Server security advisory published.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFFN5dhW7P1GVgWeRoRAqLQAKChYWtNVbzLGvVy4uuLuJuFQ9OwiACfQKS+
DeF+soaUL4p5iwtTZxagxNg=
=73VV
-----END PGP SIGNATURE-----



From cvs at kolab.org  Thu Oct 19 17:24:34 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 17:24:34 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers Makefile,1.9.2.7,1.9.2.8 
Message-ID: <20061019152434.08ABF1006AD@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
dont download every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -u -d -r1.9.2.7 -r1.9.2.8
--- Makefile	11 Aug 2006 16:02:56 -0000	1.9.2.7
+++ Makefile	19 Oct 2006 15:24:32 -0000	1.9.2.8
@@ -9,12 +9,15 @@
 
 RPM = /kolab/bin/openpkg rpm
 
-all:
+all: pear-$(PEARVERSION).tar.bz2
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	tar -cvj --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE)-$(VERSION).tar.bz2 *
 	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "ftp://ftp.horde.org/pub/pear/pear-$(PEARVERSION).tar.bz2"
+	cp pear-$(PEARVERSION).tar.bz2 $(KOLABRPMSRC)/$(PACKAGE) 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+pear-$(PEARVERSION).tar.bz2:
+	wget -c "ftp://ftp.horde.org/pub/pear/pear-$(PEARVERSION).tar.bz2"
 
 dist: all
 	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/



From cvs at kolab.org  Thu Oct 19 17:26:48 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 17:26:48 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php, 1.26.2.7, 1.26.2.8 resmgr.conf, 1.7, 1.7.2.1 
Message-ID: <20061019152648.D65711006AD@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php resmgr.conf 
Log Message:
make inserted from text configurable (issue974)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -u -d -r1.26.2.7 -r1.26.2.8
--- kolabfilter.php	21 May 2006 13:41:19 -0000	1.26.2.7
+++ kolabfilter.php	19 Oct 2006 15:26:46 -0000	1.26.2.8
@@ -1,9 +1,9 @@
 #!@l_prefix@/bin/php
 <?php
 /*
- *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *  Copyright (c) 2004-2006 Klaraelvdalens Datakonsult AB
  *
- *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -105,12 +105,16 @@
 
 function rewrite_from($sender,$from) {
   global $params;
+  if( exists($param['untrusted_subject_insert']) ) $untrusted_subject_insert=$param['untrusted_subject_insert'];
+  else $untrusted_subject_insert="(UNTRUSTED, sender is <%s>)";
+  $untrusted = sprintf($untrusted_subject_insert, $sender);
+
   $adrs = imap_rfc822_parse_adrlist($from, $params['email_domain'][0]);
   foreach ($adrs as $adr) {
     $fromadr = $adr->mailbox.'@'.$adr->host;
-    if( !ereg( "\(UNTRUSTED, sender is <$sender>\)", $from ) ) {
+    if( strpos( $from, $untrusted )===false ) {
       myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-      return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' (UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$fromadr.'>';
+      return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' '.$untrusted.'" '.'<'.$fromadr.'>';
     } /* else already rewritten */
   }
   return $from;

Index: resmgr.conf
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.conf,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- resmgr.conf	10 Jun 2005 23:54:37 -0000	1.7
+++ resmgr.conf	19 Oct 2006 15:26:46 -0000	1.7.2.1
@@ -33,6 +33,9 @@
 // the envelope? Default is to rewrite the header
 $params['reject_forged_from_header'] = false;
 
+// Text to be inserted in From: when rewriting untrusted mails
+$params['untrusted_subject_insert']="(UNTRUSTED, sender is <%s>)";
+
 // Should we allow forwarded ical messages from Outlook
 // by encapsulating them in a MIME multipart
 $params['allow_outlook_ical_forward']  = true;



From cvs at kolab.org  Thu Oct 19 17:29:55 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 17:29:55 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.94,1.95 
Message-ID: <20061019152955.C12D31006B7@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Link to Kolab SA13.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- index.html.m4	9 Oct 2006 16:47:03 -0000	1.94
+++ index.html.m4	19 Oct 2006 15:29:53 -0000	1.95
@@ -46,6 +46,20 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <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)	



From cvs at kolab.org  Thu Oct 19 17:58:43 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 17:58:43 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php, 1.26.2.8, 1.26.2.9 
Message-ID: <20061019155843.51D401006AA@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php 
Log Message:
make inserted from text configurable (issue974)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.8
retrieving revision 1.26.2.9
diff -u -d -r1.26.2.8 -r1.26.2.9
--- kolabfilter.php	19 Oct 2006 15:26:46 -0000	1.26.2.8
+++ kolabfilter.php	19 Oct 2006 15:58:41 -0000	1.26.2.9
@@ -105,7 +105,8 @@
 
 function rewrite_from($sender,$from) {
   global $params;
-  if( exists($param['untrusted_subject_insert']) ) $untrusted_subject_insert=$param['untrusted_subject_insert'];
+  if( array_key_exists('untrusted_subject_insert', $params) ) 
+    $untrusted_subject_insert=$param['untrusted_subject_insert'];
   else $untrusted_subject_insert="(UNTRUSTED, sender is <%s>)";
   $untrusted = sprintf($untrusted_subject_insert, $sender);
 



From cvs at kolab.org  Thu Oct 19 22:19:07 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 22:19:07 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers Makefile,1.9.2.8,1.9.2.9 
Message-ID: <20061019201907.1393D1006A9@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile 
Log Message:
cleanup and version

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.9.2.8
retrieving revision 1.9.2.9
diff -u -d -r1.9.2.8 -r1.9.2.9
--- Makefile	19 Oct 2006 15:24:32 -0000	1.9.2.8
+++ Makefile	19 Oct 2006 20:19:05 -0000	1.9.2.9
@@ -4,7 +4,7 @@
 
 PACKAGE=kolab-resource-handlers
 VERSION = 0.3.9
-RELEASE=20060811
+RELEASE=20061019
 PEARVERSION = 1.3
 
 RPM = /kolab/bin/openpkg rpm



From cvs at kolab.org  Thu Oct 19 22:19:07 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 22:19:07 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php, 1.26.2.9, 1.26.2.10 
Message-ID: <20061019201907.1B4EB1006AB@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php 
Log Message:
cleanup and version

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.9
retrieving revision 1.26.2.10
diff -u -d -r1.26.2.9 -r1.26.2.10
--- kolabfilter.php	19 Oct 2006 15:58:41 -0000	1.26.2.9
+++ kolabfilter.php	19 Oct 2006 20:19:05 -0000	1.26.2.10
@@ -103,12 +103,19 @@
   return false;
 }
 
+function get_untrusted_subject_insert()
+{
+  global $params;
+  if( array_key_exists('untrusted_subject_insert', $params) ) {
+    return $param['untrusted_subject_insert'];
+  } else {
+    return "(UNTRUSTED, sender is <%s>)";
+  }
+}
+
 function rewrite_from($sender,$from) {
   global $params;
-  if( array_key_exists('untrusted_subject_insert', $params) ) 
-    $untrusted_subject_insert=$param['untrusted_subject_insert'];
-  else $untrusted_subject_insert="(UNTRUSTED, sender is <%s>)";
-  $untrusted = sprintf($untrusted_subject_insert, $sender);
+  $untrusted = sprintf(get_untrusted_subject_insert(), $sender);
 
   $adrs = imap_rfc822_parse_adrlist($from, $params['email_domain'][0]);
   foreach ($adrs as $adr) {



From cvs at kolab.org  Thu Oct 19 22:56:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 19 Oct 2006 22:56:28 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.10, 1.11 resmgr.conf.in, 1.1, 1.2 
Message-ID: <20061019205628.33B211006A6@lists.intevation.de>

Author: steffen

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

Modified Files:
	kolabfilter.php.in resmgr.conf.in 
Log Message:
forwardport of issue974

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolabfilter.php.in	21 May 2006 13:53:25 -0000	1.10
+++ kolabfilter.php.in	19 Oct 2006 20:56:26 -0000	1.11
@@ -163,6 +163,18 @@
   return $addrs;
 }
 
+/** Returns the format string used to rewrite
+    the From header for untrusted messages */
+function get_untrusted_subject_insert()
+{
+  global $params;
+  if( array_key_exists('untrusted_subject_insert', $params) ) {
+    return $param['untrusted_subject_insert'];
+  } else {
+    return "(UNTRUSTED, sender is <%s>)";
+  }
+}
+
 /** Check that the From header is not trying
     to impersonate a valid user that is not
     $sasluser. Returns one of:
@@ -173,7 +185,7 @@
       From acceptable
     * A PEAR_Error object if something croaked
 */
-function verify_sender( $sasluser, $sender, $from, $client_addr ) {
+function verify_sender( $sasluser, $sender, $fromhdr, $client_addr ) {
   global $params;
 
   /* Allow anything from localhost and
@@ -199,8 +211,8 @@
   } else {
     $allowed_addrs = false;
   }
-
-  $adrs = imap_rfc822_parse_adrlist($from, $params['email_domain'][0]);
+  $untrusted = sprintf(get_untrusted_subject_insert(), $sender);
+  $adrs = imap_rfc822_parse_adrlist($fromhdr, $params['email_domain'][0]);
   foreach ($adrs as $adr) {
     $from = $adr->mailbox.'@'.$adr->host;
     $fromdom = $adr->host;
@@ -220,7 +232,12 @@
 	  } else {
 	    /* Rewrite */
 	    myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-	    return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' (UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$from.'>';
+	    
+	    if( strpos( $fromhdr, $untrusted )===false ) {
+	      return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' '.$untrusted.'" '.'<'.$from.'>';
+	    } else {
+	      return true;
+	    }
 	  }
 	}
       }

Index: resmgr.conf.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resmgr.conf.in	5 Dec 2005 14:13:42 -0000	1.1
+++ resmgr.conf.in	19 Oct 2006 20:56:26 -0000	1.2
@@ -36,6 +36,9 @@
 // the envelope? Default is to rewrite the header
 $params['reject_forged_from_header'] = false;
 
+// Text to be inserted in From: when rewriting untrusted mails
+$params['untrusted_subject_insert']="(UNTRUSTED, sender is <%s>)";
+
 // Should we allow forwarded ical messages from Outlook
 // by encapsulating them in a MIME multipart
 $params['allow_outlook_ical_forward']  = true;



From cvs at kolab.org  Fri Oct 20 17:01:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Oct 2006 17:01:20 +0200 (CEST)
Subject: thomas: server obmtool.conf,1.225,1.226 
Message-ID: <20061020150120.7EA3A1005DD@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf 
Log Message:
Use openldap-2.3.27-2.20061018_kolab instead of openldap-2.3.11-2.5.0_kolab
Fixes issue1229, issue1431, CVE-2006-4600 (Bugtraq ID 19832), and more.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- obmtool.conf	19 Oct 2006 02:33:22 -0000	1.225
+++ obmtool.conf	20 Oct 2006 15:01:18 -0000	1.226
@@ -92,7 +92,7 @@
     @install ${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.11-2.5.0_kolab
+    @install ${altloc}openldap-2.3.27-2.20061018_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



From cvs at kolab.org  Fri Oct 20 17:01:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Oct 2006 17:01:20 +0200 (CEST)
Subject: thomas: server/openldap kolab.patch,1.7,1.8 
Message-ID: <20061020150120.818841006A4@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab.patch 
Log Message:
Use openldap-2.3.27-2.20061018_kolab instead of openldap-2.3.11-2.5.0_kolab
Fixes issue1229, issue1431, CVE-2006-4600 (Bugtraq ID 19832), and more.


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openldap/kolab.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab.patch	9 Dec 2005 15:56:03 -0000	1.7
+++ kolab.patch	20 Oct 2006 15:01:18 -0000	1.8
@@ -1,57 +1,49 @@
---- openldap.spec.orig	Wed Dec  7 15:26:35 2005
-+++ openldap.spec	Wed Dec  7 15:26:35 2005
-@@ -33,7 +33,7 @@ Class:        BASE
- Group:        Database
+--- openldap.spec.orig	2006-10-16 16:31:56.000000000 +0200
++++ openldap.spec	2006-10-17 15:53:36.000000000 +0200
+@@ -33,7 +33,7 @@
+ Group:        LDAP
  License:      GPL
- Version:      2.3.11
--Release:      2.5.0
-+Release:      2.5.0_kolab
+ Version:      2.3.27
+-Release:      2.20061018
++Release:      2.20061018_kolab
  
  #   package options
- %option       with_fsl   yes
-@@ -53,8 +53,8 @@ Prefix:       %{l_prefix}
+ %option       with_fsl      yes
+@@ -53,10 +53,10 @@
+ #   build information
+ Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
- BuildPreReq:  OpenPKG, openpkg >= 2.5.0, make, gcc
- PreReq:       OpenPKG, openpkg >= 2.5.0
+-BuildPreReq:  OpenPKG, openpkg >= 2.20061018, make, gcc
+-PreReq:       OpenPKG, openpkg >= 2.20061018
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
++BuildPreReq:  OpenPKG, openpkg >= 2.5.2, make, gcc
++PreReq:       OpenPKG, openpkg >= 2.5.2
 +BuildPreReq:  readline, openssl, db >= 4.2
 +PreReq:       readline, openssl, db >= 4.2
  %if "%{with_fsl}" == "yes"
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
-@@ -89,8 +89,8 @@ AutoReqProv:  no
-     #   (2. make sure our Berkeley-DB is picked up first)
+@@ -132,13 +132,6 @@
+     LDFLAGS="$LDFLAGS %{l_fsl_ldflags}"
+     LIBS="$LIBS %{l_fsl_libs}"
+ 
+-    #   configuration: force to use GNU pth
+-    CFLAGS="$CFLAGS `%{l_prefix}/bin/pth-config --cflags`"
+-    CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/bin/pth-config --includedir`"
+-    LDFLAGS="$LDFLAGS `%{l_prefix}/bin/pth-config --ldflags`"
+-    LIBS="`%{l_prefix}/bin/pth-config --libs` $LIBS"
+-    ARGS="$ARGS --with-threads=pth"
+-
+     #   configuration: optional overlay support
+ %if "%{with_overlays}" == "yes"
+     ARGS="$ARGS --enable-overlays=yes"
+@@ -177,7 +170,7 @@
+     #   configuration: use hard-links and make sure our Berkeley-DB is picked up first
      %{l_shtool} subst \
          -e 's;ln -s;ln;g' \
--        -e 's;-ldb42;-ldb;g' \
--        -e 's;-ldb43;-ldb;g' \
-+        -e 's;-ldb42;%{l_prefix}/lib/libdb.a;g' \
-+        -e 's;-ldb43;%{l_prefix}/lib/libdb.a;g' \
+-        -e 's;-ldb4[234];-ldb;g' \
++        -e 's;-ldb4[234];%{l_prefix}/lib/libdb.a;g' \
          -e 's;<db\.h>;"db.h";g' \
          configure
- %if "%{with_sasl}" == "yes"
-@@ -108,10 +108,10 @@ AutoReqProv:  no
-         ;;
-     esac
-     CC="%{l_cc}" \
--    CFLAGS="%{l_cflags -O} `%{l_prefix}/bin/pth-config --cflags`" \
--    CPPFLAGS="$cf -I`%{l_prefix}/bin/pth-config --includedir`" \
--    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/pth-config --ldflags` %{l_fsl_ldflags}" \
--    LIBS="`%{l_prefix}/bin/pth-config --libs` %{l_fsl_libs} $LOCLIBS" \
-+    CFLAGS="%{l_cflags -O} " \
-+    CPPFLAGS="$cf " \
-+    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
-+    LIBS="%{l_fsl_libs} $LOCLIBS" \
-     ./configure \
-         --cache-file=./config.cache \
-         --prefix=%{l_prefix} \
-@@ -160,7 +160,7 @@ AutoReqProv:  no
- %endif
-         --with-dyngroup \
-         --with-proxycache \
--        --with-threads=pth \
-+        --with-threads=auto \
-         --enable-slurpd
  
-     #   build toolkit



From cvs at kolab.org  Fri Oct 20 20:31:45 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 20 Oct 2006 20:31:45 +0200 (CEST)
Subject: richard: server/kolabd/kolabd/dist_conf centos-clarkconnect,1.3,1.4 
Message-ID: <20061020183145.507F31005DC@lists.intevation.de>

Author: richard

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

Modified Files:
	centos-clarkconnect 
Log Message:
Added copyright and caveats



Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- centos-clarkconnect	18 Oct 2006 16:35:31 -0000	1.3
+++ centos-clarkconnect	20 Oct 2006 18:31:42 -0000	1.4
@@ -2,7 +2,22 @@
 # dist_conf file that comes with the clarkconnect
 # distribtion (http://www.clarkconnect.com).  Clarkconnect is build
 # upon Centos, which is basically Red-Hat, and that is basically Fedora.
-# License: gpl
+# License: GPL
+# Copyright: Point Clark Networks
+#
+# 20 Oct 2006
+# Keep in mind, *many* features (e.g. freebusy) have not yet been 
+# integrated into ClarkConnect, so parts of the dist_conf file are not 
+# really applicable... yet.  I would be interested in hearing from folks 
+# working on Kolab + CentOS.  We have all the RPMs and source RPMs 
+# available @ http://download.clarkconnect.com/community/.  These RPMS 
+# would have to be tweaked a bit to work on CentOS.  If someone is willing 
+# to do the testing and sanity checking on CentOS, we would be happy to 
+# handle the RPM spec files and package building.
+# 
+# If I knew there was some interest, it would also give me incentive to 
+# update my incomplete Kolab + CentOS documentation @ 
+# http://www.clarkconnect.com/wiki/index.php?title=Kolab
 #--------------------------------------------------------------------
 kolab_usr=kolab-n
 kolab_grp=kolab-n



From cvs at kolab.org  Mon Oct 23 14:37:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Oct 2006 14:37:28 +0200 (CEST)
Subject: thomas: doc/www/src/security kolab-vendor-notice-13.txt,1.1,1.2 
Message-ID: <20061023123728.8161E1006A6@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab-vendor-notice-13.txt 
Log Message:
Corrected rsync path and signed again.


Index: kolab-vendor-notice-13.txt
===================================================================
RCS file: /kolabrepository/doc/www/src/security/kolab-vendor-notice-13.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-vendor-notice-13.txt	19 Oct 2006 15:20:05 -0000	1.1
+++ kolab-vendor-notice-13.txt	23 Oct 2006 12:37:26 -0000	1.2
@@ -49,8 +49,8 @@
 
 The mirrors are listed on http://kolab.org/mirrors.html
 While the mirrors are catching up, you can also get the package via rsync:
-# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/security-updates/20061019/clamav-0.88.5-2.20061018.src.rpm .
-# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/security-updates/20061019/clamav-0.88.5-2.20061018.ix86-debian3.1-kolab.rpm .
+# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20061019/clamav-0.88.5-2.20061018.src.rpm .
+# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20061019/clamav-0.88.5-2.20061018.ix86-debian3.1-kolab.rpm .
 
 MD5 sums:
 d449d8970698e3bd3dd30eac7a1e4579  clamav-0.88.5-2.20061018.src.rpm
@@ -87,7 +87,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFFN5dhW7P1GVgWeRoRAqLQAKChYWtNVbzLGvVy4uuLuJuFQ9OwiACfQKS+
-DeF+soaUL4p5iwtTZxagxNg=
-=73VV
+iD8DBQFFPLdLW7P1GVgWeRoRAq6vAKCXVpNZPWSGIXG+yZBEcQDpjSRr+QCeOTe/
+7IxAqKpYKUa6wOeYakOp90U=
+=35r+
 -----END PGP SIGNATURE-----



From cvs at kolab.org  Mon Oct 23 23:37:52 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 23 Oct 2006 23:37:52 +0200 (CEST)
Subject: martin: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	pfb.php.in, 1.4, 1.5 
Message-ID: <20061023213752.B0C151005AA@lists.intevation.de>

Author: martin

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

Modified Files:
	pfb.php.in 
Log Message:
Martin Konold: clear outdated IMAP cache and cleanup directory structure.


Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pfb.php.in	28 Mar 2006 19:45:39 -0000	1.4
+++ pfb.php.in	23 Oct 2006 21:37:50 -0000	1.5
@@ -159,6 +159,18 @@
   $rc = $fb->imapOpenMailbox(FreeBusy::imapFolderName( $imapuser, $owner, 
 						       $folder, $params['email_domain']));
   if( PEAR::isError( $rc ) ) {
+    // folder doesn't exist (anymore)
+    $cache->store( $owner.'/'.$folder, false, array(), "delete folder");
+    $xcache->store( $owner.'/'.$folder, false, array(), "delete folder");
+    
+    // clear IMAP cache
+    $imapcache = new FreeBusyIMAPCache($full_cache_dir."/", $owner, $fb->foldername);
+    $imapcache->cache_delete();
+    
+    // try to unlink (parent) directory, works only if empty
+    $parent_folder = $full_cache_dir."/".str_replace(".", "^", $owner."/".$folder);
+    @rmdir($parent_folder);
+
     notfound( "Folder: ".$fb->foldername.', '.$rc->toString());
     return false;
   }



From cvs at kolab.org  Tue Oct 24 13:18:33 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 13:18:33 +0200 (CEST)
Subject: steffen: server/openldap Makefile,1.13,1.14 kolab.patch,1.8,1.9 
Message-ID: <20061024111833.A53AB1005BB@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Package is gone, have to play catchup

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	20 Dec 2005 09:18:50 -0000	1.13
+++ Makefile	24 Oct 2006 11:18:31 -0000	1.14
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC/BASE
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,9 +9,9 @@
 endif
 
 PACKAGE=openldap
-VERSION=2.3.11
-RELEASE=2.5.0
-KOLABRELEASE=2.5.0_kolab
+VERSION=2.3.28
+RELEASE=20061022
+KOLABRELEASE=20061022_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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab.patch	20 Oct 2006 15:01:18 -0000	1.8
+++ kolab.patch	24 Oct 2006 11:18:31 -0000	1.9
@@ -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.28
+-Release:      20061022
++Release:      20061022_kolab
  
  #   package options
  %option       with_fsl      yes
@@ -13,8 +13,8 @@
  #   build information
  Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
--BuildPreReq:  OpenPKG, openpkg >= 2.20061018, make, gcc
--PreReq:       OpenPKG, openpkg >= 2.20061018
+-BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc
+-PreReq:       OpenPKG, openpkg >= 20060823
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
 +BuildPreReq:  OpenPKG, openpkg >= 2.5.2, make, gcc



From cvs at kolab.org  Tue Oct 24 13:52:36 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 13:52:36 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.7, 1.8 
Message-ID: <20061024115236.E53761005BB@lists.intevation.de>

Author: steffen

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

Modified Files:
	messages.po 
Log Message:
removed weird garbage at start of file

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- messages.po	19 Oct 2006 01:49:21 -0000	1.7
+++ messages.po	24 Oct 2006 11:52:34 -0000	1.8
@@ -1,10 +1,3 @@
-# translation of messages.po to 
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
 # translation of messages.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.



From cvs at kolab.org  Tue Oct 24 14:12:32 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 14:12:32 +0200 (CEST)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.1.2.2, 1.1.2.3 
Message-ID: <20061024121232.3883D1005CC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	messages.po 
Log Message:
updated french translation (issue1457, thanks jml)

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- messages.po	19 Oct 2006 01:49:56 -0000	1.1.2.2
+++ messages.po	24 Oct 2006 12:12:30 -0000	1.1.2.3
@@ -1,10 +1,3 @@
-# translation of messages.po to 
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
 # translation of messages.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
@@ -15,7 +8,7 @@
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-10-17 14:09+0200\n"
-"PO-Revision-Date: 2006-10-17 14:37+0100\n"
+"PO-Revision-Date: 2006-10-24 11:21+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"
@@ -902,9 +895,9 @@
 
 #: ../../../www/admin/addressbook/addr.php:211
 #: ../../../www/admin/addressbook/addr.php:222
-#, fuzzy, php-format
+#, php-format
 msgid "%s successfully updated"
-msgstr "crée avec succès"
+msgstr "%s créé avec succès"
 
 #: ../../../www/admin/addressbook/addr.php:215
 msgid "LDAP Error: could not read "
@@ -919,9 +912,9 @@
 msgstr "Erreur LDAP: Impossible d'ajouter un objet"
 
 #: ../../../www/admin/addressbook/addr.php:233
-#, fuzzy, php-format
+#, php-format
 msgid "%s successfully added"
-msgstr "crée avec succès"
+msgstr "%s créé avec succès"
 
 #: ../../../www/admin/addressbook/addr.php:243
 #: ../../../www/admin/addressbook/addr.php:261
@@ -1108,7 +1101,7 @@
 #: ../../../www/admin/maintainer/maintainer.php:278
 #: ../../../www/admin/user/user.php:695
 msgid " successfully created"
-msgstr "crée avec succès"
+msgstr " créé avec succès"
 
 #: ../../../www/admin/administrator/admin.php:287
 #: ../../../www/admin/administrator/admin.php:293



From cvs at kolab.org  Tue Oct 24 15:22:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 15:22:20 +0200 (CEST)
Subject: thomas: server/openldap Makefile,1.14,1.15 kolab.patch,1.9,1.10 
Message-ID: <20061024132220.2DEB31005CC@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Package is not gone, reverting changes to kolab.patch, adjusting Makefile.

The complete URL for the package is:
ftp://ftp.openpkg.org/stable/2.20061018/SRC/BASE/openldap-2.3.27-2.20061018.src.rpm
(but you have to be registered+authenticated to download it while other
BASE packages can be downloaded without authentication)
In my previous commit I didn't look at the Makefile, therefore I didn't adjust
the version and URL there.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	24 Oct 2006 11:18:31 -0000	1.14
+++ Makefile	24 Oct 2006 13:22:18 -0000	1.15
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC/BASE
+  KOLABPKGURI = ftp://ftp.openpkg.org/stable/2.20061018/SRC/BASE/
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -9,9 +9,9 @@
 endif
 
 PACKAGE=openldap
-VERSION=2.3.28
-RELEASE=20061022
-KOLABRELEASE=20061022_kolab
+VERSION=2.3.27
+RELEASE=20061018
+KOLABRELEASE=20061018_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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.patch	24 Oct 2006 11:18:31 -0000	1.9
+++ kolab.patch	24 Oct 2006 13:22:18 -0000	1.10
@@ -3,9 +3,9 @@
 @@ -33,7 +33,7 @@
  Group:        LDAP
  License:      GPL
- Version:      2.3.28
--Release:      20061022
-+Release:      20061022_kolab
+ Version:      2.3.27
+-Release:      2.20061018
++Release:      2.20061018_kolab
  
  #   package options
  %option       with_fsl      yes
@@ -13,8 +13,8 @@
  #   build information
  Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
--BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc
--PreReq:       OpenPKG, openpkg >= 20060823
+-BuildPreReq:  OpenPKG, openpkg >= 2.20061018, make, gcc
+-PreReq:       OpenPKG, openpkg >= 2.20061018
 -BuildPreReq:  readline, openssl, db >= 4.2, pth
 -PreReq:       readline, openssl, db >= 4.2, pth
 +BuildPreReq:  OpenPKG, openpkg >= 2.5.2, make, gcc



From cvs at kolab.org  Tue Oct 24 17:08:59 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 17:08:59 +0200 (CEST)
Subject: bernhard: server obmtool.conf,1.226,1.227 
Message-ID: <20061024150859.835EB1005C6@lists.intevation.de>

Author: bernhard

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

Modified Files:
	obmtool.conf 
Log Message:
bumbed clamav version number.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- obmtool.conf	20 Oct 2006 15:01:18 -0000	1.226
+++ obmtool.conf	24 Oct 2006 15:08:57 -0000	1.227
@@ -146,7 +146,7 @@
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
     @install ${loc}curl-7.15.0-2.5.1
-    @install ${altloc}clamav-0.88.2-20060524
+    @install ${altloc}clamav-0.88.5-2.20061018
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-20061011



From cvs at kolab.org  Tue Oct 24 17:29:58 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 17:29:58 +0200 (CEST)
Subject: bh: server obmtool.conf,1.227,1.228 
Message-ID: <20061024152958.C8A881005DD@lists.intevation.de>

Author: bh

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

Modified Files:
	obmtool.conf 
Log Message:
Make sure RPMs depending on openssl are recompiled


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- obmtool.conf	24 Oct 2006 15:08:57 -0000	1.227
+++ obmtool.conf	24 Oct 2006 15:29:56 -0000	1.228
@@ -86,10 +86,10 @@
     @install ${loc}perl-xml-5.8.7-2.5.0
     @install ${loc}perl-net-5.8.7-2.5.0
     @install ${loc}perl-comp-5.8.7-2.5.0
-    @install ${loc}perl-ssl-5.8.7-2.5.0
+    @trigger ${loc}perl-ssl-5.8.7-2.5.0
     @install ${loc}perl-www-5.8.7-2.5.1
     @install ${loc}perl-dns-5.8.7-2.5.0
-    @install ${altloc}imap-2004g-2.5.0_kolab --with=annotate
+    @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
@@ -97,16 +97,16 @@
     @install ${loc}bison-2.1-2.5.0
     @install ${loc}flex-2.5.31-2.5.0
     @install ${loc}groff-1.19.2-2.5.0
-    @install ${loc}sasl-2.1.21-2.5.0 --with=ldap --with=login
+    @trigger ${loc}sasl-2.1.21-2.5.0 --with=ldap --with=login
     @install ${loc}getopt-20051005-2.5.0
-    @install ${loc}proftpd-1.3.0rc2-2.5.0 --with=ldap
+    @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 ${altloc}postfix-2.2.5-2.5.0_kolab --with=ldap --with=sasl --with=ssl
+    @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
     @install ${loc}config-20051002-2.5.0
-    @install ${altloc}imapd-2.2.12-2.5.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging # Drop morelogging if you dont want/need it
+    @trigger ${altloc}imapd-2.2.12-2.5.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging # Drop morelogging if you dont want/need it
     @install ${loc}libiconv-1.10-2.5.0
     @install ${loc}autoconf-2.59-2.5.0
     @install ${loc}automake-1.9.6-2.5.0
@@ -117,7 +117,7 @@
     @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!
-    @install ${altloc}apache-1.3.33-2.5.5_kolab \
+    @trigger ${altloc}apache-1.3.33-2.5.5_kolab \
         --with=mod_auth_ldap \
         --with=mod_dav \
         --with=mod_php \
@@ -130,7 +130,7 @@
 	--with=mod_php_dom \
         --with=mod_ssl \
 	--with=mod_php_mbstring
-    @install ${altloc}php-4.4.0-2.5.2_kolab \
+    @trigger ${altloc}php-4.4.0-2.5.2_kolab \
 	--with=zlib \
 	--with=gdbm \
 	--with=gettext \
@@ -145,7 +145,7 @@
     @install ${loc}gmp-4.1.4-2.5.0
     @install ${loc}spamassassin-3.1.0-2.5.0
     @install ${plusloc}amavisd-2.3.3-2.5.0
-    @install ${loc}curl-7.15.0-2.5.1
+    @trigger ${loc}curl-7.15.0-2.5.1
     @install ${altloc}clamav-0.88.5-2.20061018
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0



From cvs at kolab.org  Tue Oct 24 17:39:13 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 17:39:13 +0200 (CEST)
Subject: bh: server obmtool.conf,1.174.2.38,1.174.2.39 
Message-ID: <20061024153913.45B251005DD@lists.intevation.de>

Author: bh

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf 
Log Message:
Updates from the kolab security advisory 11&12


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.38
retrieving revision 1.174.2.39
diff -u -d -r1.174.2.38 -r1.174.2.39
--- obmtool.conf	11 Aug 2006 16:28:51 -0000	1.174.2.38
+++ obmtool.conf	24 Oct 2006 15:39:11 -0000	1.174.2.39
@@ -75,18 +75,18 @@
     @install ${loc}perl-util-5.8.7-2.4.0
     @install ${loc}perl-parse-5.8.7-2.4.0
     @install ${loc}perl-sys-5.8.7-2.4.0
-    @install ${loc}openssl-0.9.7g-2.4.2
+    @install ${loc}openssl-0.9.7l-20061002_kolab
     @install ${loc}perl-mail-5.8.7-2.4.0
-    @install ${loc}perl-crypto-5.8.7-2.4.0
+    @trigger ${loc}perl-crypto-5.8.7-2.4.0
     @install ${loc}perl-xml-5.8.7-2.4.0
     @install ${loc}perl-net-5.8.7-2.4.0
     @install ${loc}perl-comp-5.8.7-2.4.0
     @trigger ${loc}perl-ssl-5.8.7-2.4.0
     @install ${loc}perl-www-5.8.7-2.4.0
-    @install ${altloc}imap-2004d-2.4.0_kolab --with=annotate
+    @trigger ${altloc}imap-2004d-2.4.0_kolab --with=annotate
     @trigger ${loc}procmail-3.22-2.4.0
     @install ${loc}db-4.2.52.2-2.2.0
-    @install ${altloc}openldap-2.2.27-2.4.1_kolab 
+    @trigger ${altloc}openldap-2.2.27-2.4.1_kolab 
     @install ${loc}m4-1.4.3-2.4.0
     @install ${loc}bison-2.0-2.4.0
     @install ${loc}flex-2.5.31-2.4.0
@@ -99,7 +99,7 @@
     @trigger ${altloc}postfix-2.2.3-2.4.1_kolab --with=ldap --with=sasl --with=ssl
     @install ${loc}perl-ldap-5.8.7-2.4.0
     @install ${loc}perl-db-5.8.7-2.4.0
-    @install ${altloc}imapd-2.2.12-2.4.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging
+    @trigger ${altloc}imapd-2.2.12-2.4.0_kolab3 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging
     @install ${loc}libiconv-1.9.2-2.4.0
     @install ${loc}autoconf-2.59-2.4.0
     @install ${loc}automake-1.9.5-2.4.0
@@ -110,7 +110,7 @@
     @install ${loc}sed-4.1.4-2.4.0
     @install ${loc}libxml-2.6.19-2.4.0
     @install ${loc}libxslt-1.1.14-2.4.0 # WARNING: Remove libgcrypt before building!
-    @install ${altloc}apache-1.3.33-2.4.5_kolab2 \
+    @trigger ${altloc}apache-1.3.33-2.4.5_kolab2 \
         --with=mod_auth_ldap \
         --with=mod_dav \
         --with=mod_php \
@@ -123,7 +123,7 @@
 	--with=mod_php_dom \
         --with=mod_ssl \
 	--with=mod_php_mbstring
-    @install ${altloc}php-4.3.11-2.4.2_kolab \
+    @trigger ${altloc}php-4.3.11-2.4.2_kolab \
 	--with=zlib \
 	--with=gdbm \
 	--with=gettext \
@@ -138,14 +138,14 @@
     @install ${plusloc}gmp-4.1.4-2.4.0
     @trigger ${loc}spamassassin-3.0.3-2.4.1
     @install ${plusloc}amavisd-2.3.1-2.4.0
-    @install ${loc}curl-7.14.0-2.4.0
+    @trigger ${loc}curl-7.14.0-2.4.0
     @install ${altloc}clamav-0.88.4-20060809
     @install ${loc}vim-6.3.78-2.4.0
     @install ${plusloc}dcron-2.9-2.4.0
     @install ${altloc}perl-kolab-5.8.7-2.0_20060430
     @install ${altloc}kolabd-1.9.4-20060707 --define kolab_version=$kolab_version
     @install ${altloc}kolab-webadmin-0.4.0-20060810 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-0.3.9-20060811 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-0.3.9-20060914 --define kolab_version=$kolab_version
     @check
 
     if test ! -e "/usr/bin/kolab" ; then



From cvs at kolab.org  Tue Oct 24 18:48:35 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 24 Oct 2006 18:48:35 +0200 (CEST)
Subject: thomas: doc/www/src index.html.m4,1.95,1.96 
Message-ID: <20061024164835.504C31005D4@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Kolab-based UGS at Systems 2006 in Munich, Germany


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- index.html.m4	19 Oct 2006 15:29:53 -0000	1.95
+++ index.html.m4	24 Oct 2006 16:48:33 -0000	1.96
@@ -46,6 +46,20 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">October 23th - 27th, 2006</td>
+<td class="newsh">&raquo;
+	Kolab-based UGS at Systems 2006 in Munich, Germany
+</td></tr>
+</table>
+<div class="newsb">
+	<a href="http://www.univention.de/">Univention</a>,
+	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)



From cvs at kolab.org  Wed Oct 25 04:28:59 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Oct 2006 04:28:59 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	resmgr.php.in, 1.9, 1.10 
Message-ID: <20061025022859.AA9251006A6@lists.intevation.de>

Author: steffen

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

Modified Files:
	resmgr.php.in 
Log Message:
freebusy imap caching from Martin

Index: resmgr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- resmgr.php.in	25 Aug 2006 16:51:23 -0000	1.9
+++ resmgr.php.in	25 Oct 2006 02:28:57 -0000	1.10
@@ -1234,7 +1234,7 @@
 	    " and ends on <$fbend>" .iCalDate2Kolab($vfbend), RM_LOG_DEBUG);
 	
       $outofperiod=0;
-      if ($dtstart > convert2epoch ($vfbend)) {
+      if ($vfbstart && $dtstart > convert2epoch ($vfbend)) {
 		$outofperiod=1;
       } else {
 	      // Check whether we are busy or not



From cvs at kolab.org  Wed Oct 25 04:28:59 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Oct 2006 04:28:59 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers
	Makefile.am, 1.8, 1.9 
Message-ID: <20061025022859.A81F91005D4@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile.am 
Log Message:
freebusy imap caching from Martin

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	28 Mar 2006 18:53:41 -0000	1.8
+++ Makefile.am	25 Oct 2006 02:28:57 -0000	1.9
@@ -18,7 +18,9 @@
 freebusy_FILES = freebusy/misc.php \
 	freebusy/freebusycollector.class.php \
 	freebusy/freebusyldap.class.php \
-	freebusy/recurrence.class.php
+	freebusy/recurrence.class.php \
+	freebusy/freebusyimapcache.class.php \
+	freebusy/freebusyldap_dummy.class.php
 
 freebusydir = $(phplibdir2)/$(kolab_php_module_prefix)freebusy
 freebusy_DATA = $(freebusy_FILES) \



From cvs at kolab.org  Wed Oct 25 04:28:59 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Oct 2006 04:28:59 +0200 (CEST)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusyimapcache.class.php, NONE,
	1.1 freebusyldap_dummy.class.php, NONE,
	1.1 freebusy.class.php.in, 1.5, 1.6 freebusy.conf, 1.2,
	1.3 freebusy.php.in, 1.3, 1.4 freebusycache.class.php.in, 1.5,
	1.6 misc.php, 1.6, 1.7 pfb.php.in, 1.5, 1.6 
Message-ID: <20061025022859.A94CC1006A5@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.class.php.in freebusy.conf freebusy.php.in 
	freebusycache.class.php.in misc.php pfb.php.in 
Added Files:
	freebusyimapcache.class.php freebusyldap_dummy.class.php 
Log Message:
freebusy imap caching from Martin

--- NEW FILE: freebusyimapcache.class.php ---
<?php
/*
 *  Copyright (c) 2005 Intra2net AG
 *  Copyright (c) 2006 erfrakon Partnerschaftsgesellschaft
 *
 *    Written by Thomas Jarosch <thomas.jarosch at intra2net.com>
 *    Written by Martin Konold <martin.konold at erfrakon.de>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */

 /* Class to efficently cache kolab events stored on an IMAP server */

class FreeBusyIMAPCache {
  var $version;       // internal version of format
  var $store_prefix;  // prefix to prepend to all file operations
  var $owner;         // folder owner
  var $foldername;    // folder name
  var $cache_modified;      // indicates if we have to writeout the cache
  var $cache;         // cache data

  function FreeBusyIMAPCache($store_prefix, &$owner, &$foldername) {
    $this->store_prefix = $store_prefix;
    $this->owner = $owner;
    $this->foldername = $foldername;
    $this->version = 1;
    $this->reset_cache();
  }
  
  function reset_cache() {
    $this->cache = array();
    $this->cache["version"] = $this->version;
    $this->cache["uidvalidity"] = -1;
    $this->cache["uidnext"] = -1;
    $this->cache["incidences-for"] = "";
    $this->cache["imap2fb"] = array();
    $this->cache_modified = true;
  }

  function check_folder_changed($uidvalidity, $uidnext, $incidences_for, &$new_uids) {
    $changed = false;
    // uidvalidity changed?
    if ($uidvalidity != $this->cache["uidvalidity"]) {
      myLog("uidvalidity changed (old: ".$this->cache["uidvalidity"].", new: $uidvalidity), clearing cache", RM_LOG_DEBUG);
      $this->reset_cache();
      $changed = true;
    }

    // uidnext changed?
    if ($uidnext != $this->cache["uidnext"]) {
      myLog("uidnext on folder changed (old: ".$this->cache["uidnext"].", new: ".$uidnext.")", RM_LOG_DEBUG);
      $changed = true;
    }

    // incidences-for changed?
    if ($incidences_for != $this->cache["incidences-for"]) {
      myLog("incidences-for changed (old: ".$this->cache["incidences-for"].", new: $incidences_for), clearing cache", RM_LOG_DEBUG);
      $this->reset_cache();
      $changed = true;
    }

    $this->cache["uidvalidity"] = $uidvalidity;
    $this->cache["uidnext"] = $uidnext;
    $this->cache["incidences-for"] = $incidences_for;

    // deleted a message?
    $old_uids = array_keys($this->cache["imap2fb"]);
    while(list($key, $old_uid) = each($old_uids)) {
      if (!in_array($old_uid, $new_uids)) {
        unset($this->cache["imap2fb"][$old_uid]);
        $this->cache_modified = true;
        $changed = true;
      }
    }

    if (!$changed)
      myLog("check_changed: folder didn't change", RM_LOG_DEBUG);
      return $changed;
    }

    function check_uid_exists($uid) {
      return array_key_exists($uid, $this->cache["imap2fb"]);
    }

    function add_empty_imap2fb(&$imap_uid) {
      $this->cache["imap2fb"][$imap_uid] = array();
      $this->cache_modified = true;
    }

    function add_imap2fb(&$imap_uid, $fb_start, $fb_end, $fb_duration, $fb_extra) {
      /*
           Internal imap2fb array structure:
           0..n IMAP uid
           |----------- 0..n free/busy periods
                        |----------- start
                        |----------- end
                        |----------- duration
                        |----------- extra
      */
      myLog("added event to store: uid: $imap_uid, start: $fb_start, end: $fb_end, duration: $fb_duration", RM_LOG_DEBUG);

      $store = array();
      $store["start"] = $fb_start;
      $store["end"] = $fb_end;
      $store["duration"] = $fb_duration;
      $store["extra"] = $fb_extra;

      $this->cache["imap2fb"][$imap_uid][] = $store;
      $this->cache_modified = true;
    }

    function output_fb(&$vFb) {
      reset($this->cache["imap2fb"]);
      while(list($uid, $periods) = each($this->cache["imap2fb"]))
         while(list($key, $period) = each($periods))
            $vFb->addBusyPeriod('BUSY', $period["start"], $period["end"], $period["duration"], $period["extra"]);
    }


    function compute_filename() {
      $folder_parts = explode('/', $this->foldername);
      unset($folder_parts[0]);
      $folder_storename = join('/', $folder_parts);

      $folder_storename = str_replace(".", "^", $folder_storename);
      $folder_storename = str_replace("\0", "", $folder_storename);

       $full_path = $this->store_prefix.$folder_storename.".imapcache";
       return $full_path;
    }

    function cache_load() {
      $filename = $this->compute_filename();

      myLog("Trying to load file: $filename", RM_LOG_DEBUG);

      if (!is_readable($filename))
        return false;

      $this->cache = unserialize(file_get_contents($filename));

      // Delete disc cache if it's from an old version
      if ($this->cache["version"] != $this->version) {
        myLog("Version mismatch (got: ".$this->cache["version"].", current: ".$this->version.", dropping cache", RM_LOG_WARN);
        $this->reset_cache();
      } 
      else $this->cache_modified = false;
      return true;
    }

    function cache_store($force=false) {
      if ($this->cache_modified || $force) {
        $filename = $this->compute_filename();
        myLog("Trying to save cache to file: $filename", RM_LOG_DEBUG);

        if (!$this->mkdirhier(dirname($filename))) {
          myLog("can't create director hierachy: ".dirname($filename), RM_LOG_ERROR);
          return;
        }

        $tmpname = tempnam(dirname($this->store_prefix), 'imapcache');
        $fp = fopen($tmpname, 'w');
        if(!$fp) return false;
          if (fwrite($fp, serialize($this->cache)) === false) {
            fclose ($fp);
            myLog("can't write to file: $tmpname. Out of discspace?", RM_LOG_ERROR);
            return;
          }

        if(!rename($tmpname, $filename)) {
           myLog("can't rename $tmpname to $filename", RM_LOG_ERROR);
           return false;
        }
        fclose($fp);
        $this->cache_modified = false;
      } 
      else {
        myLog("IMAPcache unmodified, not saving", RM_LOG_DEBUG);
      }	
    }

   function cache_delete() {
     unlink($this->compute_filename());
     $this->reset_cache();
   }

   function mkdirhier( $dirname ) {
     $base = substr($dirname,0,strrpos($dirname,'/'));
     $base = str_replace(".", "^", $base);
     if( !empty( $base ) && !is_dir( $base ) ) {
       if( !$this->mkdirhier( $base ) ) return false;
     }
     if( !file_exists( $dirname ) ) return mkdir( $dirname, 0755 );
     return true;
    }
};

?>


--- NEW FILE: freebusyldap_dummy.class.php ---
<?php
/*
 *  Copyright (c) 2005 Intra2net AG
 *  Copyright (c) 2006 erfrakon Partnerschaftsgesellschaft
 *
 *    Written by Thomas Jarosch <thomas.jarosch at intra2net.com>
 *    Written by Martin Konold <martin.konold at erfrakon.de>
 *
 *  This  program is free  software; you can redistribute  it and/or
 *  modify it  under the terms of the GNU  General Public License as
 *  published by the  Free Software Foundation; either version 2, or
 *  (at your option) any later version.
 *
 *  This program is  distributed in the hope that it will be useful,
 *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 *  General Public License for more details.
 *
 *  You can view the  GNU General Public License, online, at the GNU
 *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 */

class FreeBusyLDAP {
  function FreeBusyLDAP( $uri, $base ) {
    return true;
  }

  function error() {
    return "LDAP::error not implemented";
  }

  function close() {
    return true;
  }

  function bind( $dn = false , $pw = '' ) {
    return true;
  }

  function freeBusyPast() {
    return 0;  // Default
  }

  // Return a hash of info about a user
  function userInfo( $uid ) {
    $rtn = array();

    $rtn["MAIL"] = $uid;
    $rtn["HOMESERVER"] = "";
    $rtn["FBFUTURE"] = 60;

    return $rtn;
  }

  function mailForUid( $uid ) {
    return $uid;
  }

  function homeServer( $uid ) {
    return "localhost";
  }

  function dn( $uid ) {
    return "";
  }

  function distlists( $dn ) {
    return array();
  }
};

?>


Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freebusy.class.php.in	30 Apr 2006 02:35:47 -0000	1.5
+++ freebusy.class.php.in	25 Oct 2006 02:28:57 -0000	1.6
@@ -1,8 +1,11 @@
 <?php
 /*
- *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *  Copyright (c) 2004-12006 Klaraelvdalens Datakonsult AB, Intra2net AG,
+ *                            erfrakon Partnerschaftsgesellschaft
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *               Thomas Jarosch <thomas.jarosch at intra2net.com>
+ *               Martin Konold <martin.konold at erfrakon.de>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -18,75 +21,104 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
+ /*
+    TODO: Looks like we don't get called for deleted folders.
+         Best thing would be to have a cron script which deletes
+         unmodified pfbs/caches after 2 months.
+ */
+
+
+require_once '@kolab_php_module_prefix at freebusy/freebusycache.class.php';
+require_once '@kolab_php_module_prefix at freebusy/freebusyimapcache.class.php';
 require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php';
 
 class FreeBusyRecurrence extends Recurrence {
-  function FreeBusyRecurrence( &$vfb, &$extra ) {
+  function FreeBusyRecurrence( &$imapcache, &$imapuid, &$vfb, &$extra ) {
+    $this->imapcache =& $imapcache;
+    $this->imapuid =& $imapuid;
     $this->vfb =& $vfb;
     $this->extra =& $extra;
   }
 
   function setBusy( $start, $end, $duration ) {
-    $this->vfb->addBusyPeriod('BUSY', $start, null, $duration, $this->extra);
+    $this->imapcache->add_imap2fb($this->imapuid, $start, null, $duration, $this->extra);
   }
 
+  var $imapcache;
   var $vfb;
   var $extra;
 };
 
 class FreeBusy {
-  function FreeBusy( $username, 
+  function FreeBusy( $cache_dir,
+                     $username,
 		     $password, 
 		     $imaphost,
+		     $imapoptions,
 		     $fbfuture=60,
 		     $fbpast=0 ) {
+    $this->cache_dir = $cache_dir;
     $this->username = $username;
     $this->password = $password;
     $this->imaphost = $imaphost;
+    $this->imapoptions = $imapoptions;
     $this->fbfuture = $fbfuture;
     $this->fbpast   = $fbpast;
+    $this->relevance = null;
   }
 
   function imapConnect() {
-    require_once('Net/IMAP.php');
-    $this->imap = &new Net_IMAP( $this->imaphost, $this->imapport );
-    #$this->imap->setDebug(true);
+    $this->imap_serverstring = "{".$this->imaphost.":".$this->imapport.$this->imapoptions."}";
+    $this->imap = imap_open( $this->imap_serverstring, $this->username, $this->password );
+
     return $this->imap;
   }
 
   function imapDisconnect() {
-    return $this->imap->disconnect();
-  }
-
-  function imapLogin() {
-    return $this->imap->login($this->username,$this->password, true, false);
+    return imap_close($this->imap);
   }
 
   function imapOpenMailbox($foldername = 'INBOX') {
     $this->foldername = $foldername;
-    $rc = $this->imap->selectMailbox( $foldername );
-    $a  = $this->imap->getAnnotation( '/vendor/kolab/folder-type', '*' );
-    //myLog( "$folder has annotation: ".print_r($a,true), RM_LOG_DEBUG);
+
+    $rc = imap_reopen($this->imap, $this->imap_serverstring . $this->foldername);
+    // PHP only returns false for imap_reopen() if we use an HALF_OPEN connection. doh!
+    if (imap_last_error() !== false)
+       $rc = false;
+
+    // $a = $this->imap->getAnnotation( '/vendor/kolab/folder-type', '*' );
+    // myLog( "$folder has annotation: ".print_r($a,true), RM_LOG_DEBUG);
+    
     return $rc;
   }
 
   function getACL() {
-    return $this->imap->getACL();
+    $imap_acls = imap_getacl($this->imap, $this->foldername);
+
+    $rtn = array();
+    while (list($user, $rights) = each($imap_acls))
+        $rtn[] = array("USER" => $user, "RIGHTS" => $rights);
+
+    return $rtn;
   }
 
   function getRelevance() {
-    $val = $this->imap->getAnnotation( '/vendor/kolab/incidences-for', 'value.shared' );
-    if( PEAR::isError($val) || empty($val) ) {
+    // cached?
+    if (isset($this->relevance))
+        return $this->relevance;
+
+    $val = imap_getannotation( $this->imap, $this->foldername, '/vendor/kolab/incidences-for', 'value.shared' );
+    if( $val === false || empty($val) ) {
       myLog("No /vendor/kolab/incidences-for found for ".$this->foldername, RM_LOG_DEBUG);
-      return 'admins';
+      $this->relevance = "admins";
     } else {
       myLog("/vendor/kolab/incidences-for = ".print_r($val,true)." for ".$this->foldername, RM_LOG_DEBUG);
-      return $val;
     }
+    
+    return $this->relevance;
   }
 
   function &generateFreeBusy($startstamp = NULL, $endstamp = NULL ) {
-  
     require_once 'PEAR.php';
     require_once 'Horde/iCalendar.php';
     require_once 'Horde/MIME.php';
@@ -102,7 +134,8 @@
       $startstamp = strtotime( '-'.$this->fbpast.' days', mktime(0, 0, 0, $month, $day, $year) );
     }
   
-    // Default the end date to the start date + freebusy_days.
+    // Default the end date to the start date + fbfuture.
+
     if (is_null($endstamp) || $endstamp < $startstamp) {
       $endstamp = strtotime( '+'.$this->fbfuture.' days', $startstamp );
     }
@@ -124,7 +157,9 @@
     // URL is not required, so out it goes...
     //$vFb->setAttribute('URL', 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
   
-    if( $this->imap->getNumberOfMessages() == 0 ) {
+    $status = imap_status_current($this->imap, SA_MESSAGES | SA_UIDVALIDITY | SA_UIDNEXT);
+
+    if( $status->messages == 0 ) {
       $vFb->setAttribute('DTSTART', 0, array(), false );
       $vFb->setAttribute('DTEND', 0, array(), false );
       $vFb->setAttribute('COMMENT', 'This is a dummy vfreebusy that indicates an empty calendar');
@@ -138,15 +173,53 @@
       $retval = array($vCal->exportvCalendar(),$vCal->exportvCalendar());
       return $retval;
     }
-	myLog("Reading messagelist", RM_LOG_DEBUG);
-	$getMessages_start = microtime_float();
-	$msglist = $this->imap->getMessagesList();
-	//$msglist = &$this->imap->getMessages();
-	myLog("FreeBusy::imap->getMessagesList() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG);
-    if( PEAR::isError( $msglist ) ) return array( $msglist, null);
-	foreach ($msglist as $msginfo) {
-	  //myLog("Reading message ".$msginfo['msg_id'], RM_LOG_DEBUG);
-	  $textmsg = $this->imap->getMsg($msginfo['msg_id']);
+    myLog("Reading messagelist", RM_LOG_DEBUG);
+    $getMessages_start = microtime_float();
+//    $msglist = $this->imap->getMessagesList();
+    //$msglist = &$this->imap->getMessages();
+    myLog("FreeBusy::imap->getMessagesList() took ".(microtime_float()-$getMessages_start)." secs.", RM_LOG_DEBUG);
+//   if( PEAR::isError( $msglist ) ) return array( $msglist, null);
+//	foreach ($msglist as $msginfo) {
+
+    // This only happens in php standalone mode and is needed
+    // to make the debug log quiet
+    if (!isset($_SERVER["SERVER_NAME"]))
+        $_SERVER["SERVER_NAME"] = "localhost";
+
+    $imapcache = new FreeBusyIMAPCache($this->cache_dir."/", $this->username, $this->foldername);
+    $imapcache->cache_load();
+
+    $uids = imap_search($this->imap, "UNDELETED", SE_UID);
+
+    if ($imapcache->check_folder_changed($status->uidvalidity, $status->uidnext, $this->getRelevance(), $uids)) {
+        reset ($uids);
+        while(list($key, $uid) = each($uids))
+            if (!$imapcache->check_uid_exists($uid))
+                $this->process_imap_message($imapcache, $uid, $startstamp, $endstamp);
+    }
+
+    // store cache and output free busy list
+    $imapcache->cache_store();
+    $imapcache->output_fb($vFb);
+
+    $xvCal = $vCal;
+    $xvCal->addComponent($vFb);
+    $vCal->addComponent($this->clearExtra($vFb));
+
+    // Generate the vCal file.
+    $result = array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() );
+    return $result;
+  }
+
+  /********************** Private API below this line ********************/
+
+  function process_imap_message(&$imapcache, &$imapuid, &$startstamp, &$endstamp)
+  {
+      myLog("Processing new message $imapuid", RM_LOG_DEBUG);
+      $imapcache->add_empty_imap2fb($imapuid);
+
+      $textmsg = imap_fetchheader($this->imap, $imapuid, FT_UID).imap_body($this->imap, $imapuid, FT_UID);
+
       $mimemsg = &MIME_Structure::parseTextMIMEMessage($textmsg);
     
       // Read in a Kolab event object, if one exists
@@ -166,21 +239,14 @@
     
       if ($event === false) {
 	myLog("No x-vnd.kolab.events at all ", RM_LOG_DEBUG);
-	continue;
+	return;
       }
       
       $uid = $event['uid'];
-      /*
-      // See if we need to ignore this event
-      if (isset($params['ignore'][$uid])) {
-	trigger_error("Ignoring event with uid=$uid", E_USER_NOTICE);
-	continue;
-      }
-      */
 
       if( array_key_exists( 'show-time-as', $event ) && 
 	  strtolower(trim($event['show-time-as'])) == 'free' ) {
-	continue;
+	return;
       }
     
       $summary = ($event['sensitivity'] == 'public' ? $event['summary'] : '');
@@ -205,7 +271,7 @@
       if( array_key_exists( 'recurrence', $event ) ) {	
 	myLog("Detected recurring event $uid", RM_LOG_DEBUG);
 	$rec = $event['recurrence'];
-	$recurrence =& new FreeBusyRecurrence( $vFb, $extra );
+	$recurrence =& new FreeBusyRecurrence( $imapcache, $imapuid, $vFb, $extra );
 	$recurrence->setStartDate( $initial_start );
 	$recurrence->setEndDate( $initial_end );
 	$recurrence->setCycletype( $rec['cycle'] );
@@ -231,25 +297,15 @@
     
 	// Don't bother adding the initial event if it's outside our free/busy window
 	if ($initial_start < $startstamp || $initial_end > $endstamp) {
-	  continue;
+	  return;
 	}
-		
-	$vFb->addBusyPeriod('BUSY', $initial_start/* + FreeBusy::tzOffset($initial_start)*/, 
-			    $initial_end/* + FreeBusy::tzOffset($initial_end)*/, null, $extra);
+
+        // $initial_start/* + FreeBusy::tzOffset($initial_start)
+        $imapcache->add_imap2fb($imapuid, $initial_start, $initial_end, null, $extra);
+
       }
-    }
-  
-    $xvCal = $vCal;
-    $xvCal->addComponent($vFb);
-    $vCal->addComponent($this->clearExtra($vFb));
-  
-    // Generate the vCal file.
-    $result = array( $vCal->exportvCalendar(), $xvCal->exportvCalendar() );
-    return $result;
   }
 
-  /********************** Private API below this line ********************/
-
   function tzOffset( $ts ) {
     $dstr = date('O',$ts);
     return 3600 * substr( $dstr, 0, 3) + 60 * substr( $dstr, 3, 2);
@@ -408,12 +464,15 @@
     $vFb->_extraParams = array();
     return $vFb;
   }
- 
+
+  var $cache_dir;
   var $username;
   var $password;
   var $imaphost;
   var $imapport = 143;
+  var $imapoptions;
   var $foldername;
+  var $relevance;
 
   // Settings
   var $fbfuture;
@@ -422,6 +481,8 @@
   var $week_starts_on_sunday = false;
 
   var $imap;
+  var $imap_serverstring;  
 };
 
 ?>
+

Index: freebusy.conf
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusy.conf	3 Feb 2006 07:05:11 -0000	1.2
+++ freebusy.conf	25 Oct 2006 02:28:57 -0000	1.3
@@ -65,3 +65,21 @@
 
 // What db type to use for freebusy caches 
 $params['dbtype'] = 'gdbm';
+
+// Logging
+$params['log'] = "syslog:";
+$params['log_level'] = 2;
+
+// IMAP options passed to imap_open
+$params['imap_options'] = "/notls/secure/readonly";
+
+// Directory prefixes
+$params['kolab_prefix'] = "";
+$params['cache_dir'] = "/datastore/freebusy";          // default: /var/kolab/www/freebusy/cache
+
+$params['pfb_dbformat'] = "";          // default: gdbm
+
+// don't change this if you don't have to
++$params['ldap_uri'] = "";
++$params['ldap_classname_suffix'] = "_dummy";
+

Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freebusy.php.in	5 Feb 2006 20:15:10 -0000	1.3
+++ freebusy.php.in	25 Oct 2006 02:28:57 -0000	1.4
@@ -1,8 +1,12 @@
 <?php
 /*
  *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+    Copyright (c) 2006 Intra2net AG, erfrakon Partnerschaftsgesellschaft
+ *                    
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *               Thomas Jarosch <thomas.jarosch at intra2net.com>
+ *               Martin Konold <martin.konold at erfrakon.de>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -18,12 +22,12 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
+require_once('@resmgr_confdir@/freebusy.conf');
 require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');
 require_once('@kolab_php_module_prefix at freebusy/freebusycollector.class.php');
-require_once('@kolab_php_module_prefix at freebusy/freebusyldap.class.php');
-require_once('@kolab_php_module_prefix at freebusy/misc.php');
+require_once('@kolab_php_module_prefix at freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php');
 
-require_once('@resmgr_confdir@/freebusy.conf');
+require_once('@kolab_php_module_prefix at freebusy/misc.php');
 
 logInit( 'freebusy' );
 
@@ -68,7 +72,8 @@
 }
 
 $user = strtolower($user);
-$cache =& new FreeBusyCache( '@freebusy_cachedir@', $req_extended );
+$cache =& new FreeBusyCache( '@freebusy_cachedir@', $params['pfb_dbformat'], $req_extended );
+
 $collector =& new FreeBusyCollector( $user );
 
 $groups = $ldap->distlists( $ldap->dn( $user ) );
@@ -128,3 +133,4 @@
 
 echo $vfb;
 ?>
+

Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freebusycache.class.php.in	9 Apr 2006 18:28:35 -0000	1.5
+++ freebusycache.class.php.in	25 Oct 2006 02:28:57 -0000	1.6
@@ -1,8 +1,12 @@
 <?php
 /*
  *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *  Copyright (c) 2005 Intra2net AG
+ *  Copyright (c) 2006 erfrakon Partnerschaftsgesellschaft
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *    Written by Thomas Jarosch <thomas.jarosch at intra2net.com>
+ *    Written by Martin Konold <martin.konold at erfrakon.de>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -25,8 +29,9 @@
 require_once('@resmgr_confdir@/freebusy.conf');
 
 class FreeBusyCache {
-  function FreeBusyCache( $basedir, $extended = false ) {
+  function FreeBusyCache( $basedir, $dbformat, $extended = false ) {
     $this->basedir = $basedir;
+    $this->dbformat = $dbformat;
     $this->extended = $extended;
 	 /* make sure that a database really exists before accessing it */
     if( !file_exists( $this->basedir.'/pfbcache.db' ) ) {
@@ -37,10 +42,6 @@
 
   function store( $filename, $fbdata, $acl, $relevance ) {
     global $params;
-    if( ereg( '\.\.', $filename ) ) {
-      $this->error = $filename._(' is not absolute');
-      return false;
-    }
 
     $fbfilename = $this->mkfbfilename($filename);
     myLog("FreeBusyCache::store( file=$fbfilename, acl=[ "
@@ -150,6 +151,7 @@
 	    ."] )", RM_LOG_DEBUG);
       return file_get_contents($fbfilename);
     }
+    myLog("FreeBusyCache: file $fbfilename does not exist", RM_LOG_ERROR);
     return false;
   }
 
@@ -203,8 +205,10 @@
   }
 
   /*************** Private API below this line *************/
+  // a copy of this function exists in freebusyimapcache.class.php
   function mkdirhier( $dirname ) {
     $base = substr($dirname,0,strrpos($dirname,'/'));
+    $base = str_replace(".", "^", $base);
     if( !empty( $base ) && !is_dir( $base ) ) {
       if( !$this->mkdirhier( $base ) ) return false;
     }
@@ -213,13 +217,14 @@
   }
 
   function mkfbfilename( $fbfilename ) {
-    $fbfilename = str_replace( '..', '', $fbfilename );
+    $fbfilename = str_replace( '.', '^', $fbfilename );
+
     $fbfilename = str_replace( "\0", '', $fbfilename );    
     return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb');
   }
 
   function mkaclfilename( $fbfilename ) {
-    $fbfilename = str_replace( '..', '', $fbfilename );
+    $fbfilename = str_replace( '.', '^', $fbfilename );
     $fbfilename = str_replace( "\0", '', $fbfilename );    
     return $this->basedir.'/'.$fbfilename.($this->extended?'.xpfb':'.pfb').'.acl';
   }
@@ -339,7 +344,9 @@
   }
 
   var $basedir;
+  var $dbformat;  
   var $error;
 };
 
 ?>
+

Index: misc.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/misc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- misc.php	16 Jan 2005 08:17:49 -0000	1.6
+++ misc.php	25 Oct 2006 02:28:57 -0000	1.7
@@ -256,4 +256,4 @@
   return assembleUri($parsed);
 }
 
-?>
\ No newline at end of file
+?>

Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pfb.php.in	23 Oct 2006 21:37:50 -0000	1.5
+++ pfb.php.in	25 Oct 2006 02:28:57 -0000	1.6
@@ -1,8 +1,12 @@
 <?php
 /*
  *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *  Copyright (c) 2005 Intra2net AG
+ *  Copyright (c) 2006 erfrakon Partnerschaftsgesellschaft
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *               Thomas Jarosch <thomas.jarosch at intra2net.com> 
+ *               Martin Konold <martin.konold at erfrakon.de>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -30,11 +34,11 @@
 $max_execution_time = ini_get('max_execution_time');
 if( $max_execution_time < 200 ) ini_set('max_execution_time', '200');
 
-require_once('@kolab_php_module_prefix at freebusy/freebusyldap.class.php');
-require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');
 require_once('@kolab_php_module_prefix at freebusy/misc.php');
-
 require_once('@resmgr_confdir@/freebusy.conf');
+require_once('@kolab_php_module_prefix at freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php');
+
+require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');
 
 logInit('pfb');
 
@@ -43,6 +47,18 @@
 $req_cache    = isset($_REQUEST['cache'])?(bool)$_REQUEST['cache']:false;
 $req_folder   = isset($_REQUEST['folder'])?$_REQUEST['folder']:false;
 $req_extended = isset($_REQUEST['extended'])?(bool)$_REQUEST['extended']:false;
+// convert character encoding (stores utf7 folder names also on disc)
+require_once "Horde/Util.php";
+require_once "Horde/String.php";
+$req_folder = String::convertCharset($req_folder, "UTF-8", "UTF7-IMAP");
+/*
+// Debug test values
+$imapuser = "groupware";
+$imappw = "groupware";
+$req_cache = 0;
+$req_folder = "groupware/Kalender";
+$req_extended = 0;
+*/
 
 myLog("pfb.php starting up: user=$imapuser, folder=$req_folder, extended=$req_extended", 
       RM_LOG_DEBUG);
@@ -59,7 +75,8 @@
   //$homeserver = $userinfo['HOMESERVER'];  
 }
 
-$folder = array_values(array_filter(explode('/', $req_folder )));
+$folder = explode('/', $req_folder);
+
 if( count($folder) < 1 ) {
   // error
   notFound( _('No such folder ').htmlentities($req_folder) );
@@ -101,10 +118,11 @@
   exit;
 }
 
-$cache =& new FreeBusyCache( '@freebusy_cachedir@',
-			     false );
-$xcache =& new FreeBusyCache( '@freebusy_cachedir@',
-			     true );
+$full_cache_dir = $params['kolab_prefix'] . $params['cache_dir'];
+
+$cache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], false );
+$xcache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], true );
+
 
 if( $req_cache ) {
   $acl = false;
@@ -143,35 +161,18 @@
   unset($folder[0]);
   $folder = join('/', $folder);
   $fbpast = $ldap->freeBusyPast();
-  $fb =& new FreeBusy( $imapuser, $imappw, 'localhost', $uinfo['FBFUTURE'], $fbpast );
-  $fb->freebusy_days = $params['freebusy_days'];
+  $fb =& new FreeBusy( $full_cache_dir, $imapuser, $imappw, 'localhost', $params['imap_options'], $uinfo['FBFUTURE'], $fbpast );
+
   $fb->default_domain = $params['email_domain'];
   $rc = $fb->imapConnect();
-  if( PEAR::isError( $rc ) ) {
-    unauthorized($rc->toString());
-    return false;
-  }
-  $rc = $fb->imapLogin();
-  if( PEAR::isError( $rc ) ) {
-    unauthorized("Access denied for user $imapuser: ".$rc->toString());
+  if( $rc === false ) {
+    unauthorized(imap_last_error());
     return false;
   }
   $rc = $fb->imapOpenMailbox(FreeBusy::imapFolderName( $imapuser, $owner, 
 						       $folder, $params['email_domain']));
-  if( PEAR::isError( $rc ) ) {
-    // folder doesn't exist (anymore)
-    $cache->store( $owner.'/'.$folder, false, array(), "delete folder");
-    $xcache->store( $owner.'/'.$folder, false, array(), "delete folder");
-    
-    // clear IMAP cache
-    $imapcache = new FreeBusyIMAPCache($full_cache_dir."/", $owner, $fb->foldername);
-    $imapcache->cache_delete();
-    
-    // try to unlink (parent) directory, works only if empty
-    $parent_folder = $full_cache_dir."/".str_replace(".", "^", $owner."/".$folder);
-    @rmdir($parent_folder);
-
-    notfound( "Folder: ".$fb->foldername.', '.$rc->toString());
+  if( $rc === false ) {
+    notfound( "Folder: ".$fb->foldername.', '.imap_last_error());
     return false;
   }
   $relevance = $fb->getRelevance();



From cvs at kolab.org  Wed Oct 25 04:29:53 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 25 Oct 2006 04:29:53 +0200 (CEST)
Subject: steffen: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.2,
	1.3 
Message-ID: <20061025022953.1B4A21005D4@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
freebusy imap caching from Martin

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusy.conf.template.in	3 Apr 2006 18:18:39 -0000	1.2
+++ freebusy.conf.template.in	25 Oct 2006 02:29:51 -0000	1.3
@@ -87,3 +87,15 @@
 // What level of output should we log? Higher levels give more verbose output.
 // One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
 $params['log_level'] = RM_LOG_DEBUG;
+
+// IMAP options passed to imap_open
+//$params['imap_options'] = "/notls/secure/readonly";
+$params['imap_options'] = "/notls/readonly";
+
+$params['pfb_dbformat'] = "";          // default: gdbm
+
+// Location of the cache files
+$params['cache_dir'] = '/var/kolab/www/freebusy/cache';
+
+// don't change this if you don't have to
+//$params['ldap_classname_suffix'] = "_dummy";



From cvs at kolab.org  Tue Oct 31 02:30:44 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Oct 2006 02:30:44 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusycollector.class.php, 1.6, 1.7 
Message-ID: <20061031013044.C74F81005CA@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusycollector.class.php 
Log Message:
applied change from issue1422

Index: freebusycollector.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycollector.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusycollector.class.php	12 Jan 2005 02:51:04 -0000	1.6
+++ freebusycollector.class.php	31 Oct 2006 01:30:42 -0000	1.7
@@ -95,8 +95,6 @@
       /* No busy periods in fb list. We have to add a
        * dummy one to be standards compliant
        */
-      $vFb->setAttribute('DTSTART', 0, array(), false );
-      $vFb->setAttribute('DTEND', 0, array(), false );
       $vFb->setAttribute('COMMENT', 'This is a dummy vfreebusy that indicates an empty calendar');
       $vFb->addBusyPeriod( 'BUSY', 0,0, null );
     }
@@ -111,4 +109,4 @@
   var $vCal;
 };
 
-?>
\ No newline at end of file
+?>



From cvs at kolab.org  Tue Oct 31 03:19:11 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Oct 2006 03:19:11 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusycollector.class.php, 1.6, 1.6.2.1 
Message-ID: <20061031021911.8A4731005CA@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	freebusycollector.class.php 
Log Message:
applied change from issue1422

Index: freebusycollector.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycollector.class.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- freebusycollector.class.php	12 Jan 2005 02:51:04 -0000	1.6
+++ freebusycollector.class.php	31 Oct 2006 02:19:09 -0000	1.6.2.1
@@ -95,8 +95,6 @@
       /* No busy periods in fb list. We have to add a
        * dummy one to be standards compliant
        */
-      $vFb->setAttribute('DTSTART', 0, array(), false );
-      $vFb->setAttribute('DTEND', 0, array(), false );
       $vFb->setAttribute('COMMENT', 'This is a dummy vfreebusy that indicates an empty calendar');
       $vFb->addBusyPeriod( 'BUSY', 0,0, null );
     }
@@ -111,4 +109,4 @@
   var $vCal;
 };
 
-?>
\ No newline at end of file
+?>



From cvs at kolab.org  Tue Oct 31 05:14:57 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Oct 2006 05:14:57 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, 1.6, 1.7 freebusyimapcache.class.php, 1.1,
	1.2 pfb.php.in, 1.6, 1.7 
Message-ID: <20061031041457.A8FAB1005CA@lists.intevation.de>

Author: steffen

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

Modified Files:
	freebusy.class.php.in freebusyimapcache.class.php pfb.php.in 
Log Message:
include domain in path for cache files

Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusy.class.php.in	25 Oct 2006 02:28:57 -0000	1.6
+++ freebusy.class.php.in	31 Oct 2006 04:14:55 -0000	1.7
@@ -51,6 +51,7 @@
 
 class FreeBusy {
   function FreeBusy( $cache_dir,
+		     $owner_email,
                      $username,
 		     $password, 
 		     $imaphost,
@@ -58,6 +59,7 @@
 		     $fbfuture=60,
 		     $fbpast=0 ) {
     $this->cache_dir = $cache_dir;
+    $this->owner_email = $owner_email;
     $this->username = $username;
     $this->password = $password;
     $this->imaphost = $imaphost;
@@ -186,7 +188,7 @@
     if (!isset($_SERVER["SERVER_NAME"]))
         $_SERVER["SERVER_NAME"] = "localhost";
 
-    $imapcache = new FreeBusyIMAPCache($this->cache_dir."/", $this->username, $this->foldername);
+    $imapcache = new FreeBusyIMAPCache($this->cache_dir."/", $this->owner_email, $this->foldername);
     $imapcache->cache_load();
 
     $uids = imap_search($this->imap, "UNDELETED", SE_UID);

Index: freebusyimapcache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyimapcache.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebusyimapcache.class.php	25 Oct 2006 02:28:57 -0000	1.1
+++ freebusyimapcache.class.php	31 Oct 2006 04:14:55 -0000	1.2
@@ -129,15 +129,21 @@
 
 
     function compute_filename() {
-      $folder_parts = explode('/', $this->foldername);
-      unset($folder_parts[0]);
-      $folder_storename = join('/', $folder_parts);
-
-      $folder_storename = str_replace(".", "^", $folder_storename);
-      $folder_storename = str_replace("\0", "", $folder_storename);
+	$folder_parts = explode('/', $this->foldername);
+	unset($folder_parts[0]);
+	$folder_storename = join('/', $folder_parts);
+	
+	$folder_storename = str_replace(".", "^", $folder_storename);
+	$folder_storename = str_replace("\0", "", $folder_storename);
 
-       $full_path = $this->store_prefix.$folder_storename.".imapcache";
-       return $full_path;
+	if( ereg( '(.*)@(.*)', $this->owner, $regs ) ) {
+	    $domain = $regs[2].'/';
+	    $domain = str_replace(".", "^", $domain);
+	    $domain = str_replace("\0", "", $domain);
+	} else $domain = '';
+	
+	$full_path = $this->store_prefix.$domain.$folder_storename.".imapcache";
+	return $full_path;
     }
 
     function cache_load() {

Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pfb.php.in	25 Oct 2006 02:28:57 -0000	1.6
+++ pfb.php.in	31 Oct 2006 04:14:55 -0000	1.7
@@ -161,7 +161,7 @@
   unset($folder[0]);
   $folder = join('/', $folder);
   $fbpast = $ldap->freeBusyPast();
-  $fb =& new FreeBusy( $full_cache_dir, $imapuser, $imappw, 'localhost', $params['imap_options'], $uinfo['FBFUTURE'], $fbpast );
+  $fb =& new FreeBusy( $full_cache_dir, $owner, $imapuser, $imappw, 'localhost', $params['imap_options'], $uinfo['FBFUTURE'], $fbpast );
 
   $fb->default_domain = $params['email_domain'];
   $rc = $fb->imapConnect();
@@ -181,6 +181,10 @@
   if( PEAR::isError( $vfb ) ) {
     unauthorized($vfb->toString());
     return false;
+  }
+
+  if(ereg('(.*)@(.*)',$owner,$regs)) {
+      $owner = $regs[2].'/'.$regs[1];
   }
 
   $acl = $fb->getACL();



From cvs at kolab.org  Tue Oct 31 11:45:29 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 31 Oct 2006 11:45:29 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4, 1.96, 1.97 newsarchive.html.m4,
	1.11, 1.12 
Message-ID: <20061031104529.BE09A1005B0@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 newsarchive.html.m4 
Log Message:
* Moved remaining new from 2005 into the newsarchive.
* index.html: Refocussed lastest news to the four news of october.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- index.html.m4	24 Oct 2006 16:48:33 -0000	1.96
+++ index.html.m4	31 Oct 2006 10:45:27 -0000	1.97
@@ -102,6 +102,13 @@
 </div>
 <p>
 
+</div> <!-- END LATEST BLOCK -->
+
+
+
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
 <table>
 <tr><td class="newsd">August 22th, 2006</td>
 <td class="newsh">&raquo;
@@ -156,14 +163,6 @@
 </div>
 <p>
 
-
-
-</div> <!-- END LATEST BLOCK -->
-
-
-
-<!-- BEGIN NEWS BLOCK --> <div class="news">
-
 <table>
 <tr><td class="newsd">June 26th, 2006</td>
 <td class="newsh">&raquo;
@@ -354,153 +353,6 @@
 	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
-</td></tr>
-</table>
-<div class="newsb">
-	Under special circumstances emails are changed by the Kolabfiler, 
-	leading to broken email-signatures or attachments.  
-	A patch fixing the problem is available.
-	See the
-	<a href="security/kolab-vendor-notice-07.txt">Kolab Security
-	Advisory 07</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 15th, 2005</td>
-<td class="newsh">&raquo;
-	Kolab wins "Best Groupware Server" Award
-</td></tr>
-</table>
-<div class="newsb">
-Kolab has been given the Linux New Media Award 2005
-in the category 'Best Groupware Server'. The jury
-chose Kolab on top of contenders like Openexchange,
-OpenGroupware, GroupWise, eGroupWare, Scalix and Lotus Notes.
-This was revealed during a ceremony Tuesday evening
-at the LinuxWorld Expo 2005 in Frankfurt, Germany.
-
-<p>
-Read the <a href="./news/pr-20051115.html">full press release</a>.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">November 4th, 2005</td>
-<td class="newsh">&raquo;
-	Security Advisory 06 for Kolab Server
-</td></tr>
-</table>
-<div class="newsb">
-	The Clam AntiVirus package contains a boundary condition error and
-	fails to handle exceptional conditions, which can be exploited
-	remotely.  A new ClamAV RPM with a fix is available.  See the
-	<a href="security/kolab-vendor-notice-06.txt">Kolab Security
-	Advisory 06</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">October 20th, 2005</td>
-<td class="newsh">&raquo;
-	Security Advisory 05 for Kolab Server
-</td></tr>
-</table>
-<div class="newsb">
-	The obmtool.conf file distributed with Kolab Security Issue 04
-	may cause a downgrade of clamav to a vulnerable version.
-	See the <a href="security/kolab-vendor-notice-05.txt">Kolab Security
-	Advisory 05</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">October 14th, 2005</td>
-<td class="newsh">&raquo;
-	Security Advisory 04 for Kolab Server
-</td></tr>
-</table>
-<div class="newsb">
-        A potential SSL 2.0 protocol rollback attack vulnerability
-	exists in the cryptography toolkit OpenSSL.  The vulnerability
-	potentially affects applications that use the SSL/TLS server
-	implementation provided by OpenSSL.  A new OpenSSL RPM is
-	available.  See the <a
-	href="security/kolab-vendor-notice-04.txt">Kolab Security
-	Advisory 04</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">September 21st, 2005</td>
-<td class="newsh">&raquo;
-	Security Advisory 03 for Kolab Server
-</td></tr>
-</table>
-<div class="newsb">
-	The Clam AntiVirus package contains a boundary condition error and
-	fails to handle exceptional conditions, which can be exploited
-	remotely.  A new ClamAV RPM with a fix is available.  See the
-	<a href="security/kolab-vendor-notice-03.txt">Kolab Security
-	Advisory 03</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">September 14th, 2005</td>
-<td class="newsh">&raquo;
-	Kolab Server update: 2.0.1 fixes bugs and security
-</td></tr>
-</table>
-<div class="newsb">
-	The now published 2.0.1 edition of the Kolab Server is based on 
-	OpenPKG 2.4 and contains a few security updates from OpenPKG. 
-	In addition a few bugs have been fixed.
-	We recommend to update!
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">July 27th, 2005</td>
-<td class="newsh">&raquo;
-	Security Advisory 02 for Kolab Server
-</td></tr>
-</table>
-<div class="newsb">
-	The Clam AntiVirus package contains several buffer overflows
-	that can be exploited remotely.  A new ClamAV RPM with a fix is
-	available.  See
-	the <a href="security/kolab-vendor-notice-02.txt">Kolab Security
-	Advisory 02</a> for details.
-</div>
-<p>
-
-<table>
-<tr><td class="newsd">June 20th, 2005</td>
-<td class="newsh">&raquo;
-	Kolab 2 Groupware released!
-</td></tr>
-</table>
-<div class="newsb">
-	Almost two years after the stable release of Kolab 1, 
-	the Kolab team is proud to present the stable releases 
-	of Kolab Server 2.0 and KDE Kolab Client 2.0! 
-<p>
-
-	Check out the
-	<a href="./news/pr-20050620.html">official press release</a>,
-	get the packages from the mirrors
-	and watch out for Kolab at Linuxtag2005 starting Wednesday
-	in Karlsruhe.
-</div>
-<p>
-
 
 </div> <!-- END NEWS BLOCK -->
 

Index: newsarchive.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- newsarchive.html.m4	8 Jan 2006 12:04:44 -0000	1.11
+++ newsarchive.html.m4	31 Oct 2006 10:45:27 -0000	1.12
@@ -11,6 +11,152 @@
 
 <div class="news">
 
+<table>
+<tr><td class="newsd">December 22nd, 2005</td>
+<td class="newsh">&raquo;
+	Security Advisory 07 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+	Under special circumstances emails are changed by the Kolabfiler, 
+	leading to broken email-signatures or attachments.  
+	A patch fixing the problem is available.
+	See the
+	<a href="security/kolab-vendor-notice-07.txt">Kolab Security
+	Advisory 07</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 15th, 2005</td>
+<td class="newsh">&raquo;
+	Kolab wins "Best Groupware Server" Award
+</td></tr>
+</table>
+<div class="newsb">
+Kolab has been given the Linux New Media Award 2005
+in the category 'Best Groupware Server'. The jury
+chose Kolab on top of contenders like Openexchange,
+OpenGroupware, GroupWise, eGroupWare, Scalix and Lotus Notes.
+This was revealed during a ceremony Tuesday evening
+at the LinuxWorld Expo 2005 in Frankfurt, Germany.
+
+<p>
+Read the <a href="./news/pr-20051115.html">full press release</a>.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">November 4th, 2005</td>
+<td class="newsh">&raquo;
+	Security Advisory 06 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+	The Clam AntiVirus package contains a boundary condition error and
+	fails to handle exceptional conditions, which can be exploited
+	remotely.  A new ClamAV RPM with a fix is available.  See the
+	<a href="security/kolab-vendor-notice-06.txt">Kolab Security
+	Advisory 06</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">October 20th, 2005</td>
+<td class="newsh">&raquo;
+	Security Advisory 05 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+	The obmtool.conf file distributed with Kolab Security Issue 04
+	may cause a downgrade of clamav to a vulnerable version.
+	See the <a href="security/kolab-vendor-notice-05.txt">Kolab Security
+	Advisory 05</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">October 14th, 2005</td>
+<td class="newsh">&raquo;
+	Security Advisory 04 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+        A potential SSL 2.0 protocol rollback attack vulnerability
+	exists in the cryptography toolkit OpenSSL.  The vulnerability
+	potentially affects applications that use the SSL/TLS server
+	implementation provided by OpenSSL.  A new OpenSSL RPM is
+	available.  See the <a
+	href="security/kolab-vendor-notice-04.txt">Kolab Security
+	Advisory 04</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">September 21st, 2005</td>
+<td class="newsh">&raquo;
+	Security Advisory 03 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+	The Clam AntiVirus package contains a boundary condition error and
+	fails to handle exceptional conditions, which can be exploited
+	remotely.  A new ClamAV RPM with a fix is available.  See the
+	<a href="security/kolab-vendor-notice-03.txt">Kolab Security
+	Advisory 03</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">September 14th, 2005</td>
+<td class="newsh">&raquo;
+	Kolab Server update: 2.0.1 fixes bugs and security
+</td></tr>
+</table>
+<div class="newsb">
+	The now published 2.0.1 edition of the Kolab Server is based on 
+	OpenPKG 2.4 and contains a few security updates from OpenPKG. 
+	In addition a few bugs have been fixed.
+	We recommend to update!
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">July 27th, 2005</td>
+<td class="newsh">&raquo;
+	Security Advisory 02 for Kolab Server
+</td></tr>
+</table>
+<div class="newsb">
+	The Clam AntiVirus package contains several buffer overflows
+	that can be exploited remotely.  A new ClamAV RPM with a fix is
+	available.  See
+	the <a href="security/kolab-vendor-notice-02.txt">Kolab Security
+	Advisory 02</a> for details.
+</div>
+<p>
+
+<table>
+<tr><td class="newsd">June 20th, 2005</td>
+<td class="newsh">&raquo;
+	Kolab 2 Groupware released!
+</td></tr>
+</table>
+<div class="newsb">
+	Almost two years after the stable release of Kolab 1, 
+	the Kolab team is proud to present the stable releases 
+	of Kolab Server 2.0 and KDE Kolab Client 2.0! 
+<p>
+
+	Check out the
+	<a href="./news/pr-20050620.html">official press release</a>,
+	get the packages from the mirrors
+	and watch out for Kolab at Linuxtag2005 starting Wednesday
+	in Karlsruhe.
+</div>
+<p>
+
 
 <table>
 <tr><td class="newsd">June 17th, 2005</td>



From cvs at kolab.org  Wed Nov  1 10:20:47 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 10:20:47 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	kolabfilter.php.in, 1.11, 1.12 
Message-ID: <20061101092047.CD891101EF4@lists.intevation.de>

Author: gunnar

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

Modified Files:
	kolabfilter.php.in 
Log Message:
	* resmgr/kolabfilter.php.in ($addrs): 

	Fixed kolabfilter script for PHP5 (array_merge problems).


Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabfilter.php.in	19 Oct 2006 20:56:26 -0000	1.11
+++ kolabfilter.php.in	1 Nov 2006 09:20:45 -0000	1.12
@@ -134,7 +134,7 @@
   }
   unset($entries[0]['mail']['count']);
   unset($entries[0]['alias']['count']);
-  $addrs = array_merge($entries[0]['mail'],$entries[0]['alias']);
+  $addrs = array_merge((array) $entries[0]['mail'],(array) $entries[0]['alias']);
   $mail = $entries[0]['mail'][0];
 
   ldap_free_result($result);
@@ -153,7 +153,7 @@
   foreach( $entries as $adr ) {
     if( $adr['mail']['count'] > 0 ) {
       unset($adr['mail']['count']);
-      $addrs = array_merge($addrs,$adr['mail']);
+      $addrs = array_merge((array) $addrs,(array) $adr['mail']);
     }
   }
   ldap_free_result($result);



From cvs at kolab.org  Wed Nov  1 10:20:48 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 10:20:48 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.18, 1.19 
Message-ID: <20061101092048.0A5BB101EF5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* resmgr/kolabfilter.php.in ($addrs): 

	Fixed kolabfilter script for PHP5 (array_merge problems).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	25 Aug 2006 16:51:23 -0000	1.18
+++ ChangeLog	1 Nov 2006 09:20:45 -0000	1.19
@@ -1,3 +1,9 @@
+2006-11-01  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* resmgr/kolabfilter.php.in ($addrs): 
+
+	Fixed kolabfilter script for PHP5 (array_merge problems).
+
 2006-08-25  Bernhard Herzog  <bh at intevation.de>
 
 	* resmgr/resmgr.php.in: Apply patch to fix Issue1352.



From cvs at kolab.org  Wed Nov  1 10:23:26 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 10:23:26 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	misc.php, 1.5, 1.6 
Message-ID: <20061101092326.90B53101EF5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	misc.php 
Log Message:
	* resmgr/misc.php: 

	Fixed misc.php helper for PHP5 (array_merge problems).


Index: misc.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- misc.php	22 May 2006 10:49:29 -0000	1.5
+++ misc.php	1 Nov 2006 09:23:24 -0000	1.6
@@ -178,7 +178,7 @@
 	  $i++;
 	}
 	$i--;
-	if( array_key_exists($arg[1],$ret) && is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge($ret[$arg[1]] ,$val);
+	if( array_key_exists($arg[1],$ret) && is_array( $ret[$arg[1]] ) ) $ret[$arg[1]] = array_merge((array)$ret[$arg[1]] ,(array)$val);
 	else if( count($val) == 1 ) $ret[$arg[1]] = $val[0];
 	else $ret[$arg[1]] = $val;
       }



From cvs at kolab.org  Wed Nov  1 10:23:26 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 10:23:26 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.19, 1.20 
Message-ID: <20061101092326.92C30101EF7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* resmgr/misc.php: 

	Fixed misc.php helper for PHP5 (array_merge problems).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog	1 Nov 2006 09:20:45 -0000	1.19
+++ ChangeLog	1 Nov 2006 09:23:24 -0000	1.20
@@ -1,5 +1,9 @@
 2006-11-01  Gunnar Wrobel  <wrobel at pardus.de>
 
+	* resmgr/misc.php: 
+
+	Fixed misc.php helper for PHP5 (array_merge problems).
+
 	* resmgr/kolabfilter.php.in ($addrs): 
 
 	Fixed kolabfilter script for PHP5 (array_merge problems).



From cvs at kolab.org  Wed Nov  1 10:32:29 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 10:32:29 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.20, 1.21 
Message-ID: <20061101093229.516781006C2@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/freebusycache.class.php.in: 

	Fixed freebusycache class for PHP5 (array_merge problems).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ChangeLog	1 Nov 2006 09:23:24 -0000	1.20
+++ ChangeLog	1 Nov 2006 09:32:27 -0000	1.21
@@ -1,5 +1,9 @@
 2006-11-01  Gunnar Wrobel  <wrobel at pardus.de>
 
+	* freebusy/freebusycache.class.php.in: 
+
+	Fixed freebusycache class for PHP5 (array_merge problems).
+
 	* resmgr/misc.php: 
 
 	Fixed misc.php helper for PHP5 (array_merge problems).



From cvs at kolab.org  Wed Nov  1 10:32:29 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 10:32:29 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusycache.class.php.in, 1.6, 1.7 
Message-ID: <20061101093229.4E7DF1005C6@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusycache.class.php.in 
Log Message:
	* freebusy/freebusycache.class.php.in: 

	Fixed freebusycache class for PHP5 (array_merge problems).


Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusycache.class.php.in	25 Oct 2006 02:28:57 -0000	1.6
+++ freebusycache.class.php.in	1 Nov 2006 09:32:27 -0000	1.7
@@ -192,7 +192,7 @@
       if( dba_exists( $uid, $db ) ) {
 	$tmplst = dba_fetch( $uid, $db );
 	myLog("Found ".$uid." := $tmplst", RM_LOG_DEBUG);
-	$lst = array_merge( $lst, $this->decodeList( $tmplst ) );
+	$lst = array_merge((array) $lst,(array) $this->decodeList( $tmplst ) );
       } else {
 	myLog("$uid not found", RM_LOG_DEBUG);	
       }
@@ -334,7 +334,7 @@
 	if($file=='.' || $file=='..') continue;
 	if( !ereg( ($this->extended?'/.*\.xpfb$/':'/.*\.pfb$/'), $file ) ) continue;
 	$tmp = $this->recursivedir( $dir.'/'.$file );
-	if( $tmp !== false ) $dirs = array_merge( $dirs, $tmp );
+	if( $tmp !== false ) $dirs = array_merge((array) $dirs,(array) $tmp );
       } else if( is_file($dir.'/'.$file) ) {
 	$dirs[] = $dir.'/'.$file;
       }



From cvs at kolab.org  Wed Nov  1 12:10:52 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 12:10:52 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, 1.7, 1.8 
Message-ID: <20061101111052.19F28101EF3@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusy.class.php.in 
Log Message:
Fixed typo in date.


Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusy.class.php.in	31 Oct 2006 04:14:55 -0000	1.7
+++ freebusy.class.php.in	1 Nov 2006 11:10:50 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004-12006 Klaraelvdalens Datakonsult AB, Intra2net AG,
+ *  Copyright (c) 2004-2006 Klaraelvdalens Datakonsult AB, Intra2net AG,
  *                            erfrakon Partnerschaftsgesellschaft
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>



From cvs at kolab.org  Wed Nov  1 15:00:09 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 15:00:09 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.81,1.82 
Message-ID: <20061101140009.1E299101F04@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* templates/freebusy.conf.template.in: 

	Commit
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
	leads to resmgr/misc.php not being imported before
	freebusy.conf. Consequently RM_LOG_DEBUG remains undefined and
	results in an error. Either the order of the include statements in
	kolab-resource-handlers/freebusy/freebusy.php.in is being changed
	or the template uses integer values for the log_level. Chose the
	second option for now.

	In addition $params['cache_dir'] was set to @freebusy_cachedir@ in
	order to get the correct path under all distributions.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- ChangeLog	3 Oct 2006 12:49:42 -0000	1.81
+++ ChangeLog	1 Nov 2006 14:00:07 -0000	1.82
@@ -1,3 +1,20 @@
+2006-11-01  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* templates/freebusy.conf.template.in: 
+
+	Commit
+	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
+	leads to resmgr/misc.php not being imported before
+	freebusy.conf. Consequently RM_LOG_DEBUG remains undefined an
+	results in an error. Either the order of the include statements in
+	kolab-resource-handlers/freebusy/freebusy.php.in is being changed
+	or the template uses integer values for the log_level. Chose the
+	second option for now.
+
+	In addition $params['cache_dir'] was set to @freebusy_cachedir@ in
+	order to get the correct path under all distributions.
+	
+
 2006-10-02	Marcus Hüwe <suse-tux at gmx.de>
 	* templates/slapd.conf.template.in: fixed issue1426 - thanks
 	Gunnar!



From cvs at kolab.org  Wed Nov  1 15:00:09 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  1 Nov 2006 15:00:09 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.3,
	1.4 
Message-ID: <20061101140009.1688E101EFD@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
	* templates/freebusy.conf.template.in: 

	Commit
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
	leads to resmgr/misc.php not being imported before
	freebusy.conf. Consequently RM_LOG_DEBUG remains undefined and
	results in an error. Either the order of the include statements in
	kolab-resource-handlers/freebusy/freebusy.php.in is being changed
	or the template uses integer values for the log_level. Chose the
	second option for now.

	In addition $params['cache_dir'] was set to @freebusy_cachedir@ in
	order to get the correct path under all distributions.


Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- freebusy.conf.template.in	25 Oct 2006 02:29:51 -0000	1.3
+++ freebusy.conf.template.in	1 Nov 2006 14:00:07 -0000	1.4
@@ -85,8 +85,8 @@
 // $params['log'] = 'syslog:cons, pid';            // Or syslog...
 
 // What level of output should we log? Higher levels give more verbose output.
-// One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
-$params['log_level'] = RM_LOG_DEBUG;
+// 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;
 
 // IMAP options passed to imap_open
 //$params['imap_options'] = "/notls/secure/readonly";
@@ -95,7 +95,7 @@
 $params['pfb_dbformat'] = "";          // default: gdbm
 
 // Location of the cache files
-$params['cache_dir'] = '/var/kolab/www/freebusy/cache';
+$params['cache_dir'] = '@freebusy_cachedir@';
 
 // don't change this if you don't have to
 //$params['ldap_classname_suffix'] = "_dummy";



From cvs at kolab.org  Thu Nov  2 10:44:03 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  2 Nov 2006 10:44:03 +0100 (CET)
Subject: wilde: doc/www/src index.html.m4,1.97,1.98 
Message-ID: <20061102094403.86A151006CF@lists.intevation.de>

Author: wilde

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

Modified Files:
	index.html.m4 
Log Message:
Added News on UGS presentation at LWE 2006.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- index.html.m4	31 Oct 2006 10:45:27 -0000	1.97
+++ index.html.m4	2 Nov 2006 09:44:01 -0000	1.98
@@ -46,13 +46,28 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">November 14th - 16th, 2006</td>
+<td class="newsh">&raquo;
+	Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany	
+</td></tr>
+</table>
+<div class="newsb">
+	<a href="http://www.univention.de/english.html">Univention</a>,
+	business partner of <a href="http://www.kolab-konsortium.com/">Kolab-Konsortium</a>,
+	presents the Kolab-based Univention Groupware Server
+	(UGS).<br />
+        (Special exhibition Linux/OS in the office, hall 11.2)
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">October 23th - 27th, 2006</td>
 <td class="newsh">&raquo;
 	Kolab-based UGS at Systems 2006 in Munich, Germany
 </td></tr>
 </table>
 <div class="newsb">
-	<a href="http://www.univention.de/">Univention</a>,
+	<a href="http://www.univention.de/english.html">Univention</a>,
 	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)



From cvs at kolab.org  Thu Nov  2 15:39:31 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  2 Nov 2006 15:39:31 +0100 (CET)
Subject: bernhard: utils/testing kmail-send-test-email-aegyptenissue659-1.py,
	NONE, 1.1 
Message-ID: <20061102143931.AA1F01005CA@lists.intevation.de>

Author: bernhard

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

Added Files:
	kmail-send-test-email-aegyptenissue659-1.py 
Log Message:
Adding test helping script for aegyptenissue659.


--- NEW FILE: kmail-send-test-email-aegyptenissue659-1.py ---
#!/usr/bin/env python
"""Send Email to reproduce https://intevation.de/roundup/aegypten/issue659.

Usage ./$progname <emailaddress>

This script is Free Software under the GNU General Public License >=v2.
bernhard at intevation.de
"""
#20061030 Bernhard initial 
__version__="$Revision: 1.1 $"[10:-1]

import sys

import smtplib
import string

msg="""To: Bernhard Reiter <bernhard at intevation.de>
Subject: Test Mail aegypten/issue659 rev02
From: Sascha Wilde <wilde at intevation.de>
Date: Mon, 30 Oct 2006 15:22:12 +0100
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"

--=-=-=
Content-Transfer-Encoding: quoted-printable

Eine signierte Testmail.
=2D-=20
Sascha Wilde                                 Intevation GmbH

wilde at intevation.de                          intevation at intevation.de
http://www.intevation.de/~wilde/             http://www.intevation.de/

--=-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFFRgpeuyGFFEu4ZWgRAgucAJ9tvc7Pxx2SZgXDWCYvY6jr5Pa3kwCdGN/y
OpTLo1J8XeeCCeO7lNIkzok=
=y4aq
-----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, ", ")))

headers="MIME-Version: 1.0\r\n"+ \
"Content-Type: text/plain;\r\n"+ \
"        charset=\"iso-8859-1\"\r\n"+ \
"Content-Transfer-Encoding: 8bit\r\n"

basesubject="Subject: Test for aegypten/issue659\r\n"

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()
#sys.stdout.write("\n")



From cvs at kolab.org  Fri Nov  3 12:13:26 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 12:13:26 +0100 (CET)
Subject: bernhard: doc/www/src default.css, 1.7, 1.8 header.html.m4, 1.5,
	1.6 index.html.m4, 1.98, 1.99 
Message-ID: <20061103111326.43F001005BC@lists.intevation.de>

Author: bernhard

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

Modified Files:
	default.css header.html.m4 index.html.m4 
Log Message:
Reworked the main page and the header
+ Replaced the main title with a description, this saves space
  and it more expressive. This should make it easier to see what
  Kolab is about (user feedback indicated the need).
  Switched from bold to regular font, because it was too heavy.
  The font size needs experimentation.
+ Avoided "project" in a couple of places as in the narror sense
  Kolab is not an initiative with a limited time period and goals
  but an ongoing effort.
+ Expanded the description and reshifted emphasised parts 
  to be more appealing and giving slightly more information.
+ Added more keywords, so readers can be picked up more easily.
  Added the alternative wording "Open Source" behind Free Software.
  Added gnu/linux and some more to the meta keywords.


Index: default.css
===================================================================
RCS file: /kolabrepository/doc/www/src/default.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- default.css	18 Mar 2005 10:24:21 -0000	1.7
+++ default.css	3 Nov 2006 11:13:24 -0000	1.8
@@ -187,8 +187,8 @@
 }
 
 .cbhtext {
-    font-size: 200%;
-    font-weight: bold;
+    font-size: 150%;
+    /*font-weight: bold;*/
     padding-left: 1em;
     vertical-align: middle;
 }

Index: header.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/header.html.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- header.html.m4	14 Mar 2005 14:02:47 -0000	1.5
+++ header.html.m4	3 Nov 2006 11:13:24 -0000	1.6
@@ -11,9 +11,9 @@
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>The Kolab Groupware Project :: PAGE_TITLE</title>
-<meta name="description" content="The Kolab Project aims to maintain and enhance a complete Free Software groupware solution for UNIX platforms." />
-<meta name="keywords" content= "kolab,groupware,free software,unix,linux,kde,outlook,kmail,kontact,horde,webmail" />
+<title>Kolab Groupware:: PAGE_TITLE</title>
+<meta name="description" content="Kolab aims to maintain and enhance a complete Free Software groupware solution for UNIX platforms." />
+<meta name="keywords" content= "kolab,groupware,free software,open source, unix,gnu/linux,linux,kde,outlook,kmail,korganizer,kontact,horde,email" />
 <link rel="stylesheet" type="text/css" media="screen" href="default.css" />
 <link rel="shortcut icon" type="image/png" href="images/favicon.png" />
 </head>
@@ -31,7 +31,7 @@
     <a href="index.html"><img title="Homepage"
        src="images/kolab_logo.small.png"></a>
     </td>
-    <td class="cbhtext">The Kolab Groupware Project</td>
+    <td class="cbhtext">Groupware Solution for Emails, Appointments, Contacts and more</td>
 </tr>
 </table>
 </div>

Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- index.html.m4	2 Nov 2006 09:44:01 -0000	1.98
+++ index.html.m4	3 Nov 2006 11:13:24 -0000	1.99
@@ -3,21 +3,19 @@
 <div id="date">This page was updated on:<br />$Date$</div>
 
 <p id="intro">
-<strong>
 Kolab is a Groupware Solution for Emails, Appointments, Contacts and more.
-</strong>
-It supports mixed clients environments (Outlook/KDE) because of an
-open storage format called Kolab-XML. 
+It supports <strong>mixed client environments (Outlook/KDE)</strong> 
+because of an <strong>open storage format</strong>. Any email client
+speaking standard protocols can be served.
 </p>
 
 <p id="intro">
-The Kolab Project is about the <em>Kolab Concept</em>
-and implementions.
-Especially the 
+For the full Kolab experience you need a 
 <em><a href="about-kolab-server.html">Kolab Server</a></em> and
-the 
-<em><a href="about-kolab-clients.html">Kolab Clients</a></em>,
-e.g. KDE Kontact. Server and KDE client are Free Software.
+<em><a href="about-kolab-clients.html">Kolab Clients</a></em>.
+What makes the <em>Kolab Concept</em> outstanding is the focus on
+scalability, proven components and protocols. 
+The implementations offered by us are Free Software (Open Source).
 </p>
 
 <p id="intro">



From cvs at kolab.org  Fri Nov  3 12:35:54 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 12:35:54 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4,1.99,1.100 
Message-ID: <20061103113554.56252101EE7@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 
Log Message:
Mentioned the BSI. 
Shortened the LMN sentence.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- index.html.m4	3 Nov 2006 11:13:24 -0000	1.99
+++ index.html.m4	3 Nov 2006 11:35:52 -0000	1.100
@@ -19,8 +19,11 @@
 </p>
 
 <p id="intro">
-Kolab has won the <strong>Linux New Media Award 2005</strong>
-in the category 'Best Groupware Server' 
+Kolab was created for the needs of the German
+Federal Office for Information Security (BSI) by contract in 2002-2004
+and is used there in a heterogenous environment.
+November 2005 Kolab won the <strong>Linux New Media Award:
+Category 'Best Groupware Server'</strong>
 [<a href="./news/pr-20051115.html">press release</a>].
 </p>
 



From cvs at kolab.org  Fri Nov  3 12:50:03 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 12:50:03 +0100 (CET)
Subject: bernhard: doc/www/src index.html.m4,1.100,1.101 
Message-ID: <20061103115003.93554101EF8@lists.intevation.de>

Author: bernhard

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

Modified Files:
	index.html.m4 
Log Message:
Added 2.1.5 release news.
Refocussed lastest news to only november news.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- index.html.m4	3 Nov 2006 11:35:52 -0000	1.100
+++ index.html.m4	3 Nov 2006 11:50:01 -0000	1.101
@@ -61,6 +61,39 @@
 </div>
 <p>
 
+
+<table>
+<tr><td class="newsd">November 2nd, 2006</td>
+<td class="newsh">&raquo;
+	New KDE Kolab Client released, revision 'proko2 2.1.5'.
+</td></tr>
+</table>
+<div class="newsb">
+	This release contains several fixes and
+	a few new features, like:
+	<p>
+
+	<ul>
+		<li>Ability to add ones signature at top of 
+			an email reply automatically
+		    	or manually at the cursor position.
+
+		<li>An extra button to send an email to results 
+		of LDAP queries and the possibility to reach that query
+		dialog directly from the address selection dialog.
+	</ul>
+	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>
 <td class="newsh">&raquo;
@@ -117,13 +150,6 @@
   Advisory 11</a> for details.
 </div>
 <p>
-
-</div> <!-- END LATEST BLOCK -->
-
-
-
-<!-- BEGIN NEWS BLOCK --> <div class="news">
-
 
 <table>
 <tr><td class="newsd">August 22th, 2006</td>



From cvs at kolab.org  Fri Nov  3 15:04:30 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 15:04:30 +0100 (CET)
Subject: thomas: server release-notes.txt,1.41,1.42 
Message-ID: <20061103140430.5456A1006A9@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
whitespace cleanup


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- release-notes.txt	20 Jun 2006 12:44:25 -0000	1.41
+++ release-notes.txt	3 Nov 2006 14:04:28 -0000	1.42
@@ -27,7 +27,7 @@
       the web interface.  This happens most often immediately after the
       bootstrap.  In that case restart the kolabd:
 
-          /kolab/bin/openpkg rc kolabd restart
+	/kolab/bin/openpkg rc kolabd restart
 
       See Issue1068 (Mailboxes are not created until kolabd restart) and
       Issue1098 (Changes in the service tab are not accepted after
@@ -50,11 +50,11 @@
       php-smarty-2.6.10-20051003
       clamav-0.88.2-20060524
 
-      binutils-2.16.1-2.5.1 
-        http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.009-binutils.html
+      binutils-2.16.1-2.5.1
+	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.009-binutils.html
 
-      openldap-2.3.11-2.5.1 
-       	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.008-openldap.html
+      openldap-2.3.11-2.5.1
+	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.008-openldap.html
 
 
     Kolab updates:
@@ -63,21 +63,21 @@
 
       - perl-kolab-5.8.7-20060619
 
-        Resolved:
-            Issue1194 (kolabd quota performance)
-            Issue1220 (postfix permissions)
-            issue1237 (Handling of @@@var@@@ in Conf.pm (Gunnar Wrobel))
+	Resolved:
+	    Issue1194 (kolabd quota performance)
+	    Issue1220 (postfix permissions)
+	    issue1237 (Handling of @@@var@@@ in Conf.pm (Gunnar Wrobel))
 
       - kolabd-2.0.99-20060619
 
-        * The default imapd configuration has been changed to enable the
-          hashimapspool option.  This affects the upgrade procedure.
-          See 1st.README for upgrade instructions.
+	* The default imapd configuration has been changed to enable the
+	  hashimapspool option.  This affects the upgrade procedure.
+	  See 1st.README for upgrade instructions.
 
 	* amavis now logs to /kolab/var/amavisd/amavisd.log.  This is
-          part of the fix for Issue1015
+	  part of the fix for Issue1015
 
-        Resolved:
+	Resolved:
 	    Issue1015 (fixing logging and logrotate for amavisd)
 	    Issue1089 (enable hashimapspool for imapd to cope with many users)
 	    Issue1101 (allowapop: no; disable apop access to imapd by default)
@@ -86,10 +86,10 @@
 
       - kolab-webadmin-2.0.99-20060619
 
-      	* patch from Tobias König in order to support setting of
+	* patch from Tobias König in order to support setting of
 	  foldertype for public folders
 
-        Resolved:
+	Resolved:
 	    Issue848 (Modifying address book entry may break distribution list)
 	    Issue1106 (email validation in webgui)
 	    Issue1214 (number of days for vacation messages on webinterface)
@@ -97,12 +97,12 @@
 
       - kolab-resource-handlers-2.0.99-20060619
 
-        * create empty pfbcache.db if missing
+	* create empty pfbcache.db if missing
 
-        Resolved:
+	Resolved:
 	    Issue973 (quoting and rewriting From header)
 	    Issue966 (Wrong CN for resource accounts)
- 	    Issue1042 (server modifies email content)
+	    Issue1042 (server modifies email content)
 	    Issue1195 (error message in bounce)
 	    Issue1243 (rewriting fails when "From:" contains quoted printable)
 	    Issue1245 (rewriting problems on folded Header "From:"-line)



From cvs at kolab.org  Fri Nov  3 15:16:23 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 15:16:23 +0100 (CET)
Subject: steffen: server obmtool.conf,1.228,1.229 
Message-ID: <20061103141623.7782E1005BC@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
new snapshot

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- obmtool.conf	24 Oct 2006 15:29:56 -0000	1.228
+++ obmtool.conf	3 Nov 2006 14:16:21 -0000	1.229
@@ -48,7 +48,6 @@
         --muid="19414" --ruid="19415" --nuid="19416" \
         --mgid="19414" --rgid="19415" --ngid="19416"
 
-    #@install ${altloc}openpkg-registry-0.2.7-20060223
     if test -n "$USERNAME" ; then
       $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
@@ -111,7 +110,7 @@
     @install ${loc}autoconf-2.59-2.5.0
     @install ${loc}automake-1.9.6-2.5.0
     @install ${loc}gettext-0.14.5-2.5.0
-    @install ${loc}file-4.15-2.5.0_kolab
+    @install ${altloc}file-4.15-2.5.0_kolab
     @install ${loc}openpkg-tools-0.8.47-2.5.0
     @install ${loc}patch-2.5.9-2.5.0
     @install ${loc}sed-4.1.4-2.5.0
@@ -149,11 +148,11 @@
     @install ${altloc}clamav-0.88.5-2.20061018
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20061011
-    @install ${altloc}kolabd-2.0.99-20061011 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20061011 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20061103
+    @install ${altloc}kolabd-2.0.99-20061103 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20061103 --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-20061011 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20061103 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version
     @check
 



From cvs at kolab.org  Fri Nov  3 15:16:46 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 15:16:46 +0100 (CET)
Subject: steffen: server obmtool.conf,1.229,1.230 
Message-ID: <20061103141646.E09F41005BC@lists.intevation.de>

Author: steffen

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

Modified Files:
	obmtool.conf 
Log Message:
new snapshot

Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- obmtool.conf	3 Nov 2006 14:16:21 -0000	1.229
+++ obmtool.conf	3 Nov 2006 14:16:44 -0000	1.230
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1beta2";
+    kolab_version="2.1beta3-cvs";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'



From cvs at kolab.org  Fri Nov  3 15:28:21 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 15:28:21 +0100 (CET)
Subject: thomas: server release-notes.txt,1.42,1.43 
Message-ID: <20061103142821.164051005DB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Started release notes for Kolab server 2.1 beta3


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- release-notes.txt	3 Nov 2006 14:04:28 -0000	1.42
+++ release-notes.txt	3 Nov 2006 14:28:19 -0000	1.43
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 20060620, Kolab Server 2.1 beta 2)
+(Version 2006????, Kolab Server 2.1 beta 2)
 
 This is a development snapshot of the kolab server leading up to a 2.1
 release.  For upgrading and installation instructions, please refer to
@@ -38,6 +38,64 @@
       Deleting address book entries doesn't automatically remove them
       from distribution lists like it is done for users, see Issue848
       for details.
+
+
+Changes since 2.1 beta 2:
+
+    OpenPKG updates:
+
+      - openpkg-2.5.4-2.5.4
+
+	Resolved:
+	  New upstream version, required for registration with OpenPKG.
+
+      - openssl-0.9.8a-2.5.4
+
+	Resolved:
+	  denial of service, may allow execution of arbitrary code
+	  (http://kolab.org/security/kolab-vendor-notice-12.txt)
+
+      - clamav-0.88.5-2.20061018
+
+	Resolved:
+	  buffer overflow, remotely exploitable (CVE-2006-4018)
+	  (http://kolab.org/security/kolab-vendor-notice-10.txt)
+	  heap overflow, remotely exploitable (CVE-2006-4182),
+	  denial of service, remotely exploitable (CVE-2006-5295)
+	  (http://kolab.org/security/kolab-vendor-notice-13.txt)
+
+      - file-4.15-2.5.0_kolab
+
+	Resolved:
+	  kolab/issue1458 (Password protected .sxw files can be banned by
+	                   amavisd, as a result of the file command)
+
+      - openldap-2.3.27-2.20061018_kolab
+
+	Resolved:
+	  kolab/issue1229 (Master openldap's slurpd fails to start after
+	                   adding slave)
+	  kolab/issue1431 (Slave cannot access master ldap server via SSL)
+
+
+    Kolab updates:
+
+      - perl-kolab-5.8.7-2006????
+
+	Resolved:
+
+      - kolabd-2.0.99-2006????
+
+	Resolved:
+
+      - kolab-webadmin-2.0.99-2006????
+
+	Resolved:
+
+      - kolab-resource-handlers-2.0.99-2006????
+
+	Resolved:
+
 
 
 Changes since 2.1 beta 1:



From cvs at kolab.org  Fri Nov  3 16:56:12 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 16:56:12 +0100 (CET)
Subject: thomas: server obmtool.conf,1.230,1.231 
Message-ID: <20061103155612.9DCEA1005DB@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf 
Log Message:
Activated folderchar patch for imapd package.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- obmtool.conf	3 Nov 2006 14:16:44 -0000	1.230
+++ obmtool.conf	3 Nov 2006 15:56:10 -0000	1.231
@@ -105,7 +105,7 @@
     @install ${loc}perl-ldap-5.8.7-2.5.0
     @install ${loc}perl-db-5.8.7-2.5.1
     @install ${loc}config-20051002-2.5.0
-    @trigger ${altloc}imapd-2.2.12-2.5.0_kolab --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=morelogging # Drop morelogging if you dont want/need it
+    @trigger ${altloc}imapd-2.2.12-2.5.0_kolab2 --with=group --with=ldap --with=annotate --with=atvdom --with=skiplist --with=goodchars --with=folderchar --with=morelogging # Drop morelogging if you dont want/need it
     @install ${loc}libiconv-1.10-2.5.0
     @install ${loc}autoconf-2.59-2.5.0
     @install ${loc}automake-1.9.6-2.5.0



From cvs at kolab.org  Fri Nov  3 16:56:12 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 16:56:12 +0100 (CET)
Subject: thomas: server/imapd kolab.patch,1.29,1.30 
Message-ID: <20061103155612.A7CAD1006AB@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab.patch 
Log Message:
Activated folderchar patch for imapd package.


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kolab.patch	19 Jul 2006 13:51:04 -0000	1.29
+++ kolab.patch	3 Nov 2006 15:56:10 -0000	1.30
@@ -1,5 +1,5 @@
---- imapd.spec.orig	2006-07-19 15:32:33.867230000 +0200
-+++ imapd.spec	2006-07-19 15:41:21.484428413 +0200
+--- imapd.spec.orig	2006-11-03 16:49:36.210673013 +0100
++++ imapd.spec	2006-11-03 16:50:56.703458223 +0100
 @@ -2,6 +2,9 @@
  ##  imapd.spec -- OpenPKG RPM Package Specification
  ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
@@ -10,12 +10,12 @@
  ##
  ##  Permission to use, copy, modify, and distribute this software for
  ##  any purpose with or without fee is hereby granted, provided that
-@@ -33,13 +36,17 @@
+@@ -33,13 +36,18 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.12
 -Release:      2.5.0
-+Release:      2.5.0_kolab
++Release:      2.5.0_kolab2
  
  #   package options
 -%option       with_fsl    yes
@@ -30,10 +30,11 @@
 +%option       with_ldap     no
 +%option       with_goodchars no
 +%option       with_morelogging no
++%option       with_folderchar no
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -49,6 +56,13 @@
+@@ -49,6 +57,13 @@
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
@@ -47,7 +48,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -61,6 +75,10 @@
+@@ -61,6 +76,10 @@
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -58,7 +59,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -91,6 +109,7 @@
+@@ -91,6 +110,7 @@
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
@@ -66,7 +67,7 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -98,10 +117,27 @@
+@@ -98,10 +118,27 @@
      sleep 1
      touch configure
  %endif
@@ -95,7 +96,7 @@
          configure
  
      #   ensure local et/com_err can be found
-@@ -162,6 +198,11 @@
+@@ -162,6 +199,11 @@
          -e '/alt_config/s;"deliver";"cyrdeliver";' \
          imap/deliver.c
  



From cvs at kolab.org  Fri Nov  3 17:53:00 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 17:53:00 +0100 (CET)
Subject: thomas: server release-notes.txt,1.43,1.44 
Message-ID: <20061103165300.9E7711006CB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Finished release-notes for changes up to end of October.
Removed separation between OpenPKG and Kolab packages.
Updated formatting of beta3-cvs entries.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- release-notes.txt	3 Nov 2006 14:28:19 -0000	1.43
+++ release-notes.txt	3 Nov 2006 16:52:58 -0000	1.44
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 2006????, Kolab Server 2.1 beta 2)
+(Version 20061103, Kolab Server 2.1 beta 3-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
@@ -42,60 +42,86 @@
 
 Changes since 2.1 beta 2:
 
-    OpenPKG updates:
+    - openpkg-2.5.4-2.5.4
 
-      - openpkg-2.5.4-2.5.4
+	New upstream version.
 
-	Resolved:
-	  New upstream version, required for registration with OpenPKG.
+    - openssl-0.9.8a-2.5.4
 
-      - openssl-0.9.8a-2.5.4
+	denial of service, may allow execution of arbitrary code
+	(http://kolab.org/security/kolab-vendor-notice-12.txt)
 
-	Resolved:
-	  denial of service, may allow execution of arbitrary code
-	  (http://kolab.org/security/kolab-vendor-notice-12.txt)
+    - clamav-0.88.5-2.20061018
 
-      - clamav-0.88.5-2.20061018
+	buffer overflow, remotely exploitable (CVE-2006-4018)
+	(http://kolab.org/security/kolab-vendor-notice-10.txt)
 
-	Resolved:
-	  buffer overflow, remotely exploitable (CVE-2006-4018)
-	  (http://kolab.org/security/kolab-vendor-notice-10.txt)
-	  heap overflow, remotely exploitable (CVE-2006-4182),
-	  denial of service, remotely exploitable (CVE-2006-5295)
-	  (http://kolab.org/security/kolab-vendor-notice-13.txt)
+	heap overflow, remotely exploitable (CVE-2006-4182),
+	denial of service, remotely exploitable (CVE-2006-5295)
+	(http://kolab.org/security/kolab-vendor-notice-13.txt)
 
-      - file-4.15-2.5.0_kolab
+    - file-4.15-2.5.0_kolab
 
-	Resolved:
-	  kolab/issue1458 (Password protected .sxw files can be banned by
-	                   amavisd, as a result of the file command)
+	kolab/issue1458 (Password protected .sxw files can be banned by
+	                 amavisd, as a result of the file command)
 
-      - openldap-2.3.27-2.20061018_kolab
+    - openldap-2.3.27-2.20061018_kolab
 
-	Resolved:
-	  kolab/issue1229 (Master openldap's slurpd fails to start after
-	                   adding slave)
-	  kolab/issue1431 (Slave cannot access master ldap server via SSL)
+	New upstream version, fixes CVE-2006-4600 (Bugtraq ID 19832)
+	and other problems.
 
+	kolab/issue1229 (Master openldap's slurpd fails to start after
+	                 adding slave)
+	kolab/issue1431 (Slave cannot access master ldap server via SSL)
 
-    Kolab updates:
+    - imapd-2.2.12-2.5.0_kolab2
 
-      - perl-kolab-5.8.7-2006????
+	Fix folder structure for foldernames with non-alphanumeric characters,
+	using skiplist as the database backend for mailboxes.db.
 
-	Resolved:
+    - perl-kolab-5.8.7-20061103
 
-      - kolabd-2.0.99-2006????
+	kolab/issue1194 (serious performance problem on high number of users)
 
-	Resolved:
+    - kolabd-2.0.99-20061103
 
-      - kolab-webadmin-2.0.99-2006????
+	Added missing relay service for postfix.
 
-	Resolved:
+	Changed main.cf masquerading defaults so email to
+	user at machine.example.org is actually delivered.
 
-      - kolab-resource-handlers-2.0.99-2006????
+	Use mailbox_transport instead of local_transport for
+	kolabmailboxfilter to work around issue825.
 
-	Resolved:
+	Removed doubled attribute cyrus-autocreatequota.
+
+	Added indexes for delegate and delete.
+
+	Updated freebusy.conf template for freebusy IMAP caching.
 
+	kolab/issue824 (kolabmailboxfilter run once for each recipient)
+	kolab/issue1264 (Add support for sieve based notifications)
+	kolab/issue1273 (Sending as delegate broken in Kolab server 2.1)
+	kolab/issue1428 (Fixed locking issue)
+
+    - kolab-webadmin-2.0.99-20061103
+
+	Fixes for setting folder type of shared folders.
+
+	Guard against large number of users.
+
+	kolab/issue1457 (updated French translation)
+
+    - kolab-resource-handlers-2.0.99-20061103
+
+	Improvements and fixes for freebusy IMAP caching.
+
+	kolab/issue815 (invitation replies vanish in resmgr)
+	kolab/issue957 (All-day events from Outlook don't show up in freebusy)
+	kolab/issue974 (Localize the text for rewritten From: headers)
+	kolab/issue1042 (empty lines at the end of mails delivered via LMTP)
+	kolab/issue1352 (resmgr can create wrong range dates)
+	kolab/issue1422 (Dummy freebusy info)
 
 
 Changes since 2.1 beta 1:



From cvs at kolab.org  Fri Nov  3 18:34:25 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 18:34:25 +0100 (CET)
Subject: thomas: server/imapd Makefile,1.28,1.29 
Message-ID: <20061103173425.777491006CB@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Increased KOLABRELEASE in imapd/Makefile, too.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile	31 Aug 2006 10:19:20 -0000	1.28
+++ Makefile	3 Nov 2006 17:34:23 -0000	1.29
@@ -11,7 +11,7 @@
 PACKAGE=imapd
 VERSION=2.2.12
 RELEASE=2.5.0
-KOLABRELEASE=2.5.0_kolab
+KOLABRELEASE=2.5.0_kolab2
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`



From cvs at kolab.org  Fri Nov  3 18:55:47 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 18:55:47 +0100 (CET)
Subject: thomas: server/apache Makefile,1.21,1.22 kolab.patch,1.9,1.10 
Message-ID: <20061103175547.9C5CD1006CC@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Updated apache, curl and gzip versions. Adjust release notes and obmtool.conf


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	20 Dec 2005 09:18:50 -0000	1.21
+++ Makefile	3 Nov 2006 17:55:45 -0000	1.22
@@ -10,8 +10,8 @@
 
 PACKAGE=apache
 VERSION=1.3.33
-RELEASE=2.5.5
-KOLABRELEASE=2.5.5_kolab
+RELEASE=2.5.6
+KOLABRELEASE=2.5.6_kolab
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache/kolab.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.patch	15 Dec 2005 16:26:53 -0000	1.9
+++ kolab.patch	3 Nov 2006 17:55:45 -0000	1.10
@@ -1,15 +1,15 @@
---- apache.spec.orig	Wed Dec  7 18:43:26 2005
-+++ apache.spec	Wed Dec  7 18:43:26 2005
-@@ -65,7 +65,7 @@ Class:        BASE
+--- 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 @@
  Group:        Web
  License:      ASF
  Version:      %{V_apache}
--Release:      2.5.5
-+Release:      2.5.5_kolab
+-Release:      2.5.6
++Release:      2.5.6_kolab
  
  #   package options (suexec related)
  %option       with_suexec               yes
-@@ -214,6 +214,10 @@ Patch1:       apache.patch.modowa
+@@ -214,6 +214,10 @@
  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 @@ AutoReqProv:  no
+@@ -527,6 +531,9 @@
  %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 @@ AutoReqProv:  no
+@@ -561,6 +568,7 @@
  %endif
  %if "%{with_mod_auth_ldap}" == "yes"
      %setup -q -T -D -a 14



From cvs at kolab.org  Fri Nov  3 18:55:47 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 18:55:47 +0100 (CET)
Subject: thomas: server obmtool.conf,1.231,1.232 release-notes.txt,1.44,1.45 
Message-ID: <20061103175547.967321006CB@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf release-notes.txt 
Log Message:
Updated apache, curl and gzip versions. Adjust release notes and obmtool.conf


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- obmtool.conf	3 Nov 2006 15:56:10 -0000	1.231
+++ obmtool.conf	3 Nov 2006 17:55:45 -0000	1.232
@@ -69,7 +69,7 @@
     @install ${loc}grep-2.5.1a-2.5.0
     @install ${loc}texinfo-4.8-2.5.1
     @install ${loc}diffutils-2.8.7-2.5.0
-    @install ${loc}gzip-1.3.5-2.5.0
+    @install ${loc}gzip-1.3.5-2.5.1
     @install ${loc}zlib-1.2.3-2.5.0
     @install ${loc}expat-1.95.8-2.5.0
     @install ${loc}perl-term-5.8.7-2.5.0
@@ -116,18 +116,18 @@
     @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.5_kolab \
-        --with=mod_auth_ldap \
-        --with=mod_dav \
-        --with=mod_php \
+    @trigger ${altloc}apache-1.3.33-2.5.6_kolab \
+	--with=mod_auth_ldap \
+	--with=mod_dav \
+	--with=mod_php \
 	--with=mod_php_zlib \
-        --with=mod_php_gdbm \
-        --with=mod_php_gettext \
-        --with=mod_php_imap \
-        --with=mod_php_openldap \
-        --with=mod_php_xml \
+	--with=mod_php_gdbm \
+	--with=mod_php_gettext \
+	--with=mod_php_imap \
+	--with=mod_php_openldap \
+	--with=mod_php_xml \
 	--with=mod_php_dom \
-        --with=mod_ssl \
+	--with=mod_ssl \
 	--with=mod_php_mbstring
     @trigger ${altloc}php-4.4.0-2.5.2_kolab \
 	--with=zlib \
@@ -144,7 +144,7 @@
     @install ${loc}gmp-4.1.4-2.5.0
     @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.1
+    @trigger ${loc}curl-7.15.0-2.5.2
     @install ${altloc}clamav-0.88.5-2.20061018
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
@@ -157,14 +157,14 @@
     @check
 
     if test ! -e "/usr/bin/kolab" ; then
-    	echo
+	echo
 	echo "Adding symbolic link to $PREFIX/bin/kolab as /usr/bin/kolab"
 	ln -s $PREFIX/bin/kolab /usr/bin/kolab
     fi
 
 
 
-    
+
 
 %dump
     echo "PRG = \"$PRG\""

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- release-notes.txt	3 Nov 2006 16:52:58 -0000	1.44
+++ release-notes.txt	3 Nov 2006 17:55:45 -0000	1.45
@@ -35,9 +35,6 @@
 
     - If modifying or deleting of address book entries doesn't work,
       restarting openldap can help, see Issue854 for details.
-      Deleting address book entries doesn't automatically remove them
-      from distribution lists like it is done for users, see Issue848
-      for details.
 
 
 Changes since 2.1 beta 2:
@@ -46,6 +43,18 @@
 
 	New upstream version.
 
+    - apache-1.3.33-2.5.6
+
+	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.015-apache.html
+
+    - gzip-1.3.5-2.5.1
+
+	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.020-gzip.html
+
+    - curl-7.15.0-2.5.2
+
+	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.012-curl.html
+
     - openssl-0.9.8a-2.5.4
 
 	denial of service, may allow execution of arbitrary code
@@ -99,7 +108,7 @@
 
 	Updated freebusy.conf template for freebusy IMAP caching.
 
-	kolab/issue824 (kolabmailboxfilter run once for each recipient)
+	kolab/issue824  (kolabmailboxfilter run once for each recipient)
 	kolab/issue1264 (Add support for sieve based notifications)
 	kolab/issue1273 (Sending as delegate broken in Kolab server 2.1)
 	kolab/issue1428 (Fixed locking issue)
@@ -116,9 +125,9 @@
 
 	Improvements and fixes for freebusy IMAP caching.
 
-	kolab/issue815 (invitation replies vanish in resmgr)
-	kolab/issue957 (All-day events from Outlook don't show up in freebusy)
-	kolab/issue974 (Localize the text for rewritten From: headers)
+	kolab/issue815  (invitation replies vanish in resmgr)
+	kolab/issue957  (All-day events from Outlook don't show up in freebusy)
+	kolab/issue974  (Localize the text for rewritten From: headers)
 	kolab/issue1042 (empty lines at the end of mails delivered via LMTP)
 	kolab/issue1352 (resmgr can create wrong range dates)
 	kolab/issue1422 (Dummy freebusy info)



From cvs at kolab.org  Fri Nov  3 19:05:04 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 19:05:04 +0100 (CET)
Subject: thomas: server release-notes.txt,1.45,1.46 
Message-ID: <20061103180504.5695A1006CB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Added some details to apache, gzip and curl security upgrade.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- release-notes.txt	3 Nov 2006 17:55:45 -0000	1.45
+++ release-notes.txt	3 Nov 2006 18:05:02 -0000	1.46
@@ -45,14 +45,18 @@
 
     - apache-1.3.33-2.5.6
 
+	denial of service and possibly arbitrary code execution via crafted
+	URLs that are not properly handled using certain rewrite rules.
 	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.015-apache.html
 
     - gzip-1.3.5-2.5.1
 
+	denial of service, arbitrary code execution
 	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.020-gzip.html
 
     - curl-7.15.0-2.5.2
 
+	buffer overflow
 	http://www.openpkg.org/security/advisories/OpenPKG-SA-2006.012-curl.html
 
     - openssl-0.9.8a-2.5.4



From cvs at kolab.org  Fri Nov  3 19:21:10 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 19:21:10 +0100 (CET)
Subject: thomas: server release-notes.txt,1.46,1.47 
Message-ID: <20061103182110.D7FBB1006CB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Add more detailed notes about hashimapspool to release notes.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- release-notes.txt	3 Nov 2006 18:05:02 -0000	1.46
+++ release-notes.txt	3 Nov 2006 18:21:08 -0000	1.47
@@ -19,6 +19,20 @@
       manage settings for a subset of the mail domains of the kolab
       server.
 
+    - Hashed IMAP spool
+
+      The default imapd configuration has been changed to enable the
+      hashimapspool option.  This means that in 2.1 the default directory
+      layout of the imapd spool (/kolab/var/imapd/spool/) is different from
+      the one in 2.0. When you upgrade from 2.0 it's best to keep using the
+      old structure, so remove or comment out the corresponding line in
+      /kolab/etc/kolab/templates/imapd.conf.template *before* running
+      kolabconf. For new installations the new default setting is recommended
+      because it's more efficient especially when you have many mailboxes.
+
+      For some background information about this see the dicussion at
+      https://intevation.de/roundup/kolab/issue1089
+
 
 Known problems:
 



From cvs at kolab.org  Fri Nov  3 19:36:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  3 Nov 2006 19:36:20 +0100 (CET)
Subject: thomas: server release-notes.txt,1.47,1.48 
Message-ID: <20061103183620.9C8BE1006CB@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Added hint about kolab/issue1262 (Cyrus IMAP quota >4096MB).
Use kolab/issueXXX format in Changes/Known problems.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- release-notes.txt	3 Nov 2006 18:21:08 -0000	1.47
+++ release-notes.txt	3 Nov 2006 18:36:18 -0000	1.48
@@ -29,9 +29,7 @@
       /kolab/etc/kolab/templates/imapd.conf.template *before* running
       kolabconf. For new installations the new default setting is recommended
       because it's more efficient especially when you have many mailboxes.
-
-      For some background information about this see the dicussion at
-      https://intevation.de/roundup/kolab/issue1089
+      For details see kolab/issue1089.
 
 
 Known problems:
@@ -43,13 +41,15 @@
 
 	/kolab/bin/openpkg rc kolabd restart
 
-      See Issue1068 (Mailboxes are not created until kolabd restart) and
-      Issue1098 (Changes in the service tab are not accepted after
+      See kolab/issue1068 (Mailboxes are not created until kolabd restart)
+      and kolab/ssue1098 (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 Issue854 for details.
+      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 2:
 



From cvs at kolab.org  Sat Nov  4 04:04:53 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  4 Nov 2006 04:04:53 +0100 (CET)
Subject: steffen: server/openldap Makefile,1.15,1.16 
Message-ID: <20061104030453.1812E1006D0@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
fixed version

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	24 Oct 2006 13:22:18 -0000	1.15
+++ Makefile	4 Nov 2006 03:04:50 -0000	1.16
@@ -1,5 +1,5 @@
 ifeq "x$(KOLABPKGURI)" "x"
-  KOLABPKGURI = ftp://ftp.openpkg.org/stable/2.20061018/SRC/BASE/
+  KOLABPKGURI = ftp://ftp.openpkg.org/stable/2.20061018/SRC/BASE
 endif
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,8 +10,8 @@
 
 PACKAGE=openldap
 VERSION=2.3.27
-RELEASE=20061018
-KOLABRELEASE=20061018_kolab
+RELEASE=2.20061018
+KOLABRELEASE=2.20061018_kolab
 
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`



From cvs at kolab.org  Mon Nov  6 14:22:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:38 +0100 (CET)
Subject: steffen: server Makefile,1.11,1.12 
Message-ID: <20061106132238.BAB3C1005C6@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	31 Aug 2006 14:24:55 -0000	1.11
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.12
@@ -1,6 +1,7 @@
 dist:
 	rm -rf stage
 	mkdir stage
+	cd file && make dist
 	cd imap && make dist
 	cd apache && make dist
 	cd php && make dist
@@ -14,5 +15,4 @@
 	cd kolab-resource-handlers && make dist
 	cd php-smarty && make dist
 	cd kolab-webadmin && make dist
-	#cd stage && wget -c `/kolab/bin/openpkg register -R ftp://ftp.openpkg.org/current/SRC/clamav-0.88-20060524.src.rpm`
 	cd stage && cp ../obmtool ../obmtool.conf ../README.1st . && echo "Remember to update obmtool.conf!"



From cvs at kolab.org  Mon Nov  6 14:22:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:38 +0100 (CET)
Subject: steffen: server/file Makefile,1.1,1.2 
Message-ID: <20061106132238.BFF391006A9@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/file/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	19 Oct 2006 02:31:30 -0000	1.1
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.2
@@ -4,6 +4,9 @@
 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
@@ -16,18 +19,21 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab-filemagic.patch kolab.patch
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 	cp $(KOLABCVSDIR)/kolab-filemagic.patch $(KOLABRPMSRC)/$(PACKAGE)/
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for file.spec
 	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 $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp -p $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)



From cvs at kolab.org  Mon Nov  6 14:22:39 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:39 +0100 (CET)
Subject: steffen: server/perl-kolab Makefile.cvs,1.6,1.7 
Message-ID: <20061106132239.1034D1006B6@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile.cvs 
Log Message:
avoid rebuilding everything every time

Index: Makefile.cvs
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.cvs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.cvs	20 Dec 2005 14:34:51 -0000	1.6
+++ Makefile.cvs	6 Nov 2006 13:22:36 -0000	1.7
@@ -1,6 +1,12 @@
 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=perl-kolab
 #RELEASE=2.5.5



From cvs at kolab.org  Mon Nov  6 14:22:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:38 +0100 (CET)
Subject: steffen: server/apache Makefile,1.22,1.23 
Message-ID: <20061106132238.BE4441005C9@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile	3 Nov 2006 17:55:45 -0000	1.22
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.23
@@ -4,6 +4,9 @@
 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
@@ -16,14 +19,16 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES = $(KOLABCVSDIR)/mod_auth_ldap.patch \
+	$(KOLABCVSDIR)/../php/php-getacl-backport.patch \
+	$(KOLABCVSDIR)/../php/php-imap-annotation.patch \
+	$(KOLABCVSDIR)/../php/php-imap-status-current.patch
 
-	cp $(KOLABCVSDIR)/mod_auth_ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/../php/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/../php/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/../php/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 		--define 'with_mod_auth_ldap yes' \
 		--define 'with_mod_dav yes' \
@@ -36,6 +41,8 @@
 		--define 'with_mod_php_xml yes' \
 		--define 'with_mod_php_dom yes' \
 		--define 'with_mod_ssl yes' 
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+
 
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm



From cvs at kolab.org  Mon Nov  6 14:22:39 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:39 +0100 (CET)
Subject: steffen: server/php Makefile,1.4,1.5 
Message-ID: <20061106132239.1EE4A1005C9@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	20 Dec 2005 09:18:50 -0000	1.4
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.5
@@ -4,6 +4,9 @@
 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
@@ -16,12 +19,16 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES = $(KOLABCVSDIR)/php-getacl-backport.patch \
+	$(KOLABCVSDIR)/php-imap-annotation.patch \
+	$(KOLABCVSDIR)/php-imap-status-current.patch
 
-	cp $(KOLABCVSDIR)/php-getacl-backport.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/php-imap-annotation.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/php-imap-status-current.patch $(KOLABRPMSRC)/$(PACKAGE)/
+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
+
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec \
 		--define 'with_zlib yes' \
@@ -34,12 +41,13 @@
 		--define 'with_dom yes' \
 		--define 'with_ssl yes' \
 		--define 'with_mbstring yes'
+	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 $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)* 



From cvs at kolab.org  Mon Nov  6 14:22:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:38 +0100 (CET)
Subject: steffen: server/imap Makefile,1.5,1.6 
Message-ID: <20061106132238.DCD121006AD@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imap/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	20 Dec 2005 09:18:50 -0000	1.5
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.6
@@ -4,6 +4,9 @@
 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
@@ -16,18 +19,22 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=$(KOLABCVSDIR)/imap.annotate.patch
+
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm kolab.patch Makefile
+	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/   # Patch to add annotate support  
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for imap.spec
-	cp $(KOLABCVSDIR)/imap.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/   # Patch to add annotate support  
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_annotate yes'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
 
 imap-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/imap-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp -p $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/imap-*



From cvs at kolab.org  Mon Nov  6 14:22:39 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:39 +0100 (CET)
Subject: steffen: server/postfix Makefile,1.15,1.16 
Message-ID: <20061106132239.1FD141006C2@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	20 Dec 2005 09:53:48 -0000	1.15
+++ Makefile	6 Nov 2006 13:22:37 -0000	1.16
@@ -4,6 +4,9 @@
 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
@@ -16,19 +19,24 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=$(KOLABCVSDIR)/postfix-ldap-leafonly.patch \
+	$(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch
+
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
-	cp $(KOLABCVSDIR)/postfix-ldap-leafonly.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/postfix-pipe-allow-empty-sender.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for postfix.spec
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_ldap yes' --define 'with_sasl yes' --define 'with_ssl yes'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
 
 postfix-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/postfix-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch
+	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm



From cvs at kolab.org  Mon Nov  6 14:22:39 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:39 +0100 (CET)
Subject: steffen: server/openldap Makefile,1.16,1.17 
Message-ID: <20061106132239.110EE1006C1@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	4 Nov 2006 03:04:50 -0000	1.16
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.17
@@ -4,6 +4,9 @@
 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
@@ -16,18 +19,23 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+PATCHES=
+
+$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(PATCHES) $(KOLABCVSDIR)/kolab.patch Makefile
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for openldap.spec
 
 	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 $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
 	rm -rf /kolab/RPM/TMP/$(PACKAGE)



From cvs at kolab.org  Mon Nov  6 14:22:39 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  6 Nov 2006 14:22:39 +0100 (CET)
Subject: steffen: server/imapd Makefile,1.29,1.30 
Message-ID: <20061106132239.0F54C1005C6@lists.intevation.de>

Author: steffen

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

Modified Files:
	Makefile 
Log Message:
avoid rebuilding everything every time

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile	3 Nov 2006 17:34:23 -0000	1.29
+++ Makefile	6 Nov 2006 13:22:36 -0000	1.30
@@ -4,6 +4,9 @@
 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
@@ -16,24 +19,30 @@
 RPM=/kolab/bin/openpkg rpm
 KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`
 
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=$(KOLABCVSDIR)/cyradm.annotate.patch \
+	$(KOLABCVSDIR)/imapd.annotate.patch \
+	$(KOLABCVSDIR)/imapd.morelogging.patch \
+	$(KOLABCVSDIR)/imapd.group2.patch \
+	$(KOLABCVSDIR)/imapd-goodchars.patch \
+	$(KOLABCVSDIR)/imapd.folderchar.patch \
+	$(KOLABCVSDIR)/kolab-ldap.patch
+
+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.rpm
 
-	cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/imapd.morelogging.patch $(KOLABRPMSRC)/$(PACKAGE)/
+	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
+
 	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for imapd.spec
-	cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/$(PACKAGE)/    # Patch for case insensitive group match
-	cp $(KOLABCVSDIR)/imapd-goodchars.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for allowing special chars in mailbox names
-	cp $(KOLABCVSDIR)/imapd.folderchar.patch $(KOLABRPMSRC)/$(PACKAGE)/
-	cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/$(PACKAGE)/      
 	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_group yes' --define 'with_atvdom yes' --define 'with_annotate yes' --define 'with_ldap yes' --define 'with_goodchars yes' --define 'with_morelogging yes'
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
 
 imapd-$(VERSION)-$(RELEASE).src.rpm:
 	wget -c $(KOLABPKGURI)/imapd-$(VERSION)-$(RELEASE).src.rpm
 
 dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
 
 clean:
-	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch
+	rm -rf /kolab/RPM/TMP/cyrus-imapd* cyrus* imapd* rc.imapd vhosthack.patch fsl.imapd groupfile.patch $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm



From cvs at kolab.org  Wed Nov  8 17:30:14 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  8 Nov 2006 17:30:14 +0100 (CET)
Subject: thomas: server obmtool.conf,1.232,1.233 
Message-ID: <20061108163014.1324D1006A9@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf 
Log Message:
Updated release numbers of some kolab packages from 20061103 to 20061106


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- obmtool.conf	3 Nov 2006 17:55:45 -0000	1.232
+++ obmtool.conf	8 Nov 2006 16:30:11 -0000	1.233
@@ -148,11 +148,11 @@
     @install ${altloc}clamav-0.88.5-2.20061018
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20061103
-    @install ${altloc}kolabd-2.0.99-20061103 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20061103 --define kolab_version=$kolab_version
+    @install ${altloc}perl-kolab-5.8.7-20061106
+    @install ${altloc}kolabd-2.0.99-20061106 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-webadmin-2.0.99-20061106 --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-20061103 --define kolab_version=$kolab_version
+    @install ${altloc}kolab-resource-handlers-2.0.99-20061106 --define kolab_version=$kolab_version
     @install ${altloc}kolab-horde-fbview-2.0.99-20051220 --define kolab_version=$kolab_version
     @check
 



From cvs at kolab.org  Thu Nov  9 18:50:41 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  9 Nov 2006 18:50:41 +0100 (CET)
Subject: thomas: server release-notes.txt,1.48,1.49 
Message-ID: <20061109175041.E01D71005C9@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Mark release date as currently unkown.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- release-notes.txt	3 Nov 2006 18:36:18 -0000	1.48
+++ release-notes.txt	9 Nov 2006 17:50:39 -0000	1.49
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 20061103, Kolab Server 2.1 beta 3-cvs)
+(Version 200611??, Kolab Server 2.1 beta 3-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
@@ -106,11 +106,11 @@
 	Fix folder structure for foldernames with non-alphanumeric characters,
 	using skiplist as the database backend for mailboxes.db.
 
-    - perl-kolab-5.8.7-20061103
+    - perl-kolab-5.8.7-200611??
 
 	kolab/issue1194 (serious performance problem on high number of users)
 
-    - kolabd-2.0.99-20061103
+    - kolabd-2.0.99-200611??
 
 	Added missing relay service for postfix.
 
@@ -131,7 +131,7 @@
 	kolab/issue1273 (Sending as delegate broken in Kolab server 2.1)
 	kolab/issue1428 (Fixed locking issue)
 
-    - kolab-webadmin-2.0.99-20061103
+    - kolab-webadmin-2.0.99-200611??
 
 	Fixes for setting folder type of shared folders.
 
@@ -139,7 +139,7 @@
 
 	kolab/issue1457 (updated French translation)
 
-    - kolab-resource-handlers-2.0.99-20061103
+    - kolab-resource-handlers-2.0.99-200611??
 
 	Improvements and fixes for freebusy IMAP caching.
 



From cvs at kolab.org  Thu Nov  9 18:53:26 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  9 Nov 2006 18:53:26 +0100 (CET)
Subject: thomas: server release-notes.txt,1.49,1.50 
Message-ID: <20061109175326.56D5A1005C9@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue1387 (resmgr replies to replies creating mail loop):
only send ACT_ALWAYS_REJECT replies if the itip method is REQUEST
(patch forward-ported from 2.0 branch)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- release-notes.txt	9 Nov 2006 17:50:39 -0000	1.49
+++ release-notes.txt	9 Nov 2006 17:53:24 -0000	1.50
@@ -148,6 +148,7 @@
 	kolab/issue974  (Localize the text for rewritten From: headers)
 	kolab/issue1042 (empty lines at the end of mails delivered via LMTP)
 	kolab/issue1352 (resmgr can create wrong range dates)
+	kolab/issue1387 (resmgr replies to replies creating mail loop)
 	kolab/issue1422 (Dummy freebusy info)
 
 



From cvs at kolab.org  Thu Nov  9 18:53:26 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  9 Nov 2006 18:53:26 +0100 (CET)
Subject: thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	resmgr.php.in, 1.10, 1.11 
Message-ID: <20061109175326.585CB1005CC@lists.intevation.de>

Author: thomas

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

Modified Files:
	resmgr.php.in 
Log Message:
kolab/issue1387 (resmgr replies to replies creating mail loop):
only send ACT_ALWAYS_REJECT replies if the itip method is REQUEST
(patch forward-ported from 2.0 branch)


Index: resmgr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- resmgr.php.in	25 Oct 2006 02:28:57 -0000	1.10
+++ resmgr.php.in	9 Nov 2006 17:53:24 -0000	1.11
@@ -1180,9 +1180,14 @@
 	" and ends on <$dtend> " . iCalDate2Kolab($dtend), RM_LOG_DEBUG);
 
   if ($params['action'] == RM_ACT_ALWAYS_REJECT) {
-    myLog("Rejecting $method method");
-    sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE);
-    return false;//shutdown(0);
+    if ($method == 'REQUEST') {
+      myLog("Rejecting $method method");
+      sendITipReply($cn,$resource,$itip,RM_ITIP_DECLINE);
+      return false;//shutdown(0);
+    } else {
+      myLog("Passing through $method method for ACT_ALWAYS_REJECT policy");
+      return true;
+    }
   }
 
   $is_update = false;



From cvs at kolab.org  Thu Nov  9 19:17:07 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  9 Nov 2006 19:17:07 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates imapd.conf.template.in, 1.7,
	1.8 
Message-ID: <20061109181707.EAB791005CC@lists.intevation.de>

Author: thomas

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

Modified Files:
	imapd.conf.template.in 
Log Message:
kolab/issue840: Changed imapd.conf template to use berkeley db
instead of skiplist for annotations.db and mailboxes.db as a workaround
and add documentation for this.


Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- imapd.conf.template.in	12 Jul 2006 22:58:46 -0000	1.7
+++ imapd.conf.template.in	9 Nov 2006 18:17:05 -0000	1.8
@@ -77,3 +77,7 @@
 notifysocket: @imap_notify_socket@
 sievenotifier: mailto
 mailnotifier: mailto
+
+# use berkeley db backend instead of skiplist
+annotation_db: berkeley
+mboxlist_db: berkeley



From cvs at kolab.org  Thu Nov  9 19:17:07 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  9 Nov 2006 19:17:07 +0100 (CET)
Subject: thomas: server README.1st,1.36,1.37 release-notes.txt,1.50,1.51 
Message-ID: <20061109181707.E5FC31005C9@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st release-notes.txt 
Log Message:
kolab/issue840: Changed imapd.conf template to use berkeley db
instead of skiplist for annotations.db and mailboxes.db as a workaround
and add documentation for this.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- README.1st	12 Jun 2006 16:51:12 -0000	1.36
+++ README.1st	9 Nov 2006 18:17:05 -0000	1.37
@@ -199,5 +199,37 @@
 https://intevation.de/roundup/kolab/issue1100
 
 
+Upgrade from 2.1-beta-2
+-----------------------
+
+1. database format for annotations.db and mailboxes.db
+
+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, by either running
+/kolab/sbin/kolabconf or changing it manually there, too.
+
+To convert the databases to berkeley db format, execute as root:
+
+  /kolab/bin/openpkg rc imapd stop
+  su - kolab-r
+  cd /kolab/var/imapd/
+  mv annotations.db annotations.db-skiplist
+  cvt_cyrusdb /kolab/var/imapd/annotations.db-skiplist skiplist \
+              /kolab/var/imapd/annotations.db berkeley
+  mv mailboxes.db mailboxes.db-skiplist
+  cvt_cyrusdb /kolab/var/imapd/mailboxes.db-skiplist skiplist \
+              /kolab/var/imapd/mailboxes.db berkeley
+  exit
+  /kolab/bin/openpkg rc imapd start
+
+See http://wiki.kolab.org/index.php/Kolab2_IMAPD_annotations.db_Problems
+for details about this topic.
+
+
 $Id$
 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- release-notes.txt	9 Nov 2006 17:53:24 -0000	1.50
+++ release-notes.txt	9 Nov 2006 18:17:05 -0000	1.51
@@ -126,6 +126,10 @@
 
 	Updated freebusy.conf template for freebusy IMAP caching.
 
+	Changed imapd.conf template to use berkeley db instead of
+	skiplist for annotations.db and mailboxes.db as a workaround
+	for kolab/issue840 (Annotations needs to be more robust).
+
 	kolab/issue824  (kolabmailboxfilter run once for each recipient)
 	kolab/issue1264 (Add support for sieve based notifications)
 	kolab/issue1273 (Sending as delegate broken in Kolab server 2.1)



From cvs at kolab.org  Fri Nov 10 11:26:03 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 11:26:03 +0100 (CET)
Subject: thomas: doc/www/src cvs-kolab.html.m4,1.10,1.11 
Message-ID: <20061110102603.4B6461005C6@lists.intevation.de>

Author: thomas

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

Modified Files:
	cvs-kolab.html.m4 
Log Message:
Fixed typo: utulities -> utilities


Index: cvs-kolab.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/cvs-kolab.html.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cvs-kolab.html.m4	1 Aug 2005 13:15:14 -0000	1.10
+++ cvs-kolab.html.m4	10 Nov 2006 10:26:01 -0000	1.11
@@ -35,7 +35,7 @@
 <b>Main Modules</b>
     server: The Kolab Server
     doc:    Documentation
-    util:   Various utulities
+    util:   Various utilities
 </pre>
 </p>
 



From cvs at kolab.org  Fri Nov 10 11:40:19 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 11:40:19 +0100 (CET)
Subject: thomas: doc/www/src cvs-kolab.html.m4,1.11,1.12 
Message-ID: <20061110104019.373E91005C6@lists.intevation.de>

Author: thomas

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

Modified Files:
	cvs-kolab.html.m4 
Log Message:
Another typo and clarification that 1.0 branch is no longer used.


Index: cvs-kolab.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/cvs-kolab.html.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cvs-kolab.html.m4	10 Nov 2006 10:26:01 -0000	1.11
+++ cvs-kolab.html.m4	10 Nov 2006 10:40:17 -0000	1.12
@@ -43,7 +43,7 @@
 
 <ul>
 <li><strong>Kolab-2 Development</strong><p>
- Also know as HEAD; this branch is open for development.<br>
+ Also known as HEAD; this branch is open for development.<br>
  To checkout use : <code>cvs checkout</code>
 </p>
 </li>
@@ -52,8 +52,8 @@
  To checkout use : <code>cvs checkout -r kolab_2_0_branch modulename</code>
  </p>
 </li>
-<li><strong>Kolab-1 Stable</strong><p>
- This is the current release of Kolab and is used for bugfixes.<br>
+<li><strong>Kolab-1 Stable</strong> (inactive)<p>
+ This is the last status of Kolab 1.0 and was used for bugfixes.<br>
  To checkout use : <code>cvs checkout -r KOLAB_1_0 modulename</code>
  </p>
 </li>



From cvs at kolab.org  Fri Nov 10 12:31:36 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 12:31:36 +0100 (CET)
Subject: thomas: server obmtool.conf, 1.174.2.39, 1.174.2.40 release-notes.txt,
	1.15.2.19, 1.15.2.20 
Message-ID: <20061110113136.183451005C6@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	obmtool.conf release-notes.txt 
Log Message:
Added perl-dns to make DNS blacklists work within SpamAssassin.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.174.2.39
retrieving revision 1.174.2.40
diff -u -d -r1.174.2.39 -r1.174.2.40
--- obmtool.conf	24 Oct 2006 15:39:11 -0000	1.174.2.39
+++ obmtool.conf	10 Nov 2006 11:31:34 -0000	1.174.2.40
@@ -83,6 +83,7 @@
     @install ${loc}perl-comp-5.8.7-2.4.0
     @trigger ${loc}perl-ssl-5.8.7-2.4.0
     @install ${loc}perl-www-5.8.7-2.4.0
+    @install ${loc}perl-dns-5.8.7-2.4.0
     @trigger ${altloc}imap-2004d-2.4.0_kolab --with=annotate
     @trigger ${loc}procmail-3.22-2.4.0
     @install ${loc}db-4.2.52.2-2.2.0

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.19
retrieving revision 1.15.2.20
diff -u -d -r1.15.2.19 -r1.15.2.20
--- release-notes.txt	28 Aug 2006 11:08:09 -0000	1.15.2.19
+++ release-notes.txt	10 Nov 2006 11:31:34 -0000	1.15.2.20
@@ -1,23 +1,20 @@
 Release notes Kolab2 Server
-(Version CVS, Kolab Server 2.0.x)
+(Version 2006????, Kolab Server 2.0.4+CVS)
 
-Changes since 2.0.4:
+For upgrading and installation instructions, please refer to the
+1st.README file in the source directory.
 
-      - kolabd 
-      
-      	Changed main.cf email masquerading defaults 
-	so that email to usera at machine.example.org
-	that reaches the server machine is actually delivered.
+Changes since 2.0.4:
 
-(Version 20060811, Kolab Server 2.0.4)
+    - perl-dns-5.8.7-2.4.0
 
-For upgrading and installation instructions, please refer to the
-1st.README file in the source directory.
+	Added package to make DNS blacklists work within SpamAssassin.
 
-This release fixes several security problems in apache, clamav, openldap
-and binutils.  See below for more details.
+    - kolabd-1.9.4-2006????
 
-Upgrading is recommended.
+	Changed main.cf email masquerading defaults so that email to
+	user at machine.example.org that reaches the server machine is
+	actually delivered.
 
 
 Changes since 2.0.3:



From cvs at kolab.org  Fri Nov 10 17:08:22 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 17:08:22 +0100 (CET)
Subject: thomas: server release-notes.txt,1.51,1.52 
Message-ID: <20061110160822.359E91005C9@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Issue1433: Some files in /kolab/etc/postfix have wrong ownership.
Change owner to root in the templates so 'make' doesn't abort with
permission denied when trying to create virtual.db and transport.db.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- release-notes.txt	9 Nov 2006 18:17:05 -0000	1.51
+++ release-notes.txt	10 Nov 2006 16:08:20 -0000	1.52
@@ -134,6 +134,7 @@
 	kolab/issue1264 (Add support for sieve based notifications)
 	kolab/issue1273 (Sending as delegate broken in Kolab server 2.1)
 	kolab/issue1428 (Fixed locking issue)
+	kolab/issue1433 (Some files in /kolab/etc/postfix have wrong ownership)
 
     - kolab-webadmin-2.0.99-200611??
 



From cvs at kolab.org  Fri Nov 10 17:08:22 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 17:08:22 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates transport.template.in, 1.3,
	1.4 virtual.template.in, 1.3, 1.4 
Message-ID: <20061110160822.39B701006A9@lists.intevation.de>

Author: thomas

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

Modified Files:
	transport.template.in virtual.template.in 
Log Message:
Issue1433: Some files in /kolab/etc/postfix have wrong ownership.
Change owner to root in the templates so 'make' doesn't abort with
permission denied when trying to create virtual.db and transport.db.


Index: transport.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/transport.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- transport.template.in	4 Feb 2006 18:19:58 -0000	1.3
+++ transport.template.in	10 Nov 2006 16:08:20 -0000	1.4
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/transport
 PERMISSIONS=0640
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+OWNERSHIP=root:@emailserver_grp@
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>

Index: virtual.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/virtual.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- virtual.template.in	4 Feb 2006 18:19:58 -0000	1.3
+++ virtual.template.in	10 Nov 2006 16:08:20 -0000	1.4
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/virtual
 PERMISSIONS=0640
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+OWNERSHIP=root:@emailserver_grp@
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>



From cvs at kolab.org  Fri Nov 10 17:31:14 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 17:31:14 +0100 (CET)
Subject: thomas: server README.1st,1.37,1.38 
Message-ID: <20061110163114.641AD1006AA@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Docs for manually fixing ownership of postfix config files (for issue1433)


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- README.1st	9 Nov 2006 18:17:05 -0000	1.37
+++ README.1st	10 Nov 2006 16:31:12 -0000	1.38
@@ -202,7 +202,22 @@
 Upgrade from 2.1-beta-2
 -----------------------
 
-1. database format for annotations.db and mailboxes.db
+1. postfix: ownership of virtual and transport:
+
+The owner of two config files has to be root, otherwise postfix will
+change to an unprivileged user for creating the corresponding .db files,
+isn't able to write them after the upgrade and fails to create further
+database files which don't get generated from kolab templates.
+
+To correct the file owner, execute the following commands as root:
+  cd /kolab/etc/postfix
+  chown root transport virtual
+  make
+
+See kolab/issue1433 for details about this topic.
+
+
+2. imapd: database format for annotations.db and mailboxes.db
 
 The default database format for /kolab/var/imapd/annotations.db and
 /kolab/var/imapd/mailboxes.db has changed from skiplist to berkeley db.



From cvs at kolab.org  Fri Nov 10 19:06:22 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 19:06:22 +0100 (CET)
Subject: thomas: server/kolabd/kolabd kolab_bootstrap.in,1.23,1.24 
Message-ID: <20061110180622.A18C81005C8@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
Removed wrong/confusing default for master LDAP URI when bootstrapping slave.
The previous default of "ldap://127.0.0.1:389" is
1. showing insecure connection (no SSL)
2. showing a host which is guaranteed to be the wrong one (the slave's host)


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kolab_bootstrap.in	9 Mar 2006 21:52:02 -0000	1.23
+++ kolab_bootstrap.in	10 Nov 2006 18:06:20 -0000	1.24
@@ -739,7 +739,7 @@
   print "Now some information about the master LDAP server is required:\n\n";
   do { 
       $ldap_uri = getUserInput("URI of master LDAP server (for example ldaps://host.example.com)", 
-			       $ldap_uri);
+			       "");
   } until $ldap_uri;
   my $ldapuri = URI->new($ldap_uri) || warn "error: could not parse given uri";
   if( $ldapuri ) {



From cvs at kolab.org  Fri Nov 10 19:36:02 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 19:36:02 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin configure.ac,1.23,1.24 
Message-ID: <20061110183602.5F9C11005BE@lists.intevation.de>

Author: thomas

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

Modified Files:
	configure.ac 
Log Message:
Fix version display in web interface by defining WITHOPENPKG in configure.ac


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- configure.ac	17 Jan 2006 22:06:42 -0000	1.23
+++ configure.ac	10 Nov 2006 18:36:00 -0000	1.24
@@ -32,6 +32,13 @@
   esac],[openpkg=true])
 AM_CONDITIONAL(OPENPKG, test x$openpkg = xtrue)
 
+if test "x$openpkg" = "xtrue"; then
+  WITHOPENPKG=yes
+else
+  WITHOPENPKG=no
+fi
+AC_SUBST(WITHOPENPKG)
+
 # Checks for libraries.
 
 # Checks for header files.



From cvs at kolab.org  Fri Nov 10 19:55:51 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 10 Nov 2006 19:55:51 +0100 (CET)
Subject: thomas: server obmtool.conf,1.233,1.234 release-notes.txt,1.52,1.53 
Message-ID: <20061110185551.99AA11005BE@lists.intevation.de>

Author: thomas

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

Modified Files:
	obmtool.conf release-notes.txt 
Log Message:
Preparations (e.g. version numbers) for 2.1beta3 release.


Index: obmtool.conf
===================================================================
RCS file: /kolabrepository/server/obmtool.conf,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- obmtool.conf	8 Nov 2006 16:30:11 -0000	1.233
+++ obmtool.conf	10 Nov 2006 18:55:49 -0000	1.234
@@ -24,7 +24,7 @@
 
 %kolab
     echo "---- boot/build ${NODE} %${CMD} ----"
-    kolab_version="2.1beta3-cvs";
+    kolab_version="2.1beta3";
     PREFIX=/${CMD};
     loc='' # '' (empty) for ftp.openpkg.org, '=' for URL, './' for CWD or absolute path
     plusloc='+'
@@ -148,11 +148,11 @@
     @install ${altloc}clamav-0.88.5-2.20061018
 #    @install ${loc}vim-6.3.78-2.4.0
 #    @install ${plusloc}dcron-2.9-2.4.0
-    @install ${altloc}perl-kolab-5.8.7-20061106
-    @install ${altloc}kolabd-2.0.99-20061106 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-webadmin-2.0.99-20061106 --define kolab_version=$kolab_version
+    @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}kolab-horde-framework-2.0.99-20051220 --define kolab_version=$kolab_version
-    @install ${altloc}kolab-resource-handlers-2.0.99-20061106 --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
     @check
 

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- release-notes.txt	10 Nov 2006 16:08:20 -0000	1.52
+++ release-notes.txt	10 Nov 2006 18:55:49 -0000	1.53
@@ -1,13 +1,15 @@
 Release notes Kolab2 Server
-(Version 200611??, Kolab Server 2.1 beta 3-cvs)
+(Version 20061110, Kolab Server 2.1 beta 3)
 
 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.
 
-At this point an upgrade from 2.0 is not recommended.  Instructions for
-the upgrade from 2.0 are in 1st.README, but they're not very well tested
-yet.
+WARNING, these topics need testing in 2.1 beta 3:
+
+ - Instructions for upgrading from Kolab server 2.0 in 1st.README.
+ - Changed imapd database format for annotations.db and mailboxes.db
+ - New free/busy code
 
 
 Differences between Kolab 2.0.x and 2.1:
@@ -106,11 +108,11 @@
 	Fix folder structure for foldernames with non-alphanumeric characters,
 	using skiplist as the database backend for mailboxes.db.
 
-    - perl-kolab-5.8.7-200611??
+    - perl-kolab-5.8.7-20061110
 
 	kolab/issue1194 (serious performance problem on high number of users)
 
-    - kolabd-2.0.99-200611??
+    - kolabd-2.0.99-20061110
 
 	Added missing relay service for postfix.
 
@@ -136,7 +138,7 @@
 	kolab/issue1428 (Fixed locking issue)
 	kolab/issue1433 (Some files in /kolab/etc/postfix have wrong ownership)
 
-    - kolab-webadmin-2.0.99-200611??
+    - kolab-webadmin-2.0.99-20061110
 
 	Fixes for setting folder type of shared folders.
 
@@ -144,7 +146,7 @@
 
 	kolab/issue1457 (updated French translation)
 
-    - kolab-resource-handlers-2.0.99-200611??
+    - kolab-resource-handlers-2.0.99-20061110
 
 	Improvements and fixes for freebusy IMAP caching.
 



From cvs at kolab.org  Mon Nov 13 15:35:41 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 13 Nov 2006 15:35:41 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.21, 1.22 
Message-ID: <20061113143541.C62A51005B0@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/freebusy.php.in: 

	Trailing newline introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
	may trigger php warnings depending on php verbosity


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	1 Nov 2006 09:32:27 -0000	1.21
+++ ChangeLog	13 Nov 2006 14:35:39 -0000	1.22
@@ -1,3 +1,11 @@
+2006-11-13  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* freebusy/freebusy.php.in: 
+
+	Trailing newline introduced in
+	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
+	may trigger php warnings depending on php verbosity
+	
 2006-11-01  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* freebusy/freebusycache.class.php.in: 



From cvs at kolab.org  Mon Nov 13 15:35:41 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 13 Nov 2006 15:35:41 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.php.in, 1.4, 1.5 
Message-ID: <20061113143541.C30A710016A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusy.php.in 
Log Message:
	* freebusy/freebusy.php.in: 

	Trailing newline introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
	may trigger php warnings depending on php verbosity


Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freebusy.php.in	25 Oct 2006 02:28:57 -0000	1.4
+++ freebusy.php.in	13 Nov 2006 14:35:39 -0000	1.5
@@ -132,5 +132,4 @@
 }
 
 echo $vfb;
-?>
-
+?>
\ No newline at end of file



From cvs at kolab.org  Mon Nov 13 16:29:08 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 13 Nov 2006 16:29:08 +0100 (CET)
Subject: wilde: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, NONE,
	1.1 
Message-ID: <20061113152908.CD2401006CA@lists.intevation.de>

Author: wilde

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

Added Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Added file with upgrade instructions from server 2.0.x to 2.1
This is the first draft written by Bernhard Herzog.


--- NEW FILE: kolab_2.0_to_2.1_upgrade_instructions.txt ---
Upgrade Kolab Server from 2.0.x to 2.1
======================================
2006-10-12, Bernhard Herzog <bh at intevation.de>


Preliminary instructions for the upgrade of a Kolab Server from version
2.0.x to Kolab Server 2.1.

NOTE: This is an early version of the upgrade instructions.  It is not
very well tested and may not cover all problems that may occur during
the upgrade.  Before attempting the upgrade, make sure you have a
current and working backup of your data.


Preparation for the Upgrade
---------------------------

1. Backup the old installation.


2. Stop the Kolab Server

    /kolab/bin/openpkg rc all stop

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

4. Prepare for berkeley db update

    cd /kolab/var/imapd/db
    /kolab/bin/db_recover
    rm /kolab/var/imapd/db/*


Installation
------------

The installation of the new packages is done in the normal way.  See the
file 1st.README accompanying the 2.1 server for details.  Do not do
anything after the installation yet.  In particular, do not start any
part of the server again or run kolabconf.


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


1. Check custom configuration

If you have custom configurations in your templates, the installation
process renames your templates and leaves them in files with the
extension .rpmsave.  Copy any modifications from your templates to the
new one if they are still needed.


2. Cyrus IMAPd

The default imapd configuration has been changed to enable the
hashimapspool option.  This means that in 2.1 the default directory
layout of the imapd spool (/kolab/var/imapd/spool/) is different from
the one in 2.0.  When you upgrade from 2.0 it's best to keep using the
old structure, so remove or comment out the corresponding line in
/kolab/etc/kolab/templates/imapd.conf.template *before* running
kolabconf.

For new installations the new default setting is recommended because
it's more efficient especially when you have many mailboxes.

For some background information about this see the dicussion at
https://intevation.de/roundup/kolab/issue1089


3. LDAP

You need to make two small changes to the configuration file
/kolab/etc/openldap/slapd.conf:

  - comment out the line 

     require        none

  - Move the line with the suffix setting to just after the "database
    bdb" line.

These changes have already been made in the new slapd.conf.template, so
that could be used for guidance.

Convert the openldap data.  The LDAP data-structures have changed
between 2.0 and 2.1 as described in Kolab2 Architecture Draft:
http://kolab.org/doc/concept-draft-cvs20060921.pdf

There's a Python script that can do the transformation.  The script is
utils/admin/convert-ldif-21.py in Kolab CVS and requires python >= 2.1
and python-ldap >= 2.0. The script works on the ldif data that was
exported with slapcat earlier:

   convert-ldif-21.py ~/kolab-2.0.ldif ~/kolab-2.1.ldif


Then restore the openldap data using the output from upgrade-ldap.py:

   rm /kolab/var/openldap/openldap-data/*
   /kolab/sbin/slapadd -l ~/kolab-2.1.ldif



4. kolabconf

Now start the openldap server and run kolabconf

    /kolab/bin/openpkg rc openldap start
    /kolab/sbin/kolabconf


Kolabconf will most likely complain about be some files ending in
.rpmsave or .rpmnew under /kolab/etc.  Check those files and move them
out of the way.  It's likely that you can simply remove them.


Start the Server
----------------

Now you should be able to start the server again:

    /kolab/bin/openpkg rc all start



From cvs at kolab.org  Mon Nov 13 16:33:19 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 13 Nov 2006 16:33:19 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, 1.8, 1.9 
Message-ID: <20061113153319.B75361006CA@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusy.class.php.in 
Log Message:
	* freebusy/freebusy.class.php.in: 

	See below.

	* freebusy/freebusy.php.in: 

	Trailing newline introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
	may trigger php warnings depending on php verbosity


Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- freebusy.class.php.in	1 Nov 2006 11:10:50 -0000	1.8
+++ freebusy.class.php.in	13 Nov 2006 15:33:17 -0000	1.9
@@ -486,5 +486,4 @@
   var $imap_serverstring;  
 };
 
-?>
-
+?>
\ No newline at end of file



From cvs at kolab.org  Mon Nov 13 16:33:19 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 13 Nov 2006 16:33:19 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.22, 1.23 
Message-ID: <20061113153319.BCE711006CB@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/freebusy.class.php.in: 

	See below.

	* freebusy/freebusy.php.in: 

	Trailing newline introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in.diff?r1=1.3&r2=1.4
	may trigger php warnings depending on php verbosity


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ChangeLog	13 Nov 2006 14:35:39 -0000	1.22
+++ ChangeLog	13 Nov 2006 15:33:17 -0000	1.23
@@ -1,5 +1,9 @@
 2006-11-13  Gunnar Wrobel  <wrobel at pardus.de>
 
+	* freebusy/freebusy.class.php.in: 
+
+	See below.
+
 	* freebusy/freebusy.php.in: 
 
 	Trailing newline introduced in



From cvs at kolab.org  Tue Nov 14 16:17:17 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 14 Nov 2006 16:17:17 +0100 (CET)
Subject: wilde: server release-notes.txt,1.53,1.54 
Message-ID: <20061114151717.316B51006D2@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Minor clarification in note for imapd-2.2.12-2.5.0_kolab2.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- release-notes.txt	10 Nov 2006 18:55:49 -0000	1.53
+++ release-notes.txt	14 Nov 2006 15:17:14 -0000	1.54
@@ -106,7 +106,7 @@
     - imapd-2.2.12-2.5.0_kolab2
 
 	Fix folder structure for foldernames with non-alphanumeric characters,
-	using skiplist as the database backend for mailboxes.db.
+	when using skiplist as the database backend for mailboxes.db.
 
     - perl-kolab-5.8.7-20061110
 



From cvs at kolab.org  Tue Nov 14 22:34:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 14 Nov 2006 22:34:24 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.82,1.83 
Message-ID: <20061114213424.D79931006D6@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Added a new variable emailserver_transport_usr



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ChangeLog	1 Nov 2006 14:00:07 -0000	1.82
+++ ChangeLog	14 Nov 2006 21:34:22 -0000	1.83
@@ -1,3 +1,9 @@
+2006-11-14 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: Added a new variable 
+	  emailserver_transport_usr
+
 2006-11-01  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* templates/freebusy.conf.template.in: 



From cvs at kolab.org  Tue Nov 14 22:34:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 14 Nov 2006 22:34:24 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates transport.template.in, 1.4,
	1.5 virtual.template.in, 1.4, 1.5 
Message-ID: <20061114213424.E7AAB1006D9@lists.intevation.de>

Author: richard

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

Modified Files:
	transport.template.in virtual.template.in 
Log Message:
Added a new variable emailserver_transport_usr



Index: transport.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/transport.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- transport.template.in	10 Nov 2006 16:08:20 -0000	1.4
+++ transport.template.in	14 Nov 2006 21:34:22 -0000	1.5
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/transport
 PERMISSIONS=0640
-OWNERSHIP=root:@emailserver_grp@
+OWNERSHIP=@emailserver_transport_usr@:@emailserver_grp@
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>

Index: virtual.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/virtual.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- virtual.template.in	10 Nov 2006 16:08:20 -0000	1.4
+++ virtual.template.in	14 Nov 2006 21:34:22 -0000	1.5
@@ -1,7 +1,7 @@
 KOLAB_META_START
 TARGET=@emailserver_confdir@/virtual
 PERMISSIONS=0640
-OWNERSHIP=root:@emailserver_grp@
+OWNERSHIP=@emailserver_transport_usr@:@emailserver_grp@
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold at erfrakon.de>



From cvs at kolab.org  Tue Nov 14 22:34:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 14 Nov 2006 22:34:24 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf common, 1.32, 1.33 gentoo, 1.5,
	1.6 kolab, 1.39, 1.40 suse, 1.53, 1.54 
Message-ID: <20061114213424.E37681006D7@lists.intevation.de>

Author: richard

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

Modified Files:
	common gentoo kolab suse 
Log Message:
Added a new variable emailserver_transport_usr



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- common	14 Jul 2006 09:55:54 -0000	1.32
+++ common	14 Nov 2006 21:34:22 -0000	1.33
@@ -51,6 +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_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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gentoo	29 Mar 2006 19:35:09 -0000	1.5
+++ gentoo	14 Nov 2006 21:34:22 -0000	1.6
@@ -97,6 +97,7 @@
 emailserver_setgid_grp=postdrop
 emailserver_master_usr=${kolab_grp}
 emailserver_default_privs=nobody
+emailserver_transport_usr=root
 
 ### -> files
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- kolab	12 Jul 2006 22:58:46 -0000	1.39
+++ kolab	14 Nov 2006 21:34:22 -0000	1.40
@@ -81,6 +81,7 @@
 emailserver_default_privs=kolab-n
 emailserver_master_usr=kolab-n
 emailserver_rpm=postfix
+emailserver_transport_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.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- suse	14 Jul 2006 09:55:54 -0000	1.53
+++ suse	14 Nov 2006 21:34:22 -0000	1.54
@@ -62,6 +62,7 @@
 emailserver_default_privs=kolab
 emailserver_master_usr=kolab
 emailserver_rpm=postfix
+emailserver_transport_usr=root
 
 ftpserver_scoreboardfile=${localstatedir}/proftpd/score
 ftpserver_logfile=${localstatedir}/log/proftpd.log



From cvs at kolab.org  Wed Nov 15 16:13:52 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 15 Nov 2006 16:13:52 +0100 (CET)
Subject: wilde: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.1,
	1.2 
Message-ID: <20061115151352.278871006CF@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Dome additions and clarifications.
These were generated from an actual upgraded experience. :-)


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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_2.0_to_2.1_upgrade_instructions.txt	13 Nov 2006 15:29:06 -0000	1.1
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	15 Nov 2006 15:13:49 -0000	1.2
@@ -48,7 +48,6 @@
 Configuration
 -------------
 
-
 1. Check custom configuration
 
 If you have custom configurations in your templates, the installation
@@ -56,6 +55,15 @@
 extension .rpmsave.  Copy any modifications from your templates to the
 new one if they are still needed.
 
+After that the files with the extension .rpmsave must be removed or
+renamed.  There might be more files with the .rpmsave ending in
+/kolab/etc, you can find them for example using the find command:
+
+find /kolab/etc -name '*.rpmsave'
+
+Any files found must be checked and moved out of the way, in most
+cases they can just be deleted.
+
 
 2. Cyrus IMAPd
 
@@ -63,8 +71,8 @@
 hashimapspool option.  This means that in 2.1 the default directory
 layout of the imapd spool (/kolab/var/imapd/spool/) is different from
 the one in 2.0.  When you upgrade from 2.0 it's best to keep using the
-old structure, so remove or comment out the corresponding line in
-/kolab/etc/kolab/templates/imapd.conf.template *before* running
+old structure, so remove or comment out the line "hashimapspool: yes"
+in /kolab/etc/kolab/templates/imapd.conf.template *before* running
 kolabconf.
 
 For new installations the new default setting is recommended because
@@ -79,7 +87,7 @@
 You need to make two small changes to the configuration file
 /kolab/etc/openldap/slapd.conf:
 
-  - comment out the line 
+  - comment out the line
 
      require        none
 
@@ -106,6 +114,7 @@
    rm /kolab/var/openldap/openldap-data/*
    /kolab/sbin/slapadd -l ~/kolab-2.1.ldif
 
+This will issue some warnings which can be safely ignored.
 
 
 4. kolabconf
@@ -116,9 +125,9 @@
     /kolab/sbin/kolabconf
 
 
-Kolabconf will most likely complain about be some files ending in
-.rpmsave or .rpmnew under /kolab/etc.  Check those files and move them
-out of the way.  It's likely that you can simply remove them.
+Kolabconf will 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.
 
 
 Start the Server
@@ -127,3 +136,22 @@
 Now you should be able to start the server again:
 
     /kolab/bin/openpkg rc all start
+
+
+Final Steps
+-----------
+
+1. The internal format of the ldap records for the list of privileged
+   networks has changed, to updated these recods go to the kolab web
+   interface an log in as administrative user.  Open the "Services"
+   page and search for the "Privileged Networks" section.  Klick the
+   update button for the networks list.
+
+2. Kolab 2.1 doesn't need some of the OpenPKG packages which were
+   installed for 2.0, these can be removed:
+
+   /kolab/bin/openpkg rpm -e dcron vim pth
+
+   Especially the dcron package should be removed in any case,
+   otherwise deprecated cronjobs will be run and generate mails with
+   error messages to the kolab administrator.



From cvs at kolab.org  Wed Nov 15 16:20:44 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 15 Nov 2006 16:20:44 +0100 (CET)
Subject: wilde: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.2,
	1.3 
Message-ID: <20061115152044.B15A91006CF@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Replaced change time/author line by CVS-Id tag.


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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab_2.0_to_2.1_upgrade_instructions.txt	15 Nov 2006 15:13:49 -0000	1.2
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	15 Nov 2006 15:20:42 -0000	1.3
@@ -1,7 +1,5 @@
 Upgrade Kolab Server from 2.0.x to 2.1
 ======================================
-2006-10-12, Bernhard Herzog <bh at intevation.de>
-
 
 Preliminary instructions for the upgrade of a Kolab Server from version
 2.0.x to Kolab Server 2.1.
@@ -155,3 +153,6 @@
    Especially the dcron package should be removed in any case,
    otherwise deprecated cronjobs will be run and generate mails with
    error messages to the kolab administrator.
+
+
+$Id$



From cvs at kolab.org  Wed Nov 15 16:58:57 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 15 Nov 2006 16:58:57 +0100 (CET)
Subject: wilde: server README.1st,1.38,1.39 
Message-ID: <20061115155857.E3B7A1006CF@lists.intevation.de>

Author: wilde

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

Modified Files:
	README.1st 
Log Message:
Updated information on 2.0 to 2.1 upgrade.
Added emphasis on backup and reading before acting.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- README.1st	10 Nov 2006 16:31:12 -0000	1.38
+++ README.1st	15 Nov 2006 15:58:55 -0000	1.39
@@ -47,6 +47,11 @@
 instructions for all releases newer than the one you already have before
 you start the update.
 
+In any case you should completely read *all* relevant update
+instruction *before* starting the upgrade procedure.  All ways make
+sure you have a recent backup of your /kolab directory before you
+attempt to upgrade Kolab.
+
 The installation of the new packages works just as for the initial
 installation.  Download the files as described above and run
 
@@ -82,32 +87,20 @@
 configuration files are regenerated from your templates.
 
 
-Upgrade from 2.0 releases to pre-2.1-snapshots
-----------------------------------------------
-
-An upgrade from a 2.0 release to a 2.1 snapshot is not yet recommended.
-These instructions are incomplete.  Please take a look at README.1st
-from the latest 2.0 release, too.  The instructions for the upgrade from
-development snapshots may also be relevant.
-
-Manually add two LDAP objects:
+Upgrade from 2.0 releases to 2.1-versions
+-----------------------------------------
 
-dn: cn=domains,cn=internal,<base_dn>
-objectClass: top
-objectClass: kolabNamedObject
-cn: domains
+Upgrading from Kolab 2.0.x to 2.1 is described in detail in the file
+UPGRADING.20-21 in this directory.
 
-dn: cn=domain-maintainer,cn=internal,<base_dn>
-objectClass: top
-objectClass: kolabGroupOfNames
-cn: domain-maintainer
-member: cn=manager,cn=internal,<base_dn>
+The latest version of the upgrading instruction can be found in the
+Kolab.org raw-howtos CVS:
 
-Also, after the upgrade the attribute "postfix-mydestination" of the
-k=kolab ldap object has the value "$mydomain".  Change this to the real
-domain (should be the same value as that of the "postfix-mydomain"
-attribute).
+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.
 
 
 Upgrade from pre-2.1-snapshot-20051130
@@ -247,4 +240,3 @@
 
 
 $Id$
-



From cvs at kolab.org  Wed Nov 15 18:37:42 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 15 Nov 2006 18:37:42 +0100 (CET)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.3,
	1.4 
Message-ID: <20061115173742.989171006D7@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Added URL for and how to call convert-ldif-21.py. Fixed 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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_2.0_to_2.1_upgrade_instructions.txt	15 Nov 2006 15:20:42 -0000	1.3
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	15 Nov 2006 17:37:40 -0000	1.4
@@ -101,10 +101,13 @@
 
 There's a Python script that can do the transformation.  The script is
 utils/admin/convert-ldif-21.py in Kolab CVS and requires python >= 2.1
-and python-ldap >= 2.0. The script works on the ldif data that was
-exported with slapcat earlier:
+and python-ldap >= 2.0, you can download the current version from:
 
-   convert-ldif-21.py ~/kolab-2.0.ldif ~/kolab-2.1.ldif
+  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:
+
+   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:
@@ -142,7 +145,7 @@
 1. The internal format of the ldap records for the list of privileged
    networks has changed, to updated these recods go to the kolab web
    interface an log in as administrative user.  Open the "Services"
-   page and search for the "Privileged Networks" section.  Klick the
+   page and search for the "Privileged Networks" section.  Click the
    update button for the networks list.
 
 2. Kolab 2.1 doesn't need some of the OpenPKG packages which were



From cvs at kolab.org  Wed Nov 15 18:57:03 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 15 Nov 2006 18:57:03 +0100 (CET)
Subject: thomas: server release-notes.txt,1.54,1.55 README.1st,1.39,1.40 
Message-ID: <20061115175703.84B241006D3@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt README.1st 
Log Message:
Document workaround for kolab/issue1490 (freebusy cache written to /kolab/kolab/...)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- release-notes.txt	14 Nov 2006 15:17:14 -0000	1.54
+++ release-notes.txt	15 Nov 2006 17:57:01 -0000	1.55
@@ -9,7 +9,7 @@
 
  - Instructions for upgrading from Kolab server 2.0 in 1st.README.
  - Changed imapd database format for annotations.db and mailboxes.db
- - New free/busy code
+ - New free/busy code (see section "Known problems")
 
 
 Differences between Kolab 2.0.x and 2.1:
@@ -35,6 +35,15 @@
 
 
 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

Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- README.1st	15 Nov 2006 15:58:55 -0000	1.39
+++ README.1st	15 Nov 2006 17:57:01 -0000	1.40
@@ -38,6 +38,19 @@
 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
 ---------------------------
 



From cvs at kolab.org  Thu Nov 16 01:30:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 16 Nov 2006 01:30:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	erfrakon.tpl, 1.1, 1.2 
Message-ID: <20061116003028.3EC1B1006C9@lists.intevation.de>

Author: martin

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

Modified Files:
	erfrakon.tpl 
Log Message:
Martin Konold: Update for version 2.1
:


Index: erfrakon.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/erfrakon.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- erfrakon.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ erfrakon.tpl	16 Nov 2006 00:30:25 -0000	1.2
@@ -1,17 +1,17 @@
 {* Smarty Template *}
 {*
  (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
- (c) 2004 Martin Konold <martin.konold at erfrakon.de>
+ (c) 2004-2006 Martin Konold <martin.konold 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.
 *}
 <div class="contentsimple">
 <p>
-{tr msg="Kolab's concept was done by <a href=\"http://www.erfrakon.com\">erfrakon</a>; the company also designed and implemented the Kolab 1 Server and did the design and architecture for the Kolab 2 Server while providing consulting for the implementation of the Kolab 2 server and the Kolab 2 clients."}
+{tr msg="Kolab's architecture was done by <a href=\"http://www.erfrakon.com\">erfrakon</a>; the company also designed and implemented the Kolab 1 Server and did the design and architecture for the Kolab 2 Server while providing consulting for the implementation of the Kolab 2 server and the Kolab 2 clients."}
 </p>
-<IMG SRC="../pics/erfrakon.png" ALT="erfrakon" align="middle" longdesc="http://www.erfrakon.com" usemap="#maperfrakon">
+<IMG SRC="../pics/erfrakon.png" ALT="erfrakon" align="middle" longdesc="http://www.erfrakon.de" usemap="#maperfrakon">
 <map name="maperfrakon">
- <area shape="rect" coords="0,0,300,30" href="http://www.erfrakon.com">
+ <area shape="rect" coords="0,0,300,30" href="http://www.erfrakon.de">
 </map> 
   
 <p>
@@ -21,8 +21,8 @@
 {tr msg="The following people worked on Kolab for erfrakon:"}
 </p>
 <p>
-<a href="mailto:tassilo.erlewein at erfrakon.de?subject=Kolab Server 2.0">Tassilo Erlewein</a><br>
-<a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 2.0">Achim Frank</a><br>
-<a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 2.0">Martin Konold</a><br>
+<a href="mailto:tassilo.erlewein at erfrakon.de?subject=Kolab Server 2.1">Tassilo Erlewein</a><br>
+<a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 2.1">Achim Frank</a><br>
+<a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 2.1">Martin Konold</a><br>
 </p>
 </div>



From cvs at kolab.org  Thu Nov 16 17:31:56 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 16 Nov 2006 17:31:56 +0100 (CET)
Subject: wilde: doc/www/src index.html.m4,1.101,1.102 
Message-ID: <20061116163156.33ADE101EF4@lists.intevation.de>

Author: wilde

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

Modified Files:
	index.html.m4 
Log Message:
Added announcement of Kolab Server 2.1 Beta 3 release.


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- index.html.m4	3 Nov 2006 11:50:01 -0000	1.101
+++ index.html.m4	16 Nov 2006 16:31:53 -0000	1.102
@@ -47,6 +47,21 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">November 16th, 2006</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.1 Beta 3 released
+</td></tr>
+</table>
+<div class="newsb">
+  This release fixes more than 30 problems found in Beta 2 and
+  includes the security updates published until now.  See
+  the <a
+  href="http://www.kolab.org/pipermail/kolab-announce/2006/000044.html">release
+  notes</a> for more details and information on upgrading from Kolab
+  Server 2.0 to 2.1.
+</div>
+<p>
+<table>
 <tr><td class="newsd">November 14th - 16th, 2006</td>
 <td class="newsh">&raquo;
 	Presentation of Kolab-based UGS at LinuxWorld Expo 2006 in Cologne, Germany	



From cvs at kolab.org  Thu Nov 16 23:34:57 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 16 Nov 2006 23:34:57 +0100 (CET)
Subject: martin: doc/kolab-formats commonfields.sgml, 1.22, 1.23 contacts.sgml,
	1.15, 1.16 kolabformat.sgml, 1.17, 1.18 mail.sgml, 1.1, 1.2 
Message-ID: <20061116223457.C15D51006AD@lists.intevation.de>

Author: martin

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

Modified Files:
	commonfields.sgml contacts.sgml kolabformat.sgml mail.sgml 
Log Message:
Martin Konold: new version 2.0rc5


Index: commonfields.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/commonfields.sgml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- commonfields.sgml	12 May 2005 13:48:16 -0000	1.22
+++ commonfields.sgml	16 Nov 2006 22:34:55 -0000	1.23
@@ -1,28 +1,28 @@
 <chapter><title>Common Fields</title>
 
-<sect1 id="common-in-all-types"><title>Common In All Types</title>
+<sect1 id="common-in-all-types"><title>Common Fields In All Types</title>
 
-<para>There are a number of fields that are present in all non-mail
+<para>There are a number of fields that MAY be present in all non-mail
 folder types. These are:</para>
 
 <itemizedlist>
-<listitem><para>uid (string, no default)</para></listitem>
+<listitem><para>uid (string, mandatory)</para></listitem>
 
-<listitem><para>body (string, default empty)</para></listitem>
+<listitem><para>body (string, default "")</para></listitem>
 
-<listitem><para>categories (string, default empty)</para></listitem>
+<listitem><para>categories (string, default "")</para></listitem>
 
-<listitem><para>creation-date (datetime, no default)</para></listitem>
+<listitem><para>creation-date (datetime, mandatory)</para></listitem>
 
-<listitem><para>last-modification-date (datetime, no default)
+<listitem><para>last-modification-date (datetime, mandatory)
 </para></listitem>
 
-<listitem><para>sensitivity (string, default public)</para></listitem>
+<listitem><para>sensitivity (string, default "public")</para></listitem>
 
 <listitem><para>inline-attachment (string, no default)</para></listitem>
 <listitem><para>link-attachment (string, no default)</para></listitem>
 
-<listitem><para>product-id (string, default empty)</para></listitem>
+<listitem><para>product-id (string, default "")</para></listitem>
 
 </itemizedlist>
 
@@ -32,10 +32,16 @@
 <para>The sensitivity possibilites are private, confidential and
 public.</para>
 
+<para>
+private data SHALL not be disclosed to other users except if explicitly allowed by the user.
+Normal IMAP ACLs granting reading permissions on a folder don't mean that other users MAY read
+private data.
+</para>
+
 <para>There can be any number of attachments. "inline-attachment" references the
 filename of attachments in the mail where this is stored. Attachments
 not referenced from the XML should simply not be displayed to the user.
-This allows to attach application-specific attachments (like TNEF for Outlook)
+This allows to attach application-specific attachments (like TNEF for Outlook clients)
 that remain hidden to the user.</para>
 
 <para>"link-attachment" means the attachment is external; the contents of the tag is the URL.</para>
@@ -51,15 +57,15 @@
 base class can be called incidence.</para>
 
 <para><programlisting><![CDATA[
-        <summary>(string, default empty)</summary>
-        <location>(string, default empty)</location>
+        <summary>(string, default "")</summary>
+        <location>(string, default "")</location>
         <creator>
-          <display-name>(string, default empty)</display-name>
-          <smtp-address>(string, default empty)</smtp-address>
+          <display-name>(string, default "")</display-name>
+          <smtp-address>(string, default "")</smtp-address>
         </creator>
         <organizer>
-          <display-name>(string, default empty)</display-name>
-          <smtp-address>(string, default empty)</smtp-address>
+          <display-name>(string, default "")</display-name>
+          <smtp-address>(string, default "")</smtp-address>
         </organizer>
         <start-date>(date or datetime, default not present)</start-date>
         <alarm>(number, no default)</alarm>
@@ -72,11 +78,11 @@
           {<exclusion>(date, no default)</exclusion>}
         </recurrence>
         {<attendee>
-          <display-name>(string, default empty)</display-name>
-          <smtp-address>(string, default empty)</smtp-address>
+          <display-name>(string, default "")</display-name>
+          <smtp-address>(string, default "")</smtp-address>
           <status>(string, default none)</status>
           <request-response>(bool, default true)</request-response>
-          <role>(string, default required)</role>
+          <role>(string, default "required")</role>
         </attendee>}
 ]]></programlisting></para>
 
@@ -84,9 +90,9 @@
 they are there, they can either have a date or a datetime as the
 type. Parsing this is just a matter of looking at the length of the
 date string. In the case of an all day event (floating event) the end-date
-must also be in date only format</para>
+MUST be in date only format</para>
 
-<para>The alarm specifies number of minutes before the incidence that
+<para>The alarm specifies the number of minutes before the incidence when
 the alarm should fire. In case of incidences with only a start date
 but no specific time, this means minutes before 0:00 on that
 day.</para>

Index: contacts.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/contacts.sgml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- contacts.sgml	11 Mar 2005 11:37:07 -0000	1.15
+++ contacts.sgml	16 Nov 2006 22:34:55 -0000	1.16
@@ -29,7 +29,7 @@
           </name>
           <free-busy-url>(string, default empty)</free-busy-url>
           <organization>(string, default empty)</organization>
-          <web-page>(string, default empty)</webpage>
+          <web-page>(string, default empty)</web-page>
           <im-address>(string, default empty)</im-address>
           <department>(string, default empty)</department>
           <office-location>(string, default empty)</office-location>

Index: kolabformat.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolabformat.sgml	27 Jul 2005 22:46:44 -0000	1.17
+++ kolabformat.sgml	16 Nov 2006 22:34:55 -0000	1.18
@@ -15,7 +15,7 @@
 
 <bookinfo>
 <title>The Kolab Storage Format</title>
-<subtitle>2.0rc3</subtitle>
+<subtitle>2.0rc5</subtitle>
 <!--<subtitle>Draft CVS</subtitle>-->
 <authorgroup>
 <othercredit>
@@ -27,7 +27,7 @@
 <othername> Stuart Binge, s.binge at codefusion.co.za </othername>
 </othercredit>
 </authorgroup>
-<pubdate>June 3rd, 2005</pubdate>
+<pubdate>November 16th, 2006</pubdate>
 <!--<pubdate>CVS $Date$ $Revision$</pubdate>-->
 <legalnotice>
 <para> This documentation was written in SGML using the DocBook DTD. HTML
@@ -38,10 +38,9 @@
 <trademark class='registered'>Microsoft Outlook</trademark>
 are registered trademarks of Microsoft Corporation Inc.
 </para>
-<para> <trademark>Toltec Connector</trademark> is a trademark of Radley Network Technologies CC, South Africa.</para>
+<para> <trademark>K Desktop Environment</trademark> and <trademark>KDE</trademark> are registered trademarks of the KDE e.V. </para>
 <para> <trademark>KONSEC Konnektor</trademark> is a trademark of KONSEC GmbH, Germany.</para>
-
-<para> <trademark>K Desktop Environment</trademark> and <trademark>KDE</trademark> are trademarks of the KDE e.V. </para>
+<para> <trademark>Toltec Connector</trademark> is a trademark of Radley Network Technologies CC, South Africa.</para>
 
 <para> All other herein mentioned trademarks belong
 to their respective owners.  Use of a term in this document should not be regarded as 
@@ -133,6 +132,14 @@
 <date>July 26th, 2005</date>
 <revremark>
 Clarifications about keywords and folder annotations.
+</revremark>
+</revision>
+
+<revision>
+<revnumber>2.0rc5</revnumber>
+<date>November 16th, 2006</date>
+<revremark>
+Clarifications about empty strings and changed </webpage> to </web-page>.
 </revremark>
 </revision>
 

Index: mail.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/mail.sgml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mail.sgml	10 Jun 2004 15:15:52 -0000	1.1
+++ mail.sgml	16 Nov 2006 22:34:55 -0000	1.2
@@ -2,4 +2,6 @@
 
 <para>Mail folders hold mails in the format as described in RFC 822.</para>
 
+<para>All other details about mail folders are already defined in the previous chapter</para>
+
 </chapter>



From cvs at kolab.org  Tue Nov 21 23:08:01 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 21 Nov 2006 23:08:01 +0100 (CET)
Subject: steffen: server/kolabd/kolabd/templates httpd.conf.template.in, 1.4,
	1.5 
Message-ID: <20061121220801.A6A381006CE@lists.intevation.de>

Author: steffen

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Protection of rogue scripts in fbview (issue1507)

Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- httpd.conf.template.in	4 Apr 2006 18:54:13 -0000	1.4
+++ httpd.conf.template.in	21 Nov 2006 22:07:59 -0000	1.5
@@ -137,8 +137,17 @@
 <Location />
   ErrorDocument 403 https://@@@fqdnhostname@@@/admin/
 </Location>
-<Location /fbview>
-  ErrorDocument 403 https://@@@fqdnhostname@@@/fbview/
+<Location /fbview/*.php>
+    Deny from all
+    ErrorDocument 403 https://@@@fqdnhostname@@@/fbview/
+</Location>
+<Location /fbview/index.php>
+    Order allow,deny
+    Allow from all
+</Location>
+<Location /fbview/login.php>
+    Order allow,deny
+	Allow from all
 </Location>
 
 <Files ~ "^\.ht">



From cvs at kolab.org  Wed Nov 22 12:25:06 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 12:25:06 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	pfb.php.in, 1.7, 1.8 freebusyldap_dummy.class.php, 1.1, 1.2 
Message-ID: <20061122112506.25B121006D2@lists.intevation.de>

Author: gunnar

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

Modified Files:
	pfb.php.in freebusyldap_dummy.class.php 
Log Message:
	* freebusy/pfb.php.in: 

	Fixed cache dir path problem described in

	https://intevation.de/roundup/kolab/issue1490

	and introduced with

	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/freebusy.conf.template.in.diff?r1=1.3&r2=1.4

	The use of $params['kolab_prefix'] originated from the original
	caching patch but should not be used as introduced with

	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in.diff?r1=1.5&r2=1.6

	since this breaks compatibility with running kolab on other
	distros.
	
	* freebusy/freebusyldap_dummy.class.php: 

	Trailing newline introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap_dummy.class.php?rev=1.1&content-type=text/vnd.viewcvs-markup
	may trigger php warnings depending on php verbosity


Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pfb.php.in	31 Oct 2006 04:14:55 -0000	1.7
+++ pfb.php.in	22 Nov 2006 11:25:03 -0000	1.8
@@ -118,10 +118,8 @@
   exit;
 }
 
-$full_cache_dir = $params['kolab_prefix'] . $params['cache_dir'];
-
-$cache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], false );
-$xcache =& new FreeBusyCache( $full_cache_dir, $params['pfb_dbformat'], true );
+$cache =& new FreeBusyCache( $params['cache_dir'], $params['pfb_dbformat'], false );
+$xcache =& new FreeBusyCache( $params['cache_dir'], $params['pfb_dbformat'], true );
 
 
 if( $req_cache ) {

Index: freebusyldap_dummy.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap_dummy.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freebusyldap_dummy.class.php	25 Oct 2006 02:28:57 -0000	1.1
+++ freebusyldap_dummy.class.php	22 Nov 2006 11:25:03 -0000	1.2
@@ -69,5 +69,4 @@
   }
 };
 
-?>
-
+?>
\ No newline at end of file



From cvs at kolab.org  Wed Nov 22 12:25:06 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 12:25:06 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.23, 1.24 
Message-ID: <20061122112506.275191006D3@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/pfb.php.in: 

	Fixed cache dir path problem described in

	https://intevation.de/roundup/kolab/issue1490

	and introduced with

	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/freebusy.conf.template.in.diff?r1=1.3&r2=1.4

	The use of $params['kolab_prefix'] originated from the original
	caching patch but should not be used as introduced with

	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in.diff?r1=1.5&r2=1.6

	since this breaks compatibility with running kolab on other
	distros.
	
	* freebusy/freebusyldap_dummy.class.php: 

	Trailing newline introduced in
	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap_dummy.class.php?rev=1.1&content-type=text/vnd.viewcvs-markup
	may trigger php warnings depending on php verbosity


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog	13 Nov 2006 15:33:17 -0000	1.23
+++ ChangeLog	22 Nov 2006 11:25:04 -0000	1.24
@@ -1,3 +1,29 @@
+2006-11-22  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* freebusy/pfb.php.in: 
+
+	Fixed cache dir path problem described in
+
+	https://intevation.de/roundup/kolab/issue1490
+
+	and introduced with
+
+	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolabd/kolabd/templates/freebusy.conf.template.in.diff?r1=1.3&r2=1.4
+
+	The use of $params['kolab_prefix'] originated from the original
+	caching patch but should not be used as introduced with
+
+	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in.diff?r1=1.5&r2=1.6
+
+	since this breaks compatibility with running kolab on other
+	distros.
+	
+	* freebusy/freebusyldap_dummy.class.php: 
+
+	Trailing newline introduced in
+	http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap_dummy.class.php?rev=1.1&content-type=text/vnd.viewcvs-markup
+	may trigger php warnings depending on php verbosity
+
 2006-11-13  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* freebusy/freebusy.class.php.in: 



From cvs at kolab.org  Wed Nov 22 13:15:35 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 13:15:35 +0100 (CET)
Subject: wilde: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.24, 1.25 
Message-ID: <20061122121535.EA5631005B7@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Replaced @freebusy_cachedir@ with $parms['cache_dir'].


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ChangeLog	22 Nov 2006 11:25:04 -0000	1.24
+++ ChangeLog	22 Nov 2006 12:15:33 -0000	1.25
@@ -1,3 +1,8 @@
+2006-11-22  Sascha Wilde  <wilde at intevation.de>
+
+	* freebusy/freebusy.php.in: Replaced @freebusy_cachedir@ with
+	$parms['cache_dir'].
+
 2006-11-22  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* freebusy/pfb.php.in: 



From cvs at kolab.org  Wed Nov 22 13:15:35 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 13:15:35 +0100 (CET)
Subject: wilde: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.php.in, 1.5, 1.6 
Message-ID: <20061122121535.E63CF1005A4@lists.intevation.de>

Author: wilde

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

Modified Files:
	freebusy.php.in 
Log Message:
Replaced @freebusy_cachedir@ with $parms['cache_dir'].


Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- freebusy.php.in	13 Nov 2006 14:35:39 -0000	1.5
+++ freebusy.php.in	22 Nov 2006 12:15:33 -0000	1.6
@@ -72,7 +72,8 @@
 }
 
 $user = strtolower($user);
-$cache =& new FreeBusyCache( '@freebusy_cachedir@', $params['pfb_dbformat'], $req_extended );
+
+$cache =& new FreeBusyCache( $params['cache_dir'], $params['pfb_dbformat'], $req_extended );
 
 $collector =& new FreeBusyCollector( $user );
 



From cvs at kolab.org  Wed Nov 22 13:19:44 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 13:19:44 +0100 (CET)
Subject: wilde: server/kolab-resource-handlers freebusy-imap-caching.patch, 1.1,
	NONE 
Message-ID: <20061122121944.CC9041005A4@lists.intevation.de>

Author: wilde

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

Removed Files:
	freebusy-imap-caching.patch 
Log Message:
Removed outdated/unused patch.


--- freebusy-imap-caching.patch DELETED ---



From cvs at kolab.org  Wed Nov 22 14:09:47 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 14:09:47 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.25, 1.26 
Message-ID: <20061122130947.29A481005B7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/pfb.php.in (): 

	Completed fixing cache dir path problem.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ChangeLog	22 Nov 2006 12:15:33 -0000	1.25
+++ ChangeLog	22 Nov 2006 13:09:45 -0000	1.26
@@ -1,3 +1,9 @@
+2006-11-22  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* freebusy/pfb.php.in (): 
+
+	Completed fixing cache dir path problem.
+
 2006-11-22  Sascha Wilde  <wilde at intevation.de>
 
 	* freebusy/freebusy.php.in: Replaced @freebusy_cachedir@ with



From cvs at kolab.org  Wed Nov 22 14:09:47 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 14:09:47 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	pfb.php.in, 1.8, 1.9 
Message-ID: <20061122130947.271D21005B0@lists.intevation.de>

Author: gunnar

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

Modified Files:
	pfb.php.in 
Log Message:
	* freebusy/pfb.php.in (): 

	Completed fixing cache dir path problem.


Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pfb.php.in	22 Nov 2006 11:25:03 -0000	1.8
+++ pfb.php.in	22 Nov 2006 13:09:45 -0000	1.9
@@ -159,7 +159,7 @@
   unset($folder[0]);
   $folder = join('/', $folder);
   $fbpast = $ldap->freeBusyPast();
-  $fb =& new FreeBusy( $full_cache_dir, $owner, $imapuser, $imappw, 'localhost', $params['imap_options'], $uinfo['FBFUTURE'], $fbpast );
+  $fb =& new FreeBusy( $params['cache_dir'], $owner, $imapuser, $imappw, 'localhost', $params['imap_options'], $uinfo['FBFUTURE'], $fbpast );
 
   $fb->default_domain = $params['email_domain'];
   $rc = $fb->imapConnect();



From cvs at kolab.org  Wed Nov 22 16:22:42 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 16:22:42 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.26, 1.27 
Message-ID: <20061122152242.24B2E1005C7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/freebusyimapcache.class.php: 

	Trailing newline may trigger php warnings depending on php
	verbosity.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	22 Nov 2006 13:09:45 -0000	1.26
+++ ChangeLog	22 Nov 2006 15:22:40 -0000	1.27
@@ -1,5 +1,10 @@
 2006-11-22  Gunnar Wrobel  <wrobel at pardus.de>
 
+	* freebusy/freebusyimapcache.class.php: 
+
+	Trailing newline may trigger php warnings depending on php
+	verbosity.
+
 	* freebusy/pfb.php.in (): 
 
 	Completed fixing cache dir path problem.



From cvs at kolab.org  Wed Nov 22 16:22:42 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 16:22:42 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusyimapcache.class.php, 1.2, 1.3 
Message-ID: <20061122152242.20EFA1005BF@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusyimapcache.class.php 
Log Message:
	* freebusy/freebusyimapcache.class.php: 

	Trailing newline may trigger php warnings depending on php
	verbosity.


Index: freebusyimapcache.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyimapcache.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freebusyimapcache.class.php	31 Oct 2006 04:14:55 -0000	1.2
+++ freebusyimapcache.class.php	22 Nov 2006 15:22:40 -0000	1.3
@@ -212,5 +212,4 @@
     }
 };
 
-?>
-
+?>
\ No newline at end of file



From cvs at kolab.org  Wed Nov 22 16:50:01 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 16:50:01 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.27, 1.28 
Message-ID: <20061122155001.CE8021005C7@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/freebusycache.class.php.in: 

	Trailing newline may trigger php warnings depending on php
	verbosity.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	22 Nov 2006 15:22:40 -0000	1.27
+++ ChangeLog	22 Nov 2006 15:49:59 -0000	1.28
@@ -1,5 +1,10 @@
 2006-11-22  Gunnar Wrobel  <wrobel at pardus.de>
 
+	* freebusy/freebusycache.class.php.in: 
+
+	Trailing newline may trigger php warnings depending on php
+	verbosity.
+
 	* freebusy/freebusyimapcache.class.php: 
 
 	Trailing newline may trigger php warnings depending on php



From cvs at kolab.org  Wed Nov 22 16:50:01 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 16:50:01 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusycache.class.php.in, 1.7, 1.8 
Message-ID: <20061122155001.C8E4510016A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	freebusycache.class.php.in 
Log Message:
	* freebusy/freebusycache.class.php.in: 

	Trailing newline may trigger php warnings depending on php
	verbosity.


Index: freebusycache.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusycache.class.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusycache.class.php.in	1 Nov 2006 09:32:27 -0000	1.7
+++ freebusycache.class.php.in	22 Nov 2006 15:49:59 -0000	1.8
@@ -348,5 +348,4 @@
   var $error;
 };
 
-?>
-
+?>
\ No newline at end of file



From cvs at kolab.org  Wed Nov 22 18:05:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 18:05:20 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.28, 1.29 
Message-ID: <20061122170520.273141006A8@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* freebusy/freebusy.php.in: 

	Avoid notices because of undefined
	$params['ldap_classname_suffix'].  

	Avoid notices because of undefined $_REQUEST['cache'] and
	$_REQUEST['extended']
	
	* freebusy/pfb.php.in: 

	Avoid notices because of undefined
	$params['ldap_classname_suffix'].


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	22 Nov 2006 15:49:59 -0000	1.28
+++ ChangeLog	22 Nov 2006 17:05:18 -0000	1.29
@@ -1,5 +1,18 @@
 2006-11-22  Gunnar Wrobel  <wrobel at pardus.de>
 
+	* freebusy/freebusy.php.in: 
+
+	Avoid notices because of undefined
+	$params['ldap_classname_suffix'].  
+
+	Avoid notices because of undefined $_REQUEST['cache'] and
+	$_REQUEST['extended']
+	
+	* freebusy/pfb.php.in: 
+
+	Avoid notices because of undefined
+	$params['ldap_classname_suffix'].
+
 	* freebusy/freebusycache.class.php.in: 
 
 	Trailing newline may trigger php warnings depending on php



From cvs at kolab.org  Wed Nov 22 18:05:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 22 Nov 2006 18:05:20 +0100 (CET)
Subject: gunnar: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	pfb.php.in, 1.9, 1.10 freebusy.php.in, 1.6, 1.7 
Message-ID: <20061122170520.24A9E1005C8@lists.intevation.de>

Author: gunnar

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

Modified Files:
	pfb.php.in freebusy.php.in 
Log Message:
	* freebusy/freebusy.php.in: 

	Avoid notices because of undefined
	$params['ldap_classname_suffix'].  

	Avoid notices because of undefined $_REQUEST['cache'] and
	$_REQUEST['extended']
	
	* freebusy/pfb.php.in: 

	Avoid notices because of undefined
	$params['ldap_classname_suffix'].


Index: pfb.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pfb.php.in	22 Nov 2006 13:09:45 -0000	1.9
+++ pfb.php.in	22 Nov 2006 17:05:18 -0000	1.10
@@ -36,6 +36,8 @@
 
 require_once('@kolab_php_module_prefix at freebusy/misc.php');
 require_once('@resmgr_confdir@/freebusy.conf');
+
+if ( empty($params['ldap_classname_suffix'])) $params['ldap_classname_suffix'] = '';
 require_once('@kolab_php_module_prefix at freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php');
 
 require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');

Index: freebusy.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- freebusy.php.in	22 Nov 2006 12:15:33 -0000	1.6
+++ freebusy.php.in	22 Nov 2006 17:05:18 -0000	1.7
@@ -25,6 +25,8 @@
 require_once('@resmgr_confdir@/freebusy.conf');
 require_once('@kolab_php_module_prefix at freebusy/freebusycache.class.php');
 require_once('@kolab_php_module_prefix at freebusy/freebusycollector.class.php');
+
+if ( empty($params['ldap_classname_suffix'])) $params['ldap_classname_suffix'] = '';
 require_once('@kolab_php_module_prefix at freebusy/freebusyldap'.$params['ldap_classname_suffix'].'.class.php');
 
 require_once('@kolab_php_module_prefix at freebusy/misc.php');
@@ -34,8 +36,11 @@
 $user = trim($_REQUEST['uid']);
 $imapuser     = $_SERVER['PHP_AUTH_USER'];
 $imappw       = $_SERVER['PHP_AUTH_PW'];
-$req_cache    = (bool)$_REQUEST['cache'];
-$req_extended = (bool)$_REQUEST['extended'];
+
+$req_cache    = false;
+$req_extended = false;
+if ( !empty($_REQUEST['cache']))    $req_cache    = (bool)$_REQUEST['cache'];
+if ( !empty($_REQUEST['extended'])) $req_extended = (bool)$_REQUEST['extended'];
 
 myLog("---FreeBusy Script starting (".$_SERVER['REQUEST_URI'].")---", RM_LOG_DEBUG );
 myLog("user=$user, imapuser=$imapuser, req_cache=$req_cache, req_extended=$req_extended", RM_LOG_DEBUG );



From cvs at kolab.org  Thu Nov 23 18:34:35 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 23 Nov 2006 18:34:35 +0100 (CET)
Subject: wilde: server/kolab-resource-handlers/kolab-resource-handlers
	ChangeLog, 1.29, 1.30 
Message-ID: <20061123173435.99E071005C4@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Reset error stack in imapOpenMailbox before calling imap_reopen.
Fixes Issue1512.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	22 Nov 2006 17:05:18 -0000	1.29
+++ ChangeLog	23 Nov 2006 17:34:33 -0000	1.30
@@ -1,3 +1,8 @@
+2006-11-23  Sascha Wilde  <wilde at intevation.de>
+
+	* freebusy/freebusy.class.php.in: Reset error stack in
+	imapOpenMailbox before calling imap_reopen.  Fixes Issue1512.
+
 2006-11-22  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* freebusy/freebusy.php.in: 



From cvs at kolab.org  Thu Nov 23 18:34:35 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 23 Nov 2006 18:34:35 +0100 (CET)
Subject: wilde: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
	freebusy.class.php.in, 1.9, 1.10 
Message-ID: <20061123173435.984FF1005BF@lists.intevation.de>

Author: wilde

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

Modified Files:
	freebusy.class.php.in 
Log Message:
Reset error stack in imapOpenMailbox before calling imap_reopen.
Fixes Issue1512.


Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- freebusy.class.php.in	13 Nov 2006 15:33:17 -0000	1.9
+++ freebusy.class.php.in	23 Nov 2006 17:34:33 -0000	1.10
@@ -83,6 +83,9 @@
   function imapOpenMailbox($foldername = 'INBOX') {
     $this->foldername = $foldername;
 
+    // Reset error stack
+    imap_errors();
+
     $rc = imap_reopen($this->imap, $this->imap_serverstring . $this->foldername);
     // PHP only returns false for imap_reopen() if we use an HALF_OPEN connection. doh!
     if (imap_last_error() !== false)



From cvs at kolab.org  Mon Nov 27 16:01:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 27 Nov 2006 16:01:20 +0100 (CET)
Subject: wilde: doc/kolab-formats kolabformat.sgml,1.18,1.19 
Message-ID: <20061127150120.BAB511005A3@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolabformat.sgml 
Log Message:
Fix: verbatim < and > must be written as entities.


Index: kolabformat.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/kolabformat.sgml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolabformat.sgml	16 Nov 2006 22:34:55 -0000	1.18
+++ kolabformat.sgml	27 Nov 2006 15:01:18 -0000	1.19
@@ -139,7 +139,7 @@
 <revnumber>2.0rc5</revnumber>
 <date>November 16th, 2006</date>
 <revremark>
-Clarifications about empty strings and changed </webpage> to </web-page>.
+Clarifications about empty strings and changed &lt;/webpage&gt; to &lt;/web-page&gt;.
 </revremark>
 </revision>
 



From cvs at kolab.org  Mon Nov 27 16:25:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 27 Nov 2006 16:25:20 +0100 (CET)
Subject: wilde: doc/www/src documentation.html.m4,1.27,1.28 
Message-ID: <20061127152520.5510E1005C8@lists.intevation.de>

Author: wilde

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

Modified Files:
	documentation.html.m4 
Log Message:
Added Kolab Format RC5. 
(No rc4, as it was neither tagged nor clearly marked in any other way.)
Rmoved Kolab Format draft.


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- documentation.html.m4	21 Sep 2006 13:13:16 -0000	1.27
+++ documentation.html.m4	27 Nov 2006 15:25:18 -0000	1.28
@@ -29,6 +29,12 @@
 
 <h3>Kolab2 Storage Format Specification</h3>
 <ul>
+ <li>Version Release Candidate 2.0rc5  &nbsp;
+ <a href="doc/kolabformat-2.0rc5-html/index.html">Browse Online</a>
+ |
+ <a href="doc/kolabformat-2.0rc5.pdf">Download pdf</a>
+
+
  <li>Version Release Candidate 2.0rc3  &nbsp;
  <a href="doc/kolabformat-2.0rc3-html/index.html">Browse Online</a>
  |
@@ -43,9 +49,6 @@
  <a href="doc/kolabformat-2.0rc1-html/index.html">Browse Online</a>
  |
  <a href="doc/kolabformat-2.0rc1.pdf">Download pdf</a>
-
- <li>Version Draft cvs20041007
- <a href="doc/kolabformat-draft-cvs20041007.pdf">Download pdf</a>
 </ul>
 
 <h3>Kolab2 Architecture Draft</h3>



From cvs at kolab.org  Tue Nov 28 23:28:14 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 28 Nov 2006 23:28:14 +0100 (CET)
Subject: steffen: server/kolab-horde-fbview/kolab-horde-fbview/fbview test.php,
	1.1, NONE 
Message-ID: <20061128222814.24D5F1006C3@lists.intevation.de>

Author: steffen

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

Removed Files:
	test.php 
Log Message:
bye bye offending file

--- test.php DELETED ---



From cvs at kolab.org  Mon Dec  4 14:31:50 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Dec 2006 14:31:50 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.14,1.15 
Message-ID: <20061204133150.DB92B1006AB@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
	variable corresponding to `$1' exists" in case we are NOT skipping
	the section.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	20 Mar 2006 21:09:07 -0000	1.14
+++ ChangeLog	4 Dec 2006 13:31:48 -0000	1.15
@@ -1,3 +1,9 @@
+2006-12-04  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
+	variable corresponding to `$1' exists" in case we are NOT skipping
+	the section.
+	
 2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the



From cvs at kolab.org  Mon Dec  4 14:31:50 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Dec 2006 14:31:50 +0100 (CET)
Subject: gunnar: server/perl-kolab/Kolab-Conf Conf.pm.in,1.8,1.9 
Message-ID: <20061204133150.D98AE1006A2@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Conf.pm.in 
Log Message:
	* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
	variable corresponding to `$1' exists" in case we are NOT skipping
	the section.


Index: Conf.pm.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Conf.pm.in	18 May 2006 02:53:28 -0000	1.8
+++ Conf.pm.in	4 Dec 2006 13:31:48 -0000	1.9
@@ -297,7 +297,8 @@
 		s/\@{3}([^\s\@]+?)(\|.+?)?\@{3}/$val/;
 		last if ( $val eq "\@\@\@$attr\@\@\@" ); # prevent endless loop
 	      } else {
-		Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
+		# Only warn the user in case we are not skipping the section
+		($skip == 0) && Kolab::log('T', "No configuration variable corresponding to `$1' exists", KOLAB_WARN);
 		s/\@{3}([^\s\@]+?)\@{3}//;
 	      }
 	    }



From cvs at kolab.org  Thu Dec  7 12:59:02 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Dec 2006 12:59:02 +0100 (CET)
Subject: thomas: server release-notes.txt,1.15.2.20,1.15.2.21 
Message-ID: <20061207115902.C2FFD1006C1@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	release-notes.txt 
Log Message:
Updated proftpd.conf template:
LDAPHomedirOnDemand(Prefix) is now named LDAPGenerateHomedir(Prefix).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.15.2.20
retrieving revision 1.15.2.21
diff -u -d -r1.15.2.20 -r1.15.2.21
--- release-notes.txt	10 Nov 2006 11:31:34 -0000	1.15.2.20
+++ release-notes.txt	7 Dec 2006 11:59:00 -0000	1.15.2.21
@@ -16,6 +16,9 @@
 	user at machine.example.org that reaches the server machine is
 	actually delivered.
 
+	Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
+	now named LDAPGenerateHomedir(Prefix).
+
 
 Changes since 2.0.3:
 



From cvs at kolab.org  Thu Dec  7 12:59:02 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Dec 2006 12:59:02 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates proftpd.conf.template, 1.1.1.1,
	1.1.1.1.2.1 
Message-ID: <20061207115902.CD7FB1006D0@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_0_branch
	proftpd.conf.template 
Log Message:
Updated proftpd.conf template:
LDAPHomedirOnDemand(Prefix) is now named LDAPGenerateHomedir(Prefix).


Index: proftpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/proftpd.conf.template,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- proftpd.conf.template	23 Nov 2004 20:26:47 -0000	1.1.1.1
+++ proftpd.conf.template	7 Dec 2006 11:59:00 -0000	1.1.1.1.2.1
@@ -27,8 +27,8 @@
 LDAPForceDefaultUID   on
 LDAPDefaultGID        @l_ngid@
 LDAPForceDefaultGID   on
-LDAPHomedirOnDemand             on
-LDAPHomedirOnDemandPrefix       /tmp
+LDAPGenerateHomedir             on
+LDAPGenerateHomedirPrefix       /tmp
 
 MaxInstances          40
 User                  @l_nusr@



From cvs at kolab.org  Thu Dec  7 12:59:13 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Dec 2006 12:59:13 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates proftpd.conf.template.in, 1.1,
	1.2 
Message-ID: <20061207115913.43BD01006DF@lists.intevation.de>

Author: thomas

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

Modified Files:
	proftpd.conf.template.in 
Log Message:
Updated proftpd.conf template:                                                  LDAPHomedirOnDemand(Prefix) is now named LDAPGenerateHomedir(Prefix).


Index: proftpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/proftpd.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- proftpd.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ proftpd.conf.template.in	7 Dec 2006 11:59:11 -0000	1.2
@@ -32,8 +32,8 @@
 LDAPForceDefaultUID   on
 LDAPDefaultGID        @ftpserver_gid@
 LDAPForceDefaultGID   on
-LDAPHomedirOnDemand             on
-LDAPHomedirOnDemandPrefix       /tmp
+LDAPGenerateHomedir             on
+LDAPGenerateHomedirPrefix       /tmp
 
 MaxInstances          40
 User                  @ftpserver_usr@



From cvs at kolab.org  Thu Dec  7 12:59:13 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Dec 2006 12:59:13 +0100 (CET)
Subject: thomas: server release-notes.txt,1.55,1.56 
Message-ID: <20061207115913.42D4F1006D9@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated proftpd.conf template:                                                  LDAPHomedirOnDemand(Prefix) is now named LDAPGenerateHomedir(Prefix).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- release-notes.txt	15 Nov 2006 17:57:01 -0000	1.55
+++ release-notes.txt	7 Dec 2006 11:59:11 -0000	1.56
@@ -1,5 +1,5 @@
 Release notes Kolab2 Server
-(Version 20061110, Kolab Server 2.1 beta 3)
+(Version 2006????, 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
@@ -61,6 +61,15 @@
 
     - 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:
+
+    - kolabd-2.0.99-2006????
+
+	Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
+	now named LDAPGenerateHomedir(Prefix).
+
 
 Changes since 2.1 beta 2:
 



From cvs at kolab.org  Fri Dec  8 22:13:00 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 22:13:00 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.18.2.3, 1.18.2.4 
Message-ID: <20061208211300.BFA431005B4@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	form.class.php 
Log Message:
Fix for issue1418 (Field customisation issue)

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -r1.18.2.3 -r1.18.2.4
--- form.class.php	13 Oct 2005 01:50:24 -0000	1.18.2.3
+++ form.class.php	8 Dec 2006 21:12:58 -0000	1.18.2.4
@@ -44,6 +44,18 @@
       if( !isset( $value['attrs'] ) ) $this->entries[$key]['attrs'] = '';
     }
   }
+
+  /*private*/function comment_helper( &$value ) {
+	  $ast = '';
+	  if( isset($value['validation'])){
+		  if( is_array( $value['validation'] ) && in_array( 'notempty', $value['validation']) ) {
+			  $ast = '<span class="required_asterisk">*</span> ';
+		  } else if( $value['validation'] == 'notempty' ) {
+			  $ast = '<span class="required_asterisk">*</span> ';			  
+		  }
+	  }
+	  return $ast.$value['comment'];
+  }
   
   function outputForm() {
     $str = '<div class="contentform">';
@@ -69,7 +81,6 @@
 		// Default is text
 		$value['type'] = 'text';
 	  }
-
       switch( $value['type'] ) {
       case 'hidden': continue;
       case 'password':
@@ -88,14 +99,14 @@
 		  $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.MySmarty::htmlentities($value['value']).'" '
 			.MySmarty::htmlentities($value['attrs']).' size="'.$size.'" /></td>';
 		}
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
 	  case 'comment':
 		$str .= '<tr>';
 		$str .= '<td>'.$value['name'].'</td>';
 		$str .= '<td>'.$value['value'].'</td>';
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
       case 'textarea':
@@ -106,7 +117,7 @@
 		} else {
 		  $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.MySmarty::htmlentities($value['value']).'</textarea></td>';
 		}
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;	
       case 'checkbox':
@@ -117,7 +128,7 @@
 		} else {
 		  $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="on" '.($value['value']?'checked':'').' '.$value['attrs'].' /></td>';
 		}
-        $str .= '<td>'.$value['comment'].'</td>';
+        $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;	
 	  case 'select':
@@ -137,7 +148,7 @@
 		  $str .= '</select>';
 		  $str .= '</td>';
 		}
-        $str .= '<td>'.$value['comment'].'</td>';
+        $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
       case 'aclselect': // Special Kolab entry for ACLs
@@ -168,7 +179,7 @@
 		  $str .= '</select>';
 		  $str .= '</td>';
 		}
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";	
 		break;
 	  case 'resourcepolicy': // Special Kolab entry for group/resource policies
@@ -218,7 +229,7 @@
 		  }
 		}
 		$str .= '</table></td>';
-        $str .= '<td>'.$value['comment'].'</td>';
+        $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
       }
@@ -235,6 +246,7 @@
       }
     }
     $str .= '</form>';
+	$str .= '<div class="required_asterisk">'._('* Required field.').'</div>';
     $str .= '</div>';
     return $str;
   }



From cvs at kolab.org  Fri Dec  8 22:13:00 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 22:13:00 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php,
	1.62.2.4, 1.62.2.5 
Message-ID: <20061208211300.CD5EB1006A1@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	user.php 
Log Message:
Fix for issue1418 (Field customisation issue)

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/Attic/user.php,v
retrieving revision 1.62.2.4
retrieving revision 1.62.2.5
diff -u -d -r1.62.2.4 -r1.62.2.5
--- user.php	11 Jan 2006 03:46:22 -0000	1.62.2.4
+++ user.php	8 Dec 2006 21:12:58 -0000	1.62.2.5
@@ -178,6 +178,7 @@
 	  if( $attributeaccess[$akey] == 'ro' ) {
 		$entries[$key]['attrs'] = 'readonly';
 	  } else if( $attributeaccess[$akey] == 'hidden' ) {
+		  //$entries[$key]['attrs'] = 'hidden';
 		unset($entries[$key]);
 	  } else if( $attributeaccess[$akey] == 'mandatory' ) {
 		if( isset( $entries[$key]['validation'] ) ) {
@@ -211,68 +212,74 @@
   else $mail = $ldap_object['mail'];
   if (is_array($ldap_object['uid'])) $uid = $ldap_object['uid'][0];
   else $uid = $ldap_object['uid'];
-  $form->entries['givenname']['value'] = $givenname;
-  $form->entries['sn']['value'] = $sn;
-  $form->entries['password_0']['value'] = '';
-  $form->entries['password_1']['value'] = '';
-  $form->entries['mail']['value'] = $mail;
-  $form->entries['mail']['attrs'] = 'readonly';
-  $form->entries['uid']['value'] = $uid;
-
+  if(array_key_exists('givenname',$form->entries)) $form->entries['givenname']['value'] = $givenname;
+  if(array_key_exists('sn',$form->entries)) $form->entries['sn']['value'] = $sn;
+  if(array_key_exists('password_0',$form->entries))  $form->entries['password_0']['value'] = '';
+  if(array_key_exists('password_1',$form->entries))  $form->entries['password_1']['value'] = '';
+  if(array_key_exists('mail',$form->entries))  $form->entries['mail']['value'] = $mail;
+  if(array_key_exists('mail',$form->entries))  $form->entries['mail']['attrs'] = 'readonly';
+  if(array_key_exists('uid',$form->entries))  $form->entries['uid']['value'] = $uid;
   // accttype
   $dncomp = split( ',', $dn );
-  if( in_array('cn=groups',$dncomp) ) {
-	$form->entries['accttype']['value'] = 2;
-  } else if( in_array('cn=resources',$dncomp) ) {
-	$form->entries['accttype']['value'] = 3;	
-  } else if( in_array('cn=internal',$dncomp) ) {
-	$form->entries['accttype']['value'] = 1;	
-  } else {
-	$form->entries['accttype']['value'] = 0;
+  if(array_key_exists('acctype',$form->entries)) {
+	  if( in_array('cn=groups',$dncomp) ) {
+		  $form->entries['accttype']['value'] = 2;
+	  } else if( in_array('cn=resources',$dncomp) ) {
+		  $form->entries['accttype']['value'] = 3;	
+	  } else if( in_array('cn=internal',$dncomp) ) {
+		  $form->entries['accttype']['value'] = 1;	
+	  } else {
+		  $form->entries['accttype']['value'] = 0;
+	  }
+	  if( $auth->group() == 'user' ) $form->entries['accttype']['attrs'] = 'readonly';
   }
-  if( $auth->group() == 'user' ) $form->entries['accttype']['attrs'] = 'readonly';
 
   // Automatic invitation handling
-  $policies = array();
-  for( $i = 0; $i < $ldap_object['kolabInvitationPolicy']['count']; $i++ ) {
-	$resact = $ldap_object['kolabInvitationPolicy'][$i];
-	debug("resact=$resact");
-	if( ereg( '(.*):(.*)', trim($resact), $regs ) ) {
-	  $user = trim($regs[1]);
-	  $pol  = trim($regs[2]);
-	  if( empty($user) ) continue;
-	} else {
-	  $user = 'anyone';
-	  $pol = trim($resact);
-	}
-	if( $form->entries['accttype']['value'] == 1 ) {
-	  // default for groups
-	  $pol = policy2number( $pol, 3 /*ACT_MANUAL_IF_CONFLICTS*/ );
-	} else {
-	  // default for resources
-	  $pol = policy2number( $pol, 2 /*ACT_REJECT_IF_CONFLICTS*/ );
-	}
-	$policies[$user] = $pol;
+  if(array_key_exists('kolabinvitationpolicy',$form->entries)) {
+	  $policies = array();
+	  for( $i = 0; $i < $ldap_object['kolabInvitationPolicy']['count']; $i++ ) {
+		  $resact = $ldap_object['kolabInvitationPolicy'][$i];
+		  debug("resact=$resact");
+		  if( ereg( '(.*):(.*)', trim($resact), $regs ) ) {
+			  $user = trim($regs[1]);
+			  $pol  = trim($regs[2]);
+			  if( empty($user) ) continue;
+		  } else {
+			  $user = 'anyone';
+			  $pol = trim($resact);
+		  }
+		  if( $form->entries['accttype']['value'] == 1 ) {
+			  // default for groups
+			  $pol = policy2number( $pol, 3 /*ACT_MANUAL_IF_CONFLICTS*/ );
+		  } else {
+			  // default for resources
+			  $pol = policy2number( $pol, 2 /*ACT_REJECT_IF_CONFLICTS*/ );
+		  }
+		  $policies[$user] = $pol;
+	  }
+	  if( !isset( $policies['anyone'] ) ) $policies['anyone'] = 4 /*ACT_MANUAL*/;
+	  $form->entries['kolabinvitationpolicy']['policies'] = $policies;  
   }
-  if( !isset( $policies['anyone'] ) ) $policies['anyone'] = 4 /*ACT_MANUAL*/;
-  $form->entries['kolabinvitationpolicy']['policies'] = $policies;  
 
   foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 
 				  'postOfficeBox', 'postalCode', 'l', 'c', 
 				  'telephoneNumber', 'facsimileTelephoneNumber' ) as $attr ) {
+	if(!array_key_exists($attr.'_0',$form->entries)) continue;
     if (is_array($ldap_object[$attr])) $v = $ldap_object[$attr][0];
     else $v = $ldap_object[$attr];
     $form->entries[$attr.'_0']['value'] = $v;
   }
 
   // alias
-  if (is_array($ldap_object['alias'])) {
-	$arr = $ldap_object['alias'];
-	unset( $arr['count'] );
-	$v = join("\n", $arr );
+  if(array_key_exists('alias',$form->entries)) {
+	  if (is_array($ldap_object['alias'])) {
+		  $arr = $ldap_object['alias'];
+		  unset( $arr['count'] );
+		  $v = join("\n", $arr );
+	  }
+	  else $v = "";
+	  $form->entries['alias']['value'] = $v;
   }
-  else $v = "";
-  $form->entries['alias']['value'] = $v;
 
   // kolabdelegate
   if (is_array($ldap_object['kolabDelegate'])) {
@@ -281,14 +288,15 @@
 	$v = join("\n", $arr );
   }
   else $v = "";
-  $form->entries['kolabdelegate']['value'] = $v;
+  if(array_key_exists('kolabdelegate',$form->entries)) $form->entries['kolabdelegate']['value'] = $v;
 
   // kolabhomeserver
-  if( is_array($ldap_object['kolabHomeServer']) ) {
-	$form->entries['kolabhomeserver']['value'] = $ldap_object['kolabHomeServer'][0];
+  if(array_key_exists('kolabhomeserver',$form->entries)) {
+	  if( is_array($ldap_object['kolabHomeServer']) ) {
+		  $form->entries['kolabhomeserver']['value'] = $ldap_object['kolabHomeServer'][0];
+	  }
+	  $form->entries['kolabhomeserver']['attrs'] = 'readonly';
   }
-  $form->entries['kolabhomeserver']['attrs'] = 'readonly';
-
   $form->entries['action']['value'] = 'save';
 
   // userquota
@@ -307,8 +315,8 @@
 	if( is_array( $ldap_object['kolabFreeBusyFuture'] ) ) 
 	  $freebusyfuture = $ldap_object['kolabFreeBusyFuture'][0];
 	else $freebusyfuture = $ldap_object['kolabFreeBusyFuture'];
+	$form->entries['kolabFreeBusyFuture_0']['value'] = $freebusyfuture;
   }
-  $form->entries['kolabFreeBusyFuture_0']['value'] = $freebusyfuture;
 }
 
 /**** Authentication etc. ***/
@@ -504,7 +512,7 @@
 		 }
 		 if ($count > 0) $ldap_object[$attr] = $args;
 		 elseif (!empty($_POST[$key])) $ldap_object[$attr] = $_POST[$key];  
-		 else $ldap_object[$attr] = array();
+		 else/*if (in_array($key,$_POST))*/ $ldap_object[$attr] = array();
        }
 	   {
 		 // Handle group/resource policies



From cvs at kolab.org  Fri Dec  8 22:13:00 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 22:13:00 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin style.css, 1.7,
	1.7.2.1 
Message-ID: <20061208211300.D70E11006DC@lists.intevation.de>

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	style.css 
Log Message:
Fix for issue1418 (Field customisation issue)

Index: style.css
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- style.css	16 Jun 2005 00:32:10 -0000	1.7
+++ style.css	8 Dec 2006 21:12:58 -0000	1.7.2.1
@@ -183,3 +183,9 @@
   border: solid 1px black;  
   padding: .2em .5em .2em .5em; 
 }
+
+.required_asterisk { 
+  color: red;
+  font-size: 80%;
+  text-align: right;
+}



From cvs at kolab.org  Fri Dec  8 23:02:37 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:02:37 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin style.css, 1.8,
	1.9 
Message-ID: <20061208220237.C05A5101EE6@lists.intevation.de>

Author: steffen

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

Modified Files:
	style.css 
Log Message:
Fix for issue1418 (Field customisation issue)

Index: style.css
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/style.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- style.css	31 Jul 2006 02:03:10 -0000	1.8
+++ style.css	8 Dec 2006 22:02:35 -0000	1.9
@@ -188,3 +188,9 @@
   border: solid 1px black;  
   padding: .2em .5em .2em .5em; 
 }
+
+.required_asterisk { 
+  color: red;
+  font-size: 80%;
+  text-align: right;
+}



From cvs at kolab.org  Fri Dec  8 23:02:37 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:02:37 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include
	form.class.php, 1.27, 1.28 
Message-ID: <20061208220237.B422C101EE2@lists.intevation.de>

Author: steffen

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

Modified Files:
	form.class.php 
Log Message:
Fix for issue1418 (Field customisation issue)

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- form.class.php	11 Jul 2006 16:02:24 -0000	1.27
+++ form.class.php	8 Dec 2006 22:02:35 -0000	1.28
@@ -44,8 +44,21 @@
       if( !isset( $value['attrs'] ) ) $this->entries[$key]['attrs'] = '';
     }
   }
+
+  /*private*/function comment_helper( &$value ) {
+	  $ast = '';
+	  if( isset($value['validation'])){
+		  if( is_array( $value['validation'] ) && in_array( 'notempty', $value['validation']) ) {
+			  $ast = '<span class="required_asterisk">*</span> ';
+		  } else if( $value['validation'] == 'notempty' ) {
+			  $ast = '<span class="required_asterisk">*</span> ';			  
+		  }
+	  }
+	  return $ast.$value['comment'];
+  }
   
   function outputForm() {
+	  debug_var_dump($this->entries);
     $str = '<div class="contentform">';
     /*
     if( count( $this->errors ) > 0 ) {
@@ -83,7 +96,7 @@
 		  $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.MySmarty::htmlentities($value['value']).'" '
 			.MySmarty::htmlentities($value['attrs']).' size="'.$size.'" /></td>';
 		}
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
 	  case 'email':
@@ -116,14 +129,14 @@
 			$str .= '</td>';
 		  }
 		}
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
 	  case 'comment':
 		$str .= '<tr>';
 		$str .= '<td>'.$value['name'].'</td>';
 		$str .= '<td>'.$value['value'].'</td>';
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
       case 'textarea':
@@ -134,7 +147,7 @@
 		} else {
 		  $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.MySmarty::htmlentities($value['value']).'</textarea></td>';
 		}
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;	
       case 'checkbox':
@@ -145,7 +158,7 @@
 		} else {
 		  $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="on" '.($value['value']?'checked':'').' '.$value['attrs'].' /></td>';
 		}
-        $str .= '<td>'.$value['comment'].'</td>';
+        $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;	
 	  case 'checklist':
@@ -184,7 +197,7 @@
 		  $str .= '</select>';
 		  $str .= '</td>';
 		}
-        $str .= '<td>'.$value['comment'].'</td>';
+        $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
 	  case 'foldertypeselect':
@@ -240,7 +253,7 @@
 		  $str .= '</select>';
 		  $str .= '</td>';
 		}
-		$str .= '<td>'.$value['comment'].'</td>';
+		$str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";	
 		break;
 	  case 'resourcepolicy': // Special Kolab entry for group/resource policies
@@ -290,7 +303,7 @@
 		  }
 		}
 		$str .= '</table></td>';
-        $str .= '<td>'.$value['comment'].'</td>';
+        $str .= '<td>'.KolabForm::comment_helper($value).'</td>';
 		$str .= '</tr>'."\n";
 		break;
       }
@@ -307,6 +320,7 @@
       }
     }
     $str .= '</form>';
+	$str .= '<div class="required_asterisk">'._('* Required field.').'</div>';
     $str .= '</div>';
     return $str;
   }



From cvs at kolab.org  Fri Dec  8 23:02:37 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:02:37 +0100 (CET)
Subject: steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.9, 1.10 
Message-ID: <20061208220237.CA1A1101EE7@lists.intevation.de>

Author: steffen

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

Modified Files:
	user.php.in 
Log Message:
Fix for issue1418 (Field customisation issue)

Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- user.php.in	18 May 2006 03:14:24 -0000	1.9
+++ user.php.in	8 Dec 2006 22:02:35 -0000	1.10
@@ -188,6 +188,7 @@
 	  if( $attributeaccess[$akey] == 'ro' ) {
 		$entries[$key]['attrs'] = 'readonly';
 	  } else if( $attributeaccess[$akey] == 'hidden' ) {
+		  //$entries[$key]['attrs'] = 'hidden';
 		unset($entries[$key]);
 	  } else if( $attributeaccess[$akey] == 'mandatory' ) {
 		if( isset( $entries[$key]['validation'] ) ) {
@@ -221,68 +222,74 @@
   else $mail = $ldap_object['mail'];
   if (is_array($ldap_object['uid'])) $uid = $ldap_object['uid'][0];
   else $uid = $ldap_object['uid'];
-  $form->entries['givenname']['value'] = $givenname;
-  $form->entries['sn']['value'] = $sn;
-  $form->entries['password_0']['value'] = '';
-  $form->entries['password_1']['value'] = '';
-  $form->entries['mail']['value'] = $mail;
-  $form->entries['mail']['attrs'] = 'readonly';
-  $form->entries['uid']['value'] = $uid;
-
+  if(array_key_exists('givenname',$form->entries)) $form->entries['givenname']['value'] = $givenname;
+  if(array_key_exists('sn',$form->entries)) $form->entries['sn']['value'] = $sn;
+  if(array_key_exists('password_0',$form->entries))  $form->entries['password_0']['value'] = '';
+  if(array_key_exists('password_1',$form->entries))  $form->entries['password_1']['value'] = '';
+  if(array_key_exists('mail',$form->entries))  $form->entries['mail']['value'] = $mail;
+  if(array_key_exists('mail',$form->entries))  $form->entries['mail']['attrs'] = 'readonly';
+  if(array_key_exists('uid',$form->entries))  $form->entries['uid']['value'] = $uid;
   // accttype
   $dncomp = split( ',', $dn );
-  if( in_array('cn=groups',$dncomp) ) {
-	$form->entries['accttype']['value'] = 2;
-  } else if( in_array('cn=resources',$dncomp) ) {
-	$form->entries['accttype']['value'] = 3;	
-  } else if( in_array('cn=internal',$dncomp) ) {
-	$form->entries['accttype']['value'] = 1;	
-  } else {
-	$form->entries['accttype']['value'] = 0;
+  if(array_key_exists('acctype',$form->entries)) {
+	  if( in_array('cn=groups',$dncomp) ) {
+		  $form->entries['accttype']['value'] = 2;
+	  } else if( in_array('cn=resources',$dncomp) ) {
+		  $form->entries['accttype']['value'] = 3;	
+	  } else if( in_array('cn=internal',$dncomp) ) {
+		  $form->entries['accttype']['value'] = 1;	
+	  } else {
+		  $form->entries['accttype']['value'] = 0;
+	  }
+	  if( $auth->group() == 'user' ) $form->entries['accttype']['attrs'] = 'readonly';
   }
-  if( $auth->group() == 'user' ) $form->entries['accttype']['attrs'] = 'readonly';
 
   // Automatic invitation handling
-  $policies = array();
-  for( $i = 0; $i < $ldap_object['kolabInvitationPolicy']['count']; $i++ ) {
-	$resact = $ldap_object['kolabInvitationPolicy'][$i];
-	debug("resact=$resact");
-	if( ereg( '(.*):(.*)', trim($resact), $regs ) ) {
-	  $user = trim($regs[1]);
-	  $pol  = trim($regs[2]);
-	  if( empty($user) ) continue;
-	} else {
-	  $user = 'anyone';
-	  $pol = trim($resact);
-	}
-	if( $form->entries['accttype']['value'] == 1 ) {
-	  // default for groups
-	  $pol = policy2number( $pol, 3 /*ACT_MANUAL_IF_CONFLICTS*/ );
-	} else {
-	  // default for resources
-	  $pol = policy2number( $pol, 2 /*ACT_REJECT_IF_CONFLICTS*/ );
-	}
-	$policies[$user] = $pol;
+  if(array_key_exists('kolabinvitationpolicy',$form->entries)) {
+	  $policies = array();
+	  for( $i = 0; $i < $ldap_object['kolabInvitationPolicy']['count']; $i++ ) {
+		  $resact = $ldap_object['kolabInvitationPolicy'][$i];
+		  debug("resact=$resact");
+		  if( ereg( '(.*):(.*)', trim($resact), $regs ) ) {
+			  $user = trim($regs[1]);
+			  $pol  = trim($regs[2]);
+			  if( empty($user) ) continue;
+		  } else {
+			  $user = 'anyone';
+			  $pol = trim($resact);
+		  }
+		  if( $form->entries['accttype']['value'] == 1 ) {
+			  // default for groups
+			  $pol = policy2number( $pol, 3 /*ACT_MANUAL_IF_CONFLICTS*/ );
+		  } else {
+			  // default for resources
+			  $pol = policy2number( $pol, 2 /*ACT_REJECT_IF_CONFLICTS*/ );
+		  }
+		  $policies[$user] = $pol;
+	  }
+	  if( !isset( $policies['anyone'] ) ) $policies['anyone'] = 4 /*ACT_MANUAL*/;
+	  $form->entries['kolabinvitationpolicy']['policies'] = $policies;  
   }
-  if( !isset( $policies['anyone'] ) ) $policies['anyone'] = 4 /*ACT_MANUAL*/;
-  $form->entries['kolabinvitationpolicy']['policies'] = $policies;  
 
   foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 
 				  'postOfficeBox', 'postalCode', 'l', 'c', 
 				  'telephoneNumber', 'facsimileTelephoneNumber' ) as $attr ) {
+	if(!array_key_exists($attr.'_0',$form->entries)) continue;
     if (is_array($ldap_object[$attr])) $v = $ldap_object[$attr][0];
     else $v = $ldap_object[$attr];
     $form->entries[$attr.'_0']['value'] = $v;
   }
 
   // alias
-  if (is_array($ldap_object['alias'])) {
-	$arr = $ldap_object['alias'];
-	unset( $arr['count'] );
-	$v = join("\n", $arr );
+  if(array_key_exists('alias',$form->entries)) {
+	  if (is_array($ldap_object['alias'])) {
+		  $arr = $ldap_object['alias'];
+		  unset( $arr['count'] );
+		  $v = join("\n", $arr );
+	  }
+	  else $v = "";
+	  $form->entries['alias']['value'] = $v;
   }
-  else $v = "";
-  $form->entries['alias']['value'] = $v;
 
   // kolabdelegate
   if (is_array($ldap_object['kolabDelegate'])) {
@@ -291,14 +298,15 @@
 	$v = join("\n", $arr );
   }
   else $v = "";
-  $form->entries['kolabdelegate']['value'] = $v;
+  if(array_key_exists('kolabdelegate',$form->entries)) $form->entries['kolabdelegate']['value'] = $v;
 
   // kolabhomeserver
-  if( is_array($ldap_object['kolabHomeServer']) ) {
-	$form->entries['kolabhomeserver']['value'] = $ldap_object['kolabHomeServer'][0];
+  if(array_key_exists('kolabhomeserver',$form->entries)) {
+	  if( is_array($ldap_object['kolabHomeServer']) ) {
+		  $form->entries['kolabhomeserver']['value'] = $ldap_object['kolabHomeServer'][0];
+	  }
+	  $form->entries['kolabhomeserver']['attrs'] = 'readonly';
   }
-  $form->entries['kolabhomeserver']['attrs'] = 'readonly';
-
   $form->entries['action']['value'] = 'save';
 
   // userquota
@@ -317,8 +325,8 @@
 	if( is_array( $ldap_object['kolabFreeBusyFuture'] ) ) 
 	  $freebusyfuture = $ldap_object['kolabFreeBusyFuture'][0];
 	else $freebusyfuture = $ldap_object['kolabFreeBusyFuture'];
+	$form->entries['kolabFreeBusyFuture_0']['value'] = $freebusyfuture;
   }
-  $form->entries['kolabFreeBusyFuture_0']['value'] = $freebusyfuture;
 }
 
 /**** Authentication etc. ***/
@@ -528,7 +536,7 @@
 		 }
 		 if ($count > 0) $ldap_object[$attr] = $args;
 		 elseif (!empty($_POST[$key])) $ldap_object[$attr] = $_POST[$key];  
-		 else $ldap_object[$attr] = array();
+		 else/*if (in_array($key,$_POST))*/ $ldap_object[$attr] = array();
        }
 	   {
 		 // Handle group/resource policies



From cvs at kolab.org  Fri Dec  8 23:08:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:08:38 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview
	test.php, 1.1.1.1, NONE 
Message-ID: <20061208220838.6B3D2101EE2@lists.intevation.de>

Author: steffen

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

Removed Files:
      Tag: kolab_2_0_branch
	test.php 
Log Message:
removed offending files

--- test.php DELETED ---



From cvs at kolab.org  Fri Dec  8 23:08:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:08:38 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/util
	regex_test.php, 1.1.1.1, NONE 
Message-ID: <20061208220838.7CB21101EE9@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/util
In directory doto:/tmp/cvs-serv23082/fbview/util

Removed Files:
      Tag: kolab_2_0_branch
	regex_test.php 
Log Message:
removed offending files

--- regex_test.php DELETED ---



From cvs at kolab.org  Fri Dec  8 23:08:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:08:38 +0100 (CET)
Subject: steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/turba
	test.php, 1.1.1.1, NONE 
Message-ID: <20061208220838.7AE98101EE6@lists.intevation.de>

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/turba
In directory doto:/tmp/cvs-serv23082/fbview/turba

Removed Files:
      Tag: kolab_2_0_branch
	test.php 
Log Message:
removed offending files

--- test.php DELETED ---



From cvs at kolab.org  Fri Dec  8 23:10:23 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:10:23 +0100 (CET)
Subject: steffen: server/kolab-horde-fbview/kolab-horde-fbview/fbview/turba
	test.php, 1.1, NONE 
Message-ID: <20061208221023.31A16101EE2@lists.intevation.de>

Author: steffen

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

Removed Files:
	test.php 
Log Message:
removed offending files

--- test.php DELETED ---



From cvs at kolab.org  Fri Dec  8 23:10:23 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  8 Dec 2006 23:10:23 +0100 (CET)
Subject: steffen: server/kolab-horde-fbview/kolab-horde-fbview/fbview/util
	regex_test.php, 1.1, NONE 
Message-ID: <20061208221023.3B879101EE6@lists.intevation.de>

Author: steffen

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

Removed Files:
	regex_test.php 
Log Message:
removed offending files

--- regex_test.php DELETED ---



From cvs at kolab.org  Mon Dec 11 14:29:36 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Dec 2006 14:29:36 +0100 (CET)
Subject: bernhard: utils/admin listannotations.pl,1.2,1.3 
Message-ID: <20061211132936.607711005B4@lists.intevation.de>

Author: bernhard

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

Modified Files:
	listannotations.pl 
Log Message:
Added explicit license. 


Index: listannotations.pl
===================================================================
RCS file: /kolabrepository/utils/admin/listannotations.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- listannotations.pl	21 Feb 2006 12:22:30 -0000	1.2
+++ listannotations.pl	11 Dec 2006 13:29:34 -0000	1.3
@@ -25,7 +25,7 @@
 #  20060220 initial bernhard at intevation.de	
 #  	Tested with Kolab Server 2.1.0beta1.
 #
-#  This script is Free Software. 
+#  This script is Free Software under GNU GPL v>2.
 # $Id$
 
 use Cyrus::IMAP::Admin;



From cvs at kolab.org  Mon Dec 11 14:50:47 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Dec 2006 14:50:47 +0100 (CET)
Subject: bernhard: utils/admin listannotations.pl,1.3,1.4 
Message-ID: <20061211135047.BFC5C1005B4@lists.intevation.de>

Author: bernhard

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

Modified Files:
	listannotations.pl 
Log Message:
Typo in license corrected (thanks to Sascha W for spotting).


Index: listannotations.pl
===================================================================
RCS file: /kolabrepository/utils/admin/listannotations.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- listannotations.pl	11 Dec 2006 13:29:34 -0000	1.3
+++ listannotations.pl	11 Dec 2006 13:50:45 -0000	1.4
@@ -25,7 +25,7 @@
 #  20060220 initial bernhard at intevation.de	
 #  	Tested with Kolab Server 2.1.0beta1.
 #
-#  This script is Free Software under GNU GPL v>2.
+#  This script is Free Software under GNU GPL v>=2.
 # $Id$
 
 use Cyrus::IMAP::Admin;



From cvs at kolab.org  Wed Dec 13 12:03:25 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Dec 2006 12:03:25 +0100 (CET)
Subject: bh: utils/ldap-sync - New directory 
Message-ID: <20061213110325.EDDA11006C1@lists.intevation.de>

Author: bh

Update of /kolabrepository/utils/ldap-sync
In directory doto:/tmp/cvs-serv2797/ldap-sync

Log Message:
Directory /kolabrepository/utils/ldap-sync added to the repository




From cvs at kolab.org  Wed Dec 13 12:06:49 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Dec 2006 12:06:49 +0100 (CET)
Subject: bh: utils/ldap-sync COPYING, NONE, 1.1 LIESMICH.txt, NONE,
	1.1 config-example.py, NONE, 1.1 converter.py, NONE,
	1.1 filelock.py, NONE, 1.1 ldapsync.py, NONE, 1.1 transferrer.py,
	NONE, 1.1 
Message-ID: <20061213110649.7F3611006B7@lists.intevation.de>

Author: bh

Update of /kolabrepository/utils/ldap-sync
In directory doto:/tmp/cvs-serv3246

Added Files:
	COPYING LIESMICH.txt config-example.py converter.py 
	filelock.py ldapsync.py transferrer.py 
Log Message:
initial import of the ldap sync script

--- NEW FILE: COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

--- NEW FILE: LIESMICH.txt ---
Anmerkungen zum ldapsync Script
===============================
2006-11-22, Bernhard Reiter <bernhard at intevation.de>


Systemvoraussetzungen
---------------------

Python       >=2.3
Python-LDAP  >=2.0

Getestet wurde u.A. mit:
Debian GNU/Linux, Python 2.3.5, python-ldap 2.0.4-1, libldap2 2.1.30-8, i586.
Windows Server  2003 (Standard Edition, SP1) with AD and Exchange in Vmware.


Installation
------------

Kopieren Sie den Inhalt des Verzeichnisses an eine geeignete Stelle.
Als Konfigurationsdatei dient eine Datei config.py im gleichen
Verzeichnis.  Als Vorlage für diese Datei kann config-example.py dienen,
welche auch einige Kommentare für die Dokumentation enthält.


Das Hauptprogramm ist ldapsync.py.  Zum Test kann die Option --dry-run
verwendet werden.
Die Optionen --search und --dump-data sind Analyse-Funktionen.


Logging
-------

Per default wird nach stderr geloggt mit Log-Level DEBUG.  Im Moment
kann man dies nur durch entsprechende Änderungen an der Funktion
initialize_logging in ldapsync.py ändern.


Zu Beachten
-----------

 - Datenverlust vermeiden:

   ldapsync geht davon aus, dass alle Einträge im Zielzweig des
   LDAP-Server von ldapsync verwaltet werden und löscht dort
   entsprechend Objekte, die im Quellzweig gelöscht wurden. Je nach
   Konfiguration kann das zum ungewollten Verlust von Daten führen.

   In beide Richtungen sollte also ein eigener Teilbaum für die
   Adresseinträge vorgesehen sein.

 

   In der anderen Richtung kann das Problematisch sein.  Das
   Kolab-Webfrontend hat ein Interface zum Verwalten von externen
   Addressen, dies im LDAP unter cn=external,<kolab-base-dn> ablegt.
   Wenn ldap sync seine Einträge ebenfalls dort ablegt, werden Einträge,
   die über Kolabs Webfrontend angelegt wurden gelöscht.  Es ist daher
   empfehlenswert, einen anderen Teilbaum zu verwenden.

 - Anlegen des Zielzweigs:

   Active Directory: Für jeden kolabHomeServer sollte 
   in der Standardkonfiguration ein Eintrag vorhanden sein:
	ou=kolab.server.example.org

   Kolab Servers OpenLDAP: Ein Teilbaum kann angelegt werden, z.B. mit
   ldapadd, wie folgt:

	Entsprechende Datei ad-subtree.ldif anlegen:
		dn: cn=ad,cn=external,dc=example,dc=org
		cn: ad
		objectClass: top
		objectClass: kolabNamedObject

       ldapadd -f ad-subtree.ldiff -H ldap://kolab.server.example.org \
	-D cn=manager,cn=internal,dc=example,dc=org -x -W


Bekannte Probleme/Anmerkungen
-----------------------------

 - Active Directory akzeptiert manchmal Einträge, schreibt diese
   aber nach wenigen Sekunden oder Minuten um. Nur wenn die richtige
   Kombination von Attributen gesetzt wird, 
   verbleibt beispielsweise das Attribut "showInAddressBook". 

 - Um durch AD hinzugefügte Attributewerte in relevanten Attributen
   nicht mitzuvergleichen, können diese hart entfernt werden.
   Siehe converter.py, Funktion remove_ad_extra_attributevalues().
   Die dort entfernten Attributewerte (zur Zeit X400 proxyAddresses)
   können nicht mehr zuverlässig gesetzt werden.
   
 - Sperrdatei (.lock) wird nicht weggeräumt, wenn der angegebene
   Prozess nicht mehr läuft. Wenn nach einem Rechner-Absturz
   die Sperrdatei noch da ist, dann weigert sich das Skript zu starten.
   Bei automatiserter Ausführung (z.B. per cron) 
   muss eine Fehlermeldung dem Admin also zugehen.

 - Active Directory akzeptiert nur manche geschützen ("quoted") Zeichen
   bei DNs. Das Skript versucht deshalb die DNs so zu normalisieren,
   dass sie bei Umlauten keine Probleme verursachen. 
   (Siehe Kommentare in converter.py für die technischen Details.)


--- NEW FILE: config-example.py ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: converter.py ---
# Copyright (C) 2006 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
# Bernhard Reiter <bernhard at intevation.de>
#
# This program is free software under the GPL (>=v2)
# Read the file COPYING coming with the software for details.

"""Classes and functions to convert an ldap entry"""

import logging
import re

import ldap

def joindn(exploded_dn):
    """Join an 'exploded' dn again.  This is the inverse to ldap.explode_dn"""
    return ",".join(exploded_dn)

def _change_maybe_hex_into_char(match):
    """Changes quoted hex into character if it is not a MUST dn escape char.

    The list of MUST quoted characters was taken from RFC4514.
    Takes a match object parameter for something like '\\a0'.  Returns '\xa0'.
    """
    hex=match.group(0).upper()
    if not hex in ['\\20','\\22','\\23', '\\2B','\\2C',
                   '\\3B', '\\3C', '\\3E', '\\5C']:
        return chr(int(match.group(0)[1:3],16))
    else:
        return hex

def unescape_maybe_quoted_utf8_chars(dnpartvalue):
    return re.sub("\\\\[0-9a-fA-F]{2}", _change_maybe_hex_into_char, dnpartvalue)

def normalize_dn(dn):
    """Returns a normalized version of the dn that AD can accept.

    The normalized version uses all lowercase of the types in the DN.
    E.g. 'cn=Foo,DC=example,dc=com' will become 'cn=Foo,dc=example,dc=com'.

    Also the OpenLDAP function ldap.explode_dn() will be used, which
    quotes some characters according to RFC 4514.  Note: ldap.explode_dn
    calls the OpenLDAP API function ldap_explode_dn which is deprecated
    in favor of ldap_str2dn.  However, ldap_str2dn has not been wrapped
    by python-ldap yet.

    Some experiments show that Active Directory from Windows Server 2003sp1,
    only seem to correctly accept the characters that MUST be coded,
    which happend to be ascii character, thus one byte long in utf8.
    So this function will remove the escapes done by ldap.explode_dn() again
    for the characters that MAYBE quoted before returning the dn.
    """
    normalized = []
    for item in ldap.explode_dn(dn):
        split = item.split("=")
        split[0] = split[0].lower()
        split[1] = unescape_maybe_quoted_utf8_chars(split[1])
        normalized.append("=".join(split))
    return ",".join(normalized)


def normalize_dns(entries):
    """Normalizes all dns in entries

    The parameter entries should be a dictionary mapping dns to
    attribute dictionaries, that is, the parameter should have the same
    structure as the result object from the ldap search.
    The keys in the entries dictionary will be replaced by their
    normalized version.  The normalization is done with
    normalize_dn. The entries dictionary is modified in place.
    """
    for dn in entries.keys():
        entries[normalize_dn(dn)] = entries.pop(dn)

def remove_ad_extra_attributevalues(entries):
    """Removes extra attributes that ad will add on its own.

    Active Directory might add extra attribute values by itself.
    If we do not want to see them for the comparision, this function
    can will them from entries in place.
    """
    for dn in entries.keys():
        if entries[dn].has_key("proxyAddresses"):
            entries[dn]["proxyAddresses"] = \
                filter(lambda value: value[:5]!="X400:",
                       entries[dn]["proxyAddresses"])


class ConversionError(Exception):

    """Exception raised by rules of the EntryConverter to indicate errors"""


class EntryConverter:

    """Class to convert an LDAP entry.

    An LDAP entry is defined by its dn and a dictionary of attributes.
    A converter consists of a list of converter rules.

    The converters rules are used to convert the attributes and dn of an
    entry.  Each entry in the list is applied in order.  A converter
    rule is a callable object that will be called like this:

       attribute_converter(OLD_DN, OLD_ATTRS, NEW_DN, NEW_ATTRS)

    OLD_DN is the old DN in 'exploded' form as returned by
    ldap.explode_dn, that is it is list of the individual elements of
    the dn. OLD_ATTRS is the dictionary with the old attributes and
    NEW_DN and NEW_ATTRS are the DN and attribute dictionary of the new
    entry.  A rule reads from OLD_DN and OLD_ATTRS and creates or
    modifies NEW_ATTRS and NEW_DN.  It should not modify OLD_ATTRS or
    OLD_DN.

    Usually a rule simply returns None.  However, a rule may return a
    list of (DN, ATTRS) pairs.  These pairs describe new LDAP entries
    which should be added to the LDAP server.

    A rule should raise a ConversionError to indicate an error.  If a
    rule raises such an exception, processing the rule stops and the
    convert method return None.
    """

    def __init__(self, rules):
        self.rules = rules

    def convert(self, dn, attrs, added_entries):
        """Converts an LDAP entry.

        The ldap entry is described by the dn as a string and attributes
        as a dictionary.  The parameters added_entries should be a list.
        If a rule returns a list with new LDAP entries the entries will
        be added at the end of that list.
        """
        exploded_dn = ldap.explode_dn(dn)
        new_attrs = {}
        new_dn = exploded_dn[:]
        try:
            for rule in self.rules:
                new_entries = rule(exploded_dn, attrs, new_dn, new_attrs)
                if new_entries:
                    added_entries.extend(new_entries)
            return joindn(new_dn), new_attrs
        except ConversionError, exc:
            logging.error("Cannot convert entry %r: %s" % (dn, exc))
            return None



def copy_attr(attrname, newattrname=None):
    """Creates an attribute converter that simply copies an attribute

    The source attribute is given by attrname.  The destination
    attribute by newattrname.  if newattrname is not given attrname is
    used as destination.
    """
    if newattrname is None:
        newattrname = attrname
    def convert(dn, attrs, newdn, newattrs):
        if attrname in attrs:
            newattrs[newattrname] = attrs[attrname]

    return convert

def set_attr(attrname, value):
    """Creates an attribute converter that sets an attribute to a constant

    The destination attribute is given by attrname.  The value should be
    a string or a list of strings.  The strings should be byte strings
    in UTF-8.
    """
    if isinstance(value, str):
        value = [value]
    def convert(dn, attrs, newdn, newattrs):
        newattrs[attrname] = value
    return convert

def create_targetAddress_from_mail(dn, attrs, newdn, newattrs):
    """Sets targetAddress in newattrs from the mail attribute in attrs"""
    mail = attrs["mail"][0]
    if mail:
        newattrs["targetAddress"] = ["SMTP:" + mail]

def create_proxyAddresses_from_alias(dn, attrs, newdn, newattrs):
    """Sets the proxyAddresses attribute from mail and alias in newattrs"""
    proxy_addresses = []
    for addr in attrs.get("alias", ()):
        proxy_addresses.append("smtp:" + addr)
    proxy_addresses.append("SMTP:" + attrs["mail"][0])
    newattrs["proxyAddresses"] = proxy_addresses

def create_alias_from_proxyAddresses(dn, attrs, newdn, newattrs):
    mail = attrs["mail"][0]
    aliases = []
    for item in attrs.get("proxyAddresses", ()):
        if item.lower().startswith("smtp:"):
            alias = item[5:]
            if alias != mail:
                aliases.append(alias)
    newattrs["alias"] = aliases

def create_new_entries_for_aliases(dn, attrs, newdn, newattrs):
    """Creates new ldap entries for mail aliases.

    The new entries are copies of the (newdn, newattrs) pair with
    aliases taken from the old attrs.  The cn of the new entries is the
    cn on newattrs with the mail address.
    """
    extra_entries = []
    for addr in attrs.get("alias", ()):
        extra_dn = newdn[:]
        extra_attrs = newattrs.copy()
        extra_dn[0] = extra_dn[0] + " (" + addr + ")"
        extra_attrs["mail"] = [addr]
        extra_attrs["alias"] = []
        extra_attrs["proxyAddresses"] = []
        extra_entries.append((joindn(extra_dn), extra_attrs))
    return extra_entries

def guess_sn(dn, attrs, newdn, newattrs):
    """If newattrs doesn't have an sn entry, set to the first word of the cn"""
    if "sn" not in newattrs:
        newattrs["sn"] = newattrs["cn"][0].split()[:1]


def new_base_dn(base_dn):
    """Creates a rule that changes the base of a dn

    The returned rule constructs the new DN by taking the first
    component of the old DN and appending the new base dn.
    """
    base_dn = ldap.explode_dn(normalize_dn(base_dn))

    def convert(dn, attrs, newdn, newattrs):
        newdn[:] = dn[:1] + base_dn

    return convert


def insert_kolabHomeServer_dn(dn, attrs, newdn, newattrs):
    """Inserts kolabHomeServer attribute as an ou DN part into newdn at index 1
    """
    newdn.insert(1, "ou=" + attrs["kolabHomeServer"][0])

def compare_old_attrs(attr1, attr2):
    """Creates a rule that compares attributes in the old attributes dictionary

    The returned rule, compares both attributes if they exist and if
    their values differ, it logs a warning
    """
    def compare(dn, attrs, newdn, newattrs):
        if attr1 in attrs and attr2 in attrs:
            if attrs[attr1] != attrs[attr2]:
                logging.warn("%r: %r:%r but %r:%r"
                             % (joindn(dn), attr1, attrs[attr1],
                                attr2, attrs[attr2]))
    return compare

--- NEW FILE: filelock.py ---
# Copyright (C) 2006 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
#
# This program is free software under the GPL (>=v2)
# Read the file COPYING coming with the software for details.

"""Locking with a lockfile"""

import sys
import os

import logging


class FileLock:

    """Lock resources using a lock file.

    When acquiring the lock, the file is created with the the
    os.O_CREAT|os.O_EXCL options so that creating and opening the file
    will only succeed if the file does not exist yet.  The pid of the
    current process is written to the file.  The FileLock class itself
    does nothing with that information but it may help debugging.
    """

    def __init__(self, directory, lockname):
        self.lockfile = os.path.join(directory, lockname)

    def acquire(self):
        logging.debug("creating lockfile %r", self.lockfile)
        try:
            fd = os.open(self.lockfile, os.O_CREAT|os.O_EXCL|os.O_RDWR)
        except (IOError, OSError), e:
            logging.error("Could not create lockfile %r: %s", self.lockfile, e,
                          exc_info=True)
            sys.exit(1)
        os.write(fd, "%s\n" % os.getpid())
        os.close(fd)

    def release(self):
        logging.debug("removing lockfile %r", self.lockfile)
        try:
            os.unlink(self.lockfile)
        except (IOError, OSError), e:
            logging.error("Error while trying to remove lockfile %r: %s",
                          self.lockfile, e, exc_info=True)
            sys.exit(1)

--- NEW FILE: ldapsync.py ---
# Copyright (C) 2006 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
#
# This program is free software under the GPL (>=v2)
# Read the file COPYING coming with the software for details.

"""Sync entries between a Kolab LDAP server and Active Directory"""

import sys
import os
import logging
import optparse

import ldap
import ldif

import filelock
import transferrer
import converter


class config:

    def load(cls, filename):
        variables = {}
        execfile(os.path.join(os.path.dirname(__file__), filename),
                 variables)
        for varname in ["workdir", "kolabserver", "adserver",
                        "kolab_to_ad_converter_rules",
                        "ad_to_kolab_converter_rules"]:
            setattr(cls, varname, variables[varname])
    load = classmethod(load)

    # If true, do not write to an LDAP server
    dry_run = False

    # If true, dump data during the transfer for debugging purposes
    dump_data = False


def check_work_dir(workdir):
    """Check that the working directory exists"""
    if not os.path.isdir(workdir):
        logging.error("working directory %r does not exist", workdir)
        sys.exit(1)



def perform_sync():
    """Perform the sync.

    If the dry_run parameter is given and true, no actual write
    operations will take place on the server.
    """
    logging.info("start sync process")
    logging.info("transferring from kolab to active directory")
    conv = converter.EntryConverter(config.kolab_to_ad_converter_rules)
    T = transferrer.Transferrer(config.kolabserver, config.adserver, conv,
                                dry_run=config.dry_run,
                                dump_data=config.dump_data)
    T.transfer()
    logging.info("transfer from kolab to active directory finished")

    logging.info("transferring from active directory to kolab")
    conv = converter.EntryConverter(config.ad_to_kolab_converter_rules)
    T = transferrer.Transferrer(config.adserver, config.kolabserver, conv,
                                dry_run=config.dry_run,
                                dump_data=config.dump_data)
    T.transfer()
    logging.info("transfer from active directory to kolab finished")

    logging.info("finished sync process")


def sync_ldap_servers():
    """Performs the sync while while holding the lock

    If the dry_run parameter is given and true, no actual write
    operations will take place on the server.
    """
    check_work_dir(config.workdir)
    lock = filelock.FileLock(config.workdir, "ldapsync.lock")
    lock.acquire()
    try:
        perform_sync()
    finally:
        lock.release()


def initialize_logging():
    """Initializes the logging system for the ldap sync script"""
    root = logging.getLogger()
    root.setLevel(logging.DEBUG)
    hdlr = logging.StreamHandler()
    fmt = logging.Formatter("%(asctime)s %(levelname)s %(message)s")
    hdlr.setFormatter(fmt)
    root.addHandler(hdlr)


def search(server_type, search_type):
    server = getattr(config, server_type + "server", None)
    if server is None:
        print >>sys.stderr, "unknown server type %r" % server_type
        sys.exit(1)

    search = getattr(server, search_type + "_search", None)
    if search is None:
        print >>sys.stderr, "unknown search type %r" % search_type
        sys.exit(1)

    writer = ldif.LDIFWriter(sys.stdout)
    for dn, record in server.search(search):
        if dn is not None:
            writer.unparse(dn, record)


def main():
    parser = optparse.OptionParser()
    parser.set_defaults(action="sync",
                        dry_run=config.dry_run,
                        dump_data=config.dump_data)
    parser.add_option("--dry-run", action="store_true")
    parser.add_option("--dump-data", action="store_true")
    parser.add_option("--search", action="store_const", dest="action",
                      const="search")
    opts, rest = parser.parse_args()

    config.load("config.py")

    config.dry_run = opts.dry_run
    config.dump_data = opts.dump_data

    if opts.action == "sync":
        initialize_logging()
        try:
            sync_ldap_servers()
        except SystemExit:
            raise
        except:
            logging.error("an unhandled exception occurred", exc_info=True)
    elif opts.action == "search":
        if len(rest) != 2:
            print >>sys.stderr, "search needs two parameters:"
            print >>sys.stderr, "servertype ('kolab' or 'ad') "\
                  "and search ('user' or 'contact')"
            sys.exit(1)
        search(server_type = rest[0], search_type = rest[1])
    else:
        print >>sys.stderr, "unknown action %r" % opts.action


if __name__ == "__main__":
    main()

--- NEW FILE: transferrer.py ---
# Copyright (C) 2006 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
#
# This program is free software under the GPL (>=v2)
# Read the file COPYING coming with the software for details.

"""Transfer ldap information from one ldap server to another"""

import logging
import sets

import ldap
import ldap.modlist

import converter


class Search:

    """LDAP Search definition

    A search definition has the following public instance variables:

    base_dn -- the base dn for the search.  This should be either a
        string or another Search instance.  In the latter case that
        dn-search is used to determine a list of dns under which to
        perform the search.

    filterstr -- The LDAP filter string

    search_scope -- the search scope.  Must be one of the following
        constants from the ldap module: SCOPE_SUBTREE, SCOPE_ONELEVEL
        oder SCOPE_BASE.  It can also be the string 'OU_SUBTREES' in
        which case the subtrees defined by all objects of type
        organizatinalUnit immeditely below base_dn will be searched
        individually to avoid transferring too many results in one
        search.

    attrlist -- A list of attribute names to return from the search.
        This is optional.  How this is interpreted depends on how the
        search is used by the converter.  See Transferrer for more
        details.
    """

    def __init__(self, base_dn, filterstr, search_scope, attrlist=None):
        self.base_dn = base_dn
        self.filterstr = filterstr
        self.search_scope = search_scope
        self.attrlist = attrlist


class LDAPServer:

    """LDAP Server Definition

    An LDAP server definition has the following public instance
    variables:

    uri -- The serve uri as a string.  Should be just the protocol (ldap
        or ldaps) and the host name.  E.g. 'ldap://my.ldap.server'

    bind_dn, bind_pw -- The dn and password for the ldap bind.  The user
        given here should have read and write permissions in the
        appropriate sub-trees.

    user_search -- A search definition (Search instance) for a search
        for user accounts.

    contact_search -- A search definition for a search for contact
        entries
    """

    def __init__(self, uri, bind_dn, bind_pw, user_search, contact_search):
        self.uri = uri
        self.bind_dn = bind_dn
        self.bind_pw = bind_pw
        self.user_search = user_search
        self.contact_search = contact_search

    def search(self, search, attrlist=None):
        """Searches and returns the results as a list of (dn, record) pairs.

        The search parameter should be one of the server's search
        attributes.  The attrlist parameter is optional and when not
        given, the attrlist of the search definition is used.
        """
        logging.debug("reading from %r", self.uri)
        conn = ldap.initialize(self.uri)
        conn.simple_bind_s(self.bind_dn, self.bind_pw)
        return self._search_conn(conn, search, attrlist=attrlist)

    def _search_conn(self, conn, search, attrlist=None):
        """perform search on conn"""
        if isinstance(search.base_dn, Search):
            dns = [dn for dn, record in self._search_conn(conn, search.base_dn)]
        else:
            dns = [search.base_dn]
        if attrlist is None:
            attrlist = search.attrlist

        result = []
        for dn in dns:
            logging.debug("searching dn %r", dn)
            result += [item
                       for item in conn.search_s(dn, search.search_scope,
                                                 filterstr=search.filterstr,
                                                 attrlist=attrlist)
                       if item[0] is not None]
        return result


class Transferrer:

    """Main class to transfer ldap data from one serve to another.

    This class reads ldap data from a source server, transforms the data
    and writes it to a destination servers.  Both servers are described
    by instances of the LDAPServer class.  The search on the source
    server is defined by the source server's user_search attribute.  The
    search on the destination serve is defined by the contact_search
    attribute.  The transformation is described by an EntryConverter
    instance.
    """

    def __init__(self, source, destination, converter, dry_run=False,
                 dump_data=False):
        """Initializes the transferrer

        Parameters:
        source -- The source ldap server definition
        destination -- the destinatin ldap server definition
        converter -- the EntryConverter instance to use when converting
            an ldap entry.
        dry_run -- boolean.  If true, do not write to the destination
            server.  Defaults to False.
        """
        self.source = source
        self.destination = destination
        self.converter = converter
        self.dry_run = dry_run
        self.dump_data = dump_data

    def transfer(self):
        """Performs the data transfer"""
        source_data = self.read_ldap(self.source, self.source.user_search)
        if self.dump_data:
            import pprint
            print "************* Transferrer.transfer: source_data " + \
                  "before normalization"
            pprint.pprint(source_data)
        converter.normalize_dns(source_data)
        if self.dump_data:
            import pprint
            print "************* Transferrer.transfer: source_data"
            pprint.pprint(source_data)


        converted_data, attrlist = self.convert_data(source_data)
        converter.normalize_dns(converted_data)
        if self.dump_data:
            print "************* Transferrer.transfer: converted_data"
            pprint.pprint(converted_data)

        destination_data = self.read_ldap(self.destination,
                                          self.destination.contact_search,
                                          attrlist=attrlist)

        # called for all transfers, even if we only want to remove for
        # destination ad.
        # FIXME: This shouldn't be hard-wired.
        converter.remove_ad_extra_attributevalues(destination_data)

        converter.normalize_dns(destination_data)
        if self.dump_data:
            print "************* Transferrer.transfer: destination_data"
            pprint.pprint(destination_data)

        self.write_data(self.destination, destination_data,
                        converted_data)

    def read_ldap(self, server, search, attrlist=None):
        """Reads from the server using the search definition search.
        The attrlist parameter is optional and when not given, the
        attrlist of the search definition is used.
        """
        return dict(server.search(search, attrlist=attrlist))

    def convert_data(self, entries):
        """Converts the entries using the entry converter.
        The entries dictionary is modified in place.
        """
        converted = {}
        attributes = sets.Set()
        for dn, attrs in entries.iteritems():
            added_entries = []
            converted_entry = self.converter.convert(dn, attrs, added_entries)
            if converted_entry is not None:
                for entry in [converted_entry] + added_entries:
                    new_dn, new_attrs = entry
                    converted[new_dn] = new_attrs
                    attributes.union_update(new_attrs)
        return converted, list(attributes)


    def write_data(self, server, old_data, new_data):
        """Compares the data and updates the server.

        This method compares the new_data with the old_data and modifies
        the server accordingly.  Objects in new_data but not in old_data
        are created on the server.  Objects in old_data but not in
        new_data are removed from the server.  Objects that differ in
        new_data and old_data are modified on the server.  If dry_run
        has been specified, no actual changes are made.  This method
        logs its actions with a DEBUG log level.
        """
        old_set = sets.Set(old_data)
        new_set = sets.Set(new_data)
        create_set = new_set - old_set
        delete_set = old_set - new_set
        common_set = new_set & old_set

        logging.debug("writing to %r", server.uri)
        conn = ldap.initialize(server.uri)
        conn.simple_bind_s(server.bind_dn, server.bind_pw)

        for dn in delete_set:
            logging.debug("deleting contact %r", dn)
            self.call_with_error_log(conn, "delete_s", dn)

        for dn in create_set:
            logging.debug("creating contact %r", dn)
            self.call_with_error_log(conn, "add_s",
                                     dn, ldap.modlist.addModlist(new_data[dn]))
        for dn in common_set:
            modlist = ldap.modlist.modifyModlist(old_data[dn], new_data[dn])
            if modlist:
                logging.debug("updating contact %r: modlist=%r", dn, modlist)
                self.call_with_error_log(conn, "modify_s", dn, modlist)
            else:
                logging.debug("contact %r already up to date", dn)

    def call_with_error_log(self, conn, methodname, *args):
        """Call an ldap connection method and log errors that occur.
        If dry_run has been specified the method is not actually called.
        """
        if not self.dry_run:
            try:
                getattr(conn, methodname)(*args)
            except:
                logging.error("Error calling ldap method %r%r", methodname,
                              args, exc_info=True)



From cvs at kolab.org  Thu Dec 14 10:01:37 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Dec 2006 10:01:37 +0100 (CET)
Subject: wilde: utils/admin transferannotations.pl,NONE,1.1 
Message-ID: <20061214090137.D2F861005CB@lists.intevation.de>

Author: wilde

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

Added Files:
	transferannotations.pl 
Log Message:
Added the extended listannotations.pl now called transferannotations.pl,
thanks to Thomas Ribbrock for the contribution.


--- NEW FILE: transferannotations.pl ---
#!/kolab/bin/perl
#
# script to read out the annotations for a user
# 	user.a at old.example.org
# and re-add them for a different domain and/or different user name
#       user.b at new.domain.com.
#
# USAGE:
#        1) edit user parameters below
#	 2) run script with OLD_UID NEW_UID
#
#  20061031 V0.2 transferannotations.pl emgaron+kolab at ribbrock.org
#       re-write to do full annotations transfer for given user
#  	Tested with Kolab Server 2.0.4 (src) -> 2.1.0beta2 (dst).
#
#  20060220 initial listannotations.pl bernhard at intevation.de	
#  	Tested with Kolab Server 2.1.0beta1.
#
# This program is free software under the GNU GPL (>=v2)

use Cyrus::IMAP::Admin;
use strict;

#############################################################################
# USER PARAMETERS                                                           #
# Modify the values below to reflect your setup                             #
#############################################################################

my $old_domain="OLD.DOMAIN";
my $new_domain="NEW.DOMAIN"; # leave empty if domain doesn't change
my $src_server="SRC_SERVER.DOMAIN";
my $dst_server="DST_SERVER.DOMAIN";
my $src_admin="manager";
my $dst_admin="manager";
my $src_passwd="PASSWD";
my $dst_passwd="PASSWD";

#############################################################################
# END OF USER PARAMETERS                                                    #
#############################################################################
my $old_user;
my $new_user;
my $new_mailbox;
my $kolab_vendor;
my %info;

if ($#ARGV < 0 || $#ARGV > 1)
  {
    print ("\nUsage: $0 OLD_UID NEW_UID\n");
    print ("         If NEW_UID is empty, UID is not changed.\n\n");
    exit;
  }

$old_user = $ARGV[0];
$new_user = $ARGV[1];

my $src_client = Cyrus::IMAP::Admin->new("$src_server",);
$src_client->authenticate(-user => "$src_admin", -password => "$src_passwd");

my $dst_client = Cyrus::IMAP::Admin->new("$dst_server",);
$dst_client->authenticate(-user => "$dst_admin", -password => "$dst_passwd");

# transferring all annotations
# need to call getinfo twice, as there is no simple pattern that gets
# imapd to return the info without name clashes (e.g. testuser vs.
# testuser1 and suchlike)
%info = ($src_client->getinfo("user/$old_user/*\@$old_domain"),
	 $src_client->getinfo("user/$old_user\@$old_domain"));
foreach my $attrib (sort keys %info) {
  if($attrib =~ /\/vendor\/kolab\/(folder-type|incidences-for)/)
    {
      $new_mailbox = $attrib;

      if($new_domain ne "")
	{
	  # replace domain in mailbox
	  $new_mailbox =~ s/$old_domain/$new_domain/g;
	}

      if($new_user ne "")
	{
	  # replace user in mailbox
	  $new_mailbox =~ s/$old_user/$new_user/g;
	}

      # extract pure mailbox string
      $new_mailbox =~ s/^[^{]*{//;
      $new_mailbox =~ s/}[^}]*$//;

      # extract kolab vendor string
      $kolab_vendor = $attrib;
      $kolab_vendor =~ s/^[^}]*}//;

      #printf("\$dst_client->mboxconfig('%s', '%s', '%s')\n",
      #	     $new_mailbox, $kolab_vendor, $info{$attrib});
      printf("%s (%s) -> %s\n", $new_mailbox, $kolab_vendor,
                                       $info{$attrib});

      $dst_client->mboxconfig("$new_mailbox", "$kolab_vendor",
			      "$info{$attrib}");
    }
}



From cvs at kolab.org  Thu Dec 14 15:39:04 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Dec 2006 15:39:04 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/dist_conf gentoo,1.6,1.7 
Message-ID: <20061214143904.C9AF51005DF@lists.intevation.de>

Author: gunnar

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

Modified Files:
	gentoo 
Log Message:
	* dist_conf/gentoo: 

	Updated to the newest configuration settings for Gentoo.


Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gentoo	14 Nov 2006 21:34:22 -0000	1.6
+++ gentoo	14 Dec 2006 14:39:02 -0000	1.7
@@ -50,7 +50,7 @@
 
 ### -> users
 
-clamav_rusr=clamav
+clamav_rusr=${amavisd_rusr}
 clamav_usr=root
 clamav_grp=root
 
@@ -59,11 +59,11 @@
 clamav_confdir=${sysconfdir}
 clamav_statedir=${statelibdir}/clamav
 clamav_datadir=${clamav_statedir}
-clamav_socket=${clamav_statedir}/clamd.sock
-clamav_logfile=${clamav_statedir}/clamd.log
-clamav_pidfile=${clamav_statedir}/clamd.pid
-freshclam_logfile=${clamav_statedir}/freshclam.log
-freshclam_pidfile=${clamav_statedir}/freshclam.pid
+clamav_socket=${amavisd_home}/clamd.sock
+clamav_logfile=${logdir}/clamav/clamd.log
+clamav_pidfile=${amavisd_home}/clamd.pid
+freshclam_logfile=${logdir}/clamav/freshclam.log
+freshclam_pidfile=${sysrundir}/clamav/freshclam.pid
 
 #--------------------------------------------------------------------
 
@@ -103,7 +103,7 @@
 
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_confdir=${sysconfdir}/postfix
-emailserver_socket=${localstatedir}/kolab/lmtp
+emailserver_socket=${imap_statedir}/socket/lmtp
 emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
 aliases_file=${sysconfdir}/mail/aliases
 
@@ -144,7 +144,7 @@
 imap_misclogfile=${imap_statedir}/log/misc.log
 imap_spool=${localstatedir}/spool/imap
 imap_sievedir=${imap_statedir}/sieve
-imap_lmtp=${imap_statedir}/lmtp
+imap_notify_socket=${imap_statedir}/socket/notify
 
 #####################################################################
 # Proftpd parameters
@@ -219,7 +219,7 @@
 webserver_runtime_status=${webserver_logdir}/apache_runtime_status
 webserver_sessions=${localstatedir}/cache/httpd_sessions
 
-webserver_document_root=${wwwdir}/kolab
+webserver_document_root=${wwwdir}/kolab/htdocs
 webserver_cgidir=${webserver_document_root}/cgi-bin
 webserver_pidfile=${localstatedir}/apache/run/apache.pid
 webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
@@ -235,7 +235,7 @@
 phpini_dir=${sysconfdir}/php/apache2-php5/
 phplibdir=${datadir}/php
 phplibdir2=${datadir}/php
-phppeardir=${phplibdir}/horde
+phppeardir=${phplibdir}
 kolab_php_module_prefix=kolab/
 kolab_php_smarty_prefix=smarty/
 
@@ -271,6 +271,7 @@
 	    ${emailserver_confdir}/master.cf \
 	    ${emailserver_confdir}/transport \
 	    ${emailserver_confdir}/virtual   \
+	    ${aliases_file}                  \
             ${sysconfdir}/conf.d/apache2     \
             ${sysconfdir}/conf.d/saslauthd
 	    
@@ -281,8 +282,10 @@
 
 ### -> users
 
-resmgr_usr=kolab
-resmgr_grp=kolab-n
+resmgr_usr=root
+resmgr_grp=root
+freebusy_usr=root
+freebusy_grp=apache
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
 



From cvs at kolab.org  Thu Dec 14 15:39:04 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Dec 2006 15:39:04 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.83,1.84 
Message-ID: <20061214143904.CCAC41006A3@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* dist_conf/gentoo: 

	Updated to the newest configuration settings for Gentoo.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ChangeLog	14 Nov 2006 21:34:22 -0000	1.83
+++ ChangeLog	14 Dec 2006 14:39:02 -0000	1.84
@@ -1,3 +1,9 @@
+2006-12-14  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* dist_conf/gentoo: 
+
+	Updated to the newest configuration settings for Gentoo.
+
 2006-11-14 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse, dist_conf/kolab, dist_conf/common,
 	  dist_conf/gentoo, templates/virtual.template.in,



From cvs at kolab.org  Fri Dec 15 08:55:06 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Dec 2006 08:55:06 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.84,1.85 
Message-ID: <20061215075506.5D46A1005CB@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
	* templates/amavisd.conf.template.in: 

	Added all domain names into the local domains known to amavis so
	that all spam messages will get their tags. Resolves:
	kolab/issue1531.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ChangeLog	14 Dec 2006 14:39:02 -0000	1.84
+++ ChangeLog	15 Dec 2006 07:55:04 -0000	1.85
@@ -1,3 +1,11 @@
+2006-12-15  Gunnar Wrobel  <wrobel at pardus.de>
+
+	* templates/amavisd.conf.template.in: 
+
+	Added all domain names into the local domains known to amavis so
+	that all spam messages will get their tags. Resolves:
+	kolab/issue1531.
+	
 2006-12-14  Gunnar Wrobel  <wrobel at pardus.de>
 
 	* dist_conf/gentoo: 



From cvs at kolab.org  Fri Dec 15 08:55:06 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Dec 2006 08:55:06 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.6,
	1.7 
Message-ID: <20061215075506.59AA31005C5@lists.intevation.de>

Author: gunnar

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

Modified Files:
	amavisd.conf.template.in 
Log Message:
	* templates/amavisd.conf.template.in: 

	Added all domain names into the local domains known to amavis so
	that all spam messages will get their tags. Resolves:
	kolab/issue1531.


Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- amavisd.conf.template.in	1 Feb 2006 20:48:14 -0000	1.6
+++ amavisd.conf.template.in	15 Dec 2006 07:55:04 -0000	1.7
@@ -178,7 +178,7 @@
 # a union of domains specified in: $mydestination, $virtual_alias_domains,
 # $virtual_mailbox_domains, and $relay_domains.
 #
- at local_domains_acl = ( ".$mydomain" );  # $mydomain and its subdomains
+ at local_domains_acl = ( ".@@@postfix-mydestination|join(", ".)@@@" );  # $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 );



From cvs at kolab.org  Fri Dec 15 16:00:20 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Dec 2006 16:00:20 +0100 (CET)
Subject: schreiber: doc/proko2-doc doc2.sxw,1.70,1.71 doc3.sxw,1.34,1.35 
Message-ID: <20061215150020.2924F1006B6@lists.intevation.de>

Author: schreiber

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

Modified Files:
	doc2.sxw doc3.sxw 
Log Message:
added copyright statements


Index: doc2.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc2.sxw,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
Binary files /tmp/cvstXmfzd and /tmp/cvsi5nXZl differ

Index: doc3.sxw
===================================================================
RCS file: /kolabrepository/doc/proko2-doc/doc3.sxw,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
Binary files /tmp/cvs87nsEh and /tmp/cvsUNh5Kp differ



From cvs at kolab.org  Mon Dec 18 09:04:36 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 09:04:36 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	systemaliasnagscreen.tpl, 1.1, 1.2 
Message-ID: <20061218080436.B90DF1006B2@lists.intevation.de>

Author: martin

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

Modified Files:
	systemaliasnagscreen.tpl 
Log Message:
Martin Konold: Patch from Richard Bos adding convinience link 


Index: systemaliasnagscreen.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/systemaliasnagscreen.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- systemaliasnagscreen.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ systemaliasnagscreen.tpl	18 Dec 2006 08:04:34 -0000	1.2
@@ -9,6 +9,7 @@
 </div>
 <div id="errorcontent">
 <div id="errorheader">{tr msg="NOTE:"}</div>
-{tr msg="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"}
+{tr msg="No account is configured to receive mail for administrative addresses. If you have not yet created an account for this, "}
+<a href="{$topdir}/user/user.php?action=create" target="_blank">{tr msg="please do so"}</a> {tr msg="and then go"}
 <a href="{$topdir}/service/#systemaliasconf">{tr msg="here"}</a> {tr msg="to set up forwarding of mail to administrative email addresses."}
 </div>



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.3, 1.4 
Message-ID: <20061218220428.A35841006A9@lists.intevation.de>

Author: martin

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

Modified Files:
	messages.po 
Log Message:
Martin Konold: Fix issue 1540


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- messages.po	12 Dec 2005 00:37:05 -0000	1.3
+++ messages.po	18 Dec 2006 22:04:26 -0000	1.4
@@ -587,7 +587,7 @@
 msgstr ""
 
 #: tpl_messages.php:150
-msgid "Privileged Networks"
+msgid "Priviledged Networks"
 msgstr ""
 
 #: tpl_messages.php:151



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.16, 1.17 
Message-ID: <20061218220428.A1BBE1006A8@lists.intevation.de>

Author: martin

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

Modified Files:
	messages.po 
Log Message:
Martin Konold: Fix issue 1540


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- messages.po	23 Feb 2006 16:40:18 -0000	1.16
+++ messages.po	18 Dec 2006 22:04:26 -0000	1.17
@@ -714,7 +714,7 @@
 msgstr "vergangenen Tagen verwenden"
 
 #: tpl_messages.php:150
-msgid "Privileged Networks"
+msgid "Priviledged Networks"
 msgstr "Privilegierte Netzwerke"
 
 #: tpl_messages.php:151



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.16, 1.17 
Message-ID: <20061218220428.B7FD11006B5@lists.intevation.de>

Author: martin

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

Modified Files:
	messages.po 
Log Message:
Martin Konold: Fix issue 1540


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- messages.po	4 Feb 2006 20:45:47 -0000	1.16
+++ messages.po	18 Dec 2006 22:04:26 -0000	1.17
@@ -672,7 +672,7 @@
 msgstr "Vorige dagen"
 
 #: tpl_messages.php:150
-msgid "Privileged Networks"
+msgid "Priviledged Networks"
 msgstr "Bevoorrechte netwerken"
 
 #: tpl_messages.php:151



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	erfrakon.php.in, 1.1, 1.2 versions.php.in, 1.3, 1.4 
Message-ID: <20061218220428.C64DB1006C3@lists.intevation.de>

Author: martin

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

Modified Files:
	erfrakon.php.in versions.php.in 
Log Message:
Martin Konold: Fix issue 1540


Index: erfrakon.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/erfrakon.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- erfrakon.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ erfrakon.php.in	18 Dec 2006 22:04:26 -0000	1.2
@@ -2,7 +2,7 @@
 /*
  *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
  *  Copyright (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
- *  Copyright (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ *  Copyright (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *

Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- versions.php.in	5 Feb 2006 20:13:55 -0000	1.3
+++ versions.php.in	18 Dec 2006 22:04:26 -0000	1.4
@@ -2,7 +2,7 @@
 /*
  (c) 2004 Klarälvdalens Datakonsult AB
  (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
- (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ (c) 2003-2006 Martin Konold <martin.konold 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.
 */
@@ -35,7 +35,7 @@
 $kolabversion = '@kolab_version@';
 if( $kolabversion[0] == '@' ) {
   // Unofficial/non-openpkg package
-  $kolabversion = '2.0-unofficial';
+  $kolabversion = '2.1-official';
 }
 
 /**** Insert into template and output ***/



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	service.tpl, 1.10, 1.11 
Message-ID: <20061218220428.C22FA1006BC@lists.intevation.de>

Author: martin

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

Modified Files:
	service.tpl 
Log Message:
Martin Konold: Fix issue 1540


Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- service.tpl	23 Feb 2006 16:47:50 -0000	1.10
+++ service.tpl	18 Dec 2006 22:04:26 -0000	1.11
@@ -76,7 +76,7 @@
 </form>
 </div>
 <br />
-<h2>{tr msg="Privileged Networks"}</h2>
+<h2>{tr msg="Priviledged Networks"}</h2>
 <div class="contentform">
 <form name="postfixmynetworksform" method="post">
 {tr msg="Networks allowed to relay and send mail through unauthenticated SMTP connections to the Kolab server (comma separated networks in x.x.x.x/y format):"}



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.6, 1.7 
Message-ID: <20061218220428.B17B51006B0@lists.intevation.de>

Author: martin

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

Modified Files:
	messages.po 
Log Message:
Martin Konold: Fix issue 1540


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- messages.po	12 Dec 2005 00:37:05 -0000	1.6
+++ messages.po	18 Dec 2006 22:04:26 -0000	1.7
@@ -703,7 +703,7 @@
 msgstr "giorni nel passato"
 
 #: tpl_messages.php:150
-msgid "Privileged Networks"
+msgid "Priviledged Networks"
 msgstr "Reti privilegiate"
 
 #: tpl_messages.php:151



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolabd/kolabd/templates imapd.conf.template.in, 1.8,
	1.9 
Message-ID: <20061218220428.C9F1B1006C4@lists.intevation.de>

Author: martin

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

Modified Files:
	imapd.conf.template.in 
Log Message:
Martin Konold: Fix issue 1540


Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imapd.conf.template.in	9 Nov 2006 18:17:05 -0000	1.8
+++ imapd.conf.template.in	18 Dec 2006 22:04:26 -0000	1.9
@@ -4,7 +4,7 @@
 OWNERSHIP=@imap_usr@:@imap_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-2006 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.
@@ -60,6 +60,7 @@
 ldap_bind_dn:           @@@php_dn@@@
 ldap_password:          @@@php_pw@@@
 ldap_time_limit:        15
+
 virtdomains:            ldap
 
 ## Murder slave setup
@@ -81,3 +82,9 @@
 # use berkeley db backend instead of skiplist
 annotation_db: berkeley
 mboxlist_db: berkeley
+
+# 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 only method available).
+imapidlepoll: 5



From cvs at kolab.org  Mon Dec 18 23:04:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Dec 2006 23:04:28 +0100 (CET)
Subject: martin: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.8, 1.9 
Message-ID: <20061218220428.AB48E1006AE@lists.intevation.de>

Author: martin

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

Modified Files:
	messages.po 
Log Message:
Martin Konold: Fix issue 1540


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- messages.po	24 Oct 2006 11:52:34 -0000	1.8
+++ messages.po	18 Dec 2006 22:04:26 -0000	1.9
@@ -572,7 +572,7 @@
 msgstr "jours dans le passé"
 
 #: tpl_messages.php:157
-msgid "Privileged Networks"
+msgid "Priviledged Networks"
 msgstr "Réseaux privilégiés"
 
 #: tpl_messages.php:158



From cvs at kolab.org  Tue Dec 19 12:11:38 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Dec 2006 12:11:38 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	kolab.tpl, 1.3, 1.4 kdab.tpl, 1.1, 1.2 intevation.tpl, 1.1,
	1.2 erfrakon.tpl, 1.2, 1.3 codefusion.tpl, 1.2, 1.3 
Message-ID: <20061219111138.7AE631006A1@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab.tpl kdab.tpl intevation.tpl erfrakon.tpl codefusion.tpl 
Log Message:
Revised "About Kolab" pages:
- removed mailto: links (keeping them current would be too much an hassle)
- added some projects to the list of projects kolab is based on
- removed ProFTPD from that list, as it's currently deactivated and broken
  (actually ProFTPD should be removed completely from kolab...)


Index: kolab.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kolab.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.tpl	18 Mar 2005 07:25:12 -0000	1.3
+++ kolab.tpl	19 Dec 2006 11:11:36 -0000	1.4
@@ -13,11 +13,15 @@
 <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.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>
  <li><a href="http://www.openldap.org/">OpenLDAP</a> {tr msg="(LDAP Server)"}</li>
  <li><a href="http://www.postfix.org/">Postfix</a> {tr msg="(MTA)"}</li>
- <li><a href="http://www.proftpd.org/">ProFTPD</a> {tr msg="(FTP Server)"}</li>
+<!--  <li><a href="http://www.proftpd.org/">ProFTPD</a> {tr msg="(FTP Server)"}</li> -->
+ <li><a href="http://spamassassin.apache.org/">SpamAssasin</a> {tr msg="(SPAM Filter)"}</li>
+
 </ul>
 {tr msg="The following projects are used in binding the above together, in order to create the Kolab Server:"}
 <ul>
@@ -73,23 +77,23 @@
 
 <p>
 <ul>
- <li><a href="mailto:skbinge at gmail.com">Stuart Bing&euml;</a></li>
- <li><a href="mailto:s.buys at codefusion.co.za">Stephan Buys</a></li>
- <li><a href="mailto:kalle at klaralvdalens-datakonsult.se?subject=Kolab Server 1.9">Matthias Kalle Dalheimer</a></li>
- <li><a href="mailto:tassilo.erlewein at erfrakon.de?subject=Kolab Server 1.9">Tassilo Erlewein</a></li>
- <li><a href="mailto:dfaure at klaralvdalens-datakonsult.se?subject=Kolab Client 1.9">David Faure</a></li>
- <li><a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 1.9">Achim Frank</a></li>
- <li><a href="mailto:michel at klaralvdalens-datakonsult.se?subject=Kolab Client 1.9">Michel Boyer de la Giroday</a></li>
- <li><a href="mailto:steffen at klaralvdalens-datakonsult.se?subject=Kolab Client 1.9">Steffen Hansen</a></li>
- <li><a href="mailto:bh at intevation.de?subject=Kolab Server 1.9">Bernhard Herzog</a>
- <li><a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 1.9">Martin Konold</a></li>
- <li><a href="mailto:mutz at kde.org?subject=Kolab Server 1.9">Marc Mutz</a></li>
+ <li>Stuart Bing&euml;</li>
+ <li>Stephan Buys</li>
+ <li>Matthias Kalle Dalheimer</li>
+ <li>Tassilo Erlewein</li>
+ <li>David Faure</li>
+ <li>Achim Frank</li>
+ <li>Michel Boyer de la Giroday</li>
+ <li>Steffen Hansen</li>
+ <li>Bernhard Herzog
+ <li>Martin Konold</li>
+ <li>Marc Mutz</li>
  <li>Bernhard Reiter</li>
- <li><a href="mailto:lutz at klaralvdalens-datakonsult.se?subject=Kolab Server 1.9">Lutz Rogowski</a></li>
- <li><a href="mailto:bo at klaralvdalens-datakonsult.se?subject=Kolab Server 1.9">Bo Thorsen</a></li>
- <li><a href="mailto:jan at intevation.de?subject=Kolab Server 1.9">Jan-Oliver Wagner</a></li>
- <li><a href="mailto:khz at klaralvdalens-datakonsult.se?subject=Kolab Server 1.9">Karl-Heinz Zimmer</a></li>
- <li><a href="mailto:romain at klaralvdalens-datakonsult.se?">Romain Pokrzywka</a></li>
+ <li>Lutz Rogowski</li>
+ <li>Bo Thorsen</li>
+ <li>Jan-Oliver Wagner</li>
+ <li>Karl-Heinz Zimmer</li>
+ <li>Romain Pokrzywka</li>
 </ul>
 </p>
 

Index: kdab.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kdab.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdab.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ kdab.tpl	19 Dec 2006 11:11:36 -0000	1.2
@@ -14,13 +14,13 @@
 {tr msg="The following people worked on Kolab for Klar&auml;lvdalens Datakonsult AB:"}
 </p>
 <p>
-<a href="mailto:bo at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Bo Thorsen</a><br>
-<a href="mailto:michel at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Michel Boyer de la Giroday</a><br>
-<a href="mailto:steffen at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Steffen Hansen</a><br>
-<a href="mailto:kalle at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Matthias Kalle Dalheimer</a><br>
-<a href="mailto:dfaure at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">David Faure</a><br>
-<a href="mailto:khz at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Karl-Heinz Zimmer</a><br>
-<a href="mailto:lutz at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Lutz Rogowski</a><br>
-<a href="mailto:romain at klaralvdalens-datakonsult.se">Romain Pokrzywka</a><br>
+Bo Thorsen<br>
+Michel Boyer de la Giroday<br>
+Steffen Hansen<br>
+Matthias Kalle Dalheimer<br>
+David Faure<br>
+Karl-Heinz Zimmer<br>
+Lutz Rogowski<br>
+Romain Pokrzywka<br>
 </p>
 </div>

Index: intevation.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/intevation.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- intevation.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ intevation.tpl	19 Dec 2006 11:11:36 -0000	1.2
@@ -15,14 +15,8 @@
 {tr msg="The following people worked on Kolab for Intevation:"}
 </p>
 <p>
-Bernhard Reiter
-<a href="mailto:bernhard.reiter at intevation.de"><tt>&lt;Bernhard.Reiter at intevation.de&gt;</tt></a>
-<br>
-Jan-Oliver Wagner 
-<a href="mailto:jan-oliver.wagner at intevation.de"><tt>&lt;Jan-Oliver.Wagner at intevation.de&gt;</tt></a>
-<br>
+Bernhard Reiter<br>
+Jan-Oliver Wagner<br>
 Marc Mutz
-<a href="mailto:Marc.Mutz at intevation.de"><tt>&lt;Marc.Mutz at intevation.de&gt;</tt></a>
-<br>
 </p>
 </div>

Index: erfrakon.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/erfrakon.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- erfrakon.tpl	16 Nov 2006 00:30:25 -0000	1.2
+++ erfrakon.tpl	19 Dec 2006 11:11:36 -0000	1.3
@@ -21,8 +21,8 @@
 {tr msg="The following people worked on Kolab for erfrakon:"}
 </p>
 <p>
-<a href="mailto:tassilo.erlewein at erfrakon.de?subject=Kolab Server 2.1">Tassilo Erlewein</a><br>
-<a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 2.1">Achim Frank</a><br>
-<a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 2.1">Martin Konold</a><br>
+Tassilo Erlewein<br>
+Achim Frank<br>
+Martin Konold<br>
 </p>
 </div>

Index: codefusion.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/codefusion.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- codefusion.tpl	14 Mar 2005 12:44:20 -0000	1.2
+++ codefusion.tpl	19 Dec 2006 11:11:36 -0000	1.3
@@ -21,7 +21,7 @@
 </p>
 
 <p>
-Stephan Buys <a href="mailto:s.buys at codefusion.co.za">s.buys at codefusion.co.za</a><br>
+Stephan Buys<br>
 </p>
 
 </div>



From cvs at kolab.org  Tue Dec 19 13:05:09 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Dec 2006 13:05:09 +0100 (CET)
Subject: bh: utils/ldap-sync ldapsync-overview.sk,NONE,1.1 
Message-ID: <20061219120509.9961C1006A1@lists.intevation.de>

Author: bh

Update of /kolabrepository/utils/ldap-sync
In directory doto:/tmp/cvs-serv11470

Added Files:
	ldapsync-overview.sk 
Log Message:
add sync overview diagram


--- NEW FILE: ldapsync-overview.sk ---
##Sketch 1 2
document()
layout('A4',1)
layer('Ebene 1',1,1,0,0,(0,0,0))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica-Bold')
Fs(36)
txt('ldapsync Overview',(160,547.452))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica-Bold')
Fs(18)
txt('Kolab Server - OpenLDAP',(553.434,487.076))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica-Bold')
Fs(18)
txt('Active Directory',(100,487.076))
fp((1,1,0))
lw(1)
r(180,0,0,-200,100,460)
fp((0.933,0.867,0.51))
lw(1)
r(180,0,0,-140,100,220)
fp((0,0,0))
le()
lw(1)
Fn('Helvetica-Bold')
Fs(18)
txt('User',(140,400))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica-Bold')
Fs(18)
txt('Adressbuch',(140,180))
fp((0.486,0.988,0))
lw(1)
r(180,0,0,-160,480,460)
fp((0.635,0.804,0.353))
lw(1)
r(180,0,0,-200,480,260)
fp((0,0,0))
le()
lw(1)
Fn('Helvetica-Bold')
Fs(18)
txt('User',(500,400))
fp((0,0,0))
le()
lw(1)
Fn('Helvetica-Bold')
Fs(18)
txt('Adressbuch',(500,220))
lw(2.83465)
la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
b()
bs(300,420,0)
bs(460,140,0)
lw(2.83465)
la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
b()
bs(460,380,0)
bs(394.142,294.142,0)
bc(386.336,301.948,373.664,301.948,365.858,294.142,0)
bc(358.052,286.336,358.052,273.664,365.858,265.858,0)
bs(300,180,0)
fp((0,0,0))
le()
lw(1)
Fn('Helvetica')
Fs(10)
txt('$Date: 2006/12/19 12:05:07 $',(680,560))
guidelayer('Hilfslinien',1,0,0,1,(0,0,1))
grid((0,0,20,20),1,(0,0,1),'Gitter')



From cvs at kolab.org  Tue Dec 19 20:57:34 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Dec 2006 20:57:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	service.tpl, 1.11, 1.12 
Message-ID: <20061219195734.A04931006DC@lists.intevation.de>

Author: richard

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

Modified Files:
	service.tpl 
Log Message:
spelling error Privileged is correct and
removed an inconsistency: non-authorized -> unauthorized.



Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- service.tpl	18 Dec 2006 22:04:26 -0000	1.11
+++ service.tpl	19 Dec 2006 19:57:32 -0000	1.12
@@ -76,7 +76,7 @@
 </form>
 </div>
 <br />
-<h2>{tr msg="Priviledged Networks"}</h2>
+<h2>{tr msg="Privileged Networks"}</h2>
 <div class="contentform">
 <form name="postfixmynetworksform" method="post">
 {tr msg="Networks allowed to relay and send mail through unauthenticated SMTP connections to the Kolab server (comma separated networks in x.x.x.x/y format):"}
@@ -99,7 +99,7 @@
 <div class="contentform">
 <form name="postfixallowunauthform" method="post">
 <input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked{/if} />
-{tr msg="Accept mail from other domains over non-authenticated 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 priviledged network."}
+{tr msg="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."}
 <div align="right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" /></div>
 </form>
 </div>



From cvs at kolab.org  Tue Dec 19 20:57:34 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Dec 2006 20:57:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.23,1.24 
Message-ID: <20061219195734.9E5CA1006D9@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
spelling error Privileged is correct and
removed an inconsistency: non-authorized -> unauthorized.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog	26 Mar 2006 13:45:23 -0000	1.23
+++ ChangeLog	19 Dec 2006 19:57:32 -0000	1.24
@@ -1,3 +1,7 @@
+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.
+
 2006-03-26 Richard Bos <richard at radoeka.nl>
 	Patch from Gunnar Wrobel
 	* php/admin/include/mysmarty.php.in: make the Smarty prefix



From cvs at kolab.org  Tue Dec 19 22:06:14 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Dec 2006 22:06:14 +0100 (CET)
Subject: thomas: doc/www/src/security kolab-vendor-notice-14.txt,NONE,1.1 
Message-ID: <20061219210614.675F8101EEB@lists.intevation.de>

Author: thomas

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

Added Files:
	kolab-vendor-notice-14.txt 
Log Message:
Kolab Security Issue 14 20061219 (clamav)


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

Kolab Security Issue 14 20061219
================================

Package:              Kolab Server, ClamAV
Vulnerability:        bypass virus detection (CVE-2006-6406),
                      denial of service, remotely exploitable (CVE-2006-6481)
Kolab Specific:       no
Dependent Packages:   none


Summary
~~~~~~~

CVE-2006-6406

    Hendrik Weimer discovered that invalid characters in base64 encoded
    data may lead to bypass of scanning mechanisms.

CVE-2006-6481

    Hendrik Weimer discovered that deeply nested multipart/mime MIME
    data may lead to denial of service.


Affected Versions
~~~~~~~~~~~~~~~~~

This affects versions of ClamAV up to version 0.88.6.
Kolab Server 2.0.4 and Kolab Server 2.1beta3 are vulnerable.
Previous releases are affected.


Fix
~~~

Upgrade to ClamAV 0.88.7.

The ClamAV source RPM is available from the Kolab download mirrors as:
security-updates/20061219/clamav-0.88.7-20061211.src.rpm

A binary RPM for Kolab Server 2.0.4 (ix86 Debian GNU/Linux Sarge) is available:
security-updates/20061219/clamav-0.88.7-20061211.ix86-debian3.1-kolab.rpm

All other server versions: Please build from the src.rpm.


The mirrors are listed on http://kolab.org/mirrors.html
While the mirrors are catching up, you can also get the package via rsync:
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20061219/clamav-0.88.7-20061211.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20061219/clamav-0.88.7-20061211.ix86-debian3.1-kolab.rpm .

MD5 sums:
7b19f8355d5f941422eb192671b0f814  clamav-0.88.7-20061211.ix86-debian3.1-kolab.rpm
bc86262cb06aef7b7bdd2fc5b8a87368  clamav-0.88.7-20061211.src.rpm


The package can be installed on your Kolab Server with

# /kolab/bin/openpkg rpm --rebuild clamav-0.88.7-20061211.src.rpm
# /kolab/bin/openpkg rc clamav stop
# /kolab/bin/openpkg rpm \
  -Uvh /kolab/RPM/PKG/clamav-0.88.7-20061211.<ARCH>-<OS>-kolab.rpm
# rm /kolab/etc/clamav/*.conf.rpmsave
# /kolab/sbin/kolabconf
# /kolab/bin/openpkg rc clamav start
# su - kolab-r
$ freshclam


Details
~~~~~~~

http://sourceforge.net/project/shownotes.php?release_id=461171
http://sourceforge.net/project/shownotes.php?release_id=470383
	ClamAV 0.88.6 and 0.88.7 release notes

http://www.quantenblog.net/security/virus-scanner-bypass
	Bypassing Virus Scanners Using MIME Encoding Tricks

http://www.securityfocus.com/bid/21461
	Multiple Security Products MIME Encoding Content Filter Bypass Weakness
	(CVE-2006-6406)

http://www.securityfocus.com/bid/21609
	Clam Anti-Virus Attachment Wrapping Denial Of Service Vulnerability
	(CVE-2006-6481)


Timeline
~~~~~~~~
    20061211 ClamAV release 0.88.7.
    20061211 OpenPKG 0.88.7 package release.
    20061219 Kolab Server security advisory published.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFFiFQoW7P1GVgWeRoRAgT4AJ9ERB2KHLqr3qu26t1AK8HDwobYSACcCxty
L37T0yS8rdJpqLTO+u/ztN4=
=xLcU
-----END PGP SIGNATURE-----



From cvs at kolab.org  Tue Dec 19 22:46:19 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Dec 2006 22:46:19 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.102,1.103 
Message-ID: <20061219214619.35FD2101EF7@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Security Advisory 14 news on kolab.org website


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- index.html.m4	16 Nov 2006 16:31:53 -0000	1.102
+++ index.html.m4	19 Dec 2006 21:46:17 -0000	1.103
@@ -47,6 +47,20 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">December 19th, 2006</td>
+<td class="newsh">&raquo;
+	Security Advisory 14 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-12.txt">Kolab Security
+	Issue 14</a> for details.
+</div>
+<p>
+
+<table>
 <tr><td class="newsd">November 16th, 2006</td>
 <td class="newsh">&raquo;
   Kolab Server 2.1 Beta 3 released



From cvs at kolab.org  Thu Dec 21 11:59:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 11:59:24 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.4,
	1.5 
Message-ID: <20061221105924.B5FE41006BC@lists.intevation.de>

Author: wilde

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
(re)corrected the spelling of `privileged'.


Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resmgr.conf.template.in	1 Feb 2006 19:46:12 -0000	1.4
+++ resmgr.conf.template.in	21 Dec 2006 10:59:22 -0000	1.5
@@ -15,7 +15,7 @@
 // '@domain' specified after their username as part of their email address.
 $params['email_domain'] = '@@@postfix-mydomain@@@';
 
-// List of kolab hosts that are priviledged
+// List of kolab hosts that are privileged
 $params['kolabhosts'] = '@@@kolabhost|join(,)@@@';
 
 // Are we using virtual domains with Cyrus?



From cvs at kolab.org  Thu Dec 21 11:59:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 11:59:24 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.9, 1.10 
Message-ID: <20061221105924.BB251101EE7@lists.intevation.de>

Author: wilde

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

Modified Files:
	messages.po 
Log Message:
(re)corrected the spelling of `privileged'.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- messages.po	18 Dec 2006 22:04:26 -0000	1.9
+++ messages.po	21 Dec 2006 10:59:22 -0000	1.10
@@ -594,7 +594,7 @@
 
 #: tpl_messages.php:164
 #, fuzzy
-msgid "Accept mail from other domains over non-authenticated 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 priviledged network."
+msgid "Accept mail from other domains over non-authenticated 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 "Accepter des messages venant d'autres domaines transmis grâce a du SMTP non authentifié. Ceci doit être activé si vous voulez que le serveur Kolab reçoive des messages venant d'autres domaines internet."
 
 #: tpl_messages.php:166



From cvs at kolab.org  Thu Dec 21 11:59:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 11:59:24 +0100 (CET)
Subject: wilde: server/kolab-resource-handlers/kolab-resource-handlers/resmgr
	resmgr.conf.in, 1.2, 1.3 
Message-ID: <20061221105924.BCB35101EE8@lists.intevation.de>

Author: wilde

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

Modified Files:
	resmgr.conf.in 
Log Message:
(re)corrected the spelling of `privileged'.


Index: resmgr.conf.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.conf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- resmgr.conf.in	19 Oct 2006 20:56:26 -0000	1.2
+++ resmgr.conf.in	21 Dec 2006 10:59:22 -0000	1.3
@@ -11,7 +11,7 @@
 // '@domain' specified after their username as part of their email address.
 $params['email_domain'] = 'example.com';
 
-// List of kolab hosts that are priviledged
+// List of kolab hosts that are privileged
 $params['kolabhosts'] = 'one.example.com,two.example.com,three.example.com';
 
 // Are we using virtual domains with Cyrus?



From cvs at kolab.org  Thu Dec 21 12:03:55 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 12:03:55 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.17, 1.18 
Message-ID: <20061221110355.0611F101EFB@lists.intevation.de>

Author: wilde

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

Modified Files:
	messages.po 
Log Message:
(re)corrected the spelling of `privileged'.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- messages.po	18 Dec 2006 22:04:26 -0000	1.17
+++ messages.po	21 Dec 2006 11:03:52 -0000	1.18
@@ -672,7 +672,7 @@
 msgstr "Vorige dagen"
 
 #: tpl_messages.php:150
-msgid "Priviledged Networks"
+msgid "Privileged Networks"
 msgstr "Bevoorrechte netwerken"
 
 #: tpl_messages.php:151



From cvs at kolab.org  Thu Dec 21 12:03:55 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 12:03:55 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.10, 1.11 
Message-ID: <20061221110355.0F982101F02@lists.intevation.de>

Author: wilde

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

Modified Files:
	messages.po 
Log Message:
(re)corrected the spelling of `privileged'.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- messages.po	21 Dec 2006 10:59:22 -0000	1.10
+++ messages.po	21 Dec 2006 11:03:53 -0000	1.11
@@ -572,7 +572,7 @@
 msgstr "jours dans le passé"
 
 #: tpl_messages.php:157
-msgid "Priviledged Networks"
+msgid "Privileged Networks"
 msgstr "Réseaux privilégiés"
 
 #: tpl_messages.php:158



From cvs at kolab.org  Thu Dec 21 12:03:55 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 12:03:55 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.4, 1.5 
Message-ID: <20061221110355.18F7F101F08@lists.intevation.de>

Author: wilde

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

Modified Files:
	messages.po 
Log Message:
(re)corrected the spelling of `privileged'.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- messages.po	18 Dec 2006 22:04:26 -0000	1.4
+++ messages.po	21 Dec 2006 11:03:53 -0000	1.5
@@ -587,7 +587,7 @@
 msgstr ""
 
 #: tpl_messages.php:150
-msgid "Priviledged Networks"
+msgid "Privileged Networks"
 msgstr ""
 
 #: tpl_messages.php:151



From cvs at kolab.org  Thu Dec 21 12:03:55 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 12:03:55 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.7, 1.8 
Message-ID: <20061221110355.0D79C101F00@lists.intevation.de>

Author: wilde

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

Modified Files:
	messages.po 
Log Message:
(re)corrected the spelling of `privileged'.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- messages.po	18 Dec 2006 22:04:26 -0000	1.7
+++ messages.po	21 Dec 2006 11:03:52 -0000	1.8
@@ -703,7 +703,7 @@
 msgstr "giorni nel passato"
 
 #: tpl_messages.php:150
-msgid "Priviledged Networks"
+msgid "Privileged Networks"
 msgstr "Reti privilegiate"
 
 #: tpl_messages.php:151



From cvs at kolab.org  Thu Dec 21 12:03:55 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 12:03:55 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.17, 1.18 
Message-ID: <20061221110355.17E7D101F06@lists.intevation.de>

Author: wilde

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

Modified Files:
	messages.po 
Log Message:
(re)corrected the spelling of `privileged'.


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- messages.po	18 Dec 2006 22:04:26 -0000	1.17
+++ messages.po	21 Dec 2006 11:03:53 -0000	1.18
@@ -714,7 +714,7 @@
 msgstr "vergangenen Tagen verwenden"
 
 #: tpl_messages.php:150
-msgid "Priviledged Networks"
+msgid "Privileged Networks"
 msgstr "Privilegierte Netzwerke"
 
 #: tpl_messages.php:151



From cvs at kolab.org  Thu Dec 21 12:06:24 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 12:06:24 +0100 (CET)
Subject: wilde: server/kolab-horde-fbview/kolab-horde-fbview/fbview/docs
	INSTALL, 1.1, 1.2 
Message-ID: <20061221110624.E0224101EFB@lists.intevation.de>

Author: wilde

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

Modified Files:
	INSTALL 
Log Message:
(re)corrected the spelling of `privileged'.


Index: INSTALL
===================================================================
RCS file: /kolabrepository/server/kolab-horde-fbview/kolab-horde-fbview/fbview/docs/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- INSTALL	31 Oct 2005 11:43:12 -0000	1.1
+++ INSTALL	21 Dec 2006 11:06:22 -0000	1.2
@@ -342,7 +342,7 @@
    mv horde-3.0 horde
 
 At this point, the Horde framework modules need to be installed. This must be
-done as root (or another user with sufficient administrator priviledges)::
+done as root (or another user with sufficient administrator privileges)::
 
    cd horde/framework
    php -q install-packages.php



From cvs at kolab.org  Thu Dec 21 16:11:06 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 16:11:06 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.103,1.104 
Message-ID: <20061221151106.2980C101EF1@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Fixed broken link to security advisory 14 (pointed to 12)


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- index.html.m4	19 Dec 2006 21:46:17 -0000	1.103
+++ index.html.m4	21 Dec 2006 15:11:04 -0000	1.104
@@ -55,7 +55,7 @@
 <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-12.txt">Kolab Security
+	<a href="security/kolab-vendor-notice-14.txt">Kolab Security
 	Issue 14</a> for details.
 </div>
 <p>



From cvs at kolab.org  Thu Dec 21 18:21:28 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 18:21:28 +0100 (CET)
Subject: wilde: server release-notes.txt,1.56,1.57 
Message-ID: <20061221172128.8BC301006AA@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Some notes for upcoming rc1.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- release-notes.txt	7 Dec 2006 11:59:11 -0000	1.56
+++ release-notes.txt	21 Dec 2006 17:21:26 -0000	1.57
@@ -70,6 +70,15 @@
 	Updated proftpd.conf template: LDAPHomedirOnDemand(Prefix) is
 	now named LDAPGenerateHomedir(Prefix).
 
+    - kolab-resource-handlers-2.0.99-2006????
+
+	kolab/issue1512 (No FB information for resource accounts)
+	kolab/issue1490 (freebusy cache written to /kolab/kolab/...)
+
+    - kolab-webadmin-2.0.99-2006????
+
+	kolab/issue1540 (Typo on kolab/admin/service page)
+
 
 Changes since 2.1 beta 2:
 



From cvs at kolab.org  Thu Dec 21 18:48:59 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 18:48:59 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates slapd.conf.template.in, 1.8,
	1.9 
Message-ID: <20061221174859.D8EE51006AA@lists.intevation.de>

Author: wilde

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

Modified Files:
	slapd.conf.template.in 
Log Message:
Changed deprecated "attr" to "attrs", fixes kolab/issue1484.


Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- slapd.conf.template.in	2 Oct 2006 17:31:59 -0000	1.8
+++ slapd.conf.template.in	21 Dec 2006 17:48:57 -0000	1.9
@@ -91,39 +91,39 @@
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by * none stop
 
-access to attr=userPassword
+access to attrs=userPassword
    	by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" =wx
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" =wx
         by self =wx
         by anonymous =x
         by * none stop
 
-access to attr=mail
+access to attrs=mail
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=alias
+access to attrs=alias
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=uid
+access to attrs=uid
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=cyrus-userquota
+access to attrs=cyrus-userquota
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
 	by self read stop
 
-access to attr=kolabHomeServer
+access to attrs=kolabHomeServer
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop
 
-access to attr=kolabHomeMTA
+access to attrs=kolabHomeMTA
         by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write
         by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write
         by * read stop



From cvs at kolab.org  Thu Dec 21 18:53:05 2006
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Dec 2006 18:53:05 +0100 (CET)
Subject: wilde: server release-notes.txt,1.57,1.58 
Message-ID: <20061221175305.51BCA1006AD@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Added note for upcoming rc1.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- release-notes.txt	21 Dec 2006 17:21:26 -0000	1.57
+++ release-notes.txt	21 Dec 2006 17:53:03 -0000	1.58
@@ -79,6 +79,10 @@
 
 	kolab/issue1540 (Typo on kolab/admin/service page)
 
+    - kolabd-2.0.99-2006????
+
+	kolab/issue1484 (Warnings using openldap = 2.3.27-2.20061018_kolab)
+
 
 Changes since 2.1 beta 2: