From cvs at kolab.org  Tue Jan  1 21:49:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  1 Jan 2008 21:49:57 +0100 (CET)
Subject: marcus: server/kolabconf/bin kolabconf.in,1.5,1.6 
Message-ID: <20080101204957.35CB0600D57@lists.intevation.de>

Author: marcus

Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv3678/bin

Modified Files:
	kolabconf.in 
Log Message:
Removed superfluous print statement.

Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/kolabconf/bin/kolabconf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabconf.in	13 Aug 2007 07:11:38 -0000	1.5
+++ kolabconf.in	1 Jan 2008 20:49:55 -0000	1.6
@@ -45,7 +45,6 @@
 getopts('dnh');
 if ($opt_h) {
     print "kolabconf - Version @VERSION@";
-    print;
     print <<'EOS';
 Usage: kolabconf [-d] [-n] [-h]
 



From cvs at kolab.org  Tue Jan  1 21:49:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  1 Jan 2008 21:49:57 +0100 (CET)
Subject: marcus: server/kolabconf ChangeLog,1.3,1.4 
Message-ID: <20080101204957.33892600D53@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
Removed superfluous print statement.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	7 Dec 2007 15:29:06 -0000	1.3
+++ ChangeLog	1 Jan 2008 20:49:55 -0000	1.4
@@ -1,3 +1,8 @@
+2008-01-01  Marcus Hüwe   <suse-tux at gmx.de>
+	* bin/kolabconf.in:
+	
+	Removed superfluous print statement.
+
 2007-12-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Makefile.PL (MY::postamble):



From cvs at kolab.org  Wed Jan  2 16:36:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  2 Jan 2008 16:36:54 +0100 (CET)
Subject: marcus: server/kolabconf ChangeLog,1.4,1.5 Makefile.PL,1.16,1.17 
Message-ID: <20080102153654.D6488600D73@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog Makefile.PL 
Log Message:
Fixed build for older versions of ExtUtils::MakeMaker.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	1 Jan 2008 20:49:55 -0000	1.4
+++ ChangeLog	2 Jan 2008 15:36:52 -0000	1.5
@@ -1,3 +1,8 @@
+2008-01-02  Marcus Hüwe   <suse-tux at gmx.de>
+	* Makefile.PL:
+	
+	Fixed build for older versions of ExtUtils::MakeMaker.
+
 2008-01-01  Marcus Hüwe   <suse-tux at gmx.de>
 	* bin/kolabconf.in:
 	

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.PL	12 Dec 2007 14:24:31 -0000	1.16
+++ Makefile.PL	2 Jan 2008 15:36:52 -0000	1.17
@@ -139,12 +139,20 @@
     return $add;
 }
 
+# older versions of ExtUtils:MakeMaker don't support INSTALLVENDORSCRIPT
+my $installscript = "";
+if ($ExtUtils::MakeMaker::VERSION >= 6.42) {
+    $installscript = "INSTALLVENDORSCRIPT";
+} else {
+    $installscript = "INSTALLSCRIPT";
+}
+
 WriteMakefile(
     NAME              => 'kolabconf',
     VERSION           => $VERSION,
     INSTALLDIRS       => 'vendor',
     EXE_FILES         => [ 'bin/kolabconf', ],
-    INSTALLVENDORSCRIPT => $INSTALLSCRIPT,
+    $installscript    => $INSTALLSCRIPT,
     ABSTRACT          => 
 'kolabconf provides the central mechanism to the configuration concept
 of the Kolab server. It rewrites the Kolab configuration templates



From cvs at kolab.org  Thu Jan  3 11:12:07 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jan 2008 11:12:07 +0100 (CET)
Subject: martin: doc/architecture server.sgml,1.38,1.39 
Message-ID: <20080103101207.9B8BE600D53@lists.intevation.de>

Author: martin

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

Modified Files:
	server.sgml 
Log Message:
Martin Konold: ALL permission must also include the right to post messages 'p'. Otherwise sieve scripts cannot append messages to this folder.


Index: server.sgml
===================================================================
RCS file: /kolabrepository/doc/architecture/server.sgml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- server.sgml	9 Aug 2006 12:55:43 -0000	1.38
+++ server.sgml	3 Jan 2008 10:12:05 -0000	1.39
@@ -1442,7 +1442,7 @@
 <varlistentry><term><filename>ALL</filename></term>
 <listitem>
 <para>
-lrsiwcda
+lrsipwcda
 </para>
 </listitem>
 </varlistentry>



From cvs at kolab.org  Thu Jan  3 11:20:55 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  3 Jan 2008 11:20:55 +0100 (CET)
Subject: martin: doc/architecture server.sgml,1.39,1.40 
Message-ID: <20080103102055.62C16600D53@lists.intevation.de>

Author: martin

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

Modified Files:
	server.sgml 
Log Message:
Martin Konold: Fix the documentation with regards to the posting permission 'p'. 
Kolab/LDAP.pm implements it already correctly.



Index: server.sgml
===================================================================
RCS file: /kolabrepository/doc/architecture/server.sgml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- server.sgml	3 Jan 2008 10:12:05 -0000	1.39
+++ server.sgml	3 Jan 2008 10:20:53 -0000	1.40
@@ -1426,7 +1426,7 @@
 <varlistentry><term><filename>APPEND</filename></term>
 <listitem>
 <para>
-lrsi
+lrsip
 </para>
 </listitem>
 </varlistentry>
@@ -1434,7 +1434,7 @@
 <varlistentry><term><filename>WRITE</filename></term>
 <listitem>
 <para>
-lrsiwcd
+lrsipwcd
 </para>
 </listitem>
 </varlistentry>



From cvs at kolab.org  Mon Jan  7 12:15:44 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jan 2008 12:15:44 +0100 (CET)
Subject: thomas: server/kolabconf ChangeLog,1.5,1.6 
Message-ID: <20080107111544.ABB51600D75@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Added missing newlines in kolabconf -h.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabconf/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	2 Jan 2008 15:36:52 -0000	1.5
+++ ChangeLog	7 Jan 2008 11:15:42 -0000	1.6
@@ -1,3 +1,7 @@
+2008-01-07  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* bin/kolabconf.in: Added missing newlines in kolabconf -h.
+
 2008-01-02  Marcus Hüwe   <suse-tux at gmx.de>
 	* Makefile.PL:
 	



From cvs at kolab.org  Mon Jan  7 12:15:44 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  7 Jan 2008 12:15:44 +0100 (CET)
Subject: thomas: server/kolabconf/bin kolabconf.in,1.6,1.7 
Message-ID: <20080107111544.B256A600D77@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv28674/bin

Modified Files:
	kolabconf.in 
Log Message:
Added missing newlines in kolabconf -h.


Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/kolabconf/bin/kolabconf.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabconf.in	1 Jan 2008 20:49:55 -0000	1.6
+++ kolabconf.in	7 Jan 2008 11:15:42 -0000	1.7
@@ -44,8 +44,9 @@
 
 getopts('dnh');
 if ($opt_h) {
-    print "kolabconf - Version @VERSION@";
     print <<'EOS';
+kolabconf - Version @VERSION@
+
 Usage: kolabconf [-d] [-n] [-h]
 
     Option d (debug) to print out the current config.



From cvs at kolab.org  Wed Jan  9 17:34:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jan 2008 17:34:18 +0100 (CET)
Subject: thomas: server/clamav Makefile, 1.4.2.3, 1.4.2.4 kolab.patch, 1.5.2.2,
	1.5.2.3 
Message-ID: <20080109163418.9ADCB600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_1_branch
	Makefile kolab.patch 
Log Message:
ClamAV 0.92 for server 2.1


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/Makefile,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- Makefile	21 Aug 2007 17:07:38 -0000	1.4.2.3
+++ Makefile	9 Jan 2008 16:34:16 -0000	1.4.2.4
@@ -12,9 +12,9 @@
 endif
 
 PACKAGE=clamav
-VERSION=0.91.2
-RELEASE=20070821
-KOLABRELEASE=20070821_kolab
+VERSION=0.92
+RELEASE=20080101
+KOLABRELEASE=20080101_kolab
 
 RPM=/kolab/bin/openpkg rpm
 

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/kolab.patch,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- kolab.patch	21 Aug 2007 17:07:38 -0000	1.5.2.2
+++ kolab.patch	9 Jan 2008 16:34:16 -0000	1.5.2.3
@@ -1,15 +1,15 @@
---- clamav.spec.orig	2007-02-23 11:30:31.000000000 +0100
-+++ clamav.spec	2007-02-23 11:30:59.000000000 +0100
-@@ -33,7 +33,7 @@ Class:        EVAL
+--- clamav.spec.orig	2008-01-01 15:31:46.000000000 +0100
++++ clamav.spec	2008-01-09 16:19:08.464783000 +0100
+@@ -32,7 +32,7 @@
  Group:        AntiVirus
  License:      GPL
- Version:      0.91.2
--Release:      20070821
-+Release:      20070821_kolab
+ Version:      0.92
+-Release:      20080101
++Release:      20080101_kolab
  
  #   package options
  %option       with_milter  no
-@@ -46,8 +46,8 @@ Patch0:       clamav.patch
+@@ -45,8 +45,8 @@
  #   build information
  Prefix:       %{l_prefix}
  BuildRoot:    %{l_buildroot}
@@ -20,3 +20,12 @@
  BuildPreReq:  zlib, bzip2, curl, gmp, libiconv, openssl
  PreReq:       zlib, bzip2, curl, gmp, libiconv, openssl
  %if "%{with_milter}" == "yes"
+@@ -80,7 +80,7 @@
+ %build
+     #   configure package
+     CC="%{l_cc}" \
+-    CFLAGS="%{l_cflags -O}" \
++    CFLAGS="%{l_cflags}" \
+     CPPFLAGS="%{l_cppflags}" \
+     LDFLAGS="%{l_ldflags}" \
+     GREP="grep" \



From cvs at kolab.org  Wed Jan  9 18:03:07 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jan 2008 18:03:07 +0100 (CET)
Subject: thomas: doc/www/src/security kolab-vendor-notice-18.txt,NONE,1.1 
Message-ID: <20080109170307.74EA3600D6A@lists.intevation.de>

Author: thomas

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

Added Files:
	kolab-vendor-notice-18.txt 
Log Message:
Kolab Security Issue 18 20080109 (clamav)


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

Kolab Security Issue 18 20080109
================================

Package:              Kolab Server, ClamAV
Vulnerability:        various
Kolab Specific:       no
Dependent Packages:   none


Summary
~~~~~~~

CVE-2007-6335

    It was discovered that an integer overflow in the decompression code
    for MEW archives may lead to the execution of arbitrary code.

CVE-2007-6336

    It was discovered that on off-by-one in the MS-ZIP decompression
    code may lead to the execution of arbitrary code.

CVE-2007-6337

    Unspecified vulnerability in the bzip2 decompression algorithm in
    nsis/bzlib_private.h


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

This affects versions of ClamAV up to version 0.91.2.
Kolab Server 2.1.0 and previous releases of the 2.1 branch are affected.
Kolab Server 2.0.4 and previous releases of the 2.0 branch are affected.
Kolab Server 2.2-beta3 and previous prereleases are affected.


Fix
~~~

Upgrade to ClamAV 0.92.

The ClamAV source RPM patched to be compilable with Kolab Server 2.1 and 2.0
is available from the Kolab download mirrors as:
security-updates/20080109/clamav-0.92-20080101_kolab.src.rpm

A binary RPM for Kolab Server 2.1.0 (ix86 Debian GNU/Linux Sarge) is available:
security-updates/20080109/clamav-0.92-20080101_kolab.ix86-debian3.1-kolab.rpm

All other server versions: Please build from the src.rpm.
For Kolab Server 2.2-beta3 the unmodified OpenPKG rpm can be used:
security-updates/20080109/clamav-0.92-20080101.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/20080109/clamav-0.92-20080101_kolab.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080109/clamav-0.92-20080101_kolab.ix86-debian3.1-kolab.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080109/clamav-0.92-20080101.src.rpm .

MD5 sums:
ad61c36b1d84aaa06e734fa02e13923b  clamav-0.92-20080101.src.rpm
3fe0e99160eea9816e55630378cd79d8  clamav-0.92-20080101_kolab.ix86-debian3.1-kolab.rpm
91094b48f22958536685eb29c786ea4f  clamav-0.92-20080101_kolab.src.rpm


The package can be installed on your Kolab Server with

# /kolab/bin/openpkg rpm --rebuild clamav-0.92-20080101_kolab.src.rpm
# /kolab/bin/openpkg rpm \
  -Uvh /kolab/RPM/PKG/clamav-0.92-20080108_kolab.<ARCH>-<OS>-kolab.rpm
# rm /kolab/etc/clamav/*.rpmsave
# /kolab/bin/openpkg rc clamav start
# su - kolab-r
$ freshclam

For Kolab Server 2.0.4 you have to copy the new /kolab/etc/clamav/clamd.conf
to /kolab/etc/kolab/templates/clamd.conf.template so it will not be
overwritten by kolabconf. Do NOT copy this file with Kolab Server 2.1 or 2.2!


Details
~~~~~~~

http://sourceforge.net/project/shownotes.php?release_id=562254
	ClamAV 0.92 release notes

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6335
	CVE-2007-6335

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6336
	CVE-2007-6336

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6337
	CVE-2007-6337


Timeline
~~~~~~~~
    20071217 ClamAV release 0.92.
    20071217 OpenPKG 0.92 package release.
    20080109 Kolab Server security advisory published.

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

iD8DBQFHhP3/W7P1GVgWeRoRArqEAKCGA8hTOAWBcDt3WqG4B7WLIztaKwCbBzGb
Uxon0E4dFQhN/FdMNWZNo9E=
=1e8v
-----END PGP SIGNATURE-----



From cvs at kolab.org  Wed Jan  9 18:04:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jan 2008 18:04:12 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.132,1.133 
Message-ID: <20080109170412.7A8AC600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Security Issue 18 for Kolab Server (ClamAV)


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- index.html.m4	10 Dec 2007 08:02:30 -0000	1.132
+++ index.html.m4	9 Jan 2008 17:04:10 -0000	1.133
@@ -47,6 +47,19 @@
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
 
 <table>
+<tr><td class="newsd">January 9th, 2008</td>
+<td class="newsh">&raquo;
+  Security Issue 18 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+  A new ClamAV RPM with various fixes is available.  See the
+  <a href="security/kolab-vendor-notice-16.txt">Kolab Security Issue 18</a> for details.
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">December 9th, 2007</td>
 <td class="newsh">&raquo;
   Kolab Server 2.2 Beta 3 (with Horde web client) released



From cvs at kolab.org  Wed Jan  9 18:10:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  9 Jan 2008 18:10:21 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.133,1.134 
Message-ID: <20080109171021.7867860C4A1@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
-16 -> -18  (I "increased" -17, but vim thought it was negative)


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- index.html.m4	9 Jan 2008 17:04:10 -0000	1.133
+++ index.html.m4	9 Jan 2008 17:10:19 -0000	1.134
@@ -54,7 +54,7 @@
 </table>
 <div class="newsb">
   A new ClamAV RPM with various fixes is available.  See the
-  <a href="security/kolab-vendor-notice-16.txt">Kolab Security Issue 18</a> for details.
+  <a href="security/kolab-vendor-notice-18.txt">Kolab Security Issue 18</a> for details.
 </div>
 <p>
 



From cvs at kolab.org  Fri Jan 18 17:32:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 18 Jan 2008 17:32:13 +0100 (CET)
Subject: emanuel: doc/wwwkroupware/src documentation.html.m4,1.8,1.9 
Message-ID: <20080118163213.76905600169@lists.intevation.de>

Author: emanuel

Update of /kolabrepository/doc/wwwkroupware/src
In directory doto:/tmp/cvs-serv3426

Modified Files:
	documentation.html.m4 
Log Message:
add english KDE client manual


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/wwwkroupware/src/documentation.html.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- documentation.html.m4	19 Aug 2004 14:39:08 -0000	1.8
+++ documentation.html.m4	18 Jan 2008 16:32:11 -0000	1.9
@@ -87,6 +87,15 @@
  <small>
  (20030801)
  </small>
+ <li>Version 0.9.x cvs20030801
+ (Corresponding to client version 1.0rc2) <b>in English</b>
+ <a href="http://kolab.org/doc/kde-client-manual-0.9cvs20030801-html/index.html">Browse Online</a> |
+ <a href="http://kolab.org/doc/kde-client-manual-0.9cvs20030801-html.zip">Download html groupware_de-1.0.1-html.zip</a>
+ | <a href="http://kolab.org/doc/kde-client-manual-0.9cvs20030801.pdf">Download pdf</a>
+ <br />
+ <small>
+ (20030801) - This english document was not part of the contract.
+ </small>
 </ul>
 
 m4_include(footer.html.m4)



From cvs at kolab.org  Fri Jan 18 17:37:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 18 Jan 2008 17:37:17 +0100 (CET)
Subject: emanuel: doc/www/src documentation.html.m4,1.32,1.33 
Message-ID: <20080118163717.82B76600169@lists.intevation.de>

Author: emanuel

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

Modified Files:
	documentation.html.m4 
Log Message:
add operating manual and presentations links; reorganize page


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/documentation.html.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- documentation.html.m4	2 Jul 2007 13:58:32 -0000	1.32
+++ documentation.html.m4	18 Jan 2008 16:37:15 -0000	1.33
@@ -2,18 +2,42 @@
 m4_include(header.html.m4)
 <div id="date">This page was updated on:<br />$Date$</div>
 
-<h2>Kolab2</h2>
+<h1>Documentation</h1>
+<ul>
+    <li><a href="#administrators">Documentation for Administrators</a></li>
+    <li><a href="#developers">Documentation for Developers</a></li>
+    <li><a href="#presentation">Material for Presentations</a></li>
+</ul>
+<a name="administrators">
+<h2>Documentation for Administrators</h2>
+</a>
+<h3>Administration</h3>
+<ul>
+    <li>Kolab Server 2.2 "operating manual" <br>
+    currently <b>only in german</b> ("Allgemeine Betriebsdokumentation")<br>
+    <a href="./doc/Allgemeine-Betriebsdokumentation-KolabServer22_20080103_1.0.pdf">
+        Version 1.0 as pdf</a>
+    | 
+    <a href="./doc/Allgemeine-Betriebsdokumentation-KolabServer22_20080103_1.0.odt">
+        Version 1.0 as odt</a> (2008-01-03)
+    <br>
+    <small>Get inofficial drafts and more information on 
+    <a href="http://wiki.kolab.org/index.php/Operating_Manual">
+    this Kolab Wiki page</a>.</small>
+    </li>
+</ul>
+
 
 <h3>Setup</h3>
 
 <ul>
- <li>Server and KDE Client "Proko2 Branch" Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):<br>
+ <li>Kolab Server 2.0 and KDE Client "Proko2 Branch" Setup (aka Doc2, pdf: 2.5MB, sxw: 1.9MB):<br>
      <a href="./doc/doc2-1.70.pdf">Doc2, Version 1.70 as pdf</a>
     |
      <a href="http://kolab.org/cgi-bin/viewcvs-kolab.cgi/doc/proko2-doc/doc2.sxw"
        >CVS HEAD as sxw</a>
 
- <li>Server and KDE Client Setup Translation Deutsch/German contributed by W. Sorgenfrei. <br>
+ <li>Kolab Server 2.0 and KDE Client Setup Translation Deutsch/German contributed by W. Sorgenfrei. <br>
  (Might not reflect latest changes of the English original. Compare the revision numbers)<br>
      <a href="./doc/doc2-de-1.64.pdf">Doc2-de, Version 1.64 as pdf</a>
     |
@@ -28,6 +52,11 @@
        >CVS HEAD as sxw</a>
 </ul>
 
+<br>
+<a name="developers">
+<h2>Documentation for Developers</h2>
+</a>
+
 <h3>Kolab2 Storage Format Specification</h3>
 <ul>
  <li>Version Release Candidate 2.0rc5  &nbsp;
@@ -66,28 +95,25 @@
  <a href="doc/concept-draft-cvs20041011.pdf">Download pdf</a>
 </ul>
 
-
-<h2>Kolab1</h2>
-
-<p>The following documents were published after the conclusion 
-of the Kroupware Contract. Still you will find some of the most
-up to date revisions for Kolab1 on the 
-<a href="http://kroupware.kolab.org/documentation.html">Kroupware documentation
-page</a>.
-</p>
-
-<h3>KDE Kolab1 Client Manual</h3>
+<br>
+<a name="presentation">
+<h2>Material for presentations</h2>
+</a>
 <ul>
- <li><b>Version 0.9.x cvs20030801</b>
- (Corresponding to client version 1.0rc2)
- <a href="doc/kde-client-manual-0.9cvs20030801-html/index.html">Browse Online</a> |
- <a href="doc/kde-client-manual-0.9cvs20030801-html.zip">Download html groupware_de-1.0.1-html.zip</a>
- | <a href="doc/kde-client-manual-0.9cvs20030801.pdf">Download pdf</a>
- <br />
- <small>
- (20030801)
- </small>
+    <li>Example slides for Kolab presentations; currently <b>only in german</b><br>
+    <a href="./doc/KolabPraesentation_20080103_1.0.pdf">
+        Version 1.0 as pdf</a>
+    | 
+    <a href="./doc/KolabPraesentation_20080103_1.0.odp">
+        Version 1.0 as odp</a> (2008-01-03)
+    <br>
+    <small>Get inofficial drafts and more information on 
+    <a href="http://wiki.kolab.org/index.php/Example_Slides_for_Kolab_Presentations">
+    this Kolab Wiki page</a>.</small>
+
+    </li>
 </ul>
+
 
 
 m4_include(footer.html.m4)



From cvs at kolab.org  Sat Jan 19 21:43:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 19 Jan 2008 21:43:15 +0100 (CET)
Subject: richard: server/kolabd/kolabd/namespace/libexec deluser.in,1.2,1.3 
Message-ID: <20080119204315.3DE44600D54@lists.intevation.de>

Author: richard

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

Modified Files:
	deluser.in 
Log Message:
add missing @ to bindir variable

Index: deluser.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/deluser.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- deluser.in	13 Dec 2005 21:10:26 -0000	1.2
+++ deluser.in	19 Jan 2008 20:43:12 -0000	1.3
@@ -13,7 +13,7 @@
 ##  You can view the  GNU General Public License, online, at the GNU
 ##  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 ##
-PATH=@bindir:$PATH
+PATH=@bindir@:$PATH
 
 if [ ".$1" = ".--help" ]; then
 	echo "Delete a user mailbox"



From cvs at kolab.org  Mon Jan 21 12:43:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 21 Jan 2008 12:43:17 +0100 (CET)
Subject: thomas: doc/wwwkroupware/src documentation.html.m4,1.9,1.10 
Message-ID: <20080121114317.A8550600D59@lists.intevation.de>

Author: thomas

Update of /kolabrepository/doc/wwwkroupware/src
In directory doto:/tmp/cvs-serv9205

Modified Files:
	documentation.html.m4 
Log Message:
Fixed link text for kde-client-manual-0.9cvs20030801-html.zip


Index: documentation.html.m4
===================================================================
RCS file: /kolabrepository/doc/wwwkroupware/src/documentation.html.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- documentation.html.m4	18 Jan 2008 16:32:11 -0000	1.9
+++ documentation.html.m4	21 Jan 2008 11:43:15 -0000	1.10
@@ -90,7 +90,7 @@
  <li>Version 0.9.x cvs20030801
  (Corresponding to client version 1.0rc2) <b>in English</b>
  <a href="http://kolab.org/doc/kde-client-manual-0.9cvs20030801-html/index.html">Browse Online</a> |
- <a href="http://kolab.org/doc/kde-client-manual-0.9cvs20030801-html.zip">Download html groupware_de-1.0.1-html.zip</a>
+ <a href="http://kolab.org/doc/kde-client-manual-0.9cvs20030801-html.zip">Download html kde-client-manual-0.9cvs20030801-html.zip</a>
  | <a href="http://kolab.org/doc/kde-client-manual-0.9cvs20030801.pdf">Download pdf</a>
  <br />
  <small>



From cvs at kolab.org  Tue Jan 22 19:02:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jan 2008 19:02:03 +0100 (CET)
Subject: thomas: server release-notes.txt,1.197,1.198 
Message-ID: <20080122180203.CEBFF600169@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- release-notes.txt	12 Dec 2007 14:38:49 -0000	1.197
+++ release-notes.txt	22 Jan 2008 18:02:01 -0000	1.198
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 2008????, Kolab Server 2.2-???)
+(Version 2008????, Kolab Server 2.2-rc1
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -44,9 +44,18 @@
 	The specifics are described below.
 
 
-Changes between 2.2-beta-3 and 2.2-???:
+Changes between 2.2-beta-3 and 2.2-rc-1
+
+    All packages except for openldap and db were upgraded to OpenPKG-CURRENT
+    (as of 20080118).
+
+    - kolabconf-2.2.rc1-2008????
+
+	Added missing newlines in kolabconf -h
 
     - kolabd-2.1.99-2008????
+
+	deluser: add missing @ to bindir variable
 
 	kolab/issue26   (Allow to bind to specific IPs)
 



From cvs at kolab.org  Tue Jan 22 19:36:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jan 2008 19:36:22 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.68,1.69 
Message-ID: <20080122183622.8D15160016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Adjusted common code in management pages to look the same for easier comparison.
This fixed some variable initialisations.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ChangeLog	3 Dec 2007 17:10:30 -0000	1.68
+++ ChangeLog	22 Jan 2008 18:36:20 -0000	1.69
@@ -1,3 +1,13 @@
+2008-01-22  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* www/admin/addressbook/index.php.in,
+	www/admin/administrator/index.php.in,
+	www/admin/domainmaintainer/index.php.in,
+	www/admin/maintainer/index.php.in,
+	www/admin/sharedfolder/index.php.in,
+	www/admin/user/index.php.in: Adjusted common code to look the same for
+	easier comparison. This fixed some variable initialisations.
+
 2007-12-03  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* www/admin/user/user.php.in: Removed resource password handling



From cvs at kolab.org  Tue Jan 22 19:36:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jan 2008 19:36:22 +0100 (CET)
Subject: thomas: server release-notes.txt,1.198,1.199 
Message-ID: <20080122183622.8C04F60016B@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Adjusted common code in management pages to look the same for easier comparison.
This fixed some variable initialisations.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- release-notes.txt	22 Jan 2008 18:02:01 -0000	1.198
+++ release-notes.txt	22 Jan 2008 18:36:20 -0000	1.199
@@ -59,6 +59,10 @@
 
 	kolab/issue26   (Allow to bind to specific IPs)
 
+    - kolab-webadmin-2.1.99-20071203
+
+	Fixed some variable initialisations.
+
 
 Changes between 2.2-beta-2 and 2.2-beta-3:
 



From cvs at kolab.org  Tue Jan 22 19:36:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jan 2008 19:36:22 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
	index.php.in, 1.3, 1.4 
Message-ID: <20080122183622.AB90160016B@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
Adjusted common code in management pages to look the same for easier comparison.
This fixed some variable initialisations.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in	11 Jul 2006 16:02:24 -0000	1.3
+++ index.php.in	22 Jan 2008 18:36:20 -0000	1.4
@@ -17,9 +17,9 @@
 /**** Authentication etc. ***/
 $sidx = 'sf';
 
-$group = $auth->group();
-if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer' ) {
-   array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+if( $auth->group() != 'maintainer' && $auth->group() != 'admin' && $auth->group() != 'domain-maintainer' ) {
+  debug("auth->group=".$auth->group());
+  array_push($errors, _("Error: You don't have Permissions to access this Menu"));
 }
 
 require_once('@kolab_php_module_prefix at admin/include/menu.php');
@@ -53,32 +53,35 @@
 	$title = sprintf(_("Manage Shared Folders (%d Folders)"), $count);
 	$template = 'sflistall.tpl';
 	ldap_sort($ldap->connection,$result,'cn');
-	$entry = ldap_first_entry($ldap->connection, $result);
-	while( $entry ) {
-	  $attrs = ldap_get_attributes($ldap->connection, $entry);
-	  $dn = ldap_get_dn($ldap->connection,$entry);
-	  $cn = $attrs['cn'][0];
-	  $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
-	  $kolabhomeserver = $attrs['kolabHomeServer'][0];
-	  
-	  $folderTypeMap = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'), 'journal' => _('Journals'),
-							   'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes'));
-	  if( in_array('kolabFolderType',$attrs) ) $folderType = $folderTypeMap[$attrs['kolabFolderType'][0]];
-	  else $folderType = $folderTypeMap[''];
+	  $entry = ldap_first_entry($ldap->connection, $result);
+	  while( $entry ) {
+		$attrs = ldap_get_attributes($ldap->connection, $entry);
+		$dn = ldap_get_dn($ldap->connection,$entry);
+		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
+		$cn = $attrs['cn'][0];
+		$kolabhomeserver = $attrs['kolabHomeServer'][0];
+		$folderTypeMap = array ( '' => _('Unspecified'),
+								 'mail' => _('Mails'),
+								 'task' => _('Tasks'),
+								 'journal' => _('Journals'),
+								 'event' => _('Events'),
+								 'contact' => _('Contacts'),
+								 'note' => _('Notes'));
+		if( in_array('kolabFolderType',$attrs) ) $folderType = $folderTypeMap[$attrs['kolabFolderType'][0]];
+		else $folderType = $folderTypeMap[''];
 
-	  $entries[] = array( 'dn' => $dn,
-						  'cn' => $cn,
-						  'kolabhomeserver' => $kolabhomeserver,
-			    			  'deleted' => $deleted,
-						  'foldertype' => $folderType );
-	  $entry = ldap_next_entry( $ldap->connection,$entry );
+		  $entries[] = array( 'dn' => $dn,
+							  'cn' => $cn,
+							  'kolabhomeserver' => $kolabhomeserver,
+							  'foldertype' => $folderType,
+							  'deleted' => $deleted );
+		$entry = ldap_next_entry( $ldap->connection,$entry );
 	}
   }
 }
 
-
 /**** Insert into template and output ***/
-$smarty =& new MySmarty();
+$smarty = new MySmarty();
 $smarty->assign( 'errors', $errors );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );



From cvs at kolab.org  Tue Jan 22 19:36:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jan 2008 19:36:22 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/user
	index.php.in, 1.5, 1.6 
Message-ID: <20080122183622.B15CD60016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
Adjusted common code in management pages to look the same for easier comparison.
This fixed some variable initialisations.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.php.in	21 Nov 2007 18:11:37 -0000	1.5
+++ index.php.in	22 Jan 2008 18:36:20 -0000	1.6
@@ -140,11 +140,11 @@
 		$attrs = ldap_get_attributes($ldap->connection, $entry);
 		$dn = ldap_get_dn($ldap->connection,$entry);
 		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
-        $uid = $attrs['uid'][0];
-        $mail = $attrs['mail'][0];
-        $sn = $attrs['sn'][0];
-        $cn = $attrs['cn'][0];
-        $fn = KolabLDAP::getGivenName($cn, $sn);
+		$uid = $attrs['uid'][0];
+		$mail = $attrs['mail'][0];
+		$sn = $attrs['sn'][0];
+		$cn = $attrs['cn'][0];
+		$fn = KolabLDAP::getGivenName($cn, $sn);
 		$dncomp = split( ',', $dn );
 		if( in_array('cn=groups',$dncomp) ) {
 		  $type = 'G';



From cvs at kolab.org  Tue Jan 22 19:36:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 22 Jan 2008 19:36:22 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	index.php.in, 1.3, 1.4 
Message-ID: <20080122183622.8ADE460016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
Adjusted common code in management pages to look the same for easier comparison.
This fixed some variable initialisations.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in	21 Nov 2007 18:11:37 -0000	1.3
+++ index.php.in	22 Jan 2008 18:36:20 -0000	1.4
@@ -19,7 +19,8 @@
 $sidx = 'addressbook';
 
 if( $auth->group() != 'maintainer' && $auth->group() != 'admin') {
-   array_push($errors, _("Error: You don't have Permissions to access this Menu") );
+  debug("auth->group=".$auth->group());
+  array_push($errors, _("Error: You don't have Permissions to access this Menu"));
 }
 
 require_once('@kolab_php_module_prefix at admin/include/menu.php');
@@ -93,11 +94,11 @@
 	  while( $entry ) {
 		$attrs = ldap_get_attributes($ldap->connection, $entry);
 		$dn = ldap_get_dn($ldap->connection,$entry);
+		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 		$mail = $attrs['mail'][0];
 		$sn = $attrs['sn'][0];
 		$cn = $attrs['cn'][0];
 		$fn = KolabLDAP::getGivenName($cn, $sn);
-		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 		$entries[] = array( 'dn' => $dn,
 							'sn' => $sn,
 							'fn' => $fn,
@@ -109,9 +110,8 @@
   }
 }
 
-
 /**** Insert into template and output ***/
-$smarty =& new MySmarty();
+$smarty = new MySmarty();
 $smarty->assign( 'errors', $errors );
 $smarty->assign( 'uid', $auth->uid() );
 $smarty->assign( 'group', $auth->group() );



From cvs at kolab.org  Wed Jan 23 17:43:36 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 23 Jan 2008 17:43:36 +0100 (CET)
Subject: thomas: utils/admin hash-imap-spool,1.2,1.3 
Message-ID: <20080123164336.1301B600171@lists.intevation.de>

Author: thomas

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

Modified Files:
	hash-imap-spool 
Log Message:
Various improvements for hash-imap-spool:
- Abort if chdir failed (otherwise bad things will happen, especially as root)
- Fix trailing spaces and indentation
- Use python in $PATH
- Suggest to use the user 'kolab-r'
- Don't shadow the built-ins dir and file
- Catch specific exceptions instead of any errors
- Make it importable from other scripts


Index: hash-imap-spool
===================================================================
RCS file: /kolabrepository/utils/admin/hash-imap-spool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hash-imap-spool	12 Oct 2007 12:47:12 -0000	1.2
+++ hash-imap-spool	23 Jan 2008 16:43:33 -0000	1.3
@@ -1,10 +1,10 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 # -*- mode: python, coding: iso-8859-1 -*-
 # --------------------------------------------------------------------
 # hash-imap-spool
 # $Id$
 # --------------------------------------------------------------------
-# Copyright (C) 2007 by Intevation GmbH
+# Copyright (C) 2007, 2008 by Intevation GmbH
 # Author(s):
 # Sascha Wilde <wilde at intevation.de>
 
@@ -16,19 +16,20 @@
 
 Usage:
 
-   hash-imap-spool.py [CONFFILE]
+   hash-imap-spool [CONFFILE]
 
 The program converts plain imap spool directory as found in Kolab
 Server 2.0 to spool with basic hashing as needed for Kolab Server 2.1
 and later.
 
-The spool deirctories are read from the imapd.conf CONFFILE which
+The spool directories are read from the imapd.conf CONFFILE which
 defaults to /kolab/etc/imapd/imapd.conf if not given as an argument.
+
+Please run this script as the user 'kolab-r'.
 """
 
 import sys
 import os
-import os.path
 import re
 import string
 
@@ -41,8 +42,8 @@
         return "q"
 
 
-def tmphash_dir(dir, tmp_hash_dirs, dstdir=".", extradir=""):
-    hash_dir = "." + basic_hash(dir)
+def tmphash_dir(dir_, tmp_hash_dirs, dstdir=".", extradir=""):
+    hash_dir = "." + basic_hash(dir_)
     if not hash_dir in tmp_hash_dirs:
         os.mkdir(dstdir + "/" + hash_dir, 0700)
         tmp_hash_dirs.append(hash_dir)
@@ -50,9 +51,10 @@
         extradirpath = dstdir + "/" + hash_dir + "/" + extradir
         if not os.path.isdir(extradirpath):
             os.mkdir(extradirpath, 0700)
-        if not extradir.endswith("/"): extradir = extradir + "/"
-    dir_new = dstdir + "/" + hash_dir + "/" + extradir + dir
-    os.rename(dir, dir_new)
+        if not extradir.endswith("/"):
+            extradir = extradir + "/"
+    dir_new = dstdir + "/" + hash_dir + "/" + extradir + dir_
+    os.rename(dir_, dir_new)
 
 
 def cleanup_tmp_hash_dirs(tmp_hash_dirs):
@@ -63,24 +65,24 @@
 
 
 def hash_submb(name, tmp_hash_dirs):
-    for file in os.listdir("."):
-        if os.path.isdir(file):
-            tmphash_dir(file, tmp_hash_dirs, "..", name)
+    for file_ in os.listdir("."):
+        if os.path.isdir(file_):
+            tmphash_dir(file_, tmp_hash_dirs, "..", name)
             print ".",
 
 
 def hash_mailboxes():
     tmp_hash_dirs = []
-    for dir in os.listdir("."):
-        if dir == "user" or dir[0:6] == "shared":
+    for dir_ in os.listdir("."):
+        if dir_ == "user" or dir_[0:6] == "shared":
             old_cwd = os.getcwd()
-            os.chdir(dir)
-            hash_submb(dir, tmp_hash_dirs)
+            os.chdir(dir_)
+            hash_submb(dir_, tmp_hash_dirs)
             os.chdir(old_cwd)
-            if dir == "user": 
-                os.rmdir(dir)
+            if dir_ == "user":
+                os.rmdir(dir_)
                 continue
-        tmphash_dir(dir, tmp_hash_dirs)
+        tmphash_dir(dir_, tmp_hash_dirs)
         print ".",
     cleanup_tmp_hash_dirs(tmp_hash_dirs)
 
@@ -105,28 +107,30 @@
     print "Converting %s ..." % path
     try:
         os.chdir("%s/domain" % path)
-    except:
-        print "Can't enter `%s/domain'!" % path
+    except OSError, inst:
+        print "Can't change to spool directory."
+        print inst
+        sys.exit(23)
     hash_domains()
 
 
 def read_conffile(conffile):
     """Parse conffile and return list of paths to the partititions."""
-    n = 0
     paths = []
     spoolpath_re = re.compile("^(?:meta)?partition-.*:\s+(?P<path>.+)")
 
     try:
-        file = open(conffile)
+        file_ = open(conffile)
 
-        for line in file:
+        for line in file_:
             m = spoolpath_re.match(line)
             if m:
-              paths.append(m.group("path"))
+                paths.append(m.group("path"))
         return paths
 
-    except:
-        print "Can't read configuration file `%s'." % conffile
+    except IOError, inst:
+        print "Can't read configuration file."
+        print inst
         sys.exit(23)
 
 
@@ -141,12 +145,11 @@
 
     paths = read_conffile(conffile)
 
-    if len(paths) > 0:
-        for path in paths:
-            hash_spool_dir(path)
+    for path in paths:
+        hash_spool_dir(path)
     else:
-        print "Could not find any spool directories in %s" % conffile
+        print "Could not find any spool directories in `%s'." % conffile
         sys.exit(23)
 
-
-main()
+if __name__ == "__main__":
+    main()



From cvs at kolab.org  Mon Jan 28 22:44:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jan 2008 22:44:40 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.130,
	1.131 kolabquotawarn.in, 1.14, 1.15 
Message-ID: <20080128214440.CEF84600165@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolabquotawarn.in 
Log Message:
the quotawarn.db can not be opened on an openSUSE system, as a not-existing
directory is used.  Use the correct autotools variable @kolab_statedir@
instead of @localstatedir@ to obtain the correct behavior.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- ChangeLog	16 Dec 2007 20:41:55 -0000	1.130
+++ ChangeLog	28 Jan 2008 21:44:38 -0000	1.131
@@ -1,3 +1,9 @@
+2008-01-28 Richard Bos <richard at radoeka.nl>
+	* kolabquotawarn.in: the quotawarn.db can not be opened on an
+	  openSUSE system, as a not-existing directory is used.  Use the
+	  correct autotools variable @kolab_statedir@ instead of
+	  @localstatedir@ to obtain the correct behavior.
+
 2007-12-16 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse: the sasl2/smtp.conf location has changed, adapt to this.
 

Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolabquotawarn.in	8 Oct 2007 15:50:11 -0000	1.14
+++ kolabquotawarn.in	28 Jan 2008 21:44:38 -0000	1.15
@@ -109,7 +109,7 @@
   fatal_exit( "Can't open quotawarning.txt" );
 }
 
-dbmopen( %quotawarn_db, '@localstatedir@/kolab/quotawarn.db', 0666 )
+dbmopen( %quotawarn_db, '@kolab_statedir@/quotawarn.db', 0666 )
   || fatal_exit ('Unable to open quotawarn db');
 
 if( $opt_d ) {



From cvs at kolab.org  Mon Jan 28 23:18:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jan 2008 23:18:19 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.131,1.132 
Message-ID: <20080128221819.9FA84600165@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added missing log files and corrected 2 autotools variables
@resmgr_logfile@ and @freebusy_logfile@ that where removed
some time ago.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- ChangeLog	28 Jan 2008 21:44:38 -0000	1.131
+++ ChangeLog	28 Jan 2008 22:18:17 -0000	1.132
@@ -3,6 +3,9 @@
 	  openSUSE system, as a not-existing directory is used.  Use the
 	  correct autotools variable @kolab_statedir@ instead of
 	  @localstatedir@ to obtain the correct behavior.
+	* namespace/libexec/showlog.in: added missing log files and
+	  corrected 2 autotools variables @resmgr_logfile@ and
+	  @freebusy_logfile@ that where removed some time ago.
 
 2007-12-16 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse: the sasl2/smtp.conf location has changed, adapt to this.



From cvs at kolab.org  Mon Jan 28 23:18:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 28 Jan 2008 23:18:19 +0100 (CET)
Subject: richard: server/kolabd/kolabd/namespace/libexec showlog.in,1.5,1.6 
Message-ID: <20080128221819.A19E3600166@lists.intevation.de>

Author: richard

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

Modified Files:
	showlog.in 
Log Message:
added missing log files and corrected 2 autotools variables
@resmgr_logfile@ and @freebusy_logfile@ that where removed
some time ago.



Index: showlog.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/showlog.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- showlog.in	17 Oct 2007 17:57:13 -0000	1.5
+++ showlog.in	28 Jan 2008 22:18:17 -0000	1.6
@@ -24,16 +24,21 @@
 #list of logfiles, maintainers please update
 logfiles="
 @amavisd_logfile@
+ at freshclam_logfile@
 @fsl_logfile@
 @sasl_logfile@
- at resmgr_logfile@
- at freebusy_logfile@
+ at resmgr_logdir@/resmgr.log
+ at resmgr_logdir@/filter.log
+ at resmgr_logdir@/fatal.log
+ at freebusy_logdir@/freebusy.log
+ at fbview_logfile@
 @clamav_logfile@
 @imap_masterlogfile@
 @imap_misclogfile@
 @webserver_errorlogfile@
 @webserver_accesslogfile@
 @ldapserver_logfile@
+ at ldapserver_replogfile@
 @emailserver_logfile@
 "
 



From cvs at kolab.org  Tue Jan 29 17:20:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 Jan 2008 17:20:20 +0100 (CET)
Subject: thomas: doc/raw-howtos kolab_2.0_to_2.1_upgrade_instructions.txt, 1.13,
	1.14 
Message-ID: <20080129162020.007CC600D69@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab_2.0_to_2.1_upgrade_instructions.txt 
Log Message:
Added instructions for generatefb.php to 2.0->2.1 upgrade docs.
kolab/issue1693 (Automatically trigger f/b cache regeneration)

generatefb.php isn't compatible with the new freebusy code of 2.2.


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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolab_2.0_to_2.1_upgrade_instructions.txt	10 May 2007 12:56:11 -0000	1.13
+++ kolab_2.0_to_2.1_upgrade_instructions.txt	29 Jan 2008 16:20:17 -0000	1.14
@@ -1,7 +1,11 @@
 Upgrade Kolab Server from 2.0.x to 2.1
 ======================================
 
-Instructions for upgrading Kolab Server 2.0.4 to 2.1.0
+Instructions for upgrading Kolab Server 2.0.4 to 2.1.1,
+
+Steps that do not apply to the 2.1.0 release are marked in the text.
+There is no 2.1.1 release yet, so those steps need a CVS version of
+kolabd and kolab-resource-handlers from the kolab_2_1_branch branch.
 
 NOTE: Before attempting the upgrade, make sure you have a
 current and working backup of your data.
@@ -245,6 +249,18 @@
    - Users need to create or update an appointment in their folders.
    - Resources can be invited to a new appointment or send them an update
      to an existing appointment.
+
+Automatically trigger recreating the free/busy cache:
+
+   With server 2.1.1 or newer it is possible to automatically regenerate the
+   free/busy cache using script "generatefb.php" downloadable from CVS:
+
+     http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/utils/admin/generatefb.php
+
+   After making it executable you can start it to see usage instructions:
+
+     $ chmod 755 generatefb.php
+     $ ./generatefb.php
 
 
 $Id$



From cvs at kolab.org  Tue Jan 29 21:45:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 29 Jan 2008 21:45:11 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.29, 1.30 
Message-ID: <20080129204511.AD0E7600165@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Added missing translation for the in this case crucial word "only"



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- messages.po	3 Dec 2007 17:16:34 -0000	1.29
+++ messages.po	29 Jan 2008 20:45:09 -0000	1.30
@@ -1429,8 +1429,8 @@
 "Check here to make this distribution list available only to authenticated "
 "users"
 msgstr ""
-"Kruis hier aan om de distribitielijst beschikbaar te maken voor alle "
-"authoriseerde gebruikers"
+"Kruis hier aan om de distribitielijst alleen beschikbaar te maken voor "
+"ge-authoriseerde gebruikers"
 
 #: ../../../www/admin/distributionlist/list.php.in:145
 msgid "Add Distribution List"



From cvs at kolab.org  Wed Jan 30 15:50:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 Jan 2008 15:50:02 +0100 (CET)
Subject: wilde: utils/admin kolab-mailboxinfo.pl,1.1,1.2 
Message-ID: <20080130145002.F2D3A600D4F@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab-mailboxinfo.pl 
Log Message:
Added a option `-c' (output cyradm commands) to kolab-mailboxinfo.
With this option the output of kolab-mailboxinfo.pl can be used as
input to cyradm to restore acls and annotations.


Index: kolab-mailboxinfo.pl
===================================================================
RCS file: /kolabrepository/utils/admin/kolab-mailboxinfo.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-mailboxinfo.pl	22 Jun 2007 15:37:00 -0000	1.1
+++ kolab-mailboxinfo.pl	30 Jan 2008 14:50:00 -0000	1.2
@@ -14,10 +14,14 @@
 # $Id$
 
 use Kolab::Cyrus;
+use Getopt::Std;
 
 my $cyrus = Kolab::Cyrus::create;
 $cyrus || die 'Unable to login to Cyrus IMAP server\n';
 
+# -c generates output suitable as input to cyradm
+Getopt::Std::getopts('c');
+
 my @results = $cyrus->listmailbox('*');
 sort(@results);
 foreach my $result (@results) {
@@ -25,7 +29,11 @@
 
     my %rights = $cyrus->listacl(${mailbox});
     foreach my $user (sort keys %rights) {
-        print "${mailbox}: acl $user: $rights{$user}\n";
+        if($opt_c == 1) {
+            print "sam ${mailbox} $user $rights{$user}\n";
+        } else {
+            print "${mailbox}: acl $user: $rights{$user}\n";
+        }
     }
 
     my %info = $cyrus->getinfo(${mailbox});
@@ -33,7 +41,11 @@
         $attrib = $key;
         $attrib =~ s/^[^}]*}//;
         if(not $attrib =~ /^\/vendor\/cmu\//) {
-            print "${mailbox}: annotation $attrib: $info{$key}\n";
+            if($opt_c == 1) {
+                print "mboxcfg ${mailbox} $attrib $info{$key}\n";
+            } else {
+                print "${mailbox}: annotation $attrib: $info{$key}\n";
+            }
         }
     }
 }



From cvs at kolab.org  Wed Jan 30 16:22:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 Jan 2008 16:22:34 +0100 (CET)
Subject: wilde: utils/admin kolab-mailboxinfo.pl,1.2,1.3 
Message-ID: <20080130152234.6C56F600D53@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab-mailboxinfo.pl 
Log Message:
Fixed (added) quoting in kolab-mailboxinfo cyradm command output.


Index: kolab-mailboxinfo.pl
===================================================================
RCS file: /kolabrepository/utils/admin/kolab-mailboxinfo.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab-mailboxinfo.pl	30 Jan 2008 14:50:00 -0000	1.2
+++ kolab-mailboxinfo.pl	30 Jan 2008 15:22:32 -0000	1.3
@@ -30,7 +30,7 @@
     my %rights = $cyrus->listacl(${mailbox});
     foreach my $user (sort keys %rights) {
         if($opt_c == 1) {
-            print "sam ${mailbox} $user $rights{$user}\n";
+            print "sam \"${mailbox}\" $user $rights{$user}\n";
         } else {
             print "${mailbox}: acl $user: $rights{$user}\n";
         }
@@ -42,7 +42,7 @@
         $attrib =~ s/^[^}]*}//;
         if(not $attrib =~ /^\/vendor\/cmu\//) {
             if($opt_c == 1) {
-                print "mboxcfg ${mailbox} $attrib $info{$key}\n";
+                print "mboxcfg \"${mailbox}\" $attrib $info{$key}\n";
             } else {
                 print "${mailbox}: annotation $attrib: $info{$key}\n";
             }



From cvs at kolab.org  Wed Jan 30 22:04:31 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 30 Jan 2008 22:04:31 +0100 (CET)
Subject: richard: server/php-kolab/Kolab_Filter/Filter Content.php,1.3,1.4 
Message-ID: <20080130210431.34950600D6B@lists.intevation.de>

Author: richard

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv32636

Modified Files:
	Content.php 
Log Message:
Solves https://intevation.de/roundup/kolab/issue2425

An "s" was forgotten in the variable name



Index: Content.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Content.php	29 Nov 2007 15:00:16 -0000	1.3
+++ Content.php	30 Jan 2008 21:04:28 -0000	1.4
@@ -478,7 +478,7 @@
                 if (strtolower($fromdom) == $domain 
                     || ($verify_subdomains
                         && substr($fromdom, -strlen($domain)-1) == ".$domain")) {
-                    if ($reject_forged_from_header) {
+                    if ($reject_forged_from_headers) {
                         Horde::logMessage(sprintf(_("%s is not an allowed From address for unauthenticated users."), 
                                                   $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
                         return false;



From cvs at kolab.org  Thu Jan 31 15:03:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 Jan 2008 15:03:02 +0100 (CET)
Subject: marcus: server/kolabd/kolabd/dist_conf kolabsrv.in,1.9,1.10 
Message-ID: <20080131140302.133B4600169@lists.intevation.de>

Author: marcus

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

Modified Files:
	kolabsrv.in 
Log Message:
* dist_conf/kolabsrv.in: added getServiceName method to map distribution specific rc script names.

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolabsrv.in	22 Oct 2007 18:17:53 -0000	1.9
+++ kolabsrv.in	31 Jan 2008 14:03:00 -0000	1.10
@@ -29,6 +29,21 @@
 	fi
 }	
 
+# map distribution specific rc script names
+function getServiceName() {
+	sname=$1
+	if [ -e /etc/SuSE-release ]; then
+		case $sname in
+			openldap) SERVICE="@LDAP@" ;;
+			sasl) SERVICE="saslauthd" ;;
+			imapd) SERVICE="cyrus" ;;
+			amavisd) SERIVCE="amavis" ;;
+			clamav) SERVICE="clamd" ;;
+			*) SERVICE=$sname
+		esac
+	fi
+}	
+
 # variables
 RC=$1
 
@@ -48,6 +63,7 @@
 RCDIR=@kolab_rcdir@
 
 for SERVICE in $SERVICES; do
+	getServiceName $SERVICE
 	check $SERVICE
 done
 



From cvs at kolab.org  Thu Jan 31 15:03:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 Jan 2008 15:03:02 +0100 (CET)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.132,1.133 
Message-ID: <20080131140302.1347C60016B@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
* dist_conf/kolabsrv.in: added getServiceName method to map distribution specific rc script names.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- ChangeLog	28 Jan 2008 22:18:17 -0000	1.132
+++ ChangeLog	31 Jan 2008 14:02:59 -0000	1.133
@@ -1,3 +1,7 @@
+2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
+	* dist_conf/kolabsrv.in: added getServiceName method to map distribution
+	  specific rc script names.
+
 2008-01-28 Richard Bos <richard at radoeka.nl>
 	* kolabquotawarn.in: the quotawarn.db can not be opened on an
 	  openSUSE system, as a not-existing directory is used.  Use the



From cvs at kolab.org  Thu Jan 31 15:28:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 Jan 2008 15:28:58 +0100 (CET)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.133,1.134 
Message-ID: <20080131142858.B6FFC60016C@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
- * dist_conf/suse: updated logfile locations
- fixed typo (thanks Richard!)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- ChangeLog	31 Jan 2008 14:02:59 -0000	1.133
+++ ChangeLog	31 Jan 2008 14:28:56 -0000	1.134
@@ -1,6 +1,7 @@
 2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/kolabsrv.in: added getServiceName method to map distribution
 	  specific rc script names.
+	* dist_conf/suse: updated logfile locations
 
 2008-01-28 Richard Bos <richard at radoeka.nl>
 	* kolabquotawarn.in: the quotawarn.db can not be opened on an



From cvs at kolab.org  Thu Jan 31 15:28:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 Jan 2008 15:28:58 +0100 (CET)
Subject: marcus: server/kolabd/kolabd/dist_conf kolabsrv.in, 1.10, 1.11 suse,
	1.65, 1.66 
Message-ID: <20080131142858.C7484600170@lists.intevation.de>

Author: marcus

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

Modified Files:
	kolabsrv.in suse 
Log Message:
- * dist_conf/suse: updated logfile locations
- fixed typo (thanks Richard!)

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolabsrv.in	31 Jan 2008 14:03:00 -0000	1.10
+++ kolabsrv.in	31 Jan 2008 14:28:56 -0000	1.11
@@ -34,7 +34,7 @@
 	sname=$1
 	if [ -e /etc/SuSE-release ]; then
 		case $sname in
-			openldap) SERVICE="@LDAP@" ;;
+			openldap) SERVICE="@LDAPD@" ;;
 			sasl) SERVICE="saslauthd" ;;
 			imapd) SERVICE="cyrus" ;;
 			amavisd) SERIVCE="amavis" ;;

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- suse	16 Dec 2007 20:43:25 -0000	1.65
+++ suse	31 Jan 2008 14:28:56 -0000	1.66
@@ -141,7 +141,7 @@
 sasl_authdconffile=${sysconfdir}/saslauthd.conf
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
-resmgr_logdir=${localstatedir}/log/kolab
+resmgr_logdir=${localstatedir}/log/kolab/filter
 resmgr_scriptsdir=${kolab_scriptsdir}/resmgr
 resmgr_confdir=${resmgr_scriptsdir}
 resmgr_conffile_usr=kolab
@@ -151,7 +151,7 @@
 resmgr_grp=root
 
 fbview_logfile=${localstatedir}/log/kolab/fbview.log
-freebusy_logdir=${localstatedir}/log/kolab
+freebusy_logdir=${localstatedir}/log/kolab/freebusy
 freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
 freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
 freebusy_usr=wwwrun



From cvs at kolab.org  Thu Jan 31 16:10:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 Jan 2008 16:10:34 +0100 (CET)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.134,1.135 
Message-ID: <20080131151034.2FD1C600170@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
- some other fixes (support for suse <= 10.1 is dropped now)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- ChangeLog	31 Jan 2008 14:28:56 -0000	1.134
+++ ChangeLog	31 Jan 2008 15:10:32 -0000	1.135
@@ -1,7 +1,8 @@
 2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/kolabsrv.in: added getServiceName method to map distribution
 	  specific rc script names.
-	* dist_conf/suse: updated logfile locations
+	* dist_conf/suse: updated logfile locations + other fixes (now support for
+	  suse <= 10.1 is completely dropped)
 
 2008-01-28 Richard Bos <richard at radoeka.nl>
 	* kolabquotawarn.in: the quotawarn.db can not be opened on an



From cvs at kolab.org  Thu Jan 31 16:10:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 31 Jan 2008 16:10:34 +0100 (CET)
Subject: marcus: server/kolabd/kolabd/dist_conf suse,1.66,1.67 
Message-ID: <20080131151034.31185600D4C@lists.intevation.de>

Author: marcus

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

Modified Files:
	suse 
Log Message:
- some other fixes (support for suse <= 10.1 is dropped now)

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- suse	31 Jan 2008 14:28:56 -0000	1.66
+++ suse	31 Jan 2008 15:10:32 -0000	1.67
@@ -11,7 +11,7 @@
 BASHELL=/bin/bash
 KOLABRC=${sbindir}/kolabsrv
 PERL=${bindir}/perl
-PHP=${bindir}/php
+PHP=${bindir}/php5
 RPM=/bin/rpm
 TAR=/bin/tar
 
@@ -23,7 +23,7 @@
 kolabconf_script=${sbindir}/kolabconf
 
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${libdir}/perl5/vendor_perl/5.8.7
+perllib=${libdir}/perl5/vendor_perl/5.8.8
 
 amavisd_conffile=${sysconfdir}/amavisd.conf
 amavisd_templatedir=${sysconfdir}/amavisd/templates.d
@@ -132,9 +132,9 @@
 webserver_grp=www
 webserver_rpm=apache2
 
-phpini_dir=${sysconfdir}
-phplibdir=${datadir}/php
-phplibdir2=${datadir}/php
+phpini_dir=${sysconfdir}/php5/cli
+phplibdir=${datadir}/php5
+phplibdir2=${datadir}/php5
 phppeardir=${phplibdir}/PEAR
 
 sasl_smtpconffile=${sysconfdir}/sasl2/smtpd.conf
@@ -142,11 +142,11 @@
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logdir=${localstatedir}/log/kolab/filter
-resmgr_scriptsdir=${kolab_scriptsdir}/resmgr
+resmgr_scriptsdir=${localstatedir}/lib/kolab/kolab-filter
 resmgr_confdir=${resmgr_scriptsdir}
 resmgr_conffile_usr=kolab
 resmgr_conffile_grp=root
-resmgr_filterdir=${localstatedir}/lib/kolab/kolab-filter
+resmgr_filterdir=${localstatedir}/lib/kolab/kolab-filter/tmp
 resmgr_usr=root
 resmgr_grp=root
 
@@ -157,8 +157,8 @@
 freebusy_usr=wwwrun
 freebusy_grp=root
 
-graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
-graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+graveyard_uidcache=${localstatedir}/lib/kolab/graveyard_uidcache.db
+graveyard_tscache=${localstatedir}/lib/kolab/graveyard_tscache.db
 
 backupdir=${localstatedir}/adm/backup/kolab
 
@@ -175,7 +175,7 @@
 	/etc/freshclam.conf \
 	/etc/openldap/ldap.conf \
 	/etc/openldap/slapd.conf \
-	/etc/php.ini \
+	/etc/php5/cli/php.ini \
 	/etc/postfix/main.cf \
 	/etc/postfix/master.cf \
 	/etc/postfix/transport \



From cvs at kolab.org  Fri Feb  1 16:15:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 16:15:05 +0100 (CET)
Subject: wilde: server README.1st,1.69,1.70 
Message-ID: <20080201151505.9583860016C@lists.intevation.de>

Author: wilde

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

Modified Files:
	README.1st 
Log Message:
Added preliminary upgrade instructions for upgrading from 2.1.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- README.1st	3 Dec 2007 17:22:41 -0000	1.69
+++ README.1st	1 Feb 2008 15:15:03 -0000	1.70
@@ -147,13 +147,95 @@
 Upgrade from Kolab server 2.1 or before
 ---------------------------------------
 
-Instructions for upgrading from Kolab server 2.0 or 2.1 will be added in
-a future version of this document. Additional hints may be available in
-the Kolab wiki: http://wiki.kolab.org/index.php/Kolab2_Upgrading
+Instructions for upgrading from Kolab server 2.0 will be added in a
+future version of this document.  This instructions are on upgrading
+from Kolab 2.1.0.
 
-Direct upgrade from Kolab1 is not supported. We suggest that you back up
-your IMAP store, install Kolab2 and manually recreate user accounts and
-then restore the IMAP data from the backup.
+1.  Before upgrading the Kolab server must be stoped:
+
+    # /kolab/bin/openpkg rc all stop
+
+2.  Save the current ldap:
+
+    # /kolab/sbin/slapcat > ~/kolab-2.1.ldif
+
+3.  Some of the old Kolab packages must be removed to avoid conflicts
+    during the upgrade process:
+
+    # /kolab/bin/openpkg rpm -e --nodeps kolabd-2.1.0-20070510 \
+                                         kolab-webadmin-2.1.0-20070510 \
+                                         kolab-horde-fbview-2.1.0-20070420 \
+                                         kolab-horde-framework-2.1.0-20070420 \
+                                         kolab-resource-handlers-2.1.0-20070510 \
+                                         getopt-20051005-2.5.0 \
+                                         patch-2.5.9-2.5.0 \
+                                         proftpd-1.3.0rc2-2.5.0 \
+                                         sharutils-4.5.1-2.5.0
+
+4.  A new openpkg version is needed for the upgrade, so we have to
+    install it manually beforehand.
+
+    As root, cd into the directory of kolab server 2.2 binary packages and run: 
+
+    # /kolab/bin/openpkg rpm -Uvh \
+        ./openpkg-20071227-20071227.ix86-debian3.1-kolab.rpm
+    # /kolab/bin/openpkg rpm -Uvh \
+        ./openpkg-tools-1.4.6-20071231.ix86-debian3.1-kolab.rpm
+
+    If you don't have binary packages for you platform, you have to build from source.
+    As root, cd into the kolab server 2.2 source directory and run:
+
+    # /kolab/bin/openpkg rpm --rebuild ./openpkg-20071227-20071227.src.rpm 
+    # /kolab/bin/openpkg rpm -Uvh \
+        /kolab/RPM/PKG/openpkg-20071227-20071227.<ARCH>-<OS>-kolab.rpm
+    # /kolab/bin/openpkg rpm --rebuild ./openpkg-tools-1.4.6-20071231.src.rpm 
+    # /kolab/bin/openpkg rpm -Uvh \
+        /kolab/RPM/PKG/openpkg-tools-1.4.6-20071231.<ARCH>-<OS>-kolab.rpm
+
+    (<ARCH> and <OS> must be replaced by the correct values for your system).
+
+5.  Start the standard upgrade (as described above):
+
+    # ./install-kolab.sh -H -F 2>&1 | tee kolab-update.log
+
+6.  Before starting the ldap server the database must be restored from
+    the ldif:
+
+    # rm /kolab/var/openldap/openldap-data/*
+    # /kolab/sbin/slapadd -l ~/kolab-2.1.ldif
+
+7.  The format of certain databases changed, but as they only hold
+    caches or temporary data they can be simply truncated to zero
+    length:
+
+    # > /kolab/var/imapd/tls_sessions.db
+    [FIX ME: what else?]
+
+8.  Remove all *.conf.rpmsave files in the subdirectories of
+    /kolab/etc/ as described above.
+
+    Check /kolab/etc/kolab/kolab.conf and merge content of
+    kolab.conf.rpmsave manually!
+
+9.  Start the OpenLDAP, generate the configuration files and start the
+    Kolab server:
+
+    # /kolab/bin/openpkg rc openldap start
+    # /kolab/sbin/kolabconf
+    # /kolab/bin/openpkg rc all start
+
+10. After the success full upgrade some cleanup can be done, by
+    removing obsolete files/directories:
+   
+    # rm -r /kolab/etc/resmgr
+    # rm -r /kolab/etc/proftpd
+
+Additional hints may be available in the Kolab wiki:
+http://wiki.kolab.org/index.php/Kolab2_Upgrading
+
+Direct upgrade from Kolab1 is not supported. We suggest that you back
+up your IMAP store, install Kolab2 and manually recreate user accounts
+and then restore the IMAP data from the backup.
 
 
 Known problems and workarounds



From cvs at kolab.org  Fri Feb  1 16:33:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 16:33:51 +0100 (CET)
Subject: thomas: server release-notes.txt,1.199,1.200 
Message-ID: <20080201153351.D9F4360016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes for latest CVS changes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- release-notes.txt	22 Jan 2008 18:36:20 -0000	1.199
+++ release-notes.txt	1 Feb 2008 15:33:49 -0000	1.200
@@ -57,11 +57,20 @@
 
 	deluser: add missing @ to bindir variable
 
+	Updates for SUSE (support for <= 10.1 is completely dropped)
+
 	kolab/issue26   (Allow to bind to specific IPs)
 
+    - kolab-filter-2.2.rc1-2008????
+
+	kolab/issue2425 (Undefined variable: reject_forged_from_header
+	                 reported in fatal.log)
+
     - kolab-webadmin-2.1.99-20071203
 
 	Fixed some variable initialisations.
+
+	Correction in the Dutch translation.
 
 
 Changes between 2.2-beta-2 and 2.2-beta-3:



From cvs at kolab.org  Fri Feb  1 19:07:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 19:07:14 +0100 (CET)
Subject: thomas: server/patches/cyrus-imapd/cyrus-imapd-2.3.11
	timsieved-starttls-sendcaps.patch, NONE, 1.1 
Message-ID: <20080201180714.00184600D4D@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.11
In directory doto:/tmp/cvs-serv24201

Added Files:
	timsieved-starttls-sendcaps.patch 
Log Message:
This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45

It should be reverse-applied with patch -p2 -R to work around the kontact
behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
capabilities after starttls) and can be dropped as soon as kontact has a way
to work with old and new cyrus imapd servers.


--- NEW FILE: timsieved-starttls-sendcaps.patch ---
This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45

It should be reverse-applied with patch -p2 -R to work around the kontact
behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
capabilities after starttls) and can be dropped as soon as kontact has a way
to work with old and new cyrus imapd servers.

--- src/cyrus/timsieved/parser.c	2007/11/26 20:23:06	1.44
+++ src/cyrus/timsieved/parser.c	2007/12/10 14:47:08	1.45
@@ -1,7 +1,7 @@
 /* parser.c -- parser used by timsieved
  * Tim Martin
  * 9/21/99
- * $Id: timsieved-starttls-sendcaps.patch,v 1.1 2008/02/01 18:07:11 thomas Exp $
+ * $Id: timsieved-starttls-sendcaps.patch,v 1.1 2008/02/01 18:07:11 thomas Exp $
  */
 /*
  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
 
     starttls_done = 1;
 
-    return result;
+    return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated);
 }
 #else
 static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)



From cvs at kolab.org  Fri Feb  1 19:20:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 19:20:00 +0100 (CET)
Subject: thomas: server install-kolab.sh,1.18,1.19 
Message-ID: <20080201182000.C7EB3600D43@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
Add "-D imapd::with_kolab_nocaps" as a workaround for kolab/issue2443
(kontact aborts sieve when imapd sends capabilities after starttls)


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- install-kolab.sh	12 Dec 2007 14:24:31 -0000	1.18
+++ install-kolab.sh	1 Feb 2008 18:19:58 -0000	1.19
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (C) 2007 by Intevation GmbH
+# Copyright (C) 2007, 2008 by Intevation GmbH
 # Copyright (C) 2007 by Gunnar Wrobel
 #
 # Authors:
@@ -21,7 +21,7 @@
 INSTALL=""
 
 PACKAGES="openpkg-tools openldap postfix kolabd kolab-filter kolab-freebusy kolab-webadmin"
-DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap"
+DEFINE="-D openldap::with_pth=no -D sasl::with_ldap -D sasl::with_login -D postfix::with_sasl -D postfix::with_ssl -D postfix::with_ldap -D imapd::with_kolab_nocaps"
 
 #Flags
 FLAG_BASE=""



From cvs at kolab.org  Fri Feb  1 19:26:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 19:26:14 +0100 (CET)
Subject: thomas: server/patches/cyrus-imapd/cyrus-imapd-2.3.11
	timsieved-starttls-sendcaps.patch, 1.1, 1.2 
Message-ID: <20080201182614.A544E600D43@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.11
In directory doto:/tmp/cvs-serv24681

Modified Files:
	timsieved-starttls-sendcaps.patch 
Log Message:
Removed CVS keywords.
After checking in this patch our CVS modifies them, so the patch does not apply cleanly.


Index: timsieved-starttls-sendcaps.patch
===================================================================
RCS file: /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/timsieved-starttls-sendcaps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- timsieved-starttls-sendcaps.patch	1 Feb 2008 18:07:11 -0000	1.1
+++ timsieved-starttls-sendcaps.patch	1 Feb 2008 18:26:12 -0000	1.2
@@ -1,4 +1,5 @@
 This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
+(minus the CVS keywords)
 
 It should be reverse-applied with patch -p2 -R to work around the kontact
 behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
@@ -7,15 +8,6 @@
 
 --- src/cyrus/timsieved/parser.c	2007/11/26 20:23:06	1.44
 +++ src/cyrus/timsieved/parser.c	2007/12/10 14:47:08	1.45
-@@ -1,7 +1,7 @@
- /* parser.c -- parser used by timsieved
-  * Tim Martin
-  * 9/21/99
-- * $Id$
-+ * $Id$
-  */
- /*
-  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
 @@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
  
      starttls_done = 1;



From cvs at kolab.org  Fri Feb  1 20:12:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:12:28 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.135,1.136 
Message-ID: <20080201191228.AECBE600D4A@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
changed the reference to the script itself to an autotools variable (@KOLABRC@)



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- ChangeLog	31 Jan 2008 15:10:32 -0000	1.135
+++ ChangeLog	1 Feb 2008 19:12:26 -0000	1.136
@@ -1,3 +1,7 @@
+2008-02-01 Richard Bos <richard at radoeka.nl>
+	* dist_conf/kolabsrv.in: changed the reference to the script itself
+	  to an autotools variable (@KOLABRC@).
+
 2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/kolabsrv.in: added getServiceName method to map distribution
 	  specific rc script names.



From cvs at kolab.org  Fri Feb  1 20:12:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:12:28 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.11,1.12 
Message-ID: <20080201191228.AEC03600D49@lists.intevation.de>

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
changed the reference to the script itself to an autotools variable (@KOLABRC@)



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabsrv.in	31 Jan 2008 14:28:56 -0000	1.11
+++ kolabsrv.in	1 Feb 2008 19:12:26 -0000	1.12
@@ -22,7 +22,7 @@
 	retc=$?
 	if [ $retc -ne 0 ] && [ $retc -ne 3 ]; then
 		( echo "ERROR: $RCDIR/$SERVICE $PARAM failed"
-		  echo "Run: /usr/sbin/kolab rc all stop"
+		  echo "Run: @KOLABRC@ rc all stop"
 		  echo "to stop all services"
 		) >&2
 		exit 1



From cvs at kolab.org  Fri Feb  1 20:59:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:59:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.69,1.70 
Message-ID: <20080201195934.D00D9600D43@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
corrected sentence from:
 "Reject the message with the except if" to
 "Reject the message, except if"



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- ChangeLog	22 Jan 2008 18:36:20 -0000	1.69
+++ ChangeLog	1 Feb 2008 19:59:32 -0000	1.70
@@ -1,3 +1,13 @@
+2008-02-01 Richard Bos <richard at radoeka.nl>
+
+	* templates/service.tpl: corrected sentence from:
+	"Reject the message with the except if" to
+	"Reject the message, except if"
+	* locale/de/LC_MESSAGES/messages.po, locale/es/LC_MESSAGES/messages.po,
+	locale/fr/LC_MESSAGES/messages.po, locale/it/LC_MESSAGES/messages.po,
+	locale/nl/LC_MESSAGES/messages.po: reflect the change
+	in templates/service.tpl
+
 2008-01-22  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* www/admin/addressbook/index.php.in,



From cvs at kolab.org  Fri Feb  1 20:59:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:59:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.15, 1.16 
Message-ID: <20080201195934.D38CB600D4B@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
corrected sentence from:
 "Reject the message with the except if" to
 "Reject the message, except if"



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- messages.po	3 Dec 2007 17:16:34 -0000	1.15
+++ messages.po	1 Feb 2008 19:59:32 -0000	1.16
@@ -891,7 +891,7 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"Reject the message, except if it originates from the outside but has "
 "a From header that matches the Kolab server's domain. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""



From cvs at kolab.org  Fri Feb  1 20:59:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:59:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.30, 1.31 
Message-ID: <20080201195934.F3314600D43@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
corrected sentence from:
 "Reject the message with the except if" to
 "Reject the message, except if"



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- messages.po	29 Jan 2008 20:45:09 -0000	1.30
+++ messages.po	1 Feb 2008 19:59:32 -0000	1.31
@@ -881,7 +881,7 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"Reject the message, except if it originates from the outside but has "
 "a From header that matches the Kolab server's domain. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""



From cvs at kolab.org  Fri Feb  1 20:59:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:59:35 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	service.tpl, 1.16, 1.17 
Message-ID: <20080201195935.0156A600D4A@lists.intevation.de>

Author: richard

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

Modified Files:
	service.tpl 
Log Message:
corrected sentence from:
 "Reject the message with the except if" to
 "Reject the message, except if"



Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- service.tpl	3 Dec 2007 17:10:30 -0000	1.16
+++ service.tpl	1 Feb 2008 19:59:32 -0000	1.17
@@ -134,7 +134,7 @@
 <br />
 <h4>{tr msg="Action to take for messages that fail the check:"}</h4>
 <input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked{/if} />
-{tr msg="Reject the message with the except if it originates from the outside but has a From header that matches the Kolab server's domain. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
+{tr msg="Reject the message, except if it originates from the outside but has a From header that matches the Kolab server's domain. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
 <input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked{/if} />
 {tr msg="Always reject the message."}
 {tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}



From cvs at kolab.org  Fri Feb  1 20:59:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:59:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.34, 1.35 
Message-ID: <20080201195934.D1FAD600D4A@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
corrected sentence from:
 "Reject the message with the except if" to
 "Reject the message, except if"



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- messages.po	3 Dec 2007 17:16:34 -0000	1.34
+++ messages.po	1 Feb 2008 19:59:32 -0000	1.35
@@ -895,7 +895,7 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"Reject the message, except if it originates from the outside but has "
 "a From header that matches the Kolab server's domain. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""



From cvs at kolab.org  Fri Feb  1 20:59:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:59:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.17, 1.18 
Message-ID: <20080201195934.E0525600D4D@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
corrected sentence from:
 "Reject the message with the except if" to
 "Reject the message, except if"



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- messages.po	3 Dec 2007 17:16:34 -0000	1.17
+++ messages.po	1 Feb 2008 19:59:32 -0000	1.18
@@ -890,7 +890,7 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"Reject the message, except if it originates from the outside but has "
 "a From header that matches the Kolab server's domain. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""



From cvs at kolab.org  Fri Feb  1 20:59:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  1 Feb 2008 20:59:34 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.20, 1.21 
Message-ID: <20080201195934.D7982600D4C@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
corrected sentence from:
 "Reject the message with the except if" to
 "Reject the message, except if"



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- messages.po	3 Dec 2007 17:16:34 -0000	1.20
+++ messages.po	1 Feb 2008 19:59:32 -0000	1.21
@@ -888,7 +888,7 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message with the except if it originates from the outside but has "
+"Reject the message, except if it originates from the outside but has "
 "a From header that matches the Kolab server's domain. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""



From cvs at kolab.org  Sat Feb  2 12:47:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 12:47:17 +0100 (CET)
Subject: thomas: server README.1st,1.70,1.71 release-notes.txt,1.200,1.201 
Message-ID: <20080202114717.2485960016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st release-notes.txt 
Log Message:
Talk about kolab/issue2440 and kolab/issue2443


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- README.1st	1 Feb 2008 15:15:03 -0000	1.70
+++ README.1st	2 Feb 2008 11:47:14 -0000	1.71
@@ -58,6 +58,10 @@
 
 If you do not want to install the free/busy view tool, remove the "-F".
 
+The binary packages distributed via kolab.org are compiled with -H -F,
+currently you need to compile from the source packages to install without
+these features, see kolab/issue2440 for details.
+
 By default, the Kolab server will now be started at boottime, so you
 have to bootstrap the server configuration now to prevent unconfigured
 components from being started.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- release-notes.txt	1 Feb 2008 15:33:49 -0000	1.200
+++ release-notes.txt	2 Feb 2008 11:47:14 -0000	1.201
@@ -47,7 +47,9 @@
 Changes between 2.2-beta-3 and 2.2-rc-1
 
     All packages except for openldap and db were upgraded to OpenPKG-CURRENT
-    (as of 20080118).
+    (as of 20080118). The new imapd package was modified to behave like in
+    previous server releases, i.e. to not send capabilities after STARTTLS,
+    see kolab/issue2443 for details.
 
     - kolabconf-2.2.rc1-2008????
 



From cvs at kolab.org  Sat Feb  2 12:50:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 12:50:38 +0100 (CET)
Subject: thomas: server release-notes.txt,1.201,1.202 
Message-ID: <20080202115038.7B1A5600D73@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- release-notes.txt	2 Feb 2008 11:47:14 -0000	1.201
+++ release-notes.txt	2 Feb 2008 11:50:36 -0000	1.202
@@ -68,11 +68,14 @@
 	kolab/issue2425 (Undefined variable: reject_forged_from_header
 	                 reported in fatal.log)
 
-    - kolab-webadmin-2.1.99-20071203
+    - kolab-webadmin-2.1.99-2008????
 
 	Fixed some variable initialisations.
 
 	Correction in the Dutch translation.
+
+	kolab/issue2439 (Explanation in the section Mail Filter Settings on
+	                 the services tab not clear)
 
 
 Changes between 2.2-beta-2 and 2.2-beta-3:



From cvs at kolab.org  Sat Feb  2 14:11:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 14:11:02 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.70,1.71 
Message-ID: <20080202131102.948A260016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- ChangeLog	1 Feb 2008 19:59:32 -0000	1.70
+++ ChangeLog	2 Feb 2008 13:11:00 -0000	1.71
@@ -1,3 +1,13 @@
+2008-02-02 Richard Bos <richard at radoeka.nl>
+
+	* templates/service.tpl: rephrased the sentence from:
+	"Reject the message ........"
+	* locale/de/LC_MESSAGES/messages.po, locale/es/LC_MESSAGES/messages.po,
+	locale/fr/LC_MESSAGES/messages.po, locale/it/LC_MESSAGES/messages.po,
+	locale/nl/LC_MESSAGES/messages.po: reflect the change
+	in templates/service.tpl see issue:
+	https://intevation.de/roundup/kolab/issue2439
+
 2008-02-01 Richard Bos <richard at radoeka.nl>
 
 	* templates/service.tpl: corrected sentence from:



From cvs at kolab.org  Sat Feb  2 14:11:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 14:11:02 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.16, 1.17 
Message-ID: <20080202131102.9A3C9600D79@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- messages.po	1 Feb 2008 19:59:32 -0000	1.16
+++ messages.po	2 Feb 2008 13:11:00 -0000	1.17
@@ -891,8 +891,8 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""
 "Rechazar el mensaje salvo que esté originado en exterior pero tenga una "



From cvs at kolab.org  Sat Feb  2 14:11:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 14:11:02 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	service.tpl, 1.17, 1.18 
Message-ID: <20080202131102.AC9CC600D7E@lists.intevation.de>

Author: richard

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

Modified Files:
	service.tpl 
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439



Index: service.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/service.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- service.tpl	1 Feb 2008 19:59:32 -0000	1.17
+++ service.tpl	2 Feb 2008 13:11:00 -0000	1.18
@@ -134,7 +134,7 @@
 <br />
 <h4>{tr msg="Action to take for messages that fail the check:"}</h4>
 <input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked{/if} />
-{tr msg="Reject the message, except if it originates from the outside but has a From header that matches the Kolab server's domain. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
+{tr msg="Reject the message, except if it originates from the outside and the From header matches one of Kolab server's domains. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
 <input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked{/if} />
 {tr msg="Always reject the message."}
 {tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}



From cvs at kolab.org  Sat Feb  2 14:11:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 14:11:02 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.21, 1.22 
Message-ID: <20080202131102.A0160600D7A@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- messages.po	1 Feb 2008 19:59:32 -0000	1.21
+++ messages.po	2 Feb 2008 13:11:00 -0000	1.22
@@ -888,8 +888,8 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""
 "Refuse le message sauf s'il vient de l'extérieur et possède une adresse "



From cvs at kolab.org  Sat Feb  2 14:11:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 14:11:02 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.35, 1.36 
Message-ID: <20080202131102.95F68600D76@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- messages.po	1 Feb 2008 19:59:32 -0000	1.35
+++ messages.po	2 Feb 2008 13:11:00 -0000	1.36
@@ -895,8 +895,8 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""
 "Nachricht zurückweisen, sofern sie nicht von außen kommt, aber eine From-"



From cvs at kolab.org  Sat Feb  2 14:11:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 14:11:02 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.31, 1.32 
Message-ID: <20080202131102.A9FE6600D7D@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- messages.po	1 Feb 2008 19:59:32 -0000	1.31
+++ messages.po	2 Feb 2008 13:11:00 -0000	1.32
@@ -877,14 +877,17 @@
 
 #: tpl_messages.php:181
 msgid "Action to take for messages that fail the check:"
-msgstr ""
+msgstr "Welke actie uitvoeren voor berichten die de test falen"
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
-msgstr ""
+msgstr
+"Weiger het bericht, behalve als deze van buiten komt en "
+"een From header heeft overeenkomstig met 1 van de Kolab server domeinen.  In dit geval "
+"wordt de From header herschreven, zodat de ontvanger het mogelijke misbruik kan zien"
 
 #: tpl_messages.php:183
 msgid "Always reject the message."



From cvs at kolab.org  Sat Feb  2 14:11:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  2 Feb 2008 14:11:02 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.18, 1.19 
Message-ID: <20080202131102.A6530600D7B@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
rephrased the sentence from: "Reject the message ........"
As proposed by Thomas, see issue:
https://intevation.de/roundup/kolab/issue2439



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- messages.po	1 Feb 2008 19:59:32 -0000	1.18
+++ messages.po	2 Feb 2008 13:11:00 -0000	1.19
@@ -890,8 +890,8 @@
 
 #: tpl_messages.php:182
 msgid ""
-"Reject the message, except if it originates from the outside but has "
-"a From header that matches the Kolab server's domain. In that case rewrite "
+"Reject the message, except if it originates from the outside "
+"and the From header matches one of Kolab server's domains. In that case rewrite "
 "the From header so the recipient can see the potential forgery."
 msgstr ""
 "Rifiuta il messaggio tranne quando è stato originato all'esterno ma ha "



From cvs at kolab.org  Mon Feb  4 12:24:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 12:24:43 +0100 (CET)
Subject: emanuel: doc/www/src index.html.m4,1.134,1.135 
Message-ID: <20080204112443.84D04600D77@lists.intevation.de>

Author: emanuel

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

Modified Files:
	index.html.m4 
Log Message:
add news (new documentation material)


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- index.html.m4	9 Jan 2008 17:10:19 -0000	1.134
+++ index.html.m4	4 Feb 2008 11:24:41 -0000	1.135
@@ -45,6 +45,21 @@
 -->
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
+<table>
+<tr><td class="newsd">January 30th, 2008</td>
+<td class="newsh">&raquo;
+  New Kolab documentation material - german only
+</td></tr>
+</table>
+<div class="newsb">
+  The new "Operating manual for Kolab Server 2.2" and example slides for Kolab presentations
+  can be downloaded from the <a href="http://www.kolab.org/documentation.html">
+  documentation page</a>.
+  <br>
+  See the <a href="http://www.kolab.org/pipermail/kolab-announce/2008/000062.html">
+  announcement</a>  for details.
+</div>
+<p>
 
 <table>
 <tr><td class="newsd">January 9th, 2008</td>
@@ -58,14 +73,12 @@
 </div>
 <p>
 
-
 <table>
 <tr><td class="newsd">December 9th, 2007</td>
 <td class="newsh">&raquo;
   Kolab Server 2.2 Beta 3 (with Horde web client) released
 </td></tr>
 </table>
-<p>
 <div class="newsb">
   Source and binary packages for Kolab Server 2.2 Beta 3 are available for
   download.
@@ -81,7 +94,10 @@
   announcement</a> for details.
 </div>
 <p>
+</div> <!-- END LATEST BLOCK -->
+<p>
 
+<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 <table>
 <tr><td class="newsd">October 18th, 2007</td>
@@ -89,7 +105,6 @@
   Kolab KDE Client released, revision 'proko2.1.11'
 </td></tr>
 </table>
-<p>
 <div class="newsb">
   This release contains some bug fixes.
 A tarball and release notes with a list of the changes can be found in the 
@@ -100,10 +115,7 @@
 <p>
 
 
-</div> <!-- END LATEST BLOCK -->
-<p>
 
-<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 
 <table>
@@ -112,7 +124,6 @@
   Kolab KDE Client released, revision 'proko2.1.10'
 </td></tr>
 </table>
-<p>
 <div class="newsb">
   This release contains several bugfixes and some minor features.<br>
   See the
@@ -184,7 +195,6 @@
   Kolab Server 2.1.0 Final released
 </td></tr>
 </table>
-<p>
 <div class="newsb">
   Source and binary packages for Kolab Server 2.1.0 can be downloaded from
   <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/server/release/kolab-server-2.1.0/">erfrakon</a>,
@@ -204,7 +214,6 @@
   Kolab KDE Client released, revision 'proko2.1.7'
 </td></tr>
 </table>
-<p>
 <div class="newsb">
   This release contains several bugfixes and some minor features.<br>
   See the
@@ -220,7 +229,6 @@
   Kolab Server 2.1 Release Candidate 2 released
 </td></tr>
 </table>
-<p>
 <div class="newsb">
   This release fixes more than 20 problems found in RC 1 and contains updated translations.
   Some security issues were fixed in clamav, spamassassin and file.
@@ -237,7 +245,6 @@
   KDAB sponsors Horde Development
 </td></tr>
 </table>
-<p>
 <div class="newsb">
 In an effort to further increase the quality and usefulness of the Kolab 
 Groupware Solution, jointly developed by <strong>KDAB</strong> with its partners in the <strong>Kolab 
@@ -255,9 +262,7 @@
   CeBIT 2007 - Kolab based events
 </td></tr>
 </table>
-<p>
 <div class="newsb">
-
 <ul>
 <li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
 <a href="http://www.intevation.de/news.en.html#20070308-meet-intevation">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
@@ -277,7 +282,6 @@
   New KDE Kolab Client released, revision 'proko2.1.6'.
 </td></tr>
 </table>
-<p>
 <div class="newsb">
   This release contains several fixes and a few new features.
   See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html">announcement</a> for details.



From cvs at kolab.org  Mon Feb  4 14:44:35 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 14:44:35 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	page.tpl.in, 1.6, 1.7 
Message-ID: <20080204134435.EE38D600D4F@lists.intevation.de>

Author: thomas

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

Modified Files:
	page.tpl.in 
Log Message:
templates/page.tpl.in: Add <link> for favicon.ico (patch from Richard Bos)


Index: page.tpl.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/page.tpl.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- page.tpl.in	7 Aug 2007 12:18:50 -0000	1.6
+++ page.tpl.in	4 Feb 2008 13:44:33 -0000	1.7
@@ -9,6 +9,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <title>{$page_title}</title>
+<link href="@webserver_web_prefix@/favicon.ico" rel="SHORTCUT ICON" />
 <meta name="robots" content="noindex" />	
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <meta http-equiv="Content-Language" content="{$currentlang}" /> 



From cvs at kolab.org  Mon Feb  4 14:44:36 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 14:44:36 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.71,1.72 
Message-ID: <20080204134436.EF95E600D51@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
templates/page.tpl.in: Add <link> for favicon.ico (patch from Richard Bos)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- ChangeLog	2 Feb 2008 13:11:00 -0000	1.71
+++ ChangeLog	4 Feb 2008 13:44:33 -0000	1.72
@@ -1,3 +1,7 @@
+2008-02-04  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* php/admin/templates/page.tpl.in: Add <link> for favicon.ico.
+
 2008-02-02 Richard Bos <richard at radoeka.nl>
 
 	* templates/service.tpl: rephrased the sentence from:



From cvs at kolab.org  Mon Feb  4 15:01:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:01:19 +0100 (CET)
Subject: thomas: server release-notes.txt,1.202,1.203 
Message-ID: <20080204140119.76CFB600D4F@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- release-notes.txt	2 Feb 2008 11:50:36 -0000	1.202
+++ release-notes.txt	4 Feb 2008 14:01:17 -0000	1.203
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 2008????, Kolab Server 2.2-rc1
+(Version 20080204, Kolab Server 2.2-rc1
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -51,11 +51,11 @@
     previous server releases, i.e. to not send capabilities after STARTTLS,
     see kolab/issue2443 for details.
 
-    - kolabconf-2.2.rc1-2008????
+    - kolabconf-2.2.rc1-20080204
 
 	Added missing newlines in kolabconf -h
 
-    - kolabd-2.1.99-2008????
+    - kolabd-2.1.99-20080204
 
 	deluser: add missing @ to bindir variable
 
@@ -63,19 +63,61 @@
 
 	kolab/issue26   (Allow to bind to specific IPs)
 
-    - kolab-filter-2.2.rc1-2008????
+    - kolab-filter-2.2.rc1-20080204
 
 	kolab/issue2425 (Undefined variable: reject_forged_from_header
 	                 reported in fatal.log)
 
-    - kolab-webadmin-2.1.99-2008????
+    - kolab-webadmin-2.1.99-20080204
 
 	Fixed some variable initialisations.
 
 	Correction in the Dutch translation.
 
+	Link to favicon.ico so it is still used when running the web interface
+	with a different path prefix.
+
 	kolab/issue2439 (Explanation in the section Mail Filter Settings on
 	                 the services tab not clear)
+
+
+    Packages in the OpenPKG based Kolab server release:
+
+    - Kolab packages:
+
+      Removed:
+
+	???
+
+      Added:
+
+	???
+
+      Updated:
+
+	???
+
+      Unchanged:
+
+	???
+
+    - OpenPKG packages:
+
+      Removed:
+
+	???
+
+      Added:
+
+	???
+
+      Updated:
+
+	???
+
+      Unchanged:
+
+	???
 
 
 Changes between 2.2-beta-2 and 2.2-beta-3:



From cvs at kolab.org  Mon Feb  4 15:22:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:22:46 +0100 (CET)
Subject: thomas: utils/admin hash-imap-spool,1.3,1.4 
Message-ID: <20080204142246.6E3AB600170@lists.intevation.de>

Author: thomas

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

Modified Files:
	hash-imap-spool 
Log Message:
hash-imap-spool: Print final error message only if the error really occurred.


Index: hash-imap-spool
===================================================================
RCS file: /kolabrepository/utils/admin/hash-imap-spool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hash-imap-spool	23 Jan 2008 16:43:33 -0000	1.3
+++ hash-imap-spool	4 Feb 2008 14:22:44 -0000	1.4
@@ -145,8 +145,9 @@
 
     paths = read_conffile(conffile)
 
-    for path in paths:
-        hash_spool_dir(path)
+    if paths:
+        for path in paths:
+            hash_spool_dir(path)
     else:
         print "Could not find any spool directories in `%s'." % conffile
         sys.exit(23)



From cvs at kolab.org  Mon Feb  4 15:24:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:24:29 +0100 (CET)
Subject: thomas: server install-kolab.sh,1.19,1.20 
Message-ID: <20080204142429.1C299600170@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
Bumped version numbers to 2.2-rc1


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- install-kolab.sh	1 Feb 2008 18:19:58 -0000	1.19
+++ install-kolab.sh	4 Feb 2008 14:24:27 -0000	1.20
@@ -11,7 +11,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2-beta3+cvs"
+KOLAB_VERSION="2.2-rc1"
 KID="19414"
 
 TAG="kolab"



From cvs at kolab.org  Mon Feb  4 15:24:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:24:29 +0100 (CET)
Subject: thomas: server/kolab-filter Makefile,1.9,1.10 
Message-ID: <20080204142429.26AB9600D43@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv1914/kolab-filter

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc1


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	12 Dec 2007 14:24:31 -0000	1.9
+++ Makefile	4 Feb 2008 14:24:27 -0000	1.10
@@ -1,8 +1,8 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
 RELEASE = $(shell date '+%Y%m%d')
 
-VERSION = 2.2.beta3
-CVS = 1
+VERSION = 2.2.rc1
+CVS = 0
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Mon Feb  4 15:24:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:24:29 +0100 (CET)
Subject: thomas: server/kolab-freebusy Makefile,1.10,1.11 
Message-ID: <20080204142429.2A61B600D4C@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv1914/kolab-freebusy

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc1


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	12 Dec 2007 14:24:31 -0000	1.10
+++ Makefile	4 Feb 2008 14:24:27 -0000	1.11
@@ -1,8 +1,8 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
 RELEASE = $(shell date '+%Y%m%d')
 
-VERSION = 2.2.beta3
-CVS = 1
+VERSION = 2.2.rc1
+CVS = 0
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Mon Feb  4 15:24:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:24:29 +0100 (CET)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.12,1.13 
Message-ID: <20080204142429.3293A600D51@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Bumped version numbers to 2.2-rc1


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Kolab.pm	12 Dec 2007 14:24:31 -0000	1.12
+++ Kolab.pm	4 Feb 2008 14:24:27 -0000	1.13
@@ -59,10 +59,10 @@
 );
 
 # The Kolab version number for the perl-kolab package
-our $KOLAB_BASE_VERSION = "2.2.beta3";
+our $KOLAB_BASE_VERSION = "2.2.rc1";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 1;
+my $KOLAB_CVS = 0;
 
 our $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Mon Feb  4 15:24:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:24:29 +0100 (CET)
Subject: thomas: server/kolabconf Makefile.PL,1.17,1.18 
Message-ID: <20080204142429.2D89C600D4F@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile.PL 
Log Message:
Bumped version numbers to 2.2-rc1


Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.PL	2 Jan 2008 15:36:52 -0000	1.17
+++ Makefile.PL	4 Feb 2008 14:24:27 -0000	1.18
@@ -9,10 +9,10 @@
 my $KOLAB_VERSION;
 
 # The Kolab version number for the perl-kolab package
-my $KOLAB_BASE_VERSION = "2.2.beta3";
+my $KOLAB_BASE_VERSION = "2.2.rc1";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 1;
+my $KOLAB_CVS = 0;
 
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Mon Feb  4 15:24:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:24:29 +0100 (CET)
Subject: thomas: server/php-kolab Makefile,1.15,1.16 
Message-ID: <20080204142429.357B0600D66@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc1


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	12 Dec 2007 14:24:31 -0000	1.15
+++ Makefile	4 Feb 2008 14:24:27 -0000	1.16
@@ -3,9 +3,9 @@
 DATE = $(shell date '+%Y-%m-%d')
 
 VERSION = 2.2
-PRERELEASE = beta
-PRERELEASE_VERSION = 3
-CVS = 1
+PRERELEASE = rc
+PRERELEASE_VERSION = 1
+CVS = 0
 
 ifeq "x$(PRERELEASE)" "x"
   ifeq "x$(CVS)" "x0"



From cvs at kolab.org  Mon Feb  4 15:34:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 15:34:23 +0100 (CET)
Subject: thomas: server README.1st,1.71,1.72 
Message-ID: <20080204143423.1A08B600170@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Added "Nothing special" upgrade instructions from beta3 to rc1.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- README.1st	2 Feb 2008 11:47:14 -0000	1.71
+++ README.1st	4 Feb 2008 14:34:21 -0000	1.72
@@ -124,6 +124,12 @@
 # /kolab/bin/openpkg rc all start
 
 
+Upgrade from 2.2-beta3 to 2.2-rc1
+---------------------------------
+
+Nothing special has to be done for this upgrade.
+
+
 Upgrade from 2.2-beta2 to 2.2-beta3
 -----------------------------------
 



From cvs at kolab.org  Mon Feb  4 17:40:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 17:40:20 +0100 (CET)
Subject: thomas: server/perl-kolab/lib/Kolab LDAP.pm,1.2,1.3 
Message-ID: <20080204164020.0DF2E600151@lists.intevation.de>

Author: thomas

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

Modified Files:
	LDAP.pm 
Log Message:
perl-kolab/lib/Kolab/LDAP.pm: Fix synchronization of mailboxes with newer perl.
kolab/issue2411 (perl error in LDAP.pm)


Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- LDAP.pm	28 Nov 2007 12:45:32 -0000	1.2
+++ LDAP.pm	4 Feb 2008 16:40:18 -0000	1.3
@@ -540,7 +540,7 @@
     my %objects;
     my $mailbox;
     foreach $mailbox (@mailboxes) {
-        my $u = ${@{$mailbox}}[0];
+        my $u = @{$mailbox}[0];
         $u =~ /user[\/\.]([^\/]*)\/?.*/;
         $objects{$1} = 1 if ($1);
     }



From cvs at kolab.org  Mon Feb  4 17:40:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 17:40:20 +0100 (CET)
Subject: thomas: server/perl-kolab ChangeLog,1.26,1.27 
Message-ID: <20080204164020.10794600D4B@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
perl-kolab/lib/Kolab/LDAP.pm: Fix synchronization of mailboxes with newer perl.
kolab/issue2411 (perl error in LDAP.pm)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	28 Nov 2007 12:45:32 -0000	1.26
+++ ChangeLog	4 Feb 2008 16:40:18 -0000	1.27
@@ -1,3 +1,8 @@
+2008-02-04  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* lib/Kolab/LDAP.pm: Fix synchronization of mailboxes with newer perl.
+	kolab/issue2411 (perl error in LDAP.pm)
+
 2007-11-28  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP.pm (syncDomains, createObject):



From cvs at kolab.org  Mon Feb  4 17:40:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 17:40:20 +0100 (CET)
Subject: thomas: server release-notes.txt,1.203,1.204 
Message-ID: <20080204164020.0F007600169@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
perl-kolab/lib/Kolab/LDAP.pm: Fix synchronization of mailboxes with newer perl.
kolab/issue2411 (perl error in LDAP.pm)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- release-notes.txt	4 Feb 2008 14:01:17 -0000	1.203
+++ release-notes.txt	4 Feb 2008 16:40:17 -0000	1.204
@@ -80,6 +80,10 @@
 	kolab/issue2439 (Explanation in the section Mail Filter Settings on
 	                 the services tab not clear)
 
+    - perl-kolab-2.2.rc1-20080204
+
+	kolab/issue2411 (perl error in LDAP.pm)
+
 
     Packages in the OpenPKG based Kolab server release:
 



From cvs at kolab.org  Mon Feb  4 20:45:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 20:45:34 +0100 (CET)
Subject: thomas: server release-notes.txt,1.204,1.205 
Message-ID: <20080204194534.D8D8160016C@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Added 2.2-rc-2 package list to release notes


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- release-notes.txt	4 Feb 2008 16:40:17 -0000	1.204
+++ release-notes.txt	4 Feb 2008 19:45:32 -0000	1.205
@@ -89,39 +89,134 @@
 
     - Kolab packages:
 
-      Removed:
-
-	???
-
-      Added:
-
-	???
-
       Updated:
 
-	???
+	imapd-2.3.11-20080101_kolab
+	kolab-filter-2.2.rc1-20080204
+	kolab-freebusy-2.2.rc1-20080204
+	kolab-webadmin-2.1.99-20080204
+	kolabconf-2.2.rc1-20080204
+	kolabd-2.1.99-20080204
+	openldap-2.3.39-20071130
+	perl-kolab-2.2.rc1-20080204
+	php-kolab-2.2.rc1-20080204
 
       Unchanged:
 
-	???
+	PEAR-Auth_SASL-1.0.2-1
+	PEAR-Date-1.4.7-1
+	PEAR-HTTP_Request-1.4.1-1
+	PEAR-Log-1.9.9-1
+	PEAR-Mail-1.1.14-1
+	PEAR-Mail_Mime-1.3.1-1
+	PEAR-Net_IMAP-1.1.0beta1-1
+	PEAR-Net_LMTP-1.0.1-1
+	PEAR-Net_SMTP-1.2.10-1
+	PEAR-Net_Sieve-1.1.5-1
+	PEAR-Net_Socket-1.0.6-1
+	PEAR-Net_URL-1.0.15-1
+	fbview-horde-3.2_rc1-20071201
+	fbview-kronolith-2.2_rc1-20071129
+	horde-framework-kolab-3.2_rc1-20071129
+	horde-imp-kolab-4.2_rc1-20071128
+	horde-ingo-kolab-1.2_rc1-20071128
+	horde-kolab-3.2_rc1-20071201
+	horde-kolab-client-0.99-20071002
+	horde-kronolith-kolab-2.2_rc1-20071129
+	horde-mnemo-kolab-2.2_rc1-20071128
+	horde-nag-kolab-2.2_rc1-20071128
+	horde-passwd-kolab-3.0.1-20071001
+	horde-turba-kolab-2.2_rc1-20071128
+	php-channel-horde-1.0-1
+	php-smarty-2.6.18-20070607
 
     - OpenPKG packages:
 
-      Removed:
-
-	???
-
       Added:
 
-	???
+	perl-locale-5.10.0-20080112
+	perl-text-5.10.0-20080101
 
       Updated:
 
-	???
+	amavisd-2.5.3-20080101
+	apache-2.2.8-20080118
+	apache-php-5.2.5-20080114
+	apr-1.2.12-20080101
+	autoconf-2.61-20080101
+	automake-1.10-20080101
+	bc-1.06-20080101
+	binutils-2.18-20080101
+	bison-2.3-20080101
+	bzip2-1.0.4-20080101
+	clamav-0.92-20080101
+	config-20060923-20080101
+	curl-7.17.1-20080101
+	diffutils-2.8.7-20080101
+	expat-2.0.1-20080101
+	file-4.23-20080101
+	flex-2.5.34-20080101
+	freetype-2.3.5-20080101
+	fsl-1.7.0-20080101
+	gcc-4.2.2-20080101
+	gd-2.0.35-20080101
+	gettext-0.17-20080101
+	gmp-4.2.2-20080101
+	grep-2.5.3-20080101
+	groff-1.19.2-20080101
+	gzip-1.3.12-20080101
+	imap-2006k-20080101
+	jpeg-6b-20080101
+	libiconv-1.12-20080101
+	libmcrypt-2.5.8-20080101
+	libxml-2.6.31-20080111
+	libxslt-1.1.22-20080101
+	lzo-2.02-20080101
+	m4-1.4.9-20080101
+	make-3.81-20080101
+	mhash-0.9.9-20080101
+	mm-1.4.2-20080101
+	ncurses-5.6.20080112-20080113
+	openpkg-20071227-20071227
+	openpkg-tools-1.4.6-20071231
+	openssl-0.9.8g-20080101
+	pcre-7.5-20080110
+	perl-5.10.0-20080103
+	perl-comp-5.10.0-20080110
+	perl-conv-5.10.0-20080101
+	perl-crypto-5.10.0-20080101
+	perl-db-5.10.0-20080118
+	perl-dns-5.10.0-20080101
+	perl-ds-5.10.0-20080104
+	perl-ldap-5.10.0-20080101
+	perl-mail-5.10.0-20080117
+	perl-module-5.10.0-20080101
+	perl-net-5.10.0-20080101
+	perl-openpkg-5.10.0-20080109
+	perl-parse-5.10.0-20080117
+	perl-ssl-5.10.0-20080101
+	perl-stats-5.10.0-20080101
+	perl-sys-5.10.0-20080101
+	perl-term-5.10.0-20080116
+	perl-time-5.10.0-20080101
+	perl-util-5.10.0-20080116
+	perl-www-5.10.0-20080103
+	perl-xml-5.10.0-20080101
+	php-5.2.5-20080114
+	pkgconfig-0.23-20080117
+	png-1.2.24-20080101
+	postfix-2.4.6-20080101
+	procmail-3.22-20080101
+	readline-5.2.12-20080101
+	sasl-2.1.22-20080101
+	sed-4.1.5-20080101
+	spamassassin-3.2.4-20080107
+	texinfo-4.11-20080101
+	zlib-1.2.3-20080101
 
       Unchanged:
 
-	???
+	db-4.5.20.2-20070628
 
 
 Changes between 2.2-beta-2 and 2.2-beta-3:



From cvs at kolab.org  Mon Feb  4 20:47:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 20:47:02 +0100 (CET)
Subject: thomas: server 00INDEX.rdf,1.12,NONE 
Message-ID: <20080204194702.9C38160016C@lists.intevation.de>

Author: thomas

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

Removed Files:
	00INDEX.rdf 
Log Message:
Removed 00INDEX.rdf from CVS as it is generated.
Full package lists for OpenPKG are available in the release notes.


--- 00INDEX.rdf DELETED ---



From cvs at kolab.org  Mon Feb  4 21:16:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  4 Feb 2008 21:16:29 +0100 (CET)
Subject: thomas: server README.1st,1.72,1.73 
Message-ID: <20080204201629.64C65600D4B@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Updated update instructions


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- README.1st	4 Feb 2008 14:34:21 -0000	1.72
+++ README.1st	4 Feb 2008 20:16:27 -0000	1.73
@@ -158,8 +158,10 @@
 ---------------------------------------
 
 Instructions for upgrading from Kolab server 2.0 will be added in a
-future version of this document.  This instructions are on upgrading
-from Kolab 2.1.0.
+future version of this document.  These instructions are for upgrading
+from Kolab server 2.1.0 to 2.2-rc1:
+
+0.  Make a backup of your installation and data stored inside /kolab
 
 1.  Before upgrading the Kolab server must be stoped:
 
@@ -172,33 +174,35 @@
 3.  Some of the old Kolab packages must be removed to avoid conflicts
     during the upgrade process:
 
-    # /kolab/bin/openpkg rpm -e --nodeps kolabd-2.1.0-20070510 \
-                                         kolab-webadmin-2.1.0-20070510 \
-                                         kolab-horde-fbview-2.1.0-20070420 \
-                                         kolab-horde-framework-2.1.0-20070420 \
-                                         kolab-resource-handlers-2.1.0-20070510 \
-                                         getopt-20051005-2.5.0 \
-                                         patch-2.5.9-2.5.0 \
-                                         proftpd-1.3.0rc2-2.5.0 \
-                                         sharutils-4.5.1-2.5.0
+    # /kolab/bin/openpkg rpm -e --nodeps \
+        kolabd-2.1.0-20070510 \
+        kolab-webadmin-2.1.0-20070510 \
+        kolab-horde-fbview-2.1.0-20070420 \
+        kolab-horde-framework-2.1.0-20070420 \
+        kolab-resource-handlers-2.1.0-20070510 \
+        getopt-20051005-2.5.0 \
+        patch-2.5.9-2.5.0 \
+        proftpd-1.3.0rc2-2.5.0 \
+        sharutils-4.5.1-2.5.0
 
-4.  A new openpkg version is needed for the upgrade, so we have to
-    install it manually beforehand.
+4.  New versions of openpkg and openpkg-tools are needed for the upgrade, so
+    you have to install them manually beforehand.
 
-    As root, cd into the directory of kolab server 2.2 binary packages and run: 
+    As root, cd into the directory of kolab server 2.2 binary packages and run:
 
     # /kolab/bin/openpkg rpm -Uvh \
-        ./openpkg-20071227-20071227.ix86-debian3.1-kolab.rpm
+        ./openpkg-20071227-20071227.<ARCH>-<OS>-kolab.rpm
     # /kolab/bin/openpkg rpm -Uvh \
-        ./openpkg-tools-1.4.6-20071231.ix86-debian3.1-kolab.rpm
+        ./openpkg-tools-1.4.6-20071231.<ARCH>-<OS>-kolab.rpm
 
-    If you don't have binary packages for you platform, you have to build from source.
-    As root, cd into the kolab server 2.2 source directory and run:
+    If you do not have binary packages for you platform, you have to build
+    them from source first. As root, cd into the Kolab server 2.2 source
+    directory and run:
 
-    # /kolab/bin/openpkg rpm --rebuild ./openpkg-20071227-20071227.src.rpm 
+    # /kolab/bin/openpkg rpm --rebuild ./openpkg-20071227-20071227.src.rpm
     # /kolab/bin/openpkg rpm -Uvh \
         /kolab/RPM/PKG/openpkg-20071227-20071227.<ARCH>-<OS>-kolab.rpm
-    # /kolab/bin/openpkg rpm --rebuild ./openpkg-tools-1.4.6-20071231.src.rpm 
+    # /kolab/bin/openpkg rpm --rebuild ./openpkg-tools-1.4.6-20071231.src.rpm
     # /kolab/bin/openpkg rpm -Uvh \
         /kolab/RPM/PKG/openpkg-tools-1.4.6-20071231.<ARCH>-<OS>-kolab.rpm
 
@@ -208,35 +212,33 @@
 
     # ./install-kolab.sh -H -F 2>&1 | tee kolab-update.log
 
-6.  Before starting the ldap server the database must be restored from
+6.  Before starting the LDAP server the database must be restored from
     the ldif:
 
     # rm /kolab/var/openldap/openldap-data/*
     # /kolab/sbin/slapadd -l ~/kolab-2.1.ldif
 
-7.  The format of certain databases changed, but as they only hold
-    caches or temporary data they can be simply truncated to zero
-    length:
+7.  The format of the TLS session cache changed, therefore you have truncated
+    it to zero length:
 
     # > /kolab/var/imapd/tls_sessions.db
-    [FIX ME: what else?]
-
-8.  Remove all *.conf.rpmsave files in the subdirectories of
-    /kolab/etc/ as described above.
 
-    Check /kolab/etc/kolab/kolab.conf and merge content of
+8   Check /kolab/etc/kolab/kolab.conf and merge content of
     kolab.conf.rpmsave manually!
 
-9.  Start the OpenLDAP, generate the configuration files and start the
+9.  Remove all *.conf.rpmsave files in the subdirectories of
+    /kolab/etc/ as described above.
+
+10. Start the OpenLDAP, generate the configuration files and start the
     Kolab server:
 
     # /kolab/bin/openpkg rc openldap start
     # /kolab/sbin/kolabconf
     # /kolab/bin/openpkg rc all start
 
-10. After the success full upgrade some cleanup can be done, by
+11. After the successful upgrade some cleanup can be done, by
     removing obsolete files/directories:
-   
+
     # rm -r /kolab/etc/resmgr
     # rm -r /kolab/etc/proftpd
 



From cvs at kolab.org  Tue Feb  5 12:40:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Feb 2008 12:40:48 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.135,1.136 
Message-ID: <20080205114048.A0FC9601446@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Kolab Server 2.2 Release Candidate 1


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- index.html.m4	4 Feb 2008 11:24:41 -0000	1.135
+++ index.html.m4	5 Feb 2008 11:40:46 -0000	1.136
@@ -45,6 +45,31 @@
 -->
 
 <!-- BEGIN LATEST BLOCK --> <div class="latestnews">
+
+
+<table>
+<tr><td class="newsd">February 5th, 2008</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.2 Release Candidate 1 released
+</td></tr>
+</table>
+<div class="newsb">
+  Source and binary packages for Kolab Server 2.2 Release Candidate 1
+  are available for download.
+  <br>
+  Since 2.2 beta 2 the Kolab server provides a web client that
+  supports all the groupware features known from Outlook and Kontact.
+  Thus users are less dependent on their local client and can access
+  their groupware data from anywhere in the world provided they have
+  a standard browser available.
+  <br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2008/000063.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
 <table>
 <tr><td class="newsd">January 30th, 2008</td>
 <td class="newsh">&raquo;
@@ -61,6 +86,7 @@
 </div>
 <p>
 
+
 <table>
 <tr><td class="newsd">January 9th, 2008</td>
 <td class="newsh">&raquo;
@@ -73,6 +99,12 @@
 </div>
 <p>
 
+
+</div> <!-- END LATEST BLOCK -->
+<p>
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
 <table>
 <tr><td class="newsd">December 9th, 2007</td>
 <td class="newsh">&raquo;
@@ -94,10 +126,7 @@
   announcement</a> for details.
 </div>
 <p>
-</div> <!-- END LATEST BLOCK -->
-<p>
 
-<!-- BEGIN NEWS BLOCK --> <div class="news">
 
 <table>
 <tr><td class="newsd">October 18th, 2007</td>
@@ -113,9 +142,6 @@
   announcement</a> for details.
 </div>
 <p>
-
-
-
 
 
 <table>



From cvs at kolab.org  Tue Feb  5 18:00:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Feb 2008 18:00:54 +0100 (CET)
Subject: gunnar: server/kolab-freebusy/freebusy generatefb.php,NONE,1.1 
Message-ID: <20080205170054.C5A8060016B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv28530/freebusy

Added Files:
	generatefb.php 
Log Message:
A first draft of the free/busy regeneration script.

--- NEW FILE: generatefb.php ---
#!/kolabrelease/bin/php -c /kolabrelease/etc/apache/php.ini
<?php
/*
 *  COPYRIGHT
 *  ---------
 *
 *  See docs/AUTHORS file
 *
 *
 *  LICENSE
 *  -------
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *  $Revision: 1.1 $
 *
 *  ABOUT
 *  -----
 *
 *  This script regenerates the cached free/busy information.
 *
 */

error_reporting(E_ALL);
ini_set('memory_limit', -1); /* requires safe_mode to be turned off */

/* Load the required free/busy libraries - this also loads Horde:: and
 Util:: as well as the PEAR constants*/ 
require_once 'Kolab/Freebusy/Page.php';

/* Load the configuration */ 
require_once '../../kolab/www/freebusy/config.php';

require_once('Console/Getopt.php');

$imaphost = $conf['kolab']['imap']['server'];
$imapport = $conf['kolab']['imap']['port'];
$imapoptions = '/notls';
$imapuser = 'manager';
$imappw = false;

/* Print out usage info */
function usage()
{
    global $imaphost,$imapport,$imapuser,$imappw;
    echo "Script for updating freebusy information on a kolab server.\n";
    echo "Normal usage is:\n";
    echo "\tsudo -u kolab-n ./generatefb.php [--help] [--imaphost=<imap hostname>] [--imapport=<imap port>] [--user=<manager user>] --password=<manager password>\n";
    echo "Defaults:\n";
    echo "\t--imaphost:\t$imaphost\n";
    echo "\t--imapport:\t$imapport\n";
    echo "\t--user:\t$imapuser\n";
    echo "\t--password:\t<no default>\n";
    exit(-1);
}

/* Parse command line options */
list($options,$args) = Console_Getopt::getopt(Console_Getopt::readPHPArgv(),'h',array('help','imaphost=','imapport=','user=','password='));
foreach( $options as $o ) {
    $a = $o[1];
    $o = $o[0];
    switch($o) {
	case 'h':
	case '--help':       usage(); break;
	case '--imaphost': $imaphost = $a; break;
	case '--imapport': $imapport = $a; break;
	case '--user':       $imapuser = $a; break;
	case '--password': $imappw   = $a; break;
    }
}

/* Password must be supplied */
if(!$imappw) usage();

$access = &new FolderAccess($imapuser, $imappw);
$result = $access->authenticate();
if (is_a($result, 'PEAR_Error')) {
    echo "Failed to authenticate!\n";
    echo $result->getMessage();
    exit(-1);
 }

/* Load the required Kolab libraries */ 
require_once "Horde/Kolab.php";
require_once "Horde/Kolab/IMAP.php";

$imap = new Kolab_IMAP();
$folders = $imap->listFolders();

if (is_a($folders, 'PEAR_Error')) {
    echo "Failed to fetch the IMAP folders!\n";
    echo $folders->getMessage();
    exit(-1);
 }

if (!is_array($folders)) {
    echo "Expected list of IMAP folders but got:\n";
    var_dump($folders);
    exit(-1);
 }

$calendars = array();

foreach ($folders as $folder) {

    if ($folder[1] == 'event' && (substr($folder[0], 0, 6) != 'shared')) {
        $calendars[] = $folder[0];
    }
}

/* Load the cache class now */
require_once('Kolab/Freebusy/Cache.php');

/* Where is the cache data stored? */
if (!empty($conf['fb']['cache_dir'])) {
    $cache_dir = $conf['fb']['cache_dir'];
} else {
    /* This default is not recommended so make sure you set a 
     * cache dir outside of the apache document root.
     */
    $cache_dir = dirname(__FILE__) . '/cache';
}

$cache = &new FreeBusyCache($cache_dir);

foreach ($calendars as $calendar) {

    /* Validate folder access */
    $result = $access->parseFolder($calendar);
    if (is_a($result, 'PEAR_Error')) {
        echo "Failed accessing calendar \"" . $calendar . "\"!\n";
        var_dump($result);
        exit(-1);
    }

    echo "Regenerating calendar \"" . $calendar . "\"!\n";

    /* Update the cache */
    $result = $cache->store($access);
    if (is_a($result, 'PEAR_Error')) {
        echo "Failed regenerating cache for calendar \"" . $calendar . "\"!\n";
        echo $result->getMessage();
        exit(-1);
    }
}
?>



From cvs at kolab.org  Tue Feb  5 18:04:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Feb 2008 18:04:15 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog,1.7,1.8 
Message-ID: <20080205170415.9E5F2600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv28686/Kolab_Freebusy

Modified Files:
	ChangeLog 
Log Message:
Some fixes required for the cache regeneration script. See ChangeLog.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	8 Dec 2007 07:32:25 -0000	1.7
+++ ChangeLog	5 Feb 2008 17:04:13 -0000	1.8
@@ -1,8 +1,19 @@
+2008-02-05  Gunnar Wrobel  <p at rdus.de>
+
+	* Freebusy/Cache.php:
+
+	Handle special users in a correct fashion.
+
+	* Freebusy/Page.php:
+
+	Allow specifying the calling user on object creation.
+	Do not warn if the session cannot be created.
+
 2007-12-08  Gunnar Wrobel  <p at rdus.de>
 
 	* Freebusy/Cache.php:
 
-	Remove non-functional line (Reported by: Marcus Hüwe).
+	Remove non-functional line (Reported by: Marcus Hüwe).
 
 2007-11-30  Gunnar Wrobel  <p at rdus.de>
 



From cvs at kolab.org  Tue Feb  5 18:04:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  5 Feb 2008 18:04:15 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php, 1.4,
	1.5 Page.php, 1.1, 1.2 
Message-ID: <20080205170415.A458C600D4C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv28686/Kolab_Freebusy/Freebusy

Modified Files:
	Cache.php Page.php 
Log Message:
Some fixes required for the cache regeneration script. See ChangeLog.

Index: Cache.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Cache.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Cache.php	8 Dec 2007 07:32:25 -0000	1.4
+++ Cache.php	5 Feb 2008 17:04:13 -0000	1.5
@@ -294,11 +294,16 @@
             // Regular user
             $user = $regs[1];
             $userdom  = $regs[2];
+        } else {
+            $user = $access->user;
         }
+        
         if(ereg( '(.*)@(.*)', $access->owner, $regs)) {      
             // Regular owner
             $owner = $regs[1];
             $ownerdom = $regs[2];
+        } else {
+            $owner = $access->owner;
         }
 
         $fldrcomp = array();

Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Page.php	22 Nov 2007 16:53:05 -0000	1.1
+++ Page.php	5 Feb 2008 17:04:13 -0000	1.2
@@ -233,9 +233,14 @@
      */
     var $fbfuture = 60;
 
-    function FolderAccess()
+    function FolderAccess($user = null, $pass = null)
     {
-        $this->_parseUser();
+        if (isset($user) && isset($pass)) {
+            $this->user = $user;
+            $this->pass = $pass;
+        } else {
+            $this->_parseUser();
+        }
     }
     
     function parseFolder($req_folder = '')
@@ -322,7 +327,7 @@
             return PEAR::raiseError(sprintf(_("Invalid Kolab authentication for user %s!"), 
                                             $this->user));
         }
-        session_start();
+        @session_start();
         $_SESSION['__auth'] = array(
             'authenticated' => true,
             'userId' => $this->user,



From cvs at kolab.org  Wed Feb  6 09:00:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 09:00:29 +0100 (CET)
Subject: gunnar: server/kolab-freebusy ChangeLog,1.4,1.5 
Message-ID: <20080206080029.7FE6560016A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv20882/kolab-freebusy

Modified Files:
	ChangeLog 
Log Message:
Second draft version of the generatefb script (issue  kolab/issue1693). Should be split into a bash script and web callable script now.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	23 Nov 2007 13:39:32 -0000	1.4
+++ ChangeLog	6 Feb 2008 08:00:27 -0000	1.5
@@ -1,3 +1,9 @@
+2008-02-06  Gunnar Wrobel  <p at rdus.de>
+
+	* freebusy/generatefb.php:
+
+	Make it a script that can be used via apache.
+
 2007-11-23  Gunnar Wrobel  <p at rdus.de>
 
 	* freebusy/config.php:



From cvs at kolab.org  Wed Feb  6 09:00:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 09:00:29 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.136, 1.137 Makefile.am, 1.36,
	1.37 
Message-ID: <20080206080029.869ED600170@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Second draft version of the generatefb script (issue  kolab/issue1693). Should be split into a bash script and web callable script now.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- ChangeLog	1 Feb 2008 19:12:26 -0000	1.136
+++ ChangeLog	6 Feb 2008 08:00:27 -0000	1.137
@@ -1,8 +1,18 @@
+2008-02-06  Gunnar Wrobel  <p at rdus.de>
+
+	* Makefile.am (namespace/libexec/generatefb):
+
+	Add the new namespace script.
+
+	* namespace/libexec/generatefb.in:
+
+	Add a bash script for calling the new generatefb.php script
+
 2008-02-01 Richard Bos <richard at radoeka.nl>
 	* dist_conf/kolabsrv.in: changed the reference to the script itself
 	  to an autotools variable (@KOLABRC@).
 
-2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
+2008-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/kolabsrv.in: added getServiceName method to map distribution
 	  specific rc script names.
 	* dist_conf/suse: updated logfile locations + other fixes (now support for
@@ -118,7 +128,7 @@
 
 	 kolab/issue2236 (Apache UID access broken)
 
-2007-11-07  Marcus Hüwe  <suse-tux at gmx.de>
+2007-11-07  Marcus Hüwe  <suse-tux at gmx.de>
 	* dist_conf/suse:
 	changed the location of the resmgr_confdir
 
@@ -131,7 +141,7 @@
 
 	Added webserver_tmpdir
 
-2007-10-22  Marcus Hüwe  <suse-tux at gmx.de>
+2007-10-22  Marcus Hüwe  <suse-tux at gmx.de>
 
 	* dist_conf/suse:
 	changed the location of the smtpd.conf file (sasl_smtpconffile)
@@ -293,21 +303,21 @@
 	configuration and "postfix upgrade-configuration" adds a missing
 	"discard" service. Added to the template.
 
-2007-06-27  Marcus Hüwe    <suse-tux at gmx.de>
+2007-06-27  Marcus Hüwe    <suse-tux at gmx.de>
 
 	* dist_conf/suse:
 
 	The emailserver_socket is stored in $(libexecdir) and not in $(libdir). This
 	fixes a x86_64 issue.
 
-2007-06-22  Marcus Hüwe    <suse-tux at gmx.de>
+2007-06-22  Marcus Hüwe    <suse-tux at gmx.de>
 
 	* Makefile.am, dirservnotify, dirservupdate:
 
 	autoconfiscated dirservnotify and dirservupdate. "dirservnotify" was renamed
 	to "dirservnotify.in" and "dirservupdate" was renamed to "dirservupdate.in".
 
-2007-06-21  Marcus Hüwe    <suse-tux at gmx.de>
+2007-06-21  Marcus Hüwe    <suse-tux at gmx.de>
 
 	* Makefile.am:
 	
@@ -376,7 +386,7 @@
 	Should fix
 	issue1609 (https://intevation.de/roundup/kolab/issue1609)
 
-2007-03-22  Marcus Hüwe    <suse-tux at gmx.de>
+2007-03-22  Marcus Hüwe    <suse-tux at gmx.de>
 
 	* templates/main.cf.template.in:
 
@@ -391,7 +401,7 @@
 	the kolabconf log. Resolves:
 	kolab/issue1638 (https://intevation.de/roundup/kolab/issue1638)
 
-2007-02-11 Marcus Hüwe <suse-tux at gmx.de>
+2007-02-11 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/suse, dist_conf/kolab/, dist_conf/common,
 	  dist_conf/gentoo: Added new variable TAR
 	* kolab_bootstrap.in: Added a condition to the slave setup so that
@@ -445,7 +455,7 @@
 	order to get the correct path under all distributions.
 	
 
-2006-10-02	Marcus Hüwe <suse-tux at gmx.de>
+2006-10-02	Marcus Hüwe <suse-tux at gmx.de>
 	* templates/slapd.conf.template.in: fixed issue1426 - thanks
 	Gunnar!
 
@@ -491,7 +501,7 @@
 	in Postfix 2.2), everything else is cleanup or commented out by
 	default.
 
-2006-04-13 Marcus Hüwe <suse-tux at gmx.de>
+2006-04-13 Marcus Hüwe <suse-tux at gmx.de>
 	* templates/master.cf.template.in: replaced @bindir@/php with @PHP@
 	* dist_conf/suse: changed the location for the ldapserver_argsfile,
 	  ldapserver_pidfile and ldapserverslurpd_pidfile
@@ -501,7 +511,7 @@
 	  engine uses a real /freebusy directory on the filesystem before
 	  %{DOCUMENT_ROOT}/freebusy.  This may result in unexpected behaviour.
 
-2006-04-03 Marcus Hüwe <suse-tux at gmx.de>
+2006-04-03 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common, dist_conf/kolab, dist_conf/suse,
 	  templates/freebusy.conf.template.in: introduction of freebusy_usr
@@ -511,7 +521,7 @@
 	* templates/php.ini.template.in: use the variable phpini_dir instead
 	  of webserver_confdir.
 
-2006-03-26 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-26 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/{common,suse,kolab}, templates/main.cf.template.in:
 	  Introduced new variable @aliases_file@
@@ -520,13 +530,13 @@
 	* dist_conf/suse, dist_conf/kolab provide the correct values for
 	  the resmgr_scriptsdir variable.
 
-2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common, dist_conf/kolab, dist_conf/suse,
 	  templates/master.cf.template.in: introduce a new variable phpini_dir
 	  for the directory that holds the php.ini file to be used.
 
-2006-03-16 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-16 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/suse: run as user kolab instead of nobody.
 
@@ -538,7 +548,7 @@
 	  In the old location the directory was not writable by the ldap
 	  daemon, in the new location /var/run/slapd/ it is.
 
-2006-03-02 Marcus Hüwe <suse-tux at gmx.de>
+2006-03-02 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common, dist_conf/kolab, dist_conf/suse,
 	  kolab_bootstrap.in, kolab_sslcert.sh.in: introduced a new
@@ -548,7 +558,7 @@
 	* dist_conf/kolab: Use amavisd.log instead of amavis.log as log file
 	  to fix logrotate in OpenPKG installation (Issue1015).
 
-2006-02-06 Marcus Hüwe <suse-tux at gmx.de>
+2006-02-06 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* Makefile.am: create the kolab_statedir directory, during make.
 
@@ -575,7 +585,7 @@
 	  kolab-n and kolab-r!
 	  See https://intevation.de/roundup/kolab/issue1083
 
-2006-02-01 Marcus Hüwe <suse-tux at gmx.de>
+2006-02-01 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common,
 	  dist_conf/kolab,
@@ -588,7 +598,7 @@
 	  @amavisd_logfile@, see tracker:
 	  https://intevation.de/roundup/kolab/issue1088
 
-2006-01-31 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-31 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common,
 	  dist_conf/kolab,
@@ -613,7 +623,7 @@
 	  emailserver_default_privs and emailserver_master_usr
 	  Remove variable emailserver_mail_usr, it is not used anymore
 
-2006-01-17 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-17 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/{common,kolab,suse}: introduced *_rpm variables and
 	  ldapserver_rgrp variable.
@@ -632,7 +642,7 @@
 	* templates/session_vars.php.template.in: use @webserver_musr@ instead
 	  of @kolab_musr@
 
-2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/common,
 	  dist_conf/kolab,
@@ -662,7 +672,7 @@
 	  use the real value 'kolab-r' instead
 	* kolab_sslcert.sh.in: replace restricted_kolab_grp with kolab_rgrp
 
-2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* configure.ac: replaced --enable-dist with --with-dist
 	  Added dist_conf file check.  If dist_conf file specified with
@@ -717,13 +727,13 @@
 	  kolabd's Makefile.am is updated for dist_conf sources.
 	  Added a distclean-local rule to remove the directory autom4te.cache
 
-2006-01-02 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-02 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* Makefile.am: changed kolabrc_FILE into kolabrc_DATA to fix
 	  bug issue1068; rc.kolabd need to be executable
 	  Thanks Marcus for providing the fix.
 
-2006-01-01 Marcus Hüwe <suse-tux at gmx.de>
+2006-01-01 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos, see issue1049
 	* dist_conf/debian: added (provided by  Benoit Mortier)
 	* dist_conf/suse, dist_conf/kolab, dist_conf/common: added backupdir
@@ -741,14 +751,14 @@
 	* dist_conf/suse: adjusted freebusy_cachedir to reflect the
 	  addition of webserver_web_prefix
 
-2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos, see issue1049
 	* templates/resmgr.conf.template.in,
 	  templates/fbview.conf.template.in: added
 	  @webserver_web_prefix@ (we did what Mandriva already had done!)
 	* dist_conf/{kolab,suse,common}: added @webserver_web_prefix@
 
-2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos, see issue1047
 	* dist_conf/{kolab,suse}: added KOLABRC variable
 	* kolab_bootstrap.in: replaced @bindir@/openpkg with @KOLABRC@
@@ -793,7 +803,7 @@
 	* Makefile.am: make kolabpasswd executable for non OPENPKG distributions
 	  as well
 
-2005-12-22 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-22 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* dist_conf/suse: changed perllib from site_perl to vendor_perl
 	  changed pkgdocdir from ${datadir}/doc/packages to
@@ -810,7 +820,7 @@
 	  that the variable BASH does not get updated in configure, as it is
 	  already set by bash itself....)
 
-2005-12-18 Marcus Hüwe <suse-tux at gmx.de>
+2005-12-18 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* Makefile.am: removed redundant prefix dist_
 	  Removed commented out lines
@@ -818,7 +828,7 @@
 2005-12-17 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common: added @ftpserver_pidfile@
 
-2005-12-17 Richard Bos <richard at radoeka.nl> and Marcus Hüwe <suse-tux at gmx.de>
+2005-12-17 Richard Bos <richard at radoeka.nl> and Marcus Hüwe <suse-tux at gmx.de>
 	* configure.ac: added --enable/--disable-openpkg configure options,
 	  by default openpkg is enabled.  When disabled, the files kolab,
 	  namespace/kolab and rc.kolabd are not distributed as they are
@@ -912,7 +922,7 @@
 	  in phplibdir2
 	* Makefile.am: added kolab_upgrade
 
-2005-11-27 Marcus Hüwe <suse-tux at gmx.de>
+2005-11-27 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/common: altered bash_exec, perl_exec to respectively:
 	  BASH and PERL.
 	  Added: PHP, freebusy_cachefile and resmgr_filter in preparation for

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am	7 Nov 2007 10:37:53 -0000	1.36
+++ Makefile.am	6 Feb 2008 08:00:27 -0000	1.37
@@ -85,6 +85,7 @@
 kolabnamespace_FILES = namespace/libexec/newconfig \
 	namespace/libexec/adduser \
 	namespace/libexec/deluser \
+	namespace/libexec/generatefb \
 	namespace/libexec/listusers \
 	namespace/libexec/showuser \
 	namespace/libexec/newconfig \
@@ -267,6 +268,13 @@
 	chmod a+x namespace/libexec/deluser
 CLEANFILES += namespace/libexec/deluser
 EXTRA_DIST += namespace/libexec/deluser.in
+
+namespace/libexec/generatefb: namespace/libexec/generatefb.in
+	@$(mkinstalldirs) namespace/libexec
+	 $(do_subst) <$(srcdir)/namespace/libexec/generatefb.in >$@
+	 chmod a+x namespace/libexec/generatefb
+CLEANFILES += namespace/libexec/generatefb
+EXTRA_DIST += namespace/libexec/generatefb.in
 
 namespace/libexec/listusers: namespace/libexec/listusers.in
 	@$(mkinstalldirs) namespace/libexec



From cvs at kolab.org  Wed Feb  6 09:00:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 09:00:29 +0100 (CET)
Subject: gunnar: server/kolab-freebusy/freebusy generatefb.php,1.1,1.2 
Message-ID: <20080206080029.8146260016C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv20882/kolab-freebusy/freebusy

Modified Files:
	generatefb.php 
Log Message:
Second draft version of the generatefb script (issue  kolab/issue1693). Should be split into a bash script and web callable script now.

Index: generatefb.php
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/freebusy/generatefb.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- generatefb.php	5 Feb 2008 17:00:52 -0000	1.1
+++ generatefb.php	6 Feb 2008 08:00:27 -0000	1.2
@@ -1,4 +1,3 @@
-#!/kolabrelease/bin/php -c /kolabrelease/etc/apache/php.ini
 <?php
 /*
  *  COPYRIGHT
@@ -36,55 +35,14 @@
 error_reporting(E_ALL);
 ini_set('memory_limit', -1); /* requires safe_mode to be turned off */
 
+/* Load the configuration */ 
+require_once 'config.php';
+
 /* Load the required free/busy libraries - this also loads Horde:: and
  Util:: as well as the PEAR constants*/ 
 require_once 'Kolab/Freebusy/Page.php';
 
-/* Load the configuration */ 
-require_once '../../kolab/www/freebusy/config.php';
-
-require_once('Console/Getopt.php');
-
-$imaphost = $conf['kolab']['imap']['server'];
-$imapport = $conf['kolab']['imap']['port'];
-$imapoptions = '/notls';
-$imapuser = 'manager';
-$imappw = false;
-
-/* Print out usage info */
-function usage()
-{
-    global $imaphost,$imapport,$imapuser,$imappw;
-    echo "Script for updating freebusy information on a kolab server.\n";
-    echo "Normal usage is:\n";
-    echo "\tsudo -u kolab-n ./generatefb.php [--help] [--imaphost=<imap hostname>] [--imapport=<imap port>] [--user=<manager user>] --password=<manager password>\n";
-    echo "Defaults:\n";
-    echo "\t--imaphost:\t$imaphost\n";
-    echo "\t--imapport:\t$imapport\n";
-    echo "\t--user:\t$imapuser\n";
-    echo "\t--password:\t<no default>\n";
-    exit(-1);
-}
-
-/* Parse command line options */
-list($options,$args) = Console_Getopt::getopt(Console_Getopt::readPHPArgv(),'h',array('help','imaphost=','imapport=','user=','password='));
-foreach( $options as $o ) {
-    $a = $o[1];
-    $o = $o[0];
-    switch($o) {
-	case 'h':
-	case '--help':       usage(); break;
-	case '--imaphost': $imaphost = $a; break;
-	case '--imapport': $imapport = $a; break;
-	case '--user':       $imapuser = $a; break;
-	case '--password': $imappw   = $a; break;
-    }
-}
-
-/* Password must be supplied */
-if(!$imappw) usage();
-
-$access = &new FolderAccess($imapuser, $imappw);
+$access = &new FolderAccess();
 $result = $access->authenticate();
 if (is_a($result, 'PEAR_Error')) {
     echo "Failed to authenticate!\n";



From cvs at kolab.org  Wed Feb  6 09:00:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 09:00:29 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog,1.8,1.9 
Message-ID: <20080206080029.8E4B2600171@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv20882/php-kolab/Kolab_Freebusy

Modified Files:
	ChangeLog 
Log Message:
Second draft version of the generatefb script (issue  kolab/issue1693). Should be split into a bash script and web callable script now.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	5 Feb 2008 17:04:13 -0000	1.8
+++ ChangeLog	6 Feb 2008 08:00:27 -0000	1.9
@@ -1,3 +1,9 @@
+2008-02-06  Gunnar Wrobel  <p at rdus.de>
+
+	* Freebusy/Page.php:
+
+	Allow to specify the user and pass on the command line.
+
 2008-02-05  Gunnar Wrobel  <p at rdus.de>
 
 	* Freebusy/Cache.php:



From cvs at kolab.org  Wed Feb  6 09:00:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 09:00:29 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Page.php,1.2,1.3 
Message-ID: <20080206080029.90B1D600D43@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv20882/php-kolab/Kolab_Freebusy/Freebusy

Modified Files:
	Page.php 
Log Message:
Second draft version of the generatefb script (issue  kolab/issue1693). Should be split into a bash script and web callable script now.

Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Page.php	5 Feb 2008 17:04:13 -0000	1.2
+++ Page.php	6 Feb 2008 08:00:27 -0000	1.3
@@ -374,6 +374,10 @@
                 list($this->user, $this->pass) = explode(':', $a, 2);
             }
         }
+        if (empty($this->user) && isset($_ENV['CLI_USER']) && isset($_ENV['CLI_PASS'])) {
+            $this->user = $_ENV['CLI_USER'];
+            $this->pass = $_ENV['CLI_PASS'];
+        }
     }
 
     function _process() 



From cvs at kolab.org  Wed Feb  6 10:28:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 10:28:54 +0100 (CET)
Subject: gunnar: server/kolab-freebusy/freebusy generatefb.php,1.2,1.3 
Message-ID: <20080206092854.8D101600D4C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv23437/kolab-freebusy/freebusy

Modified Files:
	generatefb.php 
Log Message:
Add the manager acl hack to the generatefb script.

Index: generatefb.php
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/freebusy/generatefb.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generatefb.php	6 Feb 2008 08:00:27 -0000	1.2
+++ generatefb.php	6 Feb 2008 09:28:52 -0000	1.3
@@ -95,6 +95,8 @@
 
 foreach ($calendars as $calendar) {
 
+    $failed = false;
+
     /* Validate folder access */
     $result = $access->parseFolder($calendar);
     if (is_a($result, 'PEAR_Error')) {
@@ -103,6 +105,16 @@
         exit(-1);
     }
 
+    /* Hack for allowing manager access */
+    if ($access->user == 'manager') {
+        $acl = $imap->_imap->getACL($calendar);
+        $oldacl = '';
+        if (isset($acl['manager'])) {
+            $oldacl = $acl['manager'];
+        }
+        $acl['manager'] = 'lrs';
+    }
+
     echo "Regenerating calendar \"" . $calendar . "\"!\n";
 
     /* Update the cache */
@@ -110,6 +122,20 @@
     if (is_a($result, 'PEAR_Error')) {
         echo "Failed regenerating cache for calendar \"" . $calendar . "\"!\n";
         echo $result->getMessage();
+        $failed = true;
+    }
+
+    /* Revert the acl  */
+    if ($access->user == 'manager') {
+        $acl = $imap->_imap->getACL($calendar);
+        $oldacl = '';
+        if (isset($acl['manager'])) {
+            $oldacl = $acl['manager'];
+        }
+        $acl['manager'] = 'lrs';
+    }
+
+    if ($failed) {
         exit(-1);
     }
 }



From cvs at kolab.org  Wed Feb  6 10:28:54 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 10:28:54 +0100 (CET)
Subject: gunnar: server/kolab-freebusy ChangeLog,1.5,1.6 
Message-ID: <20080206092854.8E07F600D4D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv23437/kolab-freebusy

Modified Files:
	ChangeLog 
Log Message:
Add the manager acl hack to the generatefb script.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	6 Feb 2008 08:00:27 -0000	1.5
+++ ChangeLog	6 Feb 2008 09:28:52 -0000	1.6
@@ -2,6 +2,8 @@
 
 	* freebusy/generatefb.php:
 
+	Added the manager acl hack.
+
 	Make it a script that can be used via apache.
 
 2007-11-23  Gunnar Wrobel  <p at rdus.de>



From cvs at kolab.org  Wed Feb  6 10:34:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 10:34:33 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/namespace/libexec generatefb.in, NONE,
	1.1 
Message-ID: <20080206093433.A9D10600D4C@lists.intevation.de>

Author: gunnar

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

Added Files:
	generatefb.in 
Log Message:
Add the generatefc script.

--- NEW FILE: generatefb.in ---
#
#  LICENSE
#  -------
#
#  This program is free software; you can redistribute it and/or modify
#  it under the terms of the GNU General Public License as published by
#  the Free Software Foundation; either version 2 of the License, or
#  (at your option) any later version.
#
#  This program is distributed in the hope that it will be useful,
#  but WITHOUT ANY WARRANTY; without even the implied warranty of
#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#  GNU General Public License for more details.
#
#  You should have received a copy of the GNU General Public License
#  along with this program; if not, write to the Free Software
#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
#  $Revision: 1.1 $
#
#  ABOUT
#  -----
#
#  This script regenerates the cached free/busy information.
#
#

CLI_USER="manager"
CLI_PASS=""

usage() {
    echo "Script for updating freebusy information on a kolab server.";
    echo "Normal usage is:";
    echo
    echo "  kolab generatefb [-h] [-u=<manager>] -p=<password>";
    echo
    echo "Usage:"
    echo "  -u         The IMAP user used for regenerating the cache."
    echo "             (the default is the manager but you may also "
    echo "              specify a user name to regenrate just this users"
    echo "              cache data)"
    echo "  -p         Password for the selected user"
    exit 1
}

while getopts hu:p: ARGS; do
    case $ARGS in
	h) # Display help
	    usage
	    ;;
	u) # User
	    export CLI_USER="${OPTARG}"
	    ;;
	p) # Pass
	    export CLI_PASS="${OPTARG}"
	    ;;
    esac
done

/* Password must be supplied */
if [ -n "CLI_PASS" ]; then
    usage();
fi

php -c @sysconfdir@/apache/php.ini @freebusy_confdir@/generatefb.php



From cvs at kolab.org  Wed Feb  6 12:24:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 12:24:09 +0100 (CET)
Subject: gunnar: server Makefile,1.45,1.46 
Message-ID: <20080206112409.3ACB9600D73@lists.intevation.de>

Author: gunnar

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

Modified Files:
	Makefile 
Log Message:
The 00INDEX file has been removed.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile	30 Nov 2007 08:47:44 -0000	1.45
+++ Makefile	6 Feb 2008 11:24:06 -0000	1.46
@@ -67,7 +67,6 @@
                horde/horde-kolab-client
 
 BASE_FILES=install-kolab.sh \
-           00INDEX.rdf \
            README.1st
 
 .PHONY: dist



From cvs at kolab.org  Wed Feb  6 12:24:25 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 12:24:25 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.137,1.138 
Message-ID: <20080206112425.3B15A600D76@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
Fix the location of the php.ini file.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- ChangeLog	6 Feb 2008 08:00:27 -0000	1.137
+++ ChangeLog	6 Feb 2008 11:24:23 -0000	1.138
@@ -1,5 +1,9 @@
 2008-02-06  Gunnar Wrobel  <p at rdus.de>
 
+	* namespace/libexec/generatefb.in (CLI_PASS):
+
+	Fix php.ini location as suggested by Richard Bos.
+
 	* Makefile.am (namespace/libexec/generatefb):
 
 	Add the new namespace script.



From cvs at kolab.org  Wed Feb  6 12:24:25 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 12:24:25 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/namespace/libexec generatefb.in, 1.1,
	1.2 
Message-ID: <20080206112425.3FAD6600D77@lists.intevation.de>

Author: gunnar

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

Modified Files:
	generatefb.in 
Log Message:
Fix the location of the php.ini file.

Index: generatefb.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/generatefb.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- generatefb.in	6 Feb 2008 09:34:31 -0000	1.1
+++ generatefb.in	6 Feb 2008 11:24:23 -0000	1.2
@@ -62,4 +62,4 @@
     usage();
 fi
 
-php -c @sysconfdir@/apache/php.ini @freebusy_confdir@/generatefb.php
+php -c @phpini_dir@/php.ini @freebusy_confdir@/generatefb.php



From cvs at kolab.org  Wed Feb  6 14:05:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 14:05:56 +0100 (CET)
Subject: gunnar: server cvs-kolab.sh,1.19,1.20 
Message-ID: <20080206130556.B05E6600D4F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	cvs-kolab.sh 
Log Message:
Try to get this script up-to-date for generating an install from cvs.

Index: cvs-kolab.sh
===================================================================
RCS file: /kolabrepository/server/cvs-kolab.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cvs-kolab.sh	30 Nov 2007 09:43:27 -0000	1.19
+++ cvs-kolab.sh	6 Feb 2008 13:05:54 -0000	1.20
@@ -10,6 +10,8 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
+KOLAB_VERSION="2.2-rc-1"
+
 KOLAB_PACKAGES=/kolab-packages
 KOLAB_DEV_USER=kolabdevel
 KOLAB_INSTALL_USER=kolabtest
@@ -59,9 +61,9 @@
     mkdir -p "${KOLAB_PACKAGES}/source-original"
     cd "${KOLAB_PACKAGES}/source-original"
 
-    echo "Downloading Kolab-Server-2.2-Beta-1 sources..."
+    echo "Downloading Kolab-Server-${KOLAB_VERSION} sources..."
 
-    wget -q -r -l1 -nd --no-parent -c -R index.html\* http://ftp.belnet.be/packages/kolab/server/beta/kolab-server-2.2-beta-1/sources/ || die "Failed to download the sources!"
+    wget -q -r -l1 -nd --no-parent -c -R index.html\* http://ftp.belnet.be/packages/kolab/server/beta/kolab-server-${KOLAB_VERSION}/sources/ || die "Failed to download the sources!"
 
     echo "Verifying source authenticity ..."
 



From cvs at kolab.org  Wed Feb  6 14:06:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 14:06:34 +0100 (CET)
Subject: gunnar: server/kolab-freebusy/freebusy/docs AUTHORS,1.1,1.2 
Message-ID: <20080206130634.B0CA4600D53@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy/docs
In directory doto:/tmp/cvs-serv28917/kolab-freebusy/freebusy/docs

Modified Files:
	AUTHORS 
Log Message:
Update some copyright notices for the commits from this year.

Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/freebusy/docs/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AUTHORS	8 Aug 2007 09:47:29 -0000	1.1
+++ AUTHORS	6 Feb 2008 13:06:32 -0000	1.2
@@ -5,12 +5,12 @@
 
 Portions based on work by the following people:
 
-  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
+  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
   (c) 2006         Thomas Jarosch       <thomas.jarosch at intra2net.com>
   (c) 2005 - 2006  Richard Bos          <richard at radoeka.nl>
-  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
+  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
   (c) 2005 - 2006  Martin Konold        <martin.konold at erfrakon.de>
-  (c) 2006 - 2007  Gunnar Wrobel        <wrobel at pardus.de>
+  (c) 2006 - 2008  Gunnar Wrobel        <wrobel at pardus.de>
 
 
 Portions based on work by the following companies:
@@ -18,7 +18,7 @@
   (c) 2004         Code Fusion cc
   (c) 2006         Intra2net AG
   (c) 2005 - 2006  erfrakon Partnerschaftsgesellschaft
-  (c) 2006 - 2007  p at rdus
+  (c) 2006 - 2008  p at rdus
 
 
 Contributions by the following people:
@@ -33,4 +33,4 @@
  order of appearences is sorted by date of last contribution, longest
  period of contributions and finally based on alphabetical order. The
  listed contributors comitted less than three patches or do not have
- CVS access.)
\ No newline at end of file
+ CVS access.)



From cvs at kolab.org  Wed Feb  6 14:06:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 14:06:34 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter AUTHORS,1.1,1.2 
Message-ID: <20080206130634.D2E46600D6D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv28917/php-kolab/Kolab_Filter

Modified Files:
	AUTHORS 
Log Message:
Update some copyright notices for the commits from this year.

Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AUTHORS	16 Aug 2007 12:16:51 -0000	1.1
+++ AUTHORS	6 Feb 2008 13:06:32 -0000	1.2
@@ -5,9 +5,9 @@
 
 Portions based on work by the following people:
 
-  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
-  (c) 2005 - 2006  Richard Bos          <richard at radoeka.nl>
-  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
+  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
+  (c) 2005 - 2008  Richard Bos          <richard at radoeka.nl>
+  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
   (c) 2005 - 2006  Martin Konold        <martin.konold at erfrakon.de>
   (c) 2006         Bernhard Herzog      <bh at intevation.de>
   (c) 2006 - 2007  Gunnar Wrobel        <wrobel at pardus.de>
@@ -34,4 +34,4 @@
  order of appearences is sorted by date of last contribution, longest
  period of contributions and finally based on alphabetical order. The
  listed contributors comitted less than three patches or do not have
- CVS access.)
\ No newline at end of file
+ CVS access.)



From cvs at kolab.org  Wed Feb  6 14:06:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 14:06:34 +0100 (CET)
Subject: gunnar: server/kolabconf AUTHORS,1.2,1.3 
Message-ID: <20080206130634.B7571600D69@lists.intevation.de>

Author: gunnar

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

Modified Files:
	AUTHORS 
Log Message:
Update some copyright notices for the commits from this year.

Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/kolabconf/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AUTHORS	1 Aug 2007 14:31:35 -0000	1.2
+++ AUTHORS	6 Feb 2008 13:06:32 -0000	1.3
@@ -1,6 +1,6 @@
-Originally written by Stuart Bingë <s.binge at codefusion.co.za>
+Originally written by Stuart Bingë <s.binge at codefusion.co.za>
 
-  Copyright (c) 2003 - 2004  Stuart Bingë
+  Copyright (c) 2003 - 2004  Stuart Bingë
   Copyright (c) 2003 - 2004  Code Fusion cc
 
 Portions based on work by the following people:
@@ -9,7 +9,7 @@
   (c) 2003         Achim Frank          <achim.frank at erfrakon.de>
   (c) 2004         Stephan Buys         <s.buys at codefusion.co.za>
   (c) 2005 - 2006  Richard Bos          <richard at radoeka.nl>
-  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
+  (c) 2005 - 2008  Marcus Hüwe          <suse-tux at gmx.de>
   (c) 2004 - 2006  Steffen Hansen       <steffen at klaralvdalens-datakonsult.se>
   (c) 2006 - 2007  Gunnar Wrobel        <wrobel at pardus.de>
   (c) 2003 - 2007  Martin Konold        <martin.konold at erfrakon.de>
@@ -37,4 +37,4 @@
  order of appearences is sorted by date of last contribution, longest
  period of contributions and finally based on alphabetical order. The
  listed contributors comitted less than three patches or do not have
- CVS access.)
\ No newline at end of file
+ CVS access.)



From cvs at kolab.org  Wed Feb  6 14:06:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 14:06:34 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy AUTHORS,1.1,1.2 
Message-ID: <20080206130634.D6B78600D69@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv28917/php-kolab/Kolab_Freebusy

Modified Files:
	AUTHORS 
Log Message:
Update some copyright notices for the commits from this year.

Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AUTHORS	16 Aug 2007 12:16:51 -0000	1.1
+++ AUTHORS	6 Feb 2008 13:06:32 -0000	1.2
@@ -5,12 +5,12 @@
 
 Portions based on work by the following people:
 
-  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
+  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
   (c) 2006         Thomas Jarosch       <thomas.jarosch at intra2net.com>
   (c) 2005 - 2006  Richard Bos          <richard at radoeka.nl>
-  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
+  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
   (c) 2005 - 2006  Martin Konold        <martin.konold at erfrakon.de>
-  (c) 2006 - 2007  Gunnar Wrobel        <wrobel at pardus.de>
+  (c) 2006 - 2008  Gunnar Wrobel        <wrobel at pardus.de>
 
 
 Portions based on work by the following companies:
@@ -18,7 +18,7 @@
   (c) 2004         Code Fusion cc
   (c) 2006         Intra2net AG
   (c) 2005 - 2006  erfrakon Partnerschaftsgesellschaft
-  (c) 2006 - 2007  p at rdus
+  (c) 2006 - 2008  p at rdus
 
 
 Contributions by the following people:
@@ -33,4 +33,4 @@
  order of appearences is sorted by date of last contribution, longest
  period of contributions and finally based on alphabetical order. The
  listed contributors comitted less than three patches or do not have
- CVS access.)
\ No newline at end of file
+ CVS access.)



From cvs at kolab.org  Wed Feb  6 14:06:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 14:06:34 +0100 (CET)
Subject: gunnar: server/perl-kolab AUTHORS,1.3,1.4 
Message-ID: <20080206130634.D1084600D53@lists.intevation.de>

Author: gunnar

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

Modified Files:
	AUTHORS 
Log Message:
Update some copyright notices for the commits from this year.

Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/perl-kolab/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AUTHORS	10 Aug 2007 14:51:59 -0000	1.3
+++ AUTHORS	6 Feb 2008 13:06:32 -0000	1.4
@@ -1,6 +1,6 @@
-Originally written by Stuart Bingë <s.binge at codefusion.co.za>
+Originally written by Stuart Bingë <s.binge at codefusion.co.za>
 
-  Copyright (c) 2003 - 2004  Stuart Bingë
+  Copyright (c) 2003 - 2004  Stuart Bingë
   Copyright (c) 2003 - 2004  Code Fusion cc
 
 Portions based on work by the following people:
@@ -9,9 +9,9 @@
   (c) 2003         Achim Frank          <achim.frank at erfrakon.de>
   (c) 2004         Stephan Buys         <s.buys at codefusion.co.za>
   (c) 2005 - 2006  Richard Bos          <richard at radoeka.nl>
-  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
+  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
   (c) 2004 - 2006  Steffen Hansen       <steffen at klaralvdalens-datakonsult.se>
-  (c) 2007         Thomas Arendsen Hein <thomas at intevation.de>
+  (c) 2007 - 2008  Thomas Arendsen Hein <thomas at intevation.de>
   (c) 2006 - 2007  Gunnar Wrobel        <wrobel at pardus.de>
   (c) 2003 - 2007  Martin Konold        <martin.konold at erfrakon.de>
 
@@ -19,7 +19,7 @@
 Portions based on work by the following companies:
 
   (c) 2004 - 2006  Klaraelvdalens Datakonsult AB
-  (c) 2007         Intevation GmbH
+  (c) 2007 - 2008  Intevation GmbH
   (c) 2006 - 2007  p at rdus
   (c) 2003 - 2007  erfrakon Partnerschaftsgesellschaft
 
@@ -35,4 +35,4 @@
  order of appearences is sorted by date of last contribution, longest
  period of contributions and finally based on alphabetical order. The
  listed contributors comitted less than three patches or do not have
- CVS access.)
\ No newline at end of file
+ CVS access.)



From cvs at kolab.org  Wed Feb  6 14:57:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 14:57:20 +0100 (CET)
Subject: thomas: server release-notes.txt,1.205,1.206 
Message-ID: <20080206135720.38324600D67@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Updated release notes for 2.2-rc2 (currently only kolab/issue1693)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- release-notes.txt	4 Feb 2008 19:45:32 -0000	1.205
+++ release-notes.txt	6 Feb 2008 13:57:18 -0000	1.206
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20080204, Kolab Server 2.2-rc1
+(Version 2008????, Kolab Server 2.2-rc2
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -42,6 +42,21 @@
 	issues found in earlier versions. Additionally all software
 	components have been upgraded to new upstream versions.
 	The specifics are described below.
+
+
+Changes between 2.2-rc-1 and 2.2-rc-2
+
+    - kolabd-2.1.99-2008????
+
+	kolab/issue1693 (Automatically trigger f/b cache regeneration)
+
+    - kolab-freebusy-2.2.rc2-2008????
+
+	kolab/issue1693 (Automatically trigger f/b cache regeneration)
+
+    - php-kolab-2.2.rc2-2008????
+
+	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
 
 Changes between 2.2-beta-3 and 2.2-rc-1



From cvs at kolab.org  Wed Feb  6 15:09:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 15:09:33 +0100 (CET)
Subject: thomas: server install-kolab.sh,1.20,1.21 
Message-ID: <20080206140933.EC3E7600D67@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh 
Log Message:
Bumped version numbers to 2.2-rc1+CVS


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- install-kolab.sh	4 Feb 2008 14:24:27 -0000	1.20
+++ install-kolab.sh	6 Feb 2008 14:09:31 -0000	1.21
@@ -11,7 +11,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2-rc1"
+KOLAB_VERSION="2.2-rc1+CVS"
 KID="19414"
 
 TAG="kolab"



From cvs at kolab.org  Wed Feb  6 15:09:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 15:09:34 +0100 (CET)
Subject: thomas: server/kolab-freebusy Makefile,1.11,1.12 
Message-ID: <20080206140934.03BB6600D6C@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv30581/kolab-freebusy

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc1+CVS


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	4 Feb 2008 14:24:27 -0000	1.11
+++ Makefile	6 Feb 2008 14:09:31 -0000	1.12
@@ -2,7 +2,7 @@
 RELEASE = $(shell date '+%Y%m%d')
 
 VERSION = 2.2.rc1
-CVS = 0
+CVS = 1
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Wed Feb  6 15:09:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 15:09:34 +0100 (CET)
Subject: thomas: server/kolabconf Makefile.PL,1.18,1.19 
Message-ID: <20080206140934.076C5600D6D@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile.PL 
Log Message:
Bumped version numbers to 2.2-rc1+CVS


Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.PL	4 Feb 2008 14:24:27 -0000	1.18
+++ Makefile.PL	6 Feb 2008 14:09:32 -0000	1.19
@@ -12,7 +12,7 @@
 my $KOLAB_BASE_VERSION = "2.2.rc1";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 0;
+my $KOLAB_CVS = 1;
 
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Wed Feb  6 15:09:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 15:09:33 +0100 (CET)
Subject: thomas: server/kolab-filter Makefile,1.10,1.11 
Message-ID: <20080206140933.F3091600D69@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv30581/kolab-filter

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc1+CVS


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	4 Feb 2008 14:24:27 -0000	1.10
+++ Makefile	6 Feb 2008 14:09:31 -0000	1.11
@@ -2,7 +2,7 @@
 RELEASE = $(shell date '+%Y%m%d')
 
 VERSION = 2.2.rc1
-CVS = 0
+CVS = 1
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Wed Feb  6 15:09:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 15:09:34 +0100 (CET)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.13,1.14 
Message-ID: <20080206140934.0B75E600D70@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Bumped version numbers to 2.2-rc1+CVS


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Kolab.pm	4 Feb 2008 14:24:27 -0000	1.13
+++ Kolab.pm	6 Feb 2008 14:09:32 -0000	1.14
@@ -62,7 +62,7 @@
 our $KOLAB_BASE_VERSION = "2.2.rc1";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 0;
+my $KOLAB_CVS = 1;
 
 our $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Wed Feb  6 15:09:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 15:09:34 +0100 (CET)
Subject: thomas: server/php-kolab Makefile,1.16,1.17 
Message-ID: <20080206140934.10C9B600D73@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc1+CVS


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	4 Feb 2008 14:24:27 -0000	1.16
+++ Makefile	6 Feb 2008 14:09:32 -0000	1.17
@@ -5,7 +5,7 @@
 VERSION = 2.2
 PRERELEASE = rc
 PRERELEASE_VERSION = 1
-CVS = 0
+CVS = 1
 
 ifeq "x$(PRERELEASE)" "x"
   ifeq "x$(CVS)" "x0"



From cvs at kolab.org  Wed Feb  6 16:07:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 16:07:58 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/namespace/libexec generatefb.in, 1.2,
	1.3 
Message-ID: <20080206150758.B66CF600D67@lists.intevation.de>

Author: gunnar

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

Modified Files:
	generatefb.in 
Log Message:
Syntax fixes.

Index: generatefb.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/generatefb.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- generatefb.in	6 Feb 2008 11:24:23 -0000	1.2
+++ generatefb.in	6 Feb 2008 15:07:56 -0000	1.3
@@ -57,9 +57,9 @@
     esac
 done
 
-/* Password must be supplied */
-if [ -n "CLI_PASS" ]; then
-    usage();
+# Password must be supplied
+if [ -z "$CLI_PASS" ]; then
+    usage()
 fi
 
 php -c @phpini_dir@/php.ini @freebusy_confdir@/generatefb.php



From cvs at kolab.org  Wed Feb  6 16:21:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 16:21:33 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/namespace/libexec generatefb.in, 1.3,
	1.4 
Message-ID: <20080206152133.30A67600D73@lists.intevation.de>

Author: thomas

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

Modified Files:
	generatefb.in 
Log Message:
syntax_fix++


Index: generatefb.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/generatefb.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- generatefb.in	6 Feb 2008 15:07:56 -0000	1.3
+++ generatefb.in	6 Feb 2008 15:21:30 -0000	1.4
@@ -59,7 +59,7 @@
 
 # Password must be supplied
 if [ -z "$CLI_PASS" ]; then
-    usage()
+    usage
 fi
 
 php -c @phpini_dir@/php.ini @freebusy_confdir@/generatefb.php



From cvs at kolab.org  Wed Feb  6 17:14:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 17:14:33 +0100 (CET)
Subject: thomas: server README.1st,1.73,1.74 
Message-ID: <20080206161433.00476600D70@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Upgrade instructions: Mention f/b cache regeneration.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- README.1st	4 Feb 2008 20:16:27 -0000	1.73
+++ README.1st	6 Feb 2008 16:14:30 -0000	1.74
@@ -124,10 +124,24 @@
 # /kolab/bin/openpkg rc all start
 
 
+Upgrade from 2.2-rc1 to 2.2-rc2
+-------------------------------
+
+Nothing special has to be done for this upgrade, but if you have not
+regenerated the free/busy cache yet (see 2.2-beta3 to 2.2-rc1), you can
+now use the following commands:
+
+FIXME: document "kolab generatefb"
+
+
 Upgrade from 2.2-beta3 to 2.2-rc1
 ---------------------------------
 
-Nothing special has to be done for this upgrade.
+Updating the free/busy cache has to be triggered for all calendar
+folders of all accounts:
+- Users need to create or update an appointment in their folders.
+- Resources can be invited to a new appointment or send them an update
+  to an existing appointment.
 
 
 Upgrade from 2.2-beta2 to 2.2-beta3
@@ -241,6 +255,9 @@
 
     # rm -r /kolab/etc/resmgr
     # rm -r /kolab/etc/proftpd
+
+12. The free/busy cache has to be regenerated for all calendar folders
+    of all accounts, see "Upgrade from 2.2-rc1 to 2.2-rc2" in this file.
 
 Additional hints may be available in the Kolab wiki:
 http://wiki.kolab.org/index.php/Kolab2_Upgrading



From cvs at kolab.org  Wed Feb  6 18:48:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 18:48:56 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/namespace/libexec generatefb.in, 1.4,
	1.5 
Message-ID: <20080206174856.5E9DD60016B@lists.intevation.de>

Author: gunnar

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

Modified Files:
	generatefb.in 
Log Message:
Use @PHP@ as richard suggested ;) and correctly export the CLI variables.

Index: generatefb.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/generatefb.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- generatefb.in	6 Feb 2008 15:21:30 -0000	1.4
+++ generatefb.in	6 Feb 2008 17:48:54 -0000	1.5
@@ -49,10 +49,10 @@
 	    usage
 	    ;;
 	u) # User
-	    export CLI_USER="${OPTARG}"
+	    CLI_USER="${OPTARG}"
 	    ;;
 	p) # Pass
-	    export CLI_PASS="${OPTARG}"
+	    CLI_PASS="${OPTARG}"
 	    ;;
     esac
 done
@@ -62,4 +62,7 @@
     usage
 fi
 
-php -c @phpini_dir@/php.ini @freebusy_confdir@/generatefb.php
+export CLI_USER
+export CLI_PASS
+
+ at PHP@ -c @phpini_dir@/php.ini @freebusy_confdir@/generatefb.php



From cvs at kolab.org  Wed Feb  6 18:49:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  6 Feb 2008 18:49:50 +0100 (CET)
Subject: gunnar: server/kolab-freebusy/freebusy generatefb.php,1.3,1.4 
Message-ID: <20080206174950.55525600D79@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv3186

Modified Files:
	generatefb.php 
Log Message:
Fix the hack for the manager ACLs.

Index: generatefb.php
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/freebusy/generatefb.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- generatefb.php	6 Feb 2008 09:28:52 -0000	1.3
+++ generatefb.php	6 Feb 2008 17:49:48 -0000	1.4
@@ -107,12 +107,29 @@
 
     /* Hack for allowing manager access */
     if ($access->user == 'manager') {
-        $acl = $imap->_imap->getACL($calendar);
+        $imapc = &Kolab_IMAP_Connection::singleton(Kolab::getServer('imap'),
+                                                   $GLOBALS['conf']['kolab']['imap']['port']);
+        if (is_a($imapc, 'PEAR_Error')) {
+            echo "Failed connecting the server!\n";
+            var_dump($imapc->getMessage());
+            exit(-1);
+        }
+        $acl = $imapc->getACL($calendar);
+        if (is_a($acl, 'PEAR_Error')) {
+            echo "Failed accessing calendar \"" . $calendar . "\"!\n";
+            var_dump($acl->getMessage());
+            exit(-1);
+        }
         $oldacl = '';
         if (isset($acl['manager'])) {
             $oldacl = $acl['manager'];
         }
-        $acl['manager'] = 'lrs';
+        $result = $imapc->setACL($calendar, 'manager', 'lrs');
+        if (is_a($result, 'PEAR_Error')) {
+            echo "Failed setting manager ACL to \"lrs\"!\n";
+            var_dump($result->getMessage());
+            exit(-1);
+        }
     }
 
     echo "Regenerating calendar \"" . $calendar . "\"!\n";
@@ -126,13 +143,13 @@
     }
 
     /* Revert the acl  */
-    if ($access->user == 'manager') {
-        $acl = $imap->_imap->getACL($calendar);
-        $oldacl = '';
-        if (isset($acl['manager'])) {
-            $oldacl = $acl['manager'];
+    if ($access->user == 'manager' && $oldacl) {
+        $result = $imapc->setACL($calendar, 'manager', $oldacl);
+        if (is_a($result, 'PEAR_Error')) {
+            echo "Failed resetting manager ACL to \"" . $oldacl . "\"!\n";
+            var_dump($result->getMessage());
+            exit(-1);
         }
-        $acl['manager'] = 'lrs';
     }
 
     if ($failed) {



From cvs at kolab.org  Thu Feb  7 07:04:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 07:04:19 +0100 (CET)
Subject: gunnar: server/kolab-freebusy/freebusy generatefb.php,1.4,1.5 
Message-ID: <20080207060419.CA88E60016A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv4986/freebusy

Modified Files:
	generatefb.php 
Log Message:
Use the correct trigger path when regenerating caches.

Index: generatefb.php
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/freebusy/generatefb.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- generatefb.php	6 Feb 2008 17:49:48 -0000	1.4
+++ generatefb.php	7 Feb 2008 06:04:17 -0000	1.5
@@ -97,8 +97,20 @@
 
     $failed = false;
 
+    /* We are using imap folders for our calendar list but 
+     * the library expects us to follow the tripper format
+     * used by pfb.php
+     */
+    $req_domain = explode('@', $calendar);
+    $domain = $req_domain[1];
+    $req_folder = explode('/', $req_domain[0]);
+    unset($req_folder[0]);
+    $owner = $req_folder[1];
+    unset($req_folder[1]);
+    $trigger = $owner . '@' . $domain . '/' . join('/', $req_folder);
+
     /* Validate folder access */
-    $result = $access->parseFolder($calendar);
+    $result = $access->parseFolder($trigger);
     if (is_a($result, 'PEAR_Error')) {
         echo "Failed accessing calendar \"" . $calendar . "\"!\n";
         var_dump($result);



From cvs at kolab.org  Thu Feb  7 07:04:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 07:04:19 +0100 (CET)
Subject: gunnar: server/kolab-freebusy ChangeLog,1.6,1.7 
Message-ID: <20080207060419.CC0D560016B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv4986

Modified Files:
	ChangeLog 
Log Message:
Use the correct trigger path when regenerating caches.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	6 Feb 2008 09:28:52 -0000	1.6
+++ ChangeLog	7 Feb 2008 06:04:17 -0000	1.7
@@ -1,3 +1,9 @@
+2008-02-07  Gunnar Wrobel  <p at rdus.de>
+
+	* freebusy/generatefb.php:
+
+	Use the correct trigger path.
+
 2008-02-06  Gunnar Wrobel  <p at rdus.de>
 
 	* freebusy/generatefb.php:



From cvs at kolab.org  Thu Feb  7 07:07:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 07:07:04 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog,1.9,1.10 
Message-ID: <20080207060704.C45BF60016B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv5401

Modified Files:
	ChangeLog 
Log Message:
Fixing the path logic for these classes.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	6 Feb 2008 08:00:27 -0000	1.9
+++ ChangeLog	7 Feb 2008 06:07:02 -0000	1.10
@@ -1,3 +1,14 @@
+2008-02-07  Gunnar Wrobel  <p at rdus.de>
+
+	* Freebusy/Cache.php:
+
+	Fix the logic for generating the cache paths.
+
+	* Freebusy/Page.php:
+
+	Move the logic for generating the imap folder path into this
+	class.
+
 2008-02-06  Gunnar Wrobel  <p at rdus.de>
 
 	* Freebusy/Page.php:



From cvs at kolab.org  Thu Feb  7 07:07:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 07:07:04 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php, 1.5,
	1.6 Page.php, 1.3, 1.4 
Message-ID: <20080207060704.DF4F560016B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv5401/Freebusy

Modified Files:
	Cache.php Page.php 
Log Message:
Fixing the path logic for these classes.

Index: Cache.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Cache.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Cache.php	5 Feb 2008 17:04:13 -0000	1.5
+++ Cache.php	7 Feb 2008 06:07:02 -0000	1.6
@@ -48,13 +48,11 @@
 
     function store($access) 
     {
-        $folder = $this->_getFolder($access);
-
         /* Now we really need the free/busy library */
         require_once('Horde/Kolab/Freebusy.php');
 
         $fb = &new Horde_Kolab_Freebusy();
-        $result = $fb->connect($folder);
+        $result = $fb->connect($access->imap_folder);
         if (is_a($result, 'PEAR_Error')) {
             return $result;
         }
@@ -65,7 +63,7 @@
             $vCal;
         }
 
-        $fbfilename = $this->_getFilename($folder, $access->owner);
+        $fbfilename = $this->_getFilename($access->folder, $access->owner);
         
         $c_pvcal = &new FreeBusyCacheFile_pvcal($this->_cache_dir, $fbfilename);
         $c_acl   = &new FreeBusyCacheFile_acl($this->_cache_dir, $fbfilename);
@@ -130,8 +128,8 @@
 
     function &loadPartial(&$access, $extended) 
     {
-        $folder = $this->_getFolder($access);
-        $file = $this->_getFilename($folder, $access->owner);
+        $fbfilename = $this->_getFilename($access->folder, $access->owner);
+
         $aclcache = &FreeBusyCacheDB_acl::singleton('acl', $this->_cache_dir);
 
         $relevant = false;
@@ -144,7 +142,7 @@
 
         if (!$relevant) {
             return PEAR::raiseError(sprintf(_("Folder %s is irrelevant for user %s."),
-                                            $folder, $access->user));
+                                            $access->imap_folder, $access->user));
         }
 
         if ($extended) {
@@ -171,16 +169,21 @@
         }
         $filesnames = array();
 
-        $c_file = $this->_getFilename($access->user, $access->owner);
+        $owner = $access->owner;
+        if (ereg('(.*)@(.*)', $owner, $regs)) {
+            $owner = $regs[2] . '/' . $regs[1];
+        }
+        $user = $access->user;
+        if (ereg('(.*)@(.*)', $user, $regs)) {
+            $user = $regs[2] . '/' . $regs[1];
+        }
+        $c_file = str_replace("\0", '', str_replace('.', '^', $user . '/' . $owner));
+
         $c_vcal = &new FreeBusyCacheFile_vcal($this->_cache_dir, $c_file);
 
         /* If the current vCal cache did not expire, we can deliver it */
         if (!$c_vcal->expired($files)) {
-            $vCal = $c_vcal->loadVcal();
-            if (is_a($vCal, 'PEAR_Error')) {
-                return $vCal;
-            }
-            return $vCal;
+            return $c_vcal->loadVcal();
         }
         
         // Create the new iCalendar.
@@ -276,52 +279,8 @@
         if (ereg('(.*)@(.*)', $owner, $regs)) {
             $owner = $regs[2] . '/' . $regs[1];
         }
-        if ($folder) {
-            if (ereg('(.*)@(.*)', $folder, $regs)) {
-                $folder = $regs[2] . '/' . $regs[1];
-            }
-            $filename = $owner . '/' . $folder;
-        }
         
-        return str_replace("\0", '', str_replace('.', '^', $filename));
-    }
-
-    function _getFolder($access) 
-    {
-        $userdom = false;
-        $ownerdom = false;
-        if (ereg( '(.*)@(.*)', $access->user, $regs)) {
-            // Regular user
-            $user = $regs[1];
-            $userdom  = $regs[2];
-        } else {
-            $user = $access->user;
-        }
-        
-        if(ereg( '(.*)@(.*)', $access->owner, $regs)) {      
-            // Regular owner
-            $owner = $regs[1];
-            $ownerdom = $regs[2];
-        } else {
-            $owner = $access->owner;
-        }
-
-        $fldrcomp = array();
-        if ($user == $owner) {
-            $fldrcomp[] = 'INBOX';
-        } else {
-            $fldrcomp[] = 'user';
-        }
-        
-        if (!empty($access->folder)) {
-            $fldrcomp[] = $access->folder;
-        }
-    
-        $folder = join('/', $fldrcomp);
-        if ($ownerdom && !$userdom) {
-            $folder .= '@' . $ownerdom;
-        }
-        return $folder;
+        return str_replace("\0", '', str_replace('.', '^', $owner . '/' . $folder));
     }
 
     function &_fetchRemote($servers, $access) 

Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Page.php	6 Feb 2008 08:00:27 -0000	1.3
+++ Page.php	7 Feb 2008 06:07:02 -0000	1.4
@@ -191,6 +191,13 @@
     var $folder;
 
     /**
+     * The IMAP path of folder we try to access
+     *
+     * @var string
+     */
+    var $imap_folder;
+
+    /**
      * The requested owner
      *
      * @var string
@@ -459,7 +466,48 @@
         } else {
             $this->groups[] = $this->user;
         }
+        $this->imap_folder = $this->_getImapFolder();
+    }
+
+    function _getImapFolder() 
+    {
+        $userdom = false;
+        $ownerdom = false;
+        if (ereg( '(.*)@(.*)', $this->user, $regs)) {
+            // Regular user
+            $user = $regs[1];
+            $userdom  = $regs[2];
+        } else {
+            $user = $this->user;
+        }
+        
+        if(ereg( '(.*)@(.*)', $this->owner, $regs)) {      
+            // Regular owner
+            $owner = $regs[1];
+            $ownerdom = $regs[2];
+        } else {
+            $owner = $this->owner;
+        }
+
+        $fldrcomp = array();
+        if ($user == $owner) {
+            $fldrcomp[] = 'INBOX';
+        } else {
+            $fldrcomp[] = 'user';
+            $fldrcomp[] = $owner;
+        }
+        
+        if (!empty($this->folder)) {
+            $fldrcomp[] = $this->folder;
+        }
+    
+        $folder = join('/', $fldrcomp);
+        if ($ownerdom && !$userdom) {
+            $folder .= '@' . $ownerdom;
+        }
+        return $folder;
     }
+
 }
 
 class FreeBusyView {



From cvs at kolab.org  Thu Feb  7 08:53:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 08:53:20 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.206,1.207 
Message-ID: <20080207075320.6747060016A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
Allow internal users (also manager) to access free/busy.

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- release-notes.txt	6 Feb 2008 13:57:18 -0000	1.206
+++ release-notes.txt	7 Feb 2008 07:53:18 -0000	1.207
@@ -48,6 +48,8 @@
 
     - kolabd-2.1.99-2008????
 
+	Allow internal users (also manager) to access free/busy.
+
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
     - kolab-freebusy-2.2.rc2-2008????



From cvs at kolab.org  Thu Feb  7 08:53:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 08:53:20 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/templates httpd.conf.template.in, 1.18,
	1.19 
Message-ID: <20080207075320.6A26C60016C@lists.intevation.de>

Author: gunnar

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Allow internal users (also manager) to access free/busy.

Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- httpd.conf.template.in	29 Nov 2007 15:32:11 -0000	1.18
+++ httpd.conf.template.in	7 Feb 2008 07:53:18 -0000	1.19
@@ -211,9 +211,15 @@
 
 <AuthnProviderAlias ldap ldap-mail>
   AuthLDAPURL ldap://@@@ldap_ip@@@:@@@ldap_port@@@/@@@base_dn@@@?mail
+  AuthLDAPBindDN "@@@php_dn@@@"
+  AuthLDAPBindPassword "@@@php_pw@@@"
+  AuthzLDAPAuthoritative off
 </AuthnProviderAlias>
 <AuthnProviderAlias ldap ldap-uid>
   AuthLDAPURL ldap://@@@ldap_ip@@@:@@@ldap_port@@@/@@@base_dn@@@?uid
+  AuthLDAPBindDN "@@@php_dn@@@"
+  AuthLDAPBindPassword "@@@php_pw@@@"
+  AuthzLDAPAuthoritative off
 </AuthnProviderAlias>
 
 <Directory "@webserver_document_root@/freebusy">
@@ -236,9 +242,6 @@
    AuthBasicAuthoritative off
    AuthUserFile /dev/null
    AuthBasicProvider ldap-mail ldap-uid
-   AuthzLDAPAuthoritative off
-   AuthLDAPBindDN "@@@php_dn@@@"
-   AuthLDAPBindPassword "@@@php_pw@@@"
 @@@endif@@@
    AddDefaultCharset Off  
 </Directory>



From cvs at kolab.org  Thu Feb  7 08:53:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 08:53:20 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog,1.138,1.139 
Message-ID: <20080207075320.68ADC60016B@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
Allow internal users (also manager) to access free/busy.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- ChangeLog	6 Feb 2008 11:24:23 -0000	1.138
+++ ChangeLog	7 Feb 2008 07:53:18 -0000	1.139
@@ -1,3 +1,10 @@
+2008-02-07  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/httpd.conf.template.in:
+
+	Allow internal users (also manager) to log in via the apache
+	authentication (only relevant for free/busy).
+
 2008-02-06  Gunnar Wrobel  <p at rdus.de>
 
 	* namespace/libexec/generatefb.in (CLI_PASS):



From cvs at kolab.org  Thu Feb  7 10:04:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 10:04:48 +0100 (CET)
Subject: gunnar: server/kolab-freebusy ChangeLog,1.7,1.8 
Message-ID: <20080207090448.8986160016B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv9672/kolab-freebusy

Modified Files:
	ChangeLog 
Log Message:
Ensure that we are connected to IMAP.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	7 Feb 2008 06:04:17 -0000	1.7
+++ ChangeLog	7 Feb 2008 09:04:46 -0000	1.8
@@ -2,6 +2,8 @@
 
 	* freebusy/generatefb.php:
 
+	Ensure that we are connected to IMAP.
+
 	Use the correct trigger path.
 
 2008-02-06  Gunnar Wrobel  <p at rdus.de>



From cvs at kolab.org  Thu Feb  7 10:04:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 10:04:48 +0100 (CET)
Subject: gunnar: server/kolab-freebusy/freebusy generatefb.php,1.5,1.6 
Message-ID: <20080207090448.8978B60016A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv9672/kolab-freebusy/freebusy

Modified Files:
	generatefb.php 
Log Message:
Ensure that we are connected to IMAP.

Index: generatefb.php
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/freebusy/generatefb.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- generatefb.php	7 Feb 2008 06:04:17 -0000	1.5
+++ generatefb.php	7 Feb 2008 09:04:46 -0000	1.6
@@ -121,6 +121,7 @@
     if ($access->user == 'manager') {
         $imapc = &Kolab_IMAP_Connection::singleton(Kolab::getServer('imap'),
                                                    $GLOBALS['conf']['kolab']['imap']['port']);
+        $imapc->connect($access->user, $access->pass);
         if (is_a($imapc, 'PEAR_Error')) {
             echo "Failed connecting the server!\n";
             var_dump($imapc->getMessage());



From cvs at kolab.org  Thu Feb  7 12:00:30 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 12:00:30 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd/namespace/libexec generatefb.in, 1.5,
	NONE 
Message-ID: <20080207110030.F3B7560016A@lists.intevation.de>

Author: gunnar

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

Removed Files:
	generatefb.in 
Log Message:
Removed the generatefb shell script since it will be recommended to run the script via the web.

--- generatefb.in DELETED ---



From cvs at kolab.org  Thu Feb  7 12:00:30 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 12:00:30 +0100 (CET)
Subject: gunnar: server/kolabd/kolabd ChangeLog, 1.139, 1.140 Makefile.am, 1.37,
	1.38 
Message-ID: <20080207110030.F3C0360016B@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Removed the generatefb shell script since it will be recommended to run the script via the web.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- ChangeLog	7 Feb 2008 07:53:18 -0000	1.139
+++ ChangeLog	7 Feb 2008 11:00:28 -0000	1.140
@@ -1,5 +1,15 @@
 2008-02-07  Gunnar Wrobel  <p at rdus.de>
 
+	* namespace/libexec/generatefb.in:
+
+	Removed the script again because calling the script on the command
+	line destroys ownership of the cache. The recommended way is to
+	call the script via the web.
+
+	* Makefile.am (namespace/libexec/generatefb):
+
+	Removed the generatefb tool again.
+
 	* templates/httpd.conf.template.in:
 
 	Allow internal users (also manager) to log in via the apache

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Makefile.am	6 Feb 2008 08:00:27 -0000	1.37
+++ Makefile.am	7 Feb 2008 11:00:28 -0000	1.38
@@ -85,7 +85,6 @@
 kolabnamespace_FILES = namespace/libexec/newconfig \
 	namespace/libexec/adduser \
 	namespace/libexec/deluser \
-	namespace/libexec/generatefb \
 	namespace/libexec/listusers \
 	namespace/libexec/showuser \
 	namespace/libexec/newconfig \
@@ -268,13 +267,6 @@
 	chmod a+x namespace/libexec/deluser
 CLEANFILES += namespace/libexec/deluser
 EXTRA_DIST += namespace/libexec/deluser.in
-
-namespace/libexec/generatefb: namespace/libexec/generatefb.in
-	@$(mkinstalldirs) namespace/libexec
-	 $(do_subst) <$(srcdir)/namespace/libexec/generatefb.in >$@
-	 chmod a+x namespace/libexec/generatefb
-CLEANFILES += namespace/libexec/generatefb
-EXTRA_DIST += namespace/libexec/generatefb.in
 
 namespace/libexec/listusers: namespace/libexec/listusers.in
 	@$(mkinstalldirs) namespace/libexec



From cvs at kolab.org  Thu Feb  7 12:32:03 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 12:32:03 +0100 (CET)
Subject: thomas: server release-notes.txt,1.207,1.208 
Message-ID: <20080207113203.2937A60016A@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
release notes: hide details about issue1693


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- release-notes.txt	7 Feb 2008 07:53:18 -0000	1.207
+++ release-notes.txt	7 Feb 2008 11:32:00 -0000	1.208
@@ -48,8 +48,6 @@
 
     - kolabd-2.1.99-2008????
 
-	Allow internal users (also manager) to access free/busy.
-
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
     - kolab-freebusy-2.2.rc2-2008????



From cvs at kolab.org  Thu Feb  7 13:24:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 13:24:05 +0100 (CET)
Subject: thomas: server/php-kolab/Kolab_Freebusy/Freebusy Page.php,1.4,1.5 
Message-ID: <20080207122405.A8D28600171@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv21509/Freebusy

Modified Files:
	Page.php 
Log Message:
Remove support for CLI_USER and CLI_PASS variables.
They can be passed as PHP_AUTH_USER/PHP_AUTH_PW.


Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Page.php	7 Feb 2008 06:07:02 -0000	1.4
+++ Page.php	7 Feb 2008 12:24:03 -0000	1.5
@@ -381,10 +381,6 @@
                 list($this->user, $this->pass) = explode(':', $a, 2);
             }
         }
-        if (empty($this->user) && isset($_ENV['CLI_USER']) && isset($_ENV['CLI_PASS'])) {
-            $this->user = $_ENV['CLI_USER'];
-            $this->pass = $_ENV['CLI_PASS'];
-        }
     }
 
     function _process() 



From cvs at kolab.org  Thu Feb  7 13:24:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 13:24:05 +0100 (CET)
Subject: thomas: server/php-kolab/Kolab_Freebusy ChangeLog,1.10,1.11 
Message-ID: <20080207122405.A8486600170@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv21509

Modified Files:
	ChangeLog 
Log Message:
Remove support for CLI_USER and CLI_PASS variables.
They can be passed as PHP_AUTH_USER/PHP_AUTH_PW.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	7 Feb 2008 06:07:02 -0000	1.10
+++ ChangeLog	7 Feb 2008 12:24:03 -0000	1.11
@@ -1,3 +1,8 @@
+2008-02-07  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* Freebusy/Page.php: Remove support for CLI_USER and CLI_PASS
+	variables as they can be passed as PHP_AUTH_USER/PHP_AUTH_PW.
+
 2008-02-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Freebusy/Cache.php:



From cvs at kolab.org  Thu Feb  7 13:30:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  7 Feb 2008 13:30:06 +0100 (CET)
Subject: thomas: server README.1st,1.74,1.75 
Message-ID: <20080207123006.A9E49600170@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Document automatic regeneration of the free/busy cache in 2.2-rc2


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- README.1st	6 Feb 2008 16:14:30 -0000	1.74
+++ README.1st	7 Feb 2008 12:30:04 -0000	1.75
@@ -127,11 +127,21 @@
 Upgrade from 2.2-rc1 to 2.2-rc2
 -------------------------------
 
-Nothing special has to be done for this upgrade, but if you have not
-regenerated the free/busy cache yet (see 2.2-beta3 to 2.2-rc1), you can
-now use the following commands:
+You have to regenerated the free/busy cache, which now can be done
+automatically. First (optional, but recommended) step is to remove the
+current cache below /kolab/var/kolab-freebusy/cache:
 
-FIXME: document "kolab generatefb"
+# su - kolab-n
+$ rm -r /kolab/var/kolab-freebusy/cache/*
+
+Now you can use the following command (still as user kolab-n):
+
+$ PHP_AUTH_USER=manager PHP_AUTH_PW='managerpassword' /kolab/bin/php \
+  -c /kolab/etc/apache/php.ini /kolab/var/kolab/www/freebusy/generatefb.php
+
+As this will show the manager's password on the command line, you can
+alternatively open https://yourserver.example.com/freebusy/generatefb.php
+in a web browser and login as "manager.
 
 
 Upgrade from 2.2-beta3 to 2.2-rc1
@@ -255,6 +265,7 @@
 
     # rm -r /kolab/etc/resmgr
     # rm -r /kolab/etc/proftpd
+    # rm -r /kolab/var/kolab/www/freebusy/cache/*
 
 12. The free/busy cache has to be regenerated for all calendar folders
     of all accounts, see "Upgrade from 2.2-rc1 to 2.2-rc2" in this file.



From cvs at kolab.org  Sat Feb  9 09:02:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 09:02:43 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.140,1.141 
Message-ID: <20080209080243.CD6B6600170@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
removed webdav related configuration settings.
See: https://www.intevation.de/roundup/kolab/issue1686

Approved by Martin Konold, with: "Yes, remove the cruft."



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- ChangeLog	7 Feb 2008 11:00:28 -0000	1.140
+++ ChangeLog	9 Feb 2008 08:02:41 -0000	1.141
@@ -1,3 +1,7 @@
+2008-02-09 Richard Bos <richard at radoeka.nl>
+	* templates/httpd.conf.template.in: removed webdav related configuration
+	settings.  See: https://www.intevation.de/roundup/kolab/issue1686
+
 2008-02-07  Gunnar Wrobel  <p at rdus.de>
 
 	* namespace/libexec/generatefb.in:



From cvs at kolab.org  Sat Feb  9 09:02:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 09:02:43 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates httpd.conf.template.in, 1.19,
	1.20 
Message-ID: <20080209080243.D5027600D4A@lists.intevation.de>

Author: richard

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

Modified Files:
	httpd.conf.template.in 
Log Message:
removed webdav related configuration settings.
See: https://www.intevation.de/roundup/kolab/issue1686

Approved by Martin Konold, with: "Yes, remove the cruft."



Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- httpd.conf.template.in	7 Feb 2008 07:53:18 -0000	1.19
+++ httpd.conf.template.in	9 Feb 2008 08:02:41 -0000	1.20
@@ -227,13 +227,6 @@
    Options None
    # Disallow for everyone as default
    Order allow,deny
-   <Limit GET PUT LOCK UNLOCK PROPFIND HEAD OPTIONS>
-       Allow from all
-@@@if apache-allow-unauthenticated-fb@@@
-@@@else@@@
-       Require valid-user
-@@@endif@@@
-   </Limit>
 @@@if apache-allow-unauthenticated-fb@@@
 @@@else@@@
    AuthType Basic



From cvs at kolab.org  Sat Feb  9 15:10:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:10:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	menu.php, 1.15, 1.16 
Message-ID: <20080209141026.4E7D160016B@lists.intevation.de>

Author: richard

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

Modified Files:
	menu.php 
Log Message:
Changed 'Services' to 'Settings' and 'Manage Services' to 'System Settings'
See, https://intevation.de/roundup/kolab/issue2437



Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- menu.php	17 May 2006 23:15:32 -0000	1.15
+++ menu.php	9 Feb 2008 14:10:24 -0000	1.16
@@ -103,9 +103,9 @@
 									'title' => _('Manage Domain Maintainer') );  
 }
 if( $auth->group() == 'admin' ) {
-  $menuitems['service'] = array( 'name' => _('Services'),
+  $menuitems['service'] = array( 'name' => _('Settings'),
 								 'url'  => $topdir.'/service/',
-								 'title' => _('Manage Services') );
+								 'title' => _('System Settings') );
 }
 
 $menuitems['about'] = array( 'name' => _('About Kolab'),



From cvs at kolab.org  Sat Feb  9 15:10:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:10:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.17, 1.18 
Message-ID: <20080209141026.D7B1160016C@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Changed 'Services' to 'Settings' and 'Manage Services' to 'System Settings'
See, https://intevation.de/roundup/kolab/issue2437



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- messages.po	2 Feb 2008 13:11:00 -0000	1.17
+++ messages.po	9 Feb 2008 14:10:24 -0000	1.18
@@ -2224,11 +2224,11 @@
 msgstr "Administrar mantenedor de dominio"
 
 #: ../include/menu.php:106
-msgid "Services"
+msgid "Settings"
 msgstr "Servicios"
 
 #: ../include/menu.php:108
-msgid "Manage Services"
+msgid "System Settings"
 msgstr "Administrar servicios"
 
 #: ../include/menu.php:111 ../include/menu.php:113



From cvs at kolab.org  Sat Feb  9 15:10:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:10:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.36, 1.37 
Message-ID: <20080209141026.D123160016B@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Changed 'Services' to 'Settings' and 'Manage Services' to 'System Settings'
See, https://intevation.de/roundup/kolab/issue2437



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- messages.po	2 Feb 2008 13:11:00 -0000	1.36
+++ messages.po	9 Feb 2008 14:10:24 -0000	1.37
@@ -2232,12 +2232,12 @@
 msgstr "Domänenverwalter verwalten"
 
 #: ../include/menu.php:106
-msgid "Services"
-msgstr "Dienste"
+msgid "Settings"
+msgstr "Einstellungen"
 
 #: ../include/menu.php:108
-msgid "Manage Services"
-msgstr "Dienste verwalten"
+msgid "System Settings"
+msgstr "System Einstellungen"
 
 #: ../include/menu.php:111 ../include/menu.php:113
 msgid "About Kolab"



From cvs at kolab.org  Sat Feb  9 15:10:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:10:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.19, 1.20 
Message-ID: <20080209141026.E705B60016B@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Changed 'Services' to 'Settings' and 'Manage Services' to 'System Settings'
See, https://intevation.de/roundup/kolab/issue2437



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- messages.po	2 Feb 2008 13:11:00 -0000	1.19
+++ messages.po	9 Feb 2008 14:10:24 -0000	1.20
@@ -2224,11 +2224,11 @@
 msgstr "Gestione Maintainer"
 
 #: ../include/menu.php:106
-msgid "Services"
+msgid "Settings"
 msgstr "Servizi"
 
 #: ../include/menu.php:108
-msgid "Manage Services"
+msgid "System Settings"
 msgstr "Gestione Servizi"
 
 #: ../include/menu.php:111 ../include/menu.php:113



From cvs at kolab.org  Sat Feb  9 15:10:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:10:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.22, 1.23 
Message-ID: <20080209141026.E0DC1600170@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Changed 'Services' to 'Settings' and 'Manage Services' to 'System Settings'
See, https://intevation.de/roundup/kolab/issue2437



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- messages.po	2 Feb 2008 13:11:00 -0000	1.22
+++ messages.po	9 Feb 2008 14:10:24 -0000	1.23
@@ -2245,11 +2245,11 @@
 msgstr "Gérer les mainteneurs"
 
 #: ../include/menu.php:106
-msgid "Services"
+msgid "Settings"
 msgstr "Services"
 
 #: ../include/menu.php:108
-msgid "Manage Services"
+msgid "System Settings"
 msgstr "Gérer les services"
 
 #: ../include/menu.php:111 ../include/menu.php:113



From cvs at kolab.org  Sat Feb  9 15:10:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:10:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.32, 1.33 
Message-ID: <20080209141026.F3CD1600D4A@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Changed 'Services' to 'Settings' and 'Manage Services' to 'System Settings'
See, https://intevation.de/roundup/kolab/issue2437



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- messages.po	2 Feb 2008 13:11:00 -0000	1.32
+++ messages.po	9 Feb 2008 14:10:24 -0000	1.33
@@ -2207,12 +2207,12 @@
 msgstr "Beheer maintainers"
 
 #: ../include/menu.php:106
-msgid "Services"
-msgstr "Diensten"
+msgid "Settings"
+msgstr "Instellingen"
 
 #: ../include/menu.php:108
-msgid "Manage Services"
-msgstr "Beheer services"
+msgid "System Settings"
+msgstr "System Instellingen"
 
 #: ../include/menu.php:111 ../include/menu.php:113
 msgid "About Kolab"



From cvs at kolab.org  Sat Feb  9 15:10:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:10:27 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.72,1.73 
Message-ID: <20080209141027.0205B60016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Changed 'Services' to 'Settings' and 'Manage Services' to 'System Settings'
See, https://intevation.de/roundup/kolab/issue2437



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- ChangeLog	4 Feb 2008 13:44:33 -0000	1.72
+++ ChangeLog	9 Feb 2008 14:10:24 -0000	1.73
@@ -1,3 +1,13 @@
+2008-02-04 Richard Bos <richard at radoeka.nl>
+
+	* php/admin/include/menu.php: Changed 'Services' to 'Settings' and
+	'Manage Services' to 'System Settings'
+	* locale/de/LC_MESSAGES/messages.po, locale/es/LC_MESSAGES/messages.po,
+	locale/fr/LC_MESSAGES/messages.po, locale/it/LC_MESSAGES/messages.po,
+	locale/nl/LC_MESSAGES/messages.po: reflect the change
+	in templates/service.tpl see issue:
+	https://intevation.de/roundup/kolab/issue2437
+
 2008-02-04  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* php/admin/templates/page.tpl.in: Add <link> for favicon.ico.



From cvs at kolab.org  Sat Feb  9 15:15:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat,  9 Feb 2008 15:15:43 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.33, 1.34 
Message-ID: <20080209141543.E476E60016B@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
small correction

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- messages.po	9 Feb 2008 14:10:24 -0000	1.33
+++ messages.po	9 Feb 2008 14:15:41 -0000	1.34
@@ -2212,7 +2212,7 @@
 
 #: ../include/menu.php:108
 msgid "System Settings"
-msgstr "System Instellingen"
+msgstr "Systeem Instellingen"
 
 #: ../include/menu.php:111 ../include/menu.php:113
 msgid "About Kolab"



From cvs at kolab.org  Mon Feb 11 09:20:42 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 09:20:42 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.34, 1.35 
Message-ID: <20080211082042.4D830600165@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
translation correction

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- messages.po	9 Feb 2008 14:15:41 -0000	1.34
+++ messages.po	11 Feb 2008 08:20:40 -0000	1.35
@@ -1767,11 +1767,11 @@
 
 #: ../../../www/admin/sharedfolder/sf.php.in:320
 msgid "Shared folder "
-msgstr "Gedeelde map"
+msgstr "Gedeelde map "
 
 #: ../../../www/admin/sharedfolder/sf.php.in:320
 msgid " marked for deletion"
-msgstr "Aangestipt voor verwijdering"
+msgstr " aangemerkt voor verwijdering"
 
 #: ../../../www/admin/sharedfolder/sf.php.in:324
 #, php-format



From cvs at kolab.org  Mon Feb 11 17:46:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 17:46:53 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter/Filter Content.php,1.4,1.5 
Message-ID: <20080211164653.88033600D7A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv1349/php-kolab/Kolab_Filter/Filter

Modified Files:
	Content.php 
Log Message:
Kolab-Filter: don't reject or rewrite mails from privileged networks.
THIS IS AN PRELIMINARY HOT FIX.  See kolab/issue2466.


Index: Content.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Content.php	30 Jan 2008 21:04:28 -0000	1.4
+++ Content.php	11 Feb 2008 16:46:51 -0000	1.5
@@ -390,6 +390,26 @@
     return sprintf($fmt, $sender);
 }
 
+/** Match IP addresses against Networks in CIDR notation. **/ 
+function match_ip($network, $ip)
+{
+  $iplong = ip2long($ip);
+  $cidr = explode("/", $network);
+  $netiplong = ip2long($cidr[0]);
+  if ( $cidr[1] ) {
+    $iplong = $iplong & ( 0xffffffff << 32 - $cidr[1] );
+    $netiplong = $netiplong & ( 0xffffffff << 32 - $cidr[1] );
+  }
+  if ($iplong == $netiplong)
+    {
+      return TRUE;
+    } 
+  else 
+    {
+      return FALSE;
+    }  
+}
+
 /** Check that the From header is not trying
     to impersonate a valid user that is not
     $sasluser. Returns one of:
@@ -438,6 +458,12 @@
         $kolabhosts = 'localhost';
     }
 
+    if (!empty($conf['filter']['privileged_networks'])) {
+        $privnetworks = $conf['filter']['privileged_networks'];
+    } else {
+        $privnetworks = '127.0.0.0/8';
+    }
+
     /* Allow anything from localhost and
      * fellow Kolab-hosts 
      */
@@ -448,10 +474,16 @@
     $kolabhosts = split(',', $kolabhosts);
     $kolabhosts = array_map('gethostbyname', $kolabhosts );
 
+    $privnetworks = split(',', $privnetworks);
+
     if (array_search($client_addr, $kolabhosts) !== false) {
         return true;
     }
     
+    foreach ($privnetworks as $network)
+      if (match_ip($network, $client_addr))
+        return true;
+
     if ($sasluser) {
         $allowed_addrs = addrs_for_uid($sasluser);
         if ($allowed_addrs instanceof PEAR_Error) {



From cvs at kolab.org  Mon Feb 11 17:46:53 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 17:46:53 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.21,
	1.22 
Message-ID: <20080211164653.88324600D7B@lists.intevation.de>

Author: wilde

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
Kolab-Filter: don't reject or rewrite mails from privileged networks.
THIS IS AN PRELIMINARY HOT FIX.  See kolab/issue2466.


Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- resmgr.conf.template.in	7 Dec 2007 15:44:20 -0000	1.21
+++ resmgr.conf.template.in	11 Feb 2008 16:46:51 -0000	1.22
@@ -70,6 +70,9 @@
 /* List of kolab hosts that are privileged */
 $conf['filter']['kolabhosts'] = '@@@kolabhost|join(,)@@@';
 
+/* List privileged networks */
+$conf['filter']['privileged_networks'] = '@@@postfix-mynetworks|join(,)@@@';
+
 /* Are we using virtual domains with Cyrus? */
 $conf['filter']['virtual_domains'] = true;
 



From cvs at kolab.org  Mon Feb 11 18:34:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:34:45 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.208,1.209 
Message-ID: <20080211173445.9E849600D6F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2467 (Koab Filter ignores configuration in 2.2 RC1)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- release-notes.txt	7 Feb 2008 11:32:00 -0000	1.208
+++ release-notes.txt	11 Feb 2008 17:34:43 -0000	1.209
@@ -57,6 +57,7 @@
     - php-kolab-2.2.rc2-2008????
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
+	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
 
 
 Changes between 2.2-beta-3 and 2.2-rc-1



From cvs at kolab.org  Mon Feb 11 18:34:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:34:45 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.6,1.7 
Message-ID: <20080211173445.A2F8D600D73@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv2706/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
kolab/issue2467 (Koab Filter ignores configuration in 2.2 RC1)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	7 Dec 2007 18:49:21 -0000	1.6
+++ ChangeLog	11 Feb 2008 17:34:43 -0000	1.7
@@ -1,3 +1,19 @@
+2008-02-11  Gunnar Wrobel  <p at rdus.de>
+
+	* tests/_data/forged.eml:
+
+	Test Email for forged sender testing.
+
+	* tests/forged_sender.phpt:
+
+	Add this test for forged sender checking.
+
+	* Filter/*.php:
+
+	Fixed !empty() -> isset() for correct array testing.
+	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
+	https://www.intevation.de/roundup/kolab/issue2467
+
 2007-12-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Filter/Incoming.php:



From cvs at kolab.org  Mon Feb 11 18:34:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:34:45 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests/_data forged.eml, NONE,
	1.1 
Message-ID: <20080211173445.B2ED9600D75@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/tests/_data
In directory doto:/tmp/cvs-serv2706/php-kolab/Kolab_Filter/tests/_data

Added Files:
	forged.eml 
Log Message:
kolab/issue2467 (Koab Filter ignores configuration in 2.2 RC1)

--- NEW FILE: forged.eml ---
Return-Path: <me at example.com>
Received: from localhost (fqdn.example.com [127.0.0.1])
	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
	 Sat, 10 Nov 2007 20:44:52 +0100
Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
From: "Me" <me at example.com>
To: "You" <you at example.com>
Subject: Me to You
Date: Sat, 10 Nov 2007 22:45:12 +0300
User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

test



From cvs at kolab.org  Mon Feb 11 18:34:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:34:46 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Content.php, 1.5,
	1.6 Filter.php, 1.5, 1.6 Incoming.php, 1.8, 1.9 Outlook.php, 1.4, 1.5 
Message-ID: <20080211173446.2774B600D6F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv2706/php-kolab/Kolab_Filter/Filter

Modified Files:
	Content.php Filter.php Incoming.php Outlook.php 
Log Message:
kolab/issue2467 (Koab Filter ignores configuration in 2.2 RC1)

Index: Content.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Content.php	11 Feb 2008 16:46:51 -0000	1.5
+++ Content.php	11 Feb 2008 17:34:43 -0000	1.6
@@ -52,19 +52,19 @@
     {
         global $conf;
 
-        if (!empty($conf['filter']['verify_from_header'])) {
+        if (isset($conf['filter']['verify_from_header'])) {
             $verify_from_header = $conf['filter']['verify_from_header'];
         } else {
             $verify_from_header = true;
         }
 
-        if (!empty($conf['filter']['allow_sender_header'])) {
+        if (isset($conf['filter']['allow_sender_header'])) {
             $allow_sender_header = $conf['filter']['allow_sender_header'];
         } else {
             $allow_sender_header = true;
         }
 
-        if (!empty($conf['filter']['allow_outlook_ical_forward'])) {
+        if (isset($conf['filter']['allow_outlook_ical_forward'])) {
             $allow_outlook_ical_forward = $conf['filter']['allow_outlook_ical_forward'];
         } else {
             $allow_outlook_ical_forward = true;
@@ -99,7 +99,7 @@
                         /* Rewrite from */
                         if (strpos($from, $rc) === false) {
                             Horde::logMessage(sprintf(_("Rewriting '%s' to '%s'"),
-                                                      $from, $to), 
+                                                      $from, $rc), 
                                               __FILE__, __LINE__, PEAR_LOG_DEBUG);
                             $rewrittenfrom = "From: $rc\r\n";
                         }
@@ -191,12 +191,12 @@
     {
         global $conf;
 
-        if (!empty($conf['filter']['smtp_host'])) {
+        if (isset($conf['filter']['smtp_host'])) {
             $host = $conf['filter']['smtp_host'];
         } else {
             $host = 'localhost';
         }
-        if (!empty($conf['filter']['smtp_port'])) {
+        if (isset($conf['filter']['smtp_port'])) {
             $port = $conf['filter']['smtp_port'];
         } else {
             $port = 10025;
@@ -270,13 +270,13 @@
 {
     global $conf;
 
-    if (!empty($conf['filter']['verify_subdomains'])) {
+    if (isset($conf['filter']['verify_subdomains'])) {
         $verify_subdomains = $conf['filter']['verify_subdomains'];
     } else {
         $verify_subdomains = true;
     }
 
-    if (!empty($conf['filter']['email_domain'])) {
+    if (isset($conf['filter']['email_domain'])) {
         $email_domain = $conf['filter']['email_domain'];
     } else {
         $email_domain = 'localhost';
@@ -375,13 +375,13 @@
     global $conf;
 
     if ($sasluser) {
-        if (!empty($conf['filter']['untrusted_subject_insert'])) {
+        if (isset($conf['filter']['untrusted_subject_insert'])) {
             $fmt = $conf['filter']['untrusted_subject_insert'];
         } else {
             $fmt = _("(UNTRUSTED, sender is <%s>)");
         }
     } else {
-        if (!empty($conf['filter']['unauthenticated_subject_insert'])) {
+        if (isset($conf['filter']['unauthenticated_subject_insert'])) {
             $fmt = $conf['filter']['unauthenticated_subject_insert'];
         } else {
             $fmt = _("(UNTRUSTED, sender <%s> is not authenticated)");
@@ -424,7 +424,7 @@
 
     global $conf;
 
-    if (!empty($conf['filter']['email_domain'])) {
+    if (isset($conf['filter']['email_domain'])) {
         $domains = $conf['filter']['email_domain'];
     } else {
         $domains = 'localhost';
@@ -434,25 +434,25 @@
         $domains = array($domains);
     }
   
-    if (!empty($conf['filter']['local_addr'])) {
+    if (isset($conf['filter']['local_addr'])) {
         $local_addr = $conf['filter']['local_addr'];
     } else {
         $local_addr = '127.0.0.1';
     }
 
-    if (!empty($conf['filter']['verify_subdomains'])) {
+    if (isset($conf['filter']['verify_subdomains'])) {
         $verify_subdomains = $conf['filter']['verify_subdomains'];
     } else {
         $verify_subdomains = true;
     }
 
-    if (!empty($conf['filter']['reject_forged_from_headers'])) {
-        $reject_forged_from_headers = $conf['filter']['reject_forged_from_headers'];
+    if (isset($conf['filter']['reject_forged_from_header'])) {
+        $reject_forged_from_header = $conf['filter']['reject_forged_from_header'];
     } else {
-        $reject_forged_from_headers = true;
+        $reject_forged_from_header = true;
     }
 
-    if (!empty($conf['filter']['kolabhosts'])) {
+    if (isset($conf['filter']['kolabhosts'])) {
         $kolabhosts = $conf['filter']['kolabhosts'];
     } else {
         $kolabhosts = 'localhost';
@@ -499,6 +499,7 @@
     foreach ($adrs as $adr) {
         $from = $adr->mailbox . '@' . $adr->host;
         $fromdom = $adr->host;
+
         if ($sasluser) {
             if (!in_array(strtolower($from), $allowed_addrs)) {
                 Horde::logMessage(sprintf(_("%s is not an allowed From address for %s"), 
@@ -510,7 +511,7 @@
                 if (strtolower($fromdom) == $domain 
                     || ($verify_subdomains
                         && substr($fromdom, -strlen($domain)-1) == ".$domain")) {
-                    if ($reject_forged_from_headers) {
+                    if ($reject_forged_from_header) {
                         Horde::logMessage(sprintf(_("%s is not an allowed From address for unauthenticated users."), 
                                                   $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
                         return false;

Index: Filter.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Filter.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Filter.php	28 Nov 2007 15:36:59 -0000	1.5
+++ Filter.php	11 Feb 2008 17:34:43 -0000	1.6
@@ -92,7 +92,7 @@
         ini_set('track_errors', '1');
 
         /* Setup error logging */
-        if (!empty($conf['filter']['error_log'])) {
+        if (isset($conf['filter']['error_log'])) {
             ini_set('log_errors', '1');
             ini_set('error_log', $conf['filter']['error_log']);
         }
@@ -107,7 +107,7 @@
 
         $this->_startts = $this->_microtime_float();
 
-        if (!empty($conf['filter']['tempdir'])) {
+        if (isset($conf['filter']['tempdir'])) {
             $this->_tmpdir = $conf['filter']['tempdir'];
         } else {
             $this->_tmpdir = sys_get_temp_dir();
@@ -120,7 +120,7 @@
         /* This is used as the default domain for unqualified adresses */
         global $_SERVER;
         if (!array_key_exists('SERVER_NAME', $_SERVER)) {
-            if (!empty($conf['filter']['email_domain'])) {
+            if (isset($conf['filter']['email_domain'])) {
                 $_SERVER['SERVER_NAME'] = $conf['filter']['email_domain'];
             } else {
                 $_SERVER['SERVER_NAME'] = 'localhost';
@@ -128,7 +128,7 @@
         }
         
         if (!array_key_exists('REMOTE_ADDR', $_SERVER)) {
-            if (!empty($conf['filter']['server'])) {
+            if (isset($conf['filter']['server'])) {
                 $_SERVER['REMOTE_ADDR'] = $conf['filter']['server'];
             } else {
                 $_SERVER['REMOTE_ADDR'] = 'localhost';
@@ -136,7 +136,7 @@
         }
         
         if (!array_key_exists('REMOTE_HOST', $_SERVER)) {
-            if (!empty($conf['filter']['server'])) {
+            if (isset($conf['filter']['server'])) {
                 $_SERVER['REMOTE_HOST'] = $conf['filter']['server'];
             } else {
                 $_SERVER['REMOTE_HOST'] = 'localhost';
@@ -255,15 +255,15 @@
         }
         $this->_recipients = $recipients;
 
-        if (!empty($options['c'])) {
+        if (isset($options['c'])) {
             $this->_client_address = $options['c'];
         }
         
-        if (!empty($options['h'])) {
+        if (isset($options['h'])) {
             $this->_fqhostname = strtolower($options['h']);
         }
         
-        if (!empty($options['u'])) {
+        if (isset($options['u'])) {
             $this->_sasl_username = strtolower($options['u']);
         }
     }

Index: Incoming.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Incoming.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Incoming.php	7 Dec 2007 18:49:21 -0000	1.8
+++ Incoming.php	11 Feb 2008 17:34:43 -0000	1.9
@@ -159,12 +159,12 @@
     {
         global $conf;
 
-        if (!empty($conf['filter']['lmtp_host'])) {
+        if (isset($conf['filter']['lmtp_host'])) {
             $host = $conf['filter']['lmtp_host'];
         } else {
             $host = 'localhost';
         }
-        if (!empty($conf['filter']['lmtp_port'])) {
+        if (isset($conf['filter']['lmtp_port'])) {
             $port = $conf['filter']['lmtp_port'];
         } else {
             $port = 2003;

Index: Outlook.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Outlook.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Outlook.php	28 Nov 2007 06:06:12 -0000	1.4
+++ Outlook.php	11 Feb 2008 17:34:43 -0000	1.5
@@ -91,7 +91,7 @@
 {
     global $conf;
 
-    if (!empty($conf['filter']['email_domain'])) {
+    if (isset($conf['filter']['email_domain'])) {
         $email_domain = $conf['filter']['email_domain'];
     } else {
         $email_domain = 'localhost';



From cvs at kolab.org  Mon Feb 11 18:34:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:34:45 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests forged_sender.phpt, NONE,
	1.1 
Message-ID: <20080211173445.ACAE2600D74@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/tests
In directory doto:/tmp/cvs-serv2706/php-kolab/Kolab_Filter/tests

Added Files:
	forged_sender.phpt 
Log Message:
kolab/issue2467 (Koab Filter ignores configuration in 2.2 RC1)

--- NEW FILE: forged_sender.phpt ---
--TEST--
Test sending a mail as an untrusted sender.
--SKIPIF--
--FILE--
<?php
require_once 'Kolab/Filter/Content.php';

/* Our test configuration */
$conf = array();
$conf['log']['enabled']          = true;
$conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
$conf['log']['type']             = 'console';
$conf['log']['name']             = 'ignored';
$conf['log']['ident']            = 'Kolab Filter';
$conf['log']['params']['append'] = true;
$conf['filter']['tempdir'] = './tmp';
$conf['filter']['reject_forged_from_header'] = false;
$conf['filter']['email_domain'] = 'example.com';
$_SERVER['argv'] = array('test', '-s', 'me at example.com', '-r', 'you at example.com', '-c', '192.168.178.1');
$logger = Horde::getLogger();

$logger->_lineFormat = '%2$s [%3$s] %7$s';
// Activate this if you need the log information. This will
// make the test fail though
//$logger->_lineFormat = '%2$s [%3$s] %4$s %7$s';

$inh = fopen('_data/forged.eml', 'r');

/* Setup the class */
$parser   = &new Filter_Content('StdOut', true);

/* Parse the mail */
$parser->parse($inh);
?>
--EXPECT--
Kolab Filter [debug] logMessage
Kolab Filter [debug] logMessage
Kolab Filter [debug] logMessage
Kolab Filter [debug] logMessage
Mail from sender: me at example.com
Mail to recipient: you at example.com
Return-Path: <me at example.com>
Received: from localhost (fqdn.example.com [127.0.0.1])
	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
	 Sat, 10 Nov 2007 20:44:52 +0100
Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
From: "Me (UNTRUSTED, sender <me at example.com> is not authenticated)" <me at example.com>
To: "You" <you at example.com>
Subject: Me to You
Date: Sat, 10 Nov 2007 22:45:12 +0300
User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

test
.
Kolab Filter [info] logMessage



From cvs at kolab.org  Mon Feb 11 18:56:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:56:28 +0100 (CET)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.141,1.142 
Message-ID: <20080211175628.60853600D73@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Added ChangeLog entries and release-notes for my last check in:
Kolab-Filter: don't reject or rewrite mails from privileged networks.
See kolab/issue2466.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- ChangeLog	9 Feb 2008 08:02:41 -0000	1.141
+++ ChangeLog	11 Feb 2008 17:56:26 -0000	1.142
@@ -1,3 +1,8 @@
+2008-02-11  Sascha Wilde  <wilde at intevation.de>
+
+	* templates/resmgr.conf.template.in: Added 'privileged_networks',
+	see kolab/issue2466.
+
 2008-02-09 Richard Bos <richard at radoeka.nl>
 	* templates/httpd.conf.template.in: removed webdav related configuration
 	settings.  See: https://www.intevation.de/roundup/kolab/issue1686



From cvs at kolab.org  Mon Feb 11 18:56:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:56:28 +0100 (CET)
Subject: wilde: server release-notes.txt,1.209,1.210 
Message-ID: <20080211175628.64CD1600D74@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Added ChangeLog entries and release-notes for my last check in:
Kolab-Filter: don't reject or rewrite mails from privileged networks.
See kolab/issue2466.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- release-notes.txt	11 Feb 2008 17:34:43 -0000	1.209
+++ release-notes.txt	11 Feb 2008 17:56:26 -0000	1.210
@@ -49,6 +49,7 @@
     - kolabd-2.1.99-2008????
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
+        kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
 
     - kolab-freebusy-2.2.rc2-2008????
 
@@ -58,7 +59,7 @@
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
-
+        kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
 
 Changes between 2.2-beta-3 and 2.2-rc-1
 



From cvs at kolab.org  Mon Feb 11 18:56:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 18:56:28 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter ChangeLog,1.7,1.8 
Message-ID: <20080211175628.5BFE6600D70@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv3141/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
Added ChangeLog entries and release-notes for my last check in:
Kolab-Filter: don't reject or rewrite mails from privileged networks.
See kolab/issue2466.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	11 Feb 2008 17:34:43 -0000	1.7
+++ ChangeLog	11 Feb 2008 17:56:26 -0000	1.8
@@ -14,6 +14,15 @@
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
 	https://www.intevation.de/roundup/kolab/issue2467
 
+2008-02-11  Sascha Wilde  <wilde at intevation.de>
+
+	* Filter/Content.php:
+	Kolab-Filter: don't reject or rewrite mails from privileged
+	networks.
+	Added new function match_ip(), and made verify_sender() use it to
+	match $client_addr against privileged networks.
+	THIS IS AN PRELIMINARY HOT FIX.  See kolab/issue2466.
+
 2007-12-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Filter/Incoming.php:



From cvs at kolab.org  Mon Feb 11 21:44:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 21:44:12 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.35, 1.36 
Message-ID: <20080211204412.9CD61600D42@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
translation update

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- messages.po	11 Feb 2008 08:20:40 -0000	1.35
+++ messages.po	11 Feb 2008 20:44:10 -0000	1.36
@@ -510,27 +510,27 @@
 
 #: tpl_messages.php:105
 msgid "Kolab builds upon many other Free Software projects, namely:"
-msgstr "Kolab is gebaseerd op verschillende Free Software projecten, namelijk:"
+msgstr "Kolab is gebaseerd op verschillende vrije Software projecten, namelijk:"
 
 #: tpl_messages.php:106
 msgid "(Mail Scanner)"
-msgstr "E-mail Scanner"
+msgstr "(E-mail scanner)"
 
 #: tpl_messages.php:107
 msgid "(HTTP Server)"
-msgstr "(HTTP Server)"
+msgstr "(HTTP server)"
 
 #: tpl_messages.php:108
 msgid "(Virus Scanner)"
-msgstr "Virus scanner"
+msgstr "(Virus scanner)"
 
 #: tpl_messages.php:109
 msgid "(IMAP Server)"
-msgstr "(IMAP Server)"
+msgstr "(IMAP server)"
 
 #: tpl_messages.php:110
 msgid "(LDAP Server)"
-msgstr "(LDAP Server)"
+msgstr "(LDAP server)"
 
 #: tpl_messages.php:111
 msgid "(MTA)"
@@ -538,15 +538,15 @@
 
 #: tpl_messages.php:112
 msgid "(SPAM Filter)"
-msgstr "(spam filter)"
+msgstr "(Spam filter)"
 
 #: tpl_messages.php:113
 msgid ""
 "The following projects are used in binding the above together, in order to "
 "create the Kolab Server:"
 msgstr ""
-"De volgende projecten worden gebruikt in verbinding met de bovenstaande, om "
-"zodoende de Kolab server te creëren:"
+"De volgende projecten worden gebruikt om in combinatie met de bovenstaanden projecten "
+"de Kolab server te creëren:"
 
 #: tpl_messages.php:114
 msgid "The following projects are used as a base for the Kolab Clients:"



From cvs at kolab.org  Mon Feb 11 21:51:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 21:51:29 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.73,1.74 
Message-ID: <20080211205129.8E010600D42@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
reflect the change in removed and new rpms:
          @kolab-filter_rpm@
          @kolab-freebusy_rpm@
          @perl-kolab-conf_rpm@
          @php-pear-kolab_filter_rpm@
          @php-pear-kolab_freebusy_rpm@



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ChangeLog	9 Feb 2008 14:10:24 -0000	1.73
+++ ChangeLog	11 Feb 2008 20:51:27 -0000	1.74
@@ -1,3 +1,12 @@
+2008-02-11 Richard Bos <richard at radoeka.nl>
+
+	* www/admin/kolab/versions.php.in: reflect the change in removed and new rpms:
+	  @kolab-filter_rpm@
+	  @kolab-freebusy_rpm@
+	  @perl-kolab-conf_rpm@
+	  @php-pear-kolab_filter_rpm@
+	  @php-pear-kolab_freebusy_rpm@
+
 2008-02-04 Richard Bos <richard at radoeka.nl>
 
 	* php/admin/include/menu.php: Changed 'Services' to 'Settings' and



From cvs at kolab.org  Mon Feb 11 21:51:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 21:51:29 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.6, 1.7 
Message-ID: <20080211205129.92600600D49@lists.intevation.de>

Author: richard

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

Modified Files:
	versions.php.in 
Log Message:
reflect the change in removed and new rpms:
          @kolab-filter_rpm@
          @kolab-freebusy_rpm@
          @perl-kolab-conf_rpm@
          @php-pear-kolab_filter_rpm@
          @php-pear-kolab_freebusy_rpm@



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- versions.php.in	2 Feb 2007 14:50:25 -0000	1.6
+++ versions.php.in	11 Feb 2008 20:51:27 -0000	1.7
@@ -24,7 +24,9 @@
 /**** Page logic ****/
 
 // Remember to keep this list up to date when patching packages!
-$kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_resource_handlers_rpm@ @kolab_webadmin_rpm@" );
+$kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_webadmin_rpm@ @kolab-filter_rpm@ @kolab-freebusy_rpm@ @perl-kolab-conf_rpm@ @php-pear-kolab_filter_rpm@ @php-pear-kolab_freebusy_rpm@" 
+);
+
 $kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
 
 # This is an openpkg test, difficult to see after make.



From cvs at kolab.org  Mon Feb 11 22:11:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 22:11:56 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse, 1.67, 1.68 common, 1.42,
	1.43 
Message-ID: <20080211211156.B0A08600D49@lists.intevation.de>

Author: richard

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

Modified Files:
	suse common 
Log Message:
added autoconf variables for the rpms:
 kolab-filter_rpm, kolab-freebusy_rpm, perl-kolab-conf_rpm,
 php-pear-kolab_filter_rpm and php-pear-kolab_freebusy_rpm



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- suse	31 Jan 2008 15:10:32 -0000	1.67
+++ suse	11 Feb 2008 21:11:54 -0000	1.68
@@ -86,10 +86,15 @@
 kolab_rpm=kolab
 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=root
 kolab_scriptsdir=$(datadir)/kolab/scripts
+kolab-filter_rpm=kolab-filter
+kolab-freebusy_rpm=kolab-freebusy
+perl_kolab_rpm=perl-kolab
+perl-kolab-conf=perl-kolab-conf
+php-pear-kolab_filter_rpm=php5-pear-kolab_filter
+php-pear-kolab_freebusy_rpm=php5-pear-kolab_freebusy
 
 # This variable makes it possible to store all kolab php modules in its own
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just
@@ -153,7 +158,7 @@
 fbview_logfile=${localstatedir}/log/kolab/fbview.log
 freebusy_logdir=${localstatedir}/log/kolab/freebusy
 freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
-freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
+freebusy_cachedir=${localstatedir}/cache/freebusy
 freebusy_usr=wwwrun
 freebusy_grp=root
 

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- common	27 Nov 2007 07:30:24 -0000	1.42
+++ common	11 Feb 2008 21:11:54 -0000	1.43
@@ -77,6 +77,8 @@
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
 	-e 's,[@]imap_usr[@],$(imap_usr),g' \
+	-e 's,[@]kolab-filter_rpm[@],$(kolab-filter_rpm),g' \
+	-e 's,[@]kolab-freebusy_rpm[@],$(kolab-freebusy_rpm),g' \
 	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
@@ -86,7 +88,6 @@
 	-e 's,[@]kolab_php_smarty_prefix[@],$(kolab_php_smarty_prefix),g' \
 	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
 	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
-	-e 's,[@]kolab_resource_handlers_rpm[@],$(kolab_resource_handlers_rpm),g' \
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
 	-e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
@@ -112,6 +113,9 @@
 	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
 	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
 	-e 's,[@]perl_kolab_rpm[@],$(perl_kolab_rpm),g' \
+	-e 's,[@]perl-kolab-conf_rpm[@],$(perl-kolab-conf_rpm),g' \
+	-e 's,[@]php-pear-kolab_filter_rpm[@],$(php-pear-kolab_filter_rpm),g' \
+	-e 's,[@]php-pear-kolab_freebusy_rpm[@],$(php-pear-kolab_freebusy_rpm),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]pki_grp[@],$(pki_grp),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \



From cvs at kolab.org  Mon Feb 11 22:11:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 22:11:56 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.142,1.143 
Message-ID: <20080211211156.9CF4E600D42@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added autoconf variables for the rpms:
 kolab-filter_rpm, kolab-freebusy_rpm, perl-kolab-conf_rpm,
 php-pear-kolab_filter_rpm and php-pear-kolab_freebusy_rpm



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- ChangeLog	11 Feb 2008 17:56:26 -0000	1.142
+++ ChangeLog	11 Feb 2008 21:11:54 -0000	1.143
@@ -1,11 +1,16 @@
+2008-02-11 Richard Bos <richard at radoeka.nl>
+	* dist_conf/common, dist_conf/suse: added autoconf variables for the rpms:
+	  kolab-filter_rpm, kolab-freebusy_rpm, perl-kolab-conf_rpm,
+          php-pear-kolab_filter_rpm and php-pear-kolab_freebusy_rpm
+
 2008-02-11  Sascha Wilde  <wilde at intevation.de>
 
 	* templates/resmgr.conf.template.in: Added 'privileged_networks',
-	see kolab/issue2466.
+	  see kolab/issue2466.
 
 2008-02-09 Richard Bos <richard at radoeka.nl>
 	* templates/httpd.conf.template.in: removed webdav related configuration
-	settings.  See: https://www.intevation.de/roundup/kolab/issue1686
+	  settings.  See: https://www.intevation.de/roundup/kolab/issue1686
 
 2008-02-07  Gunnar Wrobel  <p at rdus.de>
 



From cvs at kolab.org  Mon Feb 11 22:25:24 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 22:25:24 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	versions.tpl.in, 1.1, 1.2 
Message-ID: <20080211212524.A3FB8600D49@lists.intevation.de>

Author: richard

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

Modified Files:
	versions.tpl.in 
Log Message:
The section "Kolab2 Patched OpenPKG Package Versions" should only show up in
the openpkg version of kolab



Index: versions.tpl.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/versions.tpl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- versions.tpl.in	17 Jan 2006 22:06:42 -0000	1.1
+++ versions.tpl.in	11 Feb 2008 21:25:22 -0000	1.2
@@ -9,8 +9,8 @@
 <pre>{$kolabversion}</pre>
 <h1>{tr msg="Kolab2 Groupware Server Component Versions"}</h1>
 <pre>{$kolabversions}</pre>
-<h1>{tr msg="Kolab2 Patched OpenPKG Package Versions"}</h1>
-<pre>{$kolabpatchedversions}</pre>
+ at OPENPKG@<h1>{tr msg="Kolab2 Patched OpenPKG Package Versions"}</h1>
+ at OPENPKG@<pre>{$kolabpatchedversions}</pre>
 @OPENPKG@<h1>{tr msg="OpenPKG Version"}</h1>
 @OPENPKG@<pre>{$openpkgversion}</pre>
 </div>



From cvs at kolab.org  Mon Feb 11 22:25:24 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 11 Feb 2008 22:25:24 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.74,1.75 
Message-ID: <20080211212524.A237F600D42@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
The section "Kolab2 Patched OpenPKG Package Versions" should only show up in
the openpkg version of kolab



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- ChangeLog	11 Feb 2008 20:51:27 -0000	1.74
+++ ChangeLog	11 Feb 2008 21:25:22 -0000	1.75
@@ -6,6 +6,9 @@
 	  @perl-kolab-conf_rpm@
 	  @php-pear-kolab_filter_rpm@
 	  @php-pear-kolab_freebusy_rpm@
+	* www/admin/kolab/versions.php.in:
+	  the section "Kolab2 Patched OpenPKG Package Versions", should only show in
+	  the openpkg version of kolab.
 
 2008-02-04 Richard Bos <richard at radoeka.nl>
 



From cvs at kolab.org  Tue Feb 12 08:39:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 08:39:14 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.8,1.9 
Message-ID: <20080212073914.9FF8B600165@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv27370/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
Added a unit test for the new privileged network setting.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	11 Feb 2008 17:56:26 -0000	1.8
+++ ChangeLog	12 Feb 2008 07:39:12 -0000	1.9
@@ -1,3 +1,14 @@
+2008-02-12  Gunnar Wrobel  <p at rdus.de>
+
+	* tests/privileged_network.phpt:
+
+	Add a test for the privileged network setting.
+
+	* Filter/Content.php:
+
+	Fix !empty() -> isset()
+	Correct to Horde style.
+
 2008-02-11  Gunnar Wrobel  <p at rdus.de>
 
 	* tests/_data/forged.eml:



From cvs at kolab.org  Tue Feb 12 08:39:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 08:39:14 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Content.php,1.6,1.7 
Message-ID: <20080212073914.A22FC600166@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv27370/php-kolab/Kolab_Filter/Filter

Modified Files:
	Content.php 
Log Message:
Added a unit test for the new privileged network setting.

Index: Content.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Content.php	11 Feb 2008 17:34:43 -0000	1.6
+++ Content.php	12 Feb 2008 07:39:12 -0000	1.7
@@ -393,21 +393,17 @@
 /** Match IP addresses against Networks in CIDR notation. **/ 
 function match_ip($network, $ip)
 {
-  $iplong = ip2long($ip);
-  $cidr = explode("/", $network);
-  $netiplong = ip2long($cidr[0]);
-  if ( $cidr[1] ) {
-    $iplong = $iplong & ( 0xffffffff << 32 - $cidr[1] );
-    $netiplong = $netiplong & ( 0xffffffff << 32 - $cidr[1] );
-  }
-  if ($iplong == $netiplong)
-    {
-      return TRUE;
+    $iplong = ip2long($ip);
+    $cidr = explode("/", $network);
+    $netiplong = ip2long($cidr[0]);
+    if ( $cidr[1] ) {
+        $iplong = $iplong & ( 0xffffffff << 32 - $cidr[1] );
+        $netiplong = $netiplong & ( 0xffffffff << 32 - $cidr[1] );
+    }
+    if ($iplong == $netiplong) {
+        return true;
     } 
-  else 
-    {
-      return FALSE;
-    }  
+    return false;
 }
 
 /** Check that the From header is not trying
@@ -458,7 +454,7 @@
         $kolabhosts = 'localhost';
     }
 
-    if (!empty($conf['filter']['privileged_networks'])) {
+    if (isset($conf['filter']['privileged_networks'])) {
         $privnetworks = $conf['filter']['privileged_networks'];
     } else {
         $privnetworks = '127.0.0.0/8';
@@ -480,9 +476,11 @@
         return true;
     }
     
-    foreach ($privnetworks as $network)
-      if (match_ip($network, $client_addr))
-        return true;
+    foreach ($privnetworks as $network) {
+        if (match_ip($network, $client_addr)) {
+            return true;
+        }
+    }
 
     if ($sasluser) {
         $allowed_addrs = addrs_for_uid($sasluser);



From cvs at kolab.org  Tue Feb 12 08:39:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 08:39:14 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests privileged_network.phpt,
	NONE, 1.1 
Message-ID: <20080212073914.9BED660014F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/tests
In directory doto:/tmp/cvs-serv27370/php-kolab/Kolab_Filter/tests

Added Files:
	privileged_network.phpt 
Log Message:
Added a unit test for the new privileged network setting.

--- NEW FILE: privileged_network.phpt ---
--TEST--
Test sending a mail as an untrusted sender.
--SKIPIF--
--FILE--
<?php
require_once 'Kolab/Filter/Content.php';

/* Our test configuration */
$conf = array();
$conf['log']['enabled']          = true;
$conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
$conf['log']['type']             = 'console';
$conf['log']['name']             = 'ignored';
$conf['log']['ident']            = 'Kolab Filter';
$conf['log']['params']['append'] = true;
$conf['filter']['tempdir'] = './tmp';
$conf['filter']['reject_forged_from_header'] = false;
$conf['filter']['email_domain'] = 'example.com';
$conf['filter']['privileged_networks'] = '192.168.0.0/16';
$_SERVER['argv'] = array('test', '-s', 'me at example.com', '-r', 'you at example.com', '-c', '192.168.178.1');
$logger = Horde::getLogger();

$logger->_lineFormat = '%2$s [%3$s] %7$s';
// Activate this if you need the log information. This will
// make the test fail though
//$logger->_lineFormat = '%2$s [%3$s] %4$s %7$s';

$inh = fopen('_data/forged.eml', 'r');

/* Setup the class */
$parser   = &new Filter_Content('StdOut', true);

/* Parse the mail */
$parser->parse($inh);
?>
--EXPECT--
Kolab Filter [debug] logMessage
Kolab Filter [debug] logMessage
Mail from sender: me at example.com
Mail to recipient: you at example.com
Return-Path: <me at example.com>
Received: from localhost (fqdn.example.com [127.0.0.1])
	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
	 Sat, 10 Nov 2007 20:44:52 +0100
Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
From: "Me" <me at example.com>
To: "You" <you at example.com>
Subject: Me to You
Date: Sat, 10 Nov 2007 22:45:12 +0300
User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

test
.
Kolab Filter [info] logMessage



From cvs at kolab.org  Tue Feb 12 10:54:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 10:54:39 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.9,1.10 
Message-ID: <20080212095439.A8322600D78@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv30974/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
Reverted part of yesterday fixes. Otherwise the option parsing in the Kolab filters are not correct. Adjusted unit test to check for that.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	12 Feb 2008 07:39:12 -0000	1.9
+++ ChangeLog	12 Feb 2008 09:54:37 -0000	1.10
@@ -1,5 +1,10 @@
 2008-02-12  Gunnar Wrobel  <p at rdus.de>
 
+	* Filter/Filter.php:
+
+	Reverting fixes from yesterday on this file. For the options we
+	need empty().
+
 	* tests/privileged_network.phpt:
 
 	Add a test for the privileged network setting.



From cvs at kolab.org  Tue Feb 12 10:54:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 10:54:39 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Filter.php,1.6,1.7 
Message-ID: <20080212095439.AA6F3600D7A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv30974/php-kolab/Kolab_Filter/Filter

Modified Files:
	Filter.php 
Log Message:
Reverted part of yesterday fixes. Otherwise the option parsing in the Kolab filters are not correct. Adjusted unit test to check for that.

Index: Filter.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Filter.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Filter.php	11 Feb 2008 17:34:43 -0000	1.6
+++ Filter.php	12 Feb 2008 09:54:37 -0000	1.7
@@ -255,15 +255,15 @@
         }
         $this->_recipients = $recipients;
 
-        if (isset($options['c'])) {
+        if (!empty($options['c'])) {
             $this->_client_address = $options['c'];
         }
         
-        if (isset($options['h'])) {
+        if (!empty($options['h'])) {
             $this->_fqhostname = strtolower($options['h']);
         }
         
-        if (isset($options['u'])) {
+        if (!empty($options['u'])) {
             $this->_sasl_username = strtolower($options['u']);
         }
     }



From cvs at kolab.org  Tue Feb 12 10:54:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 10:54:39 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests forged_sender.phpt, 1.1,
	1.2 
Message-ID: <20080212095439.ABE26600D7B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/tests
In directory doto:/tmp/cvs-serv30974/php-kolab/Kolab_Filter/tests

Modified Files:
	forged_sender.phpt 
Log Message:
Reverted part of yesterday fixes. Otherwise the option parsing in the Kolab filters are not correct. Adjusted unit test to check for that.

Index: forged_sender.phpt
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/tests/forged_sender.phpt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forged_sender.phpt	11 Feb 2008 17:34:43 -0000	1.1
+++ forged_sender.phpt	12 Feb 2008 09:54:37 -0000	1.2
@@ -16,7 +16,7 @@
 $conf['filter']['tempdir'] = './tmp';
 $conf['filter']['reject_forged_from_header'] = false;
 $conf['filter']['email_domain'] = 'example.com';
-$_SERVER['argv'] = array('test', '-s', 'me at example.com', '-r', 'you at example.com', '-c', '192.168.178.1');
+$_SERVER['argv'] = array('test', '-s', 'me at example.com', '-u', '', '-r', 'you at example.com', '-c', '192.168.178.1');
 $logger = Horde::getLogger();
 
 $logger->_lineFormat = '%2$s [%3$s] %7$s';



From cvs at kolab.org  Tue Feb 12 16:08:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 16:08:12 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter AUTHORS,1.2,1.3 
Message-ID: <20080212150812.215BA600D62@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv7756/php-kolab/Kolab_Filter

Modified Files:
	AUTHORS 
Log Message:
Fixed some copyright notices and added a draft on how to use unit testing with this library.

Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AUTHORS	6 Feb 2008 13:06:32 -0000	1.2
+++ AUTHORS	12 Feb 2008 15:08:09 -0000	1.3
@@ -5,29 +5,30 @@
 
 Portions based on work by the following people:
 
-  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
+  (c) 2004         Stuart Bingë         <s.binge at codefusion.co.za>
   (c) 2005 - 2008  Richard Bos          <richard at radoeka.nl>
-  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
+  (c) 2005 - 2006  Marcus Hüwe          <suse-tux at gmx.de>
   (c) 2005 - 2006  Martin Konold        <martin.konold at erfrakon.de>
   (c) 2006         Bernhard Herzog      <bh at intevation.de>
-  (c) 2006 - 2007  Gunnar Wrobel        <wrobel at pardus.de>
+  (c) 2006 - 2008  Gunnar Wrobel        <wrobel at pardus.de>
 
 
 Portions based on work by the following companies:
 
   (c) 2004         Code Fusion cc
   (c) 2005 - 2006  erfrakon Partnerschaftsgesellschaft
-  (c) 2006         Intevation GmbH
-  (c) 2006 - 2007  p at rdus
+  (c) 2006 - 2008  Intevation GmbH
+  (c) 2006 - 2008  p at rdus
 
 
 Contributions by the following people:
 
   Bernhard Reiter <bernhard at intevation.de>
+  Sascha Wilde    <wilde at intevation.de>
 
 
 
-(Established based on the following guidlines:
+(Established based on the following guidelines:
 
  People with CVS access and more than two commits are being listed in
  the first list, their corresponding company in the second list. The



From cvs at kolab.org  Tue Feb 12 16:08:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 16:08:12 +0100 (CET)
Subject: gunnar: server/php-kolab DEVELOPMENT,1.6,1.7 Makefile,1.17,1.18 
Message-ID: <20080212150812.60BDF600D63@lists.intevation.de>

Author: gunnar

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

Modified Files:
	DEVELOPMENT Makefile 
Log Message:
Fixed some copyright notices and added a draft on how to use unit testing with this library.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/php-kolab/DEVELOPMENT,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DEVELOPMENT	17 Oct 2007 09:59:57 -0000	1.6
+++ DEVELOPMENT	12 Feb 2008 15:08:09 -0000	1.7
@@ -4,12 +4,114 @@
 The php-kolab package provides PEAR-style PHP packages as suporting
 libraries for kolab-freebusy, kolab-filter and kolab-webadmin.
 
+
+Change log
+==========
+
+The change log for each package is provided in
+"Kolab_*/ChangeLog". Please keep this file up-to-date if you
+change the source code of this package.
+
+
+Contributors
+============
+
+The developers of the packages are listed in "Kolab_*/AUTHORS". A
+short list is also available in "Kolab_*/package.xml.in". Please keep
+both up-to-date if you change the source code of this package.
+
+
+Unit testing
+============
+
+With changing the code structure over to standard PEAR-style packaging
+we will also continue to add unit tests for some parts of the library.
+
+This provides short instructions on how to use these tests:
+
+1) You need to create a new PEAR environment. Feel free to choose a
+   directory that you like for that. For demonstration purposes we
+   will assume the path is ~/php.
+
+   # pear config-create ~/php ~/.pearrc
+
+   You need to already have a PEAR installation on your base system
+   for that!
+
+   If the operation is successfull, you should see corresponding
+   message at the end of the output:
+
+   ...
+   Successfully created default configuration file "/home/USER/.pearrc"
+
+   Now install the basic PEAR in ~/php:
+
+   # pear install -o PEAR
+
+2) Set some sensible php.ini settings in ~/php/php.ini:
+
+   error_reporting  =  E_ALL
+   display_errors = On
+   error_log = /home/USER/php/php-errors.log
+   include_path = ".:/home/USER/php/pear/php:/usr/share/php5:/usr/share/php"   
+
+   The point here is to make PHP as verbose as possible
+   (error_reporting, display_errors) and to log to file
+   (error_log). The include path needs to contain the path to the new
+   PEAR environment we just installed.
+
+3) Make PHP aware of our new environment by adding these lines to your ~/.bashrc:
+
+   export PATH="~/php/pear:$PATH"
+   alias php="php -c ~/php/php.ini"
+
+   This way PHP will find the new PEAR binaries in ~/php/pear and
+   apply the settings you stored in ~/php/php.ini
+
+   Now run the following to make sure PEAR also picks up your new php.ini file:
+
+   # pear config-set php_bin "`pear config-get php_bin` -c ~/php/php.ini"
+
+4) Install Horde:
+
+   # pear install channel://pear.php.net/Tree-0.3.2
+   # pear install XML_Parser
+   # export CVSROOT=:pserver:cvsread at anoncvs.horde.org:/repository
+   # cvs login
+   (pass: horde)
+   # cvs co framework
+   # cd framework
+   # php -q -d include_path=~/php/pear/php devtools/horde-fw-symlinks.php --copy --src ./ --dest ~/php/pear/php/
+   # cd ..
+
+   We need a Horde installation since the php-kolab PEAR packages rely
+   on some of the Horde functionality. In principle it should also be
+   possible to use a Horde library within your base system but there
+   might be version incompatibilities. It is safer to use a CVS
+   checkout.
+
+5) Checkout php-kolab from CVS or move into your Kolab checkout,
+   install the PEAR module to be tested and run the tests:
+
+   # cvs -d :pserver:anonymous at intevation.de:/home/kroupware/jail/kolabrepository co server/php-kolab
+   # cd server/php-kolab
+   # make test
+
+   There might be failures if you try this the first time. Go into the
+   corresponding "tests" directory and look at the *.out files for any
+   errors that occured while testing.
+
+
+Packaging
+=========
+
 The Kolab Server packages were usually not released as source
 packages. This should be changed with this new package layout. The
 "dist" target will produce a *.tar.gz packages that can be distributed
 as source packages. The same run will produce a php-kolab-*.src.rpm
 package that is suited for installation on an OpenPKG system.
 
+
 Version numbering
 =================
 
@@ -75,16 +177,3 @@
 prereleases. This leads to some weird release numbers on the source
 packages in the prerelease phase.
 
-Change log
-==========
-
-The change log for each package is provided in
-"Kolab_*/ChangeLog". Please keep this file up-to-date if you
-change the source code of this package.
-
-Contributors
-============
-
-The developers of the packages are listed in "Kolab_*/AUTHORS". A
-short list is also available in "Kolab_*/package.xml.in". Please keep
-both up-to-date if you change the source code of this package.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	6 Feb 2008 14:09:32 -0000	1.17
+++ Makefile	12 Feb 2008 15:08:09 -0000	1.18
@@ -108,3 +108,11 @@
 	  > $(@:%-$(SOURCE_TAG).tgz=%)/package.xml
 
 	$(PEAR) package $(@:%-$(SOURCE_TAG).tgz=%)/package.xml
+
+.PHONY: test
+test: test-Kolab_Filter
+
+.PHONY: test-Kolab_Filter
+test-Kolab_Filter: Kolab_Filter-$(SOURCE_TAG).tgz
+	-pear install --force $(@:test-%=%-$(SOURCE_TAG).tgz)
+	cd $(@:test-%=%)/tests && pear run-tests *.phpt



From cvs at kolab.org  Tue Feb 12 16:43:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 16:43:22 +0100 (CET)
Subject: marcus: server/kolabd/kolabd ChangeLog,1.143,1.144 
Message-ID: <20080212154322.9D50E600D65@lists.intevation.de>

Author: marcus

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

Modified Files:
	ChangeLog 
Log Message:
* dist_conf/suse: corrected path to freshclam PidFile + other minor fixes

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- ChangeLog	11 Feb 2008 21:11:54 -0000	1.143
+++ ChangeLog	12 Feb 2008 15:43:20 -0000	1.144
@@ -1,3 +1,6 @@
+2008-02-12 Marcus Hüwe <suse-tux at gmx.de>
+	* dist_conf/suse: corrected path to freshclam PidFile + other minor fixes
+
 2008-02-11 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common, dist_conf/suse: added autoconf variables for the rpms:
 	  kolab-filter_rpm, kolab-freebusy_rpm, perl-kolab-conf_rpm,



From cvs at kolab.org  Tue Feb 12 16:43:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 12 Feb 2008 16:43:22 +0100 (CET)
Subject: marcus: server/kolabd/kolabd/dist_conf suse,1.68,1.69 
Message-ID: <20080212154322.A210C600D67@lists.intevation.de>

Author: marcus

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

Modified Files:
	suse 
Log Message:
* dist_conf/suse: corrected path to freshclam PidFile + other minor fixes

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- suse	11 Feb 2008 21:11:54 -0000	1.68
+++ suse	12 Feb 2008 15:43:20 -0000	1.69
@@ -39,12 +39,12 @@
 sysrundir=${localstatedir}/run
 
 clamav_confdir=${sysconfdir}
-clamav_socket=/var/lib/clamav/clamd-socket
+clamav_socket=${localstatedir}/lib/clamav/clamd-socket
 clamav_logfile=${localstatedir}/log/clamav
-clamav_pidfile=/var/lib/clamav/clamd.pid
-clamav_datadir=/var/lib/clamav
+clamav_pidfile=${localstatedir}/lib/clamav/clamd.pid
+clamav_datadir=${localstatedir}/lib/clamav
 freshclam_logfile=${localstatedir}/log/freshclam.log
-freshclam_pidfile=${sysrundir}/freshclam.pid
+freshclam_pidfile=${localstatedir}/lib/clamav/freshclam.pid
 clamav_rusr=vscan
 clamav_usr=root
 clamav_grp=vscan



From cvs at kolab.org  Wed Feb 13 17:28:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Feb 2008 17:28:29 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter ChangeLog,1.10,1.11 
Message-ID: <20080213162829.6CCC060014F@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv16990/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
Fixed handling of empty sender address 
(caused vacation messages to be marked untrusted).
kolab/issue1272


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	12 Feb 2008 09:54:37 -0000	1.10
+++ ChangeLog	13 Feb 2008 16:28:27 -0000	1.11
@@ -1,3 +1,8 @@
+2008-02-13  Sascha Wilde  <wilde at intevation.de>
+
+	* Filter/Content.php (verify_sender): When no client address is
+	given assume $local_addr as client.
+
 2008-02-12  Gunnar Wrobel  <p at rdus.de>
 
 	* Filter/Filter.php:



From cvs at kolab.org  Wed Feb 13 17:28:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Feb 2008 17:28:29 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter/Filter Content.php,1.7,1.8 
Message-ID: <20080213162829.6CE2960016B@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv16990/php-kolab/Kolab_Filter/Filter

Modified Files:
	Content.php 
Log Message:
Fixed handling of empty sender address 
(caused vacation messages to be marked untrusted).
kolab/issue1272


Index: Content.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Content.php	12 Feb 2008 07:39:12 -0000	1.7
+++ Content.php	13 Feb 2008 16:28:27 -0000	1.8
@@ -436,6 +436,10 @@
         $local_addr = '127.0.0.1';
     }
 
+    if (empty($client_addr)) {
+        $client_addr = $local_addr;
+    }
+
     if (isset($conf['filter']['verify_subdomains'])) {
         $verify_subdomains = $conf['filter']['verify_subdomains'];
     } else {



From cvs at kolab.org  Wed Feb 13 17:35:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Feb 2008 17:35:15 +0100 (CET)
Subject: wilde: server release-notes.txt,1.210,1.211 
Message-ID: <20080213163515.BCD8260014F@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Added notes for latest fix. (kolab/issue1272).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- release-notes.txt	11 Feb 2008 17:56:26 -0000	1.210
+++ release-notes.txt	13 Feb 2008 16:35:13 -0000	1.211
@@ -60,6 +60,7 @@
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
         kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
+	kolab/issue1272 (From: header in vacation messages is marked as "Untrusted") 
 
 Changes between 2.2-beta-3 and 2.2-rc-1
 



From cvs at kolab.org  Wed Feb 13 23:59:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Feb 2008 23:59:51 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.144,1.145 
Message-ID: <20080213225951.3909460014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Changed the rpm suffix _rpm to _pkg so it better describes what it refers to,
also for platforms that use another package management system.
Added the variable kolab_pkgs to add more packages if needed.  This variable
is used in the kolab-webadmin package



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- ChangeLog	12 Feb 2008 15:43:20 -0000	1.144
+++ ChangeLog	13 Feb 2008 22:59:48 -0000	1.145
@@ -1,3 +1,11 @@
+2008-02-13 Richard Bos <richard at radoeka.nl>
+	* dist_conf/suse, dist_conf/common, dist_conf/kolab,
+	  dist_conf/centos-clarkconnect: changed the rpm suffix _rpm to _pkg
+	  so it better describes what it refers to, also for platforms that
+	  use another package management system.
+	* Added the variable kolab_pkgs to add more packages if needed.  This
+	  variable is used in the kolab-webadmin package
+
 2008-02-12 Marcus Hüwe <suse-tux at gmx.de>
 	* dist_conf/suse: corrected path to freshclam PidFile + other minor fixes
 



From cvs at kolab.org  Wed Feb 13 23:59:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 13 Feb 2008 23:59:51 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse, 1.69, 1.70 common, 1.43,
	1.44 centos-clarkconnect, 1.7, 1.8 kolab, 1.54, 1.55 
Message-ID: <20080213225951.516C9600166@lists.intevation.de>

Author: richard

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

Modified Files:
	suse common centos-clarkconnect kolab 
Log Message:
Changed the rpm suffix _rpm to _pkg so it better describes what it refers to,
also for platforms that use another package management system.
Added the variable kolab_pkgs to add more packages if needed.  This variable
is used in the kolab-webadmin package



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- suse	12 Feb 2008 15:43:20 -0000	1.69
+++ suse	13 Feb 2008 22:59:49 -0000	1.70
@@ -32,7 +32,7 @@
 amavisd_rusr=vscan
 amavisd_usr=root
 amavisd_grp=root
-amavisd_rpm=amavisd-new
+amavisd_pkg=amavisd-new
 
 fsl_logfile=${localstatedir}/log/fsl
 
@@ -63,7 +63,7 @@
 emailserver_setgid_grp=maildrop
 emailserver_default_privs=kolab
 emailserver_master_usr=kolab
-emailserver_rpm=postfix
+emailserver_pkg=postfix
 emailserver_tables_usr=root
 
 imap_confdir=${sysconfdir}
@@ -77,24 +77,24 @@
 imap_sievedir=${localstatedir}/lib/sieve
 imap_lmtp=${imap_statedir}/lmtp
 imap_notify_socket=${imap_statedir}/socket/notify
-imap_rpm=cyrus-imapd
+imap_pkg=cyrus-imapd-kolab
 
 kolab_statedir=${localstatedir}/lib/kolab
 kolab_logdir=${localstatedir}/log
 kolab_pidfile=${sysrundir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-kolab_rpm=kolab
-kolab_resource_handlers_rpm=kolab-resource-handlers
-kolab_webadmin_rpm=kolab-webadmin
+kolab_pkg=kolab
+kolab_pkgs=spamassassin openldap2 clamav
+kolab_webadmin_pkg=kolab-webadmin
 kolab_smtpdpolicy_conffile_usr=kolab
 kolab_smtpdpolicy_conffile_grp=root
 kolab_scriptsdir=$(datadir)/kolab/scripts
-kolab-filter_rpm=kolab-filter
-kolab-freebusy_rpm=kolab-freebusy
-perl_kolab_rpm=perl-kolab
-perl-kolab-conf=perl-kolab-conf
-php-pear-kolab_filter_rpm=php5-pear-kolab_filter
-php-pear-kolab_freebusy_rpm=php5-pear-kolab_freebusy
+kolab-filter_pkg=kolab-filter
+kolab-freebusy_pkg=kolab-freebusy
+perl_kolab_pkg=perl-kolab
+perl-kolab-conf_pkg=perl-kolab-conf
+php-pear-kolab_filter_pkg=php5-pear-kolab_filter
+php-pear-kolab_freebusy_pkg=php5-pear-kolab_freebusy
 
 # This variable makes it possible to store all kolab php modules in its own
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just
@@ -135,7 +135,7 @@
 webserver_musr=wwwrun
 webserver_usr=wwwrun
 webserver_grp=www
-webserver_rpm=apache2
+webserver_pkg=apache2
 
 phpini_dir=${sysconfdir}/php5/cli
 phplibdir=${datadir}/php5

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- common	11 Feb 2008 21:11:54 -0000	1.43
+++ common	13 Feb 2008 22:59:49 -0000	1.44
@@ -26,7 +26,7 @@
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
 	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
-	-e 's,[@]amavisd_rpm[@],$(amavisd_rpm),g' \
+	-e 's,[@]amavisd_pkg[@],$(amavisd_pkg),g' \
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
 	-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
@@ -49,7 +49,7 @@
 	-e 's,[@]emailserver_mail_owner[@],$(emailserver_mail_owner),g' \
 	-e 's,[@]emailserver_master_usr[@],$(emailserver_master_usr),g' \
 	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
-	-e 's,[@]emailserver_rpm[@],$(emailserver_rpm),g' \
+	-e 's,[@]emailserver_pkg[@],$(emailserver_pkg),g' \
 	-e 's,[@]emailserver_setgid_grp[@],$(emailserver_setgid_grp),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
 	-e 's,[@]emailserver_tables_usr[@],$(emailserver_tables_usr),g' \
@@ -72,13 +72,13 @@
 	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
 	-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
 	-e 's,[@]imap_notify_socket[@],$(imap_notify_socket),g' \
-	-e 's,[@]imap_rpm[@],$(imap_rpm),g' \
+	-e 's,[@]imap_pkg[@],$(imap_pkg),g' \
 	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
 	-e 's,[@]imap_usr[@],$(imap_usr),g' \
-	-e 's,[@]kolab-filter_rpm[@],$(kolab-filter_rpm),g' \
-	-e 's,[@]kolab-freebusy_rpm[@],$(kolab-freebusy_rpm),g' \
+	-e 's,[@]kolab-filter_pkg[@],$(kolab-filter_pkg),g' \
+	-e 's,[@]kolab-freebusy_pkg[@],$(kolab-freebusy_pkg),g' \
 	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
@@ -89,7 +89,8 @@
 	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
 	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
-	-e 's,[@]kolab_rpm[@],$(kolab_rpm),g' \
+	-e 's,[@]kolab_pkg[@],$(kolab_pkg),g' \
+	-e 's,[@]kolab_pkgs[@],$(kolab_pkgs),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
 	-e 's,[@]kolab_scriptsdir[@],$(kolab_scriptsdir),g' \
 	-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
@@ -97,7 +98,7 @@
 	-e 's,[@]kolab_smtpdpolicy_conffile_usr[@],$(kolab_smtpdpolicy_conffile_usr),g' \
 	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
 	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
-	-e 's,[@]kolab_webadmin_rpm[@],$(kolab_webadmin_rpm),g' \
+	-e 's,[@]kolab_webadmin_pkg[@],$(kolab_webadmin_pkg),g' \
 	-e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
 	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
 	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
@@ -112,10 +113,10 @@
 	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
 	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
 	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
-	-e 's,[@]perl_kolab_rpm[@],$(perl_kolab_rpm),g' \
-	-e 's,[@]perl-kolab-conf_rpm[@],$(perl-kolab-conf_rpm),g' \
-	-e 's,[@]php-pear-kolab_filter_rpm[@],$(php-pear-kolab_filter_rpm),g' \
-	-e 's,[@]php-pear-kolab_freebusy_rpm[@],$(php-pear-kolab_freebusy_rpm),g' \
+	-e 's,[@]perl_kolab_pkg[@],$(perl_kolab_pkg),g' \
+	-e 's,[@]perl-kolab-conf_pkg[@],$(perl-kolab-conf_pkg),g' \
+	-e 's,[@]php-pear-kolab_filter_pkg[@],$(php-pear-kolab_filter_pkg),g' \
+	-e 's,[@]php-pear-kolab_freebusy_pkg[@],$(php-pear-kolab_freebusy_pkg),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]pki_grp[@],$(pki_grp),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
@@ -139,7 +140,7 @@
 	-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
 	-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
 	-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
-	-e 's,[@]webserver_rpm[@],$(webserver_rpm),g' \
+	-e 's,[@]webserver_pkg[@],$(webserver_pkg),g' \
 	-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
 	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
 	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \

Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- centos-clarkconnect	17 Oct 2007 17:57:13 -0000	1.7
+++ centos-clarkconnect	13 Feb 2008 22:59:49 -0000	1.8
@@ -60,7 +60,7 @@
 amavisd_rusr=amavis
 amavisd_usr=root
 amavisd_grp=amavis
-amavisd_rpm=amavisd-new
+amavisd_pkg=amavisd-new
 
 # TODO: what is this? 
 fsl_logfile=/var/log/fsl/fsl.log
@@ -104,7 +104,7 @@
 emailserver_setgid_grp=postdrop
 emailserver_default_privs=nobody
 emailserver_master_usr=kolab-n
-emailserver_rpm=postfix
+emailserver_pkg=postfix
 
 # TODO: is this still used?
 emailserver_musr=is_this_still_used
@@ -124,7 +124,7 @@
 imap_spool=${localstatedir}/spool/imap
 imap_sievedir=${localstatedir}/lib/imap/sieve
 imap_lmtp=${imap_statedir}/socket/lmtp
-imap_rpm=cyrus-imapd
+imap_pkg=cyrus-imapd
 
 #--------------------------------------------------------------------
 # Kolab
@@ -140,10 +140,9 @@
 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_pkg=kolabd
+kolab_webadmin_pkg=kolab-webadmin
+perl_kolab_pkg=perl-kolab
 kolab_smtpdpolicy_conffile_usr=kolab
 kolab_smtpdpolicy_conffile_grp=filter
 kolab_scriptsdir=${datadir}/kolab/scripts
@@ -193,7 +192,7 @@
 webserver_musr=kolab
 webserver_usr=root
 webserver_grp=root
-webserver_rpm=httpd
+webserver_pkg=httpd
 webserver_confdir=/usr/webconfig/etc
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 webserver_sslscache=/var/cache/mod_ssl/scache

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- kolab	27 Nov 2007 07:30:24 -0000	1.54
+++ kolab	13 Feb 2008 22:59:49 -0000	1.55
@@ -35,7 +35,7 @@
 amavisd_usr=${kolab_musr}
 # @l_rgrp@
 amavisd_grp=${kolab_rgrp}
-amavisd_rpm=amavisd
+amavisd_pkg=amavisd
 
 
 fsl_logfile=${localstatedir}/fsl/fsl.log
@@ -73,7 +73,7 @@
 emailserver_setgid_grp=${kolab_rgrp}
 emailserver_default_privs=${kolab_usr}
 emailserver_master_usr=${kolab_usr}
-emailserver_rpm=postfix
+emailserver_pkg=postfix
 emailserver_tables_usr=${kolab_susr}
 
 imap_confdir=${sysconfdir}/imapd
@@ -89,17 +89,16 @@
 imap_sievedir=${imap_statedir}/sieve
 imap_lmtp=${imap_statedir}/lmtp
 imap_notify_socket=${imap_statedir}/socket/notify
-imap_rpm=imapd
+imap_pkg=imapd
 
 
 kolab_statedir=${localstatedir}/kolab
 kolab_logdir=${kolab_statedir}/log
 kolab_pidfile=${kolab_statedir}/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_pkg=kolabd
+kolab_webadmin_pkg=kolab-webadmin
+perl_kolab_pkg=perl-kolab
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
@@ -143,7 +142,7 @@
 webserver_musr=${kolab_musr}
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
-webserver_rpm=apache
+webserver_pkg=apache
 
 phpini_dir=${sysconfdir}/apache
 phplibdir=${libdir}/php



From cvs at kolab.org  Thu Feb 14 00:01:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Feb 2008 00:01:59 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.7, 1.8 
Message-ID: <20080213230159.2CB8A600D42@lists.intevation.de>

Author: richard

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

Modified Files:
	versions.php.in 
Log Message:
reflect the change in package variable name (new suffix _pkg instead of _rpm).
Added the variable kolab_pkgs, and splitted the name and version in the output.



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- versions.php.in	11 Feb 2008 20:51:27 -0000	1.7
+++ versions.php.in	13 Feb 2008 23:01:57 -0000	1.8
@@ -24,8 +24,25 @@
 /**** Page logic ****/
 
 // Remember to keep this list up to date when patching packages!
-$kolabversions = shell_exec("@RPM@ -q @perl_kolab_rpm@ @kolab_rpm@ @kolab_webadmin_rpm@ @kolab-filter_rpm@ @kolab-freebusy_rpm@ @perl-kolab-conf_rpm@ @php-pear-kolab_filter_rpm@ @php-pear-kolab_freebusy_rpm@" 
-);
+// The variable @kolab_pkgs@ is used to collect a packages that make up the
+// kolab groupware server.
+$kolabversions = shell_exec('
+  @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+    @kolab_pkgs@ \
+    @amavisd_pkg@ \
+    @emailserver_pkg@ \
+    @imap_pkg@ \
+    @webserver_pkg@ \
+    @kolab_pkg@ \
+    @kolab_webadmin_pkg@ \
+    @kolab-filter_pkg@ \
+    @kolab-freebusy_pkg@ \
+    @perl-kolab-conf_pkg@ \
+    @perl_kolab_pkg@ \
+    @php-pear-kolab_filter_pkg@ \
+    @php-pear-kolab_freebusy_pkg@ |
+    sort
+');
 
 $kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
 



From cvs at kolab.org  Thu Feb 14 00:01:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Feb 2008 00:01:59 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.75,1.76 
Message-ID: <20080213230159.2810F600166@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
reflect the change in package variable name (new suffix _pkg instead of _rpm).
Added the variable kolab_pkgs, and splitted the name and version in the output.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ChangeLog	11 Feb 2008 21:25:22 -0000	1.75
+++ ChangeLog	13 Feb 2008 23:01:56 -0000	1.76
@@ -1,3 +1,9 @@
+2008-02-13 Richard Bos <richard at radoeka.nl>
+
+	* www/admin/kolab/versions.php.in: reflect the change in package
+	  variable name (new suffix _pkg instead of _rpm).  Added the variable
+	  kolab_pkgs, and splitted the name and version in the output
+
 2008-02-11 Richard Bos <richard at radoeka.nl>
 
 	* www/admin/kolab/versions.php.in: reflect the change in removed and new rpms:



From cvs at kolab.org  Thu Feb 14 18:33:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Feb 2008 18:33:08 +0100 (CET)
Subject: wilde: server/perl-kolab ChangeLog,1.27,1.28 
Message-ID: <20080214173308.94426600D42@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Fixed bug in Kolab::Cyrus which caused create() to fail.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	4 Feb 2008 16:40:18 -0000	1.27
+++ ChangeLog	14 Feb 2008 17:33:06 -0000	1.28
@@ -1,3 +1,8 @@
+2008-02-14  Sascha Wilde  <wilde at intevation.de>
+
+	* lib/Kolab/Cyrus.pm (create): Added call to reloadConfig, without
+	this create failed (as $Kolab::config returned empty values).
+
 2008-02-04  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* lib/Kolab/LDAP.pm: Fix synchronization of mailboxes with newer perl.



From cvs at kolab.org  Thu Feb 14 18:33:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Feb 2008 18:33:08 +0100 (CET)
Subject: wilde: server release-notes.txt,1.211,1.212 
Message-ID: <20080214173308.950B9600D43@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Fixed bug in Kolab::Cyrus which caused create() to fail.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- release-notes.txt	13 Feb 2008 16:35:13 -0000	1.211
+++ release-notes.txt	14 Feb 2008 17:33:06 -0000	1.212
@@ -55,6 +55,10 @@
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
+    - perl-kolab-2.2.rc2-2008????
+
+        Fixed a bug in Kolab::Cyrus which cased create() to fail.
+
     - php-kolab-2.2.rc2-2008????
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)



From cvs at kolab.org  Thu Feb 14 18:33:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Feb 2008 18:33:08 +0100 (CET)
Subject: wilde: server/perl-kolab/lib/Kolab Cyrus.pm,1.2,1.3 
Message-ID: <20080214173308.95163600D46@lists.intevation.de>

Author: wilde

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

Modified Files:
	Cyrus.pm 
Log Message:
Fixed bug in Kolab::Cyrus which caused create() to fail.


Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Cyrus.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Cyrus.pm	8 Oct 2007 15:50:11 -0000	1.2
+++ Cyrus.pm	14 Feb 2008 17:33:06 -0000	1.3
@@ -58,6 +58,7 @@
 {
     Kolab::log('Y', 'Connecting to local Cyrus admin interface');
 
+    Kolab::reloadConfig("/kolab/etc/kolab/kolab.globals");
     my $cyrus = Cyrus::IMAP::Admin->new($Kolab::config{'connect_addr'});
 
     if (!$cyrus) {



From cvs at kolab.org  Thu Feb 14 19:36:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Feb 2008 19:36:58 +0100 (CET)
Subject: richard: server/perl-kolab/lib/Kolab Cyrus.pm,1.3,1.4 
Message-ID: <20080214183658.AE17F60016B@lists.intevation.de>

Author: richard

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

Modified Files:
	Cyrus.pm 
Log Message:
added a FIXME as the previous update works on openpkg installations only.



Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Cyrus.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Cyrus.pm	14 Feb 2008 17:33:06 -0000	1.3
+++ Cyrus.pm	14 Feb 2008 18:36:56 -0000	1.4
@@ -58,6 +58,7 @@
 {
     Kolab::log('Y', 'Connecting to local Cyrus admin interface');
 
+    # FIXME FIXME FIXME: this only works on openpkg installs
     Kolab::reloadConfig("/kolab/etc/kolab/kolab.globals");
     my $cyrus = Cyrus::IMAP::Admin->new($Kolab::config{'connect_addr'});
 



From cvs at kolab.org  Thu Feb 14 19:36:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 14 Feb 2008 19:36:58 +0100 (CET)
Subject: richard: server/perl-kolab ChangeLog,1.28,1.29 
Message-ID: <20080214183658.AE1FB60016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added a FIXME as the previous update works on openpkg installations only.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	14 Feb 2008 17:33:06 -0000	1.28
+++ ChangeLog	14 Feb 2008 18:36:56 -0000	1.29
@@ -1,3 +1,8 @@
+2008-02-14  Richard Bos <richard at radoeka.nl>
+
+	* lib/Kolab/Cyrus.pm (create): added a FIXME as the previous update
+	  works on openpkg installations only.
+
 2008-02-14  Sascha Wilde  <wilde at intevation.de>
 
 	* lib/Kolab/Cyrus.pm (create): Added call to reloadConfig, without



From cvs at kolab.org  Fri Feb 15 09:52:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Feb 2008 09:52:22 +0100 (CET)
Subject: wilde: server/perl-kolab ChangeLog,1.29,1.30 
Message-ID: <20080215085222.2FF27600D69@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Reverted change to Cyrus.pm (was totally wrong, sorry).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	14 Feb 2008 18:36:56 -0000	1.29
+++ ChangeLog	15 Feb 2008 08:52:20 -0000	1.30
@@ -1,7 +1,7 @@
-2008-02-14  Richard Bos <richard at radoeka.nl>
+2008-02-15  Sascha Wilde  <wilde at intevation.de>
 
-	* lib/Kolab/Cyrus.pm (create): added a FIXME as the previous update
-	  works on openpkg installations only.
+	* lib/Kolab/Cyrus.pm (create): Reverted last change. (It was
+	totally wrong and kolab even refused to start...).
 
 2008-02-14  Sascha Wilde  <wilde at intevation.de>
 



From cvs at kolab.org  Fri Feb 15 09:52:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Feb 2008 09:52:22 +0100 (CET)
Subject: wilde: server/perl-kolab/lib/Kolab Cyrus.pm,1.4,1.5 
Message-ID: <20080215085222.2E951600D47@lists.intevation.de>

Author: wilde

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

Modified Files:
	Cyrus.pm 
Log Message:
Reverted change to Cyrus.pm (was totally wrong, sorry).


Index: Cyrus.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Cyrus.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Cyrus.pm	14 Feb 2008 18:36:56 -0000	1.4
+++ Cyrus.pm	15 Feb 2008 08:52:19 -0000	1.5
@@ -58,8 +58,6 @@
 {
     Kolab::log('Y', 'Connecting to local Cyrus admin interface');
 
-    # FIXME FIXME FIXME: this only works on openpkg installs
-    Kolab::reloadConfig("/kolab/etc/kolab/kolab.globals");
     my $cyrus = Cyrus::IMAP::Admin->new($Kolab::config{'connect_addr'});
 
     if (!$cyrus) {



From cvs at kolab.org  Fri Feb 15 09:52:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Feb 2008 09:52:22 +0100 (CET)
Subject: wilde: server release-notes.txt,1.212,1.213 
Message-ID: <20080215085222.321AF600D6B@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Reverted change to Cyrus.pm (was totally wrong, sorry).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- release-notes.txt	14 Feb 2008 17:33:06 -0000	1.212
+++ release-notes.txt	15 Feb 2008 08:52:20 -0000	1.213
@@ -55,10 +55,6 @@
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
-    - perl-kolab-2.2.rc2-2008????
-
-        Fixed a bug in Kolab::Cyrus which cased create() to fail.
-
     - php-kolab-2.2.rc2-2008????
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)



From cvs at kolab.org  Fri Feb 15 10:46:34 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Feb 2008 10:46:34 +0100 (CET)
Subject: wilde: utils/admin kolab-mailboxinfo.pl,1.3,1.4 
Message-ID: <20080215094634.9A3AA60014F@lists.intevation.de>

Author: wilde

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

Modified Files:
	kolab-mailboxinfo.pl 
Log Message:
Reload config at startup (needed for server 2.2).


Index: kolab-mailboxinfo.pl
===================================================================
RCS file: /kolabrepository/utils/admin/kolab-mailboxinfo.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab-mailboxinfo.pl	30 Jan 2008 15:22:32 -0000	1.3
+++ kolab-mailboxinfo.pl	15 Feb 2008 09:46:32 -0000	1.4
@@ -13,8 +13,11 @@
 #
 # $Id$
 
+use Kolab;
 use Kolab::Cyrus;
 use Getopt::Std;
+
+Kolab::reloadConfig("/kolab/etc/kolab/kolab.globals");
 
 my $cyrus = Kolab::Cyrus::create;
 $cyrus || die 'Unable to login to Cyrus IMAP server\n';



From cvs at kolab.org  Fri Feb 15 22:34:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 15 Feb 2008 22:34:04 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.36, 1.37 
Message-ID: <20080215213404.38E9C600168@lists.intevation.de>

Author: richard

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

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

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- messages.po	11 Feb 2008 20:44:10 -0000	1.36
+++ messages.po	15 Feb 2008 21:34:01 -0000	1.37
@@ -768,7 +768,7 @@
 
 #: tpl_messages.php:151
 msgid "Service"
-msgstr "Dienst"
+msgstr "Service"
 
 #: tpl_messages.php:152
 msgid "Enabled"
@@ -789,16 +789,16 @@
 
 #: tpl_messages.php:158
 msgid "Free/Busy settings"
-msgstr "Vrij/bezig instellingen"
+msgstr "Vrij/bezet instellingen"
 
 #: tpl_messages.php:159
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
-"Laat een niet geautentificeerde downloading toe van vrij/bezig informatie  "
+"Laat niet ge-authenticeerde downloading toe van vrij/bezet informatie  "
 
 #: tpl_messages.php:161
 msgid "When creating free/busy lists, include data from"
-msgstr "Wanneer vrij/bezig lijsten worden gecreëerd, voeg gegevens in van"
+msgstr "Wanneer vrij/bezet lijsten worden gecreëerd, voeg gegevens in van"
 
 #: tpl_messages.php:162
 msgid "days in the past"



From cvs at kolab.org  Sat Feb 16 12:10:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 12:10:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	menu.php, 1.16, 1.17 
Message-ID: <20080216111045.15D29600D43@lists.intevation.de>

Author: richard

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

Modified Files:
	menu.php 
Log Message:
removed the bold formatting around Versions.



Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- menu.php	9 Feb 2008 14:10:24 -0000	1.16
+++ menu.php	16 Feb 2008 11:10:43 -0000	1.17
@@ -124,7 +124,7 @@
 													   'url'  => 'kde.php' )
 												));
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
-  $menuitems['about']['submenu'][] = array( 'name' => _('<b>Versions</b>'),
+  $menuitems['about']['submenu'][] = array( 'name' => _('Versions'),
 											'url'  => 'versions.php' );
 }
 



From cvs at kolab.org  Sat Feb 16 12:10:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 12:10:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.76,1.77 
Message-ID: <20080216111045.14EF4600D42@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
removed the bold formatting around Versions.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- ChangeLog	13 Feb 2008 23:01:56 -0000	1.76
+++ ChangeLog	16 Feb 2008 11:10:42 -0000	1.77
@@ -1,3 +1,12 @@
+2008-02-16 Richard Bos <richard at radoeka.nl>
+
+	* php/admin/include/menu.php: removed the bold formatting around
+	  Versions.
+	* locale/de/LC_MESSAGES/messages.po, locale/es/LC_MESSAGES/messages.po,
+	  locale/fr/LC_MESSAGES/messages.po, locale/it/LC_MESSAGES/messages.po,
+	  locale/nl/LC_MESSAGES/messages.po: reflect the change
+	  in templates/menu.tpl
+
 2008-02-13 Richard Bos <richard at radoeka.nl>
 
 	* www/admin/kolab/versions.php.in: reflect the change in package



From cvs at kolab.org  Sat Feb 16 12:10:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 12:10:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.18, 1.19 
Message-ID: <20080216111045.2817C600D6B@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
removed the bold formatting around Versions.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- messages.po	9 Feb 2008 14:10:24 -0000	1.18
+++ messages.po	16 Feb 2008 11:10:43 -0000	1.19
@@ -2256,8 +2256,8 @@
 msgstr ""
 
 #: ../include/menu.php:127
-msgid "<b>Versions</b>"
-msgstr "<b>Versiones</b>"
+msgid "Versions"
+msgstr "Versiones"
 
 #: ../include/passwd.php:33
 msgid "Password is empty"



From cvs at kolab.org  Sat Feb 16 12:10:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 12:10:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.37, 1.38 
Message-ID: <20080216111045.25765600D65@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
removed the bold formatting around Versions.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- messages.po	9 Feb 2008 14:10:24 -0000	1.37
+++ messages.po	16 Feb 2008 11:10:43 -0000	1.38
@@ -2264,8 +2264,8 @@
 msgstr "KDE"
 
 #: ../include/menu.php:127
-msgid "<b>Versions</b>"
-msgstr "<b>Versionen</b>"
+msgid "Versions"
+msgstr "Versionen"
 
 #: ../include/passwd.php:33
 msgid "Password is empty"



From cvs at kolab.org  Sat Feb 16 12:10:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 12:10:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.23, 1.24 
Message-ID: <20080216111045.2E773600D75@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
removed the bold formatting around Versions.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- messages.po	9 Feb 2008 14:10:24 -0000	1.23
+++ messages.po	16 Feb 2008 11:10:43 -0000	1.24
@@ -2277,8 +2277,8 @@
 msgstr "KDE"
 
 #: ../include/menu.php:127
-msgid "<b>Versions</b>"
-msgstr "<b>Version</b>"
+msgid "Versions"
+msgstr "Version"
 
 #: ../include/passwd.php:33
 msgid "Password is empty"



From cvs at kolab.org  Sat Feb 16 12:10:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 12:10:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.37, 1.38 
Message-ID: <20080216111045.3E7C1600D79@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
removed the bold formatting around Versions.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- messages.po	15 Feb 2008 21:34:01 -0000	1.37
+++ messages.po	16 Feb 2008 11:10:43 -0000	1.38
@@ -772,7 +772,7 @@
 
 #: tpl_messages.php:152
 msgid "Enabled"
-msgstr "ingeschakeld"
+msgstr "Ingeschakeld"
 
 #: tpl_messages.php:154
 msgid "Quota settings"
@@ -2239,8 +2239,8 @@
 msgstr "KDE"
 
 #: ../include/menu.php:127
-msgid "<b>Versions</b>"
-msgstr "<b>Versies</b>"
+msgid "Versions"
+msgstr "Versies"
 
 #: ../include/passwd.php:33
 msgid "Password is empty"



From cvs at kolab.org  Sat Feb 16 12:10:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 12:10:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.20, 1.21 
Message-ID: <20080216111045.3772E600D78@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
removed the bold formatting around Versions.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- messages.po	9 Feb 2008 14:10:24 -0000	1.20
+++ messages.po	16 Feb 2008 11:10:43 -0000	1.21
@@ -2256,8 +2256,8 @@
 msgstr "KDE"
 
 #: ../include/menu.php:127
-msgid "<b>Versions</b>"
-msgstr "<b>Versioni</b>"
+msgid "Versions"
+msgstr "Versioni"
 
 #: ../include/passwd.php:33
 msgid "Password is empty"



From cvs at kolab.org  Sat Feb 16 14:05:10 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 14:05:10 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.77,1.78 
Message-ID: <20080216130510.8746B600151@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Added a space after the main menu entries, so the web page formats /
breaks nices when the web browser is made smaller



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- ChangeLog	16 Feb 2008 11:10:42 -0000	1.77
+++ ChangeLog	16 Feb 2008 13:05:08 -0000	1.78
@@ -1,7 +1,9 @@
 2008-02-16 Richard Bos <richard at radoeka.nl>
 
-	* php/admin/include/menu.php: removed the bold formatting around
-	  Versions.
+	* php/admin/include/menu.php:
+	  - removed the bold formatting around Versions.
+	  - Added a space after the main menu entries, so the web page formats /
+	    breaks nices when the web browser is made smaller
 	* locale/de/LC_MESSAGES/messages.po, locale/es/LC_MESSAGES/messages.po,
 	  locale/fr/LC_MESSAGES/messages.po, locale/it/LC_MESSAGES/messages.po,
 	  locale/nl/LC_MESSAGES/messages.po: reflect the change



From cvs at kolab.org  Sat Feb 16 14:05:10 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 14:05:10 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	menu.php, 1.17, 1.18 
Message-ID: <20080216130510.8B823600168@lists.intevation.de>

Author: richard

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

Modified Files:
	menu.php 
Log Message:
Added a space after the main menu entries, so the web page formats /
breaks nices when the web browser is made smaller



Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- menu.php	16 Feb 2008 11:10:43 -0000	1.17
+++ menu.php	16 Feb 2008 13:05:08 -0000	1.18
@@ -23,7 +23,7 @@
 $menuitems = array();
 
 if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer' ) {
-  $menuitems['user'] = array( 'name' => _('Users'),
+  $menuitems['user'] = array( 'name' => _('Users').' ',
 							  'url'  => $topdir.'/user/',
 							  'title' => _('Manage Email Users'),
 							  'submenu' => array( 
@@ -42,7 +42,7 @@
 														'url'  => 'vacation.php' )));
 }
 if( $auth->group() == "admin" || $auth->group() == "maintainer") {
-  $menuitems['addressbook'] = array( 'name' => _('Addressbook'),
+  $menuitems['addressbook'] = array( 'name' => _('Addressbook'.' '),
 									 'url'  => $topdir.'/addressbook/',
 									 'title' => _('Manage Address Book'),
 									 'submenu' => array( 
@@ -51,7 +51,7 @@
 
 }
 if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') {
-  $menuitems['sf'] = array( 'name' => _('Shared Folder'),
+  $menuitems['sf'] = array( 'name' => _('Shared Folder').' ',
 							'url'  => $topdir.'/sharedfolder/',
 							'title' => _('Manage Shared Folders'),
 							'submenu' => array( 
@@ -59,7 +59,7 @@
 													  'url' => 'sf.php?action=create' )));  
 }
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
-  $menuitems['distlist'] = array( 'name' => _('Distribution Lists'),
+  $menuitems['distlist'] = array( 'name' => _('Distribution Lists').' ',
 									   'url'  => $topdir.'/distributionlist/',
 									   'title' => _('Manage Distribution Lists'),
 									   'submenu' => array(
@@ -67,19 +67,19 @@
    															 'url'   => 'list.php?action=create' ) ) );
 }
 if( $auth->group() == 'admin' ) {
-  $menuitems['administrator'] = array( 'name' => _('Administrators'),
+  $menuitems['administrator'] = array( 'name' => _('Administrators').' ',
 									   'url'  => $topdir.'/administrator/',
 									   'title' => _('Manage Administrators'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New Administrator'),
 																 'url'   => 'admin.php?action=create' ) ) );
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
 									   'url'  => $topdir.'/domainmaintainer/',
 									   'title' => _('Manage Domain Maintainers'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New Domain Maintainer'),
 																 'url'   => 'domainmaintainer.php?action=create' ) ) );
-  $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
+  $menuitems['maintainer'] = array( 'name' => _('Maintainers').' ',
 									'url'  => $topdir.'/maintainer/',
 									'title' => _('Manage Maintainers'),
 									'submenu' => array(
@@ -87,10 +87,10 @@
 															  'url'   => 'maintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'maintainer' ) {
   $mdn = $auth->dn();
-  $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
+  $menuitems['maintainer'] = array( 'name' => _('Maintainers').' ',
 									'url'  => $topdir.'/maintainer/maintainer.php?action=modify&dn='.urlencode($mdn),
 									'title' => _('Manage Maintainer') );  
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
 									   'url'  => $topdir.'/domainmaintainer/',
 									   'title' => _('Manage Domain Maintainers'),
 									   'submenu' => array(
@@ -98,12 +98,12 @@
 																 'url'   => 'domainmaintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'domain-maintainer' ) {
   $mdn = $auth->dn();
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
 									'url'  => $topdir.'/domainmaintainer/domainmaintainer.php?action=modify&dn='.urlencode($mdn),
 									'title' => _('Manage Domain Maintainer') );  
 }
 if( $auth->group() == 'admin' ) {
-  $menuitems['service'] = array( 'name' => _('Settings'),
+  $menuitems['service'] = array( 'name' => _('Settings').' ',
 								 'url'  => $topdir.'/service/',
 								 'title' => _('System Settings') );
 }



From cvs at kolab.org  Sat Feb 16 14:05:10 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 14:05:10 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.38, 1.39 
Message-ID: <20080216130510.B71D260016A@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
Added a space after the main menu entries, so the web page formats /
breaks nices when the web browser is made smaller



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- messages.po	16 Feb 2008 11:10:43 -0000	1.38
+++ messages.po	16 Feb 2008 13:05:08 -0000	1.39
@@ -1530,7 +1530,7 @@
 #: ../../../www/admin/maintainer/maintainer.php.in:241
 #: ../../../www/admin/maintainer/maintainer.php.in:265
 msgid "Maintainer "
-msgstr "Maintainers"
+msgstr "Maintainer "
 
 #: ../../../www/admin/domainmaintainer/domainmaintainer.php.in:272
 msgid "Domain maintainer "



From cvs at kolab.org  Sat Feb 16 14:19:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 14:19:01 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	menu.php, 1.18, 1.19 
Message-ID: <20080216131901.450AA600151@lists.intevation.de>

Author: richard

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

Modified Files:
	menu.php 
Log Message:
Added a space after the sub menu entries, so the web page formats /
breaks nice when the web browser is made smaller



Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- menu.php	16 Feb 2008 13:05:08 -0000	1.18
+++ menu.php	16 Feb 2008 13:18:59 -0000	1.19
@@ -112,19 +112,19 @@
 							 'url'  => $topdir.'/kolab/',
 							 'title' => _('About Kolab'),
 							 'submenu' => array( 
-												array( 'name' => _('Erfrakon'),
+												array( 'name' => _('Erfrakon').' ',
 													   'url'  => 'erfrakon.php' ),
-												array( 'name' => _('Intevation'),
+												array( 'name' => _('Intevation').' ',
 													   'url'  => 'intevation.php' ),
-												array( 'name' => _('Klar&auml;lvdalens Datakonsult'),
+												array( 'name' => _('Klar&auml;lvdalens Datakonsult').' ',
 													   'url'  => 'kdab.php' ),
 												array( 'name' => _('Code Fusion'),
 													   'url'  => 'codefusion.php' ),
-												array( 'name' => _('KDE'),
+												array( 'name' => _('KDE').' ',
 													   'url'  => 'kde.php' )
 												));
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
-  $menuitems['about']['submenu'][] = array( 'name' => _('Versions'),
+  $menuitems['about']['submenu'][] = array( 'name' => _('Versions').' ',
 											'url'  => 'versions.php' );
 }
 



From cvs at kolab.org  Sat Feb 16 14:34:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 14:34:52 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.39, 1.40 
Message-ID: <20080216133452.F2F81600151@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
et -> en

Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- messages.po	16 Feb 2008 13:05:08 -0000	1.39
+++ messages.po	16 Feb 2008 13:34:50 -0000	1.40
@@ -465,7 +465,7 @@
 "<a href=\"http://www.kde.nl\">KDE</a> is een krachtige <a href=\"http://www."
 "gnu.org/philosophy/free-sw.html\"> Vrije Software </a> grafische bureau "
 "omgeving voor Linux en Unix werkstations. Het combineert gebruiksgemak, "
-"hedendaagse functionaliteit, een opmerkelijke grafische interface et de "
+"hedendaagse functionaliteit, een opmerkelijke grafische interface en de "
 "grote technologische superioriteit van het Unix besturingssysteem."
 
 #: tpl_messages.php:101



From cvs at kolab.org  Sat Feb 16 19:28:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 19:28:58 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.78,1.79 
Message-ID: <20080216182858.9F46D60014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
prevent the autoconf variable kolab_pkgs to be processed by the build tools,
it must remain in the comment



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- ChangeLog	16 Feb 2008 13:05:08 -0000	1.78
+++ ChangeLog	16 Feb 2008 18:28:56 -0000	1.79
@@ -8,6 +8,8 @@
 	  locale/fr/LC_MESSAGES/messages.po, locale/it/LC_MESSAGES/messages.po,
 	  locale/nl/LC_MESSAGES/messages.po: reflect the change
 	  in templates/menu.tpl
+	* www/admin/kolab/versions.php.in: prevent the autoconf variable kolab_pkgs
+	  to be processed by the build tools, it must remain in the comment
 
 2008-02-13 Richard Bos <richard at radoeka.nl>
 



From cvs at kolab.org  Sat Feb 16 19:28:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 16 Feb 2008 19:28:58 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.8, 1.9 
Message-ID: <20080216182858.AC6CF600168@lists.intevation.de>

Author: richard

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

Modified Files:
	versions.php.in 
Log Message:
prevent the autoconf variable kolab_pkgs to be processed by the build tools,
it must remain in the comment



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- versions.php.in	13 Feb 2008 23:01:57 -0000	1.8
+++ versions.php.in	16 Feb 2008 18:28:56 -0000	1.9
@@ -24,7 +24,7 @@
 /**** Page logic ****/
 
 // Remember to keep this list up to date when patching packages!
-// The variable @kolab_pkgs@ is used to collect a packages that make up the
+// The variable 'kolab_pkgs' is used to collect a packages that make up the
 // kolab groupware server.
 $kolabversions = shell_exec('
   @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \



From cvs at kolab.org  Sun Feb 17 15:15:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 17 Feb 2008 15:15:59 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.79,1.80 
Message-ID: <20080217141559.E806760014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
moved an openpkg specific rpm package into a test that is enabled when run
on an openpkg installation.  This way the page shows up, much faster on native
pkg installations



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- ChangeLog	16 Feb 2008 18:28:56 -0000	1.79
+++ ChangeLog	17 Feb 2008 14:15:57 -0000	1.80
@@ -1,3 +1,10 @@
+2008-02-17 Richard Bos <richard at radoeka.nl>
+
+	* www/admin/kolab/versions.php.in: moved an openpkg specific rpm
+	  package into a test that is enabled when run on an openpkg
+	  installation.  This way the page shows up, much faster on native
+	  pkg installations
+
 2008-02-16 Richard Bos <richard at radoeka.nl>
 
 	* php/admin/include/menu.php:



From cvs at kolab.org  Sun Feb 17 15:15:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 17 Feb 2008 15:15:59 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.9, 1.10 
Message-ID: <20080217141559.EA470600168@lists.intevation.de>

Author: richard

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

Modified Files:
	versions.php.in 
Log Message:
moved an openpkg specific rpm package into a test that is enabled when run
on an openpkg installation.  This way the page shows up, much faster on native
pkg installations



Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- versions.php.in	16 Feb 2008 18:28:56 -0000	1.9
+++ versions.php.in	17 Feb 2008 14:15:57 -0000	1.10
@@ -44,12 +44,12 @@
     sort
 ');
 
-$kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
 
 # This is an openpkg test, difficult to see after make.
 # but visible in the vanilla sources.
 if ("@WITHOPENPKG@" == "yes") {
-	$openpkgversion = shell_exec("@RPM@ -q openpkg");
+  $openpkgversion = shell_exec("@RPM@ -q openpkg");
+  $kolabpatchedversions = shell_exec("@RPM@ -qa|grep 'kolab[0-9]*$'" );
 }
 
 $kolabversion = '@kolab_version@';



From cvs at kolab.org  Sun Feb 17 21:34:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 17 Feb 2008 21:34:19 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.80,
	1.81 Makefile.am, 1.42, 1.43 
Message-ID: <20080217203419.D015460014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
made it possible to reuse the code that leaves in or removes code depending
on the presence of openpkg.  Introduced a variable w_or_wo_openpkg
(with_or_without_openpkg).



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- ChangeLog	17 Feb 2008 14:15:57 -0000	1.80
+++ ChangeLog	17 Feb 2008 20:34:17 -0000	1.81
@@ -5,6 +5,10 @@
 	  installation.  This way the page shows up, much faster on native
 	  pkg installations
 
+	* Makefile.am: made it possible to reuse the code that leaves in or
+	  removes code depending on the presence of openpkg.  Introduced
+	  a variable w_or_wo_openpkg (with_or_without_openpkg).
+
 2008-02-16 Richard Bos <richard at radoeka.nl>
 
 	* php/admin/include/menu.php:

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile.am	3 Jul 2007 22:07:13 -0000	1.42
+++ Makefile.am	17 Feb 2008 20:34:17 -0000	1.43
@@ -4,6 +4,13 @@
 @distribution@
 @common@
 
+# With or Without openpkg (w_or_wo_openpkg) definition
+if OPENPKG
+	w_or_wo_openpkg = sed -e 's/^@OPENPKG@//;/^@WITHOUT_OPENPKG@/d'
+else
+	w_or_wo_openpkg = sed -e 's/^@WITHOUT_OPENPKG@//;/^@OPENPKG@/d'
+endif
+
 distclean-local:
 	rm -rf $(srcdir)/autom4te*.cache
 
@@ -390,11 +397,7 @@
 
 php/admin/templates/versions.tpl: php/admin/templates/versions.tpl.in
 	@$(mkinstalldirs) php/admin/templates
-if OPENPKG
-	sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
-else
-	sed '/^@OPENPKG at .*/d' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
-endif
+	$(w_or_wo_openpkg) <$(srcdir)/php/admin/templates/versions.tpl.in >$@
 CLEANFILES += php/admin/templates/versions.tpl
 EXTRA_DIST += php/admin/templates/versions.tpl.in
 



From cvs at kolab.org  Sun Feb 17 22:51:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 17 Feb 2008 22:51:38 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.81,
	1.82 Makefile.am, 1.43, 1.44 
Message-ID: <20080217215138.AE40960016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
added a note why the command is needed for the build of languages files
removed a comment with "new".  It's not new anymore



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- ChangeLog	17 Feb 2008 20:34:17 -0000	1.81
+++ ChangeLog	17 Feb 2008 21:51:36 -0000	1.82
@@ -8,6 +8,8 @@
 	* Makefile.am: made it possible to reuse the code that leaves in or
 	  removes code depending on the presence of openpkg.  Introduced
 	  a variable w_or_wo_openpkg (with_or_without_openpkg).
+	* Makefile.am: added a note why the command is needed for the build
+	  of languages files
 
 2008-02-16 Richard Bos <richard at radoeka.nl>
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile.am	17 Feb 2008 20:34:17 -0000	1.43
+++ Makefile.am	17 Feb 2008 21:51:36 -0000	1.44
@@ -168,6 +168,9 @@
 MSGFMT=msgfmt
 
 .po.mo: $<
+# Without $(mkinstalldirs) $(basename $@) 'make distcheck' fails
+# as the target directory (e.g. php/admin/locale/de/LC_MESSAGES)
+# does not yes exist at build time
 	@$(mkinstalldirs) $(basename $@)
 	$(MSGFMT) -o $@ $<
 
@@ -217,8 +220,6 @@
 	dist_conf/kolab \
 	dist_conf/mandriva \
 	dist_conf/suse
-
-### new
 
 www/admin/addressbook/addr.php: www/admin/addressbook/addr.php.in
 	@$(mkinstalldirs) www/admin/addressbook



From cvs at kolab.org  Mon Feb 18 00:11:09 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Feb 2008 00:11:09 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.82,
	1.83 Makefile.am, 1.44, 1.45 
Message-ID: <20080217231109.6881660016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
prevent configure to complain about not portable filenames by
replacing basename with `echo ... | sed ...`



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ChangeLog	17 Feb 2008 21:51:36 -0000	1.82
+++ ChangeLog	17 Feb 2008 23:11:07 -0000	1.83
@@ -10,6 +10,8 @@
 	  a variable w_or_wo_openpkg (with_or_without_openpkg).
 	* Makefile.am: added a note why the command is needed for the build
 	  of languages files
+	* Makefile.am: prevent configure to complain about not portable
+	  filenames by replacing basename with `echo ... | sed ...`
 
 2008-02-16 Richard Bos <richard at radoeka.nl>
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile.am	17 Feb 2008 21:51:36 -0000	1.44
+++ Makefile.am	17 Feb 2008 23:11:07 -0000	1.45
@@ -168,10 +168,12 @@
 MSGFMT=msgfmt
 
 .po.mo: $<
-# Without $(mkinstalldirs) $(basename $@) 'make distcheck' fails
-# as the target directory (e.g. php/admin/locale/de/LC_MESSAGES)
-# does not yes exist at build time
-	@$(mkinstalldirs) $(basename $@)
+# Without $(mkinstalldirs) `echo ... | sed ...` a 'make distcheck' would
+# fail as the target directory (e.g. php/admin/locale/de/LC_MESSAGES)
+# does not yes exist at build time.  Use the `echo ... | sed ...` construction
+# as something smarter, like basename, results in configure to complain
+# about not portable filenames.
+	@$(mkinstalldirs) `echo "$@" | sed 's|messages\.mo||'`
 	$(MSGFMT) -o $@ $<
 
 CLEANFILES += php/admin/locale/*/LC_MESSAGES/messages.mo



From cvs at kolab.org  Mon Feb 18 18:17:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Feb 2008 18:17:18 +0100 (CET)
Subject: thomas: doc/www/src/security kolab-vendor-notice-19.txt,NONE,1.1 
Message-ID: <20080218171718.BFB56600D7A@lists.intevation.de>

Author: thomas

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

Added Files:
	kolab-vendor-notice-19.txt 
Log Message:
Kolab Security Issue 19 20080218 (clamav)


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

Kolab Security Issue 19 20080218
================================

Package:              Kolab Server, ClamAV
Vulnerability:        various
Kolab Specific:       no
Dependent Packages:   none


Summary
~~~~~~~

CVE-2007-6595

    ClamAV 0.92 allows local users to overwrite arbitrary files via a symlink
    attack on (1) temporary files in the cli_gentempfd function in
    libclamav/others.c or on (2) .ascii files in sigtool, when utf16-decode is
    enabled.

CVE-2008-0318

    Integer overflow in libclamav in ClamAV before 0.92.1, as used in clamd,
    allows remote attackers to cause a denial of service and possibly execute
    arbitrary code via a crafted Petite packed PE file, which triggers a
    heap-based buffer overflow.

CVE-2008-0728

    libclamav/mew.c in libclamav in ClamAV before 0.92.1 has unknown impact
    and attack vectors that trigger "heap corruption."


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

This affects versions of ClamAV up to version 0.92.
Kolab Server 2.1.0 and previous releases of the 2.1 branch are affected.
Kolab Server 2.0.4 and previous releases of the 2.0 branch are affected.
Kolab Server 2.2-rc1 and previous prereleases are affected.


Fix
~~~

Upgrade to ClamAV 0.92.1.

The ClamAV source RPM patched to be compilable with Kolab Server 2.1 and 2.0
is available from the Kolab download mirrors as:
security-updates/20080218/clamav-0.92.1-20080213_kolab.src.rpm

A binary RPM for Kolab Server 2.1.0 (ix86 Debian GNU/Linux Sarge) is available:
security-updates/20080218/clamav-0.92.1-20080213_kolab.ix86-debian3.1-kolab.rpm

All other server versions: Please build from the src.rpm.
For Kolab Server 2.2-rc1 the unmodified OpenPKG rpm can be used:
security-updates/20080218/clamav-0.92.1-20080213.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/20080218/clamav-0.92.1-20080213_kolab.src.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080218/clamav-0.92.1-20080213_kolab.ix86-debian3.1-kolab.rpm .
# rsync -tvP rsync://rsync.kolab.org/kolab/server/security-updates/20080218/clamav-0.92.1-20080213.src.rpm .

MD5 sums:
272ecc840ac8c322aa845e70b44917d6  clamav-0.92.1-20080213.src.rpm
1d787aa112cebf1788b1965ae22d5d30  clamav-0.92.1-20080213_kolab.ix86-debian3.1-kolab.rpm
09cb2442abbb333371874d9f60c0e439  clamav-0.92.1-20080213_kolab.src.rpm


The package can be installed on your Kolab Server with

# /kolab/bin/openpkg rpm --rebuild clamav-0.92.1-20080213_kolab.src.rpm
# /kolab/bin/openpkg rpm \
  -Uvh /kolab/RPM/PKG/clamav-0.92.1-20080213_kolab.<ARCH>-<OS>-kolab.rpm
# rm /kolab/etc/clamav/*.rpmsave
# /kolab/bin/openpkg rc clamav stop
# /kolab/bin/openpkg rc clamav start
# su - kolab-r
$ freshclam

For Kolab Server 2.0.4 you have to copy the new /kolab/etc/clamav/clamd.conf
to /kolab/etc/kolab/templates/clamd.conf.template so it will not be
overwritten by kolabconf. Do NOT copy this file with Kolab Server 2.1 or 2.2!


Details
~~~~~~~

http://sourceforge.net/project/shownotes.php?group_id=86638&release_id=575703
	ClamAV 0.92.1 release notes

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6595
	CVE-2007-6595

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0318
	CVE-2008-0318

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0728
	CVE-2008-0728


Timeline
~~~~~~~~
    20080211 ClamAV release 0.92.1.
    20080213 OpenPKG 0.92.1 package release.
    20080218 Kolab Server security advisory published.

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

iD8DBQFHub1EW7P1GVgWeRoRAt8AAJ0bTC9e/RBM7PKevlIEoGeo9RW6kwCffic5
0KSvCfAOf5So4qnvktf3S/M=
=e1zi
-----END PGP SIGNATURE-----



From cvs at kolab.org  Mon Feb 18 18:26:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Feb 2008 18:26:01 +0100 (CET)
Subject: thomas: server release-notes.txt,1.131.2.11,1.131.2.12 
Message-ID: <20080218172601.59E60600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_1_branch
	release-notes.txt 
Log Message:
Security update clamav-0.92.1-20080213_kolab


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.131.2.11
retrieving revision 1.131.2.12
diff -u -d -r1.131.2.11 -r1.131.2.12
--- release-notes.txt	26 Oct 2007 14:51:47 -0000	1.131.2.11
+++ release-notes.txt	18 Feb 2008 17:25:59 -0000	1.131.2.12
@@ -32,7 +32,7 @@
 
 Changes between 2.1.0 and 2.1.???:
 
-    - clamav-0.91.2-20070821_kolab
+    - clamav-0.92.1-20080213_kolab
 
 	New upstream version, fixes various security issues.
 



From cvs at kolab.org  Mon Feb 18 18:26:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Feb 2008 18:26:01 +0100 (CET)
Subject: thomas: server/clamav Makefile, 1.4.2.4, 1.4.2.5 kolab.patch, 1.5.2.3,
	1.5.2.4 
Message-ID: <20080218172601.97B0C600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
      Tag: kolab_2_1_branch
	Makefile kolab.patch 
Log Message:
Security update clamav-0.92.1-20080213_kolab


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/Makefile,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- Makefile	9 Jan 2008 16:34:16 -0000	1.4.2.4
+++ Makefile	18 Feb 2008 17:25:59 -0000	1.4.2.5
@@ -12,9 +12,9 @@
 endif
 
 PACKAGE=clamav
-VERSION=0.92
-RELEASE=20080101
-KOLABRELEASE=20080101_kolab
+VERSION=0.92.1
+RELEASE=20080213
+KOLABRELEASE=20080213_kolab
 
 RPM=/kolab/bin/openpkg rpm
 

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/clamav/Attic/kolab.patch,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- kolab.patch	9 Jan 2008 16:34:16 -0000	1.5.2.3
+++ kolab.patch	18 Feb 2008 17:25:59 -0000	1.5.2.4
@@ -3,9 +3,9 @@
 @@ -32,7 +32,7 @@
  Group:        AntiVirus
  License:      GPL
- Version:      0.92
--Release:      20080101
-+Release:      20080101_kolab
+ Version:      0.92.1
+-Release:      20080213
++Release:      20080213_kolab
  
  #   package options
  %option       with_milter  no



From cvs at kolab.org  Mon Feb 18 18:31:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 18 Feb 2008 18:31:13 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.136,1.137 
Message-ID: <20080218173113.A5AE5600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
clamav security update


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- index.html.m4	5 Feb 2008 11:40:46 -0000	1.136
+++ index.html.m4	18 Feb 2008 17:31:11 -0000	1.137
@@ -48,6 +48,19 @@
 
 
 <table>
+<tr><td class="newsd">February 18th, 2008</td>
+<td class="newsh">&raquo;
+  Security Issue 19 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+  A new ClamAV RPM with various fixes is available.  See the
+  <a href="security/kolab-vendor-notice-19.txt">Kolab Security Issue 19</a> for details.
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">February 5th, 2008</td>
 <td class="newsh">&raquo;
   Kolab Server 2.2 Release Candidate 1 released



From cvs at kolab.org  Tue Feb 19 14:59:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Feb 2008 14:59:41 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.8,
	1.9 debian, 1.12, 1.13 gentoo, 1.12, 1.13 kolab, 1.55, 1.56 suse,
	1.70, 1.71 
Message-ID: <20080219135941.88882600D78@lists.intevation.de>

Author: thomas

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

Modified Files:
	centos-clarkconnect debian gentoo kolab suse 
Log Message:
Fixed locations of graveyard_uidcache and graveyard_tscache autoconf variables.

This only affects kolabdcachetool, as the locations are hardcoded in
perl-kolab.


Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- centos-clarkconnect	13 Feb 2008 22:59:49 -0000	1.8
+++ centos-clarkconnect	19 Feb 2008 13:59:39 -0000	1.9
@@ -238,7 +238,7 @@
 freebusy_grp=webconfig
 
 
-graveyard_uidcache=/var/lib/kolab/graveyard_uidcache.db
-graveyard_tscache=/var/lib/kolab/graveyard_tscache.db
+graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
+graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
 
 backupdir=/usr/share/kolab/backup

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- debian	17 Oct 2007 17:57:13 -0000	1.12
+++ debian	19 Feb 2008 13:59:39 -0000	1.13
@@ -127,6 +127,6 @@
 freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
 freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
 
-graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
-graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
+graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
 

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gentoo	17 Oct 2007 17:57:13 -0000	1.12
+++ gentoo	19 Feb 2008 13:59:39 -0000	1.13
@@ -284,6 +284,6 @@
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 
-graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
-graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
+graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- kolab	13 Feb 2008 22:59:49 -0000	1.55
+++ kolab	19 Feb 2008 13:59:39 -0000	1.56
@@ -173,8 +173,8 @@
 freebusy_usr=${kolab_musr}
 freebusy_grp=${kolab_grp}
 
-graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
-graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
+graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
 
 backupdir=${sysconfdir}/kolab
 

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- suse	13 Feb 2008 22:59:49 -0000	1.70
+++ suse	19 Feb 2008 13:59:39 -0000	1.71
@@ -162,8 +162,8 @@
 freebusy_usr=wwwrun
 freebusy_grp=root
 
-graveyard_uidcache=${localstatedir}/lib/kolab/graveyard_uidcache.db
-graveyard_tscache=${localstatedir}/lib/kolab/graveyard_tscache.db
+graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
+graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
 
 backupdir=${localstatedir}/adm/backup/kolab
 



From cvs at kolab.org  Tue Feb 19 14:59:41 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Feb 2008 14:59:41 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.145,1.146 
Message-ID: <20080219135941.86099600168@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Fixed locations of graveyard_uidcache and graveyard_tscache autoconf variables.

This only affects kolabdcachetool, as the locations are hardcoded in
perl-kolab.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- ChangeLog	13 Feb 2008 22:59:48 -0000	1.145
+++ ChangeLog	19 Feb 2008 13:59:39 -0000	1.146
@@ -1,3 +1,10 @@
+2008-02-19  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* dist_conf/centos-clarkconnect, dist_conf/debian, dist_conf/gentoo,
+	dist_conf/kolab, dist_conf/suse: Fixed locations of graveyard_uidcache
+	and graveyard_tscache autoconf variables. This only affects
+	kolabdcachetool, as the locations are hardcoded in perl-kolab.
+
 2008-02-13 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse, dist_conf/common, dist_conf/kolab,
 	  dist_conf/centos-clarkconnect: changed the rpm suffix _rpm to _pkg



From cvs at kolab.org  Tue Feb 19 15:00:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Feb 2008 15:00:47 +0100 (CET)
Subject: thomas: server release-notes.txt,1.213,1.214 
Message-ID: <20080219140047.2149B600D78@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- release-notes.txt	15 Feb 2008 08:52:20 -0000	1.213
+++ release-notes.txt	19 Feb 2008 14:00:44 -0000	1.214
@@ -48,8 +48,10 @@
 
     - kolabd-2.1.99-2008????
 
+	kolabdcachetool: Fix location of graveyard caches.
+
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
-        kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
+	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
 
     - kolab-freebusy-2.2.rc2-2008????
 
@@ -59,8 +61,8 @@
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
-        kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
-	kolab/issue1272 (From: header in vacation messages is marked as "Untrusted") 
+	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
+	kolab/issue1272 (From: header in vacation messages is marked as "Untrusted")
 
 Changes between 2.2-beta-3 and 2.2-rc-1
 



From cvs at kolab.org  Tue Feb 19 17:23:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Feb 2008 17:23:01 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates httpd.conf.template.in, 1.20,
	1.21 
Message-ID: <20080219162301.18A00600D7D@lists.intevation.de>

Author: thomas

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Reenable downloading of freebusy lists after the change as of 2008-02-09.


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- httpd.conf.template.in	9 Feb 2008 08:02:41 -0000	1.20
+++ httpd.conf.template.in	19 Feb 2008 16:22:59 -0000	1.21
@@ -227,8 +227,10 @@
    Options None
    # Disallow for everyone as default
    Order allow,deny
+   Allow from all
 @@@if apache-allow-unauthenticated-fb@@@
 @@@else@@@
+   Require valid-user
    AuthType Basic
    AuthName "Kolab Freebusy"
 



From cvs at kolab.org  Tue Feb 19 17:23:01 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 19 Feb 2008 17:23:01 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.146,1.147 
Message-ID: <20080219162301.17C55600D78@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Reenable downloading of freebusy lists after the change as of 2008-02-09.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- ChangeLog	19 Feb 2008 13:59:39 -0000	1.146
+++ ChangeLog	19 Feb 2008 16:22:59 -0000	1.147
@@ -4,6 +4,8 @@
 	dist_conf/kolab, dist_conf/suse: Fixed locations of graveyard_uidcache
 	and graveyard_tscache autoconf variables. This only affects
 	kolabdcachetool, as the locations are hardcoded in perl-kolab.
+	* templates/httpd.conf.template.in: Reenable downloading of
+	freebusy lists after the change as of 2008-02-09.
 
 2008-02-13 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse, dist_conf/common, dist_conf/kolab,



From cvs at kolab.org  Wed Feb 20 09:27:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 09:27:46 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog,1.11,1.12 
Message-ID: <20080220082746.3E04C60C4BA@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv17700/php-kolab/Kolab_Freebusy

Modified Files:
	ChangeLog 
Log Message:
kolab/issue2487 (Incorrect variable name  within Freebusy/Cache.php)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	7 Feb 2008 12:24:03 -0000	1.11
+++ ChangeLog	20 Feb 2008 08:27:44 -0000	1.12
@@ -1,3 +1,11 @@
+2008-02-20  Gunnar Wrobel  <p at rdus.de>
+
+	* Freebusy/Cache.php:
+
+	Fix variable name (broken when trying to fix the path logic).
+	kolab/issue2487 (Incorrect variable name $fbfilename within Freebusy/Cache.php)
+	https://www.intevation.de/roundup/kolab/issue2487
+
 2008-02-07  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* Freebusy/Page.php: Remove support for CLI_USER and CLI_PASS
@@ -35,7 +43,7 @@
 
 	* Freebusy/Cache.php:
 
-	Remove non-functional line (Reported by: Marcus Hüwe).
+	Remove non-functional line (Reported by: Marcus Hüwe).
 
 2007-11-30  Gunnar Wrobel  <p at rdus.de>
 



From cvs at kolab.org  Wed Feb 20 09:27:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 09:27:46 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.214,1.215 
Message-ID: <20080220082746.4D51960C4BC@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2487 (Incorrect variable name  within Freebusy/Cache.php)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- release-notes.txt	19 Feb 2008 14:00:44 -0000	1.214
+++ release-notes.txt	20 Feb 2008 08:27:43 -0000	1.215
@@ -59,10 +59,11 @@
 
     - php-kolab-2.2.rc2-2008????
 
+	kolab/issue1272 (From: header in vacation messages is marked as "Untrusted") 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
-	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
-	kolab/issue1272 (From: header in vacation messages is marked as "Untrusted")
+        kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
+        kolab/issue2487 (Incorrect variable name $fbfilename within Freebusy/Cache.php)
 
 Changes between 2.2-beta-3 and 2.2-rc-1
 



From cvs at kolab.org  Wed Feb 20 09:27:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 09:27:46 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php,1.6,1.7 
Message-ID: <20080220082746.4E6A560C4BE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv17700/php-kolab/Kolab_Freebusy/Freebusy

Modified Files:
	Cache.php 
Log Message:
kolab/issue2487 (Incorrect variable name  within Freebusy/Cache.php)

Index: Cache.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Cache.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Cache.php	7 Feb 2008 06:07:02 -0000	1.6
+++ Cache.php	20 Feb 2008 08:27:44 -0000	1.7
@@ -128,7 +128,7 @@
 
     function &loadPartial(&$access, $extended) 
     {
-        $fbfilename = $this->_getFilename($access->folder, $access->owner);
+        $file = $this->_getFilename($access->folder, $access->owner);
 
         $aclcache = &FreeBusyCacheDB_acl::singleton('acl', $this->_cache_dir);
 



From cvs at kolab.org  Wed Feb 20 13:30:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 13:30:20 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates httpd.conf.template.in, 1.21,
	1.22 
Message-ID: <20080220123020.C0F33600D45@lists.intevation.de>

Author: richard

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Added missing webserver_web_prefix

For the openpkg kolab version, there is no change in the installed
file when the before and after file versions are compared.



Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- httpd.conf.template.in	19 Feb 2008 16:22:59 -0000	1.21
+++ httpd.conf.template.in	20 Feb 2008 12:30:18 -0000	1.22
@@ -246,7 +246,7 @@
     Allow from all
 </Directory>
 
-<Directory "@webserver_document_root@/admin">
+<Directory "@webserver_document_root@@webserver_web_prefix@/admin">
    AllowOverride None
    Options None
    Order allow,deny



From cvs at kolab.org  Wed Feb 20 13:30:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 13:30:20 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.147,1.148 
Message-ID: <20080220123020.BEA5A60016F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Added missing webserver_web_prefix

For the openpkg kolab version, there is no change in the installed
file when the before and after file versions are compared.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- ChangeLog	19 Feb 2008 16:22:59 -0000	1.147
+++ ChangeLog	20 Feb 2008 12:30:18 -0000	1.148
@@ -1,3 +1,6 @@
+2008-02-20 Richard Bos <richard at radoeka.nl>
+	* templates/httpd.conf.template.in: added missing webserver_web_prefix
+
 2008-02-19  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* dist_conf/centos-clarkconnect, dist_conf/debian, dist_conf/gentoo,



From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/dimp-3.2-rc2 - New directory 
Message-ID: <20080220173421.A11DB60016F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/dimp-3.2-rc2
In directory doto:/tmp/cvs-serv31936/dimp-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/dimp-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/imp-3.2-rc2 - New directory 
Message-ID: <20080220173421.AB8BF60C4BD@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/imp-3.2-rc2
In directory doto:/tmp/cvs-serv31936/imp-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/imp-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/ingo-3.2-rc2 - New directory 
Message-ID: <20080220173421.AE34760C4BE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/ingo-3.2-rc2
In directory doto:/tmp/cvs-serv31936/ingo-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/ingo-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/mnemo-3.2-rc2 - New directory 
Message-ID: <20080220173421.EB14460C4B8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/mnemo-3.2-rc2
In directory doto:/tmp/cvs-serv31936/mnemo-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/mnemo-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/fbview-horde-3.2-rc2 - New directory 
Message-ID: <20080220173421.A3A5B60C4B8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/fbview-horde-3.2-rc2
In directory doto:/tmp/cvs-serv31936/fbview-horde-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/fbview-horde-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/horde-3.2-rc2 - New directory 
Message-ID: <20080220173421.A8CCB60C4BA@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/horde-3.2-rc2
In directory doto:/tmp/cvs-serv31936/horde-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/horde-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/framework-3.2-rc2 - New directory 
Message-ID: <20080220173421.A642460C4B9@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/framework-3.2-rc2
In directory doto:/tmp/cvs-serv31936/framework-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/framework-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:21 +0100 (CET)
Subject: gunnar: server/patches/horde/mimp-3.2-rc2 - New directory 
Message-ID: <20080220173421.E8B3260016F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/mimp-3.2-rc2
In directory doto:/tmp/cvs-serv31936/mimp-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/mimp-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:22 +0100 (CET)
Subject: gunnar: server/patches/horde/passwd-3.2-rc2 - New directory 
Message-ID: <20080220173422.75ED660C4B8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/passwd-3.2-rc2
In directory doto:/tmp/cvs-serv31936/passwd-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/passwd-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:22 +0100 (CET)
Subject: gunnar: server/patches/horde/nag-3.2-rc2 - New directory 
Message-ID: <20080220173422.7383260016F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/nag-3.2-rc2
In directory doto:/tmp/cvs-serv31936/nag-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/nag-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:34:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:34:22 +0100 (CET)
Subject: gunnar: server/patches/horde/turba-3.2-rc2 - New directory 
Message-ID: <20080220173422.786F160C4B9@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/turba-3.2-rc2
In directory doto:/tmp/cvs-serv31936/turba-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/turba-3.2-rc2 added to the repository




From cvs at kolab.org  Wed Feb 20 18:35:16 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:16 +0100 (CET)
Subject: gunnar: server/patches/horde/dimp-3.2-rc2
	HK-GW-Config_dimp-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173516.D771860C4C1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/dimp-3.2-rc2
In directory doto:/tmp/cvs-serv32120/dimp-3.2-rc2

Added Files:
	HK-GW-Config_dimp-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_dimp-3.2-rc2.patch ---
Configuration for dimp.

diff -r 5bf05e04f0f6 dimp/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dimp/config/conf.php	Tue Feb 19 13:15:14 2008 +0100
@@ -0,0 +1,22 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: dimp/config/conf.xml,v 1.30.2.3 2008/01/03 07:07:56 slusarz Exp $
+$conf['hooks']['mailboxarray'] = false;
+$conf['hooks']['messageview'] = false;
+$conf['hooks']['addressformatting'] = false;
+$conf['hooks']['msglist_format'] = false;
+$conf['css_files'] = array();
+$conf['js']['debug'] = false;
+$conf['viewport']['buffer_pages'] = 7;
+$conf['viewport']['limit_factor'] = 20;
+$conf['viewport']['viewport_wait'] = 10;
+$conf['viewport']['background_inbox'] = true;
+$conf['search']['search_all'] = false;
+$conf['server']['cachejsparams']['timeout'] = 86400;
+$conf['server']['cachejsparams']['mtime'] = false;
+$conf['server']['cachejs'] = true;
+$conf['server']['cachecssparams']['timeout'] = 86400;
+$conf['server']['cachecssparams']['mtime'] = false;
+$conf['server']['cachecss'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/fbview-horde-3.2-rc2
	HK-GW-Config_fbview-horde-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.22D7D60C4C1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/fbview-horde-3.2-rc2
In directory doto:/tmp/cvs-serv32120/fbview-horde-3.2-rc2

Added Files:
	HK-GW-Config_fbview-horde-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_fbview-horde-3.2-rc2.patch ---
The kolab specific configuration settings for the horde package.

diff -r b282890fa784 fbview-horde/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-horde/config/conf.php	Wed Feb 20 17:28:32 2008 +0100
@@ -0,0 +1,99 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.50 2008/01/07 20:08:41 bklang Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = true;
+$conf['session']['cache_limiter'] = 'nocache';
+$conf['session']['timeout'] = 0;
+$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
+$conf['cookie']['path'] = '/horde';
+$conf['sql'] = null;
+$conf['auth']['admins'] = array('manager');
+$conf['auth']['checkip'] = true;
+$conf['auth']['checkbrowser'] = true;
+$conf['auth']['alternate_login'] = false;
+$conf['auth']['redirect_on_logout'] = false;
+$conf['auth']['params']['login_block'] = true;
+$conf['auth']['params']['login_block_count'] = 3;
+$conf['auth']['params']['login_block_time'] = 5;
+$conf['auth']['driver'] = 'kolab';
+$conf['signup']['allow'] = false;
+$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['ident'] = 'HORDE';
+$conf['log']['params'] = array();
+$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['params']['append'] = true;
+$conf['log']['type'] = 'file';
+$conf['log']['enabled'] = true;
+$conf['log_accesskeys'] = false;
+$conf['prefs']['driver'] = 'session';
+$conf['alarms']['driver'] = false;
+$conf['datatree']['driver'] = 'null';
+$conf['group']['driver'] = 'mock';
+$conf['group']['cache'] = false;
+$conf['share']['no_sharing'] = false;
+$conf['share']['cache'] = false;
+$conf['share']['driver'] = 'kolab';
+$conf['cache']['default_lifetime'] = 1800;
+$conf['cache']['params']['dir'] = Horde::getTempDir();
+$conf['cache']['params']['sub'] = 0;
+$conf['cache']['driver'] = 'file';
+$conf['token']['driver'] = 'none';
+$conf['mailer']['params']['auth'] = false;
+$conf['mailer']['type'] = 'smtp';
+$conf['mailformat']['brokenrfc2231'] = false;
+$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../tmp';
+$conf['vfs']['type'] = 'file';
+$conf['sessionhandler']['type'] = 'none';
+$conf['image']['convert'] = '/usr/bin/convert';
+$conf['mime']['magic_db'] = '/etc/mime.types';
+$conf['problems']['email'] = 'webmaster at example.com';
+$conf['problems']['maildomain'] = 'example.com';
+$conf['problems']['tickets'] = false;
+$conf['menu']['apps'] = array();
+$conf['menu']['always'] = false;
+$conf['menu']['links']['help'] = 'all';
+$conf['menu']['links']['help_about'] = true;
+$conf['menu']['links']['options'] = 'authenticated';
+$conf['menu']['links']['problem'] = 'all';
+$conf['menu']['links']['login'] = 'all';
+$conf['menu']['links']['logout'] = 'authenticated';
+$conf['hooks']['permsdenied'] = false;
+$conf['hooks']['username'] = false;
+$conf['hooks']['preauthenticate'] = false;
+$conf['hooks']['postauthenticate'] = false;
+$conf['hooks']['authldap'] = false;
+$conf['hooks']['groupldap'] = false;
+$conf['portal']['fixed_blocks'] = array();
+$conf['accounts']['driver'] = 'null';
+$conf['user']['verify_from_addr'] = false;
+$conf['imsp']['enabled'] = false;
+$conf['kolab']['ldap']['server'] = 'localhost';
+$conf['kolab']['ldap']['port'] = 389;
+$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
+$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+$conf['kolab']['ldap']['phppw'] = 'dummy';
+$conf['kolab']['imap']['server'] = 'localhost';
+$conf['kolab']['imap']['port'] = 143;
+$conf['kolab']['imap']['sieveport'] = 2000;
+$conf['kolab']['imap']['virtdomains'] = true;
+$conf['kolab']['imap']['maildomain'] = 'example.com';
+$conf['kolab']['smtp']['server'] = 'localhost';
+$conf['kolab']['smtp']['port'] = 25;
+$conf['kolab']['misc']['multidomain'] = false;
+$conf['kolab']['enabled'] = true;
+$conf['memcache']['enabled'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r b282890fa784 fbview-horde/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-horde/config/kolab.php	Wed Feb 20 17:28:32 2008 +0100
@@ -0,0 +1,12 @@
+<?php
+$conf['log']['name'] = '@@@webserver_logdir@@@/horde/horde.log';
+$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
+$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
+$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
+$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
+$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
+$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
+$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
+?>
diff -r b282890fa784 fbview-horde/config/prefs.php.dist
--- a/fbview-horde/config/prefs.php.dist	Wed Feb 20 17:25:06 2008 +0100
+++ b/fbview-horde/config/prefs.php.dist	Wed Feb 20 17:28:32 2008 +0100
@@ -334,7 +334,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 
 // UI theme
 $_prefs['theme'] = array(
-    'value' => 'bluewhite',
+    'value' => 'silver',
     'locked' => false,
     'shared' => true,
     'type' => 'select',
@@ -377,7 +377,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 );
 
 $_prefs['show_sidebar'] = array(
-    'value' => true,
+    'value' => false,
     'locked' => false,
     'shared' => true,
     'type' => 'checkbox',
@@ -465,7 +465,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 
 // what application should we go to after login?
 $_prefs['initial_application'] = array(
-    'value' => 'horde',
+    'value' => 'kronolith',
     'locked' => false,
     'shared' => true,
     'type' => 'select',



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/framework-3.2-rc2
	HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.2596660C4C3@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/framework-3.2-rc2
In directory doto:/tmp/cvs-serv32120/framework-3.2-rc2

Added Files:
	HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch 
	HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch ---
diff -r 2c98314667d0 framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php	Mon Feb 18 10:10:00 2008 +0100
+++ b/framework/Share/Share/kolab.php	Mon Feb 18 10:10:51 2008 +0100
@@ -17,6 +17,13 @@ define('HORDE_ANNOT_SHARE_ATTR', HORDE_A
  * Marks a share without a name. These shares are still invalid
  */
 define('KOLAB_SHARE_INVALID', 'KOLAB_SHARE_INVALID');
+
+/**
+ * Kolab specific free/busy relevance
+ */
+define('KOLAB_FBRELEVANCE_ADMINS',  0);
+define('KOLAB_FBRELEVANCE_READERS', 1);
+define('KOLAB_FBRELEVANCE_NOBODY',  2);
 
 /**
  * Horde_Share_kolab:: provides the kolab backend for the horde share driver.
@@ -849,16 +856,135 @@ class Horde_Share_Object_kolab extends H
      */
     function isDefault()
     {
+        $type = $this->getType();
+        if (is_a($type, 'PEAR_Error')) {
+            return false;
+        }
+        return $type[1];
+    }
+
+    //FIXME: The following five functions (actually also most other things in this class
+    //       needs to go into Kolab/IMAP.php
+    /**
+     * Get the folder type
+     *
+     * @return mixed  Array containing the type and the default status or a PEAR_Error
+     *                if the folder annotation cannot be accessed.
+     */
+    function getType()
+    {
         $imap = &$this->_shareOb->getImap();
-        $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder);
+        $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE,
+                                           'value.shared', 
+                                           $this->_folder);
         if (is_a($annotation, 'PEAR_Error')) {
-            return false;
-        }
-        if (empty($annotation)) {
-            return false;
-        }
-        $type = explode('.', $annotation);
-        return (!empty($type[1]) && $type[1] == 'default');
+            return $annotation;
+        }
+        
+        if (!empty($annotation)) {
+            $default = false;
+            $subtype = '';
+            $type = explode('.', $annotation);
+            if (!empty($type[0])) {
+                $foldertype = $type[0];
+                if (!empty($type[1])) {
+                    $subtype = $type[1];
+                    if ($type[1] == 'default') {
+                        $default = true;
+                    }
+                }
+            }
+            return array($foldertype, $default, $subtype);
+        } else {
+            return PEAR::raiseError(sprintf(_("Unknown folder type for folder %s."), $this->_folder));
+        }
+    }
+
+    /**
+     * Get the free/busy relevance for this folder
+     *
+     * @return int  Value containing the FB_RELEVANCE.
+     */
+    function getFbrelevance()
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
+
+        $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
+        if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
+            return KOLAB_FBRELEVANCE_ADMINS;
+        }
+        switch ($annotation) {
+        case 'admins':
+            return KOLAB_FBRELEVANCE_ADMINS;
+        case 'readers':
+            return KOLAB_FBRELEVANCE_READERS;
+        case 'nobody':
+            return KOLAB_FBRELEVANCE_NOBODY;
+        default:
+            return KOLAB_FBRELEVANCE_ADMINS;
+        }
+    }
+
+    /**
+     * Set the free/busy relevance for this folder
+     *
+     * @param int $relevance Value containing the FB_RELEVANCE
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setFbrelevance($relevance)
+    {
+        switch ($relevance) {
+        case KOLAB_FBRELEVANCE_ADMINS:
+            $value = 'admins';
+            break;
+        case KOLAB_FBRELEVANCE_READERS:
+            $value = 'readers';
+            break;
+        case KOLAB_FBRELEVANCE_NOBODY:
+            $value = 'nobody';
+            break;
+        default:
+            $value = 'admins';
+        }
+
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
+        return $imap->setAnnotation($entry, array('value.shared' => $value), $this->_folder);
+    }
+
+    /**
+     * Get the extended free/busy access settings for this folder
+     *
+     * @return array  Array containing the users with access to the
+     *                extended information.
+     */
+    function getXfbaccess()
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
+
+        $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
+        if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
+            return array();
+        }
+        return explode(' ', $annotation);
+    }
+
+    /**
+     * Set the extended free/busy access settings for this folder
+     *
+     * @param array $access  Array containing the users with access to the
+     *                      extended information.
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setXfbaccess($access)
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
+        return $imap->setAnnotation($entry, array('value.shared' => join(' ', $access)), $this->_folder);
     }
 
     /**
@@ -934,13 +1060,18 @@ class Horde_Share_Object_kolab extends H
             break;
 
         case 'params':
-            $params = $this->getAttribute('params');
+            $params = @unserialize($this->getAttribute('params'));
             if (is_a($params, 'PEAR_Error') || $params == '') {
-                $params = serialize(array('source' => 'kolab',
-                                          'default' => $this->get('default'),
-                                          'name' => $this->get('name')));
-            }
-            $this->data['params'] = $params;
+                $params = array('source' => 'kolab',
+                                'default' => $this->get('default'),
+                                'name' => $this->get('name'));
+            }
+            $type = $this->getType();
+            if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
+                $params = array_merge($params, array('fbrelevance' => $this->getFbrelevance(),
+                                                     'xfbaccess'   => $this->getXfbaccess()));
+            }
+            $this->data['params'] = serialize($params);
             break;
 
         case 'default':
@@ -991,8 +1122,9 @@ class Horde_Share_Object_kolab extends H
             $value = unserialize($value);
             if (isset($value['default'])) {
                 $this->data['default'] = $value['default'];
-            }
-            break;
+                unset($value['default']);
+            }
+            $value = serialize($value);
 
         default:
             $this->data[$attribute] = $value;
@@ -1041,6 +1173,7 @@ class Horde_Share_Object_kolab extends H
                 }
             } elseif ($attribute == 'default') {
                 $imap = &$this->_shareOb->getImap();
+                //FIXME: Simplify with getType
                 $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder);
                 if (is_a($annotation, 'PEAR_Error')) {
                     return $annotation;
@@ -1061,6 +1194,40 @@ class Horde_Share_Object_kolab extends H
                 continue;
             } elseif ($attribute == 'folder') {
                 continue;
+            } elseif ($attribute == 'params') {
+                $type = $this->getType();
+                if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
+                    $params = @unserialize($value);
+                    if (isset($params['fbrelevance'])) {
+                        $result = $this->setFbrelevance($params['fbrelevance']);
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        }
+                        unset($params['fbrelevance']);
+                    }
+                    if (isset($params['xfbaccess'])) {
+                        $result = $this->setXfbaccess($params['xfbaccess']);
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        }
+                        unset($params['xfbaccess']);
+                    }
+
+                    if (empty($params)) {
+                        continue;
+                    }
+                    
+                    $value = @serialize($params);
+                }
+
+                $imap = &$this->_shareOb->getImap();
+                // setAnnotation apparently does not suppoort UTF-8 nor any special characters
+                $store = base64_encode($value);
+                $entry = HORDE_ANNOT_SHARE_ATTR . $attribute;
+                $result = $imap->setAnnotation($entry, array('value.shared' => $store), $this->_folder);
+                if (is_a($result, 'PEAR_Error')) {
+                    return $result;
+                }
             } else {
                 $imap = &$this->_shareOb->getImap();
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters

--- NEW FILE: HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch ---
This patch is required if you want to use Ingo with the Kolab server.

diff -r 56b552eb6b01 framework/Prefs/Prefs/kolab.php
--- a/framework/Prefs/Prefs/kolab.php	Wed Nov 28 17:00:34 2007 +0100
+++ b/framework/Prefs/Prefs/kolab.php	Wed Nov 28 17:04:21 2007 +0100
@@ -1,5 +1,6 @@
 <?php
 
+require_once 'Horde/Auth.php';
 require_once 'Horde/Prefs/ldap.php';
 require_once 'Horde/Kolab.php';
 
@@ -38,6 +39,8 @@ class Prefs_kolab extends Prefs_ldap {
                         'version' => '3',
                         'basedn' => $GLOBALS['conf']['kolab']['ldap']['basedn'],
                         'fetchdn' => true,
+                        'username' => Auth::getAuth(),
+                        'password' => Auth::getCredential('password'),
                         'searchdn' => $GLOBALS['conf']['kolab']['ldap']['phpdn'],
                         'searchpass' => $GLOBALS['conf']['kolab']['ldap']['phppw'],
                         'uid' => array('mail', 'uid'));



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/ingo-3.2-rc2
	HK-GW-Config_ingo-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.2F0B960C4CE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/ingo-3.2-rc2
In directory doto:/tmp/cvs-serv32120/ingo-3.2-rc2

Added Files:
	HK-GW-Config_ingo-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_ingo-3.2-rc2.patch ---
diff -r c689cfb3842b ingo/config/backends.php.dist
--- a/ingo/config/backends.php.dist	Tue Feb 19 13:16:57 2008 +0100
+++ b/ingo/config/backends.php.dist	Tue Feb 19 13:27:48 2008 +0100
@@ -40,6 +40,8 @@
  *               give them permissions to do so. If you want to enable this
  *               feature, you need to set this parameter to true.
  */
+
+if (!$GLOBALS['conf']['kolab']['enabled']) {
 
 /* IMAP Example */
 $backends['imap'] = array(
@@ -278,6 +280,8 @@
     'scriptparams' => array()
 );
 
+}
+
 /* Kolab Example (using Sieve) */
 if ($GLOBALS['conf']['kolab']['enabled']) {
     require_once 'Horde/Kolab.php';
diff -r c689cfb3842b ingo/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ingo/config/conf.php	Tue Feb 19 13:27:48 2008 +0100
@@ -0,0 +1,15 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: ingo/config/conf.xml,v 1.13.12.1 2007/12/20 14:05:46 jan Exp $
+$conf['menu']['apps'] = array();
+$conf['storage']['driver'] = 'prefs';
+$conf['storage']['maxblacklist'] = 0;
+$conf['storage']['maxwhitelist'] = 0;
+$conf['rules']['userheader'] = true;
+$conf['rules']['usefolderapi'] = true;
+$conf['spam']['header'] = 'X-Spam-Level';
+$conf['spam']['char'] = '*';
+$conf['spam']['compare'] = 'string';
+$conf['hooks']['vacation_addresses'] = false;
+$conf['hooks']['vacation_only'] = true;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/horde-3.2-rc2
	HK-GW-Config_horde-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.2A1F360C4C8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/horde-3.2-rc2
In directory doto:/tmp/cvs-serv32120/horde-3.2-rc2

Added Files:
	HK-GW-Config_horde-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_horde-3.2-rc2.patch ---
The kolab specific configuration settings for the horde package.

diff -r 9884c84c8c49 horde/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/horde/config/conf.php	Wed Feb 20 17:24:48 2008 +0100
@@ -0,0 +1,99 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.50 2008/01/07 20:08:41 bklang Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
+$conf['session']['cache_limiter'] = 'nocache';
+$conf['session']['timeout'] = 3600;
+$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
+$conf['cookie']['path'] = '/horde';
+$conf['sql'] = null;
+$conf['auth']['admins'] = array('manager');
+$conf['auth']['checkip'] = true;
+$conf['auth']['checkbrowser'] = true;
+$conf['auth']['alternate_login'] = false;
+$conf['auth']['redirect_on_logout'] = false;
+$conf['auth']['params']['login_block'] = true;
+$conf['auth']['params']['login_block_count'] = 3;
+$conf['auth']['params']['login_block_time'] = 5;
+$conf['auth']['driver'] = 'kolab';
+$conf['signup']['allow'] = false;
+$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['ident'] = 'HORDE';
+$conf['log']['params'] = array();
+$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['params']['append'] = true;
+$conf['log']['type'] = 'file';
+$conf['log']['enabled'] = true;
+$conf['log_accesskeys'] = false;
+$conf['prefs']['driver'] = 'kolab';
+$conf['alarms']['driver'] = false;
+$conf['datatree']['driver'] = 'null';
+$conf['group']['driver'] = 'mock';
+$conf['group']['cache'] = false;
+$conf['share']['no_sharing'] = false;
+$conf['share']['cache'] = false;
+$conf['share']['driver'] = 'kolab';
+$conf['cache']['default_lifetime'] = 1800;
+$conf['cache']['params']['dir'] = Horde::getTempDir();
+$conf['cache']['params']['sub'] = 0;
+$conf['cache']['driver'] = 'file';
+$conf['token']['driver'] = 'none';
+$conf['mailer']['params']['auth'] = false;
+$conf['mailer']['type'] = 'smtp';
+$conf['mailformat']['brokenrfc2231'] = false;
+$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../tmp';
+$conf['vfs']['type'] = 'file';
+$conf['sessionhandler']['type'] = 'none';
+$conf['image']['convert'] = '/usr/bin/convert';
+$conf['mime']['magic_db'] = '/etc/mime.types';
+$conf['problems']['email'] = 'webmaster at example.com';
+$conf['problems']['maildomain'] = 'example.com';
+$conf['problems']['tickets'] = false;
+$conf['menu']['apps'] = array();
+$conf['menu']['always'] = false;
+$conf['menu']['links']['help'] = 'all';
+$conf['menu']['links']['help_about'] = true;
+$conf['menu']['links']['options'] = 'authenticated';
+$conf['menu']['links']['problem'] = 'all';
+$conf['menu']['links']['login'] = 'all';
+$conf['menu']['links']['logout'] = 'authenticated';
+$conf['hooks']['permsdenied'] = false;
+$conf['hooks']['username'] = false;
+$conf['hooks']['preauthenticate'] = false;
+$conf['hooks']['postauthenticate'] = false;
+$conf['hooks']['authldap'] = false;
+$conf['hooks']['groupldap'] = false;
+$conf['portal']['fixed_blocks'] = array();
+$conf['accounts']['driver'] = 'null';
+$conf['user']['verify_from_addr'] = false;
+$conf['imsp']['enabled'] = false;
+$conf['kolab']['ldap']['server'] = 'localhost';
+$conf['kolab']['ldap']['port'] = 389;
+$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
+$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+$conf['kolab']['ldap']['phppw'] = 'dummy';
+$conf['kolab']['imap']['server'] = 'localhost';
+$conf['kolab']['imap']['port'] = 143;
+$conf['kolab']['imap']['sieveport'] = 2000;
+$conf['kolab']['imap']['virtdomains'] = true;
+$conf['kolab']['imap']['maildomain'] = 'example.com';
+$conf['kolab']['smtp']['server'] = 'localhost';
+$conf['kolab']['smtp']['port'] = 25;
+$conf['kolab']['misc']['multidomain'] = false;
+$conf['kolab']['enabled'] = true;
+$conf['memcache']['enabled'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r 9884c84c8c49 horde/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/horde/config/kolab.php	Wed Feb 20 17:24:48 2008 +0100
@@ -0,0 +1,12 @@
+<?php
+$conf['log']['name'] = '@@@webserver_logdir@@@/horde/horde.log';
+$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
+$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
+$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
+$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
+$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
+$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
+$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
+?>
diff -r 9884c84c8c49 horde/config/prefs.php.dist
--- a/horde/config/prefs.php.dist	Wed Feb 20 17:06:43 2008 +0100
+++ b/horde/config/prefs.php.dist	Wed Feb 20 17:24:48 2008 +0100
@@ -334,7 +334,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 
 // UI theme
 $_prefs['theme'] = array(
-    'value' => 'bluewhite',
+    'value' => 'silver',
     'locked' => false,
     'shared' => true,
     'type' => 'select',



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/imp-3.2-rc2
	HK-GW-Config_imp-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.2F67B60C4CF@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/imp-3.2-rc2
In directory doto:/tmp/cvs-serv32120/imp-3.2-rc2

Added Files:
	HK-GW-Config_imp-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_imp-3.2-rc2.patch ---
diff -r 18399a1e2037 imp/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imp/config/conf.php	Tue Feb 19 13:28:57 2008 +0100
@@ -0,0 +1,65 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: imp/config/conf.xml,v 1.53.2.21 2008/01/03 07:07:57 slusarz Exp $
+$conf['spell']['driver'] = 'aspell';
+$conf['utils']['gnupg'] = '/usr/bin/gpg';
+$conf['utils']['gnupg_keyserver'] = array();
+$conf['utils']['gnupg_timeout'] = 10;
+$conf['utils']['openssl_cafile'] = '/etc/ssl/certs';
+$conf['utils']['openssl_binary'] = '/usr/bin/openssl';
+$conf['menu']['apps'] = array();
+$conf['user']['select_sentmail_folder'] = true;
+$conf['user']['allow_resume_all_in_drafts'] = false;
+$conf['user']['allow_folders'] = true;
+$conf['user']['allow_resume_all'] = false;
+$conf['user']['allow_view_source'] = true;
+$conf['user']['alternate_login'] = false;
+$conf['user']['redirect_on_logout'] = false;
+$conf['user']['select_view'] = true;
+$conf['server']['change_server'] = false;
+$conf['server']['change_port'] = false;
+$conf['server']['change_protocol'] = false;
+$conf['server']['change_smtphost'] = false;
+$conf['server']['change_smtpport'] = false;
+$conf['server']['server_list'] = 'none';
+$conf['server']['fixed_folders'] = array();
+$conf['server']['sort_limit'] = 0;
+$conf['server']['cache_folders'] = false;
+$conf['server']['cachejs'] = false;
+$conf['server']['cachecss'] = false;
+$conf['mailbox']['show_preview'] = true;
+$conf['fetchmail']['show_account_colors'] = false;
+$conf['fetchmail']['size_limit'] = 4000000;
+$conf['mboxcache']['use_mboxcache'] = false;
+$conf['mlistcache']['use_mlistcache'] = false;
+$conf['msgsettings']['filtering']['words'] = './config/filter.txt';
+$conf['msgsettings']['filtering']['replacement'] = '****';
+$conf['spam']['reporting'] = false;
+$conf['notspam']['reporting'] = false;
+$conf['print']['add_printedby'] = false;
+$conf['msg']['prepend_header'] = true;
+$conf['msg']['append_trailer'] = false;
+$conf['compose']['allow_receipts'] = true;
+$conf['compose']['special_characters'] = true;
+$conf['compose']['use_vfs'] = true;
+$conf['compose']['link_all_attachments'] = false;
+$conf['compose']['link_attachments_notify'] = true;
+$conf['compose']['link_attachments'] = true;
+$conf['compose']['attach_size_limit'] = 0;
+$conf['compose']['attach_count_limit'] = 0;
+$conf['compose']['reply_limit'] = 200000;
+$conf['hooks']['vinfo'] = false;
+$conf['hooks']['postlogin'] = false;
+$conf['hooks']['postsent'] = false;
+$conf['hooks']['signature'] = false;
+$conf['hooks']['trailer'] = false;
+$conf['hooks']['fetchmail_filter'] = false;
+$conf['hooks']['mbox_redirect'] = true;
+$conf['hooks']['mbox_icon'] = true;
+$conf['hooks']['spam_bounce'] = false;
+$conf['hooks']['msglist_format'] = false;
+$conf['maillog']['use_maillog'] = true;
+$conf['sentmail']['driver'] = 'none';
+$conf['tasklist']['use_tasklist'] = true;
+$conf['notepad']['use_notepad'] = true;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 18399a1e2037 imp/config/servers.php.dist
--- a/imp/config/servers.php.dist	Tue Feb 19 13:16:57 2008 +0100
+++ b/imp/config/servers.php.dist	Tue Feb 19 13:28:57 2008 +0100
@@ -203,6 +203,8 @@
  *              time, you may want to set this to a lower value.  The minimum
  *              value for this setting is 1.
  */
+
+if (!$GLOBALS['conf']['kolab']['enabled']) {
 
 /* Any entries whose key value ('foo' in $servers['foo']) begin with '_'
  * (an underscore character) will be treated as prompts, and you won't be
@@ -287,6 +289,7 @@
     'realm' => '',
     'preferred' => '',
 );
+}
 
 if ($GLOBALS['conf']['kolab']['enabled']) {
     require_once 'Horde/Kolab.php';



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/mimp-3.2-rc2
	HK-GW-Config_mimp-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.3173C60C4D1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/mimp-3.2-rc2
In directory doto:/tmp/cvs-serv32120/mimp-3.2-rc2

Added Files:
	HK-GW-Config_mimp-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_mimp-3.2-rc2.patch ---
mimp configuration.

diff -r 2ebae69609af mimp/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mimp/config/conf.php	Tue Feb 19 13:20:13 2008 +0100
@@ -0,0 +1,8 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: mimp/config/conf.xml,v 1.13 2006/09/12 16:04:20 chuck Exp $
+$conf['mailbox']['max_from_chars'] = 10;
+$conf['mailbox']['max_subj_chars'] = 20;
+$conf['compose']['allow_cc'] = false;
+$conf['compose']['allow_bcc'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/mnemo-3.2-rc2
	HK-GW-Config_mnemo-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.9583460C4C1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/mnemo-3.2-rc2
In directory doto:/tmp/cvs-serv32120/mnemo-3.2-rc2

Added Files:
	HK-GW-Config_mnemo-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_mnemo-3.2-rc2.patch ---
diff -r 42133b862435 mnemo/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mnemo/config/conf.php	Tue Feb 19 13:08:09 2008 +0100
@@ -0,0 +1,9 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: mnemo/config/conf.xml,v 1.17.10.1 2007/12/20 14:17:38 jan Exp $
+$conf['storage']['driver'] = 'kolab';
+$conf['utils']['gnupg'] = '/usr/bin/gpg';
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/nag-3.2-rc2
	HK-GW-Config_nag-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.D51AD60C4C1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/nag-3.2-rc2
In directory doto:/tmp/cvs-serv32120/nag-3.2-rc2

Added Files:
	HK-GW-Config_nag-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_nag-3.2-rc2.patch ---
Test commit

diff -r cebbd2d910d7 nag/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nag/config/conf.php	Tue Feb 19 13:07:28 2008 +0100
@@ -0,0 +1,8 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: nag/config/conf.xml,v 1.25.10.2 2007/12/20 14:23:06 jan Exp $
+$conf['storage']['driver'] = 'kolab';
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/passwd-3.2-rc2
	HK-GW-Config_passwd-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.D77C160C4C3@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/passwd-3.2-rc2
In directory doto:/tmp/cvs-serv32120/passwd-3.2-rc2

Added Files:
	HK-GW-Config_passwd-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_passwd-3.2-rc2.patch ---
passwd configuration.

diff -r 00411dcfa279 passwd/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/passwd/config/conf.php	Tue Feb 19 13:20:51 2008 +0100
@@ -0,0 +1,13 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: passwd/config/conf.xml,v 1.12 2005/10/09 14:48:58 jan Exp $
+$conf['menu']['apps'] = array();
+$conf['backend']['backend_list'] = 'hidden';
+$conf['user']['change'] = true;
+$conf['user']['refused'] = array('root', 'bin', 'daemon', 'adm', 'lp', 'shutdown', 'halt', 'uucp', 'ftp', 'anonymous', 'nobody', 'httpd', 'operator', 'guest', 'diginext', 'bind', 'cyrus', 'courier', 'games', 'kmem', 'mailnull', 'man', 'mysql', 'news', 'postfix', 'sshd', 'tty', 'www');
+$conf['password']['strengthtests'] = false;
+$conf['hooks']['full_name'] = true;
+$conf['hooks']['default_username'] = false;
+$conf['hooks']['username'] = false;
+$conf['hooks']['userdn'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Wed Feb 20 18:35:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 20 Feb 2008 18:35:17 +0100 (CET)
Subject: gunnar: server/patches/horde/turba-3.2-rc2
	HK-GW-Config_turba-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fix_share_id_change_turba-3.2-rc2.patch, NONE,
	1.1 HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080220173517.DCB5960C4C8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/turba-3.2-rc2
In directory doto:/tmp/cvs-serv32120/turba-3.2-rc2

Added Files:
	HK-GW-Config_turba-3.2-rc2.patch 
	HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch 
	HK-GW-Fix_share_id_change_turba-3.2-rc2.patch 
	HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch 
Log Message:
A first set of patches for Horde-3.2-rc2. Kronolith/Fbview has not yet been completed.

--- NEW FILE: HK-GW-Config_turba-3.2-rc2.patch ---
diff -r ad6624caac2b turba/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/turba/config/conf.php	Tue Feb 19 13:30:03 2008 +0100
@@ -0,0 +1,10 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: turba/config/conf.xml,v 1.6.2.4 2007/12/20 14:34:24 jan Exp $
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+$conf['client']['addressbook'] = 'kolab_local';
+$conf['shares']['source'] = 'kolab';
+$conf['comments']['allow'] = true;
+$conf['documents']['type'] = 'horde';
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r ad6624caac2b turba/config/sources.php.dist
--- a/turba/config/sources.php.dist	Tue Feb 19 13:08:10 2008 +0100
+++ b/turba/config/sources.php.dist	Tue Feb 19 13:30:03 2008 +0100
@@ -120,8 +120,8 @@
  *
  * approximate: Only applies to LDAP servers. If set, should be an
  *              array of native field/attribute names to search
- *              "approximately" (for example, "Sánchez", "Sanchez",
- *              and "Sanchéz" will all match a search string of
+ *              "approximately" (for example, "Sánchez", "Sanchez",
+ *              and "Sanchéz" will all match a search string of
  *              "sanchez").
  *
  * export:      If set to true, this source will appear on the Export menu,
@@ -148,6 +148,8 @@
  *                  field.
  * Here are some example configurations:
  */
+
+if (empty($GLOBALS['conf']['kolab']['enabled'])) {
 
 /**
  * A local address book in an SQL database. This implements a private
@@ -748,6 +750,8 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 }
 /* End IMSP sources. */
 
+}
+
 /* Begin Kolab sources. */
 if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
 
@@ -783,6 +787,8 @@ if (!empty($GLOBALS['conf']['kolab']['en
                 'version' => 3,
                 'bind_dn' => '',
                 'bind_password' => '',
+                'bind_password' => '',
+                'read_only'     => true,
             ),
             'map' => array(
                 '__key'             => 'dn',

--- NEW FILE: HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch ---
Fixes editing contacts.

diff -r e2bcaaed2d6b turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Wed Nov 28 17:23:14 2007 +0100
+++ b/turba/lib/Driver/share.php	Wed Nov 28 17:24:17 2007 +0100
@@ -58,7 +58,7 @@ class Turba_Driver_share extends Turba_D
      */
     function getName()
     {
-        $share_parts = explode(':', $this->_share->getName());
+        $share_parts = explode(':', $this->_share->getId());
         return array_pop($share_parts);
     }
 

--- NEW FILE: HK-GW-Fix_share_id_change_turba-3.2-rc2.patch ---
This fixes a problem with the way the Kolab share driver handles ids.

diff -r 0ffb2574c923 turba/lib/Turba.php
--- a/turba/lib/Turba.php	Wed Nov 28 17:04:21 2007 +0100
+++ b/turba/lib/Turba.php	Wed Nov 28 17:23:14 2007 +0100
@@ -439,7 +439,7 @@ class Turba {
 
                         $source_config = $sources[$source];
                         $source_config['params']['share'] = &$share;
-                        $sources[$sourceKey] = $source_config;
+                        $sources[$share->getId()] = $source_config;
                     } else {
                         $notification->push($driver, 'horde.error');
                     }
@@ -564,7 +564,7 @@ class Turba {
         /* Add the new addressbook to the user's list of visible
          * address books. */
         $prefs = explode("\n", $GLOBALS['prefs']->getValue('addressbooks'));
-        if (array_search($share_id, $prefs) === false) {
+        if (array_search($share->getId(), $prefs) === false) {
             $GLOBALS['prefs']->setValue('addressbooks', $GLOBALS['prefs']->getValue('addressbooks') . "\n" . $share_id);
         }
         return $share;

--- NEW FILE: HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch ---
This is a temporary fix to mark the ldap addressbook as read-only. This should be solved with the Horde Perms package but this needs a new driver.

diff -r 7712d454fb57 turba/lib/Driver/ldap.php
--- a/turba/lib/Driver/ldap.php	Mon Feb 18 08:51:51 2008 +0100
+++ b/turba/lib/Driver/ldap.php	Mon Feb 18 09:51:07 2008 +0100
@@ -53,6 +53,9 @@ class Turba_Driver_ldap extends Turba_Dr
         }
         if (empty($params['deref'])) {
             $params['deref'] = LDAP_DEREF_NEVER;
+        }
+        if (empty($params['read_only'])) {
+            $params['read_only'] = false;
         }
 
         parent::Turba_Driver($params);
@@ -750,4 +753,25 @@ class Turba_Driver_ldap extends Turba_Dr
         return $dn;
     }
 
+    /**
+     * Checks if the current user has the requested permission
+     * on this source.
+     *
+     * @param integer $perm  The permission to check for.
+     *
+     * @return boolean  true if user has permission, false otherwise.
+     */
+     function hasPermission($perm)
+    {
+        if ($this->_params['read_only'] === false) {
+            return parent::hasPermission($perm);
+        } else {
+            switch ($perm) {
+                case PERMS_EDIT: return false;
+                case PERMS_DELETE: return false;
+                default: return parent::hasPermission($perm);
+            }
+        }
+    }
+
 }



From cvs at kolab.org  Thu Feb 21 12:59:44 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 12:59:44 +0100 (CET)
Subject: gunnar: server/patches/horde/fbview-kronolith-3.2-rc2 - New directory
Message-ID: <20080221115944.D5715600168@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/fbview-kronolith-3.2-rc2
In directory doto:/tmp/cvs-serv7635/fbview-kronolith-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/fbview-kronolith-3.2-rc2 added to the repository




From cvs at kolab.org  Thu Feb 21 12:59:44 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 12:59:44 +0100 (CET)
Subject: gunnar: server/patches/horde/kronolith-3.2-rc2 - New directory 
Message-ID: <20080221115944.D6D2D600175@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/kronolith-3.2-rc2
In directory doto:/tmp/cvs-serv7635/kronolith-3.2-rc2

Log Message:
Directory /kolabrepository/server/patches/horde/kronolith-3.2-rc2 added to the repository




From cvs at kolab.org  Thu Feb 21 13:01:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 13:01:00 +0100 (CET)
Subject: gunnar: server/patches/horde/fbview-kronolith-3.2-rc2
	HK-GW-Config_fbview-kronolith-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch, NONE,
	1.1 HK-GW-Urlencode_fbview-kronolith-3.2-rc2.patch, NONE,
	1.1 HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch, NONE,
	1.1 HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch,
	NONE, 1.1 
Message-ID: <20080221120100.5D46E600175@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/fbview-kronolith-3.2-rc2
In directory doto:/tmp/cvs-serv7707/fbview-kronolith-3.2-rc2

Added Files:
	HK-GW-Config_fbview-kronolith-3.2-rc2.patch 
	HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch 
	HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch 
	HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch 
	HK-GW-Urlencode_fbview-kronolith-3.2-rc2.patch 
	HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch 
	HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch 
Log Message:
The patch set for Horde-3.2-rc2 is complete. It still needs packaging and testing.

--- NEW FILE: HK-GW-Config_fbview-kronolith-3.2-rc2.patch ---
diff -r 36e1ed9ebc99 fbview-kronolith/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/config/conf.php	Wed Feb 20 17:30:39 2008 +0100
@@ -0,0 +1,20 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: kronolith/config/conf.xml,v 1.14.10.5 2007/12/20 14:12:23 jan Exp $
+$conf['calendar']['driver'] = 'kolab';
+$conf['storage']['default_domain'] = '';
+$conf['storage']['freebusy']['protocol'] = 'https';
+$conf['storage']['freebusy']['port'] = 443;
+$conf['storage']['driver'] = 'kolab';
+$conf['metadata']['keywords'] = false;
+$conf['reminder']['server_name'] = '';
+$conf['reminder']['from_addr'] = '';
+$conf['autoshare']['shareperms'] = 'none';
+$conf['holidays']['enable'] = true;
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r 36e1ed9ebc99 fbview-kronolith/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/config/kolab.php	Wed Feb 20 17:30:39 2008 +0100
@@ -0,0 +1,5 @@
+<?php
+$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
+$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
+$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
+?>
diff -r 36e1ed9ebc99 fbview-kronolith/config/prefs.php.dist
--- a/fbview-kronolith/config/prefs.php.dist	Wed Feb 20 17:28:32 2008 +0100
+++ b/fbview-kronolith/config/prefs.php.dist	Wed Feb 20 17:30:39 2008 +0100
@@ -83,7 +83,7 @@ if ($GLOBALS['registry']->hasMethod('con
 
 // default view
 $_prefs['defaultview'] = array(
-    'value' => 'month',
+    'value' => 'attendees',
     'locked' => false,
     'shared' => false,
     'type' => 'enum',

--- NEW FILE: HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch ---
diff -r 36826ddfc3bd fbview-kronolith/attendees.php
--- a/fbview-kronolith/attendees.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/attendees.php	Thu Feb 21 12:24:52 2008 +0100
@@ -243,6 +243,7 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 
 if ($browser->hasFeature('javascript')) {
     Horde::addScriptFile('open_savedattlist_win.js');
diff -r 36826ddfc3bd fbview-kronolith/calendars/create.php
--- a/fbview-kronolith/calendars/create.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/create.php	Thu Feb 21 12:24:52 2008 +0100
@@ -39,6 +39,6 @@ if ($form->validate($vars)) {
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'create.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/delete.php
--- a/fbview-kronolith/calendars/delete.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/delete.php	Thu Feb 21 12:24:52 2008 +0100
@@ -56,6 +56,6 @@ if ($form->validate(new Variables($_POST
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'delete.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/edit.php
--- a/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:24:52 2008 +0100
@@ -59,6 +59,6 @@ if (isset($params['fbrelevance'])) {
 }
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/index.php
--- a/fbview-kronolith/calendars/index.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/index.php	Thu Feb 21 12:24:52 2008 +0100
@@ -69,6 +69,6 @@ Horde::addScriptFile('tables.js', 'krono
 Horde::addScriptFile('tables.js', 'kronolith', true);
 $title = _("Manage Calendars");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 require KRONOLITH_TEMPLATES . '/calendar_list.php';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_edit.php
--- a/fbview-kronolith/calendars/remote_edit.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_edit.php	Thu Feb 21 12:24:52 2008 +0100
@@ -59,6 +59,6 @@ if ($form->validate($vars)) {
 $vars->set('password', $calendar['password']);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_subscribe.php
--- a/fbview-kronolith/calendars/remote_subscribe.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_subscribe.php	Thu Feb 21 12:24:52 2008 +0100
@@ -39,6 +39,6 @@ if ($form->validate($vars)) {
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_subscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_unsubscribe.php
--- a/fbview-kronolith/calendars/remote_unsubscribe.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_unsubscribe.php	Thu Feb 21 12:24:52 2008 +0100
@@ -56,6 +56,6 @@ if ($form->validate(new Variables($_POST
 $vars->set('url', $calendar['url']);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_unsubscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/lib/Kronolith.php
--- a/fbview-kronolith/lib/Kronolith.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/lib/Kronolith.php	Thu Feb 21 12:24:52 2008 +0100
@@ -1971,6 +1971,33 @@ class Kronolith {
     }
 
     /**
+     * Builds Kronolith's list of menu items.
+     */
+    function getFbviewMenu($returnType = 'object')
+    {
+        global $conf, $registry, $browser, $prefs;
+
+        /* Check here for guest calendars so that we don't get multiple
+         * messages after redirects, etc. */
+        if (!Auth::getAuth() && !count($GLOBALS['all_calendars'])) {
+            $GLOBALS['notification']->push(_("No calendars are available to guests."));
+        }
+
+        require_once 'Horde/Menu.php';
+        $menu = new Menu(HORDE_MENU_MASK_HELP | HORDE_MENU_MASK_LOGIN);
+
+        $menu->add(Horde::applicationUrl('attendees.php'), _("Attendees"), 'attendees.png', null, null, null, '__noselection');
+
+        $menu->add(Horde::applicationUrl('calendars/'), _("Calendars"), 'calendars.png', null, null, null, '__noselection');
+
+        if ($returnType == 'object') {
+            return $menu;
+        } else {
+            return $menu->render();
+        }
+    }
+
+    /**
      * Used with usort() to sort events based on their start times.
      * This function ignores the date component so recuring events can
      * be sorted correctly on a per day basis.
diff -r 36826ddfc3bd fbview-kronolith/templates/fbview-menu.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/fbview-menu.inc	Thu Feb 21 12:24:52 2008 +0100
@@ -0,0 +1,4 @@
+<div id="menu">
+ <?php echo Kronolith::getFbviewMenu('string') ?>
+</div>
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

--- NEW FILE: HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch ---
Allows to set the free/busy relevance on a calendar.

diff -r e6be25b82291 fbview-kronolith/calendars/edit.php
--- a/fbview-kronolith/calendars/edit.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:22:33 2008 +0100
@@ -53,6 +53,10 @@ if ($form->validate($vars)) {
 
 $vars->set('name', $calendar->get('name'));
 $vars->set('description', $calendar->get('desc'));
+$params = @unserialize($calendar->get('params'));
+if (isset($params['fbrelevance'])) {
+    $vars->set('fbrelevance', $params['fbrelevance']);
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r e6be25b82291 fbview-kronolith/lib/Forms/CreateCalendar.php
--- a/fbview-kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 12:22:33 2008 +0100
@@ -35,6 +35,9 @@ class Kronolith_CreateCalendarForm exten
 
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Create")));
     }
@@ -48,6 +51,7 @@ class Kronolith_CreateCalendarForm exten
         }
         $calendar->set('name', $this->_vars->get('name'));
         $calendar->set('desc', $this->_vars->get('description'));
+        $calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
         return $GLOBALS['kronolith_shares']->addShare($calendar);
     }
 
diff -r e6be25b82291 fbview-kronolith/lib/Forms/EditCalendar.php
--- a/fbview-kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 12:22:34 2008 +0100
@@ -42,6 +42,9 @@ class Kronolith_EditCalendarForm extends
         $this->addHidden('', 'c', 'text', true);
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Save")));
     }
@@ -51,6 +54,7 @@ class Kronolith_EditCalendarForm extends
         $original_name = $this->_calendar->get('name');
         $this->_calendar->set('name', $this->_vars->get('name'));
         $this->_calendar->set('desc', $this->_vars->get('description'));
+        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
 
         if ($original_name != $this->_vars->get('name')) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));

--- NEW FILE: HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch ---
diff -r 14457cf2ea2c fbview-kronolith/perms.php
--- a/fbview-kronolith/perms.php	Thu Nov 29 15:20:49 2007 +0100
+++ b/fbview-kronolith/perms.php	Thu Nov 29 15:25:36 2007 +0100
@@ -15,6 +15,34 @@ require_once KRONOLITH_BASE . '/lib/base
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/Group.php';
 
+function &getFbperms($share) 
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        if (isset($params['xfbaccess'])) {
+            $xfbusers = $params['xfbaccess'];
+            foreach ($xfbusers as $user) {
+                $fbperms[$user] = PERMS_READ;
+            }
+        }
+    }
+    return $fbperms;
+}
+
+function setFbperms($share, $xfbusers)
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        $params['xfbaccess'] = $xfbusers;
+        $params = serialize($params);
+        $share->set('params', $params);
+    }
+}
+
 $shares = &Horde_Share::singleton('kronolith');
 $groups = &Group::singleton();
 $auth = &Auth::singleton($conf['auth']['driver']);
@@ -36,6 +64,8 @@ case 'edit':
         $notification->push($share, 'horde.error');
     } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) {
         exit('permission denied');
+    } else {
+        $fbperms = getFbperms($share);
     }
     break;
 
@@ -251,6 +281,24 @@ case 'editform':
             }
         }
 
+        // Process free/busy permissions.
+        $fb_names = Util::getFormData('fb_names');
+        $fb_read = Util::getFormData('fb_read');
+
+        $fbperms = getFbperms($share);
+        foreach ($fb_names as $key => $user) {
+            if (empty($user)) {
+                continue;
+            }
+
+            if (!empty($fb_read[$key])) {
+                $fbperms[$user] = PERMS_READ;
+            } else {
+                unset($fbperms[$user]);
+            }
+        }
+        setFbperms($share, array_keys($fbperms));
+
         $share->setPermission($perm, false);
         $share->save();
         $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
diff -r 14457cf2ea2c fbview-kronolith/templates/perms/perms.inc
--- a/fbview-kronolith/templates/perms/perms.inc	Thu Nov 29 15:20:49 2007 +0100
+++ b/fbview-kronolith/templates/perms/perms.inc	Thu Nov 29 15:25:36 2007 +0100
@@ -355,6 +355,61 @@
   <td>&nbsp;</td>
 </tr>
 
+<!-- Extended free/busy Permissions -->
+<tr valign="middle">
+  <td class="header leftAlign">
+    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Extended free/busy access") ?>
+  </td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center"><?php echo _("Read") ?></td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header">&nbsp;</td>
+</tr>
+<?php foreach ($fbperms as $user => $fbperm) { if ($user != $owner) { ?>
+<tr>
+  <td class="light"><?php echo htmlspecialchars(Auth::removeHook($user)) ?><input type="hidden" name="fb_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" name="fb_read[<?php echo htmlspecialchars($user) ?>]"<?php echo ($fbperm & PERMS_READ) ? ' checked="checked"' : '' ?> />
+    <label for="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+<?php } } ?>
+<!-- New extended free/busy row -->
+<tr>
+<?php if ($auth->hasCapability('list')): ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+    <select id="fb_names_new" name="fb_names[||new]">
+      <option value=""><?php echo _("Select a user to add:") ?></option>
+    <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
+      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+    <?php } } ?>
+    </select>
+  </td>
+<?php else: ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("User to add:") ?></label>
+    <input type="text" id="fb_names_new" name="fb_names[||new]" />
+  </td>
+<?php endif; ?>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_new" name="fb_read[||new]" />
+    <label for="fb_read_new" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+
 <tr>
  <td colspan="7">&nbsp;</td>
 </tr>

--- NEW FILE: HK-GW-Urlencode_fbview-kronolith-3.2-rc2.patch ---
diff -r 7cd8afa04866 fbview-kronolith/templates/calendar_list.php
--- a/fbview-kronolith/templates/calendar_list.php	Wed Feb 20 18:20:39 2008 +0100
+++ b/fbview-kronolith/templates/calendar_list.php	Wed Feb 20 18:31:05 2008 +0100
@@ -49,11 +49,11 @@
    <td><?php echo _("Local") ?></td>
    <td><?php $url = Util::addParameter($display_url_base, 'display_cal', $calendar->getName(), false) ?><a href="<?php echo htmlspecialchars($url) ?>" title="<?php echo _("Click or copy this URL to display this calendar") ?>" target="_blank"><?php echo htmlspecialchars(shorten_url($url)) ?></a></td>
    <td><?php $url = $webdav ? $subscribe_url_base . $calendar->getName() . '.ics' : Util::addParameter($subscribe_url_base, 'c', $calendar->getName(), false) ?><a href="<?php echo htmlspecialchars($url) ?>" title="<?php echo _("Click or copy this URL to display this calendar") ?>" target="_blank"><?php echo htmlspecialchars(shorten_url($url)) ?></a></td>
-   <td><a href="<?php echo Util::addParameter($edit_url_base, 'c', $calendar->getName()) ?>" title="<?php echo _("Edit") ?>"><?php echo $edit_img ?></a></td>
+   <td><a href="<?php echo Util::addParameter($edit_url_base, 'c', urlencode($calendar->getName())) ?>" title="<?php echo _("Edit") ?>"><?php echo $edit_img ?></a></td>
 <?php if (empty($conf['shares']['no_sharing'])): ?>
-   <td><a onclick="return !popup(this.href);" href="<?php echo Util::addParameter($perms_url_base, 'share', $calendar->getName()) ?>" target="_blank" title="<?php echo _("Change Permissions") ?>"><?php echo $perms_img ?></a></td>
+   <td><a onclick="return !popup(this.href);" href="<?php echo Util::addParameter($perms_url_base, 'share', urlencode($calendar->getName())) ?>" target="_blank" title="<?php echo _("Change Permissions") ?>"><?php echo $perms_img ?></a></td>
 <?php endif; ?>
-   <td><a href="<?php echo Util::addParameter($delete_url_base, 'c', $calendar->getName()) ?>" title="<?php echo _("Delete") ?>"><?php echo $delete_img ?></a></td>
+   <td><a href="<?php echo Util::addParameter($delete_url_base, 'c', urlencode($calendar->getName())) ?>" title="<?php echo _("Delete") ?>"><?php echo $delete_img ?></a></td>
 <?php endif; ?>
   </tr>
 <?php endforeach; ?>

--- NEW FILE: HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch ---
This includes extra parameters into the free/busy view. The params are hardcoded so this patch won't make it upstream.

diff -r 9fa9c2822bdd fbview-kronolith/lib/FBView.php
--- a/fbview-kronolith/lib/FBView.php	Mon Feb 18 09:53:58 2008 +0100
+++ b/fbview-kronolith/lib/FBView.php	Mon Feb 18 10:03:17 2008 +0100
@@ -86,7 +86,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_requiredMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -107,7 +107,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_optionalMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -122,6 +122,9 @@ class Kronolith_FreeBusy_View {
             $template->set('legend', '');
             $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.html');
         }
+
+	//**********
+	//This has been disabled in kolab-fbview. Make this optional?
 
         // Possible meeting times.
         $optimal->setAttribute('ORGANIZER', _("All Attendees"));
@@ -144,6 +147,9 @@ class Kronolith_FreeBusy_View {
         $template->set('name', _("Required Attendees"));
         $template->set('blocks', $blocks);
         $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
+
+	//This has been disabled in kolab-fbview. Make this optional?
+	//**********
 
         // Reset locale.
         setlocale(LC_NUMERIC, $lc);
@@ -217,7 +223,7 @@ class Kronolith_FreeBusy_View {
         return $instances[$view];
     }
 
-    function _getBlocks($member, $periods, $blockfile, $label)
+    function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
     {
         $template = new Horde_Template();
         $template->set('label', $label);
@@ -250,6 +256,21 @@ class Kronolith_FreeBusy_View {
 
                 $template->set('left', $left . '%');
                 $template->set('width', $width . '%');
+                $template->set('evclick', '');
+
+                if (isset($extra[$periodStart])) {
+                    if (!empty($extra[$periodStart]['X-UID'])) {
+                        $link = "javascript:performAction('viewaction', '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), 
+								'UTF-8',NLS::getCharset())) . "')";
+                        $template->set('evclick', $link);
+                    }
+                    if (!empty($extra[$periodStart]['X-SUMMARY'])) {
+                        $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8',
+				       NLS::getCharset()));
+                    }
+                }
 
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
             } else {

--- NEW FILE: HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch ---
Provides a patch to store the list of attendees in the user preferences. This is a broken patch that has been rejected upstream (http://bugs.horde.org/ticket/?id=4788). This should be solved using Horde::Groups.

diff -r e0e3817cd448 fbview-kronolith/attendees.php
--- a/fbview-kronolith/attendees.php	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/attendees.php	Mon Feb 18 09:53:57 2008 +0100
@@ -155,6 +155,16 @@ case 'clear':
     $attendees = array();
     $_SESSION['kronolith']['attendees'] = $attendees;
     break;
+
+case 'save':
+    if (empty($attendees)) {
+        break;
+    }
+    $savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+    $savedattlist[] = array_keys($attendees);
+    $prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    $notification->push(_('Successfully saved attendee list'), 'horde.success');
+    break;
 }
 
 // Get the current Free/Busy view; default to the 'day' view if none specified.
@@ -233,6 +243,14 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+if ($browser->hasFeature('javascript')) {
+    Horde::addScriptFile('open_savedattlist_win.js');
+    $savedattlist_url = 'javascript:open_savedattlist_win();';
+} else {
+    $savedattlist_url = Horde::applicationUrl('savedattlist.php');
+}
+
 $notification->notify(array('status'));
 require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 fbview-kronolith/config/prefs.php.dist
--- a/fbview-kronolith/config/prefs.php.dist	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/config/prefs.php.dist	Mon Feb 18 09:53:57 2008 +0100
@@ -457,3 +457,11 @@ if ($GLOBALS['registry']->hasMethod('con
     'shared' => false,
     'type' => 'implicit'
 );
+
+$_prefs['saved_attendee_list'] = array(
+    'value' => 'a:0:{}',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit',
+    'desc' => _("A saved list of attendees")
+);
diff -r e0e3817cd448 fbview-kronolith/savedattlist.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/savedattlist.php	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
+ * $Horde: kronolith/attendeeshandler.php,v 1.1 2004/05/25 08:34:21 stuart Exp $
+ *
+ * Copyright 2004 Code Fusion  <http://www.codefusion.co.za/>
+ *                Stuart Binge <s.binge at codefusion.co.za>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/FBView.php';
+
+$title = _('Load Attendee List');
+
+Horde::addScriptFile('tooltip.js', 'horde');
+require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+// Get our list of saved attendees
+$savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+
+// Preformat our image urls
+$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde'));
+$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde'));
+
+// Get our Action ID & Value. This specifies what action the user initiated.
+$actionID = Util::getFormData('actionID', false);
+$actionValue = Util::getFormData('actionValue', false);
+if (!$actionID) {
+    $actionID = (Util::getFormData('addNew', false) ? 'add' : false);
+    $actionValue = Util::getFormData('newAttendees', '');
+}
+
+// Perform the specified action, if there is one.
+switch ($actionID) {
+case 'remove':
+    // Remove the specified attendee
+    if (array_key_exists($actionValue, $savedattlist)) {
+        unset($savedattlist[$actionValue]);
+	$prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    }
+    
+    break;
+
+case 'dismiss':
+    // Make sure we're actually allowed to dismiss
+    if (!$allow_dismiss) break;
+
+    // Close the attendee window
+    global $browser;
+
+    if ($browser->hasFeature('javascript')) {
+        Util::closeWindowJS();
+    } else {
+        $url = Util::getFormData('url');
+
+        if (!empty($url)) {
+            $location = Horde::applicationUrl($url, true);
+        } else {
+            $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month'));
+            $url = Util::addParameter($url, 'year', Util::getFormData('year'));
+            $location = Horde::applicationUrl($url, true);
+        }
+
+        // Make sure URL is unique.
+        $location = Util::addParameter($location, 'unique', md5(microtime()));
+
+        header('Location: ' . $location);
+    }
+    break;
+}
+
+$form_handler = Horde::applicationUrl('savedattlist.php');
+require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc';
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 fbview-kronolith/templates/attendees/attendees.inc
--- a/fbview-kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -92,6 +92,8 @@ function switchDateView(view, timestamp)
 <div>
  <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
  <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" />
+ <input type="button" class="button" name="loadAttList" value="<?php echo htmlspecialchars(_("Load Attendee List")) ?>" onclick="<?php echo $savedattlist_url ?>" />
+ <?php if (!empty($attendees)): ?><input type="button" class="button" name="saveAttList" value="<?php echo htmlspecialchars(_("Save Attendee List")) ?>" onclick="performAction('save', '');" /><?php endif; ?>
  <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all attendees")) ?>" /><?php endif; ?>
 </div>
 
diff -r e0e3817cd448 fbview-kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/javascript/open_savedattlist_win.js	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
+<?php endif; ?>
+function open_savedattlist_win(args)
+{
+    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/savedattlist.php', 'kronolith')) ?>";
+    if (url.indexOf('?') == -1) glue = '?';
+    else glue = '<?php echo ini_get('arg_separator.output') ?>';
+    var now = new Date();
+    var name = "savedattlist_window_" + now.getTime();
+    if (args != "") {
+        url = url + glue + args + '<?php echo ini_get('arg_separator.output') ?>' + "uniq=" + now.getTime();
+    } else {
+        url = url + glue + "uniq=" + now.getTime();
+    }
+    var Width = screen.width;
+    if (Width > 775) {
+        Width = 700;
+    } else {
+        Width -= 75;
+    }
+    var Height = screen.height;
+    if (Height > 725) {
+        Height = 650;
+    } else {
+        Height -= 75;
+    }
+    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + Width + ",height=" + Height + ",left=0,top=0";
+    name = window.open(url, name, param);
+    if (!eval("name.opener")) {
+        name.opener = self;
+    }
+}
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?>// -->
+</script>
+<?php endif; ?>
diff -r e0e3817cd448 fbview-kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/savedattlist/savedattlist.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
+<!--
+function performAction(id, value)
+{
+    document.savedattlistForm.actionID.value = id;
+    document.savedattlistForm.actionValue.value = value;
+    document.savedattlistForm.submit();
+    return false;
+}
+
+function updateMessage(list)
+{
+    if (parent.opener.closed) {
+        alert('<?php echo addslashes(_("The Edit Attendees screen is no longer present. Exiting.")) ?>');
+        this.close();
+        return;
+    }
+
+    if (!parent.opener.document.attendeesForm) {
+        alert('<?php echo addslashes(_("You can only use this form from the Edit Attendees screen.")) ?>');
+        this.close();
+        return;
+    }
+
+    parent.opener.document.attendeesForm.newAttendees.value = list;
+    this.close();
+}
+// -->
+</script>
+
+<form method="post" action="<?php echo $form_handler; ?>" name="savedattlistForm">
+<?php Util::pformInput(); ?>
+<input type="hidden" name="actionID" value="" />
+<input type="hidden" name="actionValue" value="" />
+
+<div align="center">
+
+<table border="0" width="500" cellspacing="0" cellpadding="2">
+
+<!-- header -->
+<tr><td colspan="4" class="header"><b><?php echo $title ?></b></td></tr>
+
+<!-- attendee list header -->
+<tr class="item">
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $loadimg ?></td>
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $delimg ?></td>
+ <td nowrap="nowrap" width="96%"><b><?php echo htmlspecialchars(_("Attendees")) ?></b></td>
+</tr>
+
+<!-- attendees -->
+<?php $i = 0 ?>
+<?php if (empty($savedattlist)): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>"><td align="center" colspan="3"><i><?php echo htmlspecialchars('-- ' . _("No saved attendee lists are available") . ' --') ?></i></td></tr>
+<?php else: foreach ($savedattlist as $index => $list): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>">
+ <?php
+  echo '<td align="center">', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, "</a></td>";
+ ?>
+ <?php
+  echo '<td align="center">', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, "</a></td>";
+ ?>
+  <td><?php echo implode(', ', $list); ?></td>
+ </tr>
+<?php endforeach; endif; ?>
+</table>
+</div>
+</form>



From cvs at kolab.org  Thu Feb 21 13:01:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 13:01:00 +0100 (CET)
Subject: gunnar: server/patches/horde/framework-3.2-rc2
	HK-GW-Share_fixes_framework-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080221120100.9BFCA600175@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/framework-3.2-rc2
In directory doto:/tmp/cvs-serv7707/framework-3.2-rc2

Added Files:
	HK-GW-Share_fixes_framework-3.2-rc2.patch 
Log Message:
The patch set for Horde-3.2-rc2 is complete. It still needs packaging and testing.

--- NEW FILE: HK-GW-Share_fixes_framework-3.2-rc2.patch ---
diff -r 99f100a93637 framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php	Thu Feb 21 10:56:14 2008 +0100
+++ b/framework/Share/Share/kolab.php	Thu Feb 21 11:24:50 2008 +0100
@@ -197,7 +197,7 @@ class Horde_Share_kolab extends Horde_Sh
             if (is_a($result, 'PEAR_Error')) {
                 return $result;
             }
-            $objects[$result->getId()] = &$result;
+            $objects[$result->getName()] = &$result;
         }
         return $objects;
     }
@@ -363,7 +363,7 @@ class Horde_Share_kolab extends Horde_Sh
             return $result;
         }
 
-        array_push($this->_shares, $share->getId());
+        array_push($this->_shares, $share->getName());
 
         if ($share->get('default')) {
             $this->_default = $share->get('folder');
@@ -377,7 +377,7 @@ class Horde_Share_kolab extends Horde_Sh
      */
     function _removeShare(&$share)
     {
-        $share_id = $share->getId();
+        $share_id = $share->getName();
         $folder = $share->get('folder');
         $result = $this->_imap->exists($folder);
         if (is_a($result, 'PEAR_Error')) {
@@ -748,20 +748,20 @@ class Horde_Share_Object_kolab extends H
      */
     function _getId()
     {
+        return $this->_getName();
+    }
+
+    /**
+     * Returns the name of this share.
+     *
+     * @return string  The share's name.
+     */
+    function _getName()
+    {
         if ($this->get('default')) {
             return $this->_shareOb->buildShareId(Auth::getAuth());
         }
         return $this->_shareOb->buildShareId(rawurlencode($this->get('folder')));
-    }
-
-    /**
-     * Returns the name of this share.
-     *
-     * @return string  The share's name.
-     */
-    function _getName()
-    {
-        return $this->get('folder');
     }
 
     /**



From cvs at kolab.org  Thu Feb 21 13:01:00 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 13:01:00 +0100 (CET)
Subject: gunnar: server/patches/horde/kronolith-3.2-rc2
	HK-GW-Config_kronolith-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fbview_menu_kronolith-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch, NONE,
	1.1 HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch, NONE,
	1.1 HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch, NONE,
	1.1 HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch, NONE, 1.1 
Message-ID: <20080221120100.A3FDC600D77@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/kronolith-3.2-rc2
In directory doto:/tmp/cvs-serv7707/kronolith-3.2-rc2

Added Files:
	HK-GW-Config_kronolith-3.2-rc2.patch 
	HK-GW-Fbview_menu_kronolith-3.2-rc2.patch 
	HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch 
	HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch 
	HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch 
	HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch 
Log Message:
The patch set for Horde-3.2-rc2 is complete. It still needs packaging and testing.

--- NEW FILE: HK-GW-Config_kronolith-3.2-rc2.patch ---
diff -r 897fc5c72733 kronolith/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/config/conf.php	Tue Feb 19 13:18:26 2008 +0100
@@ -0,0 +1,20 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: kronolith/config/conf.xml,v 1.14.10.5 2007/12/20 14:12:23 jan Exp $
+$conf['calendar']['driver'] = 'kolab';
+$conf['storage']['default_domain'] = '';
+$conf['storage']['freebusy']['protocol'] = 'https';
+$conf['storage']['freebusy']['port'] = 443;
+$conf['storage']['driver'] = 'kolab';
+$conf['metadata']['keywords'] = false;
+$conf['reminder']['server_name'] = '';
+$conf['reminder']['from_addr'] = '';
+$conf['autoshare']['shareperms'] = 'none';
+$conf['holidays']['enable'] = true;
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r 897fc5c72733 kronolith/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/config/kolab.php	Tue Feb 19 13:18:26 2008 +0100
@@ -0,0 +1,5 @@
+<?php
+$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
+$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
+$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
+?>

--- NEW FILE: HK-GW-Fbview_menu_kronolith-3.2-rc2.patch ---
diff -r 00e3556b32b0 kronolith/attendees.php
--- a/kronolith/attendees.php	Mon Feb 18 10:03:18 2008 +0100
+++ b/kronolith/attendees.php	Mon Feb 18 10:10:00 2008 +0100
@@ -243,6 +243,7 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 
 if ($browser->hasFeature('javascript')) {
     Horde::addScriptFile('open_savedattlist_win.js');
diff -r 00e3556b32b0 kronolith/calendars/index.php
--- a/kronolith/calendars/index.php	Mon Feb 18 10:03:18 2008 +0100
+++ b/kronolith/calendars/index.php	Mon Feb 18 10:10:00 2008 +0100
@@ -70,5 +70,6 @@ Horde::addScriptFile('tables.js', 'krono
 $title = _("Manage Calendars");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 require KRONOLITH_TEMPLATES . '/calendar_list.php';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 00e3556b32b0 kronolith/lib/Kronolith.php
--- a/kronolith/lib/Kronolith.php	Mon Feb 18 10:03:18 2008 +0100
+++ b/kronolith/lib/Kronolith.php	Mon Feb 18 10:10:00 2008 +0100
@@ -1971,6 +1971,33 @@ class Kronolith {
     }
 
     /**
+     * Builds Kronolith's list of menu items.
+     */
+    function getFbviewMenu($returnType = 'object')
+    {
+        global $conf, $registry, $browser, $prefs;
+
+        /* Check here for guest calendars so that we don't get multiple
+         * messages after redirects, etc. */
+        if (!Auth::getAuth() && !count($GLOBALS['all_calendars'])) {
+            $GLOBALS['notification']->push(_("No calendars are available to guests."));
+        }
+
+        require_once 'Horde/Menu.php';
+        $menu = new Menu(HORDE_MENU_MASK_HELP | HORDE_MENU_MASK_LOGIN);
+
+        $menu->add(Horde::applicationUrl('attendees.php'), _("Attendees"), 'attendees.png', null, null, null, '__noselection');
+
+        $menu->add(Horde::applicationUrl('calendars.php'), _("Calendars"), 'calendars.png', null, null, null, '__noselection');
+
+        if ($returnType == 'object') {
+            return $menu;
+        } else {
+            return $menu->render();
+        }
+    }
+
+    /**
      * Used with usort() to sort events based on their start times.
      * This function ignores the date component so recuring events can
      * be sorted correctly on a per day basis.
diff -r 00e3556b32b0 kronolith/templates/fbview-menu.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/fbview-menu.inc	Mon Feb 18 10:10:00 2008 +0100
@@ -0,0 +1,4 @@
+<div id="menu">
+ <?php echo Kronolith::getFbviewMenu('string') ?>
+</div>
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

--- NEW FILE: HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch ---
Allows to set the free/busy relevance on a calendar.

diff -r e6be25b82291 fbview-kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/kronolith/calendars/edit.php	Thu Feb 21 12:22:33 2008 +0100
@@ -53,6 +53,10 @@ if ($form->validate($vars)) {
 
 $vars->set('name', $calendar->get('name'));
 $vars->set('description', $calendar->get('desc'));
+$params = @unserialize($calendar->get('params'));
+if (isset($params['fbrelevance'])) {
+    $vars->set('fbrelevance', $params['fbrelevance']);
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r e6be25b82291 fbview-kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 12:22:33 2008 +0100
@@ -35,6 +35,9 @@ class Kronolith_CreateCalendarForm exten
 
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Create")));
     }
@@ -48,6 +51,7 @@ class Kronolith_CreateCalendarForm exten
         }
         $calendar->set('name', $this->_vars->get('name'));
         $calendar->set('desc', $this->_vars->get('description'));
+        $calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
         return $GLOBALS['kronolith_shares']->addShare($calendar);
     }
 
diff -r e6be25b82291 fbview-kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 12:22:34 2008 +0100
@@ -42,6 +42,9 @@ class Kronolith_EditCalendarForm extends
         $this->addHidden('', 'c', 'text', true);
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Save")));
     }
@@ -51,6 +54,7 @@ class Kronolith_EditCalendarForm extends
         $original_name = $this->_calendar->get('name');
         $this->_calendar->set('name', $this->_vars->get('name'));
         $this->_calendar->set('desc', $this->_vars->get('description'));
+        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
 
         if ($original_name != $this->_vars->get('name')) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));

--- NEW FILE: HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch ---
diff -r 14457cf2ea2c kronolith/perms.php
--- a/kronolith/perms.php	Thu Nov 29 15:20:49 2007 +0100
+++ b/kronolith/perms.php	Thu Nov 29 15:25:36 2007 +0100
@@ -15,6 +15,34 @@ require_once KRONOLITH_BASE . '/lib/base
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/Group.php';
 
+function &getFbperms($share) 
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        if (isset($params['xfbaccess'])) {
+            $xfbusers = $params['xfbaccess'];
+            foreach ($xfbusers as $user) {
+                $fbperms[$user] = PERMS_READ;
+            }
+        }
+    }
+    return $fbperms;
+}
+
+function setFbperms($share, $xfbusers)
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        $params['xfbaccess'] = $xfbusers;
+        $params = serialize($params);
+        $share->set('params', $params);
+    }
+}
+
 $shares = &Horde_Share::singleton('kronolith');
 $groups = &Group::singleton();
 $auth = &Auth::singleton($conf['auth']['driver']);
@@ -36,6 +64,8 @@ case 'edit':
         $notification->push($share, 'horde.error');
     } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) {
         exit('permission denied');
+    } else {
+        $fbperms = getFbperms($share);
     }
     break;
 
@@ -251,6 +281,24 @@ case 'editform':
             }
         }
 
+        // Process free/busy permissions.
+        $fb_names = Util::getFormData('fb_names');
+        $fb_read = Util::getFormData('fb_read');
+
+        $fbperms = getFbperms($share);
+        foreach ($fb_names as $key => $user) {
+            if (empty($user)) {
+                continue;
+            }
+
+            if (!empty($fb_read[$key])) {
+                $fbperms[$user] = PERMS_READ;
+            } else {
+                unset($fbperms[$user]);
+            }
+        }
+        setFbperms($share, array_keys($fbperms));
+
         $share->setPermission($perm, false);
         $share->save();
         $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
diff -r 14457cf2ea2c kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc	Thu Nov 29 15:20:49 2007 +0100
+++ b/kronolith/templates/perms/perms.inc	Thu Nov 29 15:25:36 2007 +0100
@@ -355,6 +355,61 @@
   <td>&nbsp;</td>
 </tr>
 
+<!-- Extended free/busy Permissions -->
+<tr valign="middle">
+  <td class="header leftAlign">
+    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Extended free/busy access") ?>
+  </td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center"><?php echo _("Read") ?></td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header">&nbsp;</td>
+</tr>
+<?php foreach ($fbperms as $user => $fbperm) { if ($user != $owner) { ?>
+<tr>
+  <td class="light"><?php echo htmlspecialchars(Auth::removeHook($user)) ?><input type="hidden" name="fb_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" name="fb_read[<?php echo htmlspecialchars($user) ?>]"<?php echo ($fbperm & PERMS_READ) ? ' checked="checked"' : '' ?> />
+    <label for="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+<?php } } ?>
+<!-- New extended free/busy row -->
+<tr>
+<?php if ($auth->hasCapability('list')): ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+    <select id="fb_names_new" name="fb_names[||new]">
+      <option value=""><?php echo _("Select a user to add:") ?></option>
+    <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
+      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+    <?php } } ?>
+    </select>
+  </td>
+<?php else: ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("User to add:") ?></label>
+    <input type="text" id="fb_names_new" name="fb_names[||new]" />
+  </td>
+<?php endif; ?>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_new" name="fb_read[||new]" />
+    <label for="fb_read_new" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+
 <tr>
  <td colspan="7">&nbsp;</td>
 </tr>

--- NEW FILE: HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch ---
This includes extra parameters into the free/busy view. The params are hardcoded so this patch won't make it upstream.

diff -r 9fa9c2822bdd kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php	Mon Feb 18 09:53:58 2008 +0100
+++ b/kronolith/lib/FBView.php	Mon Feb 18 10:03:17 2008 +0100
@@ -86,7 +86,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_requiredMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -107,7 +107,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_optionalMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -122,6 +122,9 @@ class Kronolith_FreeBusy_View {
             $template->set('legend', '');
             $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.html');
         }
+
+	//**********
+	//This has been disabled in kolab-fbview. Make this optional?
 
         // Possible meeting times.
         $optimal->setAttribute('ORGANIZER', _("All Attendees"));
@@ -144,6 +147,9 @@ class Kronolith_FreeBusy_View {
         $template->set('name', _("Required Attendees"));
         $template->set('blocks', $blocks);
         $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
+
+	//This has been disabled in kolab-fbview. Make this optional?
+	//**********
 
         // Reset locale.
         setlocale(LC_NUMERIC, $lc);
@@ -217,7 +223,7 @@ class Kronolith_FreeBusy_View {
         return $instances[$view];
     }
 
-    function _getBlocks($member, $periods, $blockfile, $label)
+    function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
     {
         $template = new Horde_Template();
         $template->set('label', $label);
@@ -250,6 +256,21 @@ class Kronolith_FreeBusy_View {
 
                 $template->set('left', $left . '%');
                 $template->set('width', $width . '%');
+                $template->set('evclick', '');
+
+                if (isset($extra[$periodStart])) {
+                    if (!empty($extra[$periodStart]['X-UID'])) {
+                        $link = "javascript:performAction('viewaction', '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), 
+								'UTF-8',NLS::getCharset())) . "')";
+                        $template->set('evclick', $link);
+                    }
+                    if (!empty($extra[$periodStart]['X-SUMMARY'])) {
+                        $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8',
+				       NLS::getCharset()));
+                    }
+                }
 
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
             } else {

--- NEW FILE: HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch ---
Provides a patch to store the list of attendees in the user preferences. This is a broken patch that has been rejected upstream (http://bugs.horde.org/ticket/?id=4788). This should be solved using Horde::Groups.

diff -r e0e3817cd448 kronolith/attendees.php
--- a/kronolith/attendees.php	Mon Feb 18 09:51:07 2008 +0100
+++ b/kronolith/attendees.php	Mon Feb 18 09:53:57 2008 +0100
@@ -155,6 +155,16 @@ case 'clear':
     $attendees = array();
     $_SESSION['kronolith']['attendees'] = $attendees;
     break;
+
+case 'save':
+    if (empty($attendees)) {
+        break;
+    }
+    $savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+    $savedattlist[] = array_keys($attendees);
+    $prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    $notification->push(_('Successfully saved attendee list'), 'horde.success');
+    break;
 }
 
 // Get the current Free/Busy view; default to the 'day' view if none specified.
@@ -233,6 +243,14 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+if ($browser->hasFeature('javascript')) {
+    Horde::addScriptFile('open_savedattlist_win.js');
+    $savedattlist_url = 'javascript:open_savedattlist_win();';
+} else {
+    $savedattlist_url = Horde::applicationUrl('savedattlist.php');
+}
+
 $notification->notify(array('status'));
 require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist	Mon Feb 18 09:51:07 2008 +0100
+++ b/kronolith/config/prefs.php.dist	Mon Feb 18 09:53:57 2008 +0100
@@ -457,3 +457,11 @@ if ($GLOBALS['registry']->hasMethod('con
     'shared' => false,
     'type' => 'implicit'
 );
+
+$_prefs['saved_attendee_list'] = array(
+    'value' => 'a:0:{}',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit',
+    'desc' => _("A saved list of attendees")
+);
diff -r e0e3817cd448 kronolith/savedattlist.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/savedattlist.php	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
+ * $Horde: kronolith/attendeeshandler.php,v 1.1 2004/05/25 08:34:21 stuart Exp $
+ *
+ * Copyright 2004 Code Fusion  <http://www.codefusion.co.za/>
+ *                Stuart Binge <s.binge at codefusion.co.za>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/FBView.php';
+
+$title = _('Load Attendee List');
+
+Horde::addScriptFile('tooltip.js', 'horde');
+require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+// Get our list of saved attendees
+$savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+
+// Preformat our image urls
+$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde'));
+$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde'));
+
+// Get our Action ID & Value. This specifies what action the user initiated.
+$actionID = Util::getFormData('actionID', false);
+$actionValue = Util::getFormData('actionValue', false);
+if (!$actionID) {
+    $actionID = (Util::getFormData('addNew', false) ? 'add' : false);
+    $actionValue = Util::getFormData('newAttendees', '');
+}
+
+// Perform the specified action, if there is one.
+switch ($actionID) {
+case 'remove':
+    // Remove the specified attendee
+    if (array_key_exists($actionValue, $savedattlist)) {
+        unset($savedattlist[$actionValue]);
+	$prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    }
+    
+    break;
+
+case 'dismiss':
+    // Make sure we're actually allowed to dismiss
+    if (!$allow_dismiss) break;
+
+    // Close the attendee window
+    global $browser;
+
+    if ($browser->hasFeature('javascript')) {
+        Util::closeWindowJS();
+    } else {
+        $url = Util::getFormData('url');
+
+        if (!empty($url)) {
+            $location = Horde::applicationUrl($url, true);
+        } else {
+            $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month'));
+            $url = Util::addParameter($url, 'year', Util::getFormData('year'));
+            $location = Horde::applicationUrl($url, true);
+        }
+
+        // Make sure URL is unique.
+        $location = Util::addParameter($location, 'unique', md5(microtime()));
+
+        header('Location: ' . $location);
+    }
+    break;
+}
+
+$form_handler = Horde::applicationUrl('savedattlist.php');
+require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc';
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:51:07 2008 +0100
+++ b/kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -92,6 +92,8 @@ function switchDateView(view, timestamp)
 <div>
  <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
  <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" />
+ <input type="button" class="button" name="loadAttList" value="<?php echo htmlspecialchars(_("Load Attendee List")) ?>" onclick="<?php echo $savedattlist_url ?>" />
+ <?php if (!empty($attendees)): ?><input type="button" class="button" name="saveAttList" value="<?php echo htmlspecialchars(_("Save Attendee List")) ?>" onclick="performAction('save', '');" /><?php endif; ?>
  <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all attendees")) ?>" /><?php endif; ?>
 </div>
 
diff -r e0e3817cd448 kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/javascript/open_savedattlist_win.js	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
+<?php endif; ?>
+function open_savedattlist_win(args)
+{
+    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/savedattlist.php', 'kronolith')) ?>";
+    if (url.indexOf('?') == -1) glue = '?';
+    else glue = '<?php echo ini_get('arg_separator.output') ?>';
+    var now = new Date();
+    var name = "savedattlist_window_" + now.getTime();
+    if (args != "") {
+        url = url + glue + args + '<?php echo ini_get('arg_separator.output') ?>' + "uniq=" + now.getTime();
+    } else {
+        url = url + glue + "uniq=" + now.getTime();
+    }
+    var Width = screen.width;
+    if (Width > 775) {
+        Width = 700;
+    } else {
+        Width -= 75;
+    }
+    var Height = screen.height;
+    if (Height > 725) {
+        Height = 650;
+    } else {
+        Height -= 75;
+    }
+    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + Width + ",height=" + Height + ",left=0,top=0";
+    name = window.open(url, name, param);
+    if (!eval("name.opener")) {
+        name.opener = self;
+    }
+}
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?>// -->
+</script>
+<?php endif; ?>
diff -r e0e3817cd448 kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/savedattlist/savedattlist.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
+<!--
+function performAction(id, value)
+{
+    document.savedattlistForm.actionID.value = id;
+    document.savedattlistForm.actionValue.value = value;
+    document.savedattlistForm.submit();
+    return false;
+}
+
+function updateMessage(list)
+{
+    if (parent.opener.closed) {
+        alert('<?php echo addslashes(_("The Edit Attendees screen is no longer present. Exiting.")) ?>');
+        this.close();
+        return;
+    }
+
+    if (!parent.opener.document.attendeesForm) {
+        alert('<?php echo addslashes(_("You can only use this form from the Edit Attendees screen.")) ?>');
+        this.close();
+        return;
+    }
+
+    parent.opener.document.attendeesForm.newAttendees.value = list;
+    this.close();
+}
+// -->
+</script>
+
+<form method="post" action="<?php echo $form_handler; ?>" name="savedattlistForm">
+<?php Util::pformInput(); ?>
+<input type="hidden" name="actionID" value="" />
+<input type="hidden" name="actionValue" value="" />
+
+<div align="center">
+
+<table border="0" width="500" cellspacing="0" cellpadding="2">
+
+<!-- header -->
+<tr><td colspan="4" class="header"><b><?php echo $title ?></b></td></tr>
+
+<!-- attendee list header -->
+<tr class="item">
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $loadimg ?></td>
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $delimg ?></td>
+ <td nowrap="nowrap" width="96%"><b><?php echo htmlspecialchars(_("Attendees")) ?></b></td>
+</tr>
+
+<!-- attendees -->
+<?php $i = 0 ?>
+<?php if (empty($savedattlist)): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>"><td align="center" colspan="3"><i><?php echo htmlspecialchars('-- ' . _("No saved attendee lists are available") . ' --') ?></i></td></tr>
+<?php else: foreach ($savedattlist as $index => $list): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>">
+ <?php
+  echo '<td align="center">', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, "</a></td>";
+ ?>
+ <?php
+  echo '<td align="center">', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, "</a></td>";
+ ?>
+  <td><?php echo implode(', ', $list); ?></td>
+ </tr>
+<?php endforeach; endif; ?>
+</table>
+</div>
+</form>



From cvs at kolab.org  Thu Feb 21 17:53:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 17:53:48 +0100 (CET)
Subject: gunnar: server/patches/imap/c-client-2006k - New directory 
Message-ID: <20080221165348.5E353600175@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/imap/c-client-2006k
In directory doto:/tmp/cvs-serv13373/c-client-2006k

Log Message:
Directory /kolabrepository/server/patches/imap/c-client-2006k added to the repository




From cvs at kolab.org  Thu Feb 21 17:54:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 17:54:28 +0100 (CET)
Subject: gunnar: server/patches/imap/c-client-2006k
	c-client-2006k_KOLAB_Annotations.patch, NONE, 1.1 
Message-ID: <20080221165428.9BE2F600D40@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/imap/c-client-2006k
In directory doto:/tmp/cvs-serv13421/c-client-2006k

Added Files:
	c-client-2006k_KOLAB_Annotations.patch 
Log Message:
Added the c-client patch for c-client-2006k

--- NEW FILE: c-client-2006k_KOLAB_Annotations.patch ---
Provides get/set ANNOTATIONS support to the c-client library. [Version: 2006k]

diff -r 217555555c77 src/c-client/imap4r1.c
--- a/src/c-client/imap4r1.c	Thu Feb 21 17:37:37 2008 +0100
+++ b/src/c-client/imap4r1.c	Thu Feb 21 17:38:15 2008 +0100
@@ -135,7 +135,8 @@ typedef struct imap_argument {
 #define MULTIAPPEND 13
 #define SNLIST 14
 #define MULTIAPPENDREDO 15
-
+#define QLIST 16
+#define QSTRING 17
 
 /* Append data */
 
@@ -205,12 +206,15 @@ void imap_gc_body (BODY *body);
 void imap_gc_body (BODY *body);
 void imap_capability (MAILSTREAM *stream);
 long imap_acl_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
+long imap_annotation_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
 
 IMAPPARSEDREPLY *imap_send (MAILSTREAM *stream,char *cmd,IMAPARG *args[]);
 IMAPPARSEDREPLY *imap_sout (MAILSTREAM *stream,char *tag,char *base,char **s);
 long imap_soutr (MAILSTREAM *stream,char *string);
 IMAPPARSEDREPLY *imap_send_astring (MAILSTREAM *stream,char *tag,char **s,
 				    SIZEDTEXT *as,long wildok,char *limit);
+IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
+				    SIZEDTEXT *as,char *limit);
 IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s,
 				    STRING *st);
 IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base,
@@ -2753,6 +2757,84 @@ long imap_getacl (MAILSTREAM *stream,cha
     args[0] = &ambx; args[1] = NIL;
   return imap_acl_work (stream,"GETACL",args);
 }
+
+/* IMAP set annotation
+ * Accepts: mail stream
+ *          annotation struct
+ * Returns: T on success, NIL on failure
+ */
+
+long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation)
+{
+  IMAPARG *args[4],ambx,apth,aval;
+  long ret;
+  
+  ambx.type = ASTRING;
+  ambx.text = (void *) annotation->mbox;
+  args[0] = &ambx;
+  
+  apth.type = QSTRING;
+  apth.text = (void *) annotation->entry;
+  args[1] = &apth;
+
+  STRINGLIST *st,*l;
+  ANNOTATION_VALUES *v;
+  
+  l = st = mail_newstringlist();
+  v = annotation->values;
+  while(v){
+    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->attr)));
+    l->next = mail_newstringlist();
+    l = l->next;
+    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->value)));
+    if(v->next){
+      l->next = mail_newstringlist();
+      l = l->next;
+    }
+    v = v->next;
+  }
+  
+  aval.type = QLIST;
+  aval.text = (void *)st;
+  args[2] = &aval;
+  args[3] = NIL;
+  
+  ret = imap_annotation_work(stream, "SETANNOTATION",args);
+  mail_free_stringlist(&st);
+  return ret;
+}
+  
+  
+  
+/* IMAP get annotation
+ * Accepts: mail stream
+ *          mailbox name
+ *          annotation entry list
+ *          annotation attribute list
+ * Returns: T on success with data returned via callback, NIL on failure
+ */
+
+long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries, STRINGLIST *attributes)
+{
+  IMAPARG *args[4],ambx,apth,aattr;
+  long ret;
+  ambx.type = ASTRING;
+  ambx.text = (void*) mailbox;
+  args[0] = &ambx; 
+
+ 
+  apth.type = QLIST;
+  apth.text = (void*) entries;
+  args[1] = &apth;
+
+  aattr.type = QLIST;
+  aattr.text = (void*) attributes;
+  args[2] = &aattr;
+
+  args[3] = NIL;
+  ret = imap_annotation_work(stream, "GETANNOTATION",args);
+  return ret;
+}
 
 /* IMAP list rights
  * Accepts: mail stream
@@ -2805,6 +2887,16 @@ long imap_acl_work (MAILSTREAM *stream,c
   else mm_log ("ACL not available on this IMAP server",ERROR);
   return ret;
 }
+ long imap_annotation_work(MAILSTREAM *stream, char *command,IMAPARG *args[])
+{
+  long ret = NIL;
+  IMAPPARSEDREPLY *reply;
+  if (imap_OK (stream,reply = imap_send (stream,command,args)))
+    ret = LONGT;
+  else mm_log (reply->text,ERROR);
+  return ret;
+}
+
 
 /* IMAP set quota
  * Accepts: mail stream
@@ -2937,6 +3029,11 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
       if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND))
 	return reply;
       break;
+    case QSTRING:		/* atom or string, must be literal? */
+      st.size = strlen ((char *) (st.data = (unsigned char *) arg->text));
+      if (reply = imap_send_qstring (stream,tag,&s,&st,CMDBASE+MAXCOMMAND))
+	return reply;
+      break;
     case LITERAL:		/* literal, as a stringstruct */
       if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply;
       break;
@@ -2947,6 +3044,18 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
       do {			/* for each list item */
 	*s++ = c;		/* write prefix character */
 	if (reply = imap_send_astring (stream,tag,&s,&list->text,NIL,
+				       CMDBASE+MAXCOMMAND)) return reply;
+	c = ' ';		/* prefix character for subsequent strings */
+      }
+      while (list = list->next);
+      *s++ = ')';		/* close list */
+      break;
+    case QLIST:			/* list of strings */
+      list = (STRINGLIST *) arg->text;
+      c = '(';			/* open paren */
+      do {			/* for each list item */
+	*s++ = c;		/* write prefix character */
+	if (reply = imap_send_qstring (stream,tag,&s,&list->text,
 				       CMDBASE+MAXCOMMAND)) return reply;
 	c = ' ';		/* prefix character for subsequent strings */
       }
@@ -3119,6 +3228,32 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
   reply = imap_sout (stream,tag,CMDBASE,&s);
   mail_unlock (stream);		/* unlock stream */
   return reply;
+}
+
+/* IMAP send quoted-string
+ * Accepts: MAIL stream
+ *	    reply tag
+ *	    pointer to current position pointer of output bigbuf
+ *	    atom-string to output
+ *	    maximum to write as atom or qstring
+ * Returns: error reply or NIL if success
+ */
+
+IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
+				    SIZEDTEXT *as,char *limit)
+{
+  unsigned long j;
+  char c;
+  STRING st;
+				/* in case needed */
+  INIT (&st,mail_string,(void *) as->data,as->size);
+				/* always write literal if no space */
+  if ((*s + as->size) > limit) return imap_send_literal (stream,tag,s,&st);
+
+  *(*s)++ = '"';	/* write open quote */
+  for (j = 0; j < as->size; j++) *(*s)++ = as->data[j];
+  *(*s)++ = '"';	/* write close quote */
+  return NIL;
 }
 
 /* IMAP send atom-string
@@ -4049,6 +4184,50 @@ void imap_parse_unsolicited (MAILSTREAM 
     }
   }
 
+  else if (!strcmp (reply->key,"ANNOTATION") && (s = reply->text)){
+    char * mbox;    
+    /* response looks like ANNOTATION "mailbox" "entry" ("attr" "value" ["attr" "value"]) ["entry" ("attr "value" ["attr" "value"] )]*/
+    getannotation_t an = (getannotation_t) mail_parameters (NIL,GET_ANNOTATION,NIL);
+    
+    mbox = imap_parse_astring (stream, &s, reply,NIL);
+    
+    while(*s){
+      ANNOTATION * al = mail_newannotation();    
+      al->mbox = cpystr(mbox);
+      t = imap_parse_astring (stream, &s, reply,NIL);
+      al->entry = t;
+      STRINGLIST *strlist;
+      if (s){while (*s == ' ')s++;}
+      
+      strlist = imap_parse_stringlist(stream, &s,reply);
+
+      ANNOTATION_VALUES *vlIter, *vlBegin;
+      vlIter = vlBegin = NIL;
+      if (strlist) {
+        while(strlist){	
+          if(vlIter){
+            vlIter->next = mail_newannotationvalue();
+            vlIter = vlIter->next;
+          }else{
+            vlIter = mail_newannotationvalue();
+            vlBegin = vlIter;
+          }
+          if ( strlist->text.size )
+            vlIter->attr = cpystr (strlist->text.data);        
+          strlist = strlist->next;        
+          if(!strlist) continue;
+          if ( strlist->text.size )
+            vlIter->value = cpystr (strlist->text.data);
+          strlist = strlist->next;
+        }
+      }
+      al->values = vlBegin;
+      if (an) 
+        (*an) (stream,al);
+      mail_free_annotation(&al);
+    }
+    fs_give ((void **)&mbox);
+  }
   else if (!strcmp (reply->key,"ACL") && (s = reply->text) &&
 	   (t = imap_parse_astring (stream,&s,reply,NIL))) {
     getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL);
diff -r 217555555c77 src/c-client/imap4r1.h
--- a/src/c-client/imap4r1.h	Thu Feb 21 17:37:37 2008 +0100
+++ b/src/c-client/imap4r1.h	Thu Feb 21 17:38:15 2008 +0100
@@ -279,3 +279,5 @@ long imap_setquota (MAILSTREAM *stream,c
 long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits);
 long imap_getquota (MAILSTREAM *stream,char *qroot);
 long imap_getquotaroot (MAILSTREAM *stream,char *mailbox);
+long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes);
+long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation); 
diff -r 217555555c77 src/c-client/mail.c
--- a/src/c-client/mail.c	Thu Feb 21 17:37:37 2008 +0100
+++ b/src/c-client/mail.c	Thu Feb 21 17:38:15 2008 +0100
@@ -69,6 +69,7 @@ static newsrcquery_t mailnewsrcquery = N
 static newsrcquery_t mailnewsrcquery = NIL;
 				/* ACL results callback */
 static getacl_t mailaclresults = NIL;
+static getannotation_t mailannotationresults = NIL;
 				/* list rights results callback */
 static listrights_t maillistrightsresults = NIL;
 				/* my rights results callback */
@@ -598,6 +599,11 @@ void *mail_parameters (MAILSTREAM *strea
     ret = (void *) (debugsensitive ? VOIDT : NIL);
     break;
 
+  case SET_ANNOTATION:
+    mailannotationresults = (getannotation_t) value;
+  case GET_ANNOTATION:
+    ret = (void *) mailannotationresults;
+    break;
   case SET_ACL:
     mailaclresults = (getacl_t) value;
   case GET_ACL:
@@ -5701,7 +5707,15 @@ ACLLIST *mail_newacllist (void)
   return (ACLLIST *) memset (fs_get (sizeof (ACLLIST)),0,sizeof (ACLLIST));
 }
 
-
+ANNOTATION *mail_newannotation (void)
+{
+  return (ANNOTATION *) memset (fs_get (sizeof (ANNOTATION)),0,sizeof(ANNOTATION));
+}
+
+ANNOTATION_VALUES *mail_newannotationvalue (void)
+{
+  return (ANNOTATION_VALUES *) memset (fs_get (sizeof (ANNOTATION_VALUES)),0,sizeof(ANNOTATION_VALUES));
+}
 /* Mail instantiate new quotalist
  * Returns: new quotalist
  */
@@ -6024,6 +6038,25 @@ void mail_free_acllist (ACLLIST **al)
   }
 }
 
+static void mail_free_annotation_values(ANNOTATION_VALUES **val)
+{
+  if (*val) {
+    if ((*val)->attr) fs_give ((void**) &(*val)->attr);
+    if ((*val)->value) fs_give ((void**) &(*val)->value);
+    mail_free_annotation_values (&(*val)->next);
+    fs_give ((void **) val);
+  }
+}				
+void mail_free_annotation(ANNOTATION **al)
+{
+  if (*al) {
+    if((*al)->mbox) fs_give ((void**) &(*al)->mbox);
+    if((*al)->entry) fs_give ((void**) &(*al)->entry);
+    if((*al)->values)
+      mail_free_annotation_values(&(*al)->values);
+    fs_give ((void **) al);
+  }
+}
 
 /* Mail garbage collect quotalist
  * Accepts: pointer to quotalist pointer
diff -r 217555555c77 src/c-client/mail.h
--- a/src/c-client/mail.h	Thu Feb 21 17:37:37 2008 +0100
+++ b/src/c-client/mail.h	Thu Feb 21 17:38:15 2008 +0100
@@ -351,6 +351,8 @@
 #define SET_SCANCONTENTS (long) 573
 #define GET_MHALLOWINBOX (long) 574
 #define SET_MHALLOWINBOX (long) 575
+#define GET_ANNOTATION (long) 576
+#define SET_ANNOTATION (long) 577
 
 /* Driver flags */
 
@@ -1043,6 +1045,24 @@ ACLLIST {
   char *identifier;		/* authentication identifier */
   char *rights;			/* access rights */
   ACLLIST *next;
+};
+
+/* ANNOTATION Response */
+
+#define ANNOTATION_VALUES struct annotation_value_list
+
+ANNOTATION_VALUES {
+	char *attr;
+	char *value;
+	ANNOTATION_VALUES *next;
+};
+
+#define ANNOTATION struct annotation
+
+ANNOTATION {
+	char *mbox;
+	char *entry;
+	ANNOTATION_VALUES * values;
 };
 
 /* Quota resource list */
@@ -1353,6 +1373,7 @@ typedef void (*logouthook_t) (void *data
 typedef void (*logouthook_t) (void *data);
 typedef char *(*sslclientcert_t) (void);
 typedef char *(*sslclientkey_t) (void);
+typedef void (*getannotation_t) (MAILSTREAM *stream,ANNOTATION* annot);
 
 /* Globals */
 
@@ -1771,7 +1792,10 @@ SORTPGM *mail_newsortpgm (void);
 SORTPGM *mail_newsortpgm (void);
 THREADNODE *mail_newthreadnode (SORTCACHE *sc);
 ACLLIST *mail_newacllist (void);
+ANNOTATION* mail_newannotation(void);
+ANNOTATION_VALUES* mail_newannotationvalue(void);
 QUOTALIST *mail_newquotalist (void);
+void mail_free_annotation(ANNOTATION **a);
 void mail_free_body (BODY **body);
 void mail_free_body_data (BODY *body);
 void mail_free_body_parameter (PARAMETER **parameter);
diff -r 217555555c77 src/mtest/mtest.c
--- a/src/mtest/mtest.c	Thu Feb 21 17:37:37 2008 +0100
+++ b/src/mtest/mtest.c	Thu Feb 21 17:38:15 2008 +0100
@@ -145,6 +145,8 @@ int main ()
 #endif
   return NIL;
 }
+
+void mm_annotation (MAILSTREAM *stream, ANNOTATION *a);
 
 /* MM command loop
  * Accepts: MAIL stream
@@ -195,6 +197,28 @@ void mm (MAILSTREAM *stream,long debug)
 	mail_setflag (stream,arg,"\\DELETED");
       else puts ("?Bad message number");
       break;
+    case 'A':
+      {
+        char parms[MAILTMPLEN];
+        prompt("Annotation: ",parms);
+        if (parms) {
+          mail_parameters(stream,SET_ANNOTATION,mm_annotation);
+          STRINGLIST *entries = mail_newstringlist();
+          STRINGLIST *cur = entries;
+          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr (parms)));
+          cur->next = NIL;
+          
+          STRINGLIST *attributes = mail_newstringlist();
+          cur = attributes;
+          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr ("*")));
+          cur->next = NIL;
+          
+          imap_getannotation(stream,"INBOX",entries,attributes);
+          mail_free_stringlist(&entries);
+          mail_free_stringlist(&attributes);
+        }
+      }
+      break;  
     case 'E':			/* Expunge command */
       mail_expunge (stream);
       last = 0;
@@ -347,7 +371,7 @@ void mm (MAILSTREAM *stream,long debug)
     case '?':			/* ? command */
       puts ("Body, Check, Delete, Expunge, Find, GC, Headers, Literal,");
       puts (" MailboxStatus, New Mailbox, Overview, Ping, Quit, Send, Type,");
-      puts ("Undelete, Xit, +, -, or <RETURN> for next message");
+      puts ("Undelete, Xit,Annotation, +, -, or <RETURN> for next message");
       break;
     default:			/* bogus command */
       printf ("?Unrecognized command: %s\n",cmd);
@@ -600,6 +624,18 @@ void prompt (char *msg,char *txt)
 
 /* Interfaces to C-client */
 
+void mm_annotation (MAILSTREAM *stream, ANNOTATION *a)
+{
+  if(a){
+    fprintf(stderr,"mailbox: %s\nentry: %s\n",a->mbox,a->entry);
+    ANNOTATION_VALUES * v = a->values;
+    while(v){
+      fprintf(stderr,"attr: %s, value: %s\n",v->attr,v->value);
+      v = v->next;
+    }
+  }
+}
+
 
 void mm_searched (MAILSTREAM *stream,unsigned long number)
 {



From cvs at kolab.org  Thu Feb 21 17:55:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 17:55:32 +0100 (CET)
Subject: gunnar: server/patches/imap/c-client-2004g - New directory 
Message-ID: <20080221165532.528C4600D64@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/imap/c-client-2004g
In directory doto:/tmp/cvs-serv13445/c-client-2004g

Log Message:
Directory /kolabrepository/server/patches/imap/c-client-2004g added to the repository




From cvs at kolab.org  Thu Feb 21 17:55:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 17:55:32 +0100 (CET)
Subject: gunnar: server/patches/imap/c-client-2006h - New directory 
Message-ID: <20080221165532.4F1FB600D63@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/imap/c-client-2006h
In directory doto:/tmp/cvs-serv13445/c-client-2006h

Log Message:
Directory /kolabrepository/server/patches/imap/c-client-2006h added to the repository




From cvs at kolab.org  Thu Feb 21 17:57:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 17:57:20 +0100 (CET)
Subject: gunnar: server/patches/imap/c-client-2004g
	c-client-2004g_KOLAB_Annotations.patch, NONE, 1.1 
Message-ID: <20080221165720.AECEB600D64@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/imap/c-client-2004g
In directory doto:/tmp/cvs-serv13496/c-client-2004g

Added Files:
	c-client-2004g_KOLAB_Annotations.patch 
Log Message:
Similar structure for the older patches. The older ones should be removed later.

--- NEW FILE: c-client-2004g_KOLAB_Annotations.patch ---
Provides get/set ANNOTATIONS support to the c-client library. [Version: 2004g]

diff -r b9fd2c61d881 src/c-client/imap4r1.c
--- a/src/c-client/imap4r1.c	Sat Sep 29 08:56:35 2007 +0200
+++ b/src/c-client/imap4r1.c	Sat Sep 29 10:40:13 2007 +0200
@@ -125,7 +125,8 @@ typedef struct imap_argument {
 #define MULTIAPPEND 13
 #define SNLIST 14
 #define MULTIAPPENDREDO 15
-
+#define QLIST 16
+#define QSTRING 17
 
 /* Append data */
 
@@ -195,12 +196,15 @@ void imap_gc_body (BODY *body);
 void imap_gc_body (BODY *body);
 void imap_capability (MAILSTREAM *stream);
 long imap_acl_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
+long imap_annotation_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
 
 IMAPPARSEDREPLY *imap_send (MAILSTREAM *stream,char *cmd,IMAPARG *args[]);
 IMAPPARSEDREPLY *imap_sout (MAILSTREAM *stream,char *tag,char *base,char **s);
 long imap_soutr (MAILSTREAM *stream,char *string);
 IMAPPARSEDREPLY *imap_send_astring (MAILSTREAM *stream,char *tag,char **s,
 				    SIZEDTEXT *as,long wildok,char *limit);
+IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
+				    SIZEDTEXT *as,char *limit);
 IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s,
 				    STRING *st);
 IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base,
@@ -2679,6 +2683,84 @@ long imap_getacl (MAILSTREAM *stream,cha
     args[0] = &ambx; args[1] = NIL;
   return imap_acl_work (stream,"GETACL",args);
 }
+
+/* IMAP set annotation
+ * Accepts: mail stream
+ *          annotation struct
+ * Returns: T on success, NIL on failure
+ */
+
+long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation)
+{
+  IMAPARG *args[4],ambx,apth,aval;
+  long ret;
+  
+  ambx.type = ASTRING;
+  ambx.text = (void *) annotation->mbox;
+  args[0] = &ambx;
+  
+  apth.type = QSTRING;
+  apth.text = (void *) annotation->entry;
+  args[1] = &apth;
+
+  STRINGLIST *st,*l;
+  ANNOTATION_VALUES *v;
+  
+  l = st = mail_newstringlist();
+  v = annotation->values;
+  while(v){
+    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->attr)));
+    l->next = mail_newstringlist();
+    l = l->next;
+    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->value)));
+    if(v->next){
+      l->next = mail_newstringlist();
+      l = l->next;
+    }
+    v = v->next;
+  }
+  
+  aval.type = QLIST;
+  aval.text = (void *)st;
+  args[2] = &aval;
+  args[3] = NIL;
+  
+  ret = imap_annotation_work(stream, "SETANNOTATION",args);
+  mail_free_stringlist(&st);
+  return ret;
+}
+  
+  
+  
+/* IMAP get annotation
+ * Accepts: mail stream
+ *          mailbox name
+ *          annotation entry list
+ *          annotation attribute list
+ * Returns: T on success with data returned via callback, NIL on failure
+ */
+
+long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries, STRINGLIST *attributes)
+{
+  IMAPARG *args[4],ambx,apth,aattr;
+  long ret;
+  ambx.type = ASTRING;
+  ambx.text = (void*) mailbox;
+  args[0] = &ambx; 
+
+ 
+  apth.type = QLIST;
+  apth.text = (void*) entries;
+  args[1] = &apth;
+
+  aattr.type = QLIST;
+  aattr.text = (void*) attributes;
+  args[2] = &aattr;
+
+  args[3] = NIL;
+  ret = imap_annotation_work(stream, "GETANNOTATION",args);
+  return ret;
+}
 
 /* IMAP list rights
  * Accepts: mail stream
@@ -2731,6 +2813,16 @@ long imap_acl_work (MAILSTREAM *stream,c
   else mm_log ("ACL not available on this IMAP server",ERROR);
   return ret;
 }
+ long imap_annotation_work(MAILSTREAM *stream, char *command,IMAPARG *args[])
+{
+  long ret = NIL;
+  IMAPPARSEDREPLY *reply;
+  if (imap_OK (stream,reply = imap_send (stream,command,args)))
+    ret = LONGT;
+  else mm_log (reply->text,ERROR);
+  return ret;
+}
+
 
 /* IMAP set quota
  * Accepts: mail stream
@@ -2863,6 +2955,11 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
       if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND))
 	return reply;
       break;
+    case QSTRING:		/* atom or string, must be literal? */
+      st.size = strlen ((char *) (st.data = (unsigned char *) arg->text));
+      if (reply = imap_send_qstring (stream,tag,&s,&st,CMDBASE+MAXCOMMAND))
+	return reply;
+      break;
     case LITERAL:		/* literal, as a stringstruct */
       if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply;
       break;
@@ -2873,6 +2970,18 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
       do {			/* for each list item */
 	*s++ = c;		/* write prefix character */
 	if (reply = imap_send_astring (stream,tag,&s,&list->text,NIL,
+				       CMDBASE+MAXCOMMAND)) return reply;
+	c = ' ';		/* prefix character for subsequent strings */
+      }
+      while (list = list->next);
+      *s++ = ')';		/* close list */
+      break;
+    case QLIST:			/* list of strings */
+      list = (STRINGLIST *) arg->text;
+      c = '(';			/* open paren */
+      do {			/* for each list item */
+	*s++ = c;		/* write prefix character */
+	if (reply = imap_send_qstring (stream,tag,&s,&list->text,
 				       CMDBASE+MAXCOMMAND)) return reply;
 	c = ' ';		/* prefix character for subsequent strings */
       }
@@ -3045,6 +3154,32 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
   reply = imap_sout (stream,tag,CMDBASE,&s);
   mail_unlock (stream);		/* unlock stream */
   return reply;
+}
+
+/* IMAP send quoted-string
+ * Accepts: MAIL stream
+ *	    reply tag
+ *	    pointer to current position pointer of output bigbuf
+ *	    atom-string to output
+ *	    maximum to write as atom or qstring
+ * Returns: error reply or NIL if success
+ */
+
+IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
+				    SIZEDTEXT *as,char *limit)
+{
+  unsigned long j;
+  char c;
+  STRING st;
+				/* in case needed */
+  INIT (&st,mail_string,(void *) as->data,as->size);
+				/* always write literal if no space */
+  if ((*s + as->size) > limit) return imap_send_literal (stream,tag,s,&st);
+
+  *(*s)++ = '"';	/* write open quote */
+  for (j = 0; j < as->size; j++) *(*s)++ = as->data[j];
+  *(*s)++ = '"';	/* write close quote */
+  return NIL;
 }
 
 /* IMAP send atom-string
@@ -3948,6 +4083,50 @@ void imap_parse_unsolicited (MAILSTREAM 
     }
   }
 
+  else if (!strcmp (reply->key,"ANNOTATION") && (s = reply->text)){
+    char * mbox;    
+    /* response looks like ANNOTATION "mailbox" "entry" ("attr" "value" ["attr" "value"]) ["entry" ("attr "value" ["attr" "value"] )]*/
+    getannotation_t an = (getannotation_t) mail_parameters (NIL,GET_ANNOTATION,NIL);
+    
+    mbox = imap_parse_astring (stream, &s, reply,NIL);
+    
+    while(*s){
+      ANNOTATION * al = mail_newannotation();    
+      al->mbox = cpystr(mbox);
+      t = imap_parse_astring (stream, &s, reply,NIL);
+      al->entry = t;
+      STRINGLIST *strlist;
+      if (s){while (*s == ' ')s++;}
+      
+      strlist = imap_parse_stringlist(stream, &s,reply);
+
+      ANNOTATION_VALUES *vlIter, *vlBegin;
+      vlIter = vlBegin = NIL;
+      if (strlist) {
+        while(strlist){	
+          if(vlIter){
+            vlIter->next = mail_newannotationvalue();
+            vlIter = vlIter->next;
+          }else{
+            vlIter = mail_newannotationvalue();
+            vlBegin = vlIter;
+          }
+          if ( strlist->text.size )
+            vlIter->attr = cpystr (strlist->text.data);        
+          strlist = strlist->next;        
+          if(!strlist) continue;
+          if ( strlist->text.size )
+            vlIter->value = cpystr (strlist->text.data);
+          strlist = strlist->next;
+        }
+      }
+      al->values = vlBegin;
+      if (an) 
+        (*an) (stream,al);
+      mail_free_annotation(&al);
+    }
+    fs_give ((void **)&mbox);
+  }
   else if (!strcmp (reply->key,"ACL") && (s = reply->text) &&
 	   (t = imap_parse_astring (stream,&s,reply,NIL))) {
     getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL);
diff -r b9fd2c61d881 src/c-client/imap4r1.h
--- a/src/c-client/imap4r1.h	Sat Sep 29 08:56:35 2007 +0200
+++ b/src/c-client/imap4r1.h	Sat Sep 29 10:40:13 2007 +0200
@@ -232,3 +232,5 @@ long imap_setquota (MAILSTREAM *stream,c
 long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits);
 long imap_getquota (MAILSTREAM *stream,char *qroot);
 long imap_getquotaroot (MAILSTREAM *stream,char *mailbox);
+long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes);
+long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation); 
diff -r b9fd2c61d881 src/c-client/mail.c
--- a/src/c-client/mail.c	Sat Sep 29 08:56:35 2007 +0200
+++ b/src/c-client/mail.c	Sat Sep 29 10:40:13 2007 +0200
@@ -60,6 +60,7 @@ static newsrcquery_t mailnewsrcquery = N
 static newsrcquery_t mailnewsrcquery = NIL;
 				/* ACL results callback */
 static getacl_t mailaclresults = NIL;
+static getannotation_t mailannotationresults = NIL;
 				/* list rights results callback */
 static listrights_t maillistrightsresults = NIL;
 				/* my rights results callback */
@@ -516,6 +517,11 @@ void *mail_parameters (MAILSTREAM *strea
     ret = (void *) (debugsensitive ? VOIDT : NIL);
     break;
 
+  case SET_ANNOTATION:
+    mailannotationresults = (getannotation_t) value;
+  case GET_ANNOTATION:
+    ret = (void *) mailannotationresults;
+    break;
   case SET_ACL:
     mailaclresults = (getacl_t) value;
   case GET_ACL:
@@ -5489,7 +5495,15 @@ ACLLIST *mail_newacllist (void)
   return (ACLLIST *) memset (fs_get (sizeof (ACLLIST)),0,sizeof (ACLLIST));
 }
 
-
+ANNOTATION *mail_newannotation (void)
+{
+  return (ANNOTATION *) memset (fs_get (sizeof (ANNOTATION)),0,sizeof(ANNOTATION));
+}
+
+ANNOTATION_VALUES *mail_newannotationvalue (void)
+{
+  return (ANNOTATION_VALUES *) memset (fs_get (sizeof (ANNOTATION_VALUES)),0,sizeof(ANNOTATION_VALUES));
+}
 /* Mail instantiate new quotalist
  * Returns: new quotalist
  */
@@ -5812,6 +5826,25 @@ void mail_free_acllist (ACLLIST **al)
   }
 }
 
+static void mail_free_annotation_values(ANNOTATION_VALUES **val)
+{
+  if (*val) {
+    if ((*val)->attr) fs_give ((void**) &(*val)->attr);
+    if ((*val)->value) fs_give ((void**) &(*val)->value);
+    mail_free_annotation_values (&(*val)->next);
+    fs_give ((void **) val);
+  }
+}				
+void mail_free_annotation(ANNOTATION **al)
+{
+  if (*al) {
+    if((*al)->mbox) fs_give ((void**) &(*al)->mbox);
+    if((*al)->entry) fs_give ((void**) &(*al)->entry);
+    if((*al)->values)
+      mail_free_annotation_values(&(*al)->values);
+    fs_give ((void **) al);
+  }
+}
 
 /* Mail garbage collect quotalist
  * Accepts: pointer to quotalist pointer
diff -r b9fd2c61d881 src/c-client/mail.h
--- a/src/c-client/mail.h	Sat Sep 29 08:56:35 2007 +0200
+++ b/src/c-client/mail.h	Sat Sep 29 10:40:13 2007 +0200
@@ -311,6 +311,8 @@
 #define SET_SNARFPRESERVE (long) 567
 #define GET_INBOXPATH (long) 568
 #define SET_INBOXPATH (long) 569
+#define GET_ANNOTATION (long) 570
+#define SET_ANNOTATION (long) 571
 
 /* Driver flags */
 
@@ -976,6 +978,24 @@ ACLLIST {
   char *identifier;		/* authentication identifier */
   char *rights;			/* access rights */
   ACLLIST *next;
+};
+
+/* ANNOTATION Response */
+
+#define ANNOTATION_VALUES struct annotation_value_list
+
+ANNOTATION_VALUES {
+	char *attr;
+	char *value;
+	ANNOTATION_VALUES *next;
+};
+
+#define ANNOTATION struct annotation
+
+ANNOTATION {
+	char *mbox;
+	char *entry;
+	ANNOTATION_VALUES * values;
 };
 
 /* Quota resource list */
@@ -1262,6 +1282,7 @@ typedef long (*sslcertificatequery_t) (c
 typedef long (*sslcertificatequery_t) (char *reason,char *host,char *cert);
 typedef void (*sslfailure_t) (char *host,char *reason,unsigned long flags);
 typedef void (*logouthook_t) (void *data);
+typedef void (*getannotation_t) (MAILSTREAM *stream,ANNOTATION* annot);
 
 /* Globals */
 
@@ -1671,7 +1692,10 @@ SORTPGM *mail_newsortpgm (void);
 SORTPGM *mail_newsortpgm (void);
 THREADNODE *mail_newthreadnode (SORTCACHE *sc);
 ACLLIST *mail_newacllist (void);
+ANNOTATION* mail_newannotation(void);
+ANNOTATION_VALUES* mail_newannotationvalue(void);
 QUOTALIST *mail_newquotalist (void);
+void mail_free_annotation(ANNOTATION **a);
 void mail_free_body (BODY **body);
 void mail_free_body_data (BODY *body);
 void mail_free_body_parameter (PARAMETER **parameter);
diff -r b9fd2c61d881 src/mtest/mtest.c
--- a/src/mtest/mtest.c	Sat Sep 29 08:56:35 2007 +0200
+++ b/src/mtest/mtest.c	Sat Sep 29 10:40:13 2007 +0200
@@ -137,6 +137,8 @@ int main ()
 #endif
   return NIL;
 }
+
+void mm_annotation (MAILSTREAM *stream, ANNOTATION *a);
 
 /* MM command loop
  * Accepts: MAIL stream
@@ -187,6 +189,28 @@ void mm (MAILSTREAM *stream,long debug)
 	mail_setflag (stream,arg,"\\DELETED");
       else puts ("?Bad message number");
       break;
+    case 'A':
+      {
+        char parms[MAILTMPLEN];
+        prompt("Annotation: ",parms);
+        if (parms) {
+          mail_parameters(stream,SET_ANNOTATION,mm_annotation);
+          STRINGLIST *entries = mail_newstringlist();
+          STRINGLIST *cur = entries;
+          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr (parms)));
+          cur->next = NIL;
+          
+          STRINGLIST *attributes = mail_newstringlist();
+          cur = attributes;
+          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr ("*")));
+          cur->next = NIL;
+          
+          imap_getannotation(stream,"INBOX",entries,attributes);
+          mail_free_stringlist(&entries);
+          mail_free_stringlist(&attributes);
+        }
+      }
+      break;  
     case 'E':			/* Expunge command */
       mail_expunge (stream);
       last = 0;
@@ -339,7 +363,7 @@ void mm (MAILSTREAM *stream,long debug)
     case '?':			/* ? command */
       puts ("Body, Check, Delete, Expunge, Find, GC, Headers, Literal,");
       puts (" MailboxStatus, New Mailbox, Overview, Ping, Quit, Send, Type,");
-      puts ("Undelete, Xit, +, -, or <RETURN> for next message");
+      puts ("Undelete, Xit,Annotation, +, -, or <RETURN> for next message");
       break;
     default:			/* bogus command */
       printf ("?Unrecognized command: %s\n",cmd);
@@ -587,6 +611,18 @@ void prompt (char *msg,char *txt)
 
 /* Interfaces to C-client */
 
+void mm_annotation (MAILSTREAM *stream, ANNOTATION *a)
+{
+  if(a){
+    fprintf(stderr,"mailbox: %s\nentry: %s\n",a->mbox,a->entry);
+    ANNOTATION_VALUES * v = a->values;
+    while(v){
+      fprintf(stderr,"attr: %s, value: %s\n",v->attr,v->value);
+      v = v->next;
+    }
+  }
+}
+
 
 void mm_searched (MAILSTREAM *stream,unsigned long number)
 {



From cvs at kolab.org  Thu Feb 21 17:57:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 21 Feb 2008 17:57:20 +0100 (CET)
Subject: gunnar: server/patches/imap/c-client-2006h
	c-client-2006h_KOLAB_Annotations.patch, NONE, 1.1 
Message-ID: <20080221165720.EC893600D64@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/imap/c-client-2006h
In directory doto:/tmp/cvs-serv13496/c-client-2006h

Added Files:
	c-client-2006h_KOLAB_Annotations.patch 
Log Message:
Similar structure for the older patches. The older ones should be removed later.

--- NEW FILE: c-client-2006h_KOLAB_Annotations.patch ---
Provides get/set ANNOTATIONS support to the c-client library. [Version: 2006h]

diff -r 7c3e6a9f1837 src/c-client/imap4r1.c
--- a/src/c-client/imap4r1.c	Sat Sep 29 10:54:00 2007 +0200
+++ b/src/c-client/imap4r1.c	Sat Sep 29 10:57:59 2007 +0200
@@ -135,7 +135,8 @@ typedef struct imap_argument {
 #define MULTIAPPEND 13
 #define SNLIST 14
 #define MULTIAPPENDREDO 15
-
+#define QLIST 16
+#define QSTRING 17
 
 /* Append data */
 
@@ -205,12 +206,15 @@ void imap_gc_body (BODY *body);
 void imap_gc_body (BODY *body);
 void imap_capability (MAILSTREAM *stream);
 long imap_acl_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
+long imap_annotation_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
 
 IMAPPARSEDREPLY *imap_send (MAILSTREAM *stream,char *cmd,IMAPARG *args[]);
 IMAPPARSEDREPLY *imap_sout (MAILSTREAM *stream,char *tag,char *base,char **s);
 long imap_soutr (MAILSTREAM *stream,char *string);
 IMAPPARSEDREPLY *imap_send_astring (MAILSTREAM *stream,char *tag,char **s,
 				    SIZEDTEXT *as,long wildok,char *limit);
+IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
+				    SIZEDTEXT *as,char *limit);
 IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s,
 				    STRING *st);
 IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base,
@@ -2748,6 +2752,84 @@ long imap_getacl (MAILSTREAM *stream,cha
     args[0] = &ambx; args[1] = NIL;
   return imap_acl_work (stream,"GETACL",args);
 }
+
+/* IMAP set annotation
+ * Accepts: mail stream
+ *          annotation struct
+ * Returns: T on success, NIL on failure
+ */
+
+long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation)
+{
+  IMAPARG *args[4],ambx,apth,aval;
+  long ret;
+  
+  ambx.type = ASTRING;
+  ambx.text = (void *) annotation->mbox;
+  args[0] = &ambx;
+  
+  apth.type = QSTRING;
+  apth.text = (void *) annotation->entry;
+  args[1] = &apth;
+
+  STRINGLIST *st,*l;
+  ANNOTATION_VALUES *v;
+  
+  l = st = mail_newstringlist();
+  v = annotation->values;
+  while(v){
+    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->attr)));
+    l->next = mail_newstringlist();
+    l = l->next;
+    l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->value)));
+    if(v->next){
+      l->next = mail_newstringlist();
+      l = l->next;
+    }
+    v = v->next;
+  }
+  
+  aval.type = QLIST;
+  aval.text = (void *)st;
+  args[2] = &aval;
+  args[3] = NIL;
+  
+  ret = imap_annotation_work(stream, "SETANNOTATION",args);
+  mail_free_stringlist(&st);
+  return ret;
+}
+  
+  
+  
+/* IMAP get annotation
+ * Accepts: mail stream
+ *          mailbox name
+ *          annotation entry list
+ *          annotation attribute list
+ * Returns: T on success with data returned via callback, NIL on failure
+ */
+
+long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries, STRINGLIST *attributes)
+{
+  IMAPARG *args[4],ambx,apth,aattr;
+  long ret;
+  ambx.type = ASTRING;
+  ambx.text = (void*) mailbox;
+  args[0] = &ambx; 
+
+ 
+  apth.type = QLIST;
+  apth.text = (void*) entries;
+  args[1] = &apth;
+
+  aattr.type = QLIST;
+  aattr.text = (void*) attributes;
+  args[2] = &aattr;
+
+  args[3] = NIL;
+  ret = imap_annotation_work(stream, "GETANNOTATION",args);
+  return ret;
+}
 
 /* IMAP list rights
  * Accepts: mail stream
@@ -2800,6 +2882,16 @@ long imap_acl_work (MAILSTREAM *stream,c
   else mm_log ("ACL not available on this IMAP server",ERROR);
   return ret;
 }
+ long imap_annotation_work(MAILSTREAM *stream, char *command,IMAPARG *args[])
+{
+  long ret = NIL;
+  IMAPPARSEDREPLY *reply;
+  if (imap_OK (stream,reply = imap_send (stream,command,args)))
+    ret = LONGT;
+  else mm_log (reply->text,ERROR);
+  return ret;
+}
+
 
 /* IMAP set quota
  * Accepts: mail stream
@@ -2932,6 +3024,11 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
       if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND))
 	return reply;
       break;
+    case QSTRING:		/* atom or string, must be literal? */
+      st.size = strlen ((char *) (st.data = (unsigned char *) arg->text));
+      if (reply = imap_send_qstring (stream,tag,&s,&st,CMDBASE+MAXCOMMAND))
+	return reply;
+      break;
     case LITERAL:		/* literal, as a stringstruct */
       if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply;
       break;
@@ -2942,6 +3039,18 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
       do {			/* for each list item */
 	*s++ = c;		/* write prefix character */
 	if (reply = imap_send_astring (stream,tag,&s,&list->text,NIL,
+				       CMDBASE+MAXCOMMAND)) return reply;
+	c = ' ';		/* prefix character for subsequent strings */
+      }
+      while (list = list->next);
+      *s++ = ')';		/* close list */
+      break;
+    case QLIST:			/* list of strings */
+      list = (STRINGLIST *) arg->text;
+      c = '(';			/* open paren */
+      do {			/* for each list item */
+	*s++ = c;		/* write prefix character */
+	if (reply = imap_send_qstring (stream,tag,&s,&list->text,
 				       CMDBASE+MAXCOMMAND)) return reply;
 	c = ' ';		/* prefix character for subsequent strings */
       }
@@ -3114,6 +3223,32 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
   reply = imap_sout (stream,tag,CMDBASE,&s);
   mail_unlock (stream);		/* unlock stream */
   return reply;
+}
+
+/* IMAP send quoted-string
+ * Accepts: MAIL stream
+ *	    reply tag
+ *	    pointer to current position pointer of output bigbuf
+ *	    atom-string to output
+ *	    maximum to write as atom or qstring
+ * Returns: error reply or NIL if success
+ */
+
+IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
+				    SIZEDTEXT *as,char *limit)
+{
+  unsigned long j;
+  char c;
+  STRING st;
+				/* in case needed */
+  INIT (&st,mail_string,(void *) as->data,as->size);
+				/* always write literal if no space */
+  if ((*s + as->size) > limit) return imap_send_literal (stream,tag,s,&st);
+
+  *(*s)++ = '"';	/* write open quote */
+  for (j = 0; j < as->size; j++) *(*s)++ = as->data[j];
+  *(*s)++ = '"';	/* write close quote */
+  return NIL;
 }
 
 /* IMAP send atom-string
@@ -4034,6 +4169,50 @@ void imap_parse_unsolicited (MAILSTREAM 
     }
   }
 
+  else if (!strcmp (reply->key,"ANNOTATION") && (s = reply->text)){
+    char * mbox;    
+    /* response looks like ANNOTATION "mailbox" "entry" ("attr" "value" ["attr" "value"]) ["entry" ("attr "value" ["attr" "value"] )]*/
+    getannotation_t an = (getannotation_t) mail_parameters (NIL,GET_ANNOTATION,NIL);
+    
+    mbox = imap_parse_astring (stream, &s, reply,NIL);
+    
+    while(*s){
+      ANNOTATION * al = mail_newannotation();    
+      al->mbox = cpystr(mbox);
+      t = imap_parse_astring (stream, &s, reply,NIL);
+      al->entry = t;
+      STRINGLIST *strlist;
+      if (s){while (*s == ' ')s++;}
+      
+      strlist = imap_parse_stringlist(stream, &s,reply);
+
+      ANNOTATION_VALUES *vlIter, *vlBegin;
+      vlIter = vlBegin = NIL;
+      if (strlist) {
+        while(strlist){	
+          if(vlIter){
+            vlIter->next = mail_newannotationvalue();
+            vlIter = vlIter->next;
+          }else{
+            vlIter = mail_newannotationvalue();
+            vlBegin = vlIter;
+          }
+          if ( strlist->text.size )
+            vlIter->attr = cpystr (strlist->text.data);        
+          strlist = strlist->next;        
+          if(!strlist) continue;
+          if ( strlist->text.size )
+            vlIter->value = cpystr (strlist->text.data);
+          strlist = strlist->next;
+        }
+      }
+      al->values = vlBegin;
+      if (an) 
+        (*an) (stream,al);
+      mail_free_annotation(&al);
+    }
+    fs_give ((void **)&mbox);
+  }
   else if (!strcmp (reply->key,"ACL") && (s = reply->text) &&
 	   (t = imap_parse_astring (stream,&s,reply,NIL))) {
     getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL);
diff -r 7c3e6a9f1837 src/c-client/imap4r1.h
--- a/src/c-client/imap4r1.h	Sat Sep 29 10:54:00 2007 +0200
+++ b/src/c-client/imap4r1.h	Sat Sep 29 10:57:59 2007 +0200
@@ -248,3 +248,5 @@ long imap_setquota (MAILSTREAM *stream,c
 long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits);
 long imap_getquota (MAILSTREAM *stream,char *qroot);
 long imap_getquotaroot (MAILSTREAM *stream,char *mailbox);
+long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes);
+long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation); 
diff -r 7c3e6a9f1837 src/c-client/mail.c
--- a/src/c-client/mail.c	Sat Sep 29 10:54:00 2007 +0200
+++ b/src/c-client/mail.c	Sat Sep 29 10:57:59 2007 +0200
@@ -67,6 +67,7 @@ static newsrcquery_t mailnewsrcquery = N
 static newsrcquery_t mailnewsrcquery = NIL;
 				/* ACL results callback */
 static getacl_t mailaclresults = NIL;
+static getannotation_t mailannotationresults = NIL;
 				/* list rights results callback */
 static listrights_t maillistrightsresults = NIL;
 				/* my rights results callback */
@@ -580,6 +581,11 @@ void *mail_parameters (MAILSTREAM *strea
     ret = (void *) (debugsensitive ? VOIDT : NIL);
     break;
 
+  case SET_ANNOTATION:
+    mailannotationresults = (getannotation_t) value;
+  case GET_ANNOTATION:
+    ret = (void *) mailannotationresults;
+    break;
   case SET_ACL:
     mailaclresults = (getacl_t) value;
   case GET_ACL:
@@ -5666,7 +5672,15 @@ ACLLIST *mail_newacllist (void)
   return (ACLLIST *) memset (fs_get (sizeof (ACLLIST)),0,sizeof (ACLLIST));
 }
 
-
+ANNOTATION *mail_newannotation (void)
+{
+  return (ANNOTATION *) memset (fs_get (sizeof (ANNOTATION)),0,sizeof(ANNOTATION));
+}
+
+ANNOTATION_VALUES *mail_newannotationvalue (void)
+{
+  return (ANNOTATION_VALUES *) memset (fs_get (sizeof (ANNOTATION_VALUES)),0,sizeof(ANNOTATION_VALUES));
+}
 /* Mail instantiate new quotalist
  * Returns: new quotalist
  */
@@ -5989,6 +6003,25 @@ void mail_free_acllist (ACLLIST **al)
   }
 }
 
+static void mail_free_annotation_values(ANNOTATION_VALUES **val)
+{
+  if (*val) {
+    if ((*val)->attr) fs_give ((void**) &(*val)->attr);
+    if ((*val)->value) fs_give ((void**) &(*val)->value);
+    mail_free_annotation_values (&(*val)->next);
+    fs_give ((void **) val);
+  }
+}				
+void mail_free_annotation(ANNOTATION **al)
+{
+  if (*al) {
+    if((*al)->mbox) fs_give ((void**) &(*al)->mbox);
+    if((*al)->entry) fs_give ((void**) &(*al)->entry);
+    if((*al)->values)
+      mail_free_annotation_values(&(*al)->values);
+    fs_give ((void **) al);
+  }
+}
 
 /* Mail garbage collect quotalist
  * Accepts: pointer to quotalist pointer
diff -r 7c3e6a9f1837 src/c-client/mail.h
--- a/src/c-client/mail.h	Sat Sep 29 10:54:00 2007 +0200
+++ b/src/c-client/mail.h	Sat Sep 29 10:57:59 2007 +0200
@@ -347,6 +347,8 @@
 #define SET_SCANCONTENTS (long) 573
 #define GET_MHALLOWINBOX (long) 574
 #define SET_MHALLOWINBOX (long) 575
+#define GET_ANNOTATION (long) 570
+#define SET_ANNOTATION (long) 571
 
 /* Driver flags */
 
@@ -1037,6 +1039,24 @@ ACLLIST {
   char *identifier;		/* authentication identifier */
   char *rights;			/* access rights */
   ACLLIST *next;
+};
+
+/* ANNOTATION Response */
+
+#define ANNOTATION_VALUES struct annotation_value_list
+
+ANNOTATION_VALUES {
+	char *attr;
+	char *value;
+	ANNOTATION_VALUES *next;
+};
+
+#define ANNOTATION struct annotation
+
+ANNOTATION {
+	char *mbox;
+	char *entry;
+	ANNOTATION_VALUES * values;
 };
 
 /* Quota resource list */
@@ -1347,6 +1367,7 @@ typedef void (*logouthook_t) (void *data
 typedef void (*logouthook_t) (void *data);
 typedef char *(*sslclientcert_t) (void);
 typedef char *(*sslclientkey_t) (void);
+typedef void (*getannotation_t) (MAILSTREAM *stream,ANNOTATION* annot);
 
 /* Globals */
 
@@ -1763,7 +1784,10 @@ SORTPGM *mail_newsortpgm (void);
 SORTPGM *mail_newsortpgm (void);
 THREADNODE *mail_newthreadnode (SORTCACHE *sc);
 ACLLIST *mail_newacllist (void);
+ANNOTATION* mail_newannotation(void);
+ANNOTATION_VALUES* mail_newannotationvalue(void);
 QUOTALIST *mail_newquotalist (void);
+void mail_free_annotation(ANNOTATION **a);
 void mail_free_body (BODY **body);
 void mail_free_body_data (BODY *body);
 void mail_free_body_parameter (PARAMETER **parameter);
diff -r 7c3e6a9f1837 src/mtest/mtest.c
--- a/src/mtest/mtest.c	Sat Sep 29 10:54:00 2007 +0200
+++ b/src/mtest/mtest.c	Sat Sep 29 10:57:59 2007 +0200
@@ -145,6 +145,8 @@ int main ()
 #endif
   return NIL;
 }
+
+void mm_annotation (MAILSTREAM *stream, ANNOTATION *a);
 
 /* MM command loop
  * Accepts: MAIL stream
@@ -195,6 +197,28 @@ void mm (MAILSTREAM *stream,long debug)
 	mail_setflag (stream,arg,"\\DELETED");
       else puts ("?Bad message number");
       break;
+    case 'A':
+      {
+        char parms[MAILTMPLEN];
+        prompt("Annotation: ",parms);
+        if (parms) {
+          mail_parameters(stream,SET_ANNOTATION,mm_annotation);
+          STRINGLIST *entries = mail_newstringlist();
+          STRINGLIST *cur = entries;
+          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr (parms)));
+          cur->next = NIL;
+          
+          STRINGLIST *attributes = mail_newstringlist();
+          cur = attributes;
+          cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr ("*")));
+          cur->next = NIL;
+          
+          imap_getannotation(stream,"INBOX",entries,attributes);
+          mail_free_stringlist(&entries);
+          mail_free_stringlist(&attributes);
+        }
+      }
+      break;  
     case 'E':			/* Expunge command */
       mail_expunge (stream);
       last = 0;
@@ -347,7 +371,7 @@ void mm (MAILSTREAM *stream,long debug)
     case '?':			/* ? command */
       puts ("Body, Check, Delete, Expunge, Find, GC, Headers, Literal,");
       puts (" MailboxStatus, New Mailbox, Overview, Ping, Quit, Send, Type,");
-      puts ("Undelete, Xit, +, -, or <RETURN> for next message");
+      puts ("Undelete, Xit,Annotation, +, -, or <RETURN> for next message");
       break;
     default:			/* bogus command */
       printf ("?Unrecognized command: %s\n",cmd);
@@ -595,6 +619,18 @@ void prompt (char *msg,char *txt)
 
 /* Interfaces to C-client */
 
+void mm_annotation (MAILSTREAM *stream, ANNOTATION *a)
+{
+  if(a){
+    fprintf(stderr,"mailbox: %s\nentry: %s\n",a->mbox,a->entry);
+    ANNOTATION_VALUES * v = a->values;
+    while(v){
+      fprintf(stderr,"attr: %s, value: %s\n",v->attr,v->value);
+      v = v->next;
+    }
+  }
+}
+
 
 void mm_searched (MAILSTREAM *stream,unsigned long number)
 {



From cvs at kolab.org  Fri Feb 22 23:19:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 22 Feb 2008 23:19:11 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/pics kde.png,
	NONE, 1.1 
Message-ID: <20080222221911.0DF30600D5E@lists.intevation.de>

Author: richard

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

Added Files:
	kde.png 
Log Message:
Add kde.png to the web files.  This is the kde logo based on kde4
instead of the current one that is based on kde1.



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



From cvs at kolab.org  Fri Feb 22 23:19:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 22 Feb 2008 23:19:11 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.83,1.84 
Message-ID: <20080222221911.0B9B0600D5D@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Add kde.png to the web files.  This is the kde logo based on kde4
instead of the current one that is based on kde1.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ChangeLog	17 Feb 2008 23:11:07 -0000	1.83
+++ ChangeLog	22 Feb 2008 22:19:08 -0000	1.84
@@ -1,3 +1,8 @@
+2008-02-22 Richard Bos <richard at radoeka.nl>
+
+	* www/admin/pics/kde.png: added
+	* Makefile.am: added kde.png
+
 2008-02-17 Richard Bos <richard at radoeka.nl>
 
 	* www/admin/kolab/versions.php.in: moved an openpkg specific rpm



From cvs at kolab.org  Sat Feb 23 10:25:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 10:25:04 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	kde.tpl, 1.2, 1.3 
Message-ID: <20080223092504.B27D4600165@lists.intevation.de>

Author: richard

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

Modified Files:
	kde.tpl 
Log Message:
replaced kde.jpg with kde.png



Index: kde.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kde.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kde.tpl	15 Jan 2006 22:01:06 -0000	1.2
+++ kde.tpl	23 Feb 2008 09:25:02 -0000	1.3
@@ -3,7 +3,7 @@
 <p>
 {tr msg="<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop environment for Linux and Unix workstations. It combines ease of use, contemporary functionality, and outstanding graphical design with the technological superiority of the Unix operating system."}
 </p>
-<IMG SRC="../pics/kde.jpg" ALT="KDE" align="middle" longdesc="http://www.kde.org">
+<IMG SRC="../pics/kde.png" ALT="KDE" align="middle" longdesc="http://www.kde.org">
 <p>
 {tr msg="<b>KDE</b> is an Internet project that is truly open in every sense. Development takes place on the Internet and is discussed on our <a href=\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news groups, and IRC channels to which we invite and welcome everyone."}
 </p>



From cvs at kolab.org  Sat Feb 23 10:25:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 10:25:04 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.84,
	1.85 Makefile.am, 1.45, 1.46 
Message-ID: <20080223092504.B4C67600167@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
replaced kde.jpg with kde.png



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ChangeLog	22 Feb 2008 22:19:08 -0000	1.84
+++ ChangeLog	23 Feb 2008 09:25:02 -0000	1.85
@@ -1,5 +1,6 @@
 2008-02-22 Richard Bos <richard at radoeka.nl>
 
+	* php/admin/templates/kde.tpl: replaced kde.jpg with kde.png
 	* www/admin/pics/kde.png: added
 	* Makefile.am: added kde.png
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile.am	17 Feb 2008 23:11:07 -0000	1.45
+++ Makefile.am	23 Feb 2008 09:25:02 -0000	1.46
@@ -77,6 +77,7 @@
 	www/admin/pics/intevation_logo.png \
 	www/admin/pics/kdab.png \
 	www/admin/pics/kde.jpg \
+	www/admin/pics/kde.png \
 	www/admin/pics/kolab_logo.png
 
 wspicsdir = $(wskolabdir)/pics



From cvs at kolab.org  Sat Feb 23 15:01:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 15:01:12 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	menu.php, 1.19, 1.20 
Message-ID: <20080223140112.6CF2D600165@lists.intevation.de>

Author: richard

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

Modified Files:
	menu.php 
Log Message:
Fixed untranslated string Addressbook



Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- menu.php	16 Feb 2008 13:18:59 -0000	1.19
+++ menu.php	23 Feb 2008 14:01:10 -0000	1.20
@@ -42,7 +42,7 @@
 														'url'  => 'vacation.php' )));
 }
 if( $auth->group() == "admin" || $auth->group() == "maintainer") {
-  $menuitems['addressbook'] = array( 'name' => _('Addressbook'.' '),
+  $menuitems['addressbook'] = array( 'name' => _('Addressbook').' ',
 									 'url'  => $topdir.'/addressbook/',
 									 'title' => _('Manage Address Book'),
 									 'submenu' => array( 



From cvs at kolab.org  Sat Feb 23 15:01:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 15:01:12 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.85,1.86 
Message-ID: <20080223140112.6843760014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Fixed untranslated string Addressbook



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- ChangeLog	23 Feb 2008 09:25:02 -0000	1.85
+++ ChangeLog	23 Feb 2008 14:01:10 -0000	1.86
@@ -1,3 +1,7 @@
+2008-02-23 Richard Bos <richard at radoeka.nl>
+
+	* php/admin/include/menu.php: Fixed untranslated string Addressbook
+
 2008-02-22 Richard Bos <richard at radoeka.nl>
 
 	* php/admin/templates/kde.tpl: replaced kde.jpg with kde.png



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES
	messages.po, 1.21, 1.22 
Message-ID: <20080223201914.BB68D600169@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/it/LC_MESSAGES/messages.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- messages.po	16 Feb 2008 11:10:43 -0000	1.21
+++ messages.po	23 Feb 2008 20:19:11 -0000	1.22
@@ -1135,7 +1135,7 @@
 #, fuzzy, php-format
 msgid ""
 "Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"href='@kolab_wui@/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first "
 "remove it from the distribution list."
 msgstr ""
@@ -2407,7 +2407,7 @@
 #, fuzzy
 #~ msgid ""
 #~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
 #~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
 #~ "first remove it from the distribution list."
 #~ msgstr ""



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES
	messages.po, 1.19, 1.20 
Message-ID: <20080223201914.B4E41600167@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/es/LC_MESSAGES/messages.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- messages.po	16 Feb 2008 11:10:43 -0000	1.19
+++ messages.po	23 Feb 2008 20:19:11 -0000	1.20
@@ -1133,12 +1133,12 @@
 #, php-format
 msgid ""
 "Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"href='@kolab_wui@/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first "
 "remove it from the distribution list."
 msgstr ""
 "La entrada DN de la libreta de direcciones no puede ser modificada, la lista "
-"de distribución <a href='@webserver_web_prefix@/admin/distributionlist/list."
+"de distribución <a href='@kolab_wui@/distributionlist/list."
 "php?action=modify&dn=%s'>'%s'</a> depende de ella. Para modificar esta "
 "entrada, primero bórrela de la lista de distribución."
 
@@ -2405,12 +2405,12 @@
 
 #~ msgid ""
 #~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
 #~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
 #~ "first remove it from the distribution list."
 #~ msgstr ""
 #~ "La cuenta DN no puede ser modificada, la lista de distribución <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
 #~ "action=modify&dn=%s'>'%s'</a> depende de ella. Para modificar esta "
 #~ "cuenta, primero borrarla de la lista de distribución."
 



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.86,
	1.87 Makefile.am, 1.46, 1.47 
Message-ID: <20080223201914.3851260014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- ChangeLog	23 Feb 2008 14:01:10 -0000	1.86
+++ ChangeLog	23 Feb 2008 20:19:11 -0000	1.87
@@ -1,6 +1,15 @@
 2008-02-23 Richard Bos <richard at radoeka.nl>
 
 	* php/admin/include/menu.php: Fixed untranslated string Addressbook
+	* Makefile.am, php/admin/include/auth.class.php.in,
+	  php/admin/include/headers.php.in, php/admin/templates/page.tpl.in,
+	  www/admin/logout.php.in, www/admin/addressbook/addr.php.in,
+	  php/admin/locale/de/LC_MESSAGES/messages.po,
+	  php/admin/locale/es/LC_MESSAGES/messages.po,
+	  php/admin/locale/fr/LC_MESSAGES/messages.po,
+	  php/admin/locale/it/LC_MESSAGES/messages.po,
+	  php/admin/locale/nl/LC_MESSAGES/messages.po: changed the hardcoded
+	  path to web user interface (/admin) into a variable: kolab_wui.
 
 2008-02-22 Richard Bos <richard at radoeka.nl>
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile.am	23 Feb 2008 09:25:02 -0000	1.46
+++ Makefile.am	23 Feb 2008 20:19:11 -0000	1.47
@@ -26,7 +26,7 @@
 	www/admin/print.css  \
 	www/admin/style.css 
 
-wskolabdir = $(webserver_document_root)$(webserver_web_prefix)/admin
+wskolabdir = $(webserver_document_root)$(kolab_wui)
 wskolab_DATA = $(WSKOLAB_FILES)
 EXTRA_DIST += www/admin/style.css \
 	www/admin/print.css



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.38, 1.39 
Message-ID: <20080223201914.B0CD4600165@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- messages.po	16 Feb 2008 11:10:43 -0000	1.38
+++ messages.po	23 Feb 2008 20:19:11 -0000	1.39
@@ -1139,12 +1139,12 @@
 #, php-format
 msgid ""
 "Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"href='@kolab_wui@/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first "
 "remove it from the distribution list."
 msgstr ""
 "Der DN der Adresse konnte nicht verändert werden; Verteilerliste <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"href='@kolab_wui@/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> hängt davon ab. Um dieses Konto zu verändern, "
 "müssen Sie es erst aus der Verteilerliste entfernen."
 
@@ -2408,12 +2408,12 @@
 
 #~ msgid ""
 #~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
 #~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
 #~ "first remove it from the distribution list."
 #~ msgstr ""
 #~ "Der DN des Kontos konnte nicht verändert werden; Verteilerliste <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
 #~ "action=modify&dn=%s'>'%s'</a> hängt davon ab. Um dieses Konto zu "
 #~ "verändern, müssen Sie es erst aus der Verteilerliste entfernen."
 



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	auth.class.php.in, 1.2, 1.3 headers.php.in, 1.1, 1.2 
Message-ID: <20080223201914.3DF32600151@lists.intevation.de>

Author: richard

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

Modified Files:
	auth.class.php.in headers.php.in 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: auth.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- auth.class.php.in	8 Jan 2007 04:01:43 -0000	1.2
+++ auth.class.php.in	23 Feb 2008 20:19:11 -0000	1.3
@@ -104,7 +104,7 @@
 		session_destroy();
 		$this->error_string = false;
 		//$this->gotoLoginPage();
-		Header("Location: @webserver_web_prefix@/admin/");
+		Header("Location: @kolab_wui@/");
 	}
 
 	function handleLogin() {

Index: headers.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/headers.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- headers.php.in	30 Dec 2005 11:07:17 -0000	1.1
+++ headers.php.in	23 Feb 2008 20:19:11 -0000	1.2
@@ -23,7 +23,7 @@
 header("Cache-Control: no-cache, must-revalidate");
 header("Pragma: no-cache");
 
-$topdir = '@webserver_web_prefix@/admin';
+$topdir = '@kolab_wui@';
 /*
   Local variables:
   mode: php



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	page.tpl.in, 1.7, 1.8 
Message-ID: <20080223201914.BD96B600172@lists.intevation.de>

Author: richard

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

Modified Files:
	page.tpl.in 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: page.tpl.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/page.tpl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- page.tpl.in	4 Feb 2008 13:44:33 -0000	1.7
+++ page.tpl.in	23 Feb 2008 20:19:12 -0000	1.8
@@ -30,7 +30,7 @@
 </head>
 <body>
 <div id="topbar">
-	<a href="@webserver_web_prefix@/admin"><span id="toplogo"></span></a>
+	<a href="@kolab_wui@"><span id="toplogo"></span></a>
 	<div id="toptitle">{$page_title}</div>
 </div>
 <div id="topuserinfo">



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
	addr.php.in, 1.9, 1.10 
Message-ID: <20080223201914.C109A600D5D@lists.intevation.de>

Author: richard

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

Modified Files:
	addr.php.in 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: addr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- addr.php.in	21 Nov 2007 18:11:37 -0000	1.9
+++ addr.php.in	23 Feb 2008 20:19:12 -0000	1.10
@@ -175,7 +175,7 @@
 			  unset( $distlists['count'] );
 			  foreach( $distlists as $distlist ) {
 				$dlcn = $distlist['mail'][0];
-				$errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='@webserver_web_prefix@/admin/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
+				$errors[] = sprintf(_("Addressbook entry DN could not be modified, distribution list <a href='@kolab_wui@/distributionlist/list.php?action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first remove it from the distribution list."), urlencode($distlist['dn']), $dlcn );
 			  }
 			  
 			  if( !$errors ) {



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.24, 1.25 
Message-ID: <20080223201914.B9BB8600168@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- messages.po	16 Feb 2008 11:10:43 -0000	1.24
+++ messages.po	23 Feb 2008 20:19:11 -0000	1.25
@@ -1131,7 +1131,7 @@
 #, fuzzy, php-format
 msgid ""
 "Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"href='@kolab_wui@/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first "
 "remove it from the distribution list."
 msgstr ""
@@ -2433,7 +2433,7 @@
 #, fuzzy
 #~ msgid ""
 #~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
 #~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
 #~ "first remove it from the distribution list."
 #~ msgstr ""



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES
	messages.po, 1.40, 1.41 
Message-ID: <20080223201914.BCB4860016E@lists.intevation.de>

Author: richard

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

Modified Files:
	messages.po 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/nl/LC_MESSAGES/messages.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- messages.po	16 Feb 2008 13:34:50 -0000	1.40
+++ messages.po	23 Feb 2008 20:19:12 -0000	1.41
@@ -1123,7 +1123,7 @@
 #, php-format
 msgid ""
 "Addressbook entry DN could not be modified, distribution list <a "
-"href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+"href='@kolab_wui@/distributionlist/list.php?"
 "action=modify&dn=%s'>'%s'</a> depends on it. To modify this entry, first "
 "remove it from the distribution list."
 msgstr ""
@@ -2385,7 +2385,7 @@
 
 #~ msgid ""
 #~ "Account DN could not be modified, distribution list <a "
-#~ "href='@webserver_web_prefix@/admin/distributionlist/list.php?"
+#~ "href='@kolab_wui@/distributionlist/list.php?"
 #~ "action=modify&dn=%s'>'%s'</a> depends on it. To modify this account, "
 #~ "first remove it from the distribution list."
 #~ msgstr ""



From cvs at kolab.org  Sat Feb 23 21:19:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin logout.php.in,
	1.1, 1.2 
Message-ID: <20080223201914.BE761600D44@lists.intevation.de>

Author: richard

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

Modified Files:
	logout.php.in 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: logout.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/logout.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logout.php.in	30 Dec 2005 11:07:17 -0000	1.1
+++ logout.php.in	23 Feb 2008 20:19:12 -0000	1.2
@@ -21,7 +21,7 @@
 session_start();
 session_destroy();
 session_unset();
-header('Location: @webserver_web_prefix@/admin/');
+header('Location: @kolab_wui@/');
 
 /*
   Local variables:



From cvs at kolab.org  Sat Feb 23 21:19:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:20 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog, 1.148,
	1.149 kolab_bootstrap.in, 1.33, 1.34 
Message-ID: <20080223201920.90C5960014F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- ChangeLog	20 Feb 2008 12:30:18 -0000	1.148
+++ ChangeLog	23 Feb 2008 20:19:18 -0000	1.149
@@ -1,3 +1,10 @@
+2008-02-23 Richard Bos <richard at radoeka.nl>
+	* kolab_bootstrap.in, templates/httpd.conf.template.in,
+	  dist_conf/common, dist_conf/centos-clarkconnect,
+	  dist_conf/debian, dist_conf/gentoo, dist_conf/kolab
+	  dist_conf/mandriva, dist_conf/suse: changed the hardcoded
+	  path to the web user interface (/admin) into a variable: kolab_wui.
+
 2008-02-20 Richard Bos <richard at radoeka.nl>
 	* templates/httpd.conf.template.in: added missing webserver_web_prefix
 

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- kolab_bootstrap.in	3 Dec 2007 11:27:19 -0000	1.33
+++ kolab_bootstrap.in	23 Feb 2008 20:19:18 -0000	1.34
@@ -916,4 +916,4 @@
 print "kolab is now ready to run!\n";
 print "please run '@KOLABRC@ rc all start'\n";
 print ("Use login=manager and passwd=$bind_pw when you log into\n");
-print ("the webinterface https://$fqdn at webserver_web_prefix@/admin !\n");
+print ("the webinterface https://$fqdn at kolab_wui@ !\n");



From cvs at kolab.org  Sat Feb 23 21:19:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:21 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates httpd.conf.template.in, 1.22,
	1.23 
Message-ID: <20080223201921.0B7FF60014F@lists.intevation.de>

Author: richard

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

Modified Files:
	httpd.conf.template.in 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- httpd.conf.template.in	20 Feb 2008 12:30:18 -0000	1.22
+++ httpd.conf.template.in	23 Feb 2008 20:19:19 -0000	1.23
@@ -142,7 +142,7 @@
 AccessFileName .htaccess
 
 <Location @webserver_web_prefix@/>
-  ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/admin/
+  ErrorDocument 403 https://@@@fqdnhostname@@@@kolab_wui@/
 </Location>
 <Location "@webserver_web_prefix@/fbview">
     ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/
@@ -246,7 +246,7 @@
     Allow from all
 </Directory>
 
-<Directory "@webserver_document_root@@webserver_web_prefix@/admin">
+<Directory "@webserver_document_root@@kolab_wui@">
    AllowOverride None
    Options None
    Order allow,deny



From cvs at kolab.org  Sat Feb 23 21:19:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 23 Feb 2008 21:19:21 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.9,
	1.10 common, 1.44, 1.45 debian, 1.13, 1.14 gentoo, 1.13,
	1.14 kolab, 1.56, 1.57 mandriva, 1.9, 1.10 suse, 1.71, 1.72 
Message-ID: <20080223201921.123FA600167@lists.intevation.de>

Author: richard

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

Modified Files:
	centos-clarkconnect common debian gentoo kolab mandriva suse 
Log Message:
changed the hardcoded path to web user interface (/admin)
into a variable: kolab_wui.



Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- centos-clarkconnect	19 Feb 2008 13:59:39 -0000	1.9
+++ centos-clarkconnect	23 Feb 2008 20:19:18 -0000	1.10
@@ -150,6 +150,9 @@
 kolab_php_module_prefix=
 kolab_php_smarty_prefix=Smarty
 
+# Kolab web user interface
+kolab_wui=/kolab/admin
+
 #--------------------------------------------------------------------
 # OpenLDAP
 #--------------------------------------------------------------------

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- common	13 Feb 2008 22:59:49 -0000	1.44
+++ common	23 Feb 2008 20:19:18 -0000	1.45
@@ -99,6 +99,7 @@
 	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
 	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
 	-e 's,[@]kolab_webadmin_pkg[@],$(kolab_webadmin_pkg),g' \
+	-e 's,[@]kolab_wui[@],$(kolab_wui),g' \
 	-e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
 	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
 	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- debian	19 Feb 2008 13:59:39 -0000	1.13
+++ debian	23 Feb 2008 20:19:18 -0000	1.14
@@ -75,6 +75,9 @@
 kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=smarty/libs
 
+# Kolab web user interface
+kolab_wui=/kolab/admin
+
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
 ldapserver_replogfile=${localstatedir}/log/ldap-replicalog

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gentoo	19 Feb 2008 13:59:39 -0000	1.13
+++ gentoo	23 Feb 2008 20:19:18 -0000	1.14
@@ -210,6 +210,9 @@
 # webserver_web_prefix is empty indeed
 webserver_web_prefix=
 
+# Kolab web user interface
+kolab_wui=/admin
+
 #####################################################################
 # PHP parameters
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- kolab	19 Feb 2008 13:59:39 -0000	1.56
+++ kolab	23 Feb 2008 20:19:18 -0000	1.57
@@ -105,6 +105,9 @@
 kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
 
+# Kolab web user interface
+kolab_wui=/admin
+
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data
 ldapserver_replogfile=${ldapserver_statedir}/replog

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mandriva	17 Oct 2007 17:57:13 -0000	1.9
+++ mandriva	23 Feb 2008 20:19:18 -0000	1.10
@@ -39,6 +39,9 @@
 kolab_pidfile=/var/run/kolab/kolab.pid
 kolab_scriptsdir=$(sysconfdir)/kolab
 
+# Kolab web user interface
+kolab_wui=/admin
+
 ldapserver_dir=${localstatedir}/ldap-kolab
 ldapserver_rundir=/var/run/ldap
 ldapserver_schemadir=${datadir}/openldap/schema

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- suse	19 Feb 2008 13:59:39 -0000	1.71
+++ suse	23 Feb 2008 20:19:18 -0000	1.72
@@ -100,8 +100,10 @@
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just
 # /usr/share/php. This prevents scattering of the kolab php files.
 kolab_php_module_prefix=kolab/
-
 kolab_php_smarty_prefix=Smarty
+
+# Kolab web user interface
+kolab_wui=/kolab
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap



From cvs at kolab.org  Mon Feb 25 16:05:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 25 Feb 2008 16:05:06 +0100 (CET)
Subject: martin: server/kolabconf/lib/Kolab Conf.pm,1.12,1.13 
Message-ID: <20080225150506.D276B600D58@lists.intevation.de>

Author: martin

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv4470

Modified Files:
	Conf.pm 
Log Message:
Applied fix from mcayland


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Conf.pm	17 Oct 2007 17:57:13 -0000	1.12
+++ Conf.pm	25 Feb 2008 15:05:04 -0000	1.13
@@ -185,7 +185,7 @@
 			      if (ref $Kolab::config{$attr} eq "ARRAY") {
 				  my @vals = @{$Kolab::config{$attr}} ;
 				  # We want to make sure subdomain.domain.tld comes before domain.tld
-				  my @length_sorted_vals = sort {length $a cmp length $b} @vals;
+				  my @length_sorted_vals = sort {length $b cmp length $a} @vals;
 				  $val = join ($args, @length_sorted_vals) ;
 			      } else {
 				  $val = $Kolab::config{$attr};



From cvs at kolab.org  Tue Feb 26 07:04:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 07:04:02 +0100 (CET)
Subject: martin: server/kolabconf/bin kolabconf.in,1.7,1.8 
Message-ID: <20080226060402.2FD21600D58@lists.intevation.de>

Author: martin

Update of /kolabrepository/server/kolabconf/bin
In directory doto:/tmp/cvs-serv27041/kolabconf/bin

Modified Files:
	kolabconf.in 
Log Message:
Martin Konold: applied patch from mathieu.parent. It makes the syslog_facility configurable via kolab.conf, E,g, it is 
possible to send the syslog messages to local5. The default preserves the old behaviour ('user'). 
https://www.intevation.de/roundup/kolab/issue2446 


Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/kolabconf/bin/kolabconf.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabconf.in	7 Jan 2008 11:15:42 -0000	1.7
+++ kolabconf.in	26 Feb 2008 06:03:59 -0000	1.8
@@ -40,7 +40,7 @@
 
 Kolab::reloadConfig("@CONFIG_FILE@");
 
-openlog('kolabconf', 'cons, pid', 'user');
+openlog('kolabconf', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
 
 getopts('dnh');
 if ($opt_h) {



From cvs at kolab.org  Tue Feb 26 07:04:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 07:04:02 +0100 (CET)
Subject: martin: server/kolabd/kolabd kolab.conf,1.2,1.3 kolabd.in,1.7,1.8 
Message-ID: <20080226060402.2FBE9600167@lists.intevation.de>

Author: martin

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

Modified Files:
	kolab.conf kolabd.in 
Log Message:
Martin Konold: applied patch from mathieu.parent. It makes the syslog_facility configurable via kolab.conf, E,g, it is 
possible to send the syslog messages to local5. The default preserves the old behaviour ('user'). 
https://www.intevation.de/roundup/kolab/issue2446 


Index: kolab.conf
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.conf	8 Oct 2007 15:21:20 -0000	1.2
+++ kolab.conf	26 Feb 2008 06:04:00 -0000	1.3
@@ -10,5 +10,6 @@
 ldap_master_uri : @@@ldap_master_uri@@@
 php_dn : cn=nobody,@@@kolab_basedn@@@
 php_pw : @@@nobody_pw@@@
+syslog_facility : user
 slurpd_addr : 127.0.0.1
 slurpd_port : 9999

Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabd.in	2 Aug 2007 06:49:43 -0000	1.7
+++ kolabd.in	26 Feb 2008 06:04:00 -0000	1.8
@@ -49,7 +49,7 @@
 
 Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
 
-openlog('kolabd', 'cons, pid', 'user');
+openlog('kolabd', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
 
 # won't be needed now (i think)
 # my $prefix = $Kolab::config{'prefix'};



From cvs at kolab.org  Tue Feb 26 16:52:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 16:52:46 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES
	messages.po, 1.39, 1.40 
Message-ID: <20080226155246.AB63C600D58@lists.intevation.de>

Author: thomas

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

Modified Files:
	messages.po 
Log Message:
System Einstellungen -> Systemeinstellungen (from kolab/issue2437)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/de/LC_MESSAGES/messages.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- messages.po	23 Feb 2008 20:19:11 -0000	1.39
+++ messages.po	26 Feb 2008 15:52:44 -0000	1.40
@@ -8,7 +8,7 @@
 "Project-Id-Version: Kolab-Webadmin German\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-12-03 18:11+0100\n"
-"PO-Revision-Date: 2007-11-21 15:23+0100\n"
+"PO-Revision-Date: 2008-02-26 16:51+0100\n"
 "Last-Translator: Thomas Arendsen Hein <thomas at intevation.de>\n"
 "Language-Team: Kolab development coordination <kolab-devel at kolab.org>\n"
 "MIME-Version: 1.0\n"
@@ -2237,7 +2237,7 @@
 
 #: ../include/menu.php:108
 msgid "System Settings"
-msgstr "System Einstellungen"
+msgstr "Systemeinstellungen"
 
 #: ../include/menu.php:111 ../include/menu.php:113
 msgid "About Kolab"



From cvs at kolab.org  Tue Feb 26 19:30:36 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 19:30:36 +0100 (CET)
Subject: thomas: server release-notes.txt,1.215,1.216 
Message-ID: <20080226183036.4937F600D40@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- release-notes.txt	20 Feb 2008 08:27:43 -0000	1.215
+++ release-notes.txt	26 Feb 2008 18:30:34 -0000	1.216
@@ -57,13 +57,20 @@
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
+    - kolab-webadmin-2.1.99-2008????
+
+	Corrections in the Dutch translation.
+
+	kolab/issue2437 (Change name of service tab to settings)
+
     - php-kolab-2.2.rc2-2008????
 
 	kolab/issue1272 (From: header in vacation messages is marked as "Untrusted") 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
+	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
-        kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
-        kolab/issue2487 (Incorrect variable name $fbfilename within Freebusy/Cache.php)
+	kolab/issue2487 (Incorrect variable name $fbfilename within Freebusy/Cache.php)
+
 
 Changes between 2.2-beta-3 and 2.2-rc-1
 



From cvs at kolab.org  Tue Feb 26 19:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 19:39:57 +0100 (CET)
Subject: thomas: server release-notes.txt,1.216,1.217 
Message-ID: <20080226183957.99952600D40@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
About Kolab -> Versions: Separate PEAR/Horde section, s/-/_ in autoconf vars.

kolab/issue2203 (About Kolab does not list new server components)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- release-notes.txt	26 Feb 2008 18:30:34 -0000	1.216
+++ release-notes.txt	26 Feb 2008 18:39:55 -0000	1.217
@@ -61,6 +61,7 @@
 
 	Corrections in the Dutch translation.
 
+	kolab/issue2203 (About Kolab does not list new server components)
 	kolab/issue2437 (Change name of service tab to settings)
 
     - php-kolab-2.2.rc2-2008????



From cvs at kolab.org  Tue Feb 26 19:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 19:39:57 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	versions.tpl.in, 1.2, 1.3 
Message-ID: <20080226183957.A0836600D60@lists.intevation.de>

Author: thomas

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

Modified Files:
	versions.tpl.in 
Log Message:
About Kolab -> Versions: Separate PEAR/Horde section, s/-/_ in autoconf vars.

kolab/issue2203 (About Kolab does not list new server components)


Index: versions.tpl.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/versions.tpl.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- versions.tpl.in	11 Feb 2008 21:25:22 -0000	1.2
+++ versions.tpl.in	26 Feb 2008 18:39:55 -0000	1.3
@@ -9,6 +9,8 @@
 <pre>{$kolabversion}</pre>
 <h1>{tr msg="Kolab2 Groupware Server Component Versions"}</h1>
 <pre>{$kolabversions}</pre>
+<h1>{tr msg="PEAR/Horde Versions"}</h1>
+<pre>{$pearhordeversions}</pre>
 @OPENPKG@<h1>{tr msg="Kolab2 Patched OpenPKG Package Versions"}</h1>
 @OPENPKG@<pre>{$kolabpatchedversions}</pre>
 @OPENPKG@<h1>{tr msg="OpenPKG Version"}</h1>



From cvs at kolab.org  Tue Feb 26 19:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 19:39:57 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/kolab
	versions.php.in, 1.10, 1.11 
Message-ID: <20080226183957.A1A50600D61@lists.intevation.de>

Author: thomas

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

Modified Files:
	versions.php.in 
Log Message:
About Kolab -> Versions: Separate PEAR/Horde section, s/-/_ in autoconf vars.

kolab/issue2203 (About Kolab does not list new server components)


Index: versions.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/kolab/versions.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- versions.php.in	17 Feb 2008 14:15:57 -0000	1.10
+++ versions.php.in	26 Feb 2008 18:39:55 -0000	1.11
@@ -35,13 +35,18 @@
     @webserver_pkg@ \
     @kolab_pkg@ \
     @kolab_webadmin_pkg@ \
-    @kolab-filter_pkg@ \
-    @kolab-freebusy_pkg@ \
-    @perl-kolab-conf_pkg@ \
+    @kolab_filter_pkg@ \
+    @kolab_freebusy_pkg@ \
+    @perl_kolabconf_pkg@ \
     @perl_kolab_pkg@ \
-    @php-pear-kolab_filter_pkg@ \
-    @php-pear-kolab_freebusy_pkg@ |
-    sort
+    @php_kolab_pkg@ \
+    | sort
+');
+
+$pearhordeversions = shell_exec('
+  @RPM@ -q --qf "%{NAME}: %{VERSION}-%{RELEASE}\n" \
+    @pear_horde_pkg@ \
+    | sort
 ');
 
 
@@ -68,6 +73,7 @@
 $smarty->assign( 'submenuitems', $menuitems[$sidx]['submenu'] );
 $smarty->assign( 'kolabversion',  $kolabversion );
 $smarty->assign( 'kolabversions', $kolabversions );
+$smarty->assign( 'pearhordeversions', $pearhordeversions );
 $smarty->assign( 'kolabpatchedversions', $kolabpatchedversions );
 $smarty->assign( 'openpkgversion', $openpkgversion );
 $smarty->assign( 'maincontent', 'versions.tpl' );



From cvs at kolab.org  Tue Feb 26 19:39:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 19:39:57 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/dist_conf common, 1.45, 1.46 kolab, 1.57,
	1.58 suse, 1.72, 1.73 
Message-ID: <20080226183957.B0CF9600D40@lists.intevation.de>

Author: thomas

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

Modified Files:
	common kolab suse 
Log Message:
About Kolab -> Versions: Separate PEAR/Horde section, s/-/_ in autoconf vars.

kolab/issue2203 (About Kolab does not list new server components)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- common	23 Feb 2008 20:19:18 -0000	1.45
+++ common	26 Feb 2008 18:39:55 -0000	1.46
@@ -77,8 +77,8 @@
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
 	-e 's,[@]imap_usr[@],$(imap_usr),g' \
-	-e 's,[@]kolab-filter_pkg[@],$(kolab-filter_pkg),g' \
-	-e 's,[@]kolab-freebusy_pkg[@],$(kolab-freebusy_pkg),g' \
+	-e 's,[@]kolab_filter_pkg[@],$(kolab_filter_pkg),g' \
+	-e 's,[@]kolab_freebusy_pkg[@],$(kolab_freebusy_pkg),g' \
 	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
@@ -115,9 +115,9 @@
 	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
 	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
 	-e 's,[@]perl_kolab_pkg[@],$(perl_kolab_pkg),g' \
-	-e 's,[@]perl-kolab-conf_pkg[@],$(perl-kolab-conf_pkg),g' \
-	-e 's,[@]php-pear-kolab_filter_pkg[@],$(php-pear-kolab_filter_pkg),g' \
-	-e 's,[@]php-pear-kolab_freebusy_pkg[@],$(php-pear-kolab_freebusy_pkg),g' \
+	-e 's,[@]perl_kolabconf_pkg[@],$(perl_kolabconf_pkg),g' \
+	-e 's,[@]php_kolab_pkg[@],$(php_kolab_pkg),g' \
+	-e 's,[@]pear_horde_pkg[@],$(pear_horde_pkg),g' \
 	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
 	-e 's,[@]pki_grp[@],$(pki_grp),g' \
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- kolab	23 Feb 2008 20:19:18 -0000	1.57
+++ kolab	26 Feb 2008 18:39:55 -0000	1.58
@@ -96,14 +96,21 @@
 kolab_logdir=${kolab_statedir}/log
 kolab_pidfile=${kolab_statedir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-kolab_pkg=kolabd
-kolab_webadmin_pkg=kolab-webadmin
-perl_kolab_pkg=perl-kolab
 kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 kolab_php_module_prefix=
 kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
+
+kolab_pkg=kolabd
+kolab_pkgs=spamassassin openldap clamav
+kolab_webadmin_pkg=kolab-webadmin
+kolab_filter_pkg=kolab-filter
+kolab_freebusy_pkg=kolab-freebusy
+perl_kolab_pkg=perl-kolab
+perl_kolabconf_pkg=kolabconf
+php_kolab_pkg=php-kolab
+pear_horde_pkg=PEAR-Net_IMAP PEAR-Net_SMTP PEAR-Net_URL PEAR-Mail_Mime PEAR-Log PEAR-Date PEAR-Auth_SASL PEAR-Net_Sieve PEAR-Net_Socket PEAR-Net_LMTP PEAR-HTTP_Request PEAR-Mail horde-framework-kolab horde-turba-kolab horde-nag-kolab horde-kolab-client fbview-kronolith php-channel-horde horde-kolab horde-kronolith-kolab horde-mnemo-kolab horde-passwd-kolab horde-imp-kolab horde-ingo-kolab fbview-horde
 
 # Kolab web user interface
 kolab_wui=/admin

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- suse	23 Feb 2008 20:19:18 -0000	1.72
+++ suse	26 Feb 2008 18:39:55 -0000	1.73
@@ -89,12 +89,11 @@
 kolab_smtpdpolicy_conffile_usr=kolab
 kolab_smtpdpolicy_conffile_grp=root
 kolab_scriptsdir=$(datadir)/kolab/scripts
-kolab-filter_pkg=kolab-filter
-kolab-freebusy_pkg=kolab-freebusy
+kolab_filter_pkg=kolab-filter
+kolab_freebusy_pkg=kolab-freebusy
 perl_kolab_pkg=perl-kolab
-perl-kolab-conf_pkg=perl-kolab-conf
-php-pear-kolab_filter_pkg=php5-pear-kolab_filter
-php-pear-kolab_freebusy_pkg=php5-pear-kolab_freebusy
+perl_kolabconf_pkg=perl-kolab-conf
+php_kolab_pkg=php5-pear-kolab_filter php5-pear-kolab_freebusy
 
 # This variable makes it possible to store all kolab php modules in its own
 # module.  E.g on suse it will be /usr/share/php/kolab instead of just



From cvs at kolab.org  Tue Feb 26 22:33:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:33:58 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.11,1.12 
Message-ID: <20080226213358.75EF9600D5E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv22361

Modified Files:
	ChangeLog 
Log Message:
Fix some minor issues with the option handling.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	13 Feb 2008 16:28:27 -0000	1.11
+++ ChangeLog	26 Feb 2008 21:33:56 -0000	1.12
@@ -1,3 +1,8 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* Filter/Filter.php: Fix some minor issues with the option
+	handling.
+
 2008-02-13  Sascha Wilde  <wilde at intevation.de>
 
 	* Filter/Content.php (verify_sender): When no client address is



From cvs at kolab.org  Tue Feb 26 22:33:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:33:58 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Filter.php,1.7,1.8 
Message-ID: <20080226213358.70305600D5C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv22361/Filter

Modified Files:
	Filter.php 
Log Message:
Fix some minor issues with the option handling.

Index: Filter.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Filter.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Filter.php	12 Feb 2008 09:54:37 -0000	1.7
+++ Filter.php	26 Feb 2008 21:33:56 -0000	1.8
@@ -255,15 +255,15 @@
         }
         $this->_recipients = $recipients;
 
-        if (!empty($options['c'])) {
+        if (isset($options['c']) && !empty($options['c'])) {
             $this->_client_address = $options['c'];
         }
         
-        if (!empty($options['h'])) {
+        if (isset($options['h']) && !empty($options['h'])) {
             $this->_fqhostname = strtolower($options['h']);
         }
         
-        if (!empty($options['u'])) {
+        if (isset($options['u']) && !empty($options['u'])) {
             $this->_sasl_username = strtolower($options['u']);
         }
     }



From cvs at kolab.org  Tue Feb 26 22:35:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:35:04 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.12,1.13 
Message-ID: <20080226213504.8A0C2600D5E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv22452

Modified Files:
	ChangeLog 
Log Message:
Fix undefined variables.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	26 Feb 2008 21:33:56 -0000	1.12
+++ ChangeLog	26 Feb 2008 21:35:02 -0000	1.13
@@ -1,5 +1,7 @@
 2008-02-26  Gunnar Wrobel  <p at rdus.de>
 
+	* Filter/Resource.php: Fix undefined variables.
+
 	* Filter/Filter.php: Fix some minor issues with the option
 	handling.
 



From cvs at kolab.org  Tue Feb 26 22:35:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:35:04 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Resource.php,1.5,1.6 
Message-ID: <20080226213504.8F795600D60@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv22452/Filter

Modified Files:
	Resource.php 
Log Message:
Fix undefined variables.

Index: Resource.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Resource.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Resource.php	28 Nov 2007 15:36:59 -0000	1.5
+++ Resource.php	26 Feb 2008 21:35:02 -0000	1.6
@@ -435,26 +435,21 @@
         return $result;
     }
 
-    // If this call is purely to cache the f/b list then we don't need to
-    // bother parsing the VFB file
-    if (!$cache) {
-        $iCalendar = &new Horde_iCalendar();
-        $iCalendar->parsevCalendar($text);
-        $vfb = &$iCalendar->findComponent('VFREEBUSY');
-
-        if ($vfb === false) {
-            Horde::logMessage(sprintf(_("Invalid or no free/busy information available for %s"), 
-                                      $resource), 
-                              __FILE__, __LINE__, PEAR_LOG_ERR);
-            //shutdown();
-            $result = false;
-            return $result;
-        }
-
-        $vfb->simplify();
-
-        return $vfb;
+    $iCalendar = &new Horde_iCalendar();
+    $iCalendar->parsevCalendar($text);
+    $vfb = &$iCalendar->findComponent('VFREEBUSY');
+   
+    if ($vfb === false) {
+        Horde::logMessage(sprintf(_("Invalid or no free/busy information available for %s"), 
+                                  $resource), 
+                          __FILE__, __LINE__, PEAR_LOG_ERR);
+        //shutdown();
+        $result = false;
+        return $result;
     }
+    $vfb->simplify();
+
+    return $vfb;
 }
 
 function sendITipReply($cn,$resource, $itip, $type = RM_ITIP_ACCEPT)
@@ -832,8 +827,8 @@
 
     $recurrence = false;
 
-    $kolab_xml = Horde_DOM_Document::factory(array('xml' => $xml_text));
-    if (is_a($result, 'PEAR_Error')) {
+    $kolab_xml = Horde_DOM_Document::factory();
+    if (is_a($kolab_xml, 'PEAR_Error')) {
         // There were errors building the xml document
         Horde::logMessage(sprintf(_("Error building xml document: %s"), 
                                   $result->getMessage()),



From cvs at kolab.org  Tue Feb 26 22:37:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:37:47 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.217,1.218 
Message-ID: <20080226213747.A4C0D600D5C@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- release-notes.txt	26 Feb 2008 18:39:55 -0000	1.217
+++ release-notes.txt	26 Feb 2008 21:37:45 -0000	1.218
@@ -71,6 +71,7 @@
 	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
 	kolab/issue2487 (Incorrect variable name $fbfilename within Freebusy/Cache.php)
+	kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.)
 
 
 Changes between 2.2-beta-3 and 2.2-rc-1



From cvs at kolab.org  Tue Feb 26 22:37:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:37:47 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.13,1.14 
Message-ID: <20080226213747.A87AD600D60@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv22510/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	26 Feb 2008 21:35:02 -0000	1.13
+++ ChangeLog	26 Feb 2008 21:37:45 -0000	1.14
@@ -1,6 +1,9 @@
 2008-02-26  Gunnar Wrobel  <p at rdus.de>
 
 	* Filter/Resource.php: Fix undefined variables.
+	(String): Fix default encoding.
+	kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.)
+	https://www.intevation.de/roundup/kolab/issue2495
 
 	* Filter/Filter.php: Fix some minor issues with the option
 	handling.



From cvs at kolab.org  Tue Feb 26 22:37:47 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:37:47 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Resource.php,1.6,1.7 
Message-ID: <20080226213747.E07BA600D61@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv22510/php-kolab/Kolab_Filter/Filter

Modified Files:
	Resource.php 
Log Message:
kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.)

Index: Resource.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Resource.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Resource.php	26 Feb 2008 21:35:02 -0000	1.6
+++ Resource.php	26 Feb 2008 21:37:45 -0000	1.7
@@ -41,6 +41,7 @@
 require_once 'Horde/MIME/Structure.php';
 
 require_once 'Horde/String.php';
+String::setDefaultCharset('UTF-8');
 
 // Required to be able to use the old Horde framework
 function wrap($text) 



From cvs at kolab.org  Tue Feb 26 22:42:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 26 Feb 2008 22:42:51 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.73,1.74 
Message-ID: <20080226214251.723DD600D5C@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
kolab_wui was defined incorrectly



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- suse	26 Feb 2008 18:39:55 -0000	1.73
+++ suse	26 Feb 2008 21:42:49 -0000	1.74
@@ -102,7 +102,7 @@
 kolab_php_smarty_prefix=Smarty
 
 # Kolab web user interface
-kolab_wui=/kolab
+kolab_wui=/kolab/admin
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
@@ -142,6 +142,10 @@
 phplibdir=${datadir}/php5
 phplibdir2=${datadir}/php5
 phppeardir=${phplibdir}/PEAR
+
+
+# Variable to list all pear related packages (including horde)
+pear_horde_pkg=
 
 sasl_smtpconffile=${sysconfdir}/sasl2/smtpd.conf
 sasl_authdconffile=${sysconfdir}/saslauthd.conf



From cvs at kolab.org  Wed Feb 27 08:09:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Feb 2008 08:09:58 +0100 (CET)
Subject: gunnar: server/php-kolab DEVELOPMENT,1.7,1.8 
Message-ID: <20080227070958.BD6C5600D40@lists.intevation.de>

Author: gunnar

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

Modified Files:
	DEVELOPMENT 
Log Message:
Add a test fo rkolab/issue1272 and fix a notice when the sender does only use a mail address (no plain text name.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/php-kolab/DEVELOPMENT,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DEVELOPMENT	12 Feb 2008 15:08:09 -0000	1.7
+++ DEVELOPMENT	27 Feb 2008 07:09:56 -0000	1.8
@@ -38,7 +38,7 @@
    You need to already have a PEAR installation on your base system
    for that!
 
-   If the operation is successfull, you should see corresponding
+   If the operation is successfull, you should see a corresponding
    message at the end of the output:
 
    ...



From cvs at kolab.org  Wed Feb 27 08:09:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Feb 2008 08:09:58 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests forged_vacation_msg.phpt,
	NONE, 1.1 forged_sender.phpt, 1.2, 1.3 privileged_network.phpt,
	1.1, 1.2 
Message-ID: <20080227070958.C21B4600D58@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/tests
In directory doto:/tmp/cvs-serv10323/Kolab_Filter/tests

Modified Files:
	forged_sender.phpt privileged_network.phpt 
Added Files:
	forged_vacation_msg.phpt 
Log Message:
Add a test fo rkolab/issue1272 and fix a notice when the sender does only use a mail address (no plain text name.

--- NEW FILE: forged_vacation_msg.phpt ---
--TEST--
Test sending a mail as an untrusted sender.
--SKIPIF--
--FILE--
<?php
require_once 'Kolab/Filter/Content.php';

/* Our test configuration */
$conf = array();
$conf['log']['enabled']          = true;
$conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
$conf['log']['type']             = 'console';
$conf['log']['name']             = 'ignored';
$conf['log']['ident']            = 'Kolab Filter';
$conf['log']['params']['append'] = true;
$conf['filter']['tempdir'] = './tmp';
$conf['filter']['reject_forged_from_header'] = false;
$conf['filter']['email_domain'] = 'example.com';

/* Use an empty client address here, indicating that the mail is sent
 * via local sendmail -> We want to trust local sendmail */
$_SERVER['argv'] = array('test', '-s', 'me at example.com', '-u', '', '-r', 'you at example.net', '-c', '');
$logger = Horde::getLogger();

$logger->_lineFormat = '%2$s [%3$s] %7$s';
// Activate this if you need the log information. This will
// make the test fail though
//$logger->_lineFormat = '%2$s [%3$s] %4$s %7$s';

$inh = fopen('_data/vacation.eml', 'r');

/* Setup the class */
$parser   = &new Filter_Content('StdOut', true);

/* Parse the mail */
$parser->parse($inh);
?>
--EXPECT--
Kolab Filter [debug] logMessage
Kolab Filter [debug] logMessage
Mail from sender: me at example.com
Mail to recipient: you at example.net
Return-Path: <me at example.com>
Received: from localhost (fqdn.example.com [127.0.0.1])
	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
	 Sat, 10 Nov 2007 20:44:52 +0100
Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
From: me at example.com
To: you at example.net
Subject: Me to You
Date: Sat, 10 Nov 2007 22:45:12 +0300
User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

I'm on vacation
.
Kolab Filter [info] logMessage

Index: forged_sender.phpt
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/tests/forged_sender.phpt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- forged_sender.phpt	12 Feb 2008 09:54:37 -0000	1.2
+++ forged_sender.phpt	27 Feb 2008 07:09:56 -0000	1.3
@@ -44,7 +44,7 @@
 	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
 	 Sat, 10 Nov 2007 20:44:52 +0100
 Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
-From: "Me (UNTRUSTED, sender <me at example.com> is not authenticated)" <me at example.com>
+From: " (UNTRUSTED, sender <me at example.com> is not authenticated)" <me at example.com>
 To: "You" <you at example.com>
 Subject: Me to You
 Date: Sat, 10 Nov 2007 22:45:12 +0300

Index: privileged_network.phpt
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/tests/privileged_network.phpt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- privileged_network.phpt	12 Feb 2008 07:39:12 -0000	1.1
+++ privileged_network.phpt	27 Feb 2008 07:09:56 -0000	1.2
@@ -43,7 +43,7 @@
 	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
 	 Sat, 10 Nov 2007 20:44:52 +0100
 Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
-From: "Me" <me at example.com>
+From: me at example.com
 To: "You" <you at example.com>
 Subject: Me to You
 Date: Sat, 10 Nov 2007 22:45:12 +0300



From cvs at kolab.org  Wed Feb 27 08:09:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Feb 2008 08:09:58 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/tests/_data vacation.eml, NONE,
	1.1 forged.eml, 1.1, 1.2 
Message-ID: <20080227070958.C61E5600D5C@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/tests/_data
In directory doto:/tmp/cvs-serv10323/Kolab_Filter/tests/_data

Modified Files:
	forged.eml 
Added Files:
	vacation.eml 
Log Message:
Add a test fo rkolab/issue1272 and fix a notice when the sender does only use a mail address (no plain text name.

--- NEW FILE: vacation.eml ---
Return-Path: <me at example.com>
Received: from localhost (fqdn.example.com [127.0.0.1])
	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
	 Sat, 10 Nov 2007 20:44:52 +0100
Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
From: me at example.com
To: you at example.net
Subject: Me to You
Date: Sat, 10 Nov 2007 22:45:12 +0300
User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

I'm on vacation

Index: forged.eml
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/tests/_data/forged.eml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forged.eml	11 Feb 2008 17:34:43 -0000	1.1
+++ forged.eml	27 Feb 2008 07:09:56 -0000	1.2
@@ -3,7 +3,7 @@
 	 by demo.example.com (Cyrus v2.3.9-openpkg) with LMTPA;
 	 Sat, 10 Nov 2007 20:44:52 +0100
 Message-ID: <1d2101c823d2$3555aa10$ac112c15 at Meredith>
-From: "Me" <me at example.com>
+From: me at example.com
 To: "You" <you at example.com>
 Subject: Me to You
 Date: Sat, 10 Nov 2007 22:45:12 +0300



From cvs at kolab.org  Wed Feb 27 08:09:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Feb 2008 08:09:58 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Content.php,1.8,1.9 
Message-ID: <20080227070958.C7A3A600D5E@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv10323/Kolab_Filter/Filter

Modified Files:
	Content.php 
Log Message:
Add a test fo rkolab/issue1272 and fix a notice when the sender does only use a mail address (no plain text name.

Index: Content.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Content.php	13 Feb 2008 16:28:27 -0000	1.8
+++ Content.php	27 Feb 2008 07:09:56 -0000	1.9
@@ -522,7 +522,14 @@
                         Horde::logMessage(sprintf(_("%s is not an allowed From address for unauthenticated users, rewriting."), 
                                                   $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
                         if (strpos( $fromhdr, $untrusted )===false) {
-                            return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' '.$untrusted.'" '.'<'.$from.'>';
+                            if (property_exists($adr, 'personal')) {
+                                $name = str_replace(array("\\", '"'), 
+                                                    array("\\\\",'\"'), 
+                                                    $adr->personal);
+                            } else {
+                                $name = '';
+                            }
+                            return '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
                         } else {
                             return true;
                         }



From cvs at kolab.org  Wed Feb 27 08:09:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Feb 2008 08:09:58 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.14,1.15 
Message-ID: <20080227070958.C94DC600D5F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv10323/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
Add a test fo rkolab/issue1272 and fix a notice when the sender does only use a mail address (no plain text name.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	26 Feb 2008 21:37:45 -0000	1.14
+++ ChangeLog	27 Feb 2008 07:09:56 -0000	1.15
@@ -1,3 +1,10 @@
+2008-02-27  Gunnar Wrobel  <p at rdus.de>
+
+	* tests/forged_vacation_msg.phpt: Add a test for kolab/issue1272
+
+	* Filter/Content.php: Fix a notice when the sender does not use a
+	name but only a mail address.
+
 2008-02-26  Gunnar Wrobel  <p at rdus.de>
 
 	* Filter/Resource.php: Fix undefined variables.



From cvs at kolab.org  Wed Feb 27 09:44:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Feb 2008 09:44:40 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog,1.12,1.13 
Message-ID: <20080227084440.7943C600D70@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv12922

Modified Files:
	ChangeLog 
Log Message:
Add the CN attribute in the freebusy files.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	20 Feb 2008 08:27:44 -0000	1.12
+++ ChangeLog	27 Feb 2008 08:44:38 -0000	1.13
@@ -1,3 +1,9 @@
+2008-02-27  Gunnar Wrobel  <p at rdus.de>
+
+	* Freebusy/Cache.php: Add the CN attribute if available.
+
+	* Freebusy/Page.php: Add the CN attribute.
+
 2008-02-20  Gunnar Wrobel  <p at rdus.de>
 
 	* Freebusy/Cache.php:



From cvs at kolab.org  Wed Feb 27 09:44:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 27 Feb 2008 09:44:40 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php, 1.7,
	1.8 Page.php, 1.5, 1.6 
Message-ID: <20080227084440.7B242600D72@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv12922/Freebusy

Modified Files:
	Cache.php Page.php 
Log Message:
Add the CN attribute in the freebusy files.

Index: Cache.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Cache.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Cache.php	20 Feb 2008 08:27:44 -0000	1.7
+++ Cache.php	27 Feb 2008 08:44:38 -0000	1.8
@@ -193,7 +193,10 @@
         
         // Create new vFreebusy.
         $vFb = &Horde_iCalendar::newComponent('vfreebusy', $vCal);
-        $vFb->setAttribute('ORGANIZER', 'MAILTO:' . $access->owner);
+        if ($access->cn) {
+            $cn = ';CN="' $access->cn . '":';
+        }
+        $vFb->setAttribute('ORGANIZER', $cn . 'MAILTO:' . $access->owner);
         
         $vFb->setAttribute('DTSTAMP', time());
         $vFb->setAttribute('URL', 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);

Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Page.php	7 Feb 2008 12:24:03 -0000	1.5
+++ Page.php	27 Feb 2008 08:44:38 -0000	1.6
@@ -212,6 +212,13 @@
     var $owner;
 
     /**
+     * The common name (CN) of the owner
+     *
+     * @var string
+     */
+    var $cn = '';
+
+    /**
      * The homeserver for that folder
      *
      * @var string
@@ -446,6 +453,9 @@
         if ($uinfo) {
             if (!empty($uinfo['MAIL'])) {
                 $this->owner = $uinfo['MAIL'];
+            }
+            if (!empty($uinfo['CN'])) {
+                $this->cn = $uinfo['CN'];  
             }
             if (!empty($uinfo['HOMESERVER'])) {
                 $this->homeserver = $uinfo['HOMESERVER'];  



From cvs at kolab.org  Thu Feb 28 12:11:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 28 Feb 2008 12:11:48 +0100 (CET)
Subject: gunnar: server/horde external-horde.sh,1.7,1.8 
Message-ID: <20080228111148.1D6CE600D61@lists.intevation.de>

Author: gunnar

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

Modified Files:
	external-horde.sh 
Log Message:
kolab/issue2495

Index: external-horde.sh
===================================================================
RCS file: /kolabrepository/server/horde/external-horde.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- external-horde.sh	1 Dec 2007 07:00:12 -0000	1.7
+++ external-horde.sh	28 Feb 2008 11:11:45 -0000	1.8
@@ -2,14 +2,16 @@
 
 # The package versions we will be using
 
-HORDE_PKG=horde-3.2-rc1
-IMP_PKG=imp-h3-4.2-rc1
-INGO_PKG=ingo-h3-1.2-rc1
+HORDE_PKG=horde-3.2-rc2
+IMP_PKG=imp-h3-4.2-rc2
+DIMP_PKG=dimp-h3-1.0-rc2
+MIMP_PKG=mimp-h3-1.1-rc1
+INGO_PKG=ingo-h3-1.2-rc2
 PASSWD_PKG=passwd-h3-3.0.1
-KRONOLITH_PKG=kronolith-h3-2.2-rc1
-MNEMO_PKG=mnemo-h3-2.2-rc1
-NAG_PKG=nag-h3-2.2-rc1
-TURBA_PKG=turba-h3-2.2-rc1
+KRONOLITH_PKG=kronolith-h3-2.2-rc2
+MNEMO_PKG=mnemo-h3-2.2-rc2
+NAG_PKG=nag-h3-2.2-rc2
+TURBA_PKG=turba-h3-2.2-rc3
 
 
 # The patches we will be using
@@ -52,6 +54,8 @@
 
 wget ftp://ftp.horde.org/pub/horde/${HORDE_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/imp/${IMP_PKG}.tar.gz
+wget ftp://ftp.horde.org/pub/dimp/${DIMP_PKG}.tar.gz
+wget ftp://ftp.horde.org/pub/mimp/${MIMP_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/ingo/${INGO_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/passwd/${PASSWD_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/kronolith/${KRONOLITH_PKG}.tar.gz
@@ -64,6 +68,8 @@
 
 tar xfz ${HORDE_PKG}.tar.gz
 tar xfz ${IMP_PKG}.tar.gz
+tar xfz ${DIMP_PKG}.tar.gz
+tar xfz ${MIMP_PKG}.tar.gz
 tar xfz ${INGO_PKG}.tar.gz
 tar xfz ${PASSWD_PKG}.tar.gz
 tar xfz ${KRONOLITH_PKG}.tar.gz
@@ -76,6 +82,8 @@
 
 mv ${HORDE_PKG} horde
 mv ${IMP_PKG} horde/imp
+mv ${DIMP_PKG} horde/dimp
+mv ${MIMP_PKG} horde/mimp
 mv ${INGO_PKG} horde/ingo
 mv ${PASSWD_PKG} horde/passwd
 mv ${KRONOLITH_PKG} horde/kronolith



From cvs at kolab.org  Thu Feb 28 12:11:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 28 Feb 2008 12:11:48 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter/Filter Resource.php,1.7,1.8 
Message-ID: <20080228111148.22B98600D64@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv5931/php-kolab/Kolab_Filter/Filter

Modified Files:
	Resource.php 
Log Message:
kolab/issue2495

Index: Resource.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Resource.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Resource.php	26 Feb 2008 21:37:45 -0000	1.7
+++ Resource.php	28 Feb 2008 11:11:46 -0000	1.8
@@ -41,12 +41,12 @@
 require_once 'Horde/MIME/Structure.php';
 
 require_once 'Horde/String.php';
-String::setDefaultCharset('UTF-8');
+String::setDefaultCharset('utf-8');
 
 // Required to be able to use the old Horde framework
 function wrap($text) 
 {
-    return String::wrap($text, 76, "\n");
+    return String::wrap($text, 76, "\n", 'utf-8');
 }
 
 // What actions we can take when receiving an event request
@@ -1477,6 +1477,11 @@
                               __FILE__, __LINE__, PEAR_LOG_ERR);
             $deleted_messages = array();
         }
+
+        /* Ensure that $summary is single byte here, else we get
+         * problems with sprintf()
+         */
+        $summary = String::convertCharset($summary, 'utf-8', 'iso-8859-1');
         if (empty($deleted_messages)) {
             Horde::logMessage(sprintf(_("Canceled event %s is not present in %s's calendar"),
                                       $sid, $resource),
@@ -1487,6 +1492,10 @@
             $body = sprintf(_("The following event has been successfully removed:\r\n\r\n%s"), $summary);
             $subject = sprintf(_("%s has been cancelled"), $summary);
         }
+        
+        /* Switch back to utf-8 */
+        $body = String::convertCharset($body, 'iso-8859-1');
+        $subject = String::convertCharset($subject, 'iso-8859-1');
 
         if (!is_array($deleted_messages)) {
             $deleted_messages = array($deleted_messages);
@@ -1496,7 +1505,7 @@
                                   $organiser),
                           __FILE__, __LINE__, PEAR_LOG_WARNING);
 
-        $body = &new MIME_Part('text/plain', wrap($body));
+        $body = &new MIME_Part('text/plain', wrap($body), 'utf-8');
         $mime = &MIME_Message::convertMimePart($body);
         $mime->setTransferEncoding('quoted-printable');
         $mime->transferEncodeContents();
@@ -1521,9 +1530,9 @@
 
         $msg = $mime->toString();
         if (is_object($msg_headers)) {
-            $headerArray = $mime->encode($msg_headers->toArray(), $mime->getCharset());
+            $headerArray = $mime->encode($msg_headers->toArray(), 'UTF-8');
         } else {
-            $headerArray = $mime->encode($msg_headers, $mime->getCharset());
+            $headerArray = $mime->encode($msg_headers, 'UTF-8');
         }
 
         /* Make sure the message has a trailing newline. */



From cvs at kolab.org  Thu Feb 28 12:11:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 28 Feb 2008 12:11:48 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Filter ChangeLog,1.15,1.16 
Message-ID: <20080228111148.24382600D68@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv5931/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
kolab/issue2495

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog	27 Feb 2008 07:09:56 -0000	1.15
+++ ChangeLog	28 Feb 2008 11:11:46 -0000	1.16
@@ -1,3 +1,9 @@
+2008-02-28  Gunnar Wrobel  <p at rdus.de>
+
+	* Filter/Resource.php: Fix wrapping and response generation.
+	kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.)
+	https://www.intevation.de/roundup/kolab/issue2495
+
 2008-02-27  Gunnar Wrobel  <p at rdus.de>
 
 	* tests/forged_vacation_msg.phpt: Add a test for kolab/issue1272



From cvs at kolab.org  Thu Feb 28 22:18:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 28 Feb 2008 22:18:51 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.87,
	1.88 Makefile.am, 1.47, 1.48 
Message-ID: <20080228211851.F238A600D79@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
move the url of the services page from services to settings.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- ChangeLog	23 Feb 2008 20:19:11 -0000	1.87
+++ ChangeLog	28 Feb 2008 21:18:49 -0000	1.88
@@ -1,5 +1,10 @@
 2008-02-23 Richard Bos <richard at radoeka.nl>
 
+	* Makefile.am, php/admin/include/menu.php: move the url of the services
+	  page from services to settings.
+
+2008-02-23 Richard Bos <richard at radoeka.nl>
+
 	* php/admin/include/menu.php: Fixed untranslated string Addressbook
 	* Makefile.am, php/admin/include/auth.class.php.in,
 	  php/admin/include/headers.php.in, php/admin/templates/page.tpl.in,

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile.am	23 Feb 2008 20:19:11 -0000	1.47
+++ Makefile.am	28 Feb 2008 21:18:49 -0000	1.48
@@ -83,7 +83,7 @@
 wspicsdir = $(wskolabdir)/pics
 dist_wspics_DATA = $(WSPICS_FILES)
 
-wsservicedir = $(wskolabdir)/service
+wsservicedir = $(wskolabdir)/settings
 wsservice_DATA = www/admin/service/index.php
 
 WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \



From cvs at kolab.org  Thu Feb 28 22:18:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 28 Feb 2008 22:18:52 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	menu.php, 1.20, 1.21 
Message-ID: <20080228211852.01F7B600D7B@lists.intevation.de>

Author: richard

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

Modified Files:
	menu.php 
Log Message:
move the url of the services page from services to settings.



Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- menu.php	23 Feb 2008 14:01:10 -0000	1.20
+++ menu.php	28 Feb 2008 21:18:49 -0000	1.21
@@ -104,7 +104,7 @@
 }
 if( $auth->group() == 'admin' ) {
   $menuitems['service'] = array( 'name' => _('Settings').' ',
-								 'url'  => $topdir.'/service/',
+								 'url'  => $topdir.'/settings/',
 								 'title' => _('System Settings') );
 }
 



From cvs at kolab.org  Mon Mar  3 09:33:37 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  3 Mar 2008 09:33:37 +0100 (CET)
Subject: gunnar: server/horde external-horde.sh,1.8,1.9 
Message-ID: <20080303083337.AB137600D5F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	external-horde.sh 
Log Message:
Revert to rc1 since we'll probably skip directly ahead to 3.2

Index: external-horde.sh
===================================================================
RCS file: /kolabrepository/server/horde/external-horde.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- external-horde.sh	28 Feb 2008 11:11:45 -0000	1.8
+++ external-horde.sh	3 Mar 2008 08:33:35 -0000	1.9
@@ -2,16 +2,14 @@
 
 # The package versions we will be using
 
-HORDE_PKG=horde-3.2-rc2
-IMP_PKG=imp-h3-4.2-rc2
-DIMP_PKG=dimp-h3-1.0-rc2
-MIMP_PKG=mimp-h3-1.1-rc1
-INGO_PKG=ingo-h3-1.2-rc2
+HORDE_PKG=horde-3.2-rc1
+IMP_PKG=imp-h3-4.2-rc1
+INGO_PKG=ingo-h3-1.2-rc1
 PASSWD_PKG=passwd-h3-3.0.1
-KRONOLITH_PKG=kronolith-h3-2.2-rc2
-MNEMO_PKG=mnemo-h3-2.2-rc2
-NAG_PKG=nag-h3-2.2-rc2
-TURBA_PKG=turba-h3-2.2-rc3
+KRONOLITH_PKG=kronolith-h3-2.2-rc1
+MNEMO_PKG=mnemo-h3-2.2-rc1
+NAG_PKG=nag-h3-2.2-rc1
+TURBA_PKG=turba-h3-2.2-rc1
 
 
 # The patches we will be using
@@ -54,8 +52,6 @@
 
 wget ftp://ftp.horde.org/pub/horde/${HORDE_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/imp/${IMP_PKG}.tar.gz
-wget ftp://ftp.horde.org/pub/dimp/${DIMP_PKG}.tar.gz
-wget ftp://ftp.horde.org/pub/mimp/${MIMP_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/ingo/${INGO_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/passwd/${PASSWD_PKG}.tar.gz
 wget ftp://ftp.horde.org/pub/kronolith/${KRONOLITH_PKG}.tar.gz
@@ -68,8 +64,6 @@
 
 tar xfz ${HORDE_PKG}.tar.gz
 tar xfz ${IMP_PKG}.tar.gz
-tar xfz ${DIMP_PKG}.tar.gz
-tar xfz ${MIMP_PKG}.tar.gz
 tar xfz ${INGO_PKG}.tar.gz
 tar xfz ${PASSWD_PKG}.tar.gz
 tar xfz ${KRONOLITH_PKG}.tar.gz
@@ -82,8 +76,6 @@
 
 mv ${HORDE_PKG} horde
 mv ${IMP_PKG} horde/imp
-mv ${DIMP_PKG} horde/dimp
-mv ${MIMP_PKG} horde/mimp
 mv ${INGO_PKG} horde/ingo
 mv ${PASSWD_PKG} horde/passwd
 mv ${KRONOLITH_PKG} horde/kronolith



From cvs at kolab.org  Mon Mar  3 15:48:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  3 Mar 2008 15:48:27 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy ChangeLog,1.13,1.14 
Message-ID: <20080303144827.9075A600174@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv1011/php-kolab/Kolab_Freebusy

Modified Files:
	ChangeLog 
Log Message:
Fix the CN attribute handling. This requires Horde CVS

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	27 Feb 2008 08:44:38 -0000	1.13
+++ ChangeLog	3 Mar 2008 14:48:25 -0000	1.14
@@ -1,3 +1,8 @@
+2008-03-03  Gunnar Wrobel  <p at rdus.de>
+
+	* Freebusy/Cache.php: Fix the CN attribute handling. This requires Horde
+	CVS.
+
 2008-02-27  Gunnar Wrobel  <p at rdus.de>
 
 	* Freebusy/Cache.php: Add the CN attribute if available.



From cvs at kolab.org  Mon Mar  3 15:48:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  3 Mar 2008 15:48:27 +0100 (CET)
Subject: gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php,1.8,1.9 
Message-ID: <20080303144827.92BD4600D71@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv1011/php-kolab/Kolab_Freebusy/Freebusy

Modified Files:
	Cache.php 
Log Message:
Fix the CN attribute handling. This requires Horde CVS

Index: Cache.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Cache.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Cache.php	27 Feb 2008 08:44:38 -0000	1.8
+++ Cache.php	3 Mar 2008 14:48:25 -0000	1.9
@@ -58,7 +58,7 @@
         }
 
         $vCal = $fb->generate(null, null, $access->fbpast, $access->fbfuture,
-                              $access->owner);
+                              $access->owner, $access->cn);
         if (is_a($vCal, 'PEAR_Error')) {
             $vCal;
         }
@@ -193,10 +193,11 @@
         
         // Create new vFreebusy.
         $vFb = &Horde_iCalendar::newComponent('vfreebusy', $vCal);
+        $params = array();
         if ($access->cn) {
-            $cn = ';CN="' $access->cn . '":';
+            $params['cn'] = $access->cn;
         }
-        $vFb->setAttribute('ORGANIZER', $cn . 'MAILTO:' . $access->owner);
+        $vFb->setAttribute('ORGANIZER', 'MAILTO:' . $access->owner, $params);
         
         $vFb->setAttribute('DTSTAMP', time());
         $vFb->setAttribute('URL', 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);



From cvs at kolab.org  Mon Mar  3 19:49:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  3 Mar 2008 19:49:52 +0100 (CET)
Subject: thomas: server release-notes.txt,1.218,1.219 
Message-ID: <20080303184952.A1B52600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- release-notes.txt	26 Feb 2008 21:37:45 -0000	1.218
+++ release-notes.txt	3 Mar 2008 18:49:50 -0000	1.219
@@ -46,6 +46,10 @@
 
 Changes between 2.2-rc-1 and 2.2-rc-2
 
+    - kolabconf-2.2.rc2-2008????
+
+	kolab/issue1550 (Masquerade problem)
+
     - kolabd-2.1.99-2008????
 
 	kolabdcachetool: Fix location of graveyard caches.



From cvs at kolab.org  Mon Mar  3 19:56:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  3 Mar 2008 19:56:52 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog, 1.149, 1.150 kolab.conf, 1.3,
	1.4 kolab.globals.in, 1.10, 1.11 
Message-ID: <20080303185652.690DF600D59@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog kolab.conf kolab.globals.in 
Log Message:
moved default entry for syslog_facility to kolab.globals (see kolab/issue2446)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- ChangeLog	23 Feb 2008 20:19:18 -0000	1.149
+++ ChangeLog	3 Mar 2008 18:56:50 -0000	1.150
@@ -1,3 +1,8 @@
+2008-03-03  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* kolab.conf, kolab.globals.in: moved default entry for
+	syslog_facility to kolab.globals (see kolab/issue2446)
+
 2008-02-23 Richard Bos <richard at radoeka.nl>
 	* kolab_bootstrap.in, templates/httpd.conf.template.in,
 	  dist_conf/common, dist_conf/centos-clarkconnect,

Index: kolab.conf
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.conf	26 Feb 2008 06:04:00 -0000	1.3
+++ kolab.conf	3 Mar 2008 18:56:50 -0000	1.4
@@ -10,6 +10,5 @@
 ldap_master_uri : @@@ldap_master_uri@@@
 php_dn : cn=nobody,@@@kolab_basedn@@@
 php_pw : @@@nobody_pw@@@
-syslog_facility : user
 slurpd_addr : 127.0.0.1
 slurpd_port : 9999

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab.globals.in	28 Nov 2007 12:45:32 -0000	1.10
+++ kolab.globals.in	3 Mar 2008 18:56:50 -0000	1.11
@@ -47,3 +47,4 @@
 bind_any : TRUE
 bind_addr : 0.0.0.0
 calendar_id : calendar
+syslog_facility : user



From cvs at kolab.org  Mon Mar  3 19:57:31 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon,  3 Mar 2008 19:57:31 +0100 (CET)
Subject: thomas: server release-notes.txt,1.219,1.220 
Message-ID: <20080303185731.E5BBC600D5D@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- release-notes.txt	3 Mar 2008 18:49:50 -0000	1.219
+++ release-notes.txt	3 Mar 2008 18:57:29 -0000	1.220
@@ -49,12 +49,14 @@
     - kolabconf-2.2.rc2-2008????
 
 	kolab/issue1550 (Masquerade problem)
+	kolab/issue2446 (Make the used syslog facility configureable)
 
     - kolabd-2.1.99-2008????
 
 	kolabdcachetool: Fix location of graveyard caches.
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
+	kolab/issue2446 (Make the used syslog facility configureable)
 	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
 
     - kolab-freebusy-2.2.rc2-2008????



From cvs at kolab.org  Tue Mar  4 15:51:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 Mar 2008 15:51:05 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/include
	menu.php, 1.21, 1.22 
Message-ID: <20080304145105.CA5B1600D6D@lists.intevation.de>

Author: thomas

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

Modified Files:
	menu.php 
Log Message:
kolab-webadmin: Reverted extra spaces after the main menu entries.
This does not look good.

cvs diff -u -d -r1.17 -r1.20 kolab-webadmin/kolab-webadmin/php/admin/include/menu.php|patch -s -p0 -R
(and fix reject because of services now named settings)


Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- menu.php	28 Feb 2008 21:18:49 -0000	1.21
+++ menu.php	4 Mar 2008 14:51:03 -0000	1.22
@@ -23,7 +23,7 @@
 $menuitems = array();
 
 if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer' ) {
-  $menuitems['user'] = array( 'name' => _('Users').' ',
+  $menuitems['user'] = array( 'name' => _('Users'),
 							  'url'  => $topdir.'/user/',
 							  'title' => _('Manage Email Users'),
 							  'submenu' => array( 
@@ -42,7 +42,7 @@
 														'url'  => 'vacation.php' )));
 }
 if( $auth->group() == "admin" || $auth->group() == "maintainer") {
-  $menuitems['addressbook'] = array( 'name' => _('Addressbook').' ',
+  $menuitems['addressbook'] = array( 'name' => _('Addressbook'),
 									 'url'  => $topdir.'/addressbook/',
 									 'title' => _('Manage Address Book'),
 									 'submenu' => array( 
@@ -51,7 +51,7 @@
 
 }
 if( $auth->group() == "admin" || $auth->group() == "maintainer" || $auth->group() == 'domain-maintainer') {
-  $menuitems['sf'] = array( 'name' => _('Shared Folder').' ',
+  $menuitems['sf'] = array( 'name' => _('Shared Folder'),
 							'url'  => $topdir.'/sharedfolder/',
 							'title' => _('Manage Shared Folders'),
 							'submenu' => array( 
@@ -59,7 +59,7 @@
 													  'url' => 'sf.php?action=create' )));  
 }
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
-  $menuitems['distlist'] = array( 'name' => _('Distribution Lists').' ',
+  $menuitems['distlist'] = array( 'name' => _('Distribution Lists'),
 									   'url'  => $topdir.'/distributionlist/',
 									   'title' => _('Manage Distribution Lists'),
 									   'submenu' => array(
@@ -67,19 +67,19 @@
    															 'url'   => 'list.php?action=create' ) ) );
 }
 if( $auth->group() == 'admin' ) {
-  $menuitems['administrator'] = array( 'name' => _('Administrators').' ',
+  $menuitems['administrator'] = array( 'name' => _('Administrators'),
 									   'url'  => $topdir.'/administrator/',
 									   'title' => _('Manage Administrators'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New Administrator'),
 																 'url'   => 'admin.php?action=create' ) ) );
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
 									   'url'  => $topdir.'/domainmaintainer/',
 									   'title' => _('Manage Domain Maintainers'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New Domain Maintainer'),
 																 'url'   => 'domainmaintainer.php?action=create' ) ) );
-  $menuitems['maintainer'] = array( 'name' => _('Maintainers').' ',
+  $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
 									'url'  => $topdir.'/maintainer/',
 									'title' => _('Manage Maintainers'),
 									'submenu' => array(
@@ -87,10 +87,10 @@
 															  'url'   => 'maintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'maintainer' ) {
   $mdn = $auth->dn();
-  $menuitems['maintainer'] = array( 'name' => _('Maintainers').' ',
+  $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
 									'url'  => $topdir.'/maintainer/maintainer.php?action=modify&dn='.urlencode($mdn),
 									'title' => _('Manage Maintainer') );  
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
 									   'url'  => $topdir.'/domainmaintainer/',
 									   'title' => _('Manage Domain Maintainers'),
 									   'submenu' => array(
@@ -98,12 +98,12 @@
 																 'url'   => 'domainmaintainer.php?action=create' ) ) );
 } else if( $auth->group() == 'domain-maintainer' ) {
   $mdn = $auth->dn();
-  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers').' ',
+  $menuitems['domain-maintainer'] = array( 'name' => _('Domain Maintainers'),
 									'url'  => $topdir.'/domainmaintainer/domainmaintainer.php?action=modify&dn='.urlencode($mdn),
 									'title' => _('Manage Domain Maintainer') );  
 }
 if( $auth->group() == 'admin' ) {
-  $menuitems['service'] = array( 'name' => _('Settings').' ',
+  $menuitems['service'] = array( 'name' => _('Settings'),
 								 'url'  => $topdir.'/settings/',
 								 'title' => _('System Settings') );
 }
@@ -112,19 +112,19 @@
 							 'url'  => $topdir.'/kolab/',
 							 'title' => _('About Kolab'),
 							 'submenu' => array( 
-												array( 'name' => _('Erfrakon').' ',
+												array( 'name' => _('Erfrakon'),
 													   'url'  => 'erfrakon.php' ),
-												array( 'name' => _('Intevation').' ',
+												array( 'name' => _('Intevation'),
 													   'url'  => 'intevation.php' ),
-												array( 'name' => _('Klar&auml;lvdalens Datakonsult').' ',
+												array( 'name' => _('Klar&auml;lvdalens Datakonsult'),
 													   'url'  => 'kdab.php' ),
 												array( 'name' => _('Code Fusion'),
 													   'url'  => 'codefusion.php' ),
-												array( 'name' => _('KDE').' ',
+												array( 'name' => _('KDE'),
 													   'url'  => 'kde.php' )
 												));
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' || $auth->group() == 'domain-maintainer') {
-  $menuitems['about']['submenu'][] = array( 'name' => _('Versions').' ',
+  $menuitems['about']['submenu'][] = array( 'name' => _('Versions'),
 											'url'  => 'versions.php' );
 }
 



From cvs at kolab.org  Tue Mar  4 15:51:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 Mar 2008 15:51:05 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.88,1.89 
Message-ID: <20080304145105.C814E600D64@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
kolab-webadmin: Reverted extra spaces after the main menu entries.
This does not look good.

cvs diff -u -d -r1.17 -r1.20 kolab-webadmin/kolab-webadmin/php/admin/include/menu.php|patch -s -p0 -R
(and fix reject because of services now named settings)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- ChangeLog	28 Feb 2008 21:18:49 -0000	1.88
+++ ChangeLog	4 Mar 2008 14:51:03 -0000	1.89
@@ -1,3 +1,8 @@
+2008-03-04  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* php/admin/include/menu.php: Reverted extra spaces after the main
+	menu entries added on 2008-02-16, because this does not look good.
+
 2008-02-23 Richard Bos <richard at radoeka.nl>
 
 	* Makefile.am, php/admin/include/menu.php: move the url of the services



From cvs at kolab.org  Tue Mar  4 19:12:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 Mar 2008 19:12:05 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/user
	user.php.in, 1.27, 1.28 
Message-ID: <20080304181205.3D88A600D52@lists.intevation.de>

Author: thomas

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

Modified Files:
	user.php.in 
Log Message:
Fix kolab/issue2329 (Domain Maintainer cannot create users)


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- user.php.in	3 Dec 2007 11:27:19 -0000	1.27
+++ user.php.in	4 Mar 2008 18:12:03 -0000	1.28
@@ -66,23 +66,23 @@
   if ($auth->group() == 'user') {
 	return false;
   }
-  
-  // we have a domain maintainer. Get his domains
-  $domains = $ldap->domainsForMaintainerDn($auth->dn());
 
-  // retrieve the mail for the current dn
-  $mail = $ldap->mailForDn($dn);
+  // we have a domain maintainer.
 
-  $ok = false;
+  // Before creating new users the DN is empty
+  if (!$dn) {
+	return true;
+  }
 
-  // Check if the mail is within that domain
+  // Check if the user's mail is within the domain maintainer's domains
+  $mail = $ldap->mailForDn($dn);
+  $domains = $ldap->domainsForMaintainerDn($auth->dn());
   foreach( $domains as $domain ) {
         if( endsWith( $mail, '@'.$domain ) ) {
-          $ok = true;
+          return true;
         }
   }
-
-  return true;
+  return false;
 }
 
 // Check that a uid is unique



From cvs at kolab.org  Tue Mar  4 19:12:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 Mar 2008 19:12:05 +0100 (CET)
Subject: thomas: server release-notes.txt,1.220,1.221 
Message-ID: <20080304181205.4F5C3600D65@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Fix kolab/issue2329 (Domain Maintainer cannot create users)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- release-notes.txt	3 Mar 2008 18:57:29 -0000	1.220
+++ release-notes.txt	4 Mar 2008 18:12:02 -0000	1.221
@@ -68,6 +68,7 @@
 	Corrections in the Dutch translation.
 
 	kolab/issue2203 (About Kolab does not list new server components)
+	kolab/issue2329 (Domain Maintainer cannot create users)
 	kolab/issue2437 (Change name of service tab to settings)
 
     - php-kolab-2.2.rc2-2008????



From cvs at kolab.org  Tue Mar  4 19:12:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue,  4 Mar 2008 19:12:05 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.89,1.90 
Message-ID: <20080304181205.3E588600D5A@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Fix kolab/issue2329 (Domain Maintainer cannot create users)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- ChangeLog	4 Mar 2008 14:51:03 -0000	1.89
+++ ChangeLog	4 Mar 2008 18:12:03 -0000	1.90
@@ -3,6 +3,9 @@
 	* php/admin/include/menu.php: Reverted extra spaces after the main
 	menu entries added on 2008-02-16, because this does not look good.
 
+	* www/admin/user/user.php.in: Fix kolab/issue2329 (Domain Maintainer
+	cannot create users)
+
 2008-02-23 Richard Bos <richard at radoeka.nl>
 
 	* Makefile.am, php/admin/include/menu.php: move the url of the services



From cvs at kolab.org  Wed Mar  5 18:13:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 18:13:17 +0100 (CET)
Subject: thomas: server release-notes.txt,1.221,1.222 
Message-ID: <20080305171317.4E6E8600D67@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Add postfix header_checks

Fixes kolab/issue2350 (Email from buggy Lotus notes client not accepted by
Cyrus) and filter some MUA headers to not allow receiving mails which are
already marked as read, flagged, etc.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- release-notes.txt	4 Mar 2008 18:12:02 -0000	1.221
+++ release-notes.txt	5 Mar 2008 17:13:14 -0000	1.222
@@ -56,6 +56,7 @@
 	kolabdcachetool: Fix location of graveyard caches.
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
+	kolab/issue2350 (Email from buggy Lotus notes client not accepted by Cyrus)
 	kolab/issue2446 (Make the used syslog facility configureable)
 	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
 



From cvs at kolab.org  Wed Mar  5 18:13:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 18:13:17 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog, 1.150, 1.151 Makefile.am, 1.38,
	1.39 
Message-ID: <20080305171317.4DA30600D5F@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Add postfix header_checks

Fixes kolab/issue2350 (Email from buggy Lotus notes client not accepted by
Cyrus) and filter some MUA headers to not allow receiving mails which are
already marked as read, flagged, etc.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- ChangeLog	3 Mar 2008 18:56:50 -0000	1.150
+++ ChangeLog	5 Mar 2008 17:13:15 -0000	1.151
@@ -1,3 +1,10 @@
+2008-03-05  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* templates/header_checks.template.in, templates/main.cf.template.in,
+	Makefile.am: Fix kolab/issue2350 (Email from buggy Lotus notes client
+	not accepted by Cyrus) and filter some MUA headers to not allow
+	receiving mails which are already marked as read, flagged, etc.
+
 2008-03-03  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* kolab.conf, kolab.globals.in: moved default entry for

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile.am	7 Feb 2008 11:00:28 -0000	1.38
+++ Makefile.am	5 Mar 2008 17:13:15 -0000	1.39
@@ -49,6 +49,7 @@
 	templates/fbview.conf.template \
 	templates/freebusy.conf.template \
 	templates/freshclam.conf.template \
+	templates/header_checks.template \
 	templates/httpd.conf.template \
 	templates/httpd.local.template \
 	templates/imapd.annotation_definitions.template \
@@ -503,6 +504,12 @@
 	$(do_subst) <$(srcdir)/templates/virtual.template.in >$@
 CLEANFILES += templates/virtual.template
 EXTRA_DIST += templates/virtual.template.in
+
+templates/header_checks.template: templates/header_checks.template.in
+	@$(mkinstalldirs) templates
+	$(do_subst) <$(srcdir)/templates/header_checks.template.in >$@
+CLEANFILES += templates/header_checks.template
+EXTRA_DIST += templates/header_checks.template.in
 
 templates/amavisd.conf.template: templates/amavisd.conf.template.in
 	@$(mkinstalldirs) templates



From cvs at kolab.org  Wed Mar  5 18:13:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 18:13:17 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates header_checks.template.in, NONE,
	1.1 main.cf.template.in, 1.18, 1.19 
Message-ID: <20080305171317.4E9CD600D6E@lists.intevation.de>

Author: thomas

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

Modified Files:
	main.cf.template.in 
Added Files:
	header_checks.template.in 
Log Message:
Add postfix header_checks

Fixes kolab/issue2350 (Email from buggy Lotus notes client not accepted by
Cyrus) and filter some MUA headers to not allow receiving mails which are
already marked as read, flagged, etc.


--- NEW FILE: header_checks.template.in ---
KOLAB_META_START
TARGET=@emailserver_confdir@/header_checks
PERMISSIONS=0640
OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
KOLAB_META_END
# this file is automatically written by the Kolab config backend
# manual additions are lost unless made to the template in the Kolab config
# directory
# The template is  @sysconfdir@/kolab/templates/header_checks.template

# Cyrus does not like empty Message-Id: headers, see kolab/issue2350
/^Message-Id:[[:space:]]*$/	IGNORE

# Do not allow receiving mails which are already marked as read, flagged, etc.
/^Status:/	IGNORE
/^X-Status:/	IGNORE
/^X-Label:/	IGNORE


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- main.cf.template.in	12 Dec 2007 14:38:49 -0000	1.18
+++ main.cf.template.in	5 Mar 2008 17:13:15 -0000	1.19
@@ -85,6 +85,13 @@
 # Don't parse and modify headers of message/rfc822 attachments
 disable_mime_input_processing = yes
 
+# enable header_checks (not for attachment headers):
+header_checks = regexp:@emailserver_confdir@/header_checks
+# disable_mime_input_processing = yes already implies that attachment headers
+# are not being checked, but just to be sure:
+mime_header_checks =
+nested_header_checks =
+
 ## only use local_transport or a higher recipent_limit if issue825 is fixed
 #   local delivery, not using postfix local(8)
 #local_transport = kolabmailboxfilter



From cvs at kolab.org  Wed Mar  5 18:14:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 18:14:38 +0100 (CET)
Subject: thomas: server release-notes.txt,1.222,1.223 
Message-ID: <20080305171438.BB5AF6012E1@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- release-notes.txt	5 Mar 2008 17:13:14 -0000	1.222
+++ release-notes.txt	5 Mar 2008 17:14:36 -0000	1.223
@@ -56,9 +56,11 @@
 	kolabdcachetool: Fix location of graveyard caches.
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
-	kolab/issue2350 (Email from buggy Lotus notes client not accepted by Cyrus)
+	kolab/issue2350 (Email from buggy Lotus notes client not accepted by
+	                 Cyrus)
 	kolab/issue2446 (Make the used syslog facility configureable)
-	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
+	kolab/issue2466 (How should Kolab Filter handle mails from privileged
+	                 networks?)
 
     - kolab-freebusy-2.2.rc2-2008????
 
@@ -74,12 +76,16 @@
 
     - php-kolab-2.2.rc2-2008????
 
-	kolab/issue1272 (From: header in vacation messages is marked as "Untrusted") 
+	kolab/issue1272 (From: header in vacation messages is marked as
+	                 "Untrusted")
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
-	kolab/issue2466 (How should Kolab Filter handle mails from privileged networks?)
+	kolab/issue2466 (How should Kolab Filter handle mails from privileged
+	                 networks?)
 	kolab/issue2467 (Kolab Filter ignores configuration in 2.2 RC1)
-	kolab/issue2487 (Incorrect variable name $fbfilename within Freebusy/Cache.php)
-	kolab/issue2495 (The reply to an invitation with umlauts of a group account doesn't display the umlauts.)
+	kolab/issue2487 (Incorrect variable name $fbfilename within
+	                 Freebusy/Cache.php)
+	kolab/issue2495 (The reply to an invitation with umlauts of a group
+	                 account doesn't display the umlauts.)
 
 
 Changes between 2.2-beta-3 and 2.2-rc-1



From cvs at kolab.org  Wed Mar  5 19:10:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 19:10:11 +0100 (CET)
Subject: thomas: server release-notes.txt,1.223,1.224 
Message-ID: <20080305181011.8213A60014F@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Fix kolab/issue2358 (mistmatch between cyrus-admins and cyrus-admin)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- release-notes.txt	5 Mar 2008 17:14:36 -0000	1.223
+++ release-notes.txt	5 Mar 2008 18:10:09 -0000	1.224
@@ -58,6 +58,7 @@
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2350 (Email from buggy Lotus notes client not accepted by
 	                 Cyrus)
+	kolab/issue2358 (mismatch between cyrus-admins and cyrus-admin)
 	kolab/issue2446 (Make the used syslog facility configureable)
 	kolab/issue2466 (How should Kolab Filter handle mails from privileged
 	                 networks?)
@@ -73,6 +74,10 @@
 	kolab/issue2203 (About Kolab does not list new server components)
 	kolab/issue2329 (Domain Maintainer cannot create users)
 	kolab/issue2437 (Change name of service tab to settings)
+
+    - perl-kolab-2.2.rc2-2008????
+
+	kolab/issue2358 (mismatch between cyrus-admins and cyrus-admin)
 
     - php-kolab-2.2.rc2-2008????
 



From cvs at kolab.org  Wed Mar  5 19:10:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 19:10:11 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog, 1.151, 1.152 kolab.globals.in,
	1.11, 1.12 
Message-ID: <20080305181011.88CDF600D5C@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog kolab.globals.in 
Log Message:
Fix kolab/issue2358 (mistmatch between cyrus-admins and cyrus-admin)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- ChangeLog	5 Mar 2008 17:13:15 -0000	1.151
+++ ChangeLog	5 Mar 2008 18:10:09 -0000	1.152
@@ -5,6 +5,9 @@
 	not accepted by Cyrus) and filter some MUA headers to not allow
 	receiving mails which are already marked as read, flagged, etc.
 
+	* kolab.globals.in, templates/imapd.conf.template.in:
+	Fix kolab/issue2358 (mistmatch between cyrus-admins and cyrus-admin)
+
 2008-03-03  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* kolab.conf, kolab.globals.in: moved default entry for

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolab.globals.in	3 Mar 2008 18:56:50 -0000	1.11
+++ kolab.globals.in	5 Mar 2008 18:10:09 -0000	1.12
@@ -1,4 +1,5 @@
 conn_refresh_period : 60
+cyrus-admin : manager
 cyrus-admins : manager
 cyrus-autocreatequota : 100000
 cyrus-imap : TRUE



From cvs at kolab.org  Wed Mar  5 19:10:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 19:10:11 +0100 (CET)
Subject: thomas: server/perl-kolab ChangeLog,1.30,1.31 
Message-ID: <20080305181011.90553600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Fix kolab/issue2358 (mistmatch between cyrus-admins and cyrus-admin)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	15 Feb 2008 08:52:20 -0000	1.30
+++ ChangeLog	5 Mar 2008 18:10:09 -0000	1.31
@@ -1,3 +1,8 @@
+2008-03-05  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* lib/Kolab.pm: Fix kolab/issue2358 (mistmatch between cyrus-admins
+	and cyrus-admin)
+
 2008-02-15  Sascha Wilde  <wilde at intevation.de>
 
 	* lib/Kolab/Cyrus.pm (create): Reverted last change. (It was



From cvs at kolab.org  Wed Mar  5 19:10:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 19:10:11 +0100 (CET)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.14,1.15 
Message-ID: <20080305181011.9485560014F@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Fix kolab/issue2358 (mistmatch between cyrus-admins and cyrus-admin)


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Kolab.pm	6 Feb 2008 14:09:32 -0000	1.14
+++ Kolab.pm	5 Mar 2008 18:10:09 -0000	1.15
@@ -252,7 +252,7 @@
     }
 
     # Cyrus admin account
-    $tempval = $config{'cyrus-admins'} || 'manager';
+    $tempval = $config{'cyrus-admin'} || 'manager';
     (my $cmanager, my $dummy) = split(/ /, $tempval, 2);
     $config{'cyrus_admin'} = $cmanager if (!exists $config{'cyrus_admin'});
     $config{'cyrus_admin_pw'} = $config{'bind_pw'} if (!exists $config{'cyrus_admin_pw'});



From cvs at kolab.org  Wed Mar  5 19:10:11 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed,  5 Mar 2008 19:10:11 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates imapd.conf.template.in, 1.14,
	1.15 
Message-ID: <20080305181011.8D30A600D67@lists.intevation.de>

Author: thomas

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

Modified Files:
	imapd.conf.template.in 
Log Message:
Fix kolab/issue2358 (mistmatch between cyrus-admins and cyrus-admin)


Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- imapd.conf.template.in	3 Oct 2007 10:05:18 -0000	1.14
+++ imapd.conf.template.in	5 Mar 2008 18:10:09 -0000	1.15
@@ -19,7 +19,7 @@
 partition-default:      @imap_spool@
 
 allowusermoves:         0
-admins:                 @@@cyrus-admins@@@
+admins:                 @@@cyrus-admins|join( )@@@
 sasl_pwcheck_method:    saslauthd
 sasl_mech_list: 	plain
 sendmail:               @sbindir@/sendmail



From cvs at kolab.org  Thu Mar  6 09:15:07 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 Mar 2008 09:15:07 +0100 (CET)
Subject: thomas: server release-notes.txt,1.224,1.225 
Message-ID: <20080306081507.6018F60014F@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Added clamav to release-notes.txt, because in RC phase every change should be documented.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- release-notes.txt	5 Mar 2008 18:10:09 -0000	1.224
+++ release-notes.txt	6 Mar 2008 08:15:05 -0000	1.225
@@ -46,6 +46,10 @@
 
 Changes between 2.2-rc-1 and 2.2-rc-2
 
+    - clamav-0.92.1-20080213
+
+	New upstream version, fixes various security issues.
+
     - kolabconf-2.2.rc2-2008????
 
 	kolab/issue1550 (Masquerade problem)



From cvs at kolab.org  Thu Mar  6 12:46:31 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 Mar 2008 12:46:31 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	ldap.class.php.in, NONE, 1.1 ldap.class.php, 1.31, NONE 
Message-ID: <20080306114631.D899360014F@lists.intevation.de>

Author: richard

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

Added Files:
	ldap.class.php.in 
Removed Files:
	ldap.class.php 
Log Message:
Reflect the change in location of the file session_vars, it moved from a
possible read readonly location to @sysconfdir@/kolab.



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

--- ldap.class.php DELETED ---



From cvs at kolab.org  Thu Mar  6 12:46:31 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 Mar 2008 12:46:31 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.90,
	1.91 Makefile.am, 1.48, 1.49 
Message-ID: <20080306114631.D9D96600D50@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Reflect the change in location of the file session_vars, it moved from a
possible read readonly location to @sysconfdir@/kolab.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- ChangeLog	4 Mar 2008 18:12:03 -0000	1.90
+++ ChangeLog	6 Mar 2008 11:46:29 -0000	1.91
@@ -1,3 +1,11 @@
+2008-03-06 Richard Bos <richard at radoeka.nl>
+
+	* kolab/issue2507
+	* php/admin/include/ldap.class.php: removed
+	* php/admin/include/ldap.class.php.in: added
+	* Makefile.am: reflect change in php/admin/include/ldap.class.php
+	  filename
+
 2008-03-04  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* php/admin/include/menu.php: Reverted extra spaces after the main

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Makefile.am	28 Feb 2008 21:18:49 -0000	1.48
+++ Makefile.am	6 Mar 2008 11:46:29 -0000	1.49
@@ -393,6 +393,12 @@
 CLEANFILES += php/admin/include/mysmarty.php
 EXTRA_DIST += php/admin/include/mysmarty.php.in
 
+php/admin/include/ldap.class.php: php/admin/include/ldap.class.php.in
+	@$(mkinstalldirs) php/admin/include
+	$(do_subst) <$(srcdir)/php/admin/include/ldap.class.php.in >$@
+CLEANFILES += php/admin/include/ldap.class.php
+EXTRA_DIST += php/admin/include/ldap.class.php.in
+
 php/admin/templates/page.tpl: php/admin/templates/page.tpl.in
 	@$(mkinstalldirs) php/admin/templates
 	$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@



From cvs at kolab.org  Thu Mar  6 12:47:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 Mar 2008 12:47:56 +0100 (CET)
Subject: richard: server/kolabd/kolabd/templates session_vars.php.template.in,
	1.5, 1.6 
Message-ID: <20080306114756.2B76D600D56@lists.intevation.de>

Author: richard

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

Modified Files:
	session_vars.php.template.in 
Log Message:
changed TARGET path from a possible readonly location to @sysconfdir@/kolab



Index: session_vars.php.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- session_vars.php.template.in	17 May 2006 22:12:56 -0000	1.5
+++ session_vars.php.template.in	6 Mar 2008 11:47:54 -0000	1.6
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@phplibdir2@/@kolab_php_module_prefix at admin/include/session_vars.php
+TARGET=@sysconfdir@/kolab/session_vars.php
 PERMISSIONS=0640
 OWNERSHIP=@webserver_musr@:@kolab_grp@
 KOLAB_META_END



From cvs at kolab.org  Thu Mar  6 12:47:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 Mar 2008 12:47:56 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.152,1.153 
Message-ID: <20080306114756.23E89600D50@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
changed TARGET path from a possible readonly location to @sysconfdir@/kolab



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- ChangeLog	5 Mar 2008 18:10:09 -0000	1.152
+++ ChangeLog	6 Mar 2008 11:47:54 -0000	1.153
@@ -1,3 +1,9 @@
+2008-03-06 Richard Bos <richard at radoeka.nl>
+
+	* kolab/issue2507
+	* templates/session_vars.php.template.in: changed TARGET path from
+	  a possible readonly location to @sysconfdir@/kolab
+
 2008-03-05  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* templates/header_checks.template.in, templates/main.cf.template.in,



From cvs at kolab.org  Thu Mar  6 13:13:14 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 Mar 2008 13:13:14 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin configure.ac, 1.26,
	1.27 ChangeLog, 1.91, 1.92 
Message-ID: <20080306121314.DFA24600D50@lists.intevation.de>

Author: richard

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

Modified Files:
	configure.ac ChangeLog 
Log Message:
reflect change in php/admin/include/ldap.class.php filename



Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- configure.ac	17 Jul 2007 15:07:15 -0000	1.26
+++ configure.ac	6 Mar 2008 12:13:12 -0000	1.27
@@ -2,7 +2,7 @@
 
 m4_define(_VERSION,2.1.99)
 AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
-AC_CONFIG_SRCDIR(php/admin/include/ldap.class.php)
+AC_CONFIG_SRCDIR(php/admin/include/ldap.class.php.in)
 AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2] [no-dist-gzip])

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- ChangeLog	6 Mar 2008 11:46:29 -0000	1.91
+++ ChangeLog	6 Mar 2008 12:13:12 -0000	1.92
@@ -3,8 +3,8 @@
 	* kolab/issue2507
 	* php/admin/include/ldap.class.php: removed
 	* php/admin/include/ldap.class.php.in: added
-	* Makefile.am: reflect change in php/admin/include/ldap.class.php
-	  filename
+	* Makefile.am, configure.ac: reflect change in
+	  php/admin/include/ldap.class.php filename
 
 2008-03-04  Thomas Arendsen Hein <thomas at intevation.de>
 



From cvs at kolab.org  Thu Mar  6 14:40:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu,  6 Mar 2008 14:40:17 +0100 (CET)
Subject: thomas: server release-notes.txt,1.225,1.226 
Message-ID: <20080306134017.3BDA8600D50@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- release-notes.txt	6 Mar 2008 08:15:05 -0000	1.225
+++ release-notes.txt	6 Mar 2008 13:40:15 -0000	1.226
@@ -66,6 +66,7 @@
 	kolab/issue2446 (Make the used syslog facility configureable)
 	kolab/issue2466 (How should Kolab Filter handle mails from privileged
 	                 networks?)
+	kolab/issue2507 (move session_vars.php to sysconfig directory)
 
     - kolab-freebusy-2.2.rc2-2008????
 
@@ -78,6 +79,7 @@
 	kolab/issue2203 (About Kolab does not list new server components)
 	kolab/issue2329 (Domain Maintainer cannot create users)
 	kolab/issue2437 (Change name of service tab to settings)
+	kolab/issue2507 (move session_vars.php to sysconfig directory)
 
     - perl-kolab-2.2.rc2-2008????
 



From cvs at kolab.org  Fri Mar  7 09:46:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 09:46:21 +0100 (CET)
Subject: gunnar: server/horde/horde-framework
	HK-GW-freebusy_error_handling.patch, NONE, 1.1 ChangeLog, 1.12,
	1.13 horde-framework-kolab.spec, 1.33, 1.34 
Message-ID: <20080307084621.21684600D70@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv13337/horde/horde-framework

Modified Files:
	ChangeLog horde-framework-kolab.spec 
Added Files:
	HK-GW-freebusy_error_handling.patch 
Log Message:
kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)

--- NEW FILE: HK-GW-freebusy_error_handling.patch ---
diff -r eb2b13655acf framework/Kolab/Kolab/Freebusy.php
--- a/framework/Kolab/Kolab/Freebusy.php	Fri Mar 07 07:09:54 2008 +0100
+++ b/framework/Kolab/Kolab/Freebusy.php	Fri Mar 07 07:10:00 2008 +0100
@@ -135,6 +135,10 @@ class Horde_Kolab_Freebusy {
         $events = array();
         
         $objects = $this->_store->getObjects();
+        if (is_a($objects, 'PEAR_Error')) {
+            return $objects;
+        }
+
         foreach($objects as $object) {
             $events[] = &new Kolab_Event($object);
         }
@@ -169,13 +173,16 @@ class Horde_Kolab_Freebusy {
                     $next->mday++;
                     $next = $event->recurrence->nextRecurrence($next);
                 }
-                $duration = $next->timestamp() - $event->start->timestamp();
-                $next_end = &new Horde_Date($event->end->timestamp() + $duration);
-
-                if ($next !== false && 
-                    (!(($endDate->compareDateTime($next) < 0) || 
-                       ($startDate->compareDateTime($next_end) > 0)))) {
-                    $result[] = $event;
+
+                if ($next !== false) {
+                    $duration = $next->timestamp() - $event->start->timestamp();
+                    $next_end = &new Horde_Date($event->end->timestamp() + $duration);
+
+                    if ((!(($endDate->compareDateTime($next) < 0) || 
+                           ($startDate->compareDateTime($next_end) > 0)))) {
+                        $result[] = $event;
+                    }
+                    
                 }
             }
         }
@@ -311,6 +318,10 @@ class Horde_Kolab_Freebusy {
         $startDate = new Horde_Date($startstamp);
         $endDate = new Horde_Date($endstamp);
         $events = $this->listEvents($startDate, $endDate);
+        if (is_a($events, 'PEAR_Error')) {
+            return $events;
+        }
+
         if (empty($events)) {
             return $events;
         }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.12
+++ ChangeLog	7 Mar 2008 08:46:19 -0000	1.13
@@ -1,3 +1,10 @@
+2008-03-07  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-framework-kolab.spec:
+
+	kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
+	https://www.intevation.de/roundup/kolab/issue2521
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-framework-kolab.spec: Update to RC1

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- horde-framework-kolab.spec	30 Nov 2007 15:24:48 -0000	1.33
+++ horde-framework-kolab.spec	7 Mar 2008 08:46:19 -0000	1.34
@@ -28,6 +28,7 @@
 
 Patch0:         HK-GW-Fix_Prefs_for_Ingo.patch
 Patch1:         HK-GW-Fbview_xfb_concept.patch
+Patch2:         HK-GW-freebusy_error_handling.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -51,6 +52,7 @@
 	%setup -n framework
 	%patch -p2 -P 0
 	%patch -p2 -P 1
+	%patch -p2 -P 2
 
 %build
 



From cvs at kolab.org  Fri Mar  7 09:46:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 09:46:21 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.226,1.227 
Message-ID: <20080307084621.20193600D6F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- release-notes.txt	6 Mar 2008 13:40:15 -0000	1.226
+++ release-notes.txt	7 Mar 2008 08:46:18 -0000	1.227
@@ -98,6 +98,9 @@
 	kolab/issue2495 (The reply to an invitation with umlauts of a group
 	                 account doesn't display the umlauts.)
 
+    - horde-framework-kolab-3.2_rc1-2008????
+
+	kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
 
 Changes between 2.2-beta-3 and 2.2-rc-1
 



From cvs at kolab.org  Fri Mar  7 15:46:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 15:46:51 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.31,1.32 
Message-ID: <20080307144651.3E6A4600D67@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
kolab/issue2478 (kolabd memory leak)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	5 Mar 2008 18:10:09 -0000	1.31
+++ ChangeLog	7 Mar 2008 14:46:48 -0000	1.32
@@ -1,3 +1,9 @@
+2008-03-07  Gunnar Wrobel  <p at rdus.de>
+
+	* lib/Kolab/LDAP/Backend/slurpd.pm (run):
+
+	kolab/issue2478 (kolabd memory leak)
+
 2008-03-05  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* lib/Kolab.pm: Fix kolab/issue2358 (mistmatch between cyrus-admins



From cvs at kolab.org  Fri Mar  7 15:46:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 15:46:51 +0100 (CET)
Subject: gunnar: server/perl-kolab/lib/Kolab/LDAP/Backend slurpd.pm,1.1,1.2 
Message-ID: <20080307144651.3F6CC600D6A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	slurpd.pm 
Log Message:
kolab/issue2478 (kolabd memory leak)

Index: slurpd.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend/slurpd.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- slurpd.pm	1 Aug 2007 14:57:42 -0000	1.1
+++ slurpd.pm	7 Mar 2008 14:46:48 -0000	1.2
@@ -278,7 +278,15 @@
 		if( !($select->can_read(1)) ) {
 		  $changes = 0;
 		  Kolab::log('SD', 'Change detected w/ no pending LDAP messages; reloading services if needed');
-		  Kolab::LDAP::sync;
+                  my $kidpid = fork();
+		  unless (defined $kidpid) {
+		      die("can't fork: $!");
+		  }
+		  if ($kidpid == 0 ) {
+		      # child
+		      Kolab::LDAP::sync;
+		      exit(0);
+		  }
 		  Kolab::log('SD', "Running $Kolab::config{'kolabconf_script'}");
 		  system($Kolab::config{'kolabconf_script'}) == 0
 		    or Kolab::log('SD', "Failed to run $Kolab::config{'kolabconf_script'}: $?", KOLAB_ERROR);



From cvs at kolab.org  Fri Mar  7 15:46:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 15:46:51 +0100 (CET)
Subject: gunnar: server release-notes.txt,1.227,1.228 
Message-ID: <20080307144651.3C5E2600D5F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	release-notes.txt 
Log Message:
kolab/issue2478 (kolabd memory leak)

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- release-notes.txt	7 Mar 2008 08:46:18 -0000	1.227
+++ release-notes.txt	7 Mar 2008 14:46:48 -0000	1.228
@@ -84,6 +84,7 @@
     - perl-kolab-2.2.rc2-2008????
 
 	kolab/issue2358 (mismatch between cyrus-admins and cyrus-admin)
+	kolab/issue2478 (kolabd memory leak)
 
     - php-kolab-2.2.rc2-2008????
 



From cvs at kolab.org  Fri Mar  7 17:35:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 17:35:04 +0100 (CET)
Subject: thomas: server release-notes.txt,1.228,1.229 
Message-ID: <20080307163504.55B28600D57@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Enforce SSL for horde


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- release-notes.txt	7 Mar 2008 14:46:48 -0000	1.228
+++ release-notes.txt	7 Mar 2008 16:35:02 -0000	1.229
@@ -59,6 +59,8 @@
 
 	kolabdcachetool: Fix location of graveyard caches.
 
+	Enforce SSL for horde.
+
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2350 (Email from buggy Lotus notes client not accepted by
 	                 Cyrus)



From cvs at kolab.org  Fri Mar  7 17:35:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 17:35:04 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates httpd.conf.template.in, 1.23,
	1.24 
Message-ID: <20080307163504.71081600D57@lists.intevation.de>

Author: thomas

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Enforce SSL for horde


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- httpd.conf.template.in	23 Feb 2008 20:19:19 -0000	1.23
+++ httpd.conf.template.in	7 Mar 2008 16:35:02 -0000	1.24
@@ -144,6 +144,9 @@
 <Location @webserver_web_prefix@/>
   ErrorDocument 403 https://@@@fqdnhostname@@@@kolab_wui@/
 </Location>
+<Location "@webserver_web_prefix@/horde">
+    ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/horde/
+</Location>
 <Location "@webserver_web_prefix@/fbview">
     ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/
 </Location>
@@ -191,6 +194,9 @@
 </Directory>
 
 <Location /admin>
+	SSLRequireSSL
+</Location>
+<Location /horde>
 	SSLRequireSSL
 </Location>
 @@@if apache-http@@@



From cvs at kolab.org  Fri Mar  7 17:35:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 17:35:04 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.153,1.154 
Message-ID: <20080307163504.5A90D600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Enforce SSL for horde


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- ChangeLog	6 Mar 2008 11:47:54 -0000	1.153
+++ ChangeLog	7 Mar 2008 16:35:02 -0000	1.154
@@ -1,3 +1,7 @@
+2008-03-07  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* templates/httpd.conf.template.in: Enforce SSL for horde
+
 2008-03-06 Richard Bos <richard at radoeka.nl>
 
 	* kolab/issue2507



From cvs at kolab.org  Fri Mar  7 17:49:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 17:49:27 +0100 (CET)
Subject: thomas: server/kolabd/kolabd ChangeLog,1.154,1.155 
Message-ID: <20080307164927.2C942600D6E@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Enforce SSL for fbview and corrected Location entries


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- ChangeLog	7 Mar 2008 16:35:02 -0000	1.154
+++ ChangeLog	7 Mar 2008 16:49:25 -0000	1.155
@@ -1,6 +1,8 @@
 2008-03-07  Thomas Arendsen Hein <thomas at intevation.de>
 
-	* templates/httpd.conf.template.in: Enforce SSL for horde
+	* templates/httpd.conf.template.in: Enforce SSL for horde and fbview
+	and corrected Location entries for changed webserver_web_prefix and
+	kolab_wui.
 
 2008-03-06 Richard Bos <richard at radoeka.nl>
 



From cvs at kolab.org  Fri Mar  7 17:49:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 17:49:27 +0100 (CET)
Subject: thomas: server release-notes.txt,1.229,1.230 
Message-ID: <20080307164927.288B4600D6B@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Enforce SSL for fbview and corrected Location entries


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- release-notes.txt	7 Mar 2008 16:35:02 -0000	1.229
+++ release-notes.txt	7 Mar 2008 16:49:25 -0000	1.230
@@ -59,7 +59,7 @@
 
 	kolabdcachetool: Fix location of graveyard caches.
 
-	Enforce SSL for horde.
+	Enforce SSL for horde and fbview and corrected Location entries.
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2350 (Email from buggy Lotus notes client not accepted by



From cvs at kolab.org  Fri Mar  7 17:49:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 17:49:27 +0100 (CET)
Subject: thomas: server/kolabd/kolabd/templates httpd.conf.template.in, 1.24,
	1.25 
Message-ID: <20080307164927.30AF6600D70@lists.intevation.de>

Author: thomas

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

Modified Files:
	httpd.conf.template.in 
Log Message:
Enforce SSL for fbview and corrected Location entries


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- httpd.conf.template.in	7 Mar 2008 16:35:02 -0000	1.24
+++ httpd.conf.template.in	7 Mar 2008 16:49:25 -0000	1.25
@@ -141,15 +141,26 @@
 #DirectoryIndex index.html 
 AccessFileName .htaccess
 
-<Location @webserver_web_prefix@/>
-  ErrorDocument 403 https://@@@fqdnhostname@@@@kolab_wui@/
+<Location "@webserver_web_prefix@/">
+    ErrorDocument 403 https://@@@fqdnhostname@@@@kolab_wui@/
+</Location>
+<Location "@kolab_wui@">
+    SSLRequireSSL
 </Location>
 <Location "@webserver_web_prefix@/horde">
     ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/horde/
+    SSLRequireSSL
 </Location>
 <Location "@webserver_web_prefix@/fbview">
     ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/
+    SSLRequireSSL
 </Location>
+@@@if apache-http@@@
+@@@else@@@
+<Location "@webserver_web_prefix@/freebusy">
+    SSLRequireSSL
+</Location>
+@@@endif@@@
 
 <Files ~ "^\.ht">
     Order allow,deny
@@ -192,28 +203,6 @@
     Order allow,deny
     Allow from all
 </Directory>
-
-<Location /admin>
-	SSLRequireSSL
-</Location>
-<Location /horde>
-	SSLRequireSSL
-</Location>
-@@@if apache-http@@@
-@@@else@@@
-<Location /fbview>
-	SSLRequireSSL
-</Location>
-<Location /freebusy>
-	SSLRequireSSL
-</Location>
-@@@endif@@@
-
-#<Location /freebusy>
-#  SSLVerifyClient require
-#  SSLVerifyDepth 1
-#ForceType application/x-httpd-php
-#</Location>
 
 <AuthnProviderAlias ldap ldap-mail>
   AuthLDAPURL ldap://@@@ldap_ip@@@:@@@ldap_port@@@/@@@base_dn@@@?mail



From cvs at kolab.org  Fri Mar  7 17:51:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 17:51:17 +0100 (CET)
Subject: thomas: server README.1st,1.75,1.76 
Message-ID: <20080307165117.D0D70600D70@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st 
Log Message:
Recommend umask 077 before saving sensitive information


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- README.1st	7 Feb 2008 12:30:04 -0000	1.75
+++ README.1st	7 Mar 2008 16:51:15 -0000	1.76
@@ -193,6 +193,11 @@
 
 2.  Save the current ldap:
 
+    Copy the contents of the openldap database, use a different output
+    filename if you want. You should make sure that no other users can
+    read the sensitive data contained in the ldif file, e.g. with umask:
+
+    # umask 077
     # /kolab/sbin/slapcat > ~/kolab-2.1.ldif
 
 3.  Some of the old Kolab packages must be removed to avoid conflicts



From cvs at kolab.org  Fri Mar  7 18:37:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 18:37:43 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/administrator
	index.php.in, 1.4, 1.5 
Message-ID: <20080307173743.7B48760C4A9@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
webadmin: Better LDAP filter when listing admins and maintainers.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/index.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.php.in	22 Jan 2008 18:36:20 -0000	1.4
+++ index.php.in	7 Mar 2008 17:37:41 -0000	1.5
@@ -54,7 +54,7 @@
 
   $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'admin' );
 
-  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*)(uid=*))";
   $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
 
   if( $result ) {



From cvs at kolab.org  Fri Mar  7 18:37:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 18:37:43 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.92,1.93 
Message-ID: <20080307173743.7604760C4A5@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
webadmin: Better LDAP filter when listing admins and maintainers.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- ChangeLog	6 Mar 2008 12:13:12 -0000	1.92
+++ ChangeLog	7 Mar 2008 17:37:41 -0000	1.93
@@ -1,3 +1,11 @@
+2008-03-07  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* www/admin/administrator/index.php.in,
+	www/admin/domainmaintainer/index.php.in,
+	www/admin/maintainer/index.php.in: Modify LDAP filter to require
+	uid attribute to not return e.g. address book entries.
+	Prevents "PHP Notice: Undefined index: uid".
+
 2008-03-06 Richard Bos <richard at radoeka.nl>
 
 	* kolab/issue2507



From cvs at kolab.org  Fri Mar  7 18:37:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 18:37:43 +0100 (CET)
Subject: thomas: server release-notes.txt,1.230,1.231 
Message-ID: <20080307173743.720F9600D7E@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
webadmin: Better LDAP filter when listing admins and maintainers.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- release-notes.txt	7 Mar 2008 16:49:25 -0000	1.230
+++ release-notes.txt	7 Mar 2008 17:37:41 -0000	1.231
@@ -78,6 +78,8 @@
 
 	Corrections in the Dutch translation.
 
+	Better LDAP filter when listing admins and maintainers.
+
 	kolab/issue2203 (About Kolab does not list new server components)
 	kolab/issue2329 (Domain Maintainer cannot create users)
 	kolab/issue2437 (Change name of service tab to settings)



From cvs at kolab.org  Fri Mar  7 18:37:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 18:37:43 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
	index.php.in, 1.4, 1.5 
Message-ID: <20080307173743.845A660C4AC@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
webadmin: Better LDAP filter when listing admins and maintainers.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/index.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.php.in	22 Jan 2008 18:36:20 -0000	1.4
+++ index.php.in	7 Mar 2008 17:37:41 -0000	1.5
@@ -54,7 +54,7 @@
 
   $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' );
 
-  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*)(uid=*))";
   $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
 
   if( $result ) {



From cvs at kolab.org  Fri Mar  7 18:37:43 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 18:37:43 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
	index.php.in, 1.5, 1.6 
Message-ID: <20080307173743.8082E60C4AB@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.php.in 
Log Message:
webadmin: Better LDAP filter when listing admins and maintainers.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/index.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.php.in	22 Jan 2008 18:36:20 -0000	1.5
+++ index.php.in	7 Mar 2008 17:37:41 -0000	1.6
@@ -54,7 +54,7 @@
 
   $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'domain-maintainer' );
 
-  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+  $filter = "(&(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*)(uid=*))";
   $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabDeleteflag' ));
 
   if( $result ) {



From cvs at kolab.org  Fri Mar  7 18:40:20 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri,  7 Mar 2008 18:40:20 +0100 (CET)
Subject: thomas: server release-notes.txt,1.231,1.232 
Message-ID: <20080307174020.5BEB1600D76@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
added missing newline


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- release-notes.txt	7 Mar 2008 17:37:41 -0000	1.231
+++ release-notes.txt	7 Mar 2008 17:40:18 -0000	1.232
@@ -107,6 +107,7 @@
 
 	kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
 
+
 Changes between 2.2-beta-3 and 2.2-rc-1
 
     All packages except for openldap and db were upgraded to OpenPKG-CURRENT



From cvs at kolab.org  Tue Mar 11 16:42:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 11 Mar 2008 16:42:22 +0100 (CET)
Subject: thomas: server/patches/cyrus-imapd/cyrus-imapd-2.3.11
	timsieved-starttls-sendcaps.patch, 1.2, NONE 
Message-ID: <20080311154222.7002A600D55@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.11
In directory doto:/tmp/cvs-serv7546/patches/cyrus-imapd/cyrus-imapd-2.3.11

Removed Files:
	timsieved-starttls-sendcaps.patch 
Log Message:
Added server/imapd with everything needed to build imapd-2.3.11-20080101_kolab

timsieved-starttls-sendcaps.patch is not yet integrated into Gunnar's patch
queue or in the OpenPKG package, so I moved it to this directory.

http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/
should show up on the mirrors soon.


--- timsieved-starttls-sendcaps.patch DELETED ---



From cvs at kolab.org  Tue Mar 11 16:42:22 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 11 Mar 2008 16:42:22 +0100 (CET)
Subject: thomas: server/imapd .cvsignore, 1.2, 1.3 Makefile, 1.31, 1.32 README,
	1.4, 1.5 kolab.patch, 1.31,
	1.32 timsieved-starttls-sendcaps.patch, NONE, 1.1 
Message-ID: <20080311154222.750A4600D7E@lists.intevation.de>

Author: thomas

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

Added Files:
	.cvsignore Makefile README kolab.patch 
	timsieved-starttls-sendcaps.patch 
Log Message:
Added server/imapd with everything needed to build imapd-2.3.11-20080101_kolab

timsieved-starttls-sendcaps.patch is not yet integrated into Gunnar's patch
queue or in the OpenPKG package, so I moved it to this directory.

http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/
should show up on the mirrors soon.






--- NEW FILE: timsieved-starttls-sendcaps.patch ---
This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
(minus the CVS keywords)

It should be reverse-applied with patch -p2 -R to work around the kontact
behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
capabilities after starttls) and can be dropped as soon as kontact has a way
to work with old and new cyrus imapd servers.

--- src/cyrus/timsieved/parser.c	2007/11/26 20:23:06	1.44
+++ src/cyrus/timsieved/parser.c	2007/12/10 14:47:08	1.45
@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
 
     starttls_done = 1;
 
-    return result;
+    return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated);
 }
 #else
 static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)



From cvs at kolab.org  Tue Mar 11 16:47:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 11 Mar 2008 16:47:15 +0100 (CET)
Subject: thomas: server/imapd kolab.patch,1.32,1.33 
Message-ID: <20080311154715.B9A50600D55@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab.patch 
Log Message:
Fixed wrong patch direction


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolab.patch	11 Mar 2008 15:42:19 -0000	1.32
+++ kolab.patch	11 Mar 2008 15:47:13 -0000	1.33
@@ -1,39 +1,39 @@
---- imapd.spec.orig	2008-02-02 11:40:34.000000000 +0100
-+++ imapd.spec	2008-01-01 15:31:56.000000000 +0100
+--- imapd.spec.orig	2008-01-01 15:31:56.000000000 +0100
++++ imapd.spec	2008-03-11 16:45:35.584783000 +0100
 @@ -32,7 +32,7 @@
  Group:        Mail
  License:      BSD
  Version:      2.3.11
--Release:      20080101_kolab
-+Release:      20080101
+-Release:      20080101
++Release:      20080101_kolab
  
  #   package options
  %option       with_fsl           yes
-@@ -48,7 +48,6 @@
+@@ -48,6 +48,7 @@
  %option       with_annotate      no
  %option       with_morelogging   no
  %option       with_kolab         no
--%option       with_kolab_nocaps  no
++%option       with_kolab_nocaps  no
  
  #   fixing implicit inter-module dependencies and correlations
  %if "%{with_kolab}" == "yes"
-@@ -74,7 +73,6 @@
+@@ -73,6 +74,7 @@
  Patch4:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Logging.patch
  Patch5:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch
  Patch6:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
--Patch7:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/imapd/timsieved-starttls-sendcaps.patch
++Patch7:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/imapd/timsieved-starttls-sendcaps.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -154,11 +152,6 @@
+@@ -152,6 +154,11 @@
       %patch -p1 -P 6
  %endif
  
--    #   kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls)
--%if "%{with_kolab_nocaps}" == "yes"
--     %patch -p2 -R -P 7
--%endif
--
++    #   kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls)
++%if "%{with_kolab_nocaps}" == "yes"
++     %patch -p2 -R -P 7
++%endif
++
      #   add optional DRAC file support
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch



From cvs at kolab.org  Tue Mar 11 16:58:37 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 11 Mar 2008 16:58:37 +0100 (CET)
Subject: thomas: server/imapd imapd.patch.group, NONE, 1.1 Makefile, 1.32,
	1.33 kolab.patch, 1.33, 1.34 
Message-ID: <20080311155837.38085600D55@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile kolab.patch 
Added Files:
	imapd.patch.group 
Log Message:
Fix kolab/issue2535 (group:distributionlist at example.com doesn't work for Cyrus IMAP ACLs)

Updated imapd.patch.group for imapd-2.3.11-20080101_kolab2

This should replace
patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Groups.patch


--- NEW FILE: imapd.patch.group ---
diff -urN cyrus-imapd-2.3.11.orig/lib/auth_unix.c cyrus-imapd-2.3.11/lib/auth_unix.c
--- cyrus-imapd-2.3.11.orig/lib/auth_unix.c	2007-10-31 11:42:18.000000000 +0100
+++ cyrus-imapd-2.3.11/lib/auth_unix.c	2008-03-11 16:07:10.064783000 +0100
@@ -48,6 +48,7 @@
 #include <stdlib.h>
 #include <pwd.h>
 #include <grp.h>
+#include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
@@ -55,6 +56,126 @@
 #include "libcyr_cfg.h"
 #include "xmalloc.h"
 
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+/*
+ * __getgrent.c - This file is part of the libc-8086/grp package for ELKS,
+ * Copyright (C) 1995, 1996 Nat Friedman <ndf at linux.mit.edu>.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+static struct group *__getgrent(int grp_fd, char *line_buff, char **members)
+{
+    short line_index;
+    short buff_size;
+    static struct group group;
+    register char *ptr;
+    char *field_begin;
+    short member_num;
+    char *endptr;
+    int line_len;
+
+    /* We use the restart label to handle malformatted lines */
+    restart:
+    line_index = 0;
+    buff_size = 256;
+
+    line_buff = realloc(line_buff, buff_size);
+    while (1) {
+        if ((line_len = read(grp_fd, line_buff + line_index,
+                        buff_size - line_index)) <= 0) {
+            return NULL;
+        }
+        field_begin = strchr(line_buff, '\n');
+        if (field_begin != NULL) {
+            lseek(grp_fd,
+                    (long) (1 + field_begin -
+                            (line_len + line_index + line_buff)), SEEK_CUR);
+            *field_begin = '\0';
+            if (*line_buff == '#' || *line_buff == ' '
+                    || *line_buff == '\n' || *line_buff == '\t')
+                goto restart;
+            break;
+        } else {
+            /* Allocate some more space */
+            line_index = buff_size;
+            buff_size += 256;
+            line_buff = realloc(line_buff, buff_size);
+        }
+    }
+
+    /* Now parse the line */
+    group.gr_name = line_buff;
+    ptr = strchr(line_buff, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    group.gr_passwd = ptr;
+    ptr = strchr(ptr, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    field_begin = ptr;
+    ptr = strchr(ptr, ':');
+    if (ptr == NULL)
+        goto restart;
+    *ptr++ = '\0';
+
+    group.gr_gid = (gid_t) strtoul(field_begin, &endptr, 10);
+    if (*endptr != '\0')
+        goto restart;
+
+    member_num = 0;
+    field_begin = ptr;
+
+    if (members != NULL)
+        free(members);
+    members = (char **) malloc((member_num + 1) * sizeof(char *));
+    for ( ; field_begin && *field_begin != '\0'; field_begin = ptr) {
+        if ((ptr = strchr(field_begin, ',')) != NULL)
+            *ptr++ = '\0';
+        members[member_num++] = field_begin;
+        members = (char **) realloc(members,
+                (member_num + 1) * sizeof(char *));
+    }
+    members[member_num] = NULL;
+
+    group.gr_mem = members;
+    return &group;
+}
+
+static char *line_buff = NULL;
+static char **members  = NULL;
+
+struct group *fgetgrent(FILE *file)
+{
+    if (file == NULL) {
+        errno = EINTR;
+        return NULL;
+    }
+    return __getgrent(fileno(file), line_buff, members);
+}
+#endif /* __FreeBSD__ */
+
 struct auth_state {
     char userid[81];
     char **group;
@@ -142,6 +263,25 @@
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
+static struct group* fgetgrnam(const char* name)
+{
+    struct group *grp;
+    FILE *groupfile;
+
+    groupfile = fopen("/etc/imapd.group", "r");
+    if (!groupfile) groupfile = fopen("/etc/group", "r");
+    if (groupfile) {
+       while ((grp = fgetgrent(groupfile))) {
+         if (strcmp(grp->gr_name, name) == 0) {
+           fclose(groupfile);
+           return grp;
+         }
+       }
+    } 
+    if (groupfile) fclose(groupfile);
+    return NULL;
+} 
+
 /*
  * Convert 'identifier' into canonical form.
  * Returns a pointer to a static buffer containing the canonical form
@@ -177,7 +317,7 @@
      */
     
     if (!strncmp(retbuf, "group:", 6)) {
-	grp = getgrnam(retbuf+6);
+	grp = fgetgrnam(retbuf+6);
 	if (!grp) return 0;
 	strcpy(retbuf+6, grp->gr_name);
 	return retbuf;
@@ -223,11 +363,12 @@
     struct auth_state *newstate;
     struct passwd *pwd;
     struct group *grp;
-#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+#if 0 && defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
     gid_t gid, *groupids = NULL;
     int ret, ngroups = 10;
 #else
     char **mem;
+    FILE *groupfile;
 #endif
 
     identifier = mycanonifyid(identifier, 0);
@@ -245,7 +386,7 @@
 
     pwd = getpwnam(identifier);
 
-#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+#if 0 && defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
     gid = pwd ? pwd->pw_gid : (gid_t) -1;
 
     /* get the group ids */
@@ -283,20 +424,23 @@
     if (groupids) free(groupids);
 
 #else /* !HAVE_GETGROUPLIST */
-    setgrent();
-    while ((grp = getgrent())) {
-	for (mem = grp->gr_mem; *mem; mem++) {
-	    if (!strcmp(*mem, identifier)) break;
-	}
-
-	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
-	    newstate->ngroups++;
-	    newstate->group = (char **)xrealloc((char *)newstate->group,
-						newstate->ngroups * sizeof(char *));
-	    newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
-	}
-    }
-    endgrent();
+    groupfile = fopen("/etc/imapd.group", "r");
+    if (!groupfile) groupfile = fopen("/etc/group", "r");
+    if (groupfile) {
+       while ((grp = fgetgrent(groupfile))) {
+         for (mem = grp->gr_mem; *mem; mem++) {
+            if (!strcmp(*mem, identifier)) break;
+         }
+
+         if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
+            newstate->ngroups++;
+            newstate->group = (char **)xrealloc((char *)newstate->group,
+                                                newstate->ngroups * sizeof(char *));
+            newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
+         }
+       }
+       fclose(groupfile);
+    } 
 #endif /* HAVE_GETGROUPLIST */
 
     return newstate;
diff -urN cyrus-imapd-2.3.11.orig/lib/auth_unix.c.orig cyrus-imapd-2.3.11/lib/auth_unix.c.orig
--- cyrus-imapd-2.3.11.orig/lib/auth_unix.c.orig	1970-01-01 01:00:00.000000000 +0100
+++ cyrus-imapd-2.3.11/lib/auth_unix.c.orig	2007-10-31 11:42:18.000000000 +0100
@@ -0,0 +1,326 @@
+/* auth_unix.c -- Unix passwd file authorization
+ *
+ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any other legal
+ *    details, please contact  
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+/*
+ * $Id: imapd.patch.group,v 1.1 2008/03/11 15:58:35 thomas Exp $
+ */
+
+#include <config.h>
+#include <stdlib.h>
+#include <pwd.h>
+#include <grp.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "auth.h"
+#include "libcyr_cfg.h"
+#include "xmalloc.h"
+
+struct auth_state {
+    char userid[81];
+    char **group;
+    int ngroups;
+};
+
+static struct auth_state auth_anonymous = {
+    "anonymous", 0, 0
+};
+
+/*
+ * Determine if the user is a member of 'identifier'
+ * Returns one of:
+ * 	0	User does not match identifier
+ * 	1	identifier matches everybody
+ *	2	User is in the group that is identifier
+ *	3	User is identifer
+ */
+static int mymemberof(auth_state, identifier)
+struct auth_state *auth_state;
+const char *identifier;
+{
+    int i;
+
+    if (!auth_state) auth_state = &auth_anonymous;
+ 
+    if (strcmp(identifier, "anyone") == 0) return 1;
+
+    if (strcmp(identifier, auth_state->userid) == 0) return 3;
+
+    if (strncmp(identifier, "group:", 6) != 0) return 0;
+
+    for (i=0; i<auth_state->ngroups; i++) {
+	if (strcmp(identifier+6, auth_state->group[i]) == 0) return 2;
+    }
+    return 0;
+}
+
+/* Map of which characters are allowed by auth_canonifyid.
+ * Key: 0 -> not allowed (special, ctrl, or would confuse Unix or imapd)
+ *      1 -> allowed, but requires an alpha somewhere else in the string
+ *      2 -> allowed, and is an alpha
+ *
+ * At least one character must be an alpha.
+ *
+ * This may not be restrictive enough.
+ * Here are the reasons for the restrictions:
+ *
+ * &	forbidden because of MUTF-7.  (This could be fixed.)
+ * :    forbidden because it's special in /etc/passwd
+ * /    forbidden because it can't be used in a mailbox name
+ * * %  forbidden because they're IMAP magic in the LIST/LSUB commands
+ * ?    it just scares me
+ * ctrl chars, DEL
+ *      can't send them as IMAP characters in plain folder names, I think
+ * 80-FF forbidden because you can't send them in IMAP anyway
+ *       (and they're forbidden as folder names). (This could be fixed.)
+ *
+ * + and - are *allowed* although '+' is probably used for userid+detail
+ * subaddressing and qmail users use '-' for subaddressing.
+ *
+ * Identifiers don't require a digit, really, so that should probably be
+ * relaxed, too.
+ */
+static char allowedchars[256] = {
+ /* 0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 00-0F */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 10-1F */
+    1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, /* 20-2F */
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, /* 30-3F */
+
+    1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 40-4F */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, /* 50-5F */
+    1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, /* 60-6F */
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 0, /* 70-7F */
+
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/*
+ * Convert 'identifier' into canonical form.
+ * Returns a pointer to a static buffer containing the canonical form
+ * or NULL if 'identifier' is invalid.
+ *
+ * XXX If any of the characters marked with 0 are valid and are cropping up,
+ * the right thing to do is probably to canonicalize the identifier to two
+ * representations: one for getpwent calls and one for folder names.  The
+ * latter canonicalizes to a MUTF7 representation.
+ */
+static char *mycanonifyid(identifier, len)
+const char *identifier;
+size_t len;
+{
+    static char retbuf[81];
+    struct group *grp;
+    char sawalpha;
+    char *p;
+    int username_tolower = 0;
+
+    if(!len) len = strlen(identifier);
+    if(len >= sizeof(retbuf)) return NULL;
+
+    memmove(retbuf, identifier, len);
+    retbuf[len] = '\0';
+
+    /* This used to be far more restrictive, but many sites seem to ignore the 
+     * ye olde Unix conventions of username.  Specifically, we used to
+     * - drop case on the buffer
+     * - disallow lots of non-alpha characters ('-', '_', others)
+     * Now we do neither of these, but impose a very different policy based on 
+     * the character map above.
+     */
+    
+    if (!strncmp(retbuf, "group:", 6)) {
+	grp = getgrnam(retbuf+6);
+	if (!grp) return 0;
+	strcpy(retbuf+6, grp->gr_name);
+	return retbuf;
+    }
+
+    /* Copy the string and look up values in the allowedchars array above.
+     * If we see any we don't like, reject the string.
+     * Lowercase usernames if requested.
+     */
+    username_tolower = libcyrus_config_getswitch(CYRUSOPT_USERNAME_TOLOWER);
+    sawalpha = 0;
+    for(p = retbuf; *p; p++) {
+	if (username_tolower && isupper((unsigned char)*p))
+	    *p = tolower((unsigned char)*p);
+
+	switch (allowedchars[*(unsigned char*) p]) {
+	case 0:
+	    return NULL;
+	    
+	case 2:
+	    sawalpha = 1;
+	    /* FALL THROUGH */
+	    
+	default:
+	    ;
+	}
+    }
+
+    /* we used to enforce "has to be one alpha char" */
+    /* now we don't */
+    /* if (!sawalpha) return NULL;  */
+
+    return retbuf;
+}
+
+/*
+ * Set the current user to 'identifier'.  'cacheid', if non-null,
+ * points to a 16-byte binary key to cache identifier's information
+ * with.
+ */
+static struct auth_state *mynewstate(const char *identifier)
+{
+    struct auth_state *newstate;
+    struct passwd *pwd;
+    struct group *grp;
+#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+    gid_t gid, *groupids = NULL;
+    int ret, ngroups = 10;
+#else
+    char **mem;
+#endif
+
+    identifier = mycanonifyid(identifier, 0);
+    if (!identifier) return 0;
+    if (!strncmp(identifier, "group:", 6)) return 0;
+    
+    newstate = (struct auth_state *)xmalloc(sizeof(struct auth_state));
+
+    strcpy(newstate->userid, identifier);
+    newstate->ngroups = 0;
+    newstate->group = NULL;
+    
+    if(!libcyrus_config_getswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE))
+	return newstate;
+
+    pwd = getpwnam(identifier);
+
+#if defined(HAVE_GETGROUPLIST) && defined(__GLIBC__)
+    gid = pwd ? pwd->pw_gid : (gid_t) -1;
+
+    /* get the group ids */
+    do {
+	groupids = (gid_t *)xrealloc((gid_t *)groupids,
+				     ngroups * sizeof(gid_t));
+
+	newstate->ngroups = ngroups; /* copy of ngroups for comparision */
+	ret = getgrouplist(identifier, gid, groupids, &ngroups);
+	/*
+	 * This is tricky. We do this as long as getgrouplist tells us to
+	 * realloc _and_ the number of groups changes. It tells us to realloc
+	 * also in the case of failure...
+	 */
+    } while (ret == -1 && ngroups != newstate->ngroups);
+
+    if (ret == -1) {
+	newstate->ngroups = 0;
+	newstate->group = NULL;
+	goto err;
+    }
+
+    newstate->ngroups = 0;
+    newstate->group = (char **)xmalloc(ngroups * sizeof(char *));
+    while (ngroups--) {
+	if (pwd || groupids[ngroups] != gid) {
+	    if ((grp = getgrgid(groupids[ngroups]))) {
+		newstate->ngroups++;
+		newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
+	    }
+	}
+    }
+
+err:
+    if (groupids) free(groupids);
+
+#else /* !HAVE_GETGROUPLIST */
+    setgrent();
+    while ((grp = getgrent())) {
+	for (mem = grp->gr_mem; *mem; mem++) {
+	    if (!strcmp(*mem, identifier)) break;
+	}
+
+	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
+	    newstate->ngroups++;
+	    newstate->group = (char **)xrealloc((char *)newstate->group,
+						newstate->ngroups * sizeof(char *));
+	    newstate->group[newstate->ngroups-1] = xstrdup(grp->gr_name);
+	}
+    }
+    endgrent();
+#endif /* HAVE_GETGROUPLIST */
+
+    return newstate;
+}
+
+static void myfreestate(auth_state)
+struct auth_state *auth_state;
+{
+    if (auth_state->group) {
+	while (auth_state->ngroups) {
+	    free((char *)auth_state->group[--auth_state->ngroups]);
+	}
+	free((char *)auth_state->group);
+    }
+    free((char *)auth_state);
+}
+
+
+struct auth_mech auth_unix = 
+{
+    "unix",		/* name */
+
+    &mycanonifyid,
+    &mymemberof,
+    &mynewstate,
+    &myfreestate,
+};

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile	11 Mar 2008 15:42:19 -0000	1.32
+++ Makefile	11 Mar 2008 15:58:35 -0000	1.33
@@ -17,9 +17,10 @@
 PACKAGE=imapd
 VERSION=2.3.11
 RELEASE=20080101
-KOLABRELEASE=20080101_kolab
+KOLABRELEASE=20080101_kolab2
 
-PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch
+PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch \
+	$(KOLABCVSDIR)/imapd.patch.group
 
 all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
 

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- kolab.patch	11 Mar 2008 15:47:13 -0000	1.33
+++ kolab.patch	11 Mar 2008 15:58:35 -0000	1.34
@@ -5,7 +5,7 @@
  License:      BSD
  Version:      2.3.11
 -Release:      20080101
-+Release:      20080101_kolab
++Release:      20080101_kolab2
  
  #   package options
  %option       with_fsl           yes



From cvs at kolab.org  Tue Mar 11 17:02:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 11 Mar 2008 17:02:40 +0100 (CET)
Subject: thomas: server/imapd kolab.patch,1.34,1.35 
Message-ID: <20080311160240.666D7600D55@lists.intevation.de>

Author: thomas

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

Modified Files:
	kolab.patch 
Log Message:
Fix kolab/issue2541 (openpkg rpm -e imapd removes annotations.db and mailboxes.db)

(still named imapd-2.3.11-20080101_kolab2 since no package was releaed)


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- kolab.patch	11 Mar 2008 15:58:35 -0000	1.34
+++ kolab.patch	11 Mar 2008 16:02:38 -0000	1.35
@@ -1,5 +1,5 @@
 --- imapd.spec.orig	2008-01-01 15:31:56.000000000 +0100
-+++ imapd.spec	2008-03-11 16:45:35.584783000 +0100
++++ imapd.spec	2008-03-11 17:00:23.964783000 +0100
 @@ -32,7 +32,7 @@
  Group:        Mail
  License:      BSD
@@ -37,3 +37,13 @@
      #   add optional DRAC file support
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
+@@ -410,9 +417,6 @@
+     #   before erase, stop service and remove log and temporary files
+     if [ $1 -eq 0 ]; then
+         %{l_rc} imapd stop 2>/dev/null
+-        rm -f  $RPM_INSTALL_PREFIX/var/imapd/*.db       >/dev/null 2>&1 || true
+-        rm -f  $RPM_INSTALL_PREFIX/var/imapd/db.backup* >/dev/null 2>&1 || true
+-        rm -f  $RPM_INSTALL_PREFIX/var/imapd/log/*.log  >/dev/null 2>&1 || true
+         rm -f  $RPM_INSTALL_PREFIX/var/imapd/socket/*   >/dev/null 2>&1 || true
+         rm -rf $RPM_INSTALL_PREFIX/var/imapd/tmp/*      >/dev/null 2>&1 || true
+     fi



From cvs at kolab.org  Tue Mar 11 17:22:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 11 Mar 2008 17:22:21 +0100 (CET)
Subject: thomas: server release-notes.txt,1.232,1.233 
Message-ID: <20080311162221.0E97B60C4BA@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- release-notes.txt	7 Mar 2008 17:40:18 -0000	1.232
+++ release-notes.txt	11 Mar 2008 16:22:19 -0000	1.233
@@ -50,6 +50,13 @@
 
 	New upstream version, fixes various security issues.
 
+    - imapd-2.3.11-20080101_kolab2
+
+	kolab/issue2535 (group:distributionlist at example.com doesn't work for
+	                 Cyrus IMAP ACLs)
+	kolab/issue2541 (openpkg rpm -e imapd removes annotations.db and
+	                 mailboxes.db)
+
     - kolabconf-2.2.rc2-2008????
 
 	kolab/issue1550 (Masquerade problem)



From cvs at kolab.org  Tue Mar 11 17:44:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 11 Mar 2008 17:44:38 +0100 (CET)
Subject: thomas: server/horde/horde-framework horde-framework-kolab.spec, 1.34,
	1.35 
Message-ID: <20080311164438.EFAB3600D7E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv9484

Modified Files:
	horde-framework-kolab.spec 
Log Message:
Updated release date for horde-framework-kolab


Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- horde-framework-kolab.spec	7 Mar 2008 08:46:19 -0000	1.34
+++ horde-framework-kolab.spec	11 Mar 2008 16:44:36 -0000	1.35
@@ -1,9 +1,9 @@
 # Versions
 %define         V_horde_name framework
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   29
+%define         V_year  2008
+%define         V_month 03
+%define         V_day   11
 %define         V_version 3.2_rc1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}



From cvs at kolab.org  Thu Mar 13 06:47:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 06:47:13 +0100 (CET)
Subject: gunnar: server/perl-kolab ChangeLog,1.32,1.33 
Message-ID: <20080313054713.045FA600D74@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog 
Log Message:
Wait for our children.  kolab/issue2478 (kolabd memory leak).

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog	7 Mar 2008 14:46:48 -0000	1.32
+++ ChangeLog	13 Mar 2008 05:47:10 -0000	1.33
@@ -1,3 +1,10 @@
+2008-03-13  Gunnar Wrobel  <p at rdus.de>
+
+	* lib/Kolab/LDAP/Backend/slurpd.pm (run):
+
+	Wait for our children.
+	kolab/issue2478 (kolabd memory leak)
+
 2008-03-07  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP/Backend/slurpd.pm (run):



From cvs at kolab.org  Thu Mar 13 06:47:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 06:47:13 +0100 (CET)
Subject: gunnar: server/perl-kolab/lib/Kolab/LDAP/Backend slurpd.pm,1.2,1.3 
Message-ID: <20080313054713.058B0600D7F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	slurpd.pm 
Log Message:
Wait for our children.  kolab/issue2478 (kolabd memory leak).

Index: slurpd.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP/Backend/slurpd.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slurpd.pm	7 Mar 2008 14:46:48 -0000	1.2
+++ slurpd.pm	13 Mar 2008 05:47:10 -0000	1.3
@@ -287,6 +287,7 @@
 		      Kolab::LDAP::sync;
 		      exit(0);
 		  }
+		  waitpid($kidpid, 0);
 		  Kolab::log('SD', "Running $Kolab::config{'kolabconf_script'}");
 		  system($Kolab::config{'kolabconf_script'}) == 0
 		    or Kolab::log('SD', "Failed to run $Kolab::config{'kolabconf_script'}: $?", KOLAB_ERROR);



From cvs at kolab.org  Thu Mar 13 07:22:55 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 07:22:55 +0100 (CET)
Subject: gunnar: server/horde external-horde-cvs.sh,NONE,1.1 
Message-ID: <20080313062255.D954D60C4CC@lists.intevation.de>

Author: gunnar

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

Added Files:
	external-horde-cvs.sh 
Log Message:
A new script to install Horde from CVS on an external web server.

--- NEW FILE: external-horde-cvs.sh ---
#!/bin/sh
DATE="Thu Mar 13 06:21:54 UTC 2008"
PATCHES="
framework/HK-GW-Kolab_history_driver.patch
framework/HK-GW-Kolab_syncml_driver.patch
framework/HK-GW-Kolab_syncml_driver_2.patch
framework/HK-GW-Fix_Prefs_for_Ingo.patch
framework/HK-GW-Fbview_xfb_concept.patch
kronolith/HK-SB-Fbview_save_attendees.patch
kronolith/HK-SB-Fbview_extra_params.patch
kronolith/HK-GW-Fbview_relevance.patch
kronolith/HK-GW-Fbview_xfb_access.patch
turba/HK-GW-Fix_share_id_change.patch
turba/HK-GW-Fix_editing_contacts.patch
horde/HK-GW-Config.patch
imp/HK-GW-Config.patch
ingo/HK-GW-Config.patch
mnemo/HK-GW-Config.patch
nag/HK-GW-Config.patch
turba/HK-GW-Config.patch
kronolith/HK-GW-Config.patch
dimp/HK-GW-Config.patch
mimp/HK-GW-Config.patch
passwd/HK-GW-Config.patch
"
PHP_INCLUDE=""

echo ""
echo "Make sure you have the \"Tree\" package from PEAR installed"
echo "before running the script!"
echo ""

usage() {
	echo "Usage:"
	echo "  $0         (install Horde from CVS)"
	echo 
	echo "Options:"
	echo
	echo "  -p         (Absolute path to the PEAR package repository)"
}

while getopts p: ARGS; do
   case $ARGS in
      h) # Display help
         usage
         exit 0
         ;;
      p) # What should be installed?
         PHP_INCLUDE="-d include_path=${OPTARG}"
         ;;
      *) # Unknown Option
         echo
         usage
         exit 1
         ;;
   esac
done

if [ ! -d patches ]; then
    mkdir patches
    cd patches
    
    for PATCH in ${PATCHES}
    do
	mkdir -p ${PATCH/\/*/}
	wget -q http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_CVS/raw-file/tip/${PATCH} -O ${PATCH}
    done
    
    cd ..
fi

export CVSROOT=:pserver:cvsread at anoncvs.horde.org:/repository

echo "Please enter 'horde' as password."
cvs login

if [ ! -d horde ]; then
    cvs co -D "${DATE}" horde

    for PATCH in ${PATCHES}
    do
	if [ -z "${PATCH/horde*/}" ]; then
	    patch -p1 < patches/${PATCH}
	fi
    done
fi

if [ ! -d framework ]; then
    cvs co -D "${DATE}" framework

    for PATCH in ${PATCHES}
    do
	if [ -z "${PATCH/framework*/}" ]; then
	    patch -p1 < patches/${PATCH}
	fi
    done

    cd framework
    php -q ${PHP_INCLUDE} devtools/horde-fw-symlinks.php --copy --src `pwd` --dest `pwd`/../horde/lib/
    cd ..
fi

cd horde

APPS="imp kronolith ingo dimp mimp turba passwd mnemo nag"

for APP in ${APPS}
do
    if [ ! -d ${APP} ]; then
	cvs co -D "${DATE}" ${APP}

	for PATCH in "${PATCHES}"
	do
	    if [ -z "${PATCH/${APP}*/}" ]; then
		patch -p1 < ../patches/${PATCH}
	    fi
	done
    fi
done

cd ..

# Instruct the user

echo ""
echo ""
echo "================================================================="
echo "                            FINISHED"
echo "================================================================="
echo ""
echo ""
echo "All that is left to do is to configure the connection parameters"
echo "of your Kolab server and to test the installation."
echo ""
echo ""
echo "Specify the server"
echo "------------------"
echo ""
echo "You will have to manually edit both files horde/config/kolab.php"
echo "and horde/kronolith/config/kolab.php. Add the specific details"
echo "for your Kolab server instead of the variables embedded in the @"
echo "signs (e.g. rewrite @@@fqdnhostname@@@ to kolab.mydomain.com)."
echo ""
echo "You should also ensure that you set the correct cookie path of your"
echo "installation in horde/config/conf.php"
echo ""
echo "Test the installation"
echo "---------------------"
echo ""
echo "Assuming that the Horde installation is now accessible under"
echo "'horde' you should test the installation by looking at the URL"
echo "      http://my-domain.com/horde/test.php. You should do the same for"
echo "the applications imp, ingo, mnemo, nag, kronolith, passwd, and"
echo "turba. The test script for each application can be found in a"
echo "subdirectory with this name"
echo "(e.g. http://my-domain.com/horde/imp/test.php for imp)."
echo ""
echo "There should be no error messages or red warnings. If there are,"
echo "you need to identify the source of the error and fix it. You can"
echo "remove the test.php scripts afterwards."
echo ""
echo "Often there will be PEAR packages missing or Horde does not find"
echo "your PEAR installation. If PEAR is available at a non standard"
echo "      location on your web server you can inform Horde about its"
echo "location by extending the include path in horde/lib/core.php:"
echo ""
echo " ini_set('include_path', dirname(__FILE__) . '/../../php/pear/'"
echo ". PATH_SEPARATOR . dirname(__FILE__) . PATH_SEPARATOR"
echo ". ini_get('include_path'));"
echo ""
echo "If all looks good, you should be able to log in at"
echo "http://my-domain.com/horde/"



From cvs at kolab.org  Thu Mar 13 11:01:51 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 11:01:51 +0100 (CET)
Subject: gunnar: server/horde external-horde-cvs.sh,1.1,1.2 
Message-ID: <20080313100151.05CD4600D7F@lists.intevation.de>

Author: gunnar

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

Modified Files:
	external-horde-cvs.sh 
Log Message:
Fix patch application for the apps within horde. Merged one patch.

Index: external-horde-cvs.sh
===================================================================
RCS file: /kolabrepository/server/horde/external-horde-cvs.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- external-horde-cvs.sh	13 Mar 2008 06:22:53 -0000	1.1
+++ external-horde-cvs.sh	13 Mar 2008 10:01:48 -0000	1.2
@@ -1,9 +1,8 @@
 #!/bin/sh
-DATE="Thu Mar 13 06:21:54 UTC 2008"
+DATE="Thu Mar 13 10:01:01 UTC 2008"
 PATCHES="
 framework/HK-GW-Kolab_history_driver.patch
 framework/HK-GW-Kolab_syncml_driver.patch
-framework/HK-GW-Kolab_syncml_driver_2.patch
 framework/HK-GW-Fix_Prefs_for_Ingo.patch
 framework/HK-GW-Fbview_xfb_concept.patch
 kronolith/HK-SB-Fbview_save_attendees.patch
@@ -109,7 +108,7 @@
     if [ ! -d ${APP} ]; then
 	cvs co -D "${DATE}" ${APP}
 
-	for PATCH in "${PATCHES}"
+	for PATCH in ${PATCHES}
 	do
 	    if [ -z "${PATCH/${APP}*/}" ]; then
 		patch -p1 < ../patches/${PATCH}



From cvs at kolab.org  Thu Mar 13 14:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 14:59:39 +0100 (CET)
Subject: thomas: server/kolab-freebusy Makefile,1.12,1.13 
Message-ID: <20080313135939.B595760C4D4@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv11649/kolab-freebusy

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc2


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	6 Feb 2008 14:09:31 -0000	1.12
+++ Makefile	13 Mar 2008 13:59:37 -0000	1.13
@@ -1,8 +1,8 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
 RELEASE = $(shell date '+%Y%m%d')
 
-VERSION = 2.2.rc1
-CVS = 1
+VERSION = 2.2.rc2
+CVS = 0
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Thu Mar 13 14:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 14:59:39 +0100 (CET)
Subject: thomas: server install-kolab.sh, 1.21, 1.22 release-notes.txt, 1.233,
	1.234 
Message-ID: <20080313135939.B3BEC600D75@lists.intevation.de>

Author: thomas

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

Modified Files:
	install-kolab.sh release-notes.txt 
Log Message:
Bumped version numbers to 2.2-rc2


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- install-kolab.sh	6 Feb 2008 14:09:31 -0000	1.21
+++ install-kolab.sh	13 Mar 2008 13:59:37 -0000	1.22
@@ -11,7 +11,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2-rc1+CVS"
+KOLAB_VERSION="2.2-rc2"
 KID="19414"
 
 TAG="kolab"

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- release-notes.txt	11 Mar 2008 16:22:19 -0000	1.233
+++ release-notes.txt	13 Mar 2008 13:59:37 -0000	1.234
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 2008????, Kolab Server 2.2-rc2
+(Version 20080313, Kolab Server 2.2-rc2
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -57,12 +57,12 @@
 	kolab/issue2541 (openpkg rpm -e imapd removes annotations.db and
 	                 mailboxes.db)
 
-    - kolabconf-2.2.rc2-2008????
+    - kolabconf-2.2.rc2-20080313
 
 	kolab/issue1550 (Masquerade problem)
 	kolab/issue2446 (Make the used syslog facility configureable)
 
-    - kolabd-2.1.99-2008????
+    - kolabd-2.1.99-20080313
 
 	kolabdcachetool: Fix location of graveyard caches.
 
@@ -77,11 +77,11 @@
 	                 networks?)
 	kolab/issue2507 (move session_vars.php to sysconfig directory)
 
-    - kolab-freebusy-2.2.rc2-2008????
+    - kolab-freebusy-2.2.rc2-20080313
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
-    - kolab-webadmin-2.1.99-2008????
+    - kolab-webadmin-2.1.99-20080313
 
 	Corrections in the Dutch translation.
 
@@ -92,12 +92,12 @@
 	kolab/issue2437 (Change name of service tab to settings)
 	kolab/issue2507 (move session_vars.php to sysconfig directory)
 
-    - perl-kolab-2.2.rc2-2008????
+    - perl-kolab-2.2.rc2-20080313
 
 	kolab/issue2358 (mismatch between cyrus-admins and cyrus-admin)
 	kolab/issue2478 (kolabd memory leak)
 
-    - php-kolab-2.2.rc2-2008????
+    - php-kolab-2.2.rc2-20080313
 
 	kolab/issue1272 (From: header in vacation messages is marked as
 	                 "Untrusted")
@@ -110,7 +110,7 @@
 	kolab/issue2495 (The reply to an invitation with umlauts of a group
 	                 account doesn't display the umlauts.)
 
-    - horde-framework-kolab-3.2_rc1-2008????
+    - horde-framework-kolab-3.2_rc1-20080311
 
 	kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
 



From cvs at kolab.org  Thu Mar 13 14:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 14:59:39 +0100 (CET)
Subject: thomas: server/kolab-filter Makefile,1.11,1.12 
Message-ID: <20080313135939.B44E2600D7F@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv11649/kolab-filter

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc2


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	6 Feb 2008 14:09:31 -0000	1.11
+++ Makefile	13 Mar 2008 13:59:37 -0000	1.12
@@ -1,8 +1,8 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
 RELEASE = $(shell date '+%Y%m%d')
 
-VERSION = 2.2.rc1
-CVS = 1
+VERSION = 2.2.rc2
+CVS = 0
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Thu Mar 13 14:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 14:59:39 +0100 (CET)
Subject: thomas: server/kolabconf Makefile.PL,1.19,1.20 
Message-ID: <20080313135939.B706060C4D5@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile.PL 
Log Message:
Bumped version numbers to 2.2-rc2


Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.PL	6 Feb 2008 14:09:32 -0000	1.19
+++ Makefile.PL	13 Mar 2008 13:59:37 -0000	1.20
@@ -9,10 +9,10 @@
 my $KOLAB_VERSION;
 
 # The Kolab version number for the perl-kolab package
-my $KOLAB_BASE_VERSION = "2.2.rc1";
+my $KOLAB_BASE_VERSION = "2.2.rc2";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 1;
+my $KOLAB_CVS = 0;
 
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Thu Mar 13 14:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 14:59:39 +0100 (CET)
Subject: thomas: server/php-kolab Makefile,1.18,1.19 
Message-ID: <20080313135939.BE9AC60C4D7@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Bumped version numbers to 2.2-rc2


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	12 Feb 2008 15:08:09 -0000	1.18
+++ Makefile	13 Mar 2008 13:59:37 -0000	1.19
@@ -4,8 +4,8 @@
 
 VERSION = 2.2
 PRERELEASE = rc
-PRERELEASE_VERSION = 1
-CVS = 1
+PRERELEASE_VERSION = 2
+CVS = 0
 
 ifeq "x$(PRERELEASE)" "x"
   ifeq "x$(CVS)" "x0"



From cvs at kolab.org  Thu Mar 13 14:59:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 14:59:39 +0100 (CET)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.15,1.16 
Message-ID: <20080313135939.BAD4260C4D6@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Bumped version numbers to 2.2-rc2


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Kolab.pm	5 Mar 2008 18:10:09 -0000	1.15
+++ Kolab.pm	13 Mar 2008 13:59:37 -0000	1.16
@@ -59,10 +59,10 @@
 );
 
 # The Kolab version number for the perl-kolab package
-our $KOLAB_BASE_VERSION = "2.2.rc1";
+our $KOLAB_BASE_VERSION = "2.2.rc2";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 1;
+my $KOLAB_CVS = 0;
 
 our $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Thu Mar 13 16:22:57 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:22:57 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3 - New directory 
Message-ID: <20080313152257.27B86600D7F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3
In directory doto:/tmp/cvs-serv16671/3.2-rc3

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3 added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/horde - New directory 
Message-ID: <20080313153352.B817360C4CE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/horde
In directory doto:/tmp/cvs-serv16996/horde

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/horde added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/ingo - New directory 
Message-ID: <20080313153352.BAAFE60C4CF@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/ingo
In directory doto:/tmp/cvs-serv16996/ingo

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/ingo added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/fbview-horde - New directory 
Message-ID: <20080313153352.CB9DE60C4D5@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-horde
In directory doto:/tmp/cvs-serv16996/fbview-horde

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/fbview-horde added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/imp - New directory 
Message-ID: <20080313153352.BE5BA60C4D0@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/imp
In directory doto:/tmp/cvs-serv16996/imp

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/imp added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/framework - New directory 
Message-ID: <20080313153352.B579660C4CD@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/framework
In directory doto:/tmp/cvs-serv16996/framework

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/framework added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/turba - New directory 
Message-ID: <20080313153352.CA83A60C4D4@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/turba
In directory doto:/tmp/cvs-serv16996/turba

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/turba added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/kronolith - New directory 
Message-ID: <20080313153352.CCF2B60C4D6@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/kronolith
In directory doto:/tmp/cvs-serv16996/kronolith

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/kronolith added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/nag - New directory 
Message-ID: <20080313153352.C6F7D60C4CD@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/nag
In directory doto:/tmp/cvs-serv16996/nag

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/nag added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/fbview-kronolith - New directory
Message-ID: <20080313153352.B2235600D7F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-kronolith
In directory doto:/tmp/cvs-serv16996/fbview-kronolith

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/fbview-kronolith added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/mimp - New directory 
Message-ID: <20080313153352.CE1FC60C4D7@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/mimp
In directory doto:/tmp/cvs-serv16996/mimp

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/mimp added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/mnemo - New directory 
Message-ID: <20080313153352.C6420600D7F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/mnemo
In directory doto:/tmp/cvs-serv16996/mnemo

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/mnemo added to the repository




From cvs at kolab.org  Thu Mar 13 16:33:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:33:52 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/passwd - New directory 
Message-ID: <20080313153352.C9A6C60C4D2@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/passwd
In directory doto:/tmp/cvs-serv16996/passwd

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/passwd added to the repository




From cvs at kolab.org  Thu Mar 13 16:35:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:35:50 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/dimp - New directory 
Message-ID: <20080313153550.CBDAE60C4D5@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/dimp
In directory doto:/tmp/cvs-serv17177/dimp

Log Message:
Directory /kolabrepository/server/patches/horde/3.2-rc3/dimp added to the repository




From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3 README,NONE,1.1 
Message-ID: <20080313153727.D0F1660C4CD@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3
In directory doto:/tmp/cvs-serv17251

Added Files:
	README 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: README ---
###################################################
# Veersions
###################################################

The patches match the following upstream packages:

http://files.pardus.de/horde-framework-3.2-rc3.tar.bz2
ftp://ftp.horde.org/pub/horde/horde-3.2-rc3.tar.gz
ftp://ftp.horde.org/pub/imp/imp-h3-4.2-rc3.tar.gz
ftp://ftp.horde.org/pub/dimp/dimp-h3-1.0-rc3.tar.gz
ftp://ftp.horde.org/pub/mimp/mimp-h3-1.1-rc2.tar.gz
ftp://ftp.horde.org/pub/ingo/ingo-h3-1.2-rc2.tar.gz
ftp://ftp.horde.org/pub/passwd/passwd-h3-3.0.1.tar.gz
ftp://ftp.horde.org/pub/kronolith/kronolith-h3-2.2-rc2.tar.gz
ftp://ftp.horde.org/pub/mnemo/mnemo-h3-2.2-rc2.tar.gz
ftp://ftp.horde.org/pub/nag/nag-h3-2.2-rc2.tar.gz
ftp://ftp.horde.org/pub/turba/turba-h3-2.2-rc3.tar.gz


###################################################
# framework
###################################################

-------------------------------------------------------------------------
framework/HK-GW-Kolab_history_driver_framework-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Adds an IMAP based history driver.

  IMPACT:

    Either you can't use the history system (and thus SyncML) or you
    use the MySQL based backend.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY


-------------------------------------------------------------------------
framework/HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Adds an IMAP based SyncML driver.

  IMPACT:

    Either you can't use the SyncML system or you
    use the MySQL based backend.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY


-------------------------------------------------------------------------
framework/HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Adds routines in the Horde::Share library to store the free/busy
    relevance and the free/busy access settings.  This could be
    submitted upstream after some restructuring.

  IMPACT:

    Setting/Getting these parameters won't work in fbview.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY


-------------------------------------------------------------------------
framework/HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Necessary to allow Ingo to store the mail filters based on the
    preference driver. This patch will never make it upstream and is
    just providing a Kolab specific workaround to make Ingo work at
    the moment.

    There are two possible solutions in order to fix this:

    1) An alternative preferences driver that uses IMAP folders for
       storing client configuration data (the current Preferences
       driver uses LDAP). This driver has been already written but
       does not exist in Horde CVS yet.

    2) A specific Kolab driver that stores sieve filters in an IMAP
       folder.

    Since 1) has been already implemented this will probably allow us
    to get rid of this patch in one of the next Horde versions. 2)
    nevertheless has some other interesting side effects so this might
    get implemented too.

  IMPACT:

    Ingo will not allow you to store sieve filters without this patch.

  REFERENCES:

    Horde bug: 

    http://bugs.horde.org/ticket/?id=5117

    Wiki page:

    http://wiki.kolab.org/index.php/Template:Patches_horde

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RC1/summary

  HISTORY

    Submitted upstream and upstream rejected, explaining the problem
    with this patch.


###################################################
# kronolith
###################################################

-------------------------------------------------------------------------
kronolith/HK-GW-SyncML_support_kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Allows to synchronize the calendar data via SyncML.

  IMPACT:

    SyncML will fail.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    Has been commited upstream and will be part of 3.2.

-------------------------------------------------------------------------
kronolith/HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Fixes Horde bug 6031.

  IMPACT:

    There maybe display problems with recurring events.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    Has been commited upstream and will be part of 3.2.

-------------------------------------------------------------------------
kronolith/HK-GW-getid_kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Fixes some incorrect getId() calls.

  IMPACT:

    Unknown

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    Has been commited upstream and will be part of 3.2.

-------------------------------------------------------------------------
kronolith/HK-GW-notice_fix_kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Fixes a notice.

  IMPACT:

    Negligible.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    Has been commited upstream and will be part of 3.2.

-------------------------------------------------------------------------
kronolith/HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch
kronolith/HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch
kronolith/HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch
kronolith/HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  See below => fbview.

###################################################
# mnemo
###################################################

-------------------------------------------------------------------------
mnemo/HK-GW-Syncml_support_mnemo-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Allows to synchronize notes via SyncML.

  IMPACT:

    SyncML will fail.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    Has been commited upstream and will be part of 3.2.


###################################################
# turba
###################################################

-------------------------------------------------------------------------
turba/HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Fixes an issue with some links to the contact editing page.

  IMPACT:

    Turba will not allow you to edit some contacts.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    Horde issue # 5763

-------------------------------------------------------------------------
turba/HK-GW-Fix_share_id_change_turba-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Kolab shares currently have a problematic way of handling share
    ids. This is a workaround in Turba to fix the problem.

  IMPACT:

    Turba will behave strange when you create new shares.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    Horde issue # 5762

-------------------------------------------------------------------------
turba/HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Marks the LDAP addressbook as read only.

  IMPACT:

    Turba will pretend to allow you to write to the global addresses
    which will fail lif you really try to do so.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    This is a bad patch since we currently don't have the permission
    system within Kolab.


###################################################
# fbview
###################################################

-------------------------------------------------------------------------
fbview-kronolith/HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Provides a menu specific for the fbview application.

  IMPACT:

    Without this patch the menu in fbview will display links to
    non-existing functionality.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

-------------------------------------------------------------------------
fbview-kronolith/HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Allows to set the free/busy relevance of a calendar. This is Kolab
    specific and won't make it upstream in this form.

  IMPACT:

    Without this patch you won't be able to set the free/busy
    relevance of a calendar in fbview.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY


-------------------------------------------------------------------------
fbview-kronolith/HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Allows to set the access rules for extended free busy parameters.
    This is Kolab specific and won't make it upstream in this form.

  IMPACT:

    Without this patch you won't be able to modify the access rights
    in fbview.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY


-------------------------------------------------------------------------
fbview-kronolith/HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    Allows to display extended parameters of events in the free/busy
    list. The patch implements this is a Kolab specific fashion and
    thus it makes no sense to submit it upstream.

  IMPACT:

    The free/busy view won't display extended attributes.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    The patch has been originally developed by Stuart Binge
    (Codefusion).

-------------------------------------------------------------------------
fbview-kronolith/HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    This allows to store the list of attendees in the user
    preferences.  The patch implements this in a hackish way and it
    was consequently rejected upstream
    (http://bugs.horde.org/ticket/?id=4788). This should be solved
    using Horde::Groups or the Turba API.

  IMPACT:

    You won't be able to store the list of attendees.

  REFERENCES:

    Mercurial patch repository:

    http://hg.pardus.de/cgi-bin/hg.cgi/horde/HORDE_3_2_RELEASE/

  HISTORY

    The patch has been originally developed by Stuart Binge
    (Codefusion).

    Horde issue #4788


###################################################
# Configurations
###################################################

-------------------------------------------------------------------------
horde/HK-GW-Config_horde-3.2-rc3.patch
imp/HK-GW-Config_imp-3.2-rc3.patch
dimp/HK-GW-Config_dimp-3.2-rc3.patch
mimp/HK-GW-Config_mimp-3.2-rc3.patch
ingo/HK-GW-Config_ingo-3.2-rc3.patch
kronolith/HK-GW-Config_kronolith-3.2-rc3.patch
mnemo/HK-GW-Config_mnemo-3.2-rc3.patch
nag/HK-GW-Config_nag-3.2-rc3.patch
passwd/HK-GW-Config_passwd-3.2-rc3.patch
turba/HK-GW-Config_turba-3.2-rc3.patch
fbview-horde/HK-GW-Config_fbview-horde-3.2-rc3.patch
fbview-kronolith/HK-GW-Config_fbview-kronolith-3.2-rc3.patch
-------------------------------------------------------------------------

  DESCRIPTION:

    These patches provide configuration settings for Horde.

  IMPACT:

    Without these patches you'll have to configure Horde yourself.


From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/dimp
	HK-GW-Config_dimp-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153727.D5D0160C4D6@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/dimp
In directory doto:/tmp/cvs-serv17251/dimp

Added Files:
	HK-GW-Config_dimp-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_dimp-3.2-rc3.patch ---
Configuration for dimp.

diff -r c1c62f0fbbf0 dimp/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dimp/config/conf.php	Thu Mar 13 14:19:07 2008 +0100
@@ -0,0 +1,16 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: dimp/config/conf.xml,v 1.30.2.4 2008/02/29 13:22:08 slusarz Exp $
+$conf['hooks']['mailboxarray'] = false;
+$conf['hooks']['messageview'] = false;
+$conf['hooks']['addressformatting'] = false;
+$conf['hooks']['msglist_format'] = false;
+$conf['css_files'] = array();
+$conf['js']['debug'] = false;
+$conf['viewport']['buffer_pages'] = 7;
+$conf['viewport']['limit_factor'] = 20;
+$conf['viewport']['viewport_wait'] = 10;
+$conf['viewport']['background_inbox'] = true;
+$conf['search']['search_all'] = false;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/framework
	HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch, NONE,
	1.1 HK-GW-Kolab_history_driver_framework-3.2-rc3.patch, NONE,
	1.1 HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153727.E551960C4DB@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/framework
In directory doto:/tmp/cvs-serv17251/framework

Added Files:
	HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch 
	HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch 
	HK-GW-Kolab_history_driver_framework-3.2-rc3.patch 
	HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Fbview_xfb_concept_framework-3.2-rc3.patch ---
diff -r 7d4ae482d6a2 framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php	Thu Mar 13 07:16:33 2008 +0100
+++ b/framework/Share/Share/kolab.php	Thu Mar 13 07:16:38 2008 +0100
@@ -17,6 +17,13 @@ define('HORDE_ANNOT_SHARE_ATTR', HORDE_A
  * Marks a share without a name. These shares are still invalid
  */
 define('KOLAB_SHARE_INVALID', 'KOLAB_SHARE_INVALID');
+
+/**
+ * Kolab specific free/busy relevance
+ */
+define('KOLAB_FBRELEVANCE_ADMINS',  0);
+define('KOLAB_FBRELEVANCE_READERS', 1);
+define('KOLAB_FBRELEVANCE_NOBODY',  2);
 
 /**
  * Horde_Share_kolab:: provides the kolab backend for the horde share driver.
@@ -894,16 +901,135 @@ class Horde_Share_Object_kolab extends H
      */
     function isDefault()
     {
+        $type = $this->getType();
+        if (is_a($type, 'PEAR_Error')) {
+            return false;
+        }
+        return $type[1];
+    }
+
+    //FIXME: The following five functions (actually also most other things in this class
+    //       needs to go into Kolab/IMAP.php
+    /**
+     * Get the folder type
+     *
+     * @return mixed  Array containing the type and the default status or a PEAR_Error
+     *                if the folder annotation cannot be accessed.
+     */
+    function getType()
+    {
         $imap = &$this->_shareOb->getImap();
-        $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder);
+        $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE,
+                                           'value.shared', 
+                                           $this->_folder);
         if (is_a($annotation, 'PEAR_Error')) {
-            return false;
-        }
-        if (empty($annotation)) {
-            return false;
-        }
-        $type = explode('.', $annotation);
-        return (!empty($type[1]) && $type[1] == 'default');
+            return $annotation;
+        }
+        
+        if (!empty($annotation)) {
+            $default = false;
+            $subtype = '';
+            $type = explode('.', $annotation);
+            if (!empty($type[0])) {
+                $foldertype = $type[0];
+                if (!empty($type[1])) {
+                    $subtype = $type[1];
+                    if ($type[1] == 'default') {
+                        $default = true;
+                    }
+                }
+            }
+            return array($foldertype, $default, $subtype);
+        } else {
+            return PEAR::raiseError(sprintf(_("Unknown folder type for folder %s."), $this->_folder));
+        }
+    }
+
+    /**
+     * Get the free/busy relevance for this folder
+     *
+     * @return int  Value containing the FB_RELEVANCE.
+     */
+    function getFbrelevance()
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
+
+        $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
+        if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
+            return KOLAB_FBRELEVANCE_ADMINS;
+        }
+        switch ($annotation) {
+        case 'admins':
+            return KOLAB_FBRELEVANCE_ADMINS;
+        case 'readers':
+            return KOLAB_FBRELEVANCE_READERS;
+        case 'nobody':
+            return KOLAB_FBRELEVANCE_NOBODY;
+        default:
+            return KOLAB_FBRELEVANCE_ADMINS;
+        }
+    }
+
+    /**
+     * Set the free/busy relevance for this folder
+     *
+     * @param int $relevance Value containing the FB_RELEVANCE
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setFbrelevance($relevance)
+    {
+        switch ($relevance) {
+        case KOLAB_FBRELEVANCE_ADMINS:
+            $value = 'admins';
+            break;
+        case KOLAB_FBRELEVANCE_READERS:
+            $value = 'readers';
+            break;
+        case KOLAB_FBRELEVANCE_NOBODY:
+            $value = 'nobody';
+            break;
+        default:
+            $value = 'admins';
+        }
+
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'incidences-for';
+        return $imap->setAnnotation($entry, array('value.shared' => $value), $this->_folder);
+    }
+
+    /**
+     * Get the extended free/busy access settings for this folder
+     *
+     * @return array  Array containing the users with access to the
+     *                extended information.
+     */
+    function getXfbaccess()
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
+
+        $annotation = $imap->getAnnotation($entry, 'value.shared', $this->_folder);
+        if (is_a($annotation, 'PEAR_Error') || empty($annotation)) {
+            return array();
+        }
+        return explode(' ', $annotation);
+    }
+
+    /**
+     * Set the extended free/busy access settings for this folder
+     *
+     * @param array $access  Array containing the users with access to the
+     *                      extended information.
+     *
+     * @return mixed  True on success or a PEAR_Error.
+     */
+    function setXfbaccess($access)
+    {
+        $imap = &$this->_shareOb->getImap();
+        $entry = KOLAB_ANNOT_ROOT . 'xfb-readable';
+        return $imap->setAnnotation($entry, array('value.shared' => join(' ', $access)), $this->_folder);
     }
 
     /**
@@ -982,6 +1108,13 @@ class Horde_Share_Object_kolab extends H
             $default = array('source' => 'kolab',
                              'default' => $this->get('default'),
                              'name' => $this->get('name'));
+            $type = $this->getType();
+            if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
+                $default = array_merge($default, array(
+                                           'fbrelevance' => $this->getFbrelevance(),
+                                           'xfbaccess'   => $this->getXfbaccess()
+                                       ));
+            }
             if (is_a($params, 'PEAR_Error') || $params == '') {
                 $params = $default;
             }
@@ -1036,8 +1169,9 @@ class Horde_Share_Object_kolab extends H
             $value = unserialize($value);
             if (isset($value['default'])) {
                 $this->data['default'] = $value['default'];
-            }
-            break;
+                unset($value['default']);
+            }
+            $value = serialize($value);
 
         default:
             $this->data[$attribute] = $value;
@@ -1086,6 +1220,7 @@ class Horde_Share_Object_kolab extends H
                 }
             } elseif ($attribute == 'default') {
                 $imap = &$this->_shareOb->getImap();
+                //FIXME: Simplify with getType
                 $annotation = $imap->getAnnotation(KOLAB_ANNOT_FOLDER_TYPE, 'value.shared', $this->_folder);
                 if (is_a($annotation, 'PEAR_Error')) {
                     return $annotation;
@@ -1106,6 +1241,40 @@ class Horde_Share_Object_kolab extends H
                 continue;
             } elseif ($attribute == 'folder') {
                 continue;
+            } elseif ($attribute == 'params') {
+                $type = $this->getType();
+                if (!is_a($type, 'PEAR_Error') && $type[0] == 'event') {
+                    $params = @unserialize($value);
+                    if (isset($params['fbrelevance'])) {
+                        $result = $this->setFbrelevance($params['fbrelevance']);
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        }
+                        unset($params['fbrelevance']);
+                    }
+                    if (isset($params['xfbaccess'])) {
+                        $result = $this->setXfbaccess($params['xfbaccess']);
+                        if (is_a($result, 'PEAR_Error')) {
+                            return $result;
+                        }
+                        unset($params['xfbaccess']);
+                    }
+
+                    if (empty($params)) {
+                        continue;
+                    }
+                    
+                    $value = @serialize($params);
+                }
+
+                $imap = &$this->_shareOb->getImap();
+                // setAnnotation apparently does not suppoort UTF-8 nor any special characters
+                $store = base64_encode($value);
+                $entry = HORDE_ANNOT_SHARE_ATTR . $attribute;
+                $result = $imap->setAnnotation($entry, array('value.shared' => $store), $this->_folder);
+                if (is_a($result, 'PEAR_Error')) {
+                    return $result;
+                }
             } else {
                 $imap = &$this->_shareOb->getImap();
                 // setAnnotation apparently does not suppoort UTF-8 nor any special characters

--- NEW FILE: HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc3.patch ---
A dumb patch to fix the preference system for Ingo. Ingo probably needs a new Kolab driver to circumvent this problem in a correct fashion.

diff -r 007f8b011552 framework/Prefs/Prefs/kolab.php
--- a/framework/Prefs/Prefs/kolab.php	Fri Mar 07 07:10:21 2008 +0100
+++ b/framework/Prefs/Prefs/kolab.php	Fri Mar 07 07:10:25 2008 +0100
@@ -1,5 +1,6 @@
 <?php
 
+require_once 'Horde/Auth.php';
 require_once 'Horde/Prefs/ldap.php';
 require_once 'Horde/Kolab.php';
 
@@ -42,7 +43,8 @@ class Prefs_kolab extends Prefs_ldap {
                         'searchpw' => $GLOBALS['conf']['kolab']['ldap']['phppw'],
                         'uid' => 'mail');
 
-        parent::Prefs_ldap($user, $password, $scope, $params, $caching);
+        parent::Prefs_ldap(Auth::getAuth(), Auth::getCredential('password'),
+                           $scope, $params, $caching);
     }
 
 }

--- NEW FILE: HK-GW-Kolab_history_driver_framework-3.2-rc3.patch ---
diff -r c394053eccb5 framework/History/History.php
--- a/framework/History/History.php	Thu Mar 13 07:13:48 2008 +0100
+++ b/framework/History/History.php	Thu Mar 13 07:14:22 2008 +0100
@@ -1,7 +1,7 @@
 <?php
 /**
  * The History:: class provides a method of tracking changes in Horde
- * objects, stored in a SQL table.
+ * objects.
  *
  * $Horde: framework/History/History.php,v 1.58 2008/01/02 11:11:59 jan Exp $
  *
@@ -17,86 +17,49 @@ class Horde_History {
 class Horde_History {
 
     /**
-     * Pointer to a DB instance to manage the history.
-     *
-     * @var DB
[...1235 lines suppressed...]
@@ -56,6 +56,7 @@ communication between a Horde client and
     <dir name="XML">
      <file name="contact.php" role="php" />
      <file name="event.php" role="php" />
+     <file name="history.php" role="php" />
      <file name="task.php" role="php" />
      <file name="note.php" role="php" />
      <file name="prefs.php" role="php" />
diff -r c394053eccb5 framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php	Thu Mar 13 07:13:48 2008 +0100
+++ b/framework/Share/Share/kolab.php	Thu Mar 13 07:14:22 2008 +0100
@@ -605,6 +605,8 @@ class Horde_Share_kolab extends Horde_Sh
             return _("Calendar");
         case 'nag':
             return _("Tasks");
+        case 'history':
+            return _("History");
         case 'ingo':
             return _("Filters");
         case 'prefs':

--- NEW FILE: HK-GW-Kolab_syncml_driver_framework-3.2-rc3.patch ---
diff -r be3dbc9fb8b3 framework/Kolab/Kolab.php
--- a/framework/Kolab/Kolab.php	Thu Mar 13 10:04:59 2008 +0100
+++ b/framework/Kolab/Kolab.php	Thu Mar 13 10:15:22 2008 +0100
@@ -742,6 +742,14 @@ class Kolab {
                 'default_share_name'    => _("%s's History"),
             );
 
+        case 'syncml':
+            return array(
+                'mime_type_suffix'      => 'syncml',
+                'default_folder_name'   => _("SyncML"),
+                'share_name'            => _("sync db"),
+                'default_share_name'    => _("%s's SyncML db"),
+            );
+
         default:
             return PEAR::raiseError(sprintf(_("The Horde/Kolab integration engine does not support \"%s\""), $app));
         }
diff -r be3dbc9fb8b3 framework/Kolab/Kolab/XML/syncml.php
[...1532 lines suppressed...]
+        $dt->remove($this->_user, true);
+
+        print "OK\n";
+    }
+
+}
diff -r be3dbc9fb8b3 framework/SyncML/package.xml
--- a/framework/SyncML/package.xml	Thu Mar 13 10:04:59 2008 +0100
+++ b/framework/SyncML/package.xml	Thu Mar 13 10:15:22 2008 +0100
@@ -62,6 +62,10 @@ http://pear.php.net/dtd/package-2.0.xsd"
     </dir> <!-- /SyncML/Device -->
     <dir name="Backend">
      <file name="Horde.php" role="php" />
+     <dir name="Horde">
+       <file name="kolab.php" role="php" />
+       <file name="sql.php" role="php" />
+     </dir> <!-- /SyncML/Backend/Horde -->
      <file name="Sql.php" role="php" />
     </dir> <!-- /SyncML/Backend -->
     <file name="Backend.php" role="php" />



From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/kronolith
	HK-GW-Config_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-SyncML_support_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-getid_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-notice_fix_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch, NONE,
	1.1 HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153727.F0A416184A1@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/kronolith
In directory doto:/tmp/cvs-serv17251/kronolith

Added Files:
	HK-GW-Config_kronolith-3.2-rc3.patch 
	HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch 
	HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch 
	HK-GW-SyncML_support_kronolith-3.2-rc3.patch 
	HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch 
	HK-GW-getid_kronolith-3.2-rc3.patch 
	HK-GW-notice_fix_kronolith-3.2-rc3.patch 
	HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch 
	HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_kronolith-3.2-rc3.patch ---
diff -r 676351b87557 kronolith/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/config/conf.php	Thu Mar 13 14:18:48 2008 +0100
@@ -0,0 +1,20 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: kronolith/config/conf.xml,v 1.14.10.5 2007/12/20 14:12:23 jan Exp $
+$conf['calendar']['driver'] = 'kolab';
+$conf['storage']['default_domain'] = '';
+$conf['storage']['freebusy']['protocol'] = 'https';
+$conf['storage']['freebusy']['port'] = 443;
+$conf['storage']['driver'] = 'kolab';
+$conf['metadata']['keywords'] = false;
+$conf['reminder']['server_name'] = '';
+$conf['reminder']['from_addr'] = '';
+$conf['autoshare']['shareperms'] = 'none';
+$conf['holidays']['enable'] = true;
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r 676351b87557 kronolith/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/config/kolab.php	Thu Mar 13 14:18:48 2008 +0100
@@ -0,0 +1,5 @@
+<?php
+$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
+$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
+$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
+?>

--- NEW FILE: HK-GW-Fbview_relevance_kronolith-3.2-rc3.patch ---
Allows to set the free/busy relevance on a calendar.

diff -r e6be25b82291 fbview-kronolith/calendars/edit.php
--- a/kronolith/calendars/edit.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/kronolith/calendars/edit.php	Thu Feb 21 12:22:33 2008 +0100
@@ -53,6 +53,10 @@ if ($form->validate($vars)) {
 
 $vars->set('name', $calendar->get('name'));
 $vars->set('description', $calendar->get('desc'));
+$params = @unserialize($calendar->get('params'));
+if (isset($params['fbrelevance'])) {
+    $vars->set('fbrelevance', $params['fbrelevance']);
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r e6be25b82291 fbview-kronolith/lib/Forms/CreateCalendar.php
--- a/kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 12:22:33 2008 +0100
@@ -35,6 +35,9 @@ class Kronolith_CreateCalendarForm exten
 
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Create")));
     }
@@ -48,6 +51,7 @@ class Kronolith_CreateCalendarForm exten
         }
         $calendar->set('name', $this->_vars->get('name'));
         $calendar->set('desc', $this->_vars->get('description'));
+        $calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
         return $GLOBALS['kronolith_shares']->addShare($calendar);
     }
 
diff -r e6be25b82291 fbview-kronolith/lib/Forms/EditCalendar.php
--- a/kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 12:22:34 2008 +0100
@@ -42,6 +42,9 @@ class Kronolith_EditCalendarForm extends
         $this->addHidden('', 'c', 'text', true);
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Save")));
     }
@@ -51,6 +54,7 @@ class Kronolith_EditCalendarForm extends
         $original_name = $this->_calendar->get('name');
         $this->_calendar->set('name', $this->_vars->get('name'));
         $this->_calendar->set('desc', $this->_vars->get('description'));
+        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
 
         if ($original_name != $this->_vars->get('name')) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));

--- NEW FILE: HK-GW-Fbview_xfb_access_kronolith-3.2-rc3.patch ---
diff -r 14457cf2ea2c kronolith/perms.php
--- a/kronolith/perms.php	Thu Nov 29 15:20:49 2007 +0100
+++ b/kronolith/perms.php	Thu Nov 29 15:25:36 2007 +0100
@@ -15,6 +15,34 @@ require_once KRONOLITH_BASE . '/lib/base
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/Group.php';
 
+function &getFbperms($share) 
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        if (isset($params['xfbaccess'])) {
+            $xfbusers = $params['xfbaccess'];
+            foreach ($xfbusers as $user) {
+                $fbperms[$user] = PERMS_READ;
+            }
+        }
+    }
+    return $fbperms;
+}
+
+function setFbperms($share, $xfbusers)
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        $params['xfbaccess'] = $xfbusers;
+        $params = serialize($params);
+        $share->set('params', $params);
+    }
+}
+
 $shares = &Horde_Share::singleton('kronolith');
 $groups = &Group::singleton();
 $auth = &Auth::singleton($conf['auth']['driver']);
@@ -36,6 +64,8 @@ case 'edit':
         $notification->push($share, 'horde.error');
     } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) {
         exit('permission denied');
+    } else {
+        $fbperms = getFbperms($share);
     }
     break;
 
@@ -251,6 +281,24 @@ case 'editform':
             }
         }
 
+        // Process free/busy permissions.
+        $fb_names = Util::getFormData('fb_names');
+        $fb_read = Util::getFormData('fb_read');
+
+        $fbperms = getFbperms($share);
+        foreach ($fb_names as $key => $user) {
+            if (empty($user)) {
+                continue;
+            }
+
+            if (!empty($fb_read[$key])) {
+                $fbperms[$user] = PERMS_READ;
+            } else {
+                unset($fbperms[$user]);
+            }
+        }
+        setFbperms($share, array_keys($fbperms));
+
         $share->setPermission($perm, false);
         $share->save();
         $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
diff -r 14457cf2ea2c kronolith/templates/perms/perms.inc
--- a/kronolith/templates/perms/perms.inc	Thu Nov 29 15:20:49 2007 +0100
+++ b/kronolith/templates/perms/perms.inc	Thu Nov 29 15:25:36 2007 +0100
@@ -355,6 +355,61 @@
   <td>&nbsp;</td>
 </tr>
 
+<!-- Extended free/busy Permissions -->
+<tr valign="middle">
+  <td class="header leftAlign">
+    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Extended free/busy access") ?>
+  </td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center"><?php echo _("Read") ?></td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header">&nbsp;</td>
+</tr>
+<?php foreach ($fbperms as $user => $fbperm) { if ($user != $owner) { ?>
+<tr>
+  <td class="light"><?php echo htmlspecialchars(Auth::removeHook($user)) ?><input type="hidden" name="fb_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" name="fb_read[<?php echo htmlspecialchars($user) ?>]"<?php echo ($fbperm & PERMS_READ) ? ' checked="checked"' : '' ?> />
+    <label for="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+<?php } } ?>
+<!-- New extended free/busy row -->
+<tr>
+<?php if ($auth->hasCapability('list')): ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+    <select id="fb_names_new" name="fb_names[||new]">
+      <option value=""><?php echo _("Select a user to add:") ?></option>
+    <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
+      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+    <?php } } ?>
+    </select>
+  </td>
+<?php else: ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("User to add:") ?></label>
+    <input type="text" id="fb_names_new" name="fb_names[||new]" />
+  </td>
+<?php endif; ?>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_new" name="fb_read[||new]" />
+    <label for="fb_read_new" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+
 <tr>
  <td colspan="7">&nbsp;</td>
 </tr>

--- NEW FILE: HK-GW-SyncML_support_kronolith-3.2-rc3.patch ---
diff -r 172b6872dafc kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php	Thu Mar 13 13:27:27 2008 +0100
+++ b/kronolith/lib/Driver/kolab.php	Thu Mar 13 13:27:34 2008 +0100
@@ -437,18 +437,13 @@ class Kronolith_Driver_kolab_wrapper_old
 
         $edit = false;
         if ($event->isStored() || $event->exists()) {
-            $uid = $event->getUID();
-
-            $result = $this->_kolab->loadObject($uid);
-            //No error check here, already done in exists()
-
+            $uid = $event->getId();
             $edit = true;
         } else {
-            if ($event->getUID()) {
-                $uid = $event->getUID();
+            if ($event->getId()) {
+                $uid = $event->getId();
             } else {
                 $uid = md5(uniqid(mt_rand(), true));
-                $event->setUID($uid);
                 $event->setId($uid);
             }
 
@@ -975,6 +970,36 @@ class Kronolith_Driver_kolab_wrapper_new
         $this->_synchronized = false;
     }
 
+    /**
+     * Split the unique id into calendar and id.
+     *
+     * @param string $uid  The global UID for a event.
+     *
+     * @return array An array holding the calendar and the id within
+     *               that calendar.
+     */
+    function _splitUID($uid)
+    {
+        if (!$uid) {
+            return array(null, null);
+        }
+
+        $split = split('@', $uid, 3);
+        if (count($split) == 3) {
+            $calendar = $split[0];
+            $id = $split[1];
+        } else if (count($split) == 2) {
+            $calendar = Auth::getAuth();
+            $id = $split[0];
+        } else {
+            /* Hm, this should not happen */
+            Horde::logMessage(sprintf(_("Invalid uid %s"), $uid), __FILE__, __LINE__, PEAR_LOG_ERR);
+            $calendar = Auth::getAuth();
+            $id = $uid;
+        }
+        return array($id, $calendar);
+    }
+
     // We delay initial synchronization to the first use
     // so multiple calendars don't add to the total latency.
     // This function must be called before all internal driver functions
@@ -1069,13 +1094,21 @@ class Kronolith_Driver_kolab_wrapper_new
             return PEAR::raiseError(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->_driver->_calendar));
         }
 
+        list($id, $calendar) = $this->_splitUID($uid);
+
+        // Log error if someone uses this function in an unsupported way
+        if ($calendar != $this->_driver->_calendar) {
+            Horde::logMessage(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar, $this->_driver->_calendar), __FILE__, __LINE__, PEAR_LOG_ERR);
+            return PEAR::raiseError(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar, $this->_driver->_calendar));
+        }
+
         $result = $this->synchronize();
         if (is_a($result, 'PEAR_Error')) {
             return $result;
         }
 
-        if ($this->_store->objectUidExists($uid)) {
-            return $uid;
+        if ($this->_store->objectUidExists($id)) {
+            return $id;
         }
 
         return false;
@@ -1141,7 +1174,7 @@ class Kronolith_Driver_kolab_wrapper_new
             }
 
             if ($keep_event) {
-                $ids[$event->getUID()] = $event->getUID();
+                $ids[$event->getUID()] = $event->getId();
             }
         }
 
@@ -1169,18 +1202,14 @@ class Kronolith_Driver_kolab_wrapper_new
 
     function &getByUID($uid, $getAll = false)
     {
-        $ownerCalendars = array_keys(Kronolith::listCalendars(true, PERMS_READ));
+        list($id, $calendar) = $this->_splitUID($uid);
 
-        foreach ($ownerCalendars as $calendar) {
-            $this->_driver->open($calendar);
-            $this->synchronize();
+        $this->_driver->open($calendar);
+        $this->synchronize();
 
-            if (!array_key_exists($uid, $this->_events_cache)) {
-                continue;
-            }
-
+        if (array_key_exists($id, $this->_events_cache)) {
             // Ok, found event
-            $event = &$this->_events_cache[$uid];
+            $event = &$this->_events_cache[$id];
 
             if ($getAll) {
                 $events = array();
@@ -1209,9 +1238,9 @@ class Kronolith_Driver_kolab_wrapper_new
             return $result;
         }
 
-        $uid = $event->getUID();
+        $uid = $event->getId();
         if ($uid == null) {
-            $event->setUID($this->_store->generateUID());
+            $event->setId($this->_store->generateUID());
         }
 
         $attributes = $event->toDriver();
@@ -1219,12 +1248,19 @@ class Kronolith_Driver_kolab_wrapper_new
         $stored_uid = null;
         if ($event->isStored() || $event->exists()) {
             $stored_uid = $attributes['uid'];
+            $action = array('action' => 'modify');
+        } else {
+            $action = array('action' => 'add');
         }
 
         $result = $this->_store->save($attributes, $stored_uid);
         if (is_a($result, 'PEAR_Error')) {
             return $result;
         }
+
+        /* Log the creation/modification of this item in the history log. */
+        $history = &Horde_History::singleton();
+        $history->log('kronolith:' . $event->getCalendar() . ':' . $event->getUID(), $action, true);
 
         // refresh IMAP cache
         $this->synchronize(true);
@@ -1233,7 +1269,7 @@ class Kronolith_Driver_kolab_wrapper_new
             Kolab::triggerFreeBusyUpdate($this->_store->parseFolder($this->_driver->_calendar));
         }
 
-        return $event->getUID();
+        return $event->getId();
     }
 
     /**
@@ -1332,6 +1368,10 @@ class Kronolith_Driver_kolab_wrapper_new
                 Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
             }
 
+            /* Log the deletion of this item in the history log. */
+            $history = &Horde_History::singleton();
+            $history->log('kronolith:' . $event->getCalendar() . ':' . $event->getUID(), array('action' => 'delete'), true);
+
             if (is_callable('Kolab', 'triggerFreeBusyUpdate')) {
                 Kolab::triggerFreeBusyUpdate($this->_store->parseFolder($this->_driver->_calendar));
             }
@@ -1351,10 +1391,61 @@ class Kronolith_Driver_kolab_wrapper_new
  */
 class Kronolith_Event_kolab_new extends Kronolith_Event {
 
+    /**
+     * Returns the global UID for this event.
+     *
+     * @return string  The global UID for this event.
+     */
+    function getUID()
+    {
+      if (!$this->eventID) {
+            return null;
+        }
+        
+        if ($this->_calendar == Auth::getAuth()) {
+            return $this->eventID . '@' . $GLOBALS['conf']['server']['name'];
+        }
+        return $this->eventID . '@' . $this->_calendar . '@' . $GLOBALS['conf']['server']['name'];
+    }
+
+    /**
+     * Sets the global UID for this event. For the Kolab backend it is
+     * suboptimal if the UID gets set as we rather generate the UID
+     * based on the ID. But we'll try to support is as much as
+     * possible.
+     *
+     * @param string $uid  The global UID for this event.
+     */
+    function setUID($uid)
+    {
+        if (!$uid) {
+            $this->_uid = null;
+            $this->eventID = null;
+            return;
+        }
+
+        $split = split('@', $uid, 3);
+        if (count($split) == 3) {
+            $this->_uid = $uid;
+            $this->eventID = $split[1];
+            $this->_calendar = $split[0];
+        } else if (count($split) == 2) {
+            $this->_uid = $uid;
+            $this->eventID = $split[0];
+            $this->_calendar = Auth::getAuth();
+        } else {
+            /* Hm, this should not happen */
+            Horde::logMessage(sprintf(_("Invalid uid %s"), $uid), __FILE__, __LINE__, PEAR_LOG_ERR);
+            $this->_uid = $uid;
+            $this->eventID = $uid;
+            $this->_calendar = Auth::getAuth();
+        }
+    }
+
     function fromDriver($event)
     {
         $this->eventID = $event['uid'];
-        $this->setUID($this->eventID);
+        $this->_uid = $this->getUID();
 
         if (isset($event['summary'])) {
             $this->title = $event['summary'];
@@ -1472,7 +1563,7 @@ class Kronolith_Event_kolab_new extends 
     function toDriver()
     {
         $event = array();
-        $event['uid'] = $this->getUID();
+        $event['uid'] = $this->getId();
         $event['summary'] = $this->title;
         $event['body']  = $this->description;
         $event['location'] = $this->location;
@@ -1485,7 +1576,7 @@ class Kronolith_Event_kolab_new extends 
         }
 
         // Only set organizer if this is a new event
-        if ($this->getID() == null) {
+        if (!$this->exists()) {
             $organizer = array(
                             'display-name' => Kronolith::getUserName($this->getCreatorId()),
                             'smtp-address' => Kronolith::getUserEmail($this->getCreatorId())

--- NEW FILE: HK-GW-bug_6031_merged_kronolith-3.2-rc3.patch ---
diff -r 7070ff26ec97 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php	Wed Mar 12 08:28:13 2008 +0100
+++ b/kronolith/lib/Driver/kolab.php	Wed Mar 12 14:41:10 2008 +0100
@@ -1156,11 +1156,20 @@ class Kronolith_Driver_kolab_wrapper_new
             /* do recurrence expansion if not keeping anyway */
             if (!$keep_event && $event->recurs()) {
                 $next = $event->recurrence->nextRecurrence($startDate);
-                if ($next !== false && 
-                    !$event->recurrence->hasException($next->year, $next->month, $next->mday) &&
-                    (!(($endDate->compareDateTime($event->start) < 0) || 
-                       ($startDate->compareDateTime($event->end) > 0)))) {
-                    $keep_event = true;
+                while ($next !== false && 
+                       $event->recurrence->hasException($next->year, $next->month, $next->mday)) {
+                    $next->mday++;
+                    $next = $event->recurrence->nextRecurrence($next);
+                }
+
+                if ($next !== false) {
+                    $duration = $next->timestamp() - $event->start->timestamp();
+                    $next_end = &new Horde_Date($event->end->timestamp() + $duration);
+
+                    if ((!(($endDate->compareDateTime($next) < 0) || 
+                           ($startDate->compareDateTime($next_end) > 0)))) {
+                        $keep_event = true;
+                    }
                 }
             }
 

--- NEW FILE: HK-GW-getid_kronolith-3.2-rc3.patch ---
diff -r 8e1e82288f58 kronolith/delete.php
--- a/kronolith/delete.php	Thu Mar 06 11:09:17 2008 +0100
+++ b/kronolith/delete.php	Thu Mar 06 11:13:53 2008 +0100
@@ -56,7 +56,7 @@ if ($eventID = Util::getFormData('eventI
         if (!$event->recurs() ||
             Util::getFormData('all') ||
             !$event->recurrence->hasActiveRecurrence()) {
-            $result = $kronolith_driver->deleteEvent($event->getID());
+            $result = $kronolith_driver->deleteEvent($event->getId());
             if (is_a($result, 'PEAR_Error')) {
                 $notification->push($result, 'horde.error');
             }
diff -r 8e1e82288f58 kronolith/lib/Driver/holidays.php
--- a/kronolith/lib/Driver/holidays.php	Thu Mar 06 11:09:17 2008 +0100
+++ b/kronolith/lib/Driver/holidays.php	Thu Mar 06 11:13:53 2008 +0100
@@ -177,7 +177,7 @@ class Kronolith_Event_holidays extends K
         $this->stored = true;
         $this->initialized = true;
         $this->setTitle(String::convertCharset($dhEvent->getTitle(), 'iso-8859-1'));
-        $this->setID($dhEvent->getInternalName());
+        $this->setId($dhEvent->getInternalName());
 
         $this->start = new Horde_Date($dhEvent->_date->getTime());
         $this->end = new Horde_Date($this->start);
diff -r 8e1e82288f58 kronolith/lib/Driver/sql.php
--- a/kronolith/lib/Driver/sql.php	Thu Mar 06 11:09:17 2008 +0100
+++ b/kronolith/lib/Driver/sql.php	Thu Mar 06 11:13:53 2008 +0100
@@ -805,7 +805,7 @@ class Kronolith_Driver_sql extends Krono
                     return $event;
                 }
 
-                $this->deleteEvent($event->getID());
+                $this->deleteEvent($event->getId());
             }
         }
         return true;
diff -r 8e1e82288f58 kronolith/lib/api.php
--- a/kronolith/lib/api.php	Thu Mar 06 11:09:17 2008 +0100
+++ b/kronolith/lib/api.php	Thu Mar 06 11:13:53 2008 +0100
@@ -921,7 +921,7 @@ function _kronolith_delete($uid)
         return PEAR::raiseError(_("Permission Denied"));
     }
 
-    return $kronolith_driver->deleteEvent($event->getID());
+    return $kronolith_driver->deleteEvent($event->getId());
 }
 
 /**
diff -r 8e1e82288f58 kronolith/templates/delete/one.inc
--- a/kronolith/templates/delete/one.inc	Thu Mar 06 11:09:17 2008 +0100
+++ b/kronolith/templates/delete/one.inc	Thu Mar 06 11:13:53 2008 +0100
@@ -11,7 +11,7 @@ if (empty($url)) {
 <input type="hidden" name="month" value="<?php if (isset($month)) echo htmlspecialchars($month) ?>" />
 <input type="hidden" name="mday" value="<?php if (isset($day)) echo htmlspecialchars($day) ?>" />
 <input type="hidden" name="url" value="<?php echo htmlspecialchars($url) ?>" />
-<input type="hidden" name="eventID" value="<?php echo htmlspecialchars($this->event->getID()) ?>" />
+<input type="hidden" name="eventID" value="<?php echo htmlspecialchars($this->event->getId()) ?>" />
 <input type="hidden" name="calendar" value="<?php echo htmlspecialchars(Util::getFormData('calendar')) ?>" />
 
 <div class="headerbox">
diff -r 8e1e82288f58 kronolith/templates/edit/edit.inc
--- a/kronolith/templates/edit/edit.inc	Thu Mar 06 11:09:17 2008 +0100
+++ b/kronolith/templates/edit/edit.inc	Thu Mar 06 11:13:53 2008 +0100
@@ -10,7 +10,7 @@
 <input type="hidden" name="url" value="<?php echo htmlspecialchars($url) ?>" />
 <?php endif; ?>
 <?php if ($event->isInitialized() && !$event->isRemote()): ?>
-<input type="hidden" name="eventID" value="<?php echo htmlspecialchars($event->getID()) ?>" />
+<input type="hidden" name="eventID" value="<?php echo htmlspecialchars($event->getId()) ?>" />
 <input type="hidden" name="existingcalendar" value="<?php echo htmlspecialchars($event->getCalendar()) ?>" />
 <?php endif; ?>
 <?php if (!$showCalSelect): ?>

--- NEW FILE: HK-GW-notice_fix_kronolith-3.2-rc3.patch ---
diff -r fe6b81992192 kronolith/lib/Driver/kolab.php
--- a/kronolith/lib/Driver/kolab.php	Wed Mar 05 08:41:51 2008 +0100
+++ b/kronolith/lib/Driver/kolab.php	Wed Mar 05 08:44:50 2008 +0100
@@ -1380,19 +1380,23 @@ class Kronolith_Event_kolab_new extends 
         $this->end = new Horde_Date($event['end-date']);
         $this->durMin = ($this->end->timestamp() - $this->start->timestamp()) / 60;
 
-        switch ($event['show-time-as']) {
-            case 'free':
-                $this->status = KRONOLITH_STATUS_CANCELLED;
-                break;
-
-            case 'tentative':
-                $this->status = KRONOLITH_STATUS_TENTATIVE;
-                break;
-
-            case 'busy':
-            case 'outofoffice':
-            default:
-                $this->status = KRONOLITH_STATUS_CONFIRMED;
+        if (isset($event['show-time-as'])) {
+            switch ($event['show-time-as']) {
+                case 'free':
+                    $this->status = KRONOLITH_STATUS_CANCELLED;
+                    break;
+
+                case 'tentative':
+                    $this->status = KRONOLITH_STATUS_TENTATIVE;
+                    break;
+
+                case 'busy':
+                case 'outofoffice':
+                default:
+                    $this->status = KRONOLITH_STATUS_CONFIRMED;
+            }
+        } else {
+            $this->status = KRONOLITH_STATUS_CONFIRMED;
         }
 
         // Recurrence

--- NEW FILE: HK-SB-Fbview_extra_params_kronolith-3.2-rc3.patch ---
This includes extra parameters into the free/busy view. The params are hardcoded so this patch won't make it upstream.

diff -r ef1a8c5a02ca kronolith/lib/FBView.php
--- a/kronolith/lib/FBView.php	Fri Mar 07 07:26:47 2008 +0100
+++ b/kronolith/lib/FBView.php	Fri Mar 07 07:28:12 2008 +0100
@@ -86,7 +86,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_requiredMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -107,7 +107,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_optionalMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -122,6 +122,9 @@ class Kronolith_FreeBusy_View {
             $template->set('legend', '');
             $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.html');
         }
+
+	//**********
+	//This has been disabled in kolab-fbview. Make this optional?
 
         // Possible meeting times.
         $optimal->setAttribute('ORGANIZER', _("All Attendees"));
@@ -144,6 +147,9 @@ class Kronolith_FreeBusy_View {
         $template->set('name', _("Required Attendees"));
         $template->set('blocks', $blocks);
         $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
+
+	//This has been disabled in kolab-fbview. Make this optional?
+	//**********
 
         // Reset locale.
         setlocale(LC_NUMERIC, $lc);
@@ -217,7 +223,7 @@ class Kronolith_FreeBusy_View {
         return $instances[$view];
     }
 
-    function _getBlocks($member, $periods, $blockfile, $label)
+    function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
     {
         $template = new Horde_Template();
         $template->set('label', $label);
@@ -250,6 +256,21 @@ class Kronolith_FreeBusy_View {
 
                 $template->set('left', $left . '%');
                 $template->set('width', $width . '%');
+                $template->set('evclick', '');
+
+                if (isset($extra[$periodStart])) {
+                    if (!empty($extra[$periodStart]['X-UID'])) {
+                        $link = "javascript:performAction('viewaction', '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), 
+								'UTF-8',NLS::getCharset())) . "')";
+                        $template->set('evclick', $link);
+                    }
+                    if (!empty($extra[$periodStart]['X-SUMMARY'])) {
+                        $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8',
+				       NLS::getCharset()));
+                    }
+                }
 
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
             } else {

--- NEW FILE: HK-SB-Fbview_save_attendees_kronolith-3.2-rc3.patch ---
Provides a patch to store the list of attendees in the user preferences. This is a broken patch that has been rejected upstream (http://bugs.horde.org/ticket/?id=4788). This should be solved using Horde::Groups.

diff -r 493f14c45965 kronolith/attendees.php
--- a/kronolith/attendees.php	Tue Feb 26 14:53:24 2008 +0100
+++ b/kronolith/attendees.php	Tue Feb 26 14:53:35 2008 +0100
@@ -159,6 +159,16 @@ case 'clear':
     $attendees = array();
     $_SESSION['kronolith']['attendees'] = $attendees;
     break;
+
+case 'save':
+    if (empty($attendees)) {
+        break;
+    }
+    $savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+    $savedattlist[] = array_keys($attendees);
+    $prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    $notification->push(_('Successfully saved attendee list'), 'horde.success');
+    break;
 }
 
 // Get the current Free/Busy view; default to the 'day' view if none specified.
@@ -237,6 +247,14 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+if ($browser->hasFeature('javascript')) {
+    Horde::addScriptFile('open_savedattlist_win.js');
+    $savedattlist_url = 'javascript:open_savedattlist_win();';
+} else {
+    $savedattlist_url = Horde::applicationUrl('savedattlist.php');
+}
+
 $notification->notify(array('status'));
 require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 493f14c45965 kronolith/config/prefs.php.dist
--- a/kronolith/config/prefs.php.dist	Tue Feb 26 14:53:24 2008 +0100
+++ b/kronolith/config/prefs.php.dist	Tue Feb 26 14:53:35 2008 +0100
@@ -457,3 +457,11 @@ if ($GLOBALS['registry']->hasMethod('con
     'shared' => false,
     'type' => 'implicit'
 );
+
+$_prefs['saved_attendee_list'] = array(
+    'value' => 'a:0:{}',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit',
+    'desc' => _("A saved list of attendees")
+);
diff -r 493f14c45965 kronolith/savedattlist.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/savedattlist.php	Tue Feb 26 14:53:35 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
+ * $Horde: kronolith/attendeeshandler.php,v 1.1 2004/05/25 08:34:21 stuart Exp $
+ *
+ * Copyright 2004 Code Fusion  <http://www.codefusion.co.za/>
+ *                Stuart Binge <s.binge at codefusion.co.za>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/FBView.php';
+
+$title = _('Load Attendee List');
+
+Horde::addScriptFile('tooltip.js', 'horde');
+require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+// Get our list of saved attendees
+$savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+
+// Preformat our image urls
+$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde'));
+$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde'));
+
+// Get our Action ID & Value. This specifies what action the user initiated.
+$actionID = Util::getFormData('actionID', false);
+$actionValue = Util::getFormData('actionValue', false);
+if (!$actionID) {
+    $actionID = (Util::getFormData('addNew', false) ? 'add' : false);
+    $actionValue = Util::getFormData('newAttendees', '');
+}
+
+// Perform the specified action, if there is one.
+switch ($actionID) {
+case 'remove':
+    // Remove the specified attendee
+    if (array_key_exists($actionValue, $savedattlist)) {
+        unset($savedattlist[$actionValue]);
+	$prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    }
+    
+    break;
+
+case 'dismiss':
+    // Make sure we're actually allowed to dismiss
+    if (!$allow_dismiss) break;
+
+    // Close the attendee window
+    global $browser;
+
+    if ($browser->hasFeature('javascript')) {
+        Util::closeWindowJS();
+    } else {
+        $url = Util::getFormData('url');
+
+        if (!empty($url)) {
+            $location = Horde::applicationUrl($url, true);
+        } else {
+            $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month'));
+            $url = Util::addParameter($url, 'year', Util::getFormData('year'));
+            $location = Horde::applicationUrl($url, true);
+        }
+
+        // Make sure URL is unique.
+        $location = Util::addParameter($location, 'unique', md5(microtime()));
+
+        header('Location: ' . $location);
+    }
+    break;
+}
+
+$form_handler = Horde::applicationUrl('savedattlist.php');
+require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc';
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r 493f14c45965 kronolith/templates/attendees/attendees.inc
--- a/kronolith/templates/attendees/attendees.inc	Tue Feb 26 14:53:24 2008 +0100
+++ b/kronolith/templates/attendees/attendees.inc	Tue Feb 26 14:53:35 2008 +0100
@@ -92,6 +92,8 @@ function switchDateView(view, timestamp)
 <div>
  <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
  <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" />
+ <input type="button" class="button" name="loadAttList" value="<?php echo htmlspecialchars(_("Load Attendee List")) ?>" onclick="<?php echo $savedattlist_url ?>" />
+ <?php if (!empty($attendees)): ?><input type="button" class="button" name="saveAttList" value="<?php echo htmlspecialchars(_("Save Attendee List")) ?>" onclick="performAction('save', '');" /><?php endif; ?>
  <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all attendees")) ?>" /><?php endif; ?>
 </div>
 
diff -r 493f14c45965 kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/javascript/open_savedattlist_win.js	Tue Feb 26 14:53:35 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
+<?php endif; ?>
+function open_savedattlist_win(args)
+{
+    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/savedattlist.php', 'kronolith')) ?>";
+    if (url.indexOf('?') == -1) glue = '?';
+    else glue = '<?php echo ini_get('arg_separator.output') ?>';
+    var now = new Date();
+    var name = "savedattlist_window_" + now.getTime();
+    if (args != "") {
+        url = url + glue + args + '<?php echo ini_get('arg_separator.output') ?>' + "uniq=" + now.getTime();
+    } else {
+        url = url + glue + "uniq=" + now.getTime();
+    }
+    var Width = screen.width;
+    if (Width > 775) {
+        Width = 700;
+    } else {
+        Width -= 75;
+    }
+    var Height = screen.height;
+    if (Height > 725) {
+        Height = 650;
+    } else {
+        Height -= 75;
+    }
+    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + Width + ",height=" + Height + ",left=0,top=0";
+    name = window.open(url, name, param);
+    if (!eval("name.opener")) {
+        name.opener = self;
+    }
+}
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?>// -->
+</script>
+<?php endif; ?>
diff -r 493f14c45965 kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kronolith/templates/savedattlist/savedattlist.inc	Tue Feb 26 14:53:35 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
+<!--
+function performAction(id, value)
+{
+    document.savedattlistForm.actionID.value = id;
+    document.savedattlistForm.actionValue.value = value;
+    document.savedattlistForm.submit();
+    return false;
+}
+
+function updateMessage(list)
+{
+    if (parent.opener.closed) {
+        alert('<?php echo addslashes(_("The Edit Attendees screen is no longer present. Exiting.")) ?>');
+        this.close();
+        return;
+    }
+
+    if (!parent.opener.document.attendeesForm) {
+        alert('<?php echo addslashes(_("You can only use this form from the Edit Attendees screen.")) ?>');
+        this.close();
+        return;
+    }
+
+    parent.opener.document.attendeesForm.newAttendees.value = list;
+    this.close();
+}
+// -->
+</script>
+
+<form method="post" action="<?php echo $form_handler; ?>" name="savedattlistForm">
+<?php Util::pformInput(); ?>
+<input type="hidden" name="actionID" value="" />
+<input type="hidden" name="actionValue" value="" />
+
+<div align="center">
+
+<table border="0" width="500" cellspacing="0" cellpadding="2">
+
+<!-- header -->
+<tr><td colspan="4" class="header"><b><?php echo $title ?></b></td></tr>
+
+<!-- attendee list header -->
+<tr class="item">
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $loadimg ?></td>
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $delimg ?></td>
+ <td nowrap="nowrap" width="96%"><b><?php echo htmlspecialchars(_("Attendees")) ?></b></td>
+</tr>
+
+<!-- attendees -->
+<?php $i = 0 ?>
+<?php if (empty($savedattlist)): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>"><td align="center" colspan="3"><i><?php echo htmlspecialchars('-- ' . _("No saved attendee lists are available") . ' --') ?></i></td></tr>
+<?php else: foreach ($savedattlist as $index => $list): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>">
+ <?php
+  echo '<td align="center">', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, "</a></td>";
+ ?>
+ <?php
+  echo '<td align="center">', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, "</a></td>";
+ ?>
+  <td><?php echo implode(', ', $list); ?></td>
+ </tr>
+<?php endforeach; endif; ?>
+</table>
+</div>
+</form>



From cvs at kolab.org  Thu Mar 13 16:37:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:28 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/passwd
	HK-GW-Config_passwd-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153728.087F66184A8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/passwd
In directory doto:/tmp/cvs-serv17251/passwd

Added Files:
	HK-GW-Config_passwd-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_passwd-3.2-rc3.patch ---
passwd configuration.

diff -r 7e79712ff664 passwd/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/passwd/config/conf.php	Thu Mar 13 14:19:29 2008 +0100
@@ -0,0 +1,13 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: passwd/config/conf.xml,v 1.12 2005/10/09 14:48:58 jan Exp $
+$conf['menu']['apps'] = array();
+$conf['backend']['backend_list'] = 'hidden';
+$conf['user']['change'] = true;
+$conf['user']['refused'] = array('root', 'bin', 'daemon', 'adm', 'lp', 'shutdown', 'halt', 'uucp', 'ftp', 'anonymous', 'nobody', 'httpd', 'operator', 'guest', 'diginext', 'bind', 'cyrus', 'courier', 'games', 'kmem', 'mailnull', 'man', 'mysql', 'news', 'postfix', 'sshd', 'tty', 'www');
+$conf['password']['strengthtests'] = false;
+$conf['hooks']['full_name'] = true;
+$conf['hooks']['default_username'] = false;
+$conf['hooks']['username'] = false;
+$conf['hooks']['userdn'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/fbview-horde
	HK-GW-Config_fbview-horde-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153727.D9B0C60C4D8@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-horde
In directory doto:/tmp/cvs-serv17251/fbview-horde

Added Files:
	HK-GW-Config_fbview-horde-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_fbview-horde-3.2-rc3.patch ---
The kolab specific configuration settings for the horde package.

diff -r 6b200af9c925 fbview-horde/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-horde/config/conf.php	Thu Mar 13 14:23:47 2008 +0100
@@ -0,0 +1,102 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.57 2008/03/11 16:07:20 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = true;
+$conf['session']['cache_limiter'] = 'nocache';
+$conf['session']['timeout'] = 0;
+$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
+$conf['cookie']['path'] = '/horde';
+$conf['sql'] = null;
+$conf['auth']['admins'] = array('manager');
+$conf['auth']['checkip'] = true;
+$conf['auth']['checkbrowser'] = true;
+$conf['auth']['alternate_login'] = false;
+$conf['auth']['redirect_on_logout'] = false;
+$conf['auth']['params']['login_block'] = true;
+$conf['auth']['params']['login_block_count'] = 3;
+$conf['auth']['params']['login_block_time'] = 5;
+$conf['auth']['driver'] = 'kolab';
+$conf['signup']['allow'] = false;
+$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['ident'] = 'HORDE';
+$conf['log']['params'] = array();
+$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['params']['append'] = true;
+$conf['log']['type'] = 'file';
+$conf['log']['enabled'] = true;
+$conf['log_accesskeys'] = false;
+$conf['prefs']['driver'] = 'session';
+$conf['alarms']['driver'] = false;
+$conf['datatree']['driver'] = 'null';
+$conf['history']['driver'] = 'kolab';
+$conf['group']['driver'] = 'mock';
+$conf['group']['cache'] = false;
+$conf['share']['no_sharing'] = false;
+$conf['share']['cache'] = false;
+$conf['share']['driver'] = 'kolab';
+$conf['cache']['default_lifetime'] = 1800;
+$conf['cache']['params']['dir'] = Horde::getTempDir();
+$conf['cache']['params']['sub'] = 0;
+$conf['cache']['driver'] = 'file';
+$conf['token']['driver'] = 'none';
+$conf['mailer']['params']['auth'] = false;
+$conf['mailer']['type'] = 'smtp';
+$conf['mailformat']['brokenrfc2231'] = false;
+$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../tmp';
+$conf['vfs']['type'] = 'file';
+$conf['sessionhandler']['type'] = 'none';
+$conf['image']['convert'] = '/usr/bin/convert';
+$conf['mime']['magic_db'] = '/etc/mime.types';
+$conf['problems']['email'] = 'webmaster at example.com';
+$conf['problems']['maildomain'] = 'example.com';
+$conf['problems']['tickets'] = false;
+$conf['problems']['attachments'] = true;
+$conf['menu']['apps'] = array();
+$conf['menu']['always'] = false;
+$conf['menu']['links']['help'] = 'all';
+$conf['menu']['links']['help_about'] = true;
+$conf['menu']['links']['options'] = 'authenticated';
+$conf['menu']['links']['problem'] = 'all';
+$conf['menu']['links']['login'] = 'all';
+$conf['menu']['links']['logout'] = 'authenticated';
+$conf['hooks']['permsdenied'] = false;
+$conf['hooks']['username'] = false;
+$conf['hooks']['preauthenticate'] = false;
+$conf['hooks']['postauthenticate'] = false;
+$conf['hooks']['authldap'] = false;
+$conf['hooks']['groupldap'] = false;
+$conf['portal']['fixed_blocks'] = array();
+$conf['accounts']['driver'] = 'null';
+$conf['user']['verify_from_addr'] = false;
+$conf['imsp']['enabled'] = false;
+$conf['kolab']['ldap']['server'] = 'localhost';
+$conf['kolab']['ldap']['port'] = 389;
+$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
+$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+$conf['kolab']['ldap']['phppw'] = 'dummy';
+$conf['kolab']['imap']['server'] = 'localhost';
+$conf['kolab']['imap']['port'] = 143;
+$conf['kolab']['imap']['sieveport'] = 2000;
+$conf['kolab']['imap']['virtdomains'] = true;
+$conf['kolab']['imap']['maildomain'] = 'example.com';
+$conf['kolab']['smtp']['server'] = 'localhost';
+$conf['kolab']['smtp']['port'] = 25;
+$conf['kolab']['misc']['multidomain'] = false;
+$conf['kolab']['enabled'] = true;
+$conf['memcache']['enabled'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r 6b200af9c925 fbview-horde/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-horde/config/kolab.php	Thu Mar 13 14:23:47 2008 +0100
@@ -0,0 +1,12 @@
+<?php
+$conf['log']['name'] = '@@@webserver_logdir@@@/horde/horde.log';
+$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
+$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
+$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
+$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
+$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
+$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
+$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
+?>
diff -r 6b200af9c925 fbview-horde/config/prefs.php.dist
--- a/fbview-horde/config/prefs.php.dist	Thu Mar 13 14:19:30 2008 +0100
+++ b/fbview-horde/config/prefs.php.dist	Thu Mar 13 14:23:47 2008 +0100
@@ -334,7 +334,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 
 // UI theme
 $_prefs['theme'] = array(
-    'value' => 'bluewhite',
+    'value' => 'silver',
     'locked' => false,
     'shared' => true,
     'type' => 'select',
@@ -377,7 +377,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 );
 
 $_prefs['show_sidebar'] = array(
-    'value' => true,
+    'value' => false,
     'locked' => false,
     'shared' => true,
     'type' => 'checkbox',
@@ -465,7 +465,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 
 // what application should we go to after login?
 $_prefs['initial_application'] = array(
-    'value' => 'horde',
+    'value' => 'kronolith',
     'locked' => false,
     'shared' => true,
     'type' => 'select',



From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/fbview-kronolith
	HK-GW-Config_fbview-kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch, NONE,
	1.1 HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch, NONE,
	1.1 HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch,
	NONE, 1.1 
Message-ID: <20080313153727.E014A60C4D9@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/fbview-kronolith
In directory doto:/tmp/cvs-serv17251/fbview-kronolith

Added Files:
	HK-GW-Config_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch 
	HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch 
	HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch 
	HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_fbview-kronolith-3.2-rc3.patch ---
diff -r 36e1ed9ebc99 fbview-kronolith/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/config/conf.php	Wed Feb 20 17:30:39 2008 +0100
@@ -0,0 +1,20 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: kronolith/config/conf.xml,v 1.14.10.5 2007/12/20 14:12:23 jan Exp $
+$conf['calendar']['driver'] = 'kolab';
+$conf['storage']['default_domain'] = '';
+$conf['storage']['freebusy']['protocol'] = 'https';
+$conf['storage']['freebusy']['port'] = 443;
+$conf['storage']['driver'] = 'kolab';
+$conf['metadata']['keywords'] = false;
+$conf['reminder']['server_name'] = '';
+$conf['reminder']['from_addr'] = '';
+$conf['autoshare']['shareperms'] = 'none';
+$conf['holidays']['enable'] = true;
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r 36e1ed9ebc99 fbview-kronolith/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/config/kolab.php	Wed Feb 20 17:30:39 2008 +0100
@@ -0,0 +1,5 @@
+<?php
+$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
+$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
+$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
+?>
diff -r 36e1ed9ebc99 fbview-kronolith/config/prefs.php.dist
--- a/fbview-kronolith/config/prefs.php.dist	Wed Feb 20 17:28:32 2008 +0100
+++ b/fbview-kronolith/config/prefs.php.dist	Wed Feb 20 17:30:39 2008 +0100
@@ -83,7 +83,7 @@ if ($GLOBALS['registry']->hasMethod('con
 
 // default view
 $_prefs['defaultview'] = array(
-    'value' => 'month',
+    'value' => 'attendees',
     'locked' => false,
     'shared' => false,
     'type' => 'enum',

--- NEW FILE: HK-GW-Fbview_menu_fbview-kronolith-3.2-rc3.patch ---
diff -r 36826ddfc3bd fbview-kronolith/attendees.php
--- a/fbview-kronolith/attendees.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/attendees.php	Thu Feb 21 12:24:52 2008 +0100
@@ -243,6 +243,7 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 
 if ($browser->hasFeature('javascript')) {
     Horde::addScriptFile('open_savedattlist_win.js');
diff -r 36826ddfc3bd fbview-kronolith/calendars/create.php
--- a/fbview-kronolith/calendars/create.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/create.php	Thu Feb 21 12:24:52 2008 +0100
@@ -39,6 +39,6 @@ if ($form->validate($vars)) {
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'create.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/delete.php
--- a/fbview-kronolith/calendars/delete.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/delete.php	Thu Feb 21 12:24:52 2008 +0100
@@ -56,6 +56,6 @@ if ($form->validate(new Variables($_POST
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'delete.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/edit.php
--- a/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:24:52 2008 +0100
@@ -59,6 +59,6 @@ if (isset($params['fbrelevance'])) {
 }
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/index.php
--- a/fbview-kronolith/calendars/index.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/index.php	Thu Feb 21 12:24:52 2008 +0100
@@ -69,6 +69,6 @@ Horde::addScriptFile('tables.js', 'krono
 Horde::addScriptFile('tables.js', 'kronolith', true);
 $title = _("Manage Calendars");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 require KRONOLITH_TEMPLATES . '/calendar_list.php';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_edit.php
--- a/fbview-kronolith/calendars/remote_edit.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_edit.php	Thu Feb 21 12:24:52 2008 +0100
@@ -59,6 +59,6 @@ if ($form->validate($vars)) {
 $vars->set('password', $calendar['password']);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_edit.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_subscribe.php
--- a/fbview-kronolith/calendars/remote_subscribe.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_subscribe.php	Thu Feb 21 12:24:52 2008 +0100
@@ -39,6 +39,6 @@ if ($form->validate($vars)) {
 
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_subscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/calendars/remote_unsubscribe.php
--- a/fbview-kronolith/calendars/remote_unsubscribe.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/calendars/remote_unsubscribe.php	Thu Feb 21 12:24:52 2008 +0100
@@ -56,6 +56,6 @@ if ($form->validate(new Variables($_POST
 $vars->set('url', $calendar['url']);
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
-require KRONOLITH_TEMPLATES . '/menu.inc';
+require KRONOLITH_TEMPLATES . '/fbview-menu.inc';
 echo $form->renderActive($form->getRenderer(), $vars, 'remote_unsubscribe.php', 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r 36826ddfc3bd fbview-kronolith/lib/Kronolith.php
--- a/fbview-kronolith/lib/Kronolith.php	Thu Feb 21 12:24:08 2008 +0100
+++ b/fbview-kronolith/lib/Kronolith.php	Thu Feb 21 12:24:52 2008 +0100
@@ -1971,6 +1971,33 @@ class Kronolith {
     }
 
     /**
+     * Builds Kronolith's list of menu items.
+     */
+    function getFbviewMenu($returnType = 'object')
+    {
+        global $conf, $registry, $browser, $prefs;
+
+        /* Check here for guest calendars so that we don't get multiple
+         * messages after redirects, etc. */
+        if (!Auth::getAuth() && !count($GLOBALS['all_calendars'])) {
+            $GLOBALS['notification']->push(_("No calendars are available to guests."));
+        }
+
+        require_once 'Horde/Menu.php';
+        $menu = new Menu(HORDE_MENU_MASK_HELP | HORDE_MENU_MASK_LOGIN);
+
+        $menu->add(Horde::applicationUrl('attendees.php'), _("Attendees"), 'attendees.png', null, null, null, '__noselection');
+
+        $menu->add(Horde::applicationUrl('calendars/'), _("Calendars"), 'calendars.png', null, null, null, '__noselection');
+
+        if ($returnType == 'object') {
+            return $menu;
+        } else {
+            return $menu->render();
+        }
+    }
+
+    /**
      * Used with usort() to sort events based on their start times.
      * This function ignores the date component so recuring events can
      * be sorted correctly on a per day basis.
diff -r 36826ddfc3bd fbview-kronolith/templates/fbview-menu.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/fbview-menu.inc	Thu Feb 21 12:24:52 2008 +0100
@@ -0,0 +1,4 @@
+<div id="menu">
+ <?php echo Kronolith::getFbviewMenu('string') ?>
+</div>
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

--- NEW FILE: HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc3.patch ---
Allows to set the free/busy relevance on a calendar.

diff -r e6be25b82291 fbview-kronolith/calendars/edit.php
--- a/fbview-kronolith/calendars/edit.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/calendars/edit.php	Thu Feb 21 12:22:33 2008 +0100
@@ -53,6 +53,10 @@ if ($form->validate($vars)) {
 
 $vars->set('name', $calendar->get('name'));
 $vars->set('description', $calendar->get('desc'));
+$params = @unserialize($calendar->get('params'));
+if (isset($params['fbrelevance'])) {
+    $vars->set('fbrelevance', $params['fbrelevance']);
+}
 $title = $form->getTitle();
 require KRONOLITH_TEMPLATES . '/common-header.inc';
 require KRONOLITH_TEMPLATES . '/menu.inc';
diff -r e6be25b82291 fbview-kronolith/lib/Forms/CreateCalendar.php
--- a/fbview-kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/lib/Forms/CreateCalendar.php	Thu Feb 21 12:22:33 2008 +0100
@@ -35,6 +35,9 @@ class Kronolith_CreateCalendarForm exten
 
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Create")));
     }
@@ -48,6 +51,7 @@ class Kronolith_CreateCalendarForm exten
         }
         $calendar->set('name', $this->_vars->get('name'));
         $calendar->set('desc', $this->_vars->get('description'));
+        $calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
         return $GLOBALS['kronolith_shares']->addShare($calendar);
     }
 
diff -r e6be25b82291 fbview-kronolith/lib/Forms/EditCalendar.php
--- a/fbview-kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 11:55:42 2008 +0100
+++ b/fbview-kronolith/lib/Forms/EditCalendar.php	Thu Feb 21 12:22:34 2008 +0100
@@ -42,6 +42,9 @@ class Kronolith_EditCalendarForm extends
         $this->addHidden('', 'c', 'text', true);
         $this->addVariable(_("Name"), 'name', 'text', true);
         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+        $this->addVariable(_("Relevance"), 'fbrelevance', 'radio', false, false, null, 
+                           array(array('owners/administrators', 'readers', 'no one'), 
+                                 'This calendar is only included into the free/busy data for ...'));
 
         $this->setButtons(array(_("Save")));
     }
@@ -51,6 +54,7 @@ class Kronolith_EditCalendarForm extends
         $original_name = $this->_calendar->get('name');
         $this->_calendar->set('name', $this->_vars->get('name'));
         $this->_calendar->set('desc', $this->_vars->get('description'));
+        $this->_calendar->set('params', serialize(array('fbrelevance' => (int) $this->_vars->get('fbrelevance', 0))));
 
         if ($original_name != $this->_vars->get('name')) {
             $result = $GLOBALS['kronolith_driver']->rename($original_name, $this->_vars->get('name'));

--- NEW FILE: HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc3.patch ---
diff -r 14457cf2ea2c fbview-kronolith/perms.php
--- a/fbview-kronolith/perms.php	Thu Nov 29 15:20:49 2007 +0100
+++ b/fbview-kronolith/perms.php	Thu Nov 29 15:25:36 2007 +0100
@@ -15,6 +15,34 @@ require_once KRONOLITH_BASE . '/lib/base
 require_once KRONOLITH_BASE . '/lib/base.php';
 require_once 'Horde/Group.php';
 
+function &getFbperms($share) 
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        if (isset($params['xfbaccess'])) {
+            $xfbusers = $params['xfbaccess'];
+            foreach ($xfbusers as $user) {
+                $fbperms[$user] = PERMS_READ;
+            }
+        }
+    }
+    return $fbperms;
+}
+
+function setFbperms($share, $xfbusers)
+{
+    $fbperms = array();
+    $params = $share->get('params');
+    if (!is_a($params, 'PEAR_Error')) {
+        $params = @unserialize($params);
+        $params['xfbaccess'] = $xfbusers;
+        $params = serialize($params);
+        $share->set('params', $params);
+    }
+}
+
 $shares = &Horde_Share::singleton('kronolith');
 $groups = &Group::singleton();
 $auth = &Auth::singleton($conf['auth']['driver']);
@@ -36,6 +64,8 @@ case 'edit':
         $notification->push($share, 'horde.error');
     } elseif (isset($share) && Auth::getAuth() != $share->get('owner')) {
         exit('permission denied');
+    } else {
+        $fbperms = getFbperms($share);
     }
     break;
 
@@ -251,6 +281,24 @@ case 'editform':
             }
         }
 
+        // Process free/busy permissions.
+        $fb_names = Util::getFormData('fb_names');
+        $fb_read = Util::getFormData('fb_read');
+
+        $fbperms = getFbperms($share);
+        foreach ($fb_names as $key => $user) {
+            if (empty($user)) {
+                continue;
+            }
+
+            if (!empty($fb_read[$key])) {
+                $fbperms[$user] = PERMS_READ;
+            } else {
+                unset($fbperms[$user]);
+            }
+        }
+        setFbperms($share, array_keys($fbperms));
+
         $share->setPermission($perm, false);
         $share->save();
         $notification->push(sprintf(_("Updated \"%s\"."), $share->get('name')), 'horde.success');
diff -r 14457cf2ea2c fbview-kronolith/templates/perms/perms.inc
--- a/fbview-kronolith/templates/perms/perms.inc	Thu Nov 29 15:20:49 2007 +0100
+++ b/fbview-kronolith/templates/perms/perms.inc	Thu Nov 29 15:25:36 2007 +0100
@@ -355,6 +355,61 @@
   <td>&nbsp;</td>
 </tr>
 
+<!-- Extended free/busy Permissions -->
+<tr valign="middle">
+  <td class="header leftAlign">
+    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Extended free/busy access") ?>
+  </td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center"><?php echo _("Read") ?></td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header" align="center">&nbsp;</td>
+  <td class="header">&nbsp;</td>
+</tr>
+<?php foreach ($fbperms as $user => $fbperm) { if ($user != $owner) { ?>
+<tr>
+  <td class="light"><?php echo htmlspecialchars(Auth::removeHook($user)) ?><input type="hidden" name="fb_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" name="fb_read[<?php echo htmlspecialchars($user) ?>]"<?php echo ($fbperm & PERMS_READ) ? ' checked="checked"' : '' ?> />
+    <label for="fb_read_<?php echo str_replace('@', '_', htmlspecialchars($user)) ?>" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+<?php } } ?>
+<!-- New extended free/busy row -->
+<tr>
+<?php if ($auth->hasCapability('list')): ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
+    <select id="fb_names_new" name="fb_names[||new]">
+      <option value=""><?php echo _("Select a user to add:") ?></option>
+    <?php foreach ($userList as $user) { if (!isset($userperms[$user])) { ?>
+      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Auth::removeHook($user)) ?></option>
+    <?php } } ?>
+    </select>
+  </td>
+<?php else: ?>
+  <td class="light">
+    <label for="fb_names_new" class="hidden"><?php echo _("User to add:") ?></label>
+    <input type="text" id="fb_names_new" name="fb_names[||new]" />
+  </td>
+<?php endif; ?>
+  <td align="center">&nbsp;</td>
+  <td align="center">
+    <input type="checkbox" id="fb_read_new" name="fb_read[||new]" />
+    <label for="fb_read_new" class="hidden"><?php echo _("Read") ?></label>
+  </td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td align="center">&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+
 <tr>
  <td colspan="7">&nbsp;</td>
 </tr>

--- NEW FILE: HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc3.patch ---
This includes extra parameters into the free/busy view. The params are hardcoded so this patch won't make it upstream.

diff -r 9fa9c2822bdd fbview-kronolith/lib/FBView.php
--- a/fbview-kronolith/lib/FBView.php	Mon Feb 18 09:53:58 2008 +0100
+++ b/fbview-kronolith/lib/FBView.php	Mon Feb 18 10:03:17 2008 +0100
@@ -86,7 +86,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_requiredMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -107,7 +107,7 @@ class Kronolith_FreeBusy_View {
             $template = new Horde_Template();
             $rows = '';
             foreach ($this->_optionalMembers as $member) {
-                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.html', _("Busy"));
+                $blocks = $this->_getBlocks($member, $member->getBusyPeriods(), 'busyblock.tpl', _("Busy"), $member->getExtraParams());
                 $template = new Horde_Template();
                 $template->set('blocks', $blocks);
                 $template->set('name', $member->getName());
@@ -122,6 +122,9 @@ class Kronolith_FreeBusy_View {
             $template->set('legend', '');
             $html .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/section.html');
         }
+
+	//**********
+	//This has been disabled in kolab-fbview. Make this optional?
 
         // Possible meeting times.
         $optimal->setAttribute('ORGANIZER', _("All Attendees"));
@@ -144,6 +147,9 @@ class Kronolith_FreeBusy_View {
         $template->set('name', _("Required Attendees"));
         $template->set('blocks', $blocks);
         $rows .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/row.html');
+
+	//This has been disabled in kolab-fbview. Make this optional?
+	//**********
 
         // Reset locale.
         setlocale(LC_NUMERIC, $lc);
@@ -217,7 +223,7 @@ class Kronolith_FreeBusy_View {
         return $instances[$view];
     }
 
-    function _getBlocks($member, $periods, $blockfile, $label)
+    function _getBlocks($member, $periods, $blockfile, $label, $extra = array())
     {
         $template = new Horde_Template();
         $template->set('label', $label);
@@ -250,6 +256,21 @@ class Kronolith_FreeBusy_View {
 
                 $template->set('left', $left . '%');
                 $template->set('width', $width . '%');
+                $template->set('evclick', '');
+
+                if (isset($extra[$periodStart])) {
+                    if (!empty($extra[$periodStart]['X-UID'])) {
+                        $link = "javascript:performAction('viewaction', '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$periodStart]['X-UID']), 
+								'UTF-8',NLS::getCharset())) . "')";
+                        $template->set('evclick', $link);
+                    }
+                    if (!empty($extra[$periodStart]['X-SUMMARY'])) {
+                        $template->set('label', String::convertCharset(base64_decode($extra[$periodStart]['X-SUMMARY']),'UTF-8',
+				       NLS::getCharset()));
+                    }
+                }
 
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);
             } else {

--- NEW FILE: HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc3.patch ---
Provides a patch to store the list of attendees in the user preferences. This is a broken patch that has been rejected upstream (http://bugs.horde.org/ticket/?id=4788). This should be solved using Horde::Groups.

diff -r e0e3817cd448 fbview-kronolith/attendees.php
--- a/fbview-kronolith/attendees.php	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/attendees.php	Mon Feb 18 09:53:57 2008 +0100
@@ -155,6 +155,16 @@ case 'clear':
     $attendees = array();
     $_SESSION['kronolith']['attendees'] = $attendees;
     break;
+
+case 'save':
+    if (empty($attendees)) {
+        break;
+    }
+    $savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+    $savedattlist[] = array_keys($attendees);
+    $prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    $notification->push(_('Successfully saved attendee list'), 'horde.success');
+    break;
 }
 
 // Get the current Free/Busy view; default to the 'day' view if none specified.
@@ -233,6 +243,14 @@ Imple::factory('ContactAutoCompleter', a
 
 $title = _("Edit attendees");
 require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+if ($browser->hasFeature('javascript')) {
+    Horde::addScriptFile('open_savedattlist_win.js');
+    $savedattlist_url = 'javascript:open_savedattlist_win();';
+} else {
+    $savedattlist_url = Horde::applicationUrl('savedattlist.php');
+}
+
 $notification->notify(array('status'));
 require KRONOLITH_TEMPLATES . '/attendees/attendees.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 fbview-kronolith/config/prefs.php.dist
--- a/fbview-kronolith/config/prefs.php.dist	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/config/prefs.php.dist	Mon Feb 18 09:53:57 2008 +0100
@@ -457,3 +457,11 @@ if ($GLOBALS['registry']->hasMethod('con
     'shared' => false,
     'type' => 'implicit'
 );
+
+$_prefs['saved_attendee_list'] = array(
+    'value' => 'a:0:{}',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit',
+    'desc' => _("A saved list of attendees")
+);
diff -r e0e3817cd448 fbview-kronolith/savedattlist.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/savedattlist.php	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,77 @@
+<?php
+/**
+ * $Horde: kronolith/attendeeshandler.php,v 1.1 2004/05/25 08:34:21 stuart Exp $
+ *
+ * Copyright 2004 Code Fusion  <http://www.codefusion.co.za/>
+ *                Stuart Binge <s.binge at codefusion.co.za>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('KRONOLITH_BASE', dirname(__FILE__));
+require_once KRONOLITH_BASE . '/lib/base.php';
+require_once KRONOLITH_BASE . '/lib/FBView.php';
+
+$title = _('Load Attendee List');
+
+Horde::addScriptFile('tooltip.js', 'horde');
+require KRONOLITH_TEMPLATES . '/common-header.inc';
+
+// Get our list of saved attendees
+$savedattlist = unserialize($prefs->getValue('saved_attendee_list'));
+
+// Preformat our image urls
+$delimg = Horde::img('delete.png', _("Remove List"), null, $GLOBALS['registry']->getImageDir('horde'));
+$loadimg = Horde::img('tree/folder.png', _("Load List"), null, $GLOBALS['registry']->getImageDir('horde'));
+
+// Get our Action ID & Value. This specifies what action the user initiated.
+$actionID = Util::getFormData('actionID', false);
+$actionValue = Util::getFormData('actionValue', false);
+if (!$actionID) {
+    $actionID = (Util::getFormData('addNew', false) ? 'add' : false);
+    $actionValue = Util::getFormData('newAttendees', '');
+}
+
+// Perform the specified action, if there is one.
+switch ($actionID) {
+case 'remove':
+    // Remove the specified attendee
+    if (array_key_exists($actionValue, $savedattlist)) {
+        unset($savedattlist[$actionValue]);
+	$prefs->setValue('saved_attendee_list', serialize($savedattlist));
+    }
+    
+    break;
+
+case 'dismiss':
+    // Make sure we're actually allowed to dismiss
+    if (!$allow_dismiss) break;
+
+    // Close the attendee window
+    global $browser;
+
+    if ($browser->hasFeature('javascript')) {
+        Util::closeWindowJS();
+    } else {
+        $url = Util::getFormData('url');
+
+        if (!empty($url)) {
+            $location = Horde::applicationUrl($url, true);
+        } else {
+            $url = Util::addParameter($prefs->getValue('defaultview') . '.php', 'month', Util::getFormData('month'));
+            $url = Util::addParameter($url, 'year', Util::getFormData('year'));
+            $location = Horde::applicationUrl($url, true);
+        }
+
+        // Make sure URL is unique.
+        $location = Util::addParameter($location, 'unique', md5(microtime()));
+
+        header('Location: ' . $location);
+    }
+    break;
+}
+
+$form_handler = Horde::applicationUrl('savedattlist.php');
+require KRONOLITH_TEMPLATES . '/savedattlist/savedattlist.inc';
+require $GLOBALS['registry']->get('templates', 'horde') . '/common-footer.inc';
diff -r e0e3817cd448 fbview-kronolith/templates/attendees/attendees.inc
--- a/fbview-kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:51:07 2008 +0100
+++ b/fbview-kronolith/templates/attendees/attendees.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -92,6 +92,8 @@ function switchDateView(view, timestamp)
 <div>
  <input type="submit" class="button" name="addNew" value="<?php echo htmlspecialchars(_("Save Attendees")) ?>" />
  <input type="submit" class="button" name="addNewClose" value="<?php echo htmlspecialchars(_("Save and Finish")) ?>" />
+ <input type="button" class="button" name="loadAttList" value="<?php echo htmlspecialchars(_("Load Attendee List")) ?>" onclick="<?php echo $savedattlist_url ?>" />
+ <?php if (!empty($attendees)): ?><input type="button" class="button" name="saveAttList" value="<?php echo htmlspecialchars(_("Save Attendee List")) ?>" onclick="performAction('save', '');" /><?php endif; ?>
  <?php if (!empty($attendees)): ?><input type="submit" class="button" name="clearAll" value="<?php echo htmlspecialchars(_("Clear all attendees")) ?>" /><?php endif; ?>
 </div>
 
diff -r e0e3817cd448 fbview-kronolith/templates/javascript/open_savedattlist_win.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/javascript/open_savedattlist_win.js	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,36 @@
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
+<!--
+<?php endif; ?>
+function open_savedattlist_win(args)
+{
+    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/savedattlist.php', 'kronolith')) ?>";
+    if (url.indexOf('?') == -1) glue = '?';
+    else glue = '<?php echo ini_get('arg_separator.output') ?>';
+    var now = new Date();
+    var name = "savedattlist_window_" + now.getTime();
+    if (args != "") {
+        url = url + glue + args + '<?php echo ini_get('arg_separator.output') ?>' + "uniq=" + now.getTime();
+    } else {
+        url = url + glue + "uniq=" + now.getTime();
+    }
+    var Width = screen.width;
+    if (Width > 775) {
+        Width = 700;
+    } else {
+        Width -= 75;
+    }
+    var Height = screen.height;
+    if (Height > 725) {
+        Height = 650;
+    } else {
+        Height -= 75;
+    }
+    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + Width + ",height=" + Height + ",left=0,top=0";
+    name = window.open(url, name, param);
+    if (!eval("name.opener")) {
+        name.opener = self;
+    }
+}
+<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?>// -->
+</script>
+<?php endif; ?>
diff -r e0e3817cd448 fbview-kronolith/templates/savedattlist/savedattlist.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fbview-kronolith/templates/savedattlist/savedattlist.inc	Mon Feb 18 09:53:57 2008 +0100
@@ -0,0 +1,68 @@
+<!-- javascript action handling -->
+<script language="JavaScript" type="text/javascript">
+<!--
+function performAction(id, value)
+{
+    document.savedattlistForm.actionID.value = id;
+    document.savedattlistForm.actionValue.value = value;
+    document.savedattlistForm.submit();
+    return false;
+}
+
+function updateMessage(list)
+{
+    if (parent.opener.closed) {
+        alert('<?php echo addslashes(_("The Edit Attendees screen is no longer present. Exiting.")) ?>');
+        this.close();
+        return;
+    }
+
+    if (!parent.opener.document.attendeesForm) {
+        alert('<?php echo addslashes(_("You can only use this form from the Edit Attendees screen.")) ?>');
+        this.close();
+        return;
+    }
+
+    parent.opener.document.attendeesForm.newAttendees.value = list;
+    this.close();
+}
+// -->
+</script>
+
+<form method="post" action="<?php echo $form_handler; ?>" name="savedattlistForm">
+<?php Util::pformInput(); ?>
+<input type="hidden" name="actionID" value="" />
+<input type="hidden" name="actionValue" value="" />
+
+<div align="center">
+
+<table border="0" width="500" cellspacing="0" cellpadding="2">
+
+<!-- header -->
+<tr><td colspan="4" class="header"><b><?php echo $title ?></b></td></tr>
+
+<!-- attendee list header -->
+<tr class="item">
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $loadimg ?></td>
+ <td nowrap="nowrap" width="2%" align="center"><?php echo $delimg ?></td>
+ <td nowrap="nowrap" width="96%"><b><?php echo htmlspecialchars(_("Attendees")) ?></b></td>
+</tr>
+
+<!-- attendees -->
+<?php $i = 0 ?>
+<?php if (empty($savedattlist)): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>"><td align="center" colspan="3"><i><?php echo htmlspecialchars('-- ' . _("No saved attendee lists are available") . ' --') ?></i></td></tr>
+<?php else: foreach ($savedattlist as $index => $list): ?>
+ <tr class="item<?php echo ($i++ % 2) ?>">
+ <?php
+  echo '<td align="center">', Horde::link("javascript:updateMessage('" . addslashes(implode(', ', $list)) . "')", _("Load this list")), $loadimg, "</a></td>";
+ ?>
+ <?php
+  echo '<td align="center">', Horde::link("javascript:performAction('remove', '" . $index . "')", _("Remove this list")), $delimg, "</a></td>";
+ ?>
+  <td><?php echo implode(', ', $list); ?></td>
+ </tr>
+<?php endforeach; endif; ?>
+</table>
+</div>
+</form>



From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/imp
	HK-GW-Config_imp-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153727.E8FDA60C4DD@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/imp
In directory doto:/tmp/cvs-serv17251/imp

Added Files:
	HK-GW-Config_imp-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_imp-3.2-rc3.patch ---
diff -r e3c90fab947d imp/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imp/config/conf.php	Thu Mar 13 14:15:53 2008 +0100
@@ -0,0 +1,65 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: imp/config/conf.xml,v 1.53.2.24 2008/03/10 17:13:06 slusarz Exp $
+$conf['spell']['driver'] = 'aspell';
+$conf['utils']['gnupg'] = '/usr/bin/gpg';
+$conf['utils']['gnupg_keyserver'] = array();
+$conf['utils']['gnupg_timeout'] = 10;
+$conf['utils']['openssl_cafile'] = '/etc/ssl/certs';
+$conf['utils']['openssl_binary'] = '/usr/bin/openssl';
+$conf['menu']['apps'] = array();
+$conf['user']['select_sentmail_folder'] = true;
+$conf['user']['allow_resume_all_in_drafts'] = false;
+$conf['user']['allow_folders'] = true;
+$conf['user']['allow_resume_all'] = false;
+$conf['user']['allow_view_source'] = true;
+$conf['user']['alternate_login'] = false;
+$conf['user']['redirect_on_logout'] = false;
+$conf['user']['select_view'] = true;
+$conf['server']['change_server'] = false;
+$conf['server']['change_port'] = false;
+$conf['server']['change_protocol'] = false;
+$conf['server']['change_smtphost'] = false;
+$conf['server']['change_smtpport'] = false;
+$conf['server']['server_list'] = 'none';
+$conf['server']['fixed_folders'] = array();
+$conf['server']['sort_limit'] = 0;
+$conf['server']['cache_folders'] = false;
+$conf['server']['cachejs'] = false;
+$conf['server']['cachecss'] = false;
+$conf['mailbox']['show_preview'] = true;
+$conf['fetchmail']['show_account_colors'] = false;
+$conf['fetchmail']['size_limit'] = 4000000;
+$conf['msgcache']['use_msgcache'] = false;
+$conf['mlistcache']['use_mlistcache'] = false;
+$conf['msgsettings']['filtering']['words'] = './config/filter.txt';
+$conf['msgsettings']['filtering']['replacement'] = '****';
+$conf['spam']['reporting'] = false;
+$conf['notspam']['reporting'] = false;
+$conf['print']['add_printedby'] = false;
+$conf['msg']['prepend_header'] = true;
+$conf['msg']['append_trailer'] = false;
+$conf['compose']['allow_receipts'] = true;
+$conf['compose']['special_characters'] = true;
+$conf['compose']['use_vfs'] = true;
+$conf['compose']['link_all_attachments'] = false;
+$conf['compose']['link_attachments_notify'] = true;
+$conf['compose']['link_attachments'] = true;
+$conf['compose']['attach_size_limit'] = 0;
+$conf['compose']['attach_count_limit'] = 0;
+$conf['compose']['reply_limit'] = 200000;
+$conf['hooks']['vinfo'] = false;
+$conf['hooks']['postlogin'] = false;
+$conf['hooks']['postsent'] = false;
+$conf['hooks']['signature'] = false;
+$conf['hooks']['trailer'] = false;
+$conf['hooks']['fetchmail_filter'] = false;
+$conf['hooks']['mbox_redirect'] = true;
+$conf['hooks']['mbox_icon'] = true;
+$conf['hooks']['spam_bounce'] = false;
+$conf['hooks']['msglist_format'] = false;
+$conf['maillog']['use_maillog'] = true;
+$conf['sentmail']['driver'] = 'none';
+$conf['tasklist']['use_tasklist'] = true;
+$conf['notepad']['use_notepad'] = true;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r e3c90fab947d imp/config/servers.php.dist
--- a/imp/config/servers.php.dist	Thu Mar 13 14:15:32 2008 +0100
+++ b/imp/config/servers.php.dist	Thu Mar 13 14:15:53 2008 +0100
@@ -205,6 +205,8 @@
  *              value for this setting is 1.
  */
 
+if (!$GLOBALS['conf']['kolab']['enabled']) {
+
 /* Any entries whose key value ('foo' in $servers['foo']) begin with '_'
  * (an underscore character) will be treated as prompts, and you won't be
  * able to log in to them. The only property these entries need is 'name'.
@@ -288,6 +290,7 @@
     'realm' => '',
     'preferred' => '',
 );
+}
 
 if ($GLOBALS['conf']['kolab']['enabled']) {
     require_once 'Horde/Kolab.php';



From cvs at kolab.org  Thu Mar 13 16:37:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:28 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/mnemo
	HK-GW-Config_mnemo-3.2-rc3.patch, NONE,
	1.1 HK-GW-Syncml_support_mnemo-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153728.026EC6184A4@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/mnemo
In directory doto:/tmp/cvs-serv17251/mnemo

Added Files:
	HK-GW-Config_mnemo-3.2-rc3.patch 
	HK-GW-Syncml_support_mnemo-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_mnemo-3.2-rc3.patch ---
diff -r 3eafb3ec364b mnemo/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mnemo/config/conf.php	Thu Mar 13 14:16:24 2008 +0100
@@ -0,0 +1,9 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: mnemo/config/conf.xml,v 1.17.10.1 2007/12/20 14:17:38 jan Exp $
+$conf['storage']['driver'] = 'kolab';
+$conf['utils']['gnupg'] = '/usr/bin/gpg';
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */

--- NEW FILE: HK-GW-Syncml_support_mnemo-3.2-rc3.patch ---
diff -r 3bdd07983ef2 mnemo/lib/Driver/kolab.php
--- a/mnemo/lib/Driver/kolab.php	Thu Mar 13 13:27:42 2008 +0100
+++ b/mnemo/lib/Driver/kolab.php	Thu Mar 13 13:28:10 2008 +0100
@@ -596,9 +596,11 @@ class Mnemo_Driver_kolab_wrapper_new ext
         if (empty($uid)) {
             $note_uid = $this->_store->generateUID();
             $old_uid = null;
+            $action = array('action' => 'add');
         } else {
             list($note_uid, $notepad) = $this->_splitId($uid);
             $old_uid = $note_uid;
+            $action = array('action' => 'modify');
         }
 
         if ($passphrase) {
@@ -618,6 +620,10 @@ class Mnemo_Driver_kolab_wrapper_new ext
         if (is_a($result, 'PEAR_Error')) {
             return $result;
         }
+
+        /* Log the action in the history log. */
+        $history = &Horde_History::singleton();
+        $history->log('mnemo:' . $this->_notepad . ':' . $this->_uniqueId($note_uid), $action, true);
 
         return $this->_uniqueId($note_uid);
     }
@@ -685,7 +691,15 @@ class Mnemo_Driver_kolab_wrapper_new ext
     {
         list($noteId, $notepad) = $this->_splitId($noteId);
 
-        return $this->_store->delete($noteId);
+        $result = $this->_store->delete($noteId);
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+
+        $history = &Horde_History::singleton();
+        $history->log('mnemo:' . $this->_notepad . ':' . $this->_uniqueId($noteId), array('action' => 'delete'), true);
+
+        return $result;
     }
 
     /**



From cvs at kolab.org  Thu Mar 13 16:37:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:28 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/nag
	HK-GW-Config_nag-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153728.04B956184A5@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/nag
In directory doto:/tmp/cvs-serv17251/nag

Added Files:
	HK-GW-Config_nag-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_nag-3.2-rc3.patch ---
Test commit

diff -r 5b50c30314f4 nag/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nag/config/conf.php	Thu Mar 13 14:16:40 2008 +0100
@@ -0,0 +1,8 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: nag/config/conf.xml,v 1.25.10.2 2007/12/20 14:23:06 jan Exp $
+$conf['storage']['driver'] = 'kolab';
+$conf['menu']['print'] = true;
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Thu Mar 13 16:37:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:28 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/mimp
	HK-GW-Config_mimp-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153728.016BE6184A2@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/mimp
In directory doto:/tmp/cvs-serv17251/mimp

Added Files:
	HK-GW-Config_mimp-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_mimp-3.2-rc3.patch ---
mimp configuration.

diff -r 67315e68fa88 mimp/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mimp/config/conf.php	Thu Mar 13 14:19:20 2008 +0100
@@ -0,0 +1,8 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: mimp/config/conf.xml,v 1.11.2.1 2007/12/20 12:09:25 jan Exp $
+$conf['mailbox']['max_from_chars'] = 10;
+$conf['mailbox']['max_subj_chars'] = 20;
+$conf['compose']['allow_cc'] = false;
+$conf['compose']['allow_bcc'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/ingo
	HK-GW-Config_ingo-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153727.EC13660C4DE@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/ingo
In directory doto:/tmp/cvs-serv17251/ingo

Added Files:
	HK-GW-Config_ingo-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_ingo-3.2-rc3.patch ---
diff -r a755446c7bd3 ingo/config/backends.php.dist
--- a/ingo/config/backends.php.dist	Thu Mar 13 14:15:54 2008 +0100
+++ b/ingo/config/backends.php.dist	Thu Mar 13 14:16:10 2008 +0100
@@ -40,6 +40,8 @@
  *               give them permissions to do so. If you want to enable this
  *               feature, you need to set this parameter to true.
  */
+
+if (!$GLOBALS['conf']['kolab']['enabled']) {
 
 /* IMAP Example */
 $backends['imap'] = array(
@@ -278,6 +280,8 @@
     'scriptparams' => array()
 );
 
+}
+
 /* Kolab Example (using Sieve) */
 if ($GLOBALS['conf']['kolab']['enabled']) {
     require_once 'Horde/Kolab.php';
diff -r a755446c7bd3 ingo/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ingo/config/conf.php	Thu Mar 13 14:16:10 2008 +0100
@@ -0,0 +1,15 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: ingo/config/conf.xml,v 1.13.12.1 2007/12/20 14:05:46 jan Exp $
+$conf['menu']['apps'] = array();
+$conf['storage']['driver'] = 'prefs';
+$conf['storage']['maxblacklist'] = 0;
+$conf['storage']['maxwhitelist'] = 0;
+$conf['rules']['userheader'] = true;
+$conf['rules']['usefolderapi'] = true;
+$conf['spam']['header'] = 'X-Spam-Level';
+$conf['spam']['char'] = '*';
+$conf['spam']['compare'] = 'string';
+$conf['hooks']['vacation_addresses'] = false;
+$conf['hooks']['vacation_only'] = true;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */



From cvs at kolab.org  Thu Mar 13 16:37:27 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:27 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/horde
	HK-GW-Config_horde-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153727.E79F460C4DC@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/horde
In directory doto:/tmp/cvs-serv17251/horde

Added Files:
	HK-GW-Config_horde-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_horde-3.2-rc3.patch ---
The kolab specific configuration settings for the horde package.

diff -r e6a3628436d7 horde/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/horde/config/conf.php	Thu Mar 13 14:15:32 2008 +0100
@@ -0,0 +1,102 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: horde/config/conf.xml,v 1.74.2.57 2008/03/11 16:07:20 jan Exp $
+$conf['vhosts'] = false;
+$conf['debug_level'] = E_ALL;
+$conf['max_exec_time'] = 0;
+$conf['compress_pages'] = true;
+$conf['umask'] = 077;
+$conf['use_ssl'] = 2;
+$conf['server']['name'] = $_SERVER['SERVER_NAME'];
+$conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['urls']['pretty'] = false;
+$conf['safe_ips'] = array();
+$conf['session']['name'] = 'Horde';
+$conf['session']['use_only_cookies'] = false;
+$conf['session']['cache_limiter'] = 'nocache';
+$conf['session']['timeout'] = 3600;
+$conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
+$conf['cookie']['path'] = '/horde';
+$conf['sql'] = null;
+$conf['auth']['admins'] = array('manager');
+$conf['auth']['checkip'] = true;
+$conf['auth']['checkbrowser'] = true;
+$conf['auth']['alternate_login'] = false;
+$conf['auth']['redirect_on_logout'] = false;
+$conf['auth']['params']['login_block'] = true;
+$conf['auth']['params']['login_block_count'] = 3;
+$conf['auth']['params']['login_block_time'] = 5;
+$conf['auth']['driver'] = 'kolab';
+$conf['signup']['allow'] = false;
+$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['ident'] = 'HORDE';
+$conf['log']['params'] = array();
+$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['params']['append'] = true;
+$conf['log']['type'] = 'file';
+$conf['log']['enabled'] = true;
+$conf['log_accesskeys'] = false;
+$conf['prefs']['driver'] = 'kolab';
+$conf['alarms']['driver'] = false;
+$conf['datatree']['driver'] = 'null';
+$conf['history']['driver'] = 'kolab';
+$conf['group']['driver'] = 'mock';
+$conf['group']['cache'] = false;
+$conf['share']['no_sharing'] = false;
+$conf['share']['cache'] = false;
+$conf['share']['driver'] = 'kolab';
+$conf['cache']['default_lifetime'] = 1800;
+$conf['cache']['params']['dir'] = Horde::getTempDir();
+$conf['cache']['params']['sub'] = 0;
+$conf['cache']['driver'] = 'file';
+$conf['token']['driver'] = 'none';
+$conf['mailer']['params']['auth'] = false;
+$conf['mailer']['type'] = 'smtp';
+$conf['mailformat']['brokenrfc2231'] = false;
+$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../tmp';
+$conf['vfs']['type'] = 'file';
+$conf['sessionhandler']['type'] = 'none';
+$conf['image']['convert'] = '/usr/bin/convert';
+$conf['mime']['magic_db'] = '/etc/mime.types';
+$conf['problems']['email'] = 'webmaster at example.com';
+$conf['problems']['maildomain'] = 'example.com';
+$conf['problems']['tickets'] = false;
+$conf['problems']['attachments'] = true;
+$conf['menu']['apps'] = array();
+$conf['menu']['always'] = false;
+$conf['menu']['links']['help'] = 'all';
+$conf['menu']['links']['help_about'] = true;
+$conf['menu']['links']['options'] = 'authenticated';
+$conf['menu']['links']['problem'] = 'all';
+$conf['menu']['links']['login'] = 'all';
+$conf['menu']['links']['logout'] = 'authenticated';
+$conf['hooks']['permsdenied'] = false;
+$conf['hooks']['username'] = false;
+$conf['hooks']['preauthenticate'] = false;
+$conf['hooks']['postauthenticate'] = false;
+$conf['hooks']['authldap'] = false;
+$conf['hooks']['groupldap'] = false;
+$conf['portal']['fixed_blocks'] = array();
+$conf['accounts']['driver'] = 'null';
+$conf['user']['verify_from_addr'] = false;
+$conf['imsp']['enabled'] = false;
+$conf['kolab']['ldap']['server'] = 'localhost';
+$conf['kolab']['ldap']['port'] = 389;
+$conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
+$conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+$conf['kolab']['ldap']['phppw'] = 'dummy';
+$conf['kolab']['imap']['server'] = 'localhost';
+$conf['kolab']['imap']['port'] = 143;
+$conf['kolab']['imap']['sieveport'] = 2000;
+$conf['kolab']['imap']['virtdomains'] = true;
+$conf['kolab']['imap']['maildomain'] = 'example.com';
+$conf['kolab']['smtp']['server'] = 'localhost';
+$conf['kolab']['smtp']['port'] = 25;
+$conf['kolab']['misc']['multidomain'] = false;
+$conf['kolab']['enabled'] = true;
+$conf['memcache']['enabled'] = false;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/kolab.php')) {
+  require_once(dirname(__FILE__) . '/kolab.php');
+}
diff -r e6a3628436d7 horde/config/kolab.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/horde/config/kolab.php	Thu Mar 13 14:15:32 2008 +0100
@@ -0,0 +1,12 @@
+<?php
+$conf['log']['name'] = '@@@webserver_logdir@@@/horde/horde.log';
+$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
+$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
+$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
+$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
+$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
+$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
+$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
+?>
diff -r e6a3628436d7 horde/config/prefs.php.dist
--- a/horde/config/prefs.php.dist	Thu Mar 13 14:06:27 2008 +0100
+++ b/horde/config/prefs.php.dist	Thu Mar 13 14:15:32 2008 +0100
@@ -334,7 +334,7 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 
 // UI theme
 $_prefs['theme'] = array(
-    'value' => 'bluewhite',
+    'value' => 'silver',
     'locked' => false,
     'shared' => true,
     'type' => 'select',



From cvs at kolab.org  Thu Mar 13 16:37:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 16:37:28 +0100 (CET)
Subject: gunnar: server/patches/horde/3.2-rc3/turba
	HK-GW-Config_turba-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch, NONE,
	1.1 HK-GW-Fix_share_id_change_turba-3.2-rc3.patch, NONE,
	1.1 HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch, NONE, 1.1 
Message-ID: <20080313153728.0DCC26184A9@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/patches/horde/3.2-rc3/turba
In directory doto:/tmp/cvs-serv17251/turba

Added Files:
	HK-GW-Config_turba-3.2-rc3.patch 
	HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch 
	HK-GW-Fix_share_id_change_turba-3.2-rc3.patch 
	HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch 
Log Message:
Horde patches for horde-3.2-rc3

--- NEW FILE: HK-GW-Config_turba-3.2-rc3.patch ---
diff -r 723ba1b92537 turba/config/conf.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/turba/config/conf.php	Thu Mar 13 14:16:55 2008 +0100
@@ -0,0 +1,10 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: turba/config/conf.xml,v 1.6.2.4 2007/12/20 14:34:24 jan Exp $
+$conf['menu']['import_export'] = true;
+$conf['menu']['apps'] = array();
+$conf['client']['addressbook'] = 'kolab_local';
+$conf['shares']['source'] = 'kolab';
+$conf['comments']['allow'] = true;
+$conf['documents']['type'] = 'horde';
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
diff -r 723ba1b92537 turba/config/sources.php.dist
--- a/turba/config/sources.php.dist	Thu Mar 13 14:16:40 2008 +0100
+++ b/turba/config/sources.php.dist	Thu Mar 13 14:16:55 2008 +0100
@@ -120,8 +120,8 @@
  *
  * approximate: Only applies to LDAP servers. If set, should be an
  *              array of native field/attribute names to search
- *              "approximately" (for example, "Sánchez", "Sanchez",
- *              and "Sanchéz" will all match a search string of
+ *              "approximately" (for example, "Sánchez", "Sanchez",
+ *              and "Sanchéz" will all match a search string of
  *              "sanchez").
  *
  * export:      If set to true, this source will appear on the Export menu,
@@ -148,6 +148,8 @@
  *                  field.
  * Here are some example configurations:
  */
+
+if (empty($GLOBALS['conf']['kolab']['enabled'])) {
 
 /**
  * A local address book in an SQL database. This implements a private
@@ -748,6 +750,8 @@ if (!empty($GLOBALS['conf']['imsp']['ena
 }
 /* End IMSP sources. */
 
+}
+
 /* Begin Kolab sources. */
 if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
 
@@ -783,6 +787,8 @@ if (!empty($GLOBALS['conf']['kolab']['en
                 'version' => 3,
                 'bind_dn' => '',
                 'bind_password' => '',
+                'bind_password' => '',
+                'read_only'     => true,
             ),
             'map' => array(
                 '__key'             => 'dn',

--- NEW FILE: HK-GW-Fix_editing_contacts_turba-3.2-rc3.patch ---
Fixes editing contacts.

diff -r de15e2f26408 turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php	Tue Oct 02 12:25:42 2007 +0200
+++ b/turba/lib/Driver/share.php	Tue Oct 02 12:38:50 2007 +0200
@@ -58,7 +58,7 @@ class Turba_Driver_share extends Turba_D
      */
     function getName()
     {
-        $share_parts = explode(':', $this->_share->getName());
+        $share_parts = explode(':', $this->_share->getId());
         return array_pop($share_parts);
     }
 

--- NEW FILE: HK-GW-Fix_share_id_change_turba-3.2-rc3.patch ---
This fixes a problem with the way the Kolab share driver handles ids.

diff -r 765b7ae705a1 turba/lib/Turba.php
--- a/turba/lib/Turba.php	Thu Mar 13 13:28:11 2008 +0100
+++ b/turba/lib/Turba.php	Thu Mar 13 13:29:35 2008 +0100
@@ -439,7 +439,7 @@ class Turba {
 
                         $source_config = $sources[$source];
                         $source_config['params']['share'] = &$share;
-                        $sources[$sourceKey] = $source_config;
+                        $sources[$share->getId()] = $source_config;
                     } else {
                         $notification->push($driver, 'horde.error');
                     }
@@ -564,7 +564,7 @@ class Turba {
         /* Add the new addressbook to the user's list of visible
          * address books. */
         $prefs = explode("\n", $GLOBALS['prefs']->getValue('addressbooks'));
-        if (array_search($share_id, $prefs) === false) {
+        if (array_search($share->getId(), $prefs) === false) {
             $GLOBALS['prefs']->setValue('addressbooks', $GLOBALS['prefs']->getValue('addressbooks') . "\n" . $share_id);
         }
         return $share;

--- NEW FILE: HK-GW-Ldap_read_only_fix_turba-3.2-rc3.patch ---
This is a temporary fix to mark the ldap addressbook as read-only. This should be solved with the Horde Perms package but this needs a new driver.

diff -r 7712d454fb57 turba/lib/Driver/ldap.php
--- a/turba/lib/Driver/ldap.php	Mon Feb 18 08:51:51 2008 +0100
+++ b/turba/lib/Driver/ldap.php	Mon Feb 18 09:51:07 2008 +0100
@@ -53,6 +53,9 @@ class Turba_Driver_ldap extends Turba_Dr
         }
         if (empty($params['deref'])) {
             $params['deref'] = LDAP_DEREF_NEVER;
+        }
+        if (empty($params['read_only'])) {
+            $params['read_only'] = false;
         }
 
         parent::Turba_Driver($params);
@@ -750,4 +753,25 @@ class Turba_Driver_ldap extends Turba_Dr
         return $dn;
     }
 
+    /**
+     * Checks if the current user has the requested permission
+     * on this source.
+     *
+     * @param integer $perm  The permission to check for.
+     *
+     * @return boolean  true if user has permission, false otherwise.
+     */
+     function hasPermission($perm)
+    {
+        if ($this->_params['read_only'] === false) {
+            return parent::hasPermission($perm);
+        } else {
+            switch ($perm) {
+                case PERMS_EDIT: return false;
+                case PERMS_DELETE: return false;
+                default: return parent::hasPermission($perm);
+            }
+        }
+    }
+
 }



From cvs at kolab.org  Thu Mar 13 17:45:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 17:45:12 +0100 (CET)
Subject: thomas: server release-notes.txt,1.234,1.235 
Message-ID: <20080313164512.704F860C4D4@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- release-notes.txt	13 Mar 2008 13:59:37 -0000	1.234
+++ release-notes.txt	13 Mar 2008 16:45:10 -0000	1.235
@@ -50,6 +50,10 @@
 
 	New upstream version, fixes various security issues.
 
+    - horde-framework-kolab-3.2_rc1-20080311
+
+	kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
+
     - imapd-2.3.11-20080101_kolab2
 
 	kolab/issue2535 (group:distributionlist at example.com doesn't work for
@@ -110,9 +114,136 @@
 	kolab/issue2495 (The reply to an invitation with umlauts of a group
 	                 account doesn't display the umlauts.)
 
-    - horde-framework-kolab-3.2_rc1-20080311
 
-	kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
+    Packages in the OpenPKG based Kolab server release:
+
+    - Kolab packages:
+
+      Updated:
+
+	horde-framework-kolab-3.2_rc1-20080311
+	kolab-filter-2.2.rc2-20080313
+	kolab-freebusy-2.2.rc2-20080313
+	kolab-webadmin-2.1.99-20080313
+	kolabconf-2.2.rc2-20080313
+	kolabd-2.1.99-20080313
+	perl-kolab-2.2.rc2-20080313
+	php-kolab-2.2.rc2-20080313
+
+      Unchanged:
+
+	PEAR-Auth_SASL-1.0.2-1
+	PEAR-Date-1.4.7-1
+	PEAR-HTTP_Request-1.4.1-1
+	PEAR-Log-1.9.9-1
+	PEAR-Mail-1.1.14-1
+	PEAR-Mail_Mime-1.3.1-1
+	PEAR-Net_IMAP-1.1.0beta1-1
+	PEAR-Net_LMTP-1.0.1-1
+	PEAR-Net_SMTP-1.2.10-1
+	PEAR-Net_Sieve-1.1.5-1
+	PEAR-Net_Socket-1.0.6-1
+	PEAR-Net_URL-1.0.15-1
+	fbview-horde-3.2_rc1-20071201
+	fbview-kronolith-2.2_rc1-20071129
+	horde-imp-kolab-4.2_rc1-20071128
+	horde-ingo-kolab-1.2_rc1-20071128
+	horde-kolab-3.2_rc1-20071201
+	horde-kolab-client-0.99-20071002
+	horde-kronolith-kolab-2.2_rc1-20071129
+	horde-mnemo-kolab-2.2_rc1-20071128
+	horde-nag-kolab-2.2_rc1-20071128
+	horde-passwd-kolab-3.0.1-20071001
+	horde-turba-kolab-2.2_rc1-20071128
+	php-channel-horde-1.0-1
+	php-smarty-2.6.18-20070607
+
+    - OpenPKG packages:
+
+      Updated:
+
+	clamav-0.92.1-20080213
+	imapd-2.3.11-20080101_kolab2
+
+      Unchanged:
+
+	amavisd-2.5.3-20080101
+	apache-2.2.8-20080118
+	apache-php-5.2.5-20080114
+	apr-1.2.12-20080101
+	autoconf-2.61-20080101
+	automake-1.10-20080101
+	bc-1.06-20080101
+	binutils-2.18-20080101
+	bison-2.3-20080101
+	bzip2-1.0.4-20080101
+	config-20060923-20080101
+	curl-7.17.1-20080101
+	db-4.5.20.2-20070628
+	diffutils-2.8.7-20080101
+	expat-2.0.1-20080101
+	file-4.23-20080101
+	flex-2.5.34-20080101
+	freetype-2.3.5-20080101
+	fsl-1.7.0-20080101
+	gcc-4.2.2-20080101
+	gd-2.0.35-20080101
+	gettext-0.17-20080101
+	gmp-4.2.2-20080101
+	grep-2.5.3-20080101
+	groff-1.19.2-20080101
+	gzip-1.3.12-20080101
+	imap-2006k-20080101
+	jpeg-6b-20080101
+	libiconv-1.12-20080101
+	libmcrypt-2.5.8-20080101
+	libxml-2.6.31-20080111
+	libxslt-1.1.22-20080101
+	lzo-2.02-20080101
+	m4-1.4.9-20080101
+	make-3.81-20080101
+	mhash-0.9.9-20080101
+	mm-1.4.2-20080101
+	ncurses-5.6.20080112-20080113
+	openldap-2.3.39-20071130
+	openpkg-20071227-20071227
+	openpkg-tools-1.4.6-20071231
+	openssl-0.9.8g-20080101
+	pcre-7.5-20080110
+	perl-5.10.0-20080103
+	perl-comp-5.10.0-20080110
+	perl-conv-5.10.0-20080101
+	perl-crypto-5.10.0-20080101
+	perl-db-5.10.0-20080118
+	perl-dns-5.10.0-20080101
+	perl-ds-5.10.0-20080104
+	perl-ldap-5.10.0-20080101
+	perl-locale-5.10.0-20080112
+	perl-mail-5.10.0-20080117
+	perl-module-5.10.0-20080101
+	perl-net-5.10.0-20080101
+	perl-openpkg-5.10.0-20080109
+	perl-parse-5.10.0-20080117
+	perl-ssl-5.10.0-20080101
+	perl-stats-5.10.0-20080101
+	perl-sys-5.10.0-20080101
+	perl-term-5.10.0-20080116
+	perl-text-5.10.0-20080101
+	perl-time-5.10.0-20080101
+	perl-util-5.10.0-20080116
+	perl-www-5.10.0-20080103
+	perl-xml-5.10.0-20080101
+	php-5.2.5-20080114
+	pkgconfig-0.23-20080117
+	png-1.2.24-20080101
+	postfix-2.4.6-20080101
+	procmail-3.22-20080101
+	readline-5.2.12-20080101
+	sasl-2.1.22-20080101
+	sed-4.1.5-20080101
+	spamassassin-3.2.4-20080107
+	texinfo-4.11-20080101
+	zlib-1.2.3-20080101
 
 
 Changes between 2.2-beta-3 and 2.2-rc-1



From cvs at kolab.org  Thu Mar 13 17:48:23 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 17:48:23 +0100 (CET)
Subject: thomas: server rpmdircmp,NONE,1.1 
Message-ID: <20080313164823.E7E0C60C4D5@lists.intevation.de>

Author: thomas

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

Added Files:
	rpmdircmp 
Log Message:
Python script to generate "Packages in the OpenPKG based Kolab server release:"
(the list of removed/added/updated/unchanged packages in the release notes)


--- NEW FILE: rpmdircmp ---
#!/usr/bin/env python
#
# Copyright (C) 2008 by Intevation GmbH
# Authors:
# Thomas Arendsen Hein <thomas at intevation.de>
#
# This program is free software under the GPL (>=v2)

"""
rpmdircmp olddir newdir

Prints list of removed/added/updated/unchanged rpm packages
"""

import sys, os

_packagermap = {
    'OpenPKG Foundation e.V.': 'OpenPKG'
}
_packagercache = {}

def rpmpackager(rpmdir, rpm):
    if rpm in _packagercache:
        packager = _packagercache[rpm]
    else:
        name = os.path.join(rpmdir, rpm)
        rpmcall = os.popen("rpm -qp --qf '%%{packager}' '%s'" % name)
        packager = _packagermap.get(rpmcall.read(), 'Kolab')
        rpmcall.close()
        _packagercache[rpm] = packager
    return packager

def rpmdir2list(rpmdir):
    """Returns list of all .src.rpm files in the given directory.

    The list contains tuples: (name, version, release, packager)
    """
    rpms = []
    dirlist = os.listdir(rpmdir)
    todo = len(dirlist)
    sys.stderr.write("Checking %s ...\n" % rpmdir)
    for rpm in dirlist:
        sys.stderr.write("%d ...    \r" % todo)
        todo -= 1
        if rpm.endswith('.src.rpm'):
            entry = rpm[:-len('src.rpm')-1].rsplit('-', 2)
            entry.append(rpmpackager(rpmdir, rpm))
            rpms.append(tuple(entry))
    sys.stderr.write('OK.        \n')
    return rpms

def rpmsets(rpmdir):
    names = {}
    rpms = rpmdir2list(rpmdir)
    for rpm in rpms:
        names[rpm[0]] = rpm
    return set(rpms), set(names), names

if len(sys.argv[1:]) != 2:
    sys.stderr.write("%s\n" % __doc__)
else:
    oldrpms, oldnames, olddict = rpmsets(sys.argv[1])
    newrpms, newnames, newdict = rpmsets(sys.argv[2])

    removed = [olddict[name] for name in list(oldnames.difference(newnames))]
    added = [newdict[name] for name in list(newnames.difference(oldnames))]
    updated = list(newrpms.difference(oldrpms).difference(added))
    unchanged = list(oldrpms.intersection(newrpms))

    sys.stdout.write('    Packages in the OpenPKG based Kolab server release:\n\n')

    for packager in ['Kolab', 'OpenPKG']:
        sys.stdout.write('    - %s packages:\n\n' % packager)

        for title, rpms in [
            ('Removed', removed),
            ('Added', added),
            ('Updated', updated),
            ('Unchanged', unchanged),
        ]:
            wrote_title = False
            rpms.sort()
            for rpm in rpms:
                if rpm[3] == packager:
                    if not wrote_title:
                        sys.stdout.write("      %s:\n\n" % title)
                        wrote_title = True
                    sys.stdout.write("\t%s-%s-%s\n" % rpm[:3])
            if wrote_title:
                sys.stdout.write("\n")




From cvs at kolab.org  Thu Mar 13 17:56:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 17:56:50 +0100 (CET)
Subject: wilde: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.22,
	1.23 
Message-ID: <20080313165650.A203060C4D8@lists.intevation.de>

Author: wilde

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
Fix: use https for fb-look-ups by resmgr.
(resmgr didn't work when "FreeBusy Service via HTTP" was disabled)


Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- resmgr.conf.template.in	11 Feb 2008 16:46:51 -0000	1.22
+++ resmgr.conf.template.in	13 Mar 2008 16:56:48 -0000	1.23
@@ -148,7 +148,7 @@
 $conf['filter']['calendar_store'] = 'Calendar';
 
 /* Where can we get free/busy information from? */
-$conf['filter']['freebusy_url'] = 'http://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
+$conf['filter']['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
  
 /* PFB url to trigger creation of pfb */
 $conf['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.xpfb';



From cvs at kolab.org  Thu Mar 13 17:56:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 17:56:50 +0100 (CET)
Subject: wilde: server/kolabd/kolabd ChangeLog,1.155,1.156 
Message-ID: <20080313165650.AADCD60C4D9@lists.intevation.de>

Author: wilde

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

Modified Files:
	ChangeLog 
Log Message:
Fix: use https for fb-look-ups by resmgr.
(resmgr didn't work when "FreeBusy Service via HTTP" was disabled)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- ChangeLog	7 Mar 2008 16:49:25 -0000	1.155
+++ ChangeLog	13 Mar 2008 16:56:48 -0000	1.156
@@ -1,3 +1,7 @@
+2008-03-13  Sascha Wilde  <wilde at intevation.de>
+
+	* templates/resmgr.conf.template.in: Use https for freebusy_url.
+
 2008-03-07  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* templates/httpd.conf.template.in: Enforce SSL for horde and fbview



From cvs at kolab.org  Thu Mar 13 17:56:50 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 17:56:50 +0100 (CET)
Subject: wilde: server release-notes.txt,1.235,1.236 
Message-ID: <20080313165650.AE5CC60C4DA@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Fix: use https for fb-look-ups by resmgr.
(resmgr didn't work when "FreeBusy Service via HTTP" was disabled)


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- release-notes.txt	13 Mar 2008 16:45:10 -0000	1.235
+++ release-notes.txt	13 Mar 2008 16:56:48 -0000	1.236
@@ -72,6 +72,9 @@
 
 	Enforce SSL for horde and fbview and corrected Location entries.
 
+	Use https for freebusy look-ups by the resmgr (resmgr didn't work
+	when "FreeBusy Service via HTTP" was disabled).
+
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 	kolab/issue2350 (Email from buggy Lotus notes client not accepted by
 	                 Cyrus)



From cvs at kolab.org  Thu Mar 13 18:08:40 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 18:08:40 +0100 (CET)
Subject: thomas: server rpmdircmp,1.1,1.2 
Message-ID: <20080313170840.D328660C4D7@lists.intevation.de>

Author: thomas

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

Modified Files:
	rpmdircmp 
Log Message:
rpmdircmp: Warn when finding duplicate rpms (e.g. two kolabd versions)


Index: rpmdircmp
===================================================================
RCS file: /kolabrepository/server/rpmdircmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rpmdircmp	13 Mar 2008 16:48:21 -0000	1.1
+++ rpmdircmp	13 Mar 2008 17:08:38 -0000	1.2
@@ -53,7 +53,10 @@
     names = {}
     rpms = rpmdir2list(rpmdir)
     for rpm in rpms:
-        names[rpm[0]] = rpm
+        name = rpm[0]
+        if name in names:
+            sys.stderr.write("DUPLICATE in '%s': %s\n" % (rpmdir, name))
+        names[name] = rpm
     return set(rpms), set(names), names
 
 if len(sys.argv[1:]) != 2:



From cvs at kolab.org  Thu Mar 13 18:30:49 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 18:30:49 +0100 (CET)
Subject: thomas: server rpmdircmp,1.2,1.3 
Message-ID: <20080313173049.51A3160C4D4@lists.intevation.de>

Author: thomas

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

Modified Files:
	rpmdircmp 
Log Message:
rpmdircmp: Be able to run on binary rpms, too


Index: rpmdircmp
===================================================================
RCS file: /kolabrepository/server/rpmdircmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rpmdircmp	13 Mar 2008 17:08:38 -0000	1.2
+++ rpmdircmp	13 Mar 2008 17:30:47 -0000	1.3
@@ -7,7 +7,7 @@
 # This program is free software under the GPL (>=v2)
 
 """
-rpmdircmp olddir newdir
+rpmdircmp olddir newdir [ext]
 
 Prints list of removed/added/updated/unchanged rpm packages
 """
@@ -30,9 +30,10 @@
         _packagercache[rpm] = packager
     return packager
 
-def rpmdir2list(rpmdir):
-    """Returns list of all .src.rpm files in the given directory.
+def rpmdir2list(rpmdir, ext):
+    """Returns list of all rpm files in the given directory.
 
+    rpm files must have the extension "ext", e.g. ".src.rpm".
     The list contains tuples: (name, version, release, packager)
     """
     rpms = []
@@ -42,16 +43,16 @@
     for rpm in dirlist:
         sys.stderr.write("%d ...    \r" % todo)
         todo -= 1
-        if rpm.endswith('.src.rpm'):
-            entry = rpm[:-len('src.rpm')-1].rsplit('-', 2)
+        if rpm.endswith(ext):
+            entry = rpm[:-len(ext)-1].rsplit('-', 2)
             entry.append(rpmpackager(rpmdir, rpm))
             rpms.append(tuple(entry))
     sys.stderr.write('OK.        \n')
     return rpms
 
-def rpmsets(rpmdir):
+def rpmsets(rpmdir, ext):
     names = {}
-    rpms = rpmdir2list(rpmdir)
+    rpms = rpmdir2list(rpmdir, ext)
     for rpm in rpms:
         name = rpm[0]
         if name in names:
@@ -59,11 +60,11 @@
         names[name] = rpm
     return set(rpms), set(names), names
 
-if len(sys.argv[1:]) != 2:
-    sys.stderr.write("%s\n" % __doc__)
-else:
-    oldrpms, oldnames, olddict = rpmsets(sys.argv[1])
-    newrpms, newnames, newdict = rpmsets(sys.argv[2])
+def main(olddir, newdir, ext=None):
+    if not ext:
+        ext = '.src.rpm'
+    oldrpms, oldnames, olddict = rpmsets(olddir, ext)
+    newrpms, newnames, newdict = rpmsets(newdir, ext)
 
     removed = [olddict[name] for name in list(oldnames.difference(newnames))]
     added = [newdict[name] for name in list(newnames.difference(oldnames))]
@@ -91,4 +92,11 @@
                     sys.stdout.write("\t%s-%s-%s\n" % rpm[:3])
             if wrote_title:
                 sys.stdout.write("\n")
+
+
+if __name__ == "__main__":
+    if 2 <= len(sys.argv[1:]) <= 3:
+        main(*sys.argv[1:])
+    else:
+        sys.stderr.write("%s\n" % __doc__)
 



From cvs at kolab.org  Thu Mar 13 18:36:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 18:36:38 +0100 (CET)
Subject: thomas: server/kolab-filter/filter config.php,1.12,1.13 
Message-ID: <20080313173638.C48FA60C4D4@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter/filter
In directory doto:/tmp/cvs-serv21170/kolab-filter/filter

Modified Files:
	config.php 
Log Message:
Updated kolab-filter/kolab-freebusy config.php via convert_template2config_php.pl


Index: config.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/config.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config.php	3 Dec 2007 11:27:19 -0000	1.12
+++ config.php	13 Mar 2008 17:36:36 -0000	1.13
@@ -40,7 +40,7 @@
 $conf['filter']['imap_server'] = 'localhost';
 
 /* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
-$conf['filter']['lmtp_host'] = $conf['filter']['imap_server'];
+$conf['filter']['lmtp_host'] = 'localhost';
 $conf['filter']['lmtp_port'] = 2003;
 
 /* SMTP settings (Kolab Postfix usually offers reinjection port on
@@ -61,6 +61,9 @@
 /* List of kolab hosts that are privileged */
 $conf['filter']['kolabhosts'] = 'one.example.com,two.example.com,three.example.com';
 
+/* List privileged networks */
+$conf['filter']['privileged_networks'] = '';
+
 /* Are we using virtual domains with Cyrus? */
 $conf['filter']['virtual_domains'] = true;
 
@@ -124,10 +127,10 @@
 $conf['filter']['calendar_store'] = 'Calendar';
 
 /* Where can we get free/busy information from? */
-$conf['filter']['freebusy_url'] = 'http://localhost/freebusy/${USER}.xfb';
+$conf['filter']['freebusy_url'] = 'https://example.com/freebusy/${USER}.xfb';
  
 /* PFB url to trigger creation of pfb */
-$conf['filter']['pfb_trigger_url'] = 'https://localhost/freebusy/trigger/${USER}/${FOLDER}.xpfb';
+$conf['filter']['pfb_trigger_url'] = 'https://example.com/freebusy/trigger/${USER}/${FOLDER}.xpfb';
 
 /* Temporary data storage for the scripts */
 $conf['filter']['tempdir'] = '';
@@ -135,7 +138,7 @@
 /* PHP error logging */
 $conf['filter']['error_log'] = '/kolab/var/kolab-filter/log/fatal.log';
 
-/* Horde::Log configuration 
+/* Horde::Log configuration
  *
  * PEAR_LOG_INFO is the suggested setting for tracking what happens to
  * your mails in the filters.



From cvs at kolab.org  Thu Mar 13 18:36:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 18:36:38 +0100 (CET)
Subject: thomas: server/kolab-filter ChangeLog,1.3,1.4 
Message-ID: <20080313173638.C016B60C4CF@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv21170/kolab-filter

Modified Files:
	ChangeLog 
Log Message:
Updated kolab-filter/kolab-freebusy config.php via convert_template2config_php.pl


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-filter/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	3 Dec 2007 11:27:19 -0000	1.3
+++ ChangeLog	13 Mar 2008 17:36:36 -0000	1.4
@@ -1,3 +1,7 @@
+2008-03-13  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* filter/config.php: Updated via convert_template2config_php.pl
+
 2007-12-03  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* filter/config.php: Removed resource password handling which is



From cvs at kolab.org  Thu Mar 13 18:36:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 18:36:38 +0100 (CET)
Subject: thomas: server/kolab-freebusy ChangeLog,1.8,1.9 
Message-ID: <20080313173638.C84FD60C4D6@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv21170/kolab-freebusy

Modified Files:
	ChangeLog 
Log Message:
Updated kolab-filter/kolab-freebusy config.php via convert_template2config_php.pl


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	7 Feb 2008 09:04:46 -0000	1.8
+++ ChangeLog	13 Mar 2008 17:36:36 -0000	1.9
@@ -1,3 +1,7 @@
+2008-03-13  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* freebusy/config.php: Updated via convert_template2config_php.pl
+
 2008-02-07  Gunnar Wrobel  <p at rdus.de>
 
 	* freebusy/generatefb.php:



From cvs at kolab.org  Thu Mar 13 18:36:38 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 18:36:38 +0100 (CET)
Subject: thomas: server/kolab-freebusy/freebusy config.php,1.6,1.7 
Message-ID: <20080313173638.CC04C60C4D7@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy/freebusy
In directory doto:/tmp/cvs-serv21170/kolab-freebusy/freebusy

Modified Files:
	config.php 
Log Message:
Updated kolab-filter/kolab-freebusy config.php via convert_template2config_php.pl


Index: config.php
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/freebusy/config.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.php	23 Nov 2007 13:39:32 -0000	1.6
+++ config.php	13 Mar 2008 17:36:36 -0000	1.7
@@ -51,7 +51,7 @@
 $conf['kolab']['ldap']['server'] = 'example.com';
 $conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
 $conf['kolab']['ldap']['phpdn']  = 'cn=nobody,cn=internal,dc=example,dc=com';
-$conf['kolab']['ldap']['phppw']  = '';
+$conf['kolab']['ldap']['phppw']  = 'xyz';
 
 /* Horde::Kolab::IMAP configuration */
 $conf['kolab']['imap']['server']   = 'example.com';
@@ -134,4 +134,4 @@
 // ini_set('display_errors', 1);
 //
 // Both setting will disrupt header delivery (which should not cause a
-// problem).
\ No newline at end of file
+// problem).



From cvs at kolab.org  Thu Mar 13 18:58:15 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 18:58:15 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES
	messages.po, 1.25, 1.26 
Message-ID: <20080313175815.839E360C4CC@lists.intevation.de>

Author: thomas

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

Modified Files:
	messages.po 
Log Message:
kolab/issue2505 (update of the french translation for kolab-server 2.2)


Index: messages.po
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/locale/fr/LC_MESSAGES/messages.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- messages.po	23 Feb 2008 20:19:11 -0000	1.25
+++ messages.po	13 Mar 2008 17:58:13 -0000	1.26
@@ -1,19 +1,22 @@
+# translation of messages.po to Français
 # This file is distributed under the same license as Kolab-Webadmin.
 # Copyright (C)
-# Benoit Mortier <benoit.mortier at opensides.be>, 2005.
-# Jean-Michel LACROIX <jm-lacroix at savigny.org>, 2006.
 #
+# Benoit Mortier <benoit.mortier at opensides.be>, 2005, 2008.
+# Jean-Michel LACROIX <jm-lacroix at savigny.org>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab-Webadmin French\n"
[...1369 lines suppressed...]
-#~ "href='/admin/distributionlist/list.php?action=modify&dn="
-
-#, fuzzy
-#~ msgid "LDAP Error: Could not remove old entry %s,%s: %s"
-#~ msgstr "Erreur LDAP: impossible de renommer"
-
-#~ msgid "Kolab Hosts"
-#~ msgstr "Serveurs Kolab"
-
-#~ msgid "One Email address per line"
-#~ msgstr "Une adresse par ligne"
-
-#~ msgid "Please log in as a valid user"
-#~ msgstr "Veuillez vous connecter un nom d'utilisateur valide"
+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 Mar 13 19:00:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 19:00:28 +0100 (CET)
Subject: thomas: server/kolab-webadmin/kolab-webadmin ChangeLog,1.93,1.94 
Message-ID: <20080313180028.E141460C4CF@lists.intevation.de>

Author: thomas

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

Modified Files:
	ChangeLog 
Log Message:
Forgot ChangeLog entry for updated french translation


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- ChangeLog	7 Mar 2008 17:37:41 -0000	1.93
+++ ChangeLog	13 Mar 2008 18:00:26 -0000	1.94
@@ -1,3 +1,8 @@
+2008-03-13  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* php/admin/locale/fr/LC_MESSAGES/messages.po: Updated french
+	translation (kolab/issue2505)
+
 2008-03-07  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* www/admin/administrator/index.php.in,



From cvs at kolab.org  Thu Mar 13 19:01:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 13 Mar 2008 19:01:28 +0100 (CET)
Subject: thomas: server release-notes.txt,1.236,1.237 
Message-ID: <20080313180128.CF52B60C4D4@lists.intevation.de>

Author: thomas

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

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


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- release-notes.txt	13 Mar 2008 16:56:48 -0000	1.236
+++ release-notes.txt	13 Mar 2008 18:01:26 -0000	1.237
@@ -97,6 +97,7 @@
 	kolab/issue2203 (About Kolab does not list new server components)
 	kolab/issue2329 (Domain Maintainer cannot create users)
 	kolab/issue2437 (Change name of service tab to settings)
+	kolab/issue2505 (update of the french translation for kolab-server)
 	kolab/issue2507 (move session_vars.php to sysconfig directory)
 
     - perl-kolab-2.2.rc2-20080313



From cvs at kolab.org  Fri Mar 14 10:17:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 10:17:13 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Freebusy ChangeLog,1.14,1.15 
Message-ID: <20080314091713.761B160014F@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv4583/php-kolab/Kolab_Freebusy

Modified Files:
	ChangeLog 
Log Message:
Fixed determination of calender owner for freebusy regeneration.


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	3 Mar 2008 14:48:25 -0000	1.14
+++ ChangeLog	14 Mar 2008 09:17:11 -0000	1.15
@@ -1,3 +1,8 @@
+2008-03-14  Sascha Wilde  <wilde at intevation.de>
+
+	* Freebusy/Page.php (class FolderAccess): Fixed determination of
+	calendar folder owner.
+
 2008-03-03  Gunnar Wrobel  <p at rdus.de>
 
 	* Freebusy/Cache.php: Fix the CN attribute handling. This requires Horde



From cvs at kolab.org  Fri Mar 14 10:17:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 10:17:13 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Freebusy/Freebusy Page.php,1.6,1.7 
Message-ID: <20080314091713.772A3600D48@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv4583/php-kolab/Kolab_Freebusy/Freebusy

Modified Files:
	Page.php 
Log Message:
Fixed determination of calender owner for freebusy regeneration.


Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Page.php	27 Feb 2008 08:44:38 -0000	1.6
+++ Page.php	14 Mar 2008 09:17:11 -0000	1.7
@@ -427,7 +427,7 @@
 
         /* Possibly rewrite the owner UID into the primary mail address */
         if (!empty($uinfo) && isset($uinfo['MAIL']) && !empty($uinfo['MAIL'])) {
-            $this->owner = $userinfo['MAIL'];
+            $this->owner = $uinfo['MAIL'];
         }
 
         /* If we were unable to determine the owner we will finally



From cvs at kolab.org  Fri Mar 14 10:17:13 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 10:17:13 +0100 (CET)
Subject: wilde: server release-notes.txt,1.237,1.238 
Message-ID: <20080314091713.76FD4600174@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Fixed determination of calender owner for freebusy regeneration.


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- release-notes.txt	13 Mar 2008 18:01:26 -0000	1.237
+++ release-notes.txt	14 Mar 2008 09:17:11 -0000	1.238
@@ -107,6 +107,9 @@
 
     - php-kolab-2.2.rc2-20080313
 
+        Fixed determination of calendar folder owner.  Resmgr wasn't
+        able to trigger freebqusy list generation.
+
 	kolab/issue1272 (From: header in vacation messages is marked as
 	                 "Untrusted")
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)



From cvs at kolab.org  Fri Mar 14 11:07:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 11:07:32 +0100 (CET)
Subject: thomas: server release-notes.txt,1.238,1.239 
Message-ID: <20080314100732.271B9600171@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
Bumped rc2 date to today


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- release-notes.txt	14 Mar 2008 09:17:11 -0000	1.238
+++ release-notes.txt	14 Mar 2008 10:07:30 -0000	1.239
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20080313, Kolab Server 2.2-rc2
+(Version 20080314, Kolab Server 2.2-rc2
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -61,12 +61,12 @@
 	kolab/issue2541 (openpkg rpm -e imapd removes annotations.db and
 	                 mailboxes.db)
 
-    - kolabconf-2.2.rc2-20080313
+    - kolabconf-2.2.rc2-20080314
 
 	kolab/issue1550 (Masquerade problem)
 	kolab/issue2446 (Make the used syslog facility configureable)
 
-    - kolabd-2.1.99-20080313
+    - kolabd-2.1.99-20080314
 
 	kolabdcachetool: Fix location of graveyard caches.
 
@@ -84,11 +84,11 @@
 	                 networks?)
 	kolab/issue2507 (move session_vars.php to sysconfig directory)
 
-    - kolab-freebusy-2.2.rc2-20080313
+    - kolab-freebusy-2.2.rc2-20080314
 
 	kolab/issue1693 (Automatically trigger f/b cache regeneration)
 
-    - kolab-webadmin-2.1.99-20080313
+    - kolab-webadmin-2.1.99-20080314
 
 	Corrections in the Dutch translation.
 
@@ -100,12 +100,12 @@
 	kolab/issue2505 (update of the french translation for kolab-server)
 	kolab/issue2507 (move session_vars.php to sysconfig directory)
 
-    - perl-kolab-2.2.rc2-20080313
+    - perl-kolab-2.2.rc2-20080314
 
 	kolab/issue2358 (mismatch between cyrus-admins and cyrus-admin)
 	kolab/issue2478 (kolabd memory leak)
 
-    - php-kolab-2.2.rc2-20080313
+    - php-kolab-2.2.rc2-20080314
 
         Fixed determination of calendar folder owner.  Resmgr wasn't
         able to trigger freebqusy list generation.
@@ -129,13 +129,13 @@
       Updated:
 
 	horde-framework-kolab-3.2_rc1-20080311
-	kolab-filter-2.2.rc2-20080313
-	kolab-freebusy-2.2.rc2-20080313
-	kolab-webadmin-2.1.99-20080313
-	kolabconf-2.2.rc2-20080313
-	kolabd-2.1.99-20080313
-	perl-kolab-2.2.rc2-20080313
-	php-kolab-2.2.rc2-20080313
+	kolab-filter-2.2.rc2-20080314
+	kolab-freebusy-2.2.rc2-20080314
+	kolab-webadmin-2.1.99-20080314
+	kolabconf-2.2.rc2-20080314
+	kolabd-2.1.99-20080314
+	perl-kolab-2.2.rc2-20080314
+	php-kolab-2.2.rc2-20080314
 
       Unchanged:
 



From cvs at kolab.org  Fri Mar 14 12:16:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 12:16:32 +0100 (CET)
Subject: wilde: server/kolab-webadmin/kolab-webadmin configure.ac, 1.27,
	1.28 Makefile.am, 1.49, 1.50 ChangeLog, 1.94, 1.95 
Message-ID: <20080314111632.DFC20600170@lists.intevation.de>

Author: wilde

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

Modified Files:
	configure.ac Makefile.am ChangeLog 
Log Message:
Fixed issue2543 (Compiling kolab packages leaves ldap.class.php)
and removed unneeded AC_CONFIG_SRCDIR line.


Index: configure.ac
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.ac	6 Mar 2008 12:13:12 -0000	1.27
+++ configure.ac	14 Mar 2008 11:16:30 -0000	1.28
@@ -2,7 +2,6 @@
 
 m4_define(_VERSION,2.1.99)
 AC_INIT([kolab-webadmin],[_VERSION],[kolab-devel at kolab.org])
-AC_CONFIG_SRCDIR(php/admin/include/ldap.class.php.in)
 AC_CONFIG_AUX_DIR(.)
 
 AM_INIT_AUTOMAKE([gnu] [1.7] [dist-bzip2] [no-dist-gzip])

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Makefile.am	6 Mar 2008 11:46:29 -0000	1.49
+++ Makefile.am	14 Mar 2008 11:16:30 -0000	1.50
@@ -109,7 +109,6 @@
 PHP_INCLUDES = php/admin/include/menu.php \
 	php/admin/include/debug.php \
 	php/admin/include/form.class.php \
-	php/admin/include/ldap.class.php \
 	php/admin/include/sieveutils.class.php \
 	php/admin/include/authenticate.php \
 	php/admin/include/locale.php \
@@ -119,6 +118,7 @@
 phpincludesdir = $(phpkolabdir)/include
 phpincludes_DATA = $(PHP_INCLUDES) \
 	php/admin/include/auth.class.php \
+	php/admin/include/ldap.class.php \
 	php/admin/include/headers.php \
 	php/admin/include/mysmarty.php 
 EXTRA_DIST += $(PHP_INCLUDES)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- ChangeLog	13 Mar 2008 18:00:26 -0000	1.94
+++ ChangeLog	14 Mar 2008 11:16:30 -0000	1.95
@@ -1,3 +1,10 @@
+2008-03-14  Sascha Wilde  <wilde at intevation.de>
+
+	* Makefile.am (phpincludesdir): Moved
+	php/admin/include/ldap.class.php to phpincludesdir_DATA
+	(Fixes issue2543).
+	* configure.ac: Removed unneeded AC_CONFIG_SRCDIR line.
+
 2008-03-13  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* php/admin/locale/fr/LC_MESSAGES/messages.po: Updated french



From cvs at kolab.org  Fri Mar 14 18:26:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:26:08 +0100 (CET)
Subject: gunnar: server/horde/horde-mimp - New directory 
Message-ID: <20080314172608.55863600D4A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-mimp
In directory doto:/tmp/cvs-serv23679/horde-mimp

Log Message:
Directory /kolabrepository/server/horde/horde-mimp added to the repository




From cvs at kolab.org  Fri Mar 14 18:26:08 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:26:08 +0100 (CET)
Subject: gunnar: server/horde/horde-dimp - New directory 
Message-ID: <20080314172608.543A2600D48@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-dimp
In directory doto:/tmp/cvs-serv23679/horde-dimp

Log Message:
Directory /kolabrepository/server/horde/horde-dimp added to the repository




From cvs at kolab.org  Fri Mar 14 18:28:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:02 +0100 (CET)
Subject: gunnar: server/horde/fbview-horde ChangeLog, 1.2, 1.3 Makefile, 1.3,
	1.4 fbview-horde.spec, 1.17, 1.18 conf.php, 1.9, NONE prefs.php,
	1.1, NONE 
Message-ID: <20080314172802.9DD75600D4A@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Makefile fbview-horde.spec 
Removed Files:
	conf.php prefs.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	29 Nov 2007 08:25:51 -0000	1.2
+++ ChangeLog	14 Mar 2008 17:28:00 -0000	1.3
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* fbview-horde.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* fbview-horde.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	1 Oct 2007 15:47:19 -0000	1.3
+++ Makefile	14 Mar 2008 17:28:00 -0000	1.4
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fbview-horde.spec	1 Dec 2007 06:57:42 -0000	1.17
+++ fbview-horde.spec	14 Mar 2008 17:28:00 -0000	1.18
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name horde
 %define         V_package fbview-%{V_horde_name}
-%define         V_year  2007
-%define         V_month 12
-%define         V_day   01
-%define         V_version 3.2_rc1
-%define         V_uver    3.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 3.2_rc2
+%define         V_uver    3.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -24,8 +24,9 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_uver}.tar.gz
 Source1:        fbview-horde-conf.template
-Source2:        conf.php
-Source3:        prefs.php
+
+# List of Patches
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-horde-3.2-rc2/HK-GW-Config_fbview-horde-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -61,6 +62,10 @@
 %prep
 	%setup -c -q -n %{V_horde_name}-%{V_uver}
 
+	cd %{V_horde_name}-%{V_uver}
+	%patch -p2 -P 0
+	cd ..
+
 %build
 
 %install
@@ -75,7 +80,9 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	rm -rf lib/{File,File.php,Horde,Horde.php,Net,SyncML,SyncML.php,Text,VFS,VFS.php,XML}
 
@@ -85,17 +92,12 @@
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
-
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3} \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
  	    %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/fbview \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/fbview \
 	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-horde-conf.template' \
 	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/config/conf.php'    \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/conf.php'    \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/prefs.php'
+	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- conf.php DELETED ---

--- prefs.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:02 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:02 +0100 (CET)
Subject: gunnar: server/horde/fbview-kronolith ChangeLog, 1.2, 1.3 Makefile,
	1.5, 1.6 fbview-kronolith.spec, 1.19,
	1.20 HK-GW-Fbview_menu.patch, 1.1,
	NONE HK-GW-Fbview_relevance.patch, 1.1,
	NONE HK-GW-Fbview_xfb_access.patch, 1.1,
	NONE HK-JS-Fix_library_import.patch, 1.1,
	NONE HK-SB-Fbview_extra_params.patch, 1.1,
	NONE HK-SB-Fbview_save_attendees.patch, 1.1, NONE conf.php, 1.1,
	NONE prefs.php, 1.3, NONE 
Message-ID: <20080314172802.A77C0600D4B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv23799/fbview-kronolith

Modified Files:
	ChangeLog Makefile fbview-kronolith.spec 
Removed Files:
	HK-GW-Fbview_menu.patch HK-GW-Fbview_relevance.patch 
	HK-GW-Fbview_xfb_access.patch HK-JS-Fix_library_import.patch 
	HK-SB-Fbview_extra_params.patch 
	HK-SB-Fbview_save_attendees.patch conf.php prefs.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	29 Nov 2007 08:25:51 -0000	1.2
+++ ChangeLog	14 Mar 2008 17:28:00 -0000	1.3
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* fbview-kronolith.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* fbview-kronolith.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	30 Nov 2007 05:55:51 -0000	1.5
+++ Makefile	14 Mar 2008 17:28:00 -0000	1.6
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog 
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog 
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- fbview-kronolith.spec	30 Nov 2007 06:47:22 -0000	1.19
+++ fbview-kronolith.spec	14 Mar 2008 17:28:00 -0000	1.20
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name kronolith
 %define         V_package fbview-%{V_horde_name}
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   29
-%define         V_version 2.2_rc1
-%define         V_uver    2.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 2.2_rc2
+%define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -24,16 +24,15 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
 Source1:        fbview-kronolith-conf.template
-Source2:        conf.php
-Source3:        prefs.php
 
 # List of Patches
-Patch0:         HK-SB-Fbview_extra_params.patch
-Patch1:         HK-SB-Fbview_save_attendees.patch
-Patch2:         HK-JS-Fix_library_import.patch
-Patch3:         HK-GW-Fbview_menu.patch
-Patch4:         HK-GW-Fbview_relevance.patch
-Patch5:         HK-GW-Fbview_xfb_access.patch
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch
+Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch
+Patch2:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch
+Patch3:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch
+Patch4:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch
+Patch5:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Config_fbview-kronolith-3.2-rc2.patch
+
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -79,7 +78,7 @@
 
 	cd %{V_horde_name}-h3-%{V_uver}
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
 
 	# Remove some stuff not necessary for fbview
 	rm add.php day.php view.php                            \
@@ -89,21 +88,17 @@
            data.php event.php
 
 	find . -name '*.orig' | xargs rm
+
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/
 
 	cd ..
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
-
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3}      \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                            \
 	    '%config(noreplace)' %{l_prefix}/etc/kolab/templates/fbview-kronolith-conf.template   \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/prefs.php
+	    '%config(noreplace)' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- HK-GW-Fbview_menu.patch DELETED ---

--- HK-GW-Fbview_relevance.patch DELETED ---

--- HK-GW-Fbview_xfb_access.patch DELETED ---

--- HK-JS-Fix_library_import.patch DELETED ---

--- HK-SB-Fbview_extra_params.patch DELETED ---

--- HK-SB-Fbview_save_attendees.patch DELETED ---

--- conf.php DELETED ---

--- prefs.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-ingo Makefile, 1.6,
	1.7 horde-ingo-kolab.spec, 1.17, 1.18 backends.php, 1.2,
	NONE conf.php, 1.3, NONE 
Message-ID: <20080314172804.790DA600D5A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-ingo
In directory doto:/tmp/cvs-serv23799/horde-ingo

Modified Files:
	Makefile horde-ingo-kolab.spec 
Removed Files:
	backends.php conf.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:19 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- horde-ingo-kolab.spec	29 Nov 2007 15:32:10 -0000	1.17
+++ horde-ingo-kolab.spec	14 Mar 2008 17:28:02 -0000	1.18
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name ingo
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   28
-%define         V_version 1.2_rc1
-%define         V_uver    1.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 1.2_rc2
+%define         V_uver    1.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -23,8 +23,9 @@
 
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
-Source1:        conf.php
-Source2:        backends.php
+
+# List of Patches
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/ingo-3.2-rc2/HK-GW-Config_ingo-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -52,6 +53,10 @@
 %prep
 	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
 
+	cd %{V_horde_name}-h3-%{V_uver}
+	%patch -p2 -P 0
+	cd ..
+
 %build
 
 %install
@@ -62,19 +67,17 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
 
 	cd ..
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/backends.php
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- backends.php DELETED ---

--- conf.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-dimp .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Makefile, NONE, 1.1 horde-dimp-kolab.spec, NONE, 1.1 
Message-ID: <20080314172804.5DF65600D4A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-dimp
In directory doto:/tmp/cvs-serv23799/horde-dimp

Added Files:
	.cvsignore ChangeLog Makefile horde-dimp-kolab.spec 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

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

--- NEW FILE: ChangeLog ---
2008-02-26  Gunnar Wrobel  <p at rdus.de>

	* horde-imp-kolab.spec: Added package to Kolab CVS (RC2).


--- NEW FILE: Makefile ---
ifeq "x$(RPM)" "x"
  RPM = $(HOME)/bin/openpkg rpm
endif
ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
  KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABRPMTMP)" "x"
  KOLABRPMTMP = $(HOME)/RPM/TMP
endif

HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")

DATE = ${YEAR}-${MONTH}-${DAY}

PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
RELEASE = ${YEAR}${MONTH}${DAY}

PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")

PACKAGE_0=$(HORDE_NAME)-h3-$(UVER).tar.gz
SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)

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

.PHONY: dist
dist: all
	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/

.PHONY: clean
clean:
	rm -rf /kolab/RPM/TMP/$(PACKAGE)
	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	rm -rf *~

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"

	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
	  wget -c "$$PATCH"; done

	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)

	if [ -n "$(TEMPLATES)" ]; then              \
	  for TEMPLATE in $(TEMPLATES);             \
	  do                                        \
	    cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
	  done;                                     \
	fi

	if [ -n "$(CONFIGS)" ]; then                \
	  for CONFIG in $(CONFIGS);                 \
	  do                                        \
	    cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE);  \
	  done;                                     \
	fi

	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec

	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

--- NEW FILE: horde-dimp-kolab.spec ---
# Versions
%define         V_horde_name dimp
%define         V_package horde-%{V_horde_name}-kolab
%define         V_year  2008
%define         V_month 02
%define         V_day   26
%define         V_version 1.0_rc2
%define         V_uver    1.0-rc2
%define         V_date %{V_year}-%{V_month}-%{V_day}
%define         V_release %{V_year}%{V_month}%{V_day}

# Package Information
Name:		%{V_package}
Summary:	DIMP is the dynamic version of IMP.
URL:		http://www.horde.org/
Packager:	Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:	%{V_version}
Release:	%{V_release}
Class:		JUNK
License:	GPL
Group:		MAIL
Distribution:	OpenPKG

# List of Sources
Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz

# List of Patches
Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/dimp-3.2-rc2/HK-GW-Config_dimp-3.2-rc2.patch

# Build Info
Prefix:		%{l_prefix}
BuildRoot:	%{l_buildroot}

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
PreReq:	      horde-framework-kolab >= 3.1.4.99
PreReq:	      horde-imp-kolab >= 4.1.99
PreReq:	      PEAR-Auth_SASL >= 1.0.2
# FIXME (optional)
#PreReq:	      PEAR-HTTP_Request
#PreReq:	      PECL-idn

AutoReq:      no
AutoReqProv:  no
#BuildArch:    noarch

%description 
DIMP is a project to create a version of IMP utilizing AJAX-like
technologies to allow a more dynamic user experience (thus
DIMP... Dynamic IMP).

%prep
	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}

	cd %{V_horde_name}-h3-%{V_uver}
	%patch -p2 -P 0
	cd ..

%build

%install
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	

	cd %{V_horde_name}-h3-%{V_uver}

	rm -rf test.php

	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..

	find . -name '*.orig' | xargs rm

	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/

	cd ..

	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php 


%clean
	rm -rf $RPM_BUILD_ROOT

%files -f files



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde ChangeLog, 1.5, 1.6 Makefile, 1.14,
	1.15 horde-kolab.spec, 1.24, 1.25 conf.php, 1.11, NONE hooks.php,
	1.1, NONE registry.php, 1.1, NONE 
Message-ID: <20080314172804.611D5600D4B@lists.intevation.de>

Author: gunnar

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

Modified Files:
	ChangeLog Makefile horde-kolab.spec 
Removed Files:
	conf.php hooks.php registry.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.5
+++ ChangeLog	14 Mar 2008 17:28:00 -0000	1.6
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	1 Oct 2007 15:47:19 -0000	1.14
+++ Makefile	14 Mar 2008 17:28:00 -0000	1.15
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- horde-kolab.spec	1 Dec 2007 06:57:42 -0000	1.24
+++ horde-kolab.spec	14 Mar 2008 17:28:00 -0000	1.25
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name horde
 %define         V_package %{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 12
-%define         V_day   01
-%define         V_version 3.2_rc1
-%define         V_uver    3.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 3.2_rc2
+%define         V_uver    3.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -24,7 +24,9 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_uver}.tar.gz
 Source1:        horde-kolab-conf.template
-Source2:        conf.php
+
+# List of Patches
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/horde-3.2-rc2/HK-GW-Config_horde-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -63,6 +65,7 @@
 	%setup -c -q -n %{V_horde_name}-%{V_uver}
 
 	cd %{V_horde_name}-%{V_uver}
+	%patch -p2 -P 0
 	cd ..
 
 %build
@@ -78,7 +81,9 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	rm -rf lib/{File,File.php,Horde,Horde.php,Net,SyncML,SyncML.php,Text,VFS,VFS.php,XML}
 
@@ -89,15 +94,12 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2}   \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/horde \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/horde \
 	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template' \
 	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/config/conf.php'    \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/conf.php'
+	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/*.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- conf.php DELETED ---

--- hooks.php DELETED ---

--- registry.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-mimp .cvsignore, NONE, 1.1 ChangeLog, NONE,
	1.1 Makefile, NONE, 1.1 horde-mimp-kolab.spec, NONE, 1.1 
Message-ID: <20080314172804.84337600D6B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-mimp
In directory doto:/tmp/cvs-serv23799/horde-mimp

Added Files:
	.cvsignore ChangeLog Makefile horde-mimp-kolab.spec 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

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

--- NEW FILE: ChangeLog ---
2008-02-26  Gunnar Wrobel  <p at rdus.de>

	* horde-imp-kolab.spec: Added package to Kolab CVS (RC2).


--- NEW FILE: Makefile ---
ifeq "x$(RPM)" "x"
  RPM = $(HOME)/bin/openpkg rpm
endif
ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
  KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABRPMTMP)" "x"
  KOLABRPMTMP = $(HOME)/RPM/TMP
endif

HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")

DATE = ${YEAR}-${MONTH}-${DAY}

PACKAGE = horde-$(HORDE_NAME)-kolab
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
RELEASE = ${YEAR}${MONTH}${DAY}

PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")

PACKAGE_0=$(HORDE_NAME)-h3-$(UVER).tar.gz
SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)

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

.PHONY: dist
dist: all
	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/

.PHONY: clean
clean:
	rm -rf /kolab/RPM/TMP/$(PACKAGE)
	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	rm -rf *~

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"

	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
	  wget -c "$$PATCH"; done

	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)

	if [ -n "$(TEMPLATES)" ]; then              \
	  for TEMPLATE in $(TEMPLATES);             \
	  do                                        \
	    cp $$TEMPLATE $(KOLABRPMSRC)/$(PACKAGE);\
	  done;                                     \
	fi

	if [ -n "$(CONFIGS)" ]; then                \
	  for CONFIG in $(CONFIGS);                 \
	  do                                        \
	    cp $$CONFIG $(KOLABRPMSRC)/$(PACKAGE);  \
	  done;                                     \
	fi

	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec

	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

--- NEW FILE: horde-mimp-kolab.spec ---
# Versions
%define         V_horde_name mimp
%define         V_package horde-%{V_horde_name}-kolab
%define         V_year  2008
%define         V_month 02
%define         V_day   26
%define         V_version 1.1_rc1
%define         V_uver    1.1-rc1
%define         V_date %{V_year}-%{V_month}-%{V_day}
%define         V_release %{V_year}%{V_month}%{V_day}

# Package Information
Name:		%{V_package}
Summary:	MIMP is IMP but suitable for mobile devices. 
URL:		http://www.horde.org/
Packager:	Gunnar Wrobel <wrobel at pardus.de> (p at rdus)
Version:	%{V_version}
Release:	%{V_release}
Class:		JUNK
License:	GPL
Group:		MAIL
Distribution:	OpenPKG

# List of Sources
Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz

# List of Patches
Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/dimp-3.2-rc2/HK-GW-Config_dimp-3.2-rc2.patch

# Build Info
Prefix:		%{l_prefix}
BuildRoot:	%{l_buildroot}

#Pre requisites
BuildPreReq:  OpenPKG, openpkg >= 20070603
BuildPreReq:  php, php::with_pear = yes
PreReq:	      horde-framework-kolab >= 3.1.4.99
PreReq:	      horde-imp-kolab >= 4.1.99
PreReq:	      PEAR-Auth_SASL >= 1.0.2
# FIXME (optional)
#PreReq:	      PEAR-HTTP_Request
#PreReq:	      PECL-idn

AutoReq:      no
AutoReqProv:  no
#BuildArch:    noarch

%description 
MIMP is a project to create a version of IMP suitable for mobile
devices such as WAP phones or PDAs. Basic IMP functionality is
implemented including mailbox viewing and paging, viewing messages,
deleting, replying, forwarding, and composing new messages.

%prep
	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}

	cd %{V_horde_name}-h3-%{V_uver}
	%patch -p2 -P 0
	cd ..

%build

%install
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	

	cd %{V_horde_name}-h3-%{V_uver}

	rm -rf test.php

	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..

	find . -name '*.orig' | xargs rm

	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/

	cd ..

	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php 


%clean
	rm -rf $RPM_BUILD_ROOT

%files -f files



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-kolab-client horde-kolab-client.spec, 1.11,
	1.12 
Message-ID: <20080314172804.7CED8600D4A@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-kolab-client
In directory doto:/tmp/cvs-serv23799/horde-kolab-client

Modified Files:
	horde-kolab-client.spec 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: horde-kolab-client.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kolab-client/horde-kolab-client.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- horde-kolab-client.spec	2 Oct 2007 14:21:34 -0000	1.11
+++ horde-kolab-client.spec	14 Mar 2008 17:28:02 -0000	1.12
@@ -1,8 +1,8 @@
 # Versions
 %define         V_package horde-kolab-client
-%define         V_year  2007
-%define         V_month 10
-%define         V_day   02
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
 %define         V_version 0.99
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
@@ -30,6 +30,8 @@
 PreReq:	      horde-framework-kolab >= 3.1.4.99-%{V_release}
 PreReq:	      horde-kolab >= 3.1.4.99-%{V_release}
 PreReq:	      horde-imp-kolab >= 4.1.4.99-%{V_release}
+PreReq:	      horde-dimp-kolab >= 0.99-%{V_release}
+PreReq:	      horde-mimp-kolab >= 1.0.99-%{V_release}
 PreReq:	      horde-ingo-kolab >= 1.1.3.99-%{V_release}
 PreReq:	      horde-kronolith-kolab >= 2.1.5.99-%{V_release}
 PreReq:	      horde-mnemo-kolab >= 2.1.1.99-%{V_release}



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-imp ChangeLog, 1.4, 1.5 Makefile, 1.6,
	1.7 horde-imp-kolab.spec, 1.18, 1.19 conf.php, 1.3,
	NONE servers.php, 1.3, NONE 
Message-ID: <20080314172804.7416A600D55@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-imp
In directory doto:/tmp/cvs-serv23799/horde-imp

Modified Files:
	ChangeLog Makefile horde-imp-kolab.spec 
Removed Files:
	conf.php servers.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.4
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.5
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-imp-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-imp-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:19 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-imp-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-imp/horde-imp-kolab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- horde-imp-kolab.spec	29 Nov 2007 15:32:10 -0000	1.18
+++ horde-imp-kolab.spec	14 Mar 2008 17:28:02 -0000	1.19
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name imp
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   28
-%define         V_version 4.2_rc1
-%define         V_uver    4.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 4.2_rc2
+%define         V_uver    4.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -23,8 +23,9 @@
 
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
-Source1:        conf.php
-Source2:        servers.php
+
+# List of Patches
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/imp-3.2-rc2/HK-GW-Config_imp-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -49,6 +50,10 @@
 %prep
 	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
 
+	cd %{V_horde_name}-h3-%{V_uver}
+	%patch -p2 -P 0
+	cd ..
+
 %build
 
 %install
@@ -59,19 +64,17 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
 
 	cd ..
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/servers.php 
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php 
 
 
 %clean

--- conf.php DELETED ---

--- servers.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-framework ChangeLog, 1.13, 1.14 Makefile,
	1.10, 1.11 horde-framework-kolab.spec, 1.35,
	1.36 HK-GW-Fbview_xfb_concept.patch, 1.1,
	NONE HK-GW-Fix_Prefs_for_Ingo.patch, 1.1,
	NONE HK-GW-freebusy_error_handling.patch, 1.1, NONE 
Message-ID: <20080314172804.6DA89600D4F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv23799/horde-framework

Modified Files:
	ChangeLog Makefile horde-framework-kolab.spec 
Removed Files:
	HK-GW-Fbview_xfb_concept.patch HK-GW-Fix_Prefs_for_Ingo.patch 
	HK-GW-freebusy_error_handling.patch 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	7 Mar 2008 08:46:19 -0000	1.13
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.14
@@ -5,6 +5,10 @@
 	kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
 	https://www.intevation.de/roundup/kolab/issue2521
 
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-framework-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-framework-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	30 Nov 2007 16:13:41 -0000	1.10
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.11
@@ -22,7 +22,7 @@
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -42,18 +42,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- horde-framework-kolab.spec	11 Mar 2008 16:44:36 -0000	1.35
+++ horde-framework-kolab.spec	14 Mar 2008 17:28:02 -0000	1.36
@@ -3,8 +3,8 @@
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2008
 %define         V_month 03
-%define         V_day   11
-%define         V_version 3.2_rc1
+%define         V_day   13
+%define         V_version 3.2_rc3
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -21,14 +21,14 @@
 
 # List of Sources
 
-# While we download from a non-horde site again this package provides a plain
-# CVS checkout from horde cvs, tagget with HORDE_3.2_ALPHA. Horde sadly does not
-# provide such packages
-Source0:	http://build.pardus.de/downloads/horde-%{V_horde_name}-%{V_version}.tar.bz2
+# While we download from a non-horde site again this package provides
+# a plain CVS checkout from horde cvs, tagged with the corresponding
+# version. Horde does not provide such packages
+Source0:	http://files.pardus.de/horde-%{V_horde_name}-%{V_version}.tar.bz2
 
-Patch0:         HK-GW-Fix_Prefs_for_Ingo.patch
-Patch1:         HK-GW-Fbview_xfb_concept.patch
-Patch2:         HK-GW-freebusy_error_handling.patch
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch
+Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch
+Patch2:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Share_fixes_framework-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -58,7 +58,7 @@
 
 %install
 	for PKG in **/package.xml; do                                                              \
-           if [ "$PKG" != "Role_Webroot/package.xml" -a "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then        \
+           if [ "$PKG" != "Role_Webroot/package.xml" -a "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" -a "$PKG" != "Text_Diff/package.xml"  ]; then        \
 	        env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"    \
                     PHP_PEAR_CACHE_DIR="%{l_prefix}/RPM/TMP/pear/cache"                            \
                     %{l_prefix}/bin/pear package $PKG;                                             \

--- HK-GW-Fbview_xfb_concept.patch DELETED ---

--- HK-GW-Fix_Prefs_for_Ingo.patch DELETED ---

--- HK-GW-freebusy_error_handling.patch DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-mnemo ChangeLog, 1.6, 1.7 Makefile, 1.6,
	1.7 horde-mnemo-kolab.spec, 1.20, 1.21 conf.php, 1.2, NONE 
Message-ID: <20080314172804.8AA5E600D4B@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-mnemo
In directory doto:/tmp/cvs-serv23799/horde-mnemo

Modified Files:
	ChangeLog Makefile horde-mnemo-kolab.spec 
Removed Files:
	conf.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.6
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.7
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-mnemo-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-mnemo-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:19 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- horde-mnemo-kolab.spec	29 Nov 2007 15:32:10 -0000	1.20
+++ horde-mnemo-kolab.spec	14 Mar 2008 17:28:02 -0000	1.21
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name mnemo
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   28
-%define         V_version 2.2_rc1
-%define         V_uver    2.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 2.2_rc2
+%define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -23,7 +23,9 @@
 
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
-Source1:        conf.php
+
+# List of Patches
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/mnemo-3.2-rc2/HK-GW-Config_mnemo-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -48,6 +50,7 @@
 	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
 
 	cd %{V_horde_name}-h3-%{V_uver}
+	%patch -p2 -P 0
 	cd ..
 
 %build
@@ -60,18 +63,17 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
 
 	cd ..
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1}           \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                        \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- conf.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-kronolith ChangeLog, 1.5, 1.6 Makefile, 1.6,
	1.7 horde-kronolith-kolab.spec, 1.22,
	1.23 HK-GW-Fbview_relevance.patch, 1.1,
	NONE HK-GW-Fbview_xfb_access.patch, 1.1,
	NONE HK-JS-Fix_library_import.patch, 1.1,
	NONE HK-SB-Fbview_extra_params.patch, 1.1,
	NONE HK-SB-Fbview_save_attendees.patch, 1.1, NONE conf.php, 1.1, NONE 
Message-ID: <20080314172804.95608600D70@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-kronolith
In directory doto:/tmp/cvs-serv23799/horde-kronolith

Modified Files:
	ChangeLog Makefile horde-kronolith-kolab.spec 
Removed Files:
	HK-GW-Fbview_relevance.patch HK-GW-Fbview_xfb_access.patch 
	HK-JS-Fix_library_import.patch HK-SB-Fbview_extra_params.patch 
	HK-SB-Fbview_save_attendees.patch conf.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.5
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.6
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-kronolith-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-kronolith-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:19 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- horde-kronolith-kolab.spec	30 Nov 2007 06:58:38 -0000	1.22
+++ horde-kronolith-kolab.spec	14 Mar 2008 17:28:02 -0000	1.23
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name kronolith
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   29
-%define         V_version 2.2_rc1
-%define         V_uver    2.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 2.2_rc2
+%define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -24,14 +24,13 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
 Source1:        horde-kronolith-kolab-conf.template
-Source2:        conf.php
 
 # List of Patches
-Patch0:         HK-JS-Fix_library_import.patch
-Patch1:         HK-SB-Fbview_extra_params.patch
-Patch2:         HK-SB-Fbview_save_attendees.patch
-Patch3:         HK-GW-Fbview_relevance.patch
-Patch4:         HK-GW-Fbview_xfb_access.patch
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Config_kronolith-3.2-rc2.patch
+Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch
+Patch2:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch
+Patch3:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch
+Patch4:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -78,7 +77,7 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
 
 	find . -name '*.orig' | xargs rm
 
@@ -89,13 +88,10 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2}           \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                            \
 	    '%config(noreplace)'              %{l_prefix}/etc/kolab/templates/horde-kronolith-kolab-conf.template \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php     \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- HK-GW-Fbview_relevance.patch DELETED ---

--- HK-GW-Fbview_xfb_access.patch DELETED ---

--- HK-JS-Fix_library_import.patch DELETED ---

--- HK-SB-Fbview_extra_params.patch DELETED ---

--- HK-SB-Fbview_save_attendees.patch DELETED ---

--- conf.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-nag ChangeLog, 1.4, 1.5 Makefile, 1.6,
	1.7 horde-nag-kolab.spec, 1.18,
	1.19 HK-JS-Fix_library_import.patch, 1.1, NONE conf.php, 1.1, NONE 
Message-ID: <20080314172804.9042D600D6D@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-nag
In directory doto:/tmp/cvs-serv23799/horde-nag

Modified Files:
	ChangeLog Makefile horde-nag-kolab.spec 
Removed Files:
	HK-JS-Fix_library_import.patch conf.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.4
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.5
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-nag-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-nag-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:19 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-nag-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-nag/horde-nag-kolab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- horde-nag-kolab.spec	29 Nov 2007 15:32:11 -0000	1.18
+++ horde-nag-kolab.spec	14 Mar 2008 17:28:02 -0000	1.19
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name nag
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   28
-%define         V_version 2.2_rc1
-%define         V_uver    2.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 2.2_rc2
+%define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -26,7 +26,7 @@
 Source1:        conf.php
 
 # List of Patches
-Patch0:         HK-JS-Fix_library_import.patch
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/nag-3.2-rc2/HK-GW-Config_nag-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -63,18 +63,17 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
 
 	cd ..
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1}           \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                        \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- HK-JS-Fix_library_import.patch DELETED ---

--- conf.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-passwd ChangeLog, 1.4, 1.5 Makefile, 1.6,
	1.7 horde-passwd-kolab.spec, 1.15, 1.16 backends.php, 1.1,
	NONE conf.php, 1.1, NONE 
Message-ID: <20080314172804.94A1C600D6F@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-passwd
In directory doto:/tmp/cvs-serv23799/horde-passwd

Modified Files:
	ChangeLog Makefile horde-passwd-kolab.spec 
Removed Files:
	backends.php conf.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	5 Aug 2007 05:53:08 -0000	1.4
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.5
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-passwd-kolab.spec: Update to RC2
+
 2007-08-05  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-passwd-kolab.spec: Add backends.php configuration. Fixes

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:19 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-passwd-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-passwd/horde-passwd-kolab.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- horde-passwd-kolab.spec	1 Oct 2007 15:47:19 -0000	1.15
+++ horde-passwd-kolab.spec	14 Mar 2008 17:28:02 -0000	1.16
@@ -23,8 +23,9 @@
 
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
-Source1:        conf.php
-Source2:        backends.php
+
+# List of Patches
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/passwd-3.2-rc2/HK-GW-Config_passwd-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -52,6 +53,10 @@
 %prep
 	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
 
+	cd %{V_horde_name}-h3-%{V_uver}
+	%patch -p2 -P 0
+	cd ..
+
 %build
 
 %install
@@ -60,18 +65,17 @@
 
 	cd %{V_horde_name}-h3-%{V_uver}
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
 
 	cd ..
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2}       \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                               \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php'     \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/backends.php'
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php \
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- backends.php DELETED ---

--- conf.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:28:04 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:28:04 +0100 (CET)
Subject: gunnar: server/horde/horde-turba ChangeLog, 1.6, 1.7 Makefile, 1.6,
	1.7 horde-turba-kolab.spec, 1.22,
	1.23 HK-GW-Fix_editing_contacts.patch, 1.1,
	NONE HK-GW-Fix_share_id_change.patch, 1.1,
	NONE HK-GW-Ldap_read_only_fix.patch, 1.1, NONE conf.php, 1.2,
	NONE sources.php, 1.5, NONE 
Message-ID: <20080314172804.9C674600D71@lists.intevation.de>

Author: gunnar

Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv23799/horde-turba

Modified Files:
	ChangeLog Makefile horde-turba-kolab.spec 
Removed Files:
	HK-GW-Fix_editing_contacts.patch 
	HK-GW-Fix_share_id_change.patch HK-GW-Ldap_read_only_fix.patch 
	conf.php sources.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	29 Nov 2007 08:25:53 -0000	1.6
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.7
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-turba-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-turba-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:20 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- horde-turba-kolab.spec	29 Nov 2007 15:32:11 -0000	1.22
+++ horde-turba-kolab.spec	14 Mar 2008 17:28:02 -0000	1.23
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name turba
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   28
-%define         V_version 2.2_rc1
-%define         V_uver    2.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 2.2_rc3
+%define         V_uver    2.2-rc3
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -23,13 +23,12 @@
 
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
-Source1:        conf.php
-Source2:        sources.php
 
 # List of Patches
-Patch0:         HK-GW-Fix_share_id_change.patch
-Patch1:         HK-GW-Fix_editing_contacts.patch
-Patch2:         HK-GW-Ldap_read_only_fix.patch
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Config_turba-3.2-rc2.patch
+Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch
+Patch2:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Fix_share_id_change_turba-3.2-rc2.patch
+Patch3:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -66,6 +65,7 @@
 	%patch -p2 -P 0
 	%patch -p2 -P 1
 	%patch -p2 -P 2
+	%patch -p2 -P 3
 	cd ..
 
 %build
@@ -78,19 +78,17 @@
 
 	rm -rf test.php
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
+
+	find . -name '*.orig' | xargs rm
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
 
 	cd ..
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                           \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php    \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/sources.php
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- HK-GW-Fix_editing_contacts.patch DELETED ---

--- HK-GW-Fix_share_id_change.patch DELETED ---

--- HK-GW-Ldap_read_only_fix.patch DELETED ---

--- conf.php DELETED ---

--- sources.php DELETED ---



From cvs at kolab.org  Fri Mar 14 18:34:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:34:52 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter/Filter Resource.php,1.8,1.9 
Message-ID: <20080314173452.A8C66600D48@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv24257/php-kolab/Kolab_Filter/Filter

Modified Files:
	Resource.php 
Log Message:
Fixed issue2549 (Resource manager creates events in wrong account).


Index: Resource.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Resource.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Resource.php	28 Feb 2008 11:11:46 -0000	1.8
+++ Resource.php	14 Mar 2008 17:34:50 -0000	1.9
@@ -665,7 +665,7 @@
                           __FILE__, __LINE__, PEAR_LOG_ERR);
         return false;      
     }
-    $mailboxes = $imap->getMailBoxes( "user/$prefix$suffix" );
+    $mailboxes = $imap->getMailBoxes( "user/$prefix$suffix/" );
     if( PEAR::isError( $mailboxes ) ) {
         Horde::logMessage(sprintf(_("Unable to get mailbox list: %s"),
                                   $mailboxes->getMessage()),



From cvs at kolab.org  Fri Mar 14 18:34:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:34:52 +0100 (CET)
Subject: wilde: server release-notes.txt,1.239,1.240 
Message-ID: <20080314173452.CA0CD600D48@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Fixed issue2549 (Resource manager creates events in wrong account).


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- release-notes.txt	14 Mar 2008 10:07:30 -0000	1.239
+++ release-notes.txt	14 Mar 2008 17:34:50 -0000	1.240
@@ -120,6 +120,7 @@
 	                 Freebusy/Cache.php)
 	kolab/issue2495 (The reply to an invitation with umlauts of a group
 	                 account doesn't display the umlauts.)
+        kolab/issue2549 (Resource manager creates events in wrong account)
 
 
     Packages in the OpenPKG based Kolab server release:



From cvs at kolab.org  Fri Mar 14 18:34:52 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:34:52 +0100 (CET)
Subject: wilde: server/php-kolab/Kolab_Filter ChangeLog,1.16,1.17 
Message-ID: <20080314173452.AD612600D4A@lists.intevation.de>

Author: wilde

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv24257/php-kolab/Kolab_Filter

Modified Files:
	ChangeLog 
Log Message:
Fixed issue2549 (Resource manager creates events in wrong account).


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog	28 Feb 2008 11:11:46 -0000	1.16
+++ ChangeLog	14 Mar 2008 17:34:50 -0000	1.17
@@ -1,3 +1,9 @@
+2008-03-14  Sascha Wilde  <wilde at intevation.de>
+
+	* Filter/Resource.php (imapConnect): Fix: only search for
+	calendar folders of the requested resource account.
+	See kolab/issue2549.
+
 2008-02-28  Gunnar Wrobel  <p at rdus.de>
 
 	* Filter/Resource.php: Fix wrapping and response generation.



From cvs at kolab.org  Fri Mar 14 18:41:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:41:06 +0100 (CET)
Subject: wilde: server release-notes.txt,1.240,1.241 
Message-ID: <20080314174106.00542600D48@lists.intevation.de>

Author: wilde

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

Modified Files:
	release-notes.txt 
Log Message:
Moved release note for last check-in in new section -- rc2 is out already!


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- release-notes.txt	14 Mar 2008 17:34:50 -0000	1.240
+++ release-notes.txt	14 Mar 2008 17:41:03 -0000	1.241
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20080314, Kolab Server 2.2-rc2
+(Version 20080314, Kolab Server 2.2-rc2)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -44,6 +44,13 @@
 	The specifics are described below.
 
 
+Changes between 2.2-rc-2 and 2.2-rc-3
+
+    - php-kolab-2.2.rc3-2008????
+
+        kolab/issue2549 (Resource manager creates events in wrong account)
+
+
 Changes between 2.2-rc-1 and 2.2-rc-2
 
     - clamav-0.92.1-20080213
@@ -120,8 +127,6 @@
 	                 Freebusy/Cache.php)
 	kolab/issue2495 (The reply to an invitation with umlauts of a group
 	                 account doesn't display the umlauts.)
-        kolab/issue2549 (Resource manager creates events in wrong account)
-
 
     Packages in the OpenPKG based Kolab server release:
 



From cvs at kolab.org  Fri Mar 14 18:48:12 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 14 Mar 2008 18:48:12 +0100 (CET)
Subject: wilde: server/php-kolab Makefile,1.19,1.20 
Message-ID: <20080314174812.35B36600170@lists.intevation.de>

Author: wilde

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

Modified Files:
	Makefile 
Log Message:
Switched version numbering back to CVS.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	13 Mar 2008 13:59:37 -0000	1.19
+++ Makefile	14 Mar 2008 17:48:10 -0000	1.20
@@ -5,7 +5,7 @@
 VERSION = 2.2
 PRERELEASE = rc
 PRERELEASE_VERSION = 2
-CVS = 0
+CVS = 1
 
 ifeq "x$(PRERELEASE)" "x"
   ifeq "x$(CVS)" "x0"



From cvs at kolab.org  Sun Mar 16 22:53:56 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 16 Mar 2008 22:53:56 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf debian,1.14,1.15 
Message-ID: <20080316215356.78654600D46@lists.intevation.de>

Author: richard

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

Modified Files:
	debian 
Log Message:
dist_conf file as used by debian, maintained by Mathieu Parent
see kolab-devel for email



Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- debian	23 Feb 2008 20:19:18 -0000	1.14
+++ debian	16 Mar 2008 21:53:54 -0000	1.15
@@ -1,14 +1,15 @@
-kolab_usr=root
-kolab_grp=root
-kolab_musr=root
-kolab_mgrp=root
+kolab_usr=kolab
+kolab_grp=kolab
+kolab_musr=kolab
+kolab_mgrp=kolab
 kolab_uid=1002
 kolab_gid=1002
-restricted_kolab_usr=root
-restricted_kolab_grp=root
+restricted_kolab_usr=kolab
+restricted_kolab_grp=kolab
 kolab_rusr=${restricted_kolab_usr}
 kolab_rgrp=${restricted_kolab_grp}
 kolab_susr=root
+pki_grp=${kolab_rgrp}
 
 BASHELL=/bin/bash
 PERL=${bindir}/perl
@@ -20,19 +21,19 @@
 kolabconf_script=${sbindir}/kolabconf
 
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${libdir}/perl5
+perllib=/usr/share/perl5
 
 amavisd_conffile=${sysconfdir}/amavis/conf.d
 amavisd_templatedir=${sysconfdir}/amavis/conf.d
 amavisd_logfile=${localstatedir}/log/amavis.log
 amavisd_home=${localstatedir}/lib//amavis
-amavisd_rusr=kolab-r
+amavisd_rusr=kolab
 amavisd_usr=kolab
-amavisd_grp=kolab-r
+amavisd_grp=kolab
 
 fsl_logfile=${localstatedir}/log/fsl
 
-sysrundir=${localstatedir}/run/amavis
+sysrundir=${localstatedir}/run
 
 clamav_confdir=${sysconfdir}/clamav
 clamav_socket=${localstatedir}/clamav/clamd.sock
@@ -53,45 +54,45 @@
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/mail.log
-emailserver_usr=${kolab_usr}
+emailserver_usr=root
+emailserver_tables_usr=root
 emailserver_musr=kolab
-emailserver_grp=${restricted_kolab_grp}
+emailserver_grp=root
+emailserver_master_usr=kolab
 
 imap_confdir=${sysconfdir}
 imap_confperm=0640
-imap_usr=cyrus
-imap_grp=sasl
+imap_usr=root
+imap_grp=root
 imap_masterlogfile=${localstatedir}/log/mail.log
 imap_misclogfile=${localstatedir}/log/mail.log
 imap_statedir=${localstatedir}/lib/cyrus
 imap_spool=${localstatedir}/spool/cyrus/mail
 imap_sievedir=${localstatedir}/spool/sieve
 imap_lmtp=${localstatedir}/run/cyrus/socket/lmtp
+imap_notify_socket=${localstatedir}/run/cyrus/socket/notify
 
-kolab_statedir=${localstatedir}/kolab
+kolab_statedir=${localstatedir}/lib/kolab
 kolab_logdir=${localstatedir}/log/kolab
 kolab_pidfile=${sysrundir}/kolab.pid
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
-kolab_scriptsdir=$(sysconfdir)/kolab
+kolab_scriptsdir=${sbindir}
 kolab_php_smarty_prefix=smarty/libs
 
-# Kolab web user interface
-kolab_wui=/kolab/admin
-
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
-ldapserver_replogfile=${localstatedir}/log/ldap-replicalog
-ldapserver_argsfile=${sysrundir}/slapd.args
+ldapserver_replogfile=${ldapserver_statedir}/replog
+ldapserver_argsfile=${sysrundir}/slapd/slapd.args
 ldapserver_logfile=${localstatedir}/log/syslog
-ldapserver_pidfile=${sysrundir}/slapd.pid
-ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
+ldapserver_pidfile=${sysrundir}/slapd/slapd.pid
+ldapserverslurpd_pidfile=${sysrundir}/slapd/slurpd.pid
 ldapserver_schemadir=${sysconfdir}/ldap/schema
 ldapserver_confdir=${sysconfdir}/ldap
-ldapserver_usr=ldap
-ldapserver_grp=ldap
-ldapserver_rusr=ldap
+ldapserver_usr=openldap
+ldapserver_grp=openldap
+ldapserver_rusr=openldap
 
-webserver_document_root=/var/www
+webserver_document_root=/usr/share/kolab
 webserver_cgidir=${webserver_document_root}/cgi-bin
 webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
 webserver_logdir=${localstatedir}/log/apache2
@@ -105,31 +106,43 @@
 webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
 webserver_sslscache=${sysrundir}/ssl_scache
 webserver_sslmutex=${sysrundir}/ssl_mutex
-webserver_web_prefix=/kolab
+webserver_web_prefix=
 webserver_musr=kolab
-webserver_usr=wwwrun
-webserver_grp=www
+webserver_usr=www-data
+webserver_grp=www-data
 
+phpini_dir=${sysconfdir}/kolab
 phplibdir=${datadir}/php
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}/PEAR
 
-sasl_authdconffile=${sysconfdir}/sasl/____
-sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
+sasl_authdconffile=${sysconfdir}/saslauthd.conf
+sasl_smtpconffile=${sysconfdir}/postfix/sasl/smtpd.conf
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log
-resmgr_confdir=${sysconfdir}/resmgr
-resmgr_filterdir=${localstatedir}/resmgr/filter
-resmgr_scriptsdir=${resmgr_confdir}
-resmgr_usr=kolab
-resmgr_grp=kolab-n
+resmgr_confdir=${sysconfdir}/kolab
+resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
+resmgr_scriptsdir=/usr/share/kolab/filter
+resmgr_conffile_usr=kolab
+resmgr_conffile_grp=root
+resmgr_usr=root
+resmgr_grp=www-data
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 freebusy_logfile=${localstatedir}/resmgr/freebusy.log
-freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
-freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
+freebusy_confdir=${sysconfdir}/kolab
+freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
+freebusy_usr=root
+freebusy_grp=www-data
 
-graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
-graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
+graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
+graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+
+backupdir=${localstatedir}/backups/kolab
+
+kolab_smtpdpolicy_conffile_usr=${kolab_musr}
+kolab_smtpdpolicy_conffile_grp=${kolab_grp}
+
+aliases_file=${sysconfdir}/aliases
 



From cvs at kolab.org  Mon Mar 17 14:19:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 14:19:28 +0100 (CET)
Subject: thomas: doc/www/src mirrors.html.m4,1.21,1.22 
Message-ID: <20080317131928.C5D11600D46@lists.intevation.de>

Author: thomas

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

Modified Files:
	mirrors.html.m4 
Log Message:
Disabled mirrros belnet.de, erfrakon, Linjection. Removed University of Belgrade.

belnet.de shows only empty directories,
erfrakon mirror (max.kde.org) isn't reachable,
Linjection last rsync attempt was on 20080209,
University of Belgrade mirror is down for a year now.

Thanks to Eberhard Moenkeberg from GWDG we still have one working mirror!


Index: mirrors.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/mirrors.html.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mirrors.html.m4	6 Nov 2007 14:19:35 -0000	1.21
+++ mirrors.html.m4	17 Mar 2008 13:19:26 -0000	1.22
@@ -7,9 +7,11 @@
 <ul>
 
 <li>
+<!-- currently only shows empty directories:
   <b>Belnet</b><br>
   via <a href="http://ftp.belnet.be/packages/kolab/">http</a> |
   <a href="ftp://ftp.belnet.be/packages/kolab/">ftp</a>
+-->
   <!-- contact  ftpmaint ,a, belnet.be -->
 
 <li>
@@ -18,29 +20,21 @@
   <a href="ftp://ftp.gwdg.de/pub/linux/kolab/">ftp</a>
   <!-- contact  Eberhard Moenkeberg <emoenke ,a, gwdg.de> -->
 
+<!-- currently not available:
 <li>
   <b>erfrakon</b><br>
   via <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/">http</a>
+-->
   <!-- contact  martin.konold ,a, erfrakon.de -->
 
+<!-- currently not updated:
 <li>
   <b>Linjection</b> <br> 
   via
   <a href="http://kolab.linjection.org/">http</a>
+-->
   <!-- contact Markus Oliver Markert <email ,a, markus-markert.de> -->
 
-<!-- currently not available:
-<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>
 
 <em>



From cvs at kolab.org  Mon Mar 17 15:20:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 15:20:06 +0100 (CET)
Subject: thomas: server release-notes.txt,1.241,1.242 
Message-ID: <20080317142006.709F0600D49@lists.intevation.de>

Author: thomas

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

Modified Files:
	release-notes.txt 
Log Message:
release notes: Space/Tab consistency, unknown rc3 publishing date


Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- release-notes.txt	14 Mar 2008 17:41:03 -0000	1.241
+++ release-notes.txt	17 Mar 2008 14:20:04 -0000	1.242
@@ -1,6 +1,6 @@
 Kolab Server 2.2 Release Notes
 ==============================
-(Version 20080314, Kolab Server 2.2-rc2)
+(Version 2008????, Kolab Server 2.2-rc3)
 
 For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
@@ -48,7 +48,7 @@
 
     - php-kolab-2.2.rc3-2008????
 
-        kolab/issue2549 (Resource manager creates events in wrong account)
+	kolab/issue2549 (Resource manager creates events in wrong account)
 
 
 Changes between 2.2-rc-1 and 2.2-rc-2
@@ -114,8 +114,8 @@
 
     - php-kolab-2.2.rc2-20080314
 
-        Fixed determination of calendar folder owner.  Resmgr wasn't
-        able to trigger freebqusy list generation.
+	Fixed determination of calendar folder owner.  Resmgr wasn't
+	able to trigger freebqusy list generation.
 
 	kolab/issue1272 (From: header in vacation messages is marked as
 	                 "Untrusted")
@@ -127,6 +127,7 @@
 	                 Freebusy/Cache.php)
 	kolab/issue2495 (The reply to an invitation with umlauts of a group
 	                 account doesn't display the umlauts.)
+
 
     Packages in the OpenPKG based Kolab server release:
 



From cvs at kolab.org  Mon Mar 17 15:23:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 15:23:17 +0100 (CET)
Subject: thomas: server/kolab-freebusy Makefile,1.13,1.14 
Message-ID: <20080317142317.43881600D64@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv29239/kolab-freebusy

Modified Files:
	Makefile 
Log Message:
Bumped version number to 2.2-rc2+cvs and added rc3 section to README.1st


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	13 Mar 2008 13:59:37 -0000	1.13
+++ Makefile	17 Mar 2008 14:23:15 -0000	1.14
@@ -2,7 +2,7 @@
 RELEASE = $(shell date '+%Y%m%d')
 
 VERSION = 2.2.rc2
-CVS = 0
+CVS = 1
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Mon Mar 17 15:23:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 15:23:17 +0100 (CET)
Subject: thomas: server README.1st,1.76,1.77 install-kolab.sh,1.22,1.23 
Message-ID: <20080317142317.3E676600D51@lists.intevation.de>

Author: thomas

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

Modified Files:
	README.1st install-kolab.sh 
Log Message:
Bumped version number to 2.2-rc2+cvs and added rc3 section to README.1st


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- README.1st	7 Mar 2008 16:51:15 -0000	1.76
+++ README.1st	17 Mar 2008 14:23:15 -0000	1.77
@@ -124,6 +124,12 @@
 # /kolab/bin/openpkg rc all start
 
 
+Upgrade from 2.2-rc2 to 2.2-rc3
+-------------------------------
+
+Nothing special has to be done for this upgrade.
+
+
 Upgrade from 2.2-rc1 to 2.2-rc2
 -------------------------------
 

Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- install-kolab.sh	13 Mar 2008 13:59:37 -0000	1.22
+++ install-kolab.sh	17 Mar 2008 14:23:15 -0000	1.23
@@ -11,7 +11,7 @@
 #
 # This program is free software under the GNU GPL (>=v2)
 
-KOLAB_VERSION="2.2-rc2"
+KOLAB_VERSION="2.2-rc2+cvs"
 KID="19414"
 
 TAG="kolab"



From cvs at kolab.org  Mon Mar 17 15:23:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 15:23:17 +0100 (CET)
Subject: thomas: server/kolabconf Makefile.PL,1.20,1.21 
Message-ID: <20080317142317.495BA600D67@lists.intevation.de>

Author: thomas

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

Modified Files:
	Makefile.PL 
Log Message:
Bumped version number to 2.2-rc2+cvs and added rc3 section to README.1st


Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.PL	13 Mar 2008 13:59:37 -0000	1.20
+++ Makefile.PL	17 Mar 2008 14:23:15 -0000	1.21
@@ -12,7 +12,7 @@
 my $KOLAB_BASE_VERSION = "2.2.rc2";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 0;
+my $KOLAB_CVS = 1;
 
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Mon Mar 17 15:23:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 15:23:17 +0100 (CET)
Subject: thomas: server/perl-kolab/lib Kolab.pm,1.16,1.17 
Message-ID: <20080317142317.4D23A600D6A@lists.intevation.de>

Author: thomas

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

Modified Files:
	Kolab.pm 
Log Message:
Bumped version number to 2.2-rc2+cvs and added rc3 section to README.1st


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Kolab.pm	13 Mar 2008 13:59:37 -0000	1.16
+++ Kolab.pm	17 Mar 2008 14:23:15 -0000	1.17
@@ -62,7 +62,7 @@
 our $KOLAB_BASE_VERSION = "2.2.rc2";
 
 # Are current releases cvs based or is this a real release?
-my $KOLAB_CVS = 0;
+my $KOLAB_CVS = 1;
 
 our $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 



From cvs at kolab.org  Mon Mar 17 15:23:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 15:23:17 +0100 (CET)
Subject: thomas: server/kolab-filter Makefile,1.12,1.13 
Message-ID: <20080317142317.45A77600D65@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv29239/kolab-filter

Modified Files:
	Makefile 
Log Message:
Bumped version number to 2.2-rc2+cvs and added rc3 section to README.1st


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	13 Mar 2008 13:59:37 -0000	1.12
+++ Makefile	17 Mar 2008 14:23:15 -0000	1.13
@@ -2,7 +2,7 @@
 RELEASE = $(shell date '+%Y%m%d')
 
 VERSION = 2.2.rc2
-CVS = 0
+CVS = 1
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)



From cvs at kolab.org  Mon Mar 17 16:05:33 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Mon, 17 Mar 2008 16:05:33 +0100 (CET)
Subject: thomas: doc/www/src index.html.m4,1.137,1.138 
Message-ID: <20080317150533.DC1E9600D6D@lists.intevation.de>

Author: thomas

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

Modified Files:
	index.html.m4 
Log Message:
Announcement of Kolab Server 2.2-rc2


Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- index.html.m4	18 Feb 2008 17:31:11 -0000	1.137
+++ index.html.m4	17 Mar 2008 15:05:31 -0000	1.138
@@ -48,6 +48,23 @@
 
 
 <table>
+<tr><td class="newsd">March 17th, 2008</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.2 Release Candidate 2 released
+</td></tr>
+</table>
+<div class="newsb">
+  Source and binary packages for Kolab Server 2.2 Release Candidate 2
+  are available for download.
+  <br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2008/000065.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
 <tr><td class="newsd">February 18th, 2008</td>
 <td class="newsh">&raquo;
   Security Issue 19 for Kolab Server (ClamAV)



From cvs at kolab.org  Tue Mar 18 21:38:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 18 Mar 2008 21:38:06 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.74,1.75 
Message-ID: <20080318203806.CD659600D4F@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
Changed the webserver_web_prefix from /kolab to ""



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- suse	26 Feb 2008 21:42:49 -0000	1.74
+++ suse	18 Mar 2008 20:38:04 -0000	1.75
@@ -132,7 +132,7 @@
 webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
 webserver_sslscache=${webserver_logdir}/ssl_scache
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
-webserver_web_prefix=/kolab
+webserver_web_prefix=
 webserver_musr=wwwrun
 webserver_usr=wwwrun
 webserver_grp=www



From cvs at kolab.org  Tue Mar 18 22:46:48 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Tue, 18 Mar 2008 22:46:48 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf suse,1.75,1.76 
Message-ID: <20080318214648.882D6600D4F@lists.intevation.de>

Author: richard

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

Modified Files:
	suse 
Log Message:
Changed the location of the web admin and user interface from
/kolab/admin to /kolab



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- suse	18 Mar 2008 20:38:04 -0000	1.75
+++ suse	18 Mar 2008 21:46:46 -0000	1.76
@@ -102,7 +102,7 @@
 kolab_php_smarty_prefix=Smarty
 
 # Kolab web user interface
-kolab_wui=/kolab/admin
+kolab_wui=/kolab
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap



From cvs at kolab.org  Wed Mar 19 15:42:06 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 19 Mar 2008 15:42:06 +0100 (CET)
Subject: schreiber: doc/www/src index.html.m4, 1.138, 1.139 newsarchive.html.m4,
	1.15, 1.16 
Message-ID: <20080319144206.DF661600D75@lists.intevation.de>

Author: schreiber

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

Modified Files:
	index.html.m4 newsarchive.html.m4 
Log Message:
added Kolab KDE Client 2.1.12 release announcement
archived 2007 release announcements



Index: index.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/index.html.m4,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- index.html.m4	17 Mar 2008 15:05:31 -0000	1.138
+++ index.html.m4	19 Mar 2008 14:42:04 -0000	1.139
@@ -48,6 +48,24 @@
 
 
 <table>
+<tr><td class="newsd">March 19th, 2008</td>
+<td class="newsh">&raquo;
+  Kolab KDE Client 2.1.12 released
+</td></tr>
+</table>
+<div class="newsb">
+This release contains bug fixes and some new minor features.  Source and binary packages for Kolab KDE Client 2.1.12
+  are available for download.
+  <br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2008/000066.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+
+<table>
 <tr><td class="newsd">March 17th, 2008</td>
 <td class="newsh">&raquo;
   Kolab Server 2.2 Release Candidate 2 released
@@ -64,6 +82,12 @@
 <p>
 
 
+
+</div> <!-- END LATEST BLOCK -->
+<p>
+<!-- BEGIN NEWS BLOCK --> <div class="news">
+
+
 <table>
 <tr><td class="newsd">February 18th, 2008</td>
 <td class="newsh">&raquo;
@@ -130,249 +154,6 @@
 <p>
 
 
-</div> <!-- END LATEST BLOCK -->
-<p>
-<!-- BEGIN NEWS BLOCK --> <div class="news">
-
-
-<table>
-<tr><td class="newsd">December 9th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab Server 2.2 Beta 3 (with Horde web client) released
-</td></tr>
-</table>
-<div class="newsb">
-  Source and binary packages for Kolab Server 2.2 Beta 3 are available for
-  download.
-  <br>
-  Since 2.2 beta 2 the Kolab server provides a web client that
-  supports all the groupware features known from Outlook and Kontact.
-  Thus users are less dependent on their local client and can access
-  their groupware data from anywhere in the world provided they have
-  a standard browser available.
-  <br>
-  See the
-  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000060.html">
-  announcement</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">October 18th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab KDE Client released, revision 'proko2.1.11'
-</td></tr>
-</table>
-<div class="newsb">
-  This release contains some bug fixes.
-A tarball and release notes with a list of the changes can be found in the 
-Kolab download area once the mirrors have been updated.<br>
-See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000059.html">
-  announcement</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">September 3rd, 2007</td>
-<td class="newsh">&raquo;
-  Kolab KDE Client released, revision 'proko2.1.10'
-</td></tr>
-</table>
-<div class="newsb">
-  This release contains several bugfixes and some minor features.<br>
-  See the
-  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000058.html">
-  announcement</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">August 21st, 2007</td>
-<td class="newsh">&raquo;
-  Security Issue 17 for Kolab Server (ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
-  A new ClamAV RPM with various fixes is available.  See the
-  <a href="security/kolab-vendor-notice-17.txt">Kolab Security Issue 17</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">August 14th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab KDE Client released, revision 'proko2.1.9'
-</td></tr>
-</table>
-<div class="newsb">
-     The change of this release is a redesign of the sources for filtering.
-     It is now possible to select the source folders. With this new feature filtering is no longer a problem, especilly a groupware 
-folder is only filtered, if the folder is selected. This release also contains several bugfixes. See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000056.html">announement</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">July 24th, 2007</td>
-<td class="newsh">&raquo;
-  Security Issue 16 for Kolab Server (ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
-  Metaeye Security Group discovered that ClamAV crashes due to processing of
-  standard filters in RAR VM, while processing a corrupted RAR file.
-  A new ClamAV RPM with a fix is available.  See the
-  <a href="security/kolab-vendor-notice-16.txt">Kolab Security Issue 16</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">June 1st, 2007</td>
-<td class="newsh">&raquo;
-  Security Issue 15 for Kolab Server (ClamAV)
-</td></tr>
-</table>
-<div class="newsb">
-  Some 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-15.txt">Kolab Security Issue 15</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">May 10th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab Server 2.1.0 Final released
-</td></tr>
-</table>
-<div class="newsb">
-  Source and binary packages for Kolab Server 2.1.0 can be downloaded from
-  <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/server/release/kolab-server-2.1.0/">erfrakon</a>,
-  <a href="http://ftp.belnet.be/packages/kolab/server/release/kolab-server-2.1.0/">Belnet</a> or
-  <a href="ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-2.1.0/">Belnet via ftp</a>.
-  <br>
-  See the
-  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000051.html">
-  announcement</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">May 8th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab KDE Client released, revision 'proko2.1.7'
-</td></tr>
-</table>
-<div class="newsb">
-  This release contains several bugfixes and some minor features.<br>
-  See the
-  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000050.html">
-  announcement</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">April 20th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab Server 2.1 Release Candidate 2 released
-</td></tr>
-</table>
-<div class="newsb">
-  This release fixes more than 20 problems found in RC 1 and contains updated translations.
-  Some security issues were fixed in clamav, spamassassin and file.
-  See the
-  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000049.html">
-  announcement</a> for details.
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">March 22nd, 2007</td>
-<td class="newsh">&raquo;
-  KDAB sponsors Horde Development
-</td></tr>
-</table>
-<div class="newsb">
-In an effort to further increase the quality and usefulness of the Kolab 
-Groupware Solution, jointly developed by <strong>KDAB</strong> with its partners in the <strong>Kolab 
-Konsortium</strong>, KDAB now contracts Gunnar Wrobel of P at rdus to accelerate 
-development of the Horde web client, the preferred web client for the Kolab 
-solution. Gunnar will also maintain community relations on behalf of KDAB. 
-<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr">announcement</a>
-</div>
-<p>
-
-
-<table>
-<tr><td class="newsd">March 15th - 21st, 2007</td>
-<td class="newsh">&raquo;
-  CeBIT 2007 - Kolab based events
-</td></tr>
-</table>
-<div class="newsb">
-<ul>
-<li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
-<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
-<br><br>
-
-<li>The Kolab-Konsortium Business Partner <strong>Univention</strong> will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.<br>
-<a href="http://www.univention.de/termin_veranstaltung.html">CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover</a>(in German)
-<br>
-<br><strong>Univention</strong> will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.<br>
-<a href="http://www.univention.de/vortraege_cebit_2007.html">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
-</li></ul>
-  </div>
-
-<table>
-<tr><td class="newsd">February 12th 2007</td>
-<td class="newsh">&raquo;
-  New KDE Kolab Client released, revision 'proko2.1.6'.
-</td></tr>
-</table>
-<div class="newsb">
-  This release contains several fixes and a few new features.
-  See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html">announcement</a> for details.
-</div>
-<p>
-
-
-
-
-<table>
-<tr><td class="newsd">February 5th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab Server 2.1 Release Candidate 1 released
-</td></tr>
-</table>
-<p>
-<div class="newsb">
-  This release fixes more than 10 problems found in Beta 4 and
-  includes the security updates published until now.  See the
-  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000047.html">
-  announcement</a> for details.
-</div>
-<p>
-<table>
-<tr><td class="newsd">January 17th, 2007</td>
-<td class="newsh">&raquo;
-  Kolab Server 2.1 Beta 4 released
-</td></tr>
-</table>
-<div class="newsb">
-  This release fixes more than 20 problems found in Beta 3 and
-  includes the security updates published until now.  See the
-  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000046.html">
-  announcement</a> for details.
-</div>
 
 </div> <!-- END NEWS BLOCK -->
 

Index: newsarchive.html.m4
===================================================================
RCS file: /kolabrepository/doc/www/src/newsarchive.html.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- newsarchive.html.m4	2 May 2007 13:29:25 -0000	1.15
+++ newsarchive.html.m4	19 Mar 2008 14:42:04 -0000	1.16
@@ -5,12 +5,257 @@
 
 <h2>Archived News</h2>
 <ul>
+  <li><a href="#2007">2007</a></li>
   <li><a href="#2006">2006</a></li>
   <li><a href="#2005">2005</a></li>
   <li><a href="#2004">2004</a></li>
   <li><a href="#2003">2003</a></li>
 </ul>
 <p>Go to <a href="./index.html">main page</a> for current news.</p>
+
+<h3><a name="2007">News 2007</a></h3>
+<div class="news">
+
+<table>
+<tr><td class="newsd">December 9th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.2 Beta 3 (with Horde web client) released
+</td></tr>
+</table>
+<div class="newsb">
+  Source and binary packages for Kolab Server 2.2 Beta 3 are available for
+  download.
+  <br>
+  Since 2.2 beta 2 the Kolab server provides a web client that
+  supports all the groupware features known from Outlook and Kontact.
+  Thus users are less dependent on their local client and can access
+  their groupware data from anywhere in the world provided they have
+  a standard browser available.
+  <br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000060.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">October 18th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab KDE Client released, revision 'proko2.1.11'
+</td></tr>
+</table>
+<div class="newsb">
+  This release contains some bug fixes.
+A tarball and release notes with a list of the changes can be found in the 
+Kolab download area once the mirrors have been updated.<br>
+See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000059.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">September 3rd, 2007</td>
+<td class="newsh">&raquo;
+  Kolab KDE Client released, revision 'proko2.1.10'
+</td></tr>
+</table>
+<div class="newsb">
+  This release contains several bugfixes and some minor features.<br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000058.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">August 21st, 2007</td>
+<td class="newsh">&raquo;
+  Security Issue 17 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+  A new ClamAV RPM with various fixes is available.  See the
+  <a href="security/kolab-vendor-notice-17.txt">Kolab Security Issue 17</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">August 14th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab KDE Client released, revision 'proko2.1.9'
+</td></tr>
+</table>
+<div class="newsb">
+     The change of this release is a redesign of the sources for filtering.
+     It is now possible to select the source folders. With this new feature filtering is no longer a problem, especilly a groupware 
+folder is only filtered, if the folder is selected. This release also contains several bugfixes. See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000056.html">announement</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">July 24th, 2007</td>
+<td class="newsh">&raquo;
+  Security Issue 16 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+  Metaeye Security Group discovered that ClamAV crashes due to processing of
+  standard filters in RAR VM, while processing a corrupted RAR file.
+  A new ClamAV RPM with a fix is available.  See the
+  <a href="security/kolab-vendor-notice-16.txt">Kolab Security Issue 16</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">June 1st, 2007</td>
+<td class="newsh">&raquo;
+  Security Issue 15 for Kolab Server (ClamAV)
+</td></tr>
+</table>
+<div class="newsb">
+  Some 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-15.txt">Kolab Security Issue 15</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">May 10th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.1.0 Final released
+</td></tr>
+</table>
+<div class="newsb">
+  Source and binary packages for Kolab Server 2.1.0 can be downloaded from
+  <a href="http://www.erfrakon.de/mirrors/ftp.kolab.org/server/release/kolab-server-2.1.0/">erfrakon</a>,
+  <a href="http://ftp.belnet.be/packages/kolab/server/release/kolab-server-2.1.0/">Belnet</a> or
+  <a href="ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-2.1.0/">Belnet via ftp</a>.
+  <br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000051.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">May 8th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab KDE Client released, revision 'proko2.1.7'
+</td></tr>
+</table>
+<div class="newsb">
+  This release contains several bugfixes and some minor features.<br>
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000050.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">April 20th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.1 Release Candidate 2 released
+</td></tr>
+</table>
+<div class="newsb">
+  This release fixes more than 20 problems found in RC 1 and contains updated translations.
+  Some security issues were fixed in clamav, spamassassin and file.
+  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000049.html">
+  announcement</a> for details.
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">March 22nd, 2007</td>
+<td class="newsh">&raquo;
+  KDAB sponsors Horde Development
+</td></tr>
+</table>
+<div class="newsb">
+In an effort to further increase the quality and usefulness of the Kolab 
+Groupware Solution, jointly developed by <strong>KDAB</strong> with its partners in the <strong>Kolab 
+Konsortium</strong>, KDAB now contracts Gunnar Wrobel of P at rdus to accelerate 
+development of the Horde web client, the preferred web client for the Kolab 
+solution. Gunnar will also maintain community relations on behalf of KDAB. 
+<br>Read the <a href="http://www.kdab.net/?page=products&sub=kdab-kk-pardus-pr">announcement</a>
+</div>
+<p>
+
+
+<table>
+<tr><td class="newsd">March 15th - 21st, 2007</td>
+<td class="newsh">&raquo;
+  CeBIT 2007 - Kolab based events
+</td></tr>
+</table>
+<div class="newsb">
+<ul>
+<li>Bernhard Reiter will be representing <strong>Intevation</strong> and the <strong>Kolab Konsortium</strong> at the "Open Source for small business - ExChange alternatives put to test" panel-discussion.<br>
+<a href="http://www.intevation.de/news.en.html#20070308-meet-intevation">CeBIT SME Forum - Hall 5, Booth B48, March 21st, 3.15pm - 4.30pm</a>
+<br><br>
+
+<li>The Kolab-Konsortium Business Partner <strong>Univention</strong> will be presenting the Kolab based Univention Groupware Server (UGS) at Cebit.<br>
+<a href="http://www.univention.de/termin_veranstaltung.html">CeBIT - Linux-Park - pavillion 5 - booth 57/3, March 15th - 21rd in Hannover</a>(in German)
+<br>
+<br><strong>Univention</strong> will also give a talk about "Migration to a free Groupware Server - Microsoft Exchange to Kolab2" as part of the IX Forum Software & Systems discussion.<br>
+<a href="http://www.univention.de/vortraege_cebit_2007.html">CeBIT, IX Forum Software & Systems - pavillion 3 - booth B19, Wednesday March 16th, 10.00pm</a>(in German)
+</li></ul>
+  </div>
+
+<table>
+<tr><td class="newsd">February 12th 2007</td>
+<td class="newsh">&raquo;
+  New KDE Kolab Client released, revision 'proko2.1.6'.
+</td></tr>
+</table>
+<div class="newsb">
+  This release contains several fixes and a few new features.
+  See the <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000048.html">announcement</a> for details.
+</div>
+<p>
+
+
+
+
+<table>
+<tr><td class="newsd">February 5th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.1 Release Candidate 1 released
+</td></tr>
+</table>
+<p>
+<div class="newsb">
+  This release fixes more than 10 problems found in Beta 4 and
+  includes the security updates published until now.  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000047.html">
+  announcement</a> for details.
+</div>
+<p>
+<table>
+<tr><td class="newsd">January 17th, 2007</td>
+<td class="newsh">&raquo;
+  Kolab Server 2.1 Beta 4 released
+</td></tr>
+</table>
+<div class="newsb">
+  This release fixes more than 20 problems found in Beta 3 and
+  includes the security updates published until now.  See the
+  <a href="http://www.kolab.org/pipermail/kolab-announce/2007/000046.html">
+  announcement</a> for details.
+</div>
+
+</div>
 
 <h3><a name="2006">News 2006</a></h3>
 <div class="news">



From cvs at kolab.org  Wed Mar 19 20:20:49 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 19 Mar 2008 20:20:49 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.156,1.157 
Message-ID: <20080319192049.C8912600D6F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
added variable smarty_compiledir=${phplibdir2}/admin/templates_c
This is to make the smarty compile directory independent from phplibdir2,
which is now configured on a possible readonly file system.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- ChangeLog	13 Mar 2008 16:56:48 -0000	1.156
+++ ChangeLog	19 Mar 2008 19:20:47 -0000	1.157
@@ -1,3 +1,11 @@
+2008-03-19 Richard Bos <richard at radoeka.nl>
+
+	* dist_conf/common, dist_conf/centos-clarkconnect,
+	  dist_conf/debian, dist_conf/gentoo, dist_conf/kolab
+	  dist_conf/mandriva, dist_conf/suse: added variable
+	  smarty_compiledir=${phplibdir2}/admin/templates_c
+	  See issue 2538
+
 2008-03-13  Sascha Wilde  <wilde at intevation.de>
 
 	* templates/resmgr.conf.template.in: Use https for freebusy_url.



From cvs at kolab.org  Wed Mar 19 20:20:49 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 19 Mar 2008 20:20:49 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.10,
	1.11 common, 1.46, 1.47 debian, 1.15, 1.16 gentoo, 1.14,
	1.15 kolab, 1.58, 1.59 mandriva, 1.10, 1.11 suse, 1.76, 1.77 
Message-ID: <20080319192049.D92B6600D70@lists.intevation.de>

Author: richard

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

Modified Files:
	centos-clarkconnect common debian gentoo kolab mandriva suse 
Log Message:
added variable smarty_compiledir=${phplibdir2}/admin/templates_c
This is to make the smarty compile directory independent from phplibdir2,
which is now configured on a possible readonly file system.



Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- centos-clarkconnect	23 Feb 2008 20:19:18 -0000	1.10
+++ centos-clarkconnect	19 Mar 2008 19:20:47 -0000	1.11
@@ -149,6 +149,7 @@
 #kolab_php_module_prefix=kolab/
 kolab_php_module_prefix=
 kolab_php_smarty_prefix=Smarty
+smarty_compiledir=${phplibdir2}/admin/templates_c
 
 # Kolab web user interface
 kolab_wui=/kolab/admin

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- common	26 Feb 2008 18:39:55 -0000	1.46
+++ common	19 Mar 2008 19:20:47 -0000	1.47
@@ -131,6 +131,7 @@
 	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
 	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
+	-e 's,[@]smarty_compiledir[@],$(smarty_compiledir),g' \
 	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
 	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
 	-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- debian	16 Mar 2008 21:53:54 -0000	1.15
+++ debian	19 Mar 2008 19:20:47 -0000	1.16
@@ -78,6 +78,9 @@
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 kolab_scriptsdir=${sbindir}
 kolab_php_smarty_prefix=smarty/libs
+smarty_compiledir=${phplibdir2}/admin/templates_c
+# Kolab web user interface
+kolab_wui=/kolab/admin
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gentoo	23 Feb 2008 20:19:18 -0000	1.14
+++ gentoo	19 Mar 2008 19:20:47 -0000	1.15
@@ -221,7 +221,8 @@
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}
 kolab_php_module_prefix=kolab/
-kolab_php_smarty_prefix=smarty/
+kolab_php_smarty_prefix=smarty
+smarty_compiledir=${phplibdir2}/admin/templates_c
 
 #--------------------------------------------------------------------
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- kolab	26 Feb 2008 18:39:55 -0000	1.58
+++ kolab	19 Mar 2008 19:20:47 -0000	1.59
@@ -101,6 +101,7 @@
 kolab_php_module_prefix=
 kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
+smarty_compiledir=${phplibdir2}/admin/templates_c
 
 kolab_pkg=kolabd
 kolab_pkgs=spamassassin openldap clamav

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mandriva	23 Feb 2008 20:19:18 -0000	1.10
+++ mandriva	19 Mar 2008 19:20:47 -0000	1.11
@@ -64,3 +64,5 @@
 sysrundir = /var/run
 
 resmgr_scriptsdir=${resmgr_confdir}
+smarty_compiledir=${phplibdir2}/admin/templates_c
+

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- suse	18 Mar 2008 21:46:46 -0000	1.76
+++ suse	19 Mar 2008 19:20:47 -0000	1.77
@@ -100,6 +100,7 @@
 # /usr/share/php. This prevents scattering of the kolab php files.
 kolab_php_module_prefix=kolab/
 kolab_php_smarty_prefix=Smarty
+smarty_compiledir=${phplibdir2}/admin/templates_c
 
 # Kolab web user interface
 kolab_wui=/kolab



From cvs at kolab.org  Wed Mar 19 22:43:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 19 Mar 2008 22:43:17 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.157,1.158 
Message-ID: <20080319214317.BC066600D6A@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Added kolab_php_module_prefix to the smarty_compiledir variable as
further examination of the templates_c patch revealed that the
kolab_php_module_prefix was missing



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- ChangeLog	19 Mar 2008 19:20:47 -0000	1.157
+++ ChangeLog	19 Mar 2008 21:43:15 -0000	1.158
@@ -3,7 +3,7 @@
 	* dist_conf/common, dist_conf/centos-clarkconnect,
 	  dist_conf/debian, dist_conf/gentoo, dist_conf/kolab
 	  dist_conf/mandriva, dist_conf/suse: added variable
-	  smarty_compiledir=${phplibdir2}/admin/templates_c
+	  smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 	  See issue 2538
 
 2008-03-13  Sascha Wilde  <wilde at intevation.de>



From cvs at kolab.org  Wed Mar 19 22:43:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 19 Mar 2008 22:43:17 +0100 (CET)
Subject: richard: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.11,
	1.12 debian, 1.16, 1.17 gentoo, 1.15, 1.16 kolab, 1.59,
	1.60 mandriva, 1.11, 1.12 suse, 1.77, 1.78 
Message-ID: <20080319214317.CFAC4600D6A@lists.intevation.de>

Author: richard

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

Modified Files:
	centos-clarkconnect debian gentoo kolab mandriva suse 
Log Message:
Added kolab_php_module_prefix to the smarty_compiledir variable as
further examination of the templates_c patch revealed that the
kolab_php_module_prefix was missing



Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- centos-clarkconnect	19 Mar 2008 19:20:47 -0000	1.11
+++ centos-clarkconnect	19 Mar 2008 21:43:15 -0000	1.12
@@ -149,7 +149,7 @@
 #kolab_php_module_prefix=kolab/
 kolab_php_module_prefix=
 kolab_php_smarty_prefix=Smarty
-smarty_compiledir=${phplibdir2}/admin/templates_c
+smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 
 # Kolab web user interface
 kolab_wui=/kolab/admin

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- debian	19 Mar 2008 19:20:47 -0000	1.16
+++ debian	19 Mar 2008 21:43:15 -0000	1.17
@@ -78,7 +78,7 @@
 kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 kolab_scriptsdir=${sbindir}
 kolab_php_smarty_prefix=smarty/libs
-smarty_compiledir=${phplibdir2}/admin/templates_c
+smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 # Kolab web user interface
 kolab_wui=/kolab/admin
 

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gentoo	19 Mar 2008 19:20:47 -0000	1.15
+++ gentoo	19 Mar 2008 21:43:15 -0000	1.16
@@ -222,7 +222,7 @@
 phppeardir=${phplibdir}
 kolab_php_module_prefix=kolab/
 kolab_php_smarty_prefix=smarty
-smarty_compiledir=${phplibdir2}/admin/templates_c
+smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 
 #--------------------------------------------------------------------
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- kolab	19 Mar 2008 19:20:47 -0000	1.59
+++ kolab	19 Mar 2008 21:43:15 -0000	1.60
@@ -101,7 +101,7 @@
 kolab_php_module_prefix=
 kolab_scriptsdir=$(sysconfdir)/kolab
 kolab_php_smarty_prefix=Smarty
-smarty_compiledir=${phplibdir2}/admin/templates_c
+smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 
 kolab_pkg=kolabd
 kolab_pkgs=spamassassin openldap clamav

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mandriva	19 Mar 2008 19:20:47 -0000	1.11
+++ mandriva	19 Mar 2008 21:43:15 -0000	1.12
@@ -64,5 +64,5 @@
 sysrundir = /var/run
 
 resmgr_scriptsdir=${resmgr_confdir}
-smarty_compiledir=${phplibdir2}/admin/templates_c
+smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- suse	19 Mar 2008 19:20:47 -0000	1.77
+++ suse	19 Mar 2008 21:43:15 -0000	1.78
@@ -100,7 +100,7 @@
 # /usr/share/php. This prevents scattering of the kolab php files.
 kolab_php_module_prefix=kolab/
 kolab_php_smarty_prefix=Smarty
-smarty_compiledir=${phplibdir2}/admin/templates_c
+smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
 
 # Kolab web user interface
 kolab_wui=/kolab



From cvs at kolab.org  Wed Mar 26 16:14:17 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 16:14:17 +0100 (CET)
Subject: bernhard: doc/architecture freebusy.txt,1.17,1.18 
Message-ID: <20080326151417.15FBE60016E@lists.intevation.de>

Author: bernhard

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

Modified Files:
	freebusy.txt 
Log Message:
Making pxfb and xpfb consistant to pxfb (which is more logical).
Fixed a few typos.
Improved clarity: Made sure that readers will understand that one trigger
	is enough to trigger the creation of both pxfb and pfb.


Index: freebusy.txt
===================================================================
RCS file: /kolabrepository/doc/architecture/freebusy.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- freebusy.txt	30 Jun 2005 15:19:29 -0000	1.17
+++ freebusy.txt	26 Mar 2008 15:14:14 -0000	1.18
@@ -57,7 +57,7 @@
 Multi-Group Calendars
 
 On a Kolab server there may be several "shared folders" containing calendars. 
-Technically those folder are like "anonymous" users accounts
+Technically those folders are like "anonymous" user accounts
 and a better name might be "multi-group folders".
 Their indented use is to include a larger number of people, 
 like all members a company. 
@@ -100,7 +100,7 @@
 user/group2/myhierarchie/calendar (3, fb)
 
 If a client changes the contents of one of those calenders, 
-it must trigger the creation of the pfb and xpdf as described below.
+it must trigger the creation of the pfb and pxfb as described below.
 This will be done with the credential of the user that has
 write permissions.
 
@@ -117,7 +117,7 @@
 
 pfb cache
 
-The pfb and xpfb are written to the accounts pfb cache hierarchy. 
+The pfb and pxfb are written to the account's pfb cache hierarchy. 
 
 user1/user1/calendar.pfb
 user1/user1/anotherhierarchy/calendar.pfb
@@ -142,7 +142,8 @@
 the server side code. The server side code then uses these credentials to 
 access the calendar folders and to write the pfbs.
 
-To trigger creation of a pfb (and xpfb), issue a HTTP GET request like:
+To trigger creation of a pfb (and the corresponding pxfb at the same time), 
+issue an HTTP GET request like:
 
 	https://servername/freebusy/trigger/X/PATH/FOLDERNAME.pfb
 	
@@ -162,9 +163,10 @@
 but the pfb collector must be able 
 to read all pfbs from potentially many servers (multi-location setups).
 
-The xpfb are only readable by users having read permissions 
-on the corresponding folders. 
-Creation of xpfbs happens at when pfbs are created.
+The pxfb are only readable 
+by users having read permissions on the corresponding folders. 
+Creation of pxfbs happens together with the pfb creation. 
+One successful trigger does both.
 
 In general all clients writing to calendar folders including the KDE Client Kontact, the Outlook Clients,
 the web client and the resource scripts must trigger the generation of pfbs.
@@ -181,8 +183,8 @@
 can read and which are marked fb relevant.
 
 If an extended freebusy list is requested, the script has to use the
-given credentials of the users to try to access the xpfbs in the same way.
-If access to the xpfb is not possible, use the corresponding pfb.
+given credentials of the users to try to access the pxfbs in the same way.
+If access to the pxfb is not possible, use the corresponding pfb.
 
 The URLs for collecting freebusy info are
 



From cvs at kolab.org  Wed Mar 26 18:35:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 18:35:45 +0100 (CET)
Subject: thomas: server/kolab-filter/filter/docs COPYING,NONE,1.1 
Message-ID: <20080326173545.5B71860016A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-filter/filter/docs
In directory doto:/tmp/cvs-serv20356/kolab-filter/filter/docs

Added Files:
	COPYING 
Log Message:
Apply file756/copyright.diff from kolab/issue2551 (Some copyright info is missing)

This is only a partial but easy fix for the issue.


--- 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

	Appendix: 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) 19yy  <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) 19yy 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.



From cvs at kolab.org  Wed Mar 26 18:35:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 18:35:45 +0100 (CET)
Subject: thomas: server/kolab-freebusy/freebusy/docs COPYING,NONE,1.1 
Message-ID: <20080326173545.7770360016A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/kolab-freebusy/freebusy/docs
In directory doto:/tmp/cvs-serv20356/kolab-freebusy/freebusy/docs

Added Files:
	COPYING 
Log Message:
Apply file756/copyright.diff from kolab/issue2551 (Some copyright info is missing)

This is only a partial but easy fix for the issue.


--- 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

	Appendix: 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) 19yy  <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) 19yy 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.



From cvs at kolab.org  Wed Mar 26 18:35:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 18:35:45 +0100 (CET)
Subject: thomas: server/php-kolab/Kolab_Freebusy COPYING,NONE,1.1 
Message-ID: <20080326173545.8154B600173@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv20356/php-kolab/Kolab_Freebusy

Added Files:
	COPYING 
Log Message:
Apply file756/copyright.diff from kolab/issue2551 (Some copyright info is missing)

This is only a partial but easy fix for the issue.


--- 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

	Appendix: 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) 19yy  <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) 19yy 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.



From cvs at kolab.org  Wed Mar 26 18:35:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 18:35:45 +0100 (CET)
Subject: thomas: server/kolabconf COPYING,NONE,1.1 
Message-ID: <20080326173545.79EAA60016C@lists.intevation.de>

Author: thomas

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

Added Files:
	COPYING 
Log Message:
Apply file756/copyright.diff from kolab/issue2551 (Some copyright info is missing)

This is only a partial but easy fix for the issue.


--- 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

	Appendix: 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) 19yy  <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) 19yy 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.



From cvs at kolab.org  Wed Mar 26 18:35:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 18:35:45 +0100 (CET)
Subject: thomas: server/php-kolab/Kolab_Freebusy/Freebusy Page.php,1.7,1.8 
Message-ID: <20080326173545.8A08C60016A@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv20356/php-kolab/Kolab_Freebusy/Freebusy

Modified Files:
	Page.php 
Log Message:
Apply file756/copyright.diff from kolab/issue2551 (Some copyright info is missing)

This is only a partial but easy fix for the issue.


Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Page.php	14 Mar 2008 09:17:11 -0000	1.7
+++ Page.php	26 Mar 2008 17:35:43 -0000	1.8
@@ -3,7 +3,7 @@
  *  COPYRIGHT
  *  ---------
  *
- *  See docs/AUTHORS file
+ *  See ../AUTHORS file
  *
  *
  *  LICENSE



From cvs at kolab.org  Wed Mar 26 18:35:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 18:35:45 +0100 (CET)
Subject: thomas: server/php-kolab/Kolab_Filter COPYING,NONE,1.1 
Message-ID: <20080326173545.7D54D60016E@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv20356/php-kolab/Kolab_Filter

Added Files:
	COPYING 
Log Message:
Apply file756/copyright.diff from kolab/issue2551 (Some copyright info is missing)

This is only a partial but easy fix for the issue.


--- 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

	Appendix: 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) 19yy  <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) 19yy 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.



From cvs at kolab.org  Wed Mar 26 18:35:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Wed, 26 Mar 2008 18:35:45 +0100 (CET)
Subject: thomas: server/php-kolab/Kolab_Webadmin COPYING,NONE,1.1 
Message-ID: <20080326173545.8E63E60016C@lists.intevation.de>

Author: thomas

Update of /kolabrepository/server/php-kolab/Kolab_Webadmin
In directory doto:/tmp/cvs-serv20356/php-kolab/Kolab_Webadmin

Added Files:
	COPYING 
Log Message:
Apply file756/copyright.diff from kolab/issue2551 (Some copyright info is missing)

This is only a partial but easy fix for the issue.


--- 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

	Appendix: 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) 19yy  <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) 19yy 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.



From cvs at kolab.org  Thu Mar 27 10:03:55 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 27 Mar 2008 10:03:55 +0100 (CET)
Subject: bernhard: doc/architecture freebusy.txt,1.18,1.19 
Message-ID: <20080327090355.E871A60016F@lists.intevation.de>

Author: bernhard

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

Modified Files:
	freebusy.txt 
Log Message:
Typo fixed (Thanks to Richard Bos for spotting it.)


Index: freebusy.txt
===================================================================
RCS file: /kolabrepository/doc/architecture/freebusy.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- freebusy.txt	26 Mar 2008 15:14:14 -0000	1.18
+++ freebusy.txt	27 Mar 2008 09:03:53 -0000	1.19
@@ -60,7 +60,7 @@
 Technically those folders are like "anonymous" user accounts
 and a better name might be "multi-group folders".
 Their indented use is to include a larger number of people, 
-like all members a company. 
+like all members of a company. 
 Multi-group folders will not be relevant for freebusy lists.
 The reason is that within larger groups of people almost never all
 of them have to be at an event. E.g. it is better to work with invitations



From cvs at kolab.org  Thu Mar 27 18:01:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Thu, 27 Mar 2008 18:01:59 +0100 (CET)
Subject: bernhard: doc/architecture freebusy.txt,1.19,1.20 
Message-ID: <20080327170159.203EF600D70@lists.intevation.de>

Author: bernhard

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

Modified Files:
	freebusy.txt 
Log Message:
More hints when to trigger. (This has been implicit before.)


Index: freebusy.txt
===================================================================
RCS file: /kolabrepository/doc/architecture/freebusy.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- freebusy.txt	27 Mar 2008 09:03:53 -0000	1.19
+++ freebusy.txt	27 Mar 2008 17:01:56 -0000	1.20
@@ -168,8 +168,14 @@
 Creation of pxfbs happens together with the pfb creation. 
 One successful trigger does both.
 
-In general all clients writing to calendar folders including the KDE Client Kontact, the Outlook Clients,
-the web client and the resource scripts must trigger the generation of pfbs.
+In general all clients writing to calendar folders on the server
+must trigger the generation of pfbs. This include KDE Kontact, 
+the Outlook Clients, the web client and the resource manager.
+They must trigger after one or more write operations to one folder. 
+If a clients knows that it will do several write operations 
+during a very short interval to one folder,
+it should delay the trigger until it has done the operations
+to avoid unnecessary triggers.
 
 Pfb collector
 



From cvs at kolab.org  Fri Mar 28 13:12:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 13:12:29 +0100 (CET)
Subject: wilde: server/perl-kolab/lib/Kolab/LDAP/Backend fds.pm,NONE,1.1 
Message-ID: <20080328121229.8B615600D6F@lists.intevation.de>

Author: wilde

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

Added Files:
	fds.pm 
Log Message:
Added Fedora-DS backend.


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



From cvs at kolab.org  Fri Mar 28 13:12:29 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 13:12:29 +0100 (CET)
Subject: wilde: server/perl-kolab MANIFEST,1.2,1.3 ChangeLog,1.33,1.34 
Message-ID: <20080328121229.89F2A600D67@lists.intevation.de>

Author: wilde

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

Modified Files:
	MANIFEST ChangeLog 
Log Message:
Added Fedora-DS backend.


Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/perl-kolab/MANIFEST,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MANIFEST	17 Oct 2007 07:05:02 -0000	1.2
+++ MANIFEST	28 Mar 2008 12:12:27 -0000	1.3
@@ -7,6 +7,7 @@
 lib/Kolab/LDAP/Backend.pm
 lib/Kolab/LDAP/Backend/ad.pm
 lib/Kolab/LDAP/Backend/slurpd.pm
+lib/Kolab/LDAP/Backend/fds.pm
 lib/Kolab/Util.pm
 Makefile.PL
 MANIFEST

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ChangeLog	13 Mar 2008 05:47:10 -0000	1.33
+++ ChangeLog	28 Mar 2008 12:12:27 -0000	1.34
@@ -1,3 +1,9 @@
+2008-03-28  Sascha Wilde  <wilde at intevation.de>
+
+	* lib/Kolab/LDAP/Backend/fds.pm: New File.
+
+	* MANIFEST: Added Backend/fds.pm
+
 2008-03-13  Gunnar Wrobel  <p at rdus.de>
 
 	* lib/Kolab/LDAP/Backend/slurpd.pm (run):



From cvs at kolab.org  Fri Mar 28 17:30:28 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 17:30:28 +0100 (CET)
Subject: gunnar: server/horde external-horde-cvs.sh,1.2,1.3 
Message-ID: <20080328163028.7E2E4600165@lists.intevation.de>

Author: gunnar

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

Modified Files:
	external-horde-cvs.sh 
Log Message:
Update the script to latest CVS and remove the IMAP based SyncML drivers for now. Not yet completely done.

Index: external-horde-cvs.sh
===================================================================
RCS file: /kolabrepository/server/horde/external-horde-cvs.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- external-horde-cvs.sh	13 Mar 2008 10:01:48 -0000	1.2
+++ external-horde-cvs.sh	28 Mar 2008 16:30:26 -0000	1.3
@@ -1,8 +1,6 @@
 #!/bin/sh
-DATE="Thu Mar 13 10:01:01 UTC 2008"
+DATE="Fri Mar 28 16:29:37 UTC 2008"
 PATCHES="
-framework/HK-GW-Kolab_history_driver.patch
-framework/HK-GW-Kolab_syncml_driver.patch
 framework/HK-GW-Fix_Prefs_for_Ingo.patch
 framework/HK-GW-Fbview_xfb_concept.patch
 kronolith/HK-SB-Fbview_save_attendees.patch



From cvs at kolab.org  Fri Mar 28 22:45:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 22:45:05 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.95,1.96 
Message-ID: <20080328214505.0FAB960016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
Fixes issue2569
(rename of services to settings makes welcome screen fail)
Thanks to Mathieu Parent.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- ChangeLog	14 Mar 2008 11:16:30 -0000	1.95
+++ ChangeLog	28 Mar 2008 21:45:02 -0000	1.96
@@ -1,3 +1,9 @@
+2008-03-28 Richard Bos <richard at radoeka.nl>
+
+	* php/admin/templates/systemaliasnagscreen.tpl: 
+	  rename of services to settings makes welcome screen fail
+	  (Fixes issue2569)
+
 2008-03-14  Sascha Wilde  <wilde at intevation.de>
 
 	* Makefile.am (phpincludesdir): Moved



From cvs at kolab.org  Fri Mar 28 22:45:05 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 22:45:05 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	systemaliasnagscreen.tpl, 1.2, 1.3 
Message-ID: <20080328214505.11E71600D64@lists.intevation.de>

Author: richard

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

Modified Files:
	systemaliasnagscreen.tpl 
Log Message:
Fixes issue2569
(rename of services to settings makes welcome screen fail)
Thanks to Mathieu Parent.



Index: systemaliasnagscreen.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/systemaliasnagscreen.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- systemaliasnagscreen.tpl	18 Dec 2006 08:04:34 -0000	1.2
+++ systemaliasnagscreen.tpl	28 Mar 2008 21:45:03 -0000	1.3
@@ -11,5 +11,5 @@
 <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, "}
 <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."}
+<a href="{$topdir}/settings/#systemaliasconf">{tr msg="here"}</a> {tr msg="to set up forwarding of mail to administrative email addresses."}
 </div>



From cvs at kolab.org  Fri Mar 28 22:54:45 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 22:54:45 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog,1.96,1.97 
Message-ID: <20080328215445.F04F060016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
www/admin/pics/kde.jpg has been replaced by
www/admin/pics/kde.png.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- ChangeLog	28 Mar 2008 21:45:02 -0000	1.96
+++ ChangeLog	28 Mar 2008 21:54:43 -0000	1.97
@@ -3,6 +3,8 @@
 	* php/admin/templates/systemaliasnagscreen.tpl: 
 	  rename of services to settings makes welcome screen fail
 	  (Fixes issue2569)
+	* www/admin/pics/kde.jpg: has been replaced by
+	  www/admin/pics/kde.png.
 
 2008-03-14  Sascha Wilde  <wilde at intevation.de>
 



From cvs at kolab.org  Fri Mar 28 22:54:46 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 22:54:46 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/pics kde.jpg,
	1.2, NONE 
Message-ID: <20080328215446.07C70600D64@lists.intevation.de>

Author: richard

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

Removed Files:
	kde.jpg 
Log Message:
www/admin/pics/kde.jpg has been replaced by
www/admin/pics/kde.png.



--- kde.jpg DELETED ---



From cvs at kolab.org  Fri Mar 28 23:22:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 23:22:39 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/service
	index.php.in, 1.6, 1.7 
Message-ID: <20080328222239.C68E760016F@lists.intevation.de>

Author: richard

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

Modified Files:
	index.php.in 
Log Message:
Continue rename services tab to settings tab



Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.php.in	17 Oct 2007 18:27:14 -0000	1.6
+++ index.php.in	28 Mar 2008 22:22:37 -0000	1.7
@@ -310,7 +310,7 @@
 $smarty->assign( 'submenuitems', 
 				 array_key_exists('submenu', 
 								  $menuitems[$sidx])?$menuitems[$sidx]['submenu']:array() );
-$smarty->assign( 'maincontent', 'service.tpl' );
+$smarty->assign( 'maincontent', 'settings.tpl' );
 
 $systemaliasconf = array();
 



From cvs at kolab.org  Fri Mar 28 23:22:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 23:22:39 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/templates
	settings.tpl, NONE, 1.1 service.tpl, 1.18, NONE 
Message-ID: <20080328222239.C69B2600D64@lists.intevation.de>

Author: richard

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

Added Files:
	settings.tpl 
Removed Files:
	service.tpl 
Log Message:
Continue rename services tab to settings tab



--- NEW FILE: settings.tpl ---
{* Smarty Template *}
{*
  Local variables:
  buffer-file-coding-system: utf-8
  End:
*}
<h1>{tr msg="Kolab Server Settings"}</h1>

{if count($systemaliasconf)>0 }
<a name="systemaliasconf"></a>
<h2>{tr msg="Administrative email addresses"}</h2>
<div class="contentsimple">
<p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-DAEMON at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
{section name=id loop=$systemaliasconf}
<div class="contentform">
<form name="systemalias_{$systemaliasconf[id].n}" method="post">
{tr msg="Email address of account that should receive administrative mail for domain "}  {$systemaliasconf[id].domain|escape:html}:
<input type="text" name="systemaliasmail_{$systemaliasconf[id].n}" size="80"  value="{$systemaliasmail[id]|escape:"html"}" /><br/>
<div align="right"><input type="submit" name="submitsystemalias_{$systemaliasconf[id].n}" value="{tr msg="Create Distribution Lists"}" /></div>
</form>
</div>
{/section}
<br />
</div>
{/if}

<h2>{tr msg="Enable or Disable individual Services"}</h2>
<form name="serviceform" method="post">

<table class="contenttable" cellpadding="0" cellspacing="1px">
	<tr class="contentrow">
	<th>{tr msg="Service"}</th><th>{tr msg="Enabled"}</th>
	</tr>
{section name=id loop=$entries}
	<tr class="contentrow{cycle values="even,odd"}">
	   <td class="contentcell">{$entries[id].name|escape:"html"}</td>
	   <td class="actioncell"><input type="checkbox" name="{$entries[id].service}" {if $entries[id].enabled == 'true' }checked{/if}></td>
	</tr>
{/section}
	<tr class="contentrow{cycle values="even,odd"}">
	   <td class="contentcell"> </td><td class="actioncell"><input type="submit" name="submitservices" value="{tr msg="Update"}"></td>
	</tr>
</table>
</form>
<h2>{tr msg="Quota settings"}</h2>
<div class="contentform">
<form name="quotawarnform" method="post">
<br />
{tr msg="Warn users when they have used"} <input name="quotawarn" size="3"  value="{$quotawarn|escape:"html"}" /> {tr msg="% of their quota"}<br />
<div align="right"><input type="submit" name="submitquotawarn" value="{tr msg="Update"}" /></div>
</form>
</div>
<br />
<h2>{tr msg="Free/Busy settings"}</h2>
<div class="contentform">
<form name="httpallowunauthfbform" method="post">
<br />
<input type="checkbox" name="httpallowunauthfb" {if $httpallowunauthfb == 'true' }checked{/if} />
{tr msg="Allow unauthenticated downloading of Free/Busy information"}
<br />
<div align="right"><input type="submit" name="submithttpallowunauthfb" value="{tr msg="Update"}" /></div>
</form>
</div>
<br />
<div class="contentform">
<form name="freebusypastform" method="post">
<br />
{tr msg="When creating free/busy lists, include data from"} <input name="freebusypast" size="3"  value="{$freebusypast|escape:"html"}" /> {tr msg="days in the past"}<br />
<div align="right"><input type="submit" name="submitfreebusypast" value="{tr msg="Update"}" /></div>
</form>
</div>
<br />
<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):"}
<input type="text" name="postfixmynetworks" size="80"  value="{$postfixmynetworks|escape:"html"}" />
<div align="right"><input type="submit" name="submitpostfixmynetworks" value="{tr msg="Update"}" /></div>
</form>
</div>
<br />
<h2>{tr msg="SMTP \"smarthost/relayhost\""}</h2>
<div class="contentform">
<form name="postfixrelayhostform" method="post">
{tr msg="Smarthost (and optional port) to use to send outgoing mail (host.domain.tld). Leave empty for no relayhost."}
<input type="text" name="postfixrelayhost" size="40"  value="{$postfixrelayhost|escape:"html"}" />:
<input type="text" name="postfixrelayport" size="4" value="{$postfixrelayport|escape:"html"}" /><br/>
<div align="right"><input type="submit" name="submitpostfixrelayhost" value="{tr msg="Update"}" /></div>
</form>
</div>
<br />
<h2>{tr msg="Accept Internet Mail"}</h2>
<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 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>
<br />
<h2>{tr msg="Domains"}</h2>
<table class="contenttable" cellpadding="0" cellspacing="1px">
	<tr class="contentrow">
	<th>{tr msg="Domain"}</th><th>{tr msg="Action"}</th>
	</tr>
{section name=id loop=$postfixmydestination}
	<tr class="contentrow{cycle values="even,odd"}">
	   <td class="contentcell">{$postfixmydestination[id]|escape:"html"}</td>
	   <td class="actioncell">{strip}
		<form method="post">
		<input type="hidden" name="adestination" value="{$postfixmydestination[id]}" />
		<input type="submit" name="deletedestination" value="{tr msg="Delete"}" />
		</form>
           {/strip}</td>
	</tr>
{/section}
	<tr class="contentrow{cycle values="even,odd"}">
	   <form method="post">
	   <td class="contentcell"> 
		<input type="text" size="60" name="adestination" />
           </td><td class="actioncell"><input type="submit" name="adddestination" value="{tr msg="Add"}" /></td>
	   </form>
	</tr>
</table>
<br/>
<h2>{tr msg="Mail Filter Settings"}</h2>
<div class="contentform">
<form name="kolabfilterform" method="post">
<input type="checkbox" name="kolabfilterverifyfrom" {if $kolabfilterverifyfrom == 'true' }checked{/if} />
{tr msg="Check messages for mismatching From header and envelope from."}
<br />
<input type="checkbox" name="kolabfilterallowsender" {if $kolabfilterallowsender == 'true' }checked{/if} />
{tr msg="Use the Sender header instead of From for the above checks if Sender is present."}
<br />
<h4>{tr msg="Action to take for messages that fail the check:"}</h4>
<input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked{/if} />
{tr msg="Reject the message, except if it originates from the outside and the From header matches one of Kolab server's domains. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
<input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked{/if} />
{tr msg="Always reject the message."}
{tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}
<br />
<div align="right"><input type="submit" name="submitkolabfilter" value="{tr msg="Update"}" /></div>
</form>
</div>
<br />

<h2>{tr msg="Kolab Hostnames (for Master and Slaves)"}</h2>
<table class="contenttable" cellpadding="0" cellspacing="1px">
	<tr class="contentrow">
	<th>{tr msg="Host"}</th><th>{tr msg="Action"}</th>
	</tr>
{section name=id loop=$kolabhost}
	<tr class="contentrow{cycle values="even,odd"}">
	   <td class="contentcell">{$kolabhost[id]|escape:"html"}</td>
	   <td class="actioncell">{strip}
		<form method="post">
		<input type="hidden" name="akolabhost" value="{$kolabhost[id]}" />
		<input type="submit" name="deletekolabhost" value="{tr msg="Delete"}" />
		</form>
           {/strip}</td>
	</tr>
{/section}
	<tr class="contentrow{cycle values="even,odd"}">
	   <form method="post">
	   <td class="contentcell"> 
		<input type="text" size="60" name="akolabhost" />
           </td><td class="actioncell"><input type="submit" name="addkolabhost" value="{tr msg="Add"}" /></td>
	   </form>
	</tr>
</table>
</div>

--- service.tpl DELETED ---



From cvs at kolab.org  Fri Mar 28 23:22:39 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 23:22:39 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin Makefile.am,1.50,1.51 
Message-ID: <20080328222239.B8C1460016C@lists.intevation.de>

Author: richard

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

Modified Files:
	Makefile.am 
Log Message:
Continue rename services tab to settings tab



Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- Makefile.am	14 Mar 2008 11:16:30 -0000	1.50
+++ Makefile.am	28 Mar 2008 22:22:37 -0000	1.51
@@ -145,7 +145,7 @@
 	php/admin/templates/kdab.tpl \
 	php/admin/templates/userlistall.tpl \
 	php/admin/templates/userlisterror.tpl \
-	php/admin/templates/service.tpl \
+	php/admin/templates/settings.tpl \
 	php/admin/templates/welcome.tpl \
 	php/admin/templates/systemaliasnagscreen.tpl \
 	php/admin/templates/intevation.tpl \



From cvs at kolab.org  Fri Mar 28 23:27:58 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 23:27:58 +0100 (CET)
Subject: richard: server release-notes.txt,1.242,1.243 
Message-ID: <20080328222758.A70BE60016C@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
Added issue2569



Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- release-notes.txt	17 Mar 2008 14:20:04 -0000	1.242
+++ release-notes.txt	28 Mar 2008 22:27:56 -0000	1.243
@@ -106,6 +106,7 @@
 	kolab/issue2437 (Change name of service tab to settings)
 	kolab/issue2505 (update of the french translation for kolab-server)
 	kolab/issue2507 (move session_vars.php to sysconfig directory)
+	kolab/issue2569 (rename of services to settings makes welcome screen fail)
 
     - perl-kolab-2.2.rc2-20080314
 



From cvs at kolab.org  Fri Mar 28 23:29:32 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 23:29:32 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.97,
	1.98 Makefile.am, 1.51, 1.52 
Message-ID: <20080328222932.3035D60016F@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Fixed build error: kde.jpg is not distributed anymore



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- ChangeLog	28 Mar 2008 21:54:43 -0000	1.97
+++ ChangeLog	28 Mar 2008 22:29:30 -0000	1.98
@@ -3,8 +3,12 @@
 	* php/admin/templates/systemaliasnagscreen.tpl: 
 	  rename of services to settings makes welcome screen fail
 	  (Fixes issue2569)
-	* www/admin/pics/kde.jpg: has been replaced by
+	* Removed: www/admin/pics/kde.jpg: has been replaced by
 	  www/admin/pics/kde.png.
+	* Makefile.am, www/admin/service/index.php.in: reflect name change from
+	  services to settings tab
+	* Removed: php/admin/templates/service.tpl: replaced by
+	* Added: php/admin/templates/settings.tpl
 
 2008-03-14  Sascha Wilde  <wilde at intevation.de>
 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile.am	28 Mar 2008 22:22:37 -0000	1.51
+++ Makefile.am	28 Mar 2008 22:29:30 -0000	1.52
@@ -76,7 +76,6 @@
 	www/admin/pics/codefusion.png \
 	www/admin/pics/intevation_logo.png \
 	www/admin/pics/kdab.png \
-	www/admin/pics/kde.jpg \
 	www/admin/pics/kde.png \
 	www/admin/pics/kolab_logo.png
 



From cvs at kolab.org  Fri Mar 28 23:37:26 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 23:37:26 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin/www/admin/settings -
	New directory 
Message-ID: <20080328223726.C738B60016C@lists.intevation.de>

Author: richard

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

Log Message:
Directory /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/settings added to the repository




From cvs at kolab.org  Fri Mar 28 23:39:18 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Fri, 28 Mar 2008 23:39:18 +0100 (CET)
Subject: richard: server/kolab-webadmin/kolab-webadmin Makefile.am,1.52,1.53 
Message-ID: <20080328223918.AE00260016F@lists.intevation.de>

Author: richard

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

Modified Files:
	Makefile.am 
Log Message:
These should be the last changes for the renaming from
service to settings
(The service directory, is not yet removed.  It will if
 this update has proved to be working fine).



Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- Makefile.am	28 Mar 2008 22:29:30 -0000	1.52
+++ Makefile.am	28 Mar 2008 22:39:16 -0000	1.53
@@ -82,8 +82,8 @@
 wspicsdir = $(wskolabdir)/pics
 dist_wspics_DATA = $(WSPICS_FILES)
 
-wsservicedir = $(wskolabdir)/settings
-wsservice_DATA = www/admin/service/index.php
+wssettingsdir = $(wskolabdir)/settings
+wssettings_DATA = www/admin/settings/index.php
 
 WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \
 	www/admin/sharedfolder/index.php
@@ -325,11 +325,11 @@
 CLEANFILES += www/admin/maintainer/maintainer.php
 EXTRA_DIST += www/admin/maintainer/maintainer.php.in
 
-www/admin/service/index.php: www/admin/service/index.php.in
-	@$(mkinstalldirs) www/admin/service
-	$(do_subst) <$(srcdir)/www/admin/service/index.php.in >$@
-CLEANFILES += www/admin/service/index.php
-EXTRA_DIST += www/admin/service/index.php.in
+www/admin/settings/index.php: www/admin/settings/index.php.in
+	@$(mkinstalldirs) www/admin/settings
+	$(do_subst) <$(srcdir)/www/admin/settings/index.php.in >$@
+CLEANFILES += www/admin/settings/index.php
+EXTRA_DIST += www/admin/settings/index.php.in
 
 www/admin/sharedfolder/index.php: www/admin/sharedfolder/index.php.in
 	@$(mkinstalldirs) www/admin/sharedfolder



From cvs at kolab.org  Sat Mar 29 15:19:19 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sat, 29 Mar 2008 15:19:19 +0100 (CET)
Subject: richard: server/kolabd/kolabd ChangeLog,1.158,1.159 
Message-ID: <20080329141919.B9F70600169@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog 
Log Message:
replaces spaces by a tab

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- ChangeLog	19 Mar 2008 21:43:15 -0000	1.158
+++ ChangeLog	29 Mar 2008 14:19:17 -0000	1.159
@@ -70,7 +70,7 @@
 2008-02-11 Richard Bos <richard at radoeka.nl>
 	* dist_conf/common, dist_conf/suse: added autoconf variables for the rpms:
 	  kolab-filter_rpm, kolab-freebusy_rpm, perl-kolab-conf_rpm,
-          php-pear-kolab_filter_rpm and php-pear-kolab_freebusy_rpm
+	  php-pear-kolab_filter_rpm and php-pear-kolab_freebusy_rpm
 
 2008-02-11  Sascha Wilde  <wilde at intevation.de>
 
@@ -519,7 +519,7 @@
 2007-01-08 Richard Bos <richard at radoeka.nl>
 	* dist_conf/suse, dist_conf/kolab, dist_conf/common,
 	  dist_conf/gentoo, templates/virtual.template.in,
-          templates/transport.template.in: changed emailserver_transport_usr
+	  templates/transport.template.in: changed emailserver_transport_usr
 	  to emailserver_tables_usr.
 
 2006-12-15  Gunnar Wrobel  <wrobel at pardus.de>
@@ -539,7 +539,7 @@
 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 
+	  templates/transport.template.in: Added a new variable 
 	  emailserver_transport_usr
 
 2006-11-01  Gunnar Wrobel  <wrobel at pardus.de>
@@ -709,7 +709,7 @@
 	  dist_conf/suse,
 	  templates/kolab_smtpdpolicy.conf.template.in: added
 	  kolab_smtpdpolicy_conffile_usr and
-          kolab_smtpdpolicy_conffile_grp variables.
+	  kolab_smtpdpolicy_conffile_grp variables.
 
 2006-01-23 Richard Bos <richard at radoeka.nl>
 	* kolabquotawarn.in: removed \n in error string, seems redundant.



From cvs at kolab.org  Sun Mar 30 21:44:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 30 Mar 2008 21:44:21 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin/php/admin/include
	mysmarty.php.in, 1.10, 1.11 
Message-ID: <20080330194421.81053600169@lists.intevation.de>

Author: richard

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

Modified Files:
	mysmarty.php.in 
Log Message:
Make smarty compile location configurable, variable smarty_compiledir
is used for this.  See issue2538



Index: mysmarty.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mysmarty.php.in	3 Jul 2007 14:55:17 -0000	1.10
+++ mysmarty.php.in	30 Mar 2008 19:44:19 -0000	1.11
@@ -35,9 +35,9 @@
 	$this->Smarty();
 	
 	$basedir = "$php_dir/@kolab_php_module_prefix at admin/";
-	$this->template_dir = $basedir.'templates/';
-	$this->compile_dir = $basedir.'templates_c/';
 	$this->config_dir = $basedir.'configs/';
+	$this->template_dir = $basedir.'templates/';
+	$this->compile_dir = '@smarty_compiledir@/';
 	//$this->cache_dir = $basedir.'cache/';
 	// Added for i18n management (Romain 05-03-03)
 	$this->register_function("tr", "translate");



From cvs at kolab.org  Sun Mar 30 21:44:21 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 30 Mar 2008 21:44:21 +0200 (CEST)
Subject: richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.98,
	1.99 Makefile.am, 1.53, 1.54 
Message-ID: <20080330194421.8343F60016C@lists.intevation.de>

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Make smarty compile location configurable, variable smarty_compiledir
is used for this.  See issue2538



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ChangeLog	28 Mar 2008 22:29:30 -0000	1.98
+++ ChangeLog	30 Mar 2008 19:44:19 -0000	1.99
@@ -1,3 +1,10 @@
+2008-03-30 Richard Bos <richard at radoeka.nl>
+
+	* php/admin/include/mysmarty.php.in: changed $basedir.'templates into
+	  @smarty_compiledir@ (issue2538)
+	* Makefile.am: changed $(phpkolabdir)/templates_c into
+	  $(smarty_compiledir) (issue2538)
+
 2008-03-28 Richard Bos <richard at radoeka.nl>
 
 	* php/admin/templates/systemaliasnagscreen.tpl: 

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- Makefile.am	28 Mar 2008 22:39:16 -0000	1.53
+++ Makefile.am	30 Mar 2008 19:44:19 -0000	1.54
@@ -430,5 +430,5 @@
 
 
 install-data-hook:
-	$(mkinstalldirs) $(DESTDIR)$(phpkolabdir)/templates_c
+	$(mkinstalldirs) $(DESTDIR)$(smarty_compiledir)
 # 	test -z "$(webserver_usr)" || chown $(webserver_usr) $(DESTDIR)$(phpkolabdir)/templates_c



From cvs at kolab.org  Sun Mar 30 22:03:59 2008
From: cvs at kolab.org (cvs@kolab.org)
Date: Sun, 30 Mar 2008 22:03:59 +0200 (CEST)
Subject: richard: server release-notes.txt,1.243,1.244 
Message-ID: <20080330200359.1FE02600169@lists.intevation.de>

Author: richard

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

Modified Files:
	release-notes.txt 
Log Message:
added issue2538 and issue2569 to kolab-webadmin-2.2.rc3

Index: release-notes.txt
===================================================================
RCS file: /kolabrepository/server/release-notes.txt,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- release-notes.txt	28 Mar 2008 22:27:56 -0000	1.243
+++ release-notes.txt	30 Mar 2008 20:03:57 -0000	1.244
@@ -50,6 +50,11 @@
 
 	kolab/issue2549 (Resource manager creates events in wrong account)
 
+    - kolab-webadmin-2.2.rc3-2008????
+
+	kolab/issue2538 (Make the location of the Smarty compile directory configurable)
+	kolab/issue2569 (rename of services to settings makes welcome screen fail)
+
 
 Changes between 2.2-rc-1 and 2.2-rc-2
 
@@ -106,7 +111,6 @@
 	kolab/issue2437 (Change name of service tab to settings)
 	kolab/issue2505 (update of the french translation for kolab-server)
 	kolab/issue2507 (move session_vars.php to sysconfig directory)
-	kolab/issue2569 (rename of services to settings makes welcome screen fail)
 
     - perl-kolab-2.2.rc2-20080314